[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 11/17] accel: Move qtest accel registration to qt
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v3 11/17] accel: Move qtest accel registration to qtest.c |
Date: |
Fri, 26 Sep 2014 17:45:26 -0300 |
As qtest_availble() returns 1 only when CONFIG_POSIX is set, keep
setting AccelClass.available to keep current behavior (this is different
from what we did for KVM and Xen).
This also allows us to make qtest_init_accel() static.
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
accel.c | 18 ------------------
include/sysemu/qtest.h | 1 -
qtest.c | 27 ++++++++++++++++++++++++++-
3 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/accel.c b/accel.c
index 2cefbb0..2cf47337 100644
--- a/accel.c
+++ b/accel.c
@@ -132,28 +132,10 @@ static const TypeInfo tcg_accel_type = {
.class_init = tcg_accel_class_init,
};
-static void qtest_accel_class_init(ObjectClass *oc, void *data)
-{
- AccelClass *ac = ACCEL_CLASS(oc);
- ac->name = "QTest";
- ac->available = qtest_available;
- ac->init = qtest_init_accel;
- ac->allowed = &qtest_allowed;
-}
-
-#define TYPE_QTEST_ACCEL ACCEL_CLASS_NAME("qtest")
-
-static const TypeInfo qtest_accel_type = {
- .name = TYPE_QTEST_ACCEL,
- .parent = TYPE_ACCEL,
- .class_init = qtest_accel_class_init,
-};
-
static void register_accel_types(void)
{
type_register_static(&accel_type);
type_register_static(&tcg_accel_type);
- type_register_static(&qtest_accel_type);
}
type_init(register_accel_types);
diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h
index 95c9ade..05473b7 100644
--- a/include/sysemu/qtest.h
+++ b/include/sysemu/qtest.h
@@ -26,7 +26,6 @@ static inline bool qtest_enabled(void)
bool qtest_driver(void);
-int qtest_init_accel(MachineClass *mc);
void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp);
static inline int qtest_available(void)
diff --git a/qtest.c b/qtest.c
index ef0d991..0af8b74 100644
--- a/qtest.c
+++ b/qtest.c
@@ -17,6 +17,7 @@
#include "exec/ioport.h"
#include "exec/memory.h"
#include "hw/irq.h"
+#include "sysemu/accel.h"
#include "sysemu/sysemu.h"
#include "sysemu/cpus.h"
#include "qemu/config-file.h"
@@ -519,7 +520,7 @@ static void configure_qtest_icount(const char *options)
qemu_opts_del(opts);
}
-int qtest_init_accel(MachineClass *mc)
+static int qtest_init_accel(MachineClass *mc)
{
configure_qtest_icount("0");
return 0;
@@ -557,3 +558,27 @@ bool qtest_driver(void)
{
return qtest_chr;
}
+
+static void qtest_accel_class_init(ObjectClass *oc, void *data)
+{
+ AccelClass *ac = ACCEL_CLASS(oc);
+ ac->name = "QTest";
+ ac->available = qtest_available;
+ ac->init = qtest_init_accel;
+ ac->allowed = &qtest_allowed;
+}
+
+#define TYPE_QTEST_ACCEL ACCEL_CLASS_NAME("qtest")
+
+static const TypeInfo qtest_accel_type = {
+ .name = TYPE_QTEST_ACCEL,
+ .parent = TYPE_ACCEL,
+ .class_init = qtest_accel_class_init,
+};
+
+static void qtest_type_init(void)
+{
+ type_register_static(&qtest_accel_type);
+}
+
+type_init(qtest_type_init);
--
1.9.3
- [Qemu-devel] [PATCH v3 01/17] vl.c: Small coding style fix, (continued)
- [Qemu-devel] [PATCH v3 01/17] vl.c: Small coding style fix, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 02/17] accel: Move accel code to accel.c, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 03/17] accel: Create AccelType typedef, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 04/17] accel: Simplify configure_accelerator() using AccelType *acc variable, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 05/17] accel: Move accel name lookup to separate function, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 06/17] accel: Use QOM classes for accel types, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 07/17] accel: Make AccelClass.available() optional, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 08/17] accel: Report unknown accelerator as "not found" instead of "does not exist", Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 09/17] accel: Move KVM accel registration to kvm-all.c, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 10/17] accel: Move Xen registration code to xen-common.c, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 11/17] accel: Move qtest accel registration to qtest.c,
Eduardo Habkost <=
- [Qemu-devel] [PATCH v3 12/17] accel: Remove tcg_available() function, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 13/17] accel: Move accel init/allowed code to separate function, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 14/17] accel: Rename 'init' method to 'init_machine', Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 15/17] accel: Pass MachineState object to accel init functions, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 16/17] accel: Create accel object when initializing machine, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 17/17] kvm: Make KVMState be the TYPE_KVM_ACCEL instance struct, Eduardo Habkost, 2014/09/26
- Re: [Qemu-devel] [PATCH v3 00/17] QOMify accelerator code, Paolo Bonzini, 2014/09/29