Skip to contentSkip to conversation

Add Xen CpusAccel

PATCH Superseded Jason Andryuk 4 participants 11 messages Oct 12, 2020 – Oct 13, 2020 Arm/Amlogic Meson SoC support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover Add Xen CpusAccel

Xen was left behind when CpusAccel became mandatory and fails the assert in qemu_init_vcpu(). It relied on the same dummy cpu threads as qtest. Move the qtest cpu functions to a common location and reuse them for Xen.

Jason Andryuk (2):
accel: move qtest CpusAccel functions to a common location
accel: Add xen CpusAccel using dummy-cpu

 .../qtest-cpus.c => dummy/dummy-cpus.c}       | 22 +++++--------------
 .../qtest-cpus.h => dummy/dummy-cpus.h}       | 10 ++++-----
 accel/dummy/meson.build                       |  7 ++++++
 accel/meson.build                             |  1 +
 accel/qtest/meson.build                       |  1 -
 accel/qtest/qtest.c                           |  7 +++++-
 accel/xen/xen-all.c                           | 10 +++++++++
 7 files changed, 34 insertions(+), 24 deletions(-)
 rename accel/{qtest/qtest-cpus.c => dummy/dummy-cpus.c} (76%)
 rename accel/{qtest/qtest-cpus.h => dummy/dummy-cpus.h} (59%)
 create mode 100644 accel/dummy/meson.build
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/2 accel: move qtest CpusAccel functions to a common location

Move and rename accel/qtest/qtest-cpu.* files to accel/dummy/ so they can be re-used by Xen.

---
 .../qtest-cpus.c => dummy/dummy-cpus.c}       | 22 +++++--------------
 .../qtest-cpus.h => dummy/dummy-cpus.h}       | 10 ++++-----
 accel/dummy/meson.build                       |  6 +++++
 accel/meson.build                             |  1 +
 accel/qtest/meson.build                       |  1 -
 accel/qtest/qtest.c                           |  7 +++++-
 6 files changed, 23 insertions(+), 24 deletions(-)
 rename accel/{qtest/qtest-cpus.c => dummy/dummy-cpus.c} (76%)
 rename accel/{qtest/qtest-cpus.h => dummy/dummy-cpus.h} (59%)
 create mode 100644 accel/dummy/meson.build
accel/dummy/dummy-cpus.c renamed from accel/qtest/qtest-cpus.c +5 -17
similarity index 76%
rename from accel/qtest/qtest-cpus.c
rename to accel/dummy/dummy-cpus.c
index 7c5399ed9d..efade99f03 100644
@@ -1,5 +1,5 @@
 /*
- * QTest accelerator code
+ * Dummy cpu thread code
  *
  * Copyright IBM, Corp. 2011
  *
@@ -13,21 +13,14 @@
 
 #include "qemu/osdep.h"
 #include "qemu/rcu.h"
-#include "qapi/error.h"
-#include "qemu/module.h"
-#include "qemu/option.h"
-#include "qemu/config-file.h"
-#include "sysemu/accel.h"
-#include "sysemu/qtest.h"
 #include "sysemu/cpus.h"
-#include "sysemu/cpu-timers.h"
 #include "qemu/guest-random.h"
 #include "qemu/main-loop.h"
 #include "hw/core/cpu.h"
 
-#include "qtest-cpus.h"
+#include "dummy-cpus.h"
 
-static void *qtest_cpu_thread_fn(void *arg)
+static void *dummy_cpu_thread_fn(void *arg)
 {
 #ifdef _WIN32
     error_report("qtest is not supported under Windows");
@@ -72,7 +65,7 @@ static void *qtest_cpu_thread_fn(void *arg)
 #endif
 }
 
-static void qtest_start_vcpu_thread(CPUState *cpu)
+void dummy_start_vcpu_thread(CPUState *cpu)
 {
     char thread_name[VCPU_THREAD_NAME_SIZE];
 
@@ -81,11 +74,6 @@ static void qtest_start_vcpu_thread(CPUState *cpu)
     qemu_cond_init(cpu->halt_cond);
     snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/DUMMY",
              cpu->cpu_index);
-    qemu_thread_create(cpu->thread, thread_name, qtest_cpu_thread_fn, cpu,
+    qemu_thread_create(cpu->thread, thread_name, dummy_cpu_thread_fn, cpu,
                        QEMU_THREAD_JOINABLE);
 }
-
-const CpusAccel qtest_cpus = {
-    .create_vcpu_thread = qtest_start_vcpu_thread,
-    .get_virtual_clock = qtest_get_virtual_clock,
-};
accel/dummy/dummy-cpus.h renamed from accel/qtest/qtest-cpus.h +5 -5
similarity index 59%
rename from accel/qtest/qtest-cpus.h
rename to accel/dummy/dummy-cpus.h
index 739519a472..a7a0469b17 100644
@@ -7,11 +7,11 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QTEST_CPUS_H
-#define QTEST_CPUS_H
+#ifndef DUMMY_CPUS_H
+#define DUMMY_CPUS_H
 
-#include "sysemu/cpus.h"
+#include "qemu/typedefs.h"
 
-extern const CpusAccel qtest_cpus;
+void dummy_start_vcpu_thread(CPUState *);
 
-#endif /* QTEST_CPUS_H */
+#endif /* DUMMY_CPUS_H */
accel/dummy/meson.build new file +6 -0
new file mode 100644
index 0000000000..5fbe27de90
@@ -0,0 +1,6 @@
+dummy_ss = ss.source_set()
+dummy_ss.add(files(
+  'dummy-cpus.c',
+))
+
+specific_ss.add_all(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: dummy_ss)
accel/meson.build +1 -0
index bb00d0fd13..d45a33fb8e 100644
@@ -1,5 +1,6 @@
 softmmu_ss.add(files('accel.c'))
 
