On Wed, 7 Nov 2018 16:36:44 +0400
Marc-André Lureau <marcandre.lur...@redhat.com> wrote:
> Machine & Accel props are not provided by user. Let's not mix them
> with the global properties.
>
> Call a new helper function object_apply_global_props() during
> device_post_init().
>
> Add a stub for current_machine, so qemu-user and tests can find a
> fallback symbol when linking with QDev.
>
> The following patches is going to reuse object_apply_global_props()
> for qdev globals.
There are several things ongoing here,
1. switching from GlobalProperty to GArray for accel
maybe generalize and reuse SET_MACHINE_COMPAT() there?
SET_MACHINE_COMPAT() -> SET_COMPAT(GArray*, COMPAT)
2. decoupling compat vs globals
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> include/hw/boards.h | 1 -
> include/qom/object.h | 2 ++
> include/sysemu/accel.h | 4 +---
> accel/accel.c | 12 ------------
> hw/core/machine.c | 18 ------------------
> hw/core/qdev.c | 8 ++++++++
> hw/xen/xen-common.c | 9 ++++++++-
> qom/object.c | 25 +++++++++++++++++++++++++
> stubs/machine.c | 4 ++++
> tests/test-qdev-global-props.c | 1 -
> vl.c | 2 --
> stubs/Makefile.objs | 1 +
> 12 files changed, 49 insertions(+), 38 deletions(-)
> create mode 100644 stubs/machine.c
>
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index f82f28468b..c02190fc52 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -69,7 +69,6 @@ int machine_kvm_shadow_mem(MachineState *machine);
> int machine_phandle_start(MachineState *machine);
> bool machine_dump_guest_core(MachineState *machine);
> bool machine_mem_merge(MachineState *machine);
> -void machine_register_compat_props(MachineState *machine);
> HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine);
> void machine_set_cpu_numa_node(MachineState *machine,
> const CpuInstanceProperties *props,
> diff --git a/include/qom/object.h b/include/qom/object.h
> index f0b0bf39cc..e58eeb280f 100644
> --- a/include/qom/object.h
> +++ b/include/qom/object.h
> @@ -679,6 +679,8 @@ Object *object_new_with_propv(const char *typename,
> Error **errp,
> va_list vargs);
>
> +void object_apply_global_props(Object *obj, GArray *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..f4f71134b5 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;
> + GArray *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/machine.c b/hw/core/machine.c
> index da50ad6de7..4444d45945 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -844,24 +844,6 @@ static void machine_class_finalize(ObjectClass *klass,
> void *data)
> g_free(mc->name);
> }
>
> -void machine_register_compat_props(MachineState *machine)
> -{
> - MachineClass *mc = MACHINE_GET_CLASS(machine);
> - int i;
> - GlobalProperty *p;
> -
> - if (!mc->compat_props) {
> - return;
> - }
> -
> - for (i = 0; i < mc->compat_props->len; i++) {
> - p = g_array_index(mc->compat_props, GlobalProperty *, i);
> - /* Machine compat_props must never cause errors: */
> - p->errp = &error_abort;
> - qdev_prop_register_global(p);
> - }
> -}
> -
> static const TypeInfo machine_info = {
> .name = TYPE_MACHINE,
> .parent = TYPE_OBJECT,
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index 6b3cc55b27..30890f2c8d 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -972,6 +972,14 @@ static void device_initfn(Object *obj)
>
> static void device_post_init(Object *obj)
> {
> + if (current_machine) {
> + MachineClass *mc = MACHINE_GET_CLASS(current_machine);
> + AccelClass *ac = ACCEL_GET_CLASS(current_machine->accelerator);
> +
> + object_apply_global_props(obj, mc->compat_props, &error_abort);
> + object_apply_global_props(obj, ac->compat_props, &error_abort);
1. this is order inversion as opposed to register_global_properties(),
but looking at xen_compat_props[] and existing machine compats
it should work fine as they all are using switching off the same properties
so there is no conflict if order is changed but it will change semantics of
AccelClass::global_props that's says that machine compats will override
accel ones.
2. I'd prefer following style:
if (mc->compat_props) {
object_apply_global_props(...);
}
so I don't have to jump inside of object_apply_global_props() to figure out
that it is not if props are NULL
3. I quite dislike using current_machine here. Not sure what to do though
maybe in parallel to global_props create a compat_props registry would be
better:
hw/core/qdev-properties.c:
static GList *global_props;
+ static GList *compat_props;
you won't poison device model with access to higher level object and
there would be no need for a stub.
> + }
> +
> qdev_prop_set_globals(DEVICE(obj));
> }
>
> diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c
> index 6ec14c73ca..d1ef7a53cc 100644
> --- a/hw/xen/xen-common.c
> +++ b/hw/xen/xen-common.c
> @@ -181,11 +181,18 @@ static GlobalProperty xen_compat_props[] = {
> static void xen_accel_class_init(ObjectClass *oc, void *data)
> {
> AccelClass *ac = ACCEL_CLASS(oc);
> + int i;
> +
> ac->name = "Xen";
> 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_array_new(false, false, sizeof(void *));
> + for (i = 0; xen_compat_props[i].driver != NULL; i++) {
> + GlobalProperty *prop = &xen_compat_props[i];
> + g_array_append_val(ac->compat_props, prop);
> + }
> }
>
> #define TYPE_XEN_ACCEL ACCEL_CLASS_NAME("xen")
> diff --git a/qom/object.c b/qom/object.c
> index eb770dbf7f..9acdf9e16d 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -372,6 +372,31 @@ static void object_post_init_with_type(Object *obj,
> TypeImpl *ti)
> }
> }
>
> +void object_apply_global_props(Object *obj, GArray *props, Error **errp)
> +{
> + Error *err = NULL;
> + int i;
> +
> + if (!props) {
> + return;
> + }
> +
> + for (i = 0; i < props->len; i++) {
> + GlobalProperty *p = g_array_index(props, GlobalProperty *, 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/stubs/machine.c b/stubs/machine.c
> new file mode 100644
> index 0000000000..51d40fd677
> --- /dev/null
> +++ b/stubs/machine.c
> @@ -0,0 +1,4 @@
> +#include "qemu/osdep.h"
> +#include "qemu-common.h"
> +
> +MachineClass *current_machine;
> diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c
> index b1eb505442..3a8d3170a0 100644
> --- a/tests/test-qdev-global-props.c
> +++ b/tests/test-qdev-global-props.c
> @@ -28,7 +28,6 @@
> #include "qom/object.h"
> #include "qapi/visitor.h"
>
> -
unrelated change
> #define TYPE_STATIC_PROPS "static_prop_type"
> #define STATIC_TYPE(obj) \
> OBJECT_CHECK(MyType, (obj), TYPE_STATIC_PROPS)
> diff --git a/vl.c b/vl.c
> index 55bab005b6..2aea884c9d 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2963,8 +2963,6 @@ static void user_register_global_props(void)
> */
> static void register_global_properties(MachineState *ms)
> {
> - accel_register_compat_props(ms->accelerator);
> - machine_register_compat_props(ms);
> user_register_global_props();
> }
>
> diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
> index 5dd0aeeec6..6ce33ae46f 100644
> --- a/stubs/Makefile.objs
> +++ b/stubs/Makefile.objs
> @@ -18,6 +18,7 @@ stub-obj-y += iothread-lock.o
> stub-obj-y += is-daemonized.o
> stub-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
> stub-obj-y += machine-init-done.o
> +stub-obj-y += machine.o
> stub-obj-y += migr-blocker.o
> stub-obj-y += change-state-handler.o
> stub-obj-y += monitor.o
