[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-3.2 v4 15/28] hw: apply accel compat properties
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH for-3.2 v4 15/28] hw: apply accel compat properties without touching globals |
Date: |
Tue, 27 Nov 2018 13:27:48 +0400 |
Introduce object_apply_global_props() function, to apply compatibility
properties from a GPtrArray.
For accel compatibility properties, apply them during
device_post_init(), after accel_register_compat_props() has set them.
To populate the compatibility properties, introduce SET_COMPAT(), a
more generic version of SET_MACHINE_COMPAT() that can set compat
properties on other objects than Machine, and using GPtrArray.
Signed-off-by: Marc-André Lureau <address@hidden>
---
include/hw/qdev-core.h | 13 +++++++++++++
include/qom/object.h | 3 +++
include/sysemu/accel.h | 4 +---
accel/accel.c | 12 ------------
hw/core/qdev.c | 11 +++++++++++
hw/xen/xen-common.c | 38 +++++++++++++++++++-------------------
qom/object.c | 25 +++++++++++++++++++++++++
vl.c | 2 +-
8 files changed, 73 insertions(+), 35 deletions(-)
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index a24d0dd566..82afd3c50d 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -267,6 +267,19 @@ typedef struct GlobalProperty {
Error **errp;
} GlobalProperty;
+#define SET_COMPAT(S, COMPAT) \
+ do { \
+ int i; \
+ static GlobalProperty props[] = { \
+ COMPAT \
+ }; \
+ for (i = 0; i < G_N_ELEMENTS(props); i++) { \
+ g_ptr_array_add((S)->compat_props, (void *)&props[i]); \
+ } \
+ } while (0)
+
+void accel_register_compat_props(const GPtrArray *props);
+
/*** Board API. This should go away once we have a machine config file. ***/
DeviceState *qdev_create(BusState *bus, const char *name);
diff --git a/include/qom/object.h b/include/qom/object.h
index 0139838b69..5183c587f3 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -676,6 +676,9 @@ Object *object_new_with_propv(const char *typename,
Error **errp,
va_list vargs);
+void object_apply_global_props(Object *obj, const GPtrArray *props,
+ Error **errp);
+
/**
* object_set_props:
* @obj: the object instance to set properties on
diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h
index 637358f430..f331d128e9 100644
--- a/include/sysemu/accel.h
+++ b/include/sysemu/accel.h
@@ -49,7 +49,7 @@ typedef struct AccelClass {
* global properties may be overridden by machine-type
* compat_props or user-provided global properties.
*/
- GlobalProperty *global_props;
+ GPtrArray *compat_props;
} AccelClass;
#define TYPE_ACCEL "accel"
@@ -67,8 +67,6 @@ typedef struct AccelClass {
extern unsigned long tcg_tb_size;
void configure_accelerator(MachineState *ms);
-/* Register accelerator specific global properties */
-void accel_register_compat_props(AccelState *accel);
/* Called just before os_setup_post (ie just before drop OS privs) */
void accel_setup_post(MachineState *ms);
diff --git a/accel/accel.c b/accel/accel.c
index 3da26eb90f..6db5d8f4df 100644
--- a/accel/accel.c
+++ b/accel/accel.c
@@ -119,18 +119,6 @@ void configure_accelerator(MachineState *ms)
}
}
-void accel_register_compat_props(AccelState *accel)
-{
- AccelClass *class = ACCEL_GET_CLASS(accel);
- GlobalProperty *prop = class->global_props;
-
- for (; prop && prop->driver; prop++) {
- /* Any compat_props must never cause error */
- prop->errp = &error_abort;
- qdev_prop_register_global(prop);
- }
-}
-
void accel_setup_post(MachineState *ms)
{
AccelState *accel = ms->accelerator;
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 6b3cc55b27..7066d28271 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -970,8 +970,19 @@ static void device_initfn(Object *obj)
QLIST_INIT(&dev->gpios);
}
+static const GPtrArray *ac_compat_props;
+
+void accel_register_compat_props(const GPtrArray *props)
+{
+ ac_compat_props = props;
+}
+
static void device_post_init(Object *obj)
{
+ if (ac_compat_props) {
+ object_apply_global_props(obj, ac_compat_props, &error_abort);
+ }
+
qdev_prop_set_globals(DEVICE(obj));
}
diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c
index 6ec14c73ca..4da0292b61 100644
--- a/hw/xen/xen-common.c
+++ b/hw/xen/xen-common.c
@@ -159,24 +159,22 @@ static int xen_init(MachineState *ms)
return 0;
}
-static GlobalProperty xen_compat_props[] = {
- {
- .driver = "migration",
- .property = "store-global-state",
- .value = "off",
- },
- {
- .driver = "migration",
- .property = "send-configuration",
- .value = "off",
- },
- {
- .driver = "migration",
- .property = "send-section-footer",
- .value = "off",
- },
- { /* end of list */ },
-};
+#define XEN_COMPAT \
+ { \
+ .driver = "migration", \
+ .property = "store-global-state", \
+ .value = "off", \
+ }, \
+ { \
+ .driver = "migration", \
+ .property = "send-configuration", \
+ .value = "off", \
+ }, \
+ { \
+ .driver = "migration", \
+ .property = "send-section-footer", \
+ .value = "off", \
+ }
static void xen_accel_class_init(ObjectClass *oc, void *data)
{
@@ -185,7 +183,9 @@ static void xen_accel_class_init(ObjectClass *oc, void
*data)
ac->init_machine = xen_init;
ac->setup_post = xen_setup_post;
ac->allowed = &xen_allowed;
- ac->global_props = xen_compat_props;
+ ac->compat_props = g_ptr_array_new();
+
+ SET_COMPAT(ac, XEN_COMPAT);
}
#define TYPE_XEN_ACCEL ACCEL_CLASS_NAME("xen")
diff --git a/qom/object.c b/qom/object.c
index 17921c0a71..dbdab0aead 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -370,6 +370,31 @@ static void object_post_init_with_type(Object *obj,
TypeImpl *ti)
}
}
+void object_apply_global_props(Object *obj, const GPtrArray *props, Error
**errp)
+{
+ Error *err = NULL;
+ int i;
+
+ if (!props) {
+ return;
+ }
+
+ for (i = 0; i < props->len; i++) {
+ GlobalProperty *p = g_ptr_array_index(props, i);
+
+ if (object_dynamic_cast(obj, p->driver) == NULL) {
+ continue;
+ }
+ p->used = true;
+ object_property_parse(obj, p->value, p->property, &err);
+ if (err != NULL) {
+ error_prepend(&err, "can't apply global %s.%s=%s: ",
+ p->driver, p->property, p->value);
+ error_propagate(errp, err);
+ }
+ }
+}
+
static void object_initialize_with_type(void *data, size_t size, TypeImpl
*type)
{
Object *obj = data;
diff --git a/vl.c b/vl.c
index fa25d1ae2d..c06e94271c 100644
--- a/vl.c
+++ b/vl.c
@@ -2963,7 +2963,7 @@ static void user_register_global_props(void)
*/
static void register_global_properties(MachineState *ms)
{
- accel_register_compat_props(ms->accelerator);
+
accel_register_compat_props(ACCEL_GET_CLASS(ms->accelerator)->compat_props);
machine_register_compat_props(ms);
user_register_global_props();
}
--
2.20.0.rc1
- [Qemu-devel] [PATCH for-3.2 v4 10/28] qom: make interface types abstract, (continued)
- [Qemu-devel] [PATCH for-3.2 v4 10/28] qom: make interface types abstract, Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 11/28] qom: make user_creatable_complete() specific to UserCreatable, Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 12/28] accel: register global_props like machine globals, Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 13/28] qdev: move qdev_prop_register_global_list() to tests, Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 14/28] qom: remove unimplemented class_finalize, Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 15/28] hw: apply accel compat properties without touching globals,
Marc-André Lureau <=
- Re: [Qemu-devel] [PATCH for-3.2 v4 15/28] hw: apply accel compat properties without touching globals, Igor Mammedov, 2018/11/28
- [Qemu-devel] [PATCH for-3.2 v4 17/28] hw: remove SET_MACHINE_COMPAT, Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 16/28] hw: apply machine compat properties without touching globals, Marc-André Lureau, 2018/11/27