+subdir('dummy')
 subdir('qtest')
 subdir('kvm')
 subdir('tcg')
accel/qtest/meson.build +0 -1
index e477cb2ae2..a2f3276459 100644
@@ -1,7 +1,6 @@
 qtest_ss = ss.source_set()
 qtest_ss.add(files(
   'qtest.c',
-  'qtest-cpus.c',
 ))
 
 specific_ss.add_all(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: qtest_ss)
accel/qtest/qtest.c +6 -1
index 537e8b449c..ac54bc8f52 100644
@@ -25,7 +25,12 @@
 #include "qemu/main-loop.h"
 #include "hw/core/cpu.h"
 
-#include "qtest-cpus.h"
+#include "accel/dummy/dummy-cpus.h"
+
+const CpusAccel qtest_cpus = {
+    .create_vcpu_thread = dummy_start_vcpu_thread,
+    .get_virtual_clock = qtest_get_virtual_clock,
+};
 
 static int qtest_init_accel(MachineState *ms)
 {
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH 1/2] accel: move qtest CpusAccel functions to a common location

Quoted 44 lines · Jason Andryuk

Move and rename accel/qtest/qtest-cpu.* files to accel/dummy/ so they can be re-used by Xen.

---
 .../qtest-cpus.c => dummy/dummy-cpus.c}       | 22 +++++--------------
 .../qtest-cpus.h => dummy/dummy-cpus.h}       | 10 ++++-----
 accel/dummy/meson.build                       |  6 +++++
 accel/meson.build                             |  1 +
 accel/qtest/meson.build                       |  1 -
 accel/qtest/qtest.c                           |  7 +++++-
 6 files changed, 23 insertions(+), 24 deletions(-)
 rename accel/{qtest/qtest-cpus.c => dummy/dummy-cpus.c} (76%)
 rename accel/{qtest/qtest-cpus.h => dummy/dummy-cpus.h} (59%)
 create mode 100644 accel/dummy/meson.build
