diff options
| author | Leif Lindholm <leif.lindholm@linaro.org> | 2016-12-22 15:18:28 +0000 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-01-16 17:52:34 +0100 |
| commit | 1007a37e20828171010935e48c5876071c78cf47 (patch) | |
| tree | 7e5e70cbf486eacb7a12f52757785863fd0c6275 /include | |
| parent | 1c6d75d5f7c18ffc87e87d6c3ab6e55fb38fb076 (diff) | |
| download | qemu-1007a37e20828171010935e48c5876071c78cf47.zip | |
smbios: filter based on CONFIG_SMBIOS rather than TARGET
-smbios command line options were accepted but silently ignored on
TARGET_ARM, due to a test for TARGET_I386 in arch_init.c.
Copy the mechanism of hw/pci/pci-stub.c to implement an smbios-stub
instead, enabled for all targets without CONFIG_SMBIOS.
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Message-Id: <20161222151828.28292-1-leif.lindholm@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/smbios/smbios.h | 2 | ||||
| -rw-r--r-- | include/sysemu/arch_init.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/hw/smbios/smbios.h b/include/hw/smbios/smbios.h index 1cd53cc58c..31e8d5f47e 100644 --- a/include/hw/smbios/smbios.h +++ b/include/hw/smbios/smbios.h @@ -257,7 +257,7 @@ struct smbios_type_127 { struct smbios_structure_header header; } QEMU_PACKED; -void smbios_entry_add(QemuOpts *opts); +void smbios_entry_add(QemuOpts *opts, Error **errp); void smbios_set_cpuid(uint32_t version, uint32_t features); void smbios_set_defaults(const char *manufacturer, const char *product, const char *version, bool legacy_mode, diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 1c9dad1b72..88dcf77a62 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -29,7 +29,6 @@ extern const uint32_t arch_type; void select_soundhw(const char *optarg); void do_acpitable_option(const QemuOpts *opts); -void do_smbios_option(QemuOpts *opts); void audio_init(void); int kvm_available(void); int xen_available(void); |