[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 09/25] accel: Move Xen registration code to xen-common
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC 09/25] accel: Move Xen registration code to xen-common.c |
Date: |
Wed, 9 Jul 2014 19:04:06 -0300 |
Note that this has an user-visible side-effect: instead of reporting
"Xen is not supported for this target", QEMU binaries not supporting Xen
will report "xen accelerator does not exist".
As xen_available() always return 1 when CONFIG_XEN is enabled, we don't
need to set AccelClass.available anymore. xen_enabled() is not being is
not being removed yet, only because vl.c is still using it.
This also allows us to make xen_init() static.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/core/accel.c | 18 ------------------
include/hw/xen/xen.h | 1 -
xen-common-stub.c | 6 ------
xen-common.c | 25 ++++++++++++++++++++++++-
4 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/hw/core/accel.c b/hw/core/accel.c
index 2226c17..34995fd 100644
--- a/hw/core/accel.c
+++ b/hw/core/accel.c
@@ -132,23 +132,6 @@ static const TypeInfo tcg_accel_type = {
.class_init = tcg_accel_class_init,
};
-static void xen_accel_class_init(ObjectClass *oc, void *data)
-{
- AccelClass *ac = ACCEL_CLASS(oc);
- ac->name = "Xen";
- ac->available = xen_available;
- ac->init = xen_init;
- ac->allowed = &xen_allowed;
-}
-
-#define TYPE_XEN_ACCEL "xen-accel"
-
-static const TypeInfo xen_accel_type = {
- .name = TYPE_XEN_ACCEL,
- .parent = TYPE_ACCEL,
- .class_init = xen_accel_class_init,
-};
-
static void qtest_accel_class_init(ObjectClass *oc, void *data)
{
AccelClass *ac = ACCEL_CLASS(oc);
@@ -170,7 +153,6 @@ static void register_accel_types(void)
{
type_register_static(&accel_type);
type_register_static(&tcg_accel_type);
- type_register_static(&xen_accel_type);
type_register_static(&qtest_accel_type);
}
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index f71f2d8..b0ed04c 100644
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -36,7 +36,6 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level);
qemu_irq *xen_interrupt_controller_init(void);
-int xen_init(MachineClass *mc);
void xenstore_store_pv_console_info(int i, struct CharDriverState *chr);
#if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY)
diff --git a/xen-common-stub.c b/xen-common-stub.c
index bd56ca2..906f991 100644
--- a/xen-common-stub.c
+++ b/xen-common-stub.c
@@ -11,9 +11,3 @@
void xenstore_store_pv_console_info(int i, CharDriverState *chr)
{
}
-
-int xen_init(MachineClass *mc)
-{
- return -ENOSYS;
-}
-
diff --git a/xen-common.c b/xen-common.c
index f07b35e..ef853f6 100644
--- a/xen-common.c
+++ b/xen-common.c
@@ -9,6 +9,7 @@
*/
#include "hw/xen/xen_backend.h"
+#include "hw/accel.h"
#include "qmp-commands.h"
#include "sysemu/char.h"
@@ -109,7 +110,7 @@ static void xen_change_state_handler(void *opaque, int
running,
}
}
-int xen_init(MachineClass *mc)
+static int xen_init(MachineClass *mc)
{
xen_xc = xen_xc_interface_open(0, 0, 0);
if (xen_xc == XC_HANDLER_INITIAL_VALUE) {
@@ -121,3 +122,25 @@ int xen_init(MachineClass *mc)
return 0;
}
+static void xen_accel_class_init(ObjectClass *oc, void *data)
+{
+ AccelClass *ac = ACCEL_CLASS(oc);
+ ac->name = "Xen";
+ ac->init = xen_init;
+ ac->allowed = &xen_allowed;
+}
+
+#define TYPE_XEN_ACCEL "xen-accel"
+
+static const TypeInfo xen_accel_type = {
+ .name = TYPE_XEN_ACCEL,
+ .parent = TYPE_ACCEL,
+ .class_init = xen_accel_class_init,
+};
+
+static void xen_type_init(void)
+{
+ type_register_static(&xen_accel_type);
+}
+
+type_init(xen_type_init);
--
1.9.3
- [Qemu-devel] [RFC 00/25] QOMify accelerator code, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 01/25] vl.c: Small coding style fix, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 03/25] accel: Create struct AccelType, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 02/25] accel: Move accel code to accel.c, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 05/25] accel: Move accel name lookup to separate function, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 04/25] accel: Simplify configure_accelerator() using AccelType *acc variable, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 06/25] accel: Use QOM classes for accel types, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 07/25] accel: Make AccelClass.available() optional, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 08/25] accel: Move KVM accel registration to kvm-all.c, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 09/25] accel: Move Xen registration code to xen-common.c,
Eduardo Habkost <=
- [Qemu-devel] [RFC 10/25] accel: Move qtest accel registration to qtest.c, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 11/25] accel: Remove tcg_available() function, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 13/25] accel: Rename 'init' method to 'init_machine', Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 14/25] accel: Pass MachineState object to accel init functions, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 12/25] accel: Move accel init/allowed code to separate function, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 16/25] accel: Save AccelState on MachineState when initializing, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 15/25] accel: Create accel object when initializing machine, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 17/25] kvm: Make KVMState be the TYPE_KVM_ACCEL instance struct, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 20/25] accel: TYPE_X86_ACCEL interface, Eduardo Habkost, 2014/07/09
- [Qemu-devel] [RFC 24/25] target-i386: Accept "host" as value for CPU vendor, Eduardo Habkost, 2014/07/09