| Message ID | 20190422210448.2488-3-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Remove AccelClass::available field | expand |
On 4/22/19 11:04 PM, Eduardo Habkost wrote: > 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> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> mingw64: Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > include/sysemu/qtest.h | 9 --------- > accel/qtest.c | 1 - > accel/Makefile.objs | 2 +- > 3 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h > index 70aa40aa72..096ddfc20c 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 > diff --git a/accel/qtest.c b/accel/qtest.c > index a02b3c26c7..5b88f55921 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/accel/Makefile.objs b/accel/Makefile.objs > index 2a5ed46940..8b498d39d8 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/ >
On 22/04/2019 23.04, Eduardo Habkost wrote: > 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> > --- > include/sysemu/qtest.h | 9 --------- > accel/qtest.c | 1 - > accel/Makefile.objs | 2 +- > 3 files changed, 1 insertion(+), 11 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h index 70aa40aa72..096ddfc20c 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 diff --git a/accel/qtest.c b/accel/qtest.c index a02b3c26c7..5b88f55921 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/accel/Makefile.objs b/accel/Makefile.objs index 2a5ed46940..8b498d39d8 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/
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> --- include/sysemu/qtest.h | 9 --------- accel/qtest.c | 1 - accel/Makefile.objs | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-)