Re: [Qemu-devel] [PATCH v3 01/13] machine: export register_compat_prop()

[Laurent Vivier]

On 19/06/2017 14:49, Peter Xu wrote:
> We have HW_COMPAT_*, however that's only binded to machines, not other
> things (like accelerators).  Behind it, it was register_compat_prop()
> that played the trick.  Let's export the function for further use
> outside HW_COMPAT_* magic.
> 
> Meanwhile, move it to qdev-properties.c where seems more proper.
> Refactor it a bit to provide global_prop_list_add() for further
> use (will use it in cases where we need a GlobalProperty list).
> 
> CC: Eduardo Habkost <address@hidden>
> CC: Markus Armbruster <address@hidden>
> CC: Marcel Apfelbaum <address@hidden>
> Signed-off-by: Peter Xu <address@hidden>

Reviewed-by: Laurent Vivier <address@hidden>

> ---
>  accel.c                      |  1 +
>  hw/core/machine.c            | 14 +-------------
>  hw/core/qdev-properties.c    | 22 ++++++++++++++++++++++
>  include/hw/qdev-properties.h |  5 +++++
>  4 files changed, 29 insertions(+), 13 deletions(-)
> 
> diff --git a/accel.c b/accel.c
> index 664bb88..62edd29 100644
> --- a/accel.c
> +++ b/accel.c
> @@ -26,6 +26,7 @@
>  #include "qemu/osdep.h"
>  #include "sysemu/accel.h"
>  #include "hw/boards.h"
> +#include "hw/qdev-properties.h"
>  #include "qemu-common.h"
>  #include "sysemu/arch_init.h"
>  #include "sysemu/sysemu.h"
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 2e7e977..b4b3449 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -16,6 +16,7 @@
>  #include "qapi-visit.h"
>  #include "qapi/visitor.h"
>  #include "hw/sysbus.h"
> +#include "hw/qdev-properties.h"
>  #include "sysemu/sysemu.h"
>  #include "sysemu/numa.h"
>  #include "qemu/error-report.h"
> @@ -770,19 +771,6 @@ static void machine_class_finalize(ObjectClass *klass, 
> void *data)
>      g_free(mc->name);
>  }
>  
> -static void register_compat_prop(const char *driver,
> -                                 const char *property,
> -                                 const char *value)
> -{
> -    GlobalProperty *p = g_new0(GlobalProperty, 1);
> -    /* Machine compat_props must never cause errors: */
> -    p->errp = &error_abort;
> -    p->driver = driver;
> -    p->property = property;
> -    p->value = value;
> -    qdev_prop_register_global(p);
> -}
> -
>  static void machine_register_compat_for_subclass(ObjectClass *oc, void 
> *opaque)
>  {
>      GlobalProperty *p = opaque;
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index 9f1a497..4b74382 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -1042,6 +1042,28 @@ void qdev_prop_set_ptr(DeviceState *dev, const char 
> *name, void *value)
>  
>  static GList *global_props;
>  
> +GList *global_prop_list_add(GList *list, const char *driver,
> +                            const char *property, const char *value)
> +{
> +    GlobalProperty *p = g_new0(GlobalProperty, 1);
> +
> +    /* These properties cannot fail the apply */
> +    p->errp = &error_abort;
> +    p->driver = driver;
> +    p->property = property;
> +    p->value = value;
> +
> +    return g_list_append(list, p);
> +}
> +
> +void register_compat_prop(const char *driver,
> +                          const char *property,
> +                          const char *value)
> +{
> +    global_props = global_prop_list_add(global_props, driver,
> +                                        property, value);
> +}
> +
>  void qdev_prop_register_global(GlobalProperty *prop)
>  {
>      global_props = g_list_append(global_props, prop);
> diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
> index d206fc9..15ee6ba 100644
> --- a/include/hw/qdev-properties.h
> +++ b/include/hw/qdev-properties.h
> @@ -201,6 +201,11 @@ void qdev_prop_set_globals(DeviceState *dev);
>  void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev,
>                                      Property *prop, const char *value);
>  
> +GList *global_prop_list_add(GList *list, const char *driver,
> +                            const char *property, const char *value);
> +void register_compat_prop(const char *driver, const char *property,
> +                          const char *value);
> +
>  /**
>   * qdev_property_add_static:
>   * @dev: Device to add the property to.
>