diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2019-04-22 18:04:47 -0300 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2019-05-02 16:56:33 +0200 |
| commit | a08052bc248632f8c16ef0c5b93e0611543e89cc (patch) | |
| tree | a2ed5414c8c870cb3eb93f6d4a53a8e247866877 | |
| parent | 3fe13fe16e2147ccbab037ace60e2bd3831094fd (diff) | |
| download | qemu-a08052bc248632f8c16ef0c5b93e0611543e89cc.zip qemu-a08052bc248632f8c16ef0c5b93e0611543e89cc.tar.gz qemu-a08052bc248632f8c16ef0c5b93e0611543e89cc.tar.bz2 | |
qtest: Don't compile qtest accel on non-POSIX systems
qtest_available() will always return 0 on non-POSIX systems.
It's simpler to just not compile the accelerator code on those
systems instead of relying on the AccelClass::available function.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20190422210448.2488-3-ehabkost@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> [on mingw64]
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | accel/Makefile.objs | 2 | ||||
| -rw-r--r-- | accel/qtest.c | 1 | ||||
| -rw-r--r-- | include/sysemu/qtest.h | 9 |
3 files changed, 1 insertions, 11 deletions
diff --git a/accel/Makefile.objs b/accel/Makefile.objs index 2a5ed46..8b498d3 100644 --- a/accel/Makefile.objs +++ b/accel/Makefile.objs @@ -1,5 +1,5 @@ obj-$(CONFIG_SOFTMMU) += accel.o -obj-$(CONFIG_SOFTMMU) += qtest.o +obj-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_POSIX)) += qtest.o obj-$(CONFIG_KVM) += kvm/ obj-$(CONFIG_TCG) += tcg/ obj-y += stubs/ diff --git a/accel/qtest.c b/accel/qtest.c index a02b3c2..5b88f55 100644 --- a/accel/qtest.c +++ b/accel/qtest.c @@ -34,7 +34,6 @@ static void qtest_accel_class_init(ObjectClass *oc, void *data) { AccelClass *ac = ACCEL_CLASS(oc); ac->name = "QTest"; - ac->available = qtest_available; ac->init_machine = qtest_init_accel; ac->allowed = &qtest_allowed; } diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h index 70aa40a..096ddfc 100644 --- a/include/sysemu/qtest.h +++ b/include/sysemu/qtest.h @@ -27,13 +27,4 @@ bool qtest_driver(void); void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp); -static inline int qtest_available(void) -{ -#ifdef CONFIG_POSIX - return 1; -#else - return 0; -#endif -} - #endif |