Instead of using an #ifdef in arch_init.c, add a smbios_entry_add() stub. The stub will never be called because the -smbios option is defined as arch-specific in qemu-options.hx.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- include/sysemu/arch_init.h | 1 - arch_init.c | 7 ------- stubs/smbios.c | 7 +++++++ vl.c | 2 +- stubs/Makefile.objs | 1 + 5 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 stubs/smbios.c 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); diff --git a/arch_init.c b/arch_init.c index 5cc58b2c35..9647c8d337 100644 --- a/arch_init.c +++ b/arch_init.c @@ -248,13 +248,6 @@ void do_acpitable_option(const QemuOpts *opts) #endif } -void do_smbios_option(QemuOpts *opts) -{ -#ifdef TARGET_I386 - smbios_entry_add(opts); -#endif -} - int kvm_available(void) { #ifdef CONFIG_KVM diff --git a/stubs/smbios.c b/stubs/smbios.c new file mode 100644 index 0000000000..e86e8f821c --- /dev/null +++ b/stubs/smbios.c @@ -0,0 +1,7 @@ +#include "qemu/osdep.h" +#include "hw/smbios/smbios.h" + +void smbios_entry_add(QemuOpts *opts) +{ + abort(); /* must never be called */ +} diff --git a/vl.c b/vl.c index c643d3ff3a..38d812286a 100644 --- a/vl.c +++ b/vl.c @@ -3707,7 +3707,7 @@ int main(int argc, char **argv, char **envp) if (!opts) { exit(1); } - do_smbios_option(opts); + smbios_entry_add(opts); break; case QEMU_OPTION_fwcfg: opts = qemu_opts_parse_noisily(qemu_find_opts("fw_cfg"), diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 2b5bb74fce..83ddcad3c3 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -50,3 +50,4 @@ stub-obj-y += smbios_type_38.o stub-obj-y += ipmi.o stub-obj-y += pc_madt_cpu_entry.o stub-obj-y += migration-colo.o +stub-obj-y += smbios.o -- 2.11.0.259.g40922b1