accel/dummy/dummy-cpus.c renamed from accel/qtest/qtest-cpus.c +1 -8
similarity index 76%
rename from accel/qtest/qtest-cpus.c
rename to accel/dummy/dummy-cpus.c
index 7c5399ed9d..efade99f03 100644
@@ -1,5 +1,5 @@
 /*
- * QTest accelerator code
+ * Dummy cpu thread code
  *
  * Copyright IBM, Corp. 2011
  *
@@ -13,21 +13,14 @@
 
 #include "qemu/osdep.h"
 #include "qemu/rcu.h"
-#include "qapi/error.h"
-#include "qemu/module.h"
-#include "qemu/option.h"
-#include "qemu/config-file.h"
-#include "sysemu/accel.h"
-#include "sysemu/qtest.h"
 #include "sysemu/cpus.h"
-#include "sysemu/cpu-timers.h"
 #include "qemu/guest-random.h"
 #include "qemu/main-loop.h"

accel/dummy/dummy-cpus.c line 26

Quoted 10 lines
accel/dummy/dummy-cpus.c renamed from accel/qtest/qtest-cpus.c +2 -2
 #include "hw/core/cpu.h"
 
-#include "qtest-cpus.h"
+#include "dummy-cpus.h"
 
-static void *qtest_cpu_thread_fn(void *arg)
+static void *dummy_cpu_thread_fn(void *arg)
 {
 #ifdef _WIN32
     error_report("qtest is not supported under Windows");

I wonder if this should be changed to "dummy cpu thread is not supported under Windows".

Does not matter probably.

Quoted 86 lines
accel/dummy/dummy-cpus.c renamed from accel/qtest/qtest-cpus.c +2 -7
@@ -72,7 +65,7 @@ static void *qtest_cpu_thread_fn(void *arg)
 #endif
 }
 
-static void qtest_start_vcpu_thread(CPUState *cpu)
+void dummy_start_vcpu_thread(CPUState *cpu)
 {
     char thread_name[VCPU_THREAD_NAME_SIZE];
 
@@ -81,11 +74,6 @@ static void qtest_start_vcpu_thread(CPUState *cpu)
     qemu_cond_init(cpu->halt_cond);
     snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/DUMMY",
              cpu->cpu_index);
-    qemu_thread_create(cpu->thread, thread_name, qtest_cpu_thread_fn, cpu,
+    qemu_thread_create(cpu->thread, thread_name, dummy_cpu_thread_fn, cpu,
                        QEMU_THREAD_JOINABLE);
 }
-
-const CpusAccel qtest_cpus = {
-    .create_vcpu_thread = qtest_start_vcpu_thread,
-    .get_virtual_clock = qtest_get_virtual_clock,
-};
accel/dummy/dummy-cpus.h renamed from accel/qtest/qtest-cpus.h +5 -5
similarity index 59%
rename from accel/qtest/qtest-cpus.h
rename to accel/dummy/dummy-cpus.h
index 739519a472..a7a0469b17 100644
@@ -7,11 +7,11 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QTEST_CPUS_H
-#define QTEST_CPUS_H
+#ifndef DUMMY_CPUS_H
+#define DUMMY_CPUS_H
 
-#include "sysemu/cpus.h"
+#include "qemu/typedefs.h"
 
-extern const CpusAccel qtest_cpus;
+void dummy_start_vcpu_thread(CPUState *);
 
-#endif /* QTEST_CPUS_H */
+#endif /* DUMMY_CPUS_H */
accel/dummy/meson.build new file +6 -0
new file mode 100644
index 0000000000..5fbe27de90
@@ -0,0 +1,6 @@
+dummy_ss = ss.source_set()
+dummy_ss.add(files(
+  'dummy-cpus.c',
+))
+
+specific_ss.add_all(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: dummy_ss)
accel/meson.build +1 -0
index bb00d0fd13..d45a33fb8e 100644
@@ -1,5 +1,6 @@
 softmmu_ss.add(files('accel.c'))
 
+subdir('dummy')
 subdir('qtest')
 subdir('kvm')
 subdir('tcg')
accel/qtest/meson.build +0 -1
index e477cb2ae2..a2f3276459 100644
@@ -1,7 +1,6 @@
 qtest_ss = ss.source_set()
 qtest_ss.add(files(
   'qtest.c',
-  'qtest-cpus.c',
 ))
 
 specific_ss.add_all(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: qtest_ss)
accel/qtest/qtest.c +0 -0
index 537e8b449c..ac54bc8f52 100644

accel/qtest/qtest.c line 28

Quoted 5 lines
accel/qtest/qtest.c +1 -1
@@ -25,7 +25,12 @@
 #include "qemu/main-loop.h"
 #include "hw/core/cpu.h"
 
-#include "qtest-cpus.h"
+#include "accel/dummy/dummy-cpus.h"

this is a bit strange from my perspective, does not look right.

Maybe this dummy cpu prototype should be somewhere in include/ , like include/sysemu/cpus.h or even better include/sysemu/accel.h

