| Message ID | 20190309181920.30553-2-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fw_cfg: Trivial cleanups | expand |
On 09/03/2019 19:19, Philippe Mathieu-Daudé wrote: > Since commit 578f3c7b0835 ("arm: add fw_cfg to "virt" board", > 2014-12-22), the machvirt_init() unconditionally creates the > fw_cfg object. Later, commit c30e15658b1b ("smbios: implement > smbios support for mach-virt", 2015-09-07) added a superfluous > null-check on it. > Remove this superfluous check. > > Reviewed-by: Laszlo Ersek <lersek@redhat.com> > Reviewed-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > v2: Corrected commit reference (Laszlo) > v3: Dropped 'Fixes:' (Markus) > --- > hw/arm/virt.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 7f66ddad89..377e95a4cd 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1281,10 +1281,6 @@ static void virt_build_smbios(VirtMachineState *vms) > size_t smbios_tables_len, smbios_anchor_len; > const char *product = "QEMU Virtual Machine"; > > - if (!vms->fw_cfg) { > - return; > - } > - > if (kvm_enabled()) { > product = "KVM Virtual Machine"; > } > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7f66ddad89..377e95a4cd 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1281,10 +1281,6 @@ static void virt_build_smbios(VirtMachineState *vms) size_t smbios_tables_len, smbios_anchor_len; const char *product = "QEMU Virtual Machine"; - if (!vms->fw_cfg) { - return; - } - if (kvm_enabled()) { product = "KVM Virtual Machine"; }
Since commit 578f3c7b0835 ("arm: add fw_cfg to "virt" board", 2014-12-22), the machvirt_init() unconditionally creates the fw_cfg object. Later, commit c30e15658b1b ("smbios: implement smbios support for mach-virt", 2015-09-07) added a superfluous null-check on it. Remove this superfluous check. Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- v2: Corrected commit reference (Laszlo) v3: Dropped 'Fixes:' (Markus) --- hw/arm/virt.c | 4 ---- 1 file changed, 4 deletions(-)