On Mon, Oct 12, 2020 at 4:23 PM Claudio Fontana <cfont...@suse.de> wrote: > > On 10/12/20 10:07 PM, Jason Andryuk wrote: > > Move and rename accel/qtest/qtest-cpu.* files to accel/dummy/ so they > > can be re-used by Xen. > > > > Signed-off-by: Jason Andryuk <jandr...@gmail.com> > > --- > > .../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 > > > > diff --git a/accel/qtest/qtest-cpus.c b/accel/dummy/dummy-cpus.c > > similarity index 76% > > rename from accel/qtest/qtest-cpus.c > > rename to accel/dummy/dummy-cpus.c > > index 7c5399ed9d..efade99f03 100644 > > --- a/accel/qtest/qtest-cpus.c > > +++ b/accel/dummy/dummy-cpus.c > > @@ -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"); > > I wonder if this should be changed to "dummy cpu thread is not supported > under Windows". > > Does not matter probably.
I left it since I was just moving the file. But... > > diff --git a/accel/dummy/meson.build b/accel/dummy/meson.build > > new file mode 100644 > > index 0000000000..5fbe27de90 > > --- /dev/null > > +++ b/accel/dummy/meson.build > > @@ -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