Now that the code is not arch-dependent anymore, it can be moved back to vl.c.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- include/sysemu/arch_init.h | 1 - arch_init.c | 11 ----------- vl.c | 7 ++++++- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 88dcf77a62..20b01e3004 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -28,7 +28,6 @@ enum { extern const uint32_t arch_type; void select_soundhw(const char *optarg); -void do_acpitable_option(const 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 0416d84211..591afe6e2c 100644 --- a/arch_init.c +++ b/arch_init.c @@ -235,17 +235,6 @@ void audio_init(void) } } -void do_acpitable_option(const QemuOpts *opts) -{ - Error *err = NULL; - - acpi_table_add(opts, &err); - if (err) { - error_reportf_err(err, "Wrong acpi table provided: "); - exit(1); - } -} - int kvm_available(void) { #ifdef CONFIG_KVM diff --git a/vl.c b/vl.c index 38d812286a..9571b17eb6 100644 --- a/vl.c +++ b/vl.c @@ -65,6 +65,7 @@ int main(int argc, char **argv) #include "hw/bt.h" #include "sysemu/watchdog.h" #include "hw/smbios/smbios.h" +#include "hw/acpi/acpi.h" #include "hw/xen/xen.h" #include "hw/qdev.h" #include "hw/loader.h" @@ -3699,7 +3700,11 @@ int main(int argc, char **argv, char **envp) if (!opts) { exit(1); } - do_acpitable_option(opts); + acpi_table_add(opts, &err); + if (err) { + error_reportf_err(err, "Wrong acpi table provided: "); + exit(1); + } break; case QEMU_OPTION_smbios: opts = qemu_opts_parse_noisily(qemu_find_opts("smbios"), -- 2.11.0.259.g40922b1