Quoted 9 lines
accel/qtest/qtest.c +5 -0
+
+const CpusAccel qtest_cpus = {
+    .create_vcpu_thread = dummy_start_vcpu_thread,
+    .get_virtual_clock = qtest_get_virtual_clock,
+};
 
 static int qtest_init_accel(MachineState *ms)
 {
#3 lore raw

Re: [PATCH 1/2] accel: move qtest CpusAccel functions to a common location

Quoted 4 lines · Claudio Fontana
Quoted 3 lines · Jason Andryuk

Move and rename accel/qtest/qtest-cpu.* files to accel/dummy/ so they can be re-used by Xen.

Quoted 12 lines
Quoted 12 lines
---
 .../qtest-cpus.c => dummy/dummy-cpus.c}       | 22 +++++--------------
 .../qtest-cpus.h => dummy/dummy-cpus.h}       | 10 ++++-----
 accel/dummy/meson.build                       |  6 +++++
 accel/meson.build                             |  1 +
 accel/qtest/meson.build                       |  1 -
 accel/qtest/qtest.c                           |  7 +++++-
 6 files changed, 23 insertions(+), 24 deletions(-)
 rename accel/{qtest/qtest-cpus.c => dummy/dummy-cpus.c} (76%)
 rename accel/{qtest/qtest-cpus.h => dummy/dummy-cpus.h} (59%)
 create mode 100644 accel/dummy/meson.build

Maybe accel/dummy-cpus.c, no need to add a new directory.

Quoted 8 lines
Quoted 8 lines
accel/qtest/qtest.c +0 -0
index 537e8b449c..ac54bc8f52 100644
@@ -25,7 +25,12 @@
 #include "qemu/main-loop.h"
 #include "hw/core/cpu.h"
 
Quoted 7 lines

accel/qtest/qtest.c line 28

Quoted 2 lines
accel/qtest/qtest.c +1 -1
-#include "qtest-cpus.h"
+#include "accel/dummy/dummy-cpus.h"

this is a bit strange from my perspective, does not look right.

Maybe this dummy cpu prototype should be somewhere in include/ , like include/sysemu/cpus.h or even better include/sysemu/accel.h

Yes, it should be in include/sysemu/cpus.h.

Paolo

Quoted 10 lines
Quoted 9 lines
accel/qtest/qtest.c +5 -0
+
+const CpusAccel qtest_cpus = {
+    .create_vcpu_thread = dummy_start_vcpu_thread,
+    .get_virtual_clock = qtest_get_virtual_clock,
+};
 
 static int qtest_init_accel(MachineState *ms)
 {
#4 lore raw

Re: [PATCH 1/2] accel: move qtest CpusAccel functions to a common location

Quoted 19 lines · Paolo Bonzini
Quoted 4 lines · Claudio Fontana
Quoted 3 lines · Jason Andryuk

Move and rename accel/qtest/qtest-cpu.* files to accel/dummy/ so they can be re-used by Xen.

Quoted 12 lines
Quoted 12 lines
---
 .../qtest-cpus.c => dummy/dummy-cpus.c}       | 22 +++++--------------
 .../qtest-cpus.h => dummy/dummy-cpus.h}       | 10 ++++-----
 accel/dummy/meson.build                       |  6 +++++
 accel/meson.build                             |  1 +
 accel/qtest/meson.build                       |  1 -
 accel/qtest/qtest.c                           |  7 +++++-
 6 files changed, 23 insertions(+), 24 deletions(-)
 rename accel/{qtest/qtest-cpus.c => dummy/dummy-cpus.c} (76%)
 rename accel/{qtest/qtest-cpus.h => dummy/dummy-cpus.h} (59%)
 create mode 100644 accel/dummy/meson.build
Quoted 1 line

Maybe accel/dummy-cpus.c, no need to add a new directory.

Sure.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
accel/qtest/qtest.c +0 -0
index 537e8b449c..ac54bc8f52 100644
@@ -25,7 +25,12 @@
 #include "qemu/main-loop.h"
 #include "hw/core/cpu.h"
 
Quoted 4 lines
Quoted 4 lines

accel/qtest/qtest.c line 28

Quoted 2 lines
accel/qtest/qtest.c +1 -1
-#include "qtest-cpus.h"
+#include "accel/dummy/dummy-cpus.h"

this is a bit strange from my perspective, does not look right.

Yeah, I didn't really know where to put it.

Quoted 4 lines
Quoted 2 lines

Maybe this dummy cpu prototype should be somewhere in include/ , like include/sysemu/cpus.h or even better include/sysemu/accel.h

Yes, it should be in include/sysemu/cpus.h.

Sounds good.

Thanks,
Jason

#5 lore raw

Re: [PATCH 1/2] accel: move qtest CpusAccel functions to a common location

In reply to Claudio Fontana
Quoted 59 lines · Claudio Fontana
Quoted 44 lines · Jason Andryuk

