diff options
| author | Jason Andryuk <jandryuk@gmail.com> | 2020-10-13 10:05:11 -0400 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2020-10-24 07:23:19 +0200 |
| commit | efd4d93b530807921b1940e13990c561530618d3 (patch) | |
| tree | 9c8228aaad75f09779f8229e88f2753e540bf471 | |
| parent | 9ce84a0d17d015f059a6750fbbf4b057806751df (diff) | |
| download | qemu-efd4d93b530807921b1940e13990c561530618d3.zip qemu-efd4d93b530807921b1940e13990c561530618d3.tar.gz qemu-efd4d93b530807921b1940e13990c561530618d3.tar.bz2 | |
accel: Add xen CpusAccel using dummy-cpus
Xen was broken by commit 1583a3898853 ("cpus: extract out qtest-specific
code to accel/qtest"). Xen relied on qemu_init_vcpu() calling
qemu_dummy_start_vcpu() in the default case, but that was replaced by
g_assert_not_reached().
Add a minimal "CpusAccel" for Xen using the dummy-cpus implementation
used by qtest.
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
Message-Id: <20201013140511.5681-4-jandryuk@gmail.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Claudio Fontana <cfontana@suse.de>
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | accel/meson.build | 1 | ||||
| -rw-r--r-- | accel/xen/xen-all.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/accel/meson.build b/accel/meson.build index 9a41739..b26cca2 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -12,3 +12,4 @@ dummy_ss.add(files( )) specific_ss.add_all(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: dummy_ss) +specific_ss.add_all(when: ['CONFIG_XEN'], if_true: dummy_ss) diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c index 60b971d..878a408 100644 --- a/accel/xen/xen-all.c +++ b/accel/xen/xen-all.c @@ -16,6 +16,7 @@ #include "hw/xen/xen_pt.h" #include "chardev/char.h" #include "sysemu/accel.h" +#include "sysemu/cpus.h" #include "sysemu/xen.h" #include "sysemu/runstate.h" #include "migration/misc.h" @@ -153,6 +154,10 @@ static void xen_setup_post(MachineState *ms, AccelState *accel) } } +const CpusAccel xen_cpus = { + .create_vcpu_thread = dummy_start_vcpu_thread, +}; + static int xen_init(MachineState *ms) { MachineClass *mc = MACHINE_GET_CLASS(ms); @@ -180,6 +185,9 @@ static int xen_init(MachineState *ms) * opt out of system RAM being allocated by generic code */ mc->default_ram_id = NULL; + + cpus_register_accel(&xen_cpus); + return 0; } |