Move and rename accel/qtest/qtest-cpu.* files to accel/dummy/ so they can be re-used by Xen.

---
 .../qtest-cpus.c => dummy/dummy-cpus.c}       | 22 +++++--------------
 .../qtest-cpus.h => dummy/dummy-cpus.h}       | 10 ++++-----
 accel/dummy/meson.build                       |  6 +++++
 accel/meson.build                             |  1 +
 accel/qtest/meson.build                       |  1 -
 accel/qtest/qtest.c                           |  7 +++++-
 6 files changed, 23 insertions(+), 24 deletions(-)
 rename accel/{qtest/qtest-cpus.c => dummy/dummy-cpus.c} (76%)
 rename accel/{qtest/qtest-cpus.h => dummy/dummy-cpus.h} (59%)
 create mode 100644 accel/dummy/meson.build
accel/dummy/dummy-cpus.c renamed from accel/qtest/qtest-cpus.c +1 -8
similarity index 76%
rename from accel/qtest/qtest-cpus.c
rename to accel/dummy/dummy-cpus.c
index 7c5399ed9d..efade99f03 100644
@@ -1,5 +1,5 @@
 /*
- * QTest accelerator code
+ * Dummy cpu thread code
  *
  * Copyright IBM, Corp. 2011
  *
@@ -13,21 +13,14 @@
 
 #include "qemu/osdep.h"
 #include "qemu/rcu.h"
-#include "qapi/error.h"
-#include "qemu/module.h"
-#include "qemu/option.h"
-#include "qemu/config-file.h"
-#include "sysemu/accel.h"
-#include "sysemu/qtest.h"
 #include "sysemu/cpus.h"
-#include "sysemu/cpu-timers.h"
 #include "qemu/guest-random.h"
 #include "qemu/main-loop.h"

accel/dummy/dummy-cpus.c line 26

Quoted 10 lines
accel/dummy/dummy-cpus.c renamed from accel/qtest/qtest-cpus.c +2 -2
 #include "hw/core/cpu.h"
 
-#include "qtest-cpus.h"
+#include "dummy-cpus.h"
 
-static void *qtest_cpu_thread_fn(void *arg)
+static void *dummy_cpu_thread_fn(void *arg)
 {
 #ifdef _WIN32
     error_report("qtest is not supported under Windows");

I wonder if this should be changed to "dummy cpu thread is not supported under Windows".

Quoted 1 line

Does not matter probably.

I left it since I was just moving the file. But...

Quoted 4 lines
Quoted 4 lines
accel/dummy/meson.build new file +0 -1
new file mode 100644
index 0000000000..5fbe27de90
--- /dev/null
Quoted 8 lines

accel/dummy/meson.build line 6

Quoted 8 lines

+++ b/accel/dummy/meson.build

accel/dummy/meson.build new file +6 -0
@@ -0,0 +1,6 @@
+dummy_ss = ss.source_set()
+dummy_ss.add(files(
+  'dummy-cpus.c',
+))
+
+specific_ss.add_all(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: dummy_ss)

... I don't really know meson, but this file is guarded by CONFIG_POSIX? If that's true, then this ifdef can just go away.

Regards,
Jason

#6 lore raw

Re: [PATCH 1/2] accel: move qtest CpusAccel functions to a common location

Quoted 3 lines · Jason Andryuk
Quoted 1 line
Quoted 1 line

+specific_ss.add_all(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: dummy_ss)

... I don't really know meson, but this file is guarded by CONFIG_POSIX? If that's true, then this ifdef can just go away.

Yes, it's redundant since cpus.c was split.

Paolo

#7 lore raw

PATCH 2/2 accel: Add xen CpusAccel using dummy-cpu

In reply to Jason Andryuk

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-cpu implementation used by qtest.

---
 accel/dummy/meson.build |  1 +
 accel/xen/xen-all.c     | 10 ++++++++++
 2 files changed, 11 insertions(+)
accel/dummy/meson.build +1 -0
index 5fbe27de90..cdff0ba746 100644
@@ -4,3 +4,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)
accel/xen/xen-all.c +10 -0
index 60b971d0a8..2d243c58d4 100644
@@ -16,12 +16,15 @@
 #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"
 #include "migration/global_state.h"
 #include "hw/boards.h"
 
+#include "accel/dummy/dummy-cpus.h"
+
 //#define DEBUG_XEN
 
 #ifdef DEBUG_XEN
@@ -153,6 +156,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 +187,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;
 }
 
Signature · 1 line
2.25.1
#8 lore raw

Re: [PATCH 2/2] accel: Add xen CpusAccel using dummy-cpu

Quoted 29 lines · Jason Andryuk

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-cpu implementation used by qtest.

---
 accel/dummy/meson.build |  1 +
 accel/xen/xen-all.c     | 10 ++++++++++
 2 files changed, 11 insertions(+)
accel/dummy/meson.build +1 -0
index 5fbe27de90..cdff0ba746 100644
@@ -4,3 +4,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)
accel/xen/xen-all.c +0 -0
index 60b971d0a8..2d243c58d4 100644
@@ -16,12 +16,15 @@
 #include "hw/xen/xen_pt.h"

accel/xen/xen-all.c line 26

Quoted 10 lines
accel/xen/xen-all.c +2 -0
 #include "chardev/char.h"
 #include "sysemu/accel.h"
+#include "sysemu/cpus.h"
 #include "sysemu/xen.h"
 #include "sysemu/runstate.h"
 #include "migration/misc.h"
 #include "migration/global_state.h"
 #include "hw/boards.h"
 
+#include "accel/dummy/dummy-cpus.h"

it seems this should be in includes/sysemu/accel.h or so.

Quoted 17 lines
accel/xen/xen-all.c +5 -0
+
 //#define DEBUG_XEN
 
 #ifdef DEBUG_XEN
@@ -153,6 +156,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);

accel/xen/xen-all.c static int xen_init(MachineState *ms) · line 195

Quoted 9 lines
accel/xen/xen-all.c +3 -0
@@ -180,6 +187,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;
 }
 

Ciao,

Claudio

Acked-by on the v1 series
#9 lore raw
In reply to Jason Andryuk
Quoted 9 lines · Jason Andryuk

Xen was left behind when CpusAccel became mandatory and fails the assert in qemu_init_vcpu(). It relied on the same dummy cpu threads as qtest. Move the qtest cpu functions to a common location and reuse them for Xen.

Jason Andryuk (2):
accel: move qtest CpusAccel functions to a common location
accel: Add xen CpusAccel using dummy-cpu

Quoted 12 lines
 .../qtest-cpus.c => dummy/dummy-cpus.c}       | 22 +++++--------------
 .../qtest-cpus.h => dummy/dummy-cpus.h}       | 10 ++++-----
 accel/dummy/meson.build                       |  7 ++++++
 accel/meson.build                             |  1 +
 accel/qtest/meson.build                       |  1 -
 accel/qtest/qtest.c                           |  7 +++++-
 accel/xen/xen-all.c                           | 10 +++++++++
 7 files changed, 34 insertions(+), 24 deletions(-)
 rename accel/{qtest/qtest-cpus.c => dummy/dummy-cpus.c} (76%)
 rename accel/{qtest/qtest-cpus.h => dummy/dummy-cpus.h} (59%)
 create mode 100644 accel/dummy/meson.build

Yep, forgot completely, sorry.

#10 lore raw
Quoted 23 lines · Claudio Fontana
Quoted 17 lines · Jason Andryuk

Xen was left behind when CpusAccel became mandatory and fails the assert in qemu_init_vcpu(). It relied on the same dummy cpu threads as qtest. Move the qtest cpu functions to a common location and reuse them for Xen.

Jason Andryuk (2):
accel: move qtest CpusAccel functions to a common location
accel: Add xen CpusAccel using dummy-cpu

  .../qtest-cpus.c => dummy/dummy-cpus.c}       | 22 +++++--------------
  .../qtest-cpus.h => dummy/dummy-cpus.h}       | 10 ++++-----
  accel/dummy/meson.build                       |  7 ++++++
  accel/meson.build                             |  1 +
  accel/qtest/meson.build                       |  1 -
  accel/qtest/qtest.c                           |  7 +++++-
  accel/xen/xen-all.c                           | 10 +++++++++
  7 files changed, 34 insertions(+), 24 deletions(-)
Quoted 4 lines

rename accel/{qtest/qtest-cpus.c => dummy/dummy-cpus.c} (76%) rename accel/{qtest/qtest-cpus.h => dummy/dummy-cpus.h} (59%) create mode 100644 accel/dummy/meson.build

Quoted 1 line

Yep, forgot completely, sorry.

Good opportunity to ask the Xen folks to add testing to our Gitlab CI, so this doesn't happen again :)

Quoted 5 lines