Re: [Qemu-devel] [RFC PATCH v2 01/12] pc: make smbus configurable

[Eduardo Habkost]

On Thu, Aug 25, 2016 at 06:14:54AM -0400, Chao Peng wrote:
> Signed-off-by: Chao Peng <address@hidden>
> ---
>  hw/i386/pc.c         | 23 +++++++++++++++++++++++
>  hw/i386/pc_q35.c     | 12 +++++++-----
>  include/hw/i386/pc.h |  3 +++
>  3 files changed, 33 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 022dd1b..66e1961 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -2005,6 +2005,27 @@ static HotplugHandler 
> *pc_get_hotpug_handler(MachineState *machine,
>          pcmc->get_hotplug_handler(machine, dev) : NULL;
>  }
>  
> +static void pc_machine_get_prop_bool(Object *obj, Visitor *v, const char 
> *name,
> +                                     void *opaque, Error **errp)
> +{
> +    bool value = *(bool *)opaque;
> +
> +    visit_type_bool(v, name, &value, errp);
> +}
> +
> +static void pc_machine_set_prop_bool(Object *obj, Visitor *v, const char 
> *name,
> +                                     void *opaque, Error **errp)
> +{
> +    visit_type_bool(v, name, (bool *)opaque, errp);
> +}
> +
> +#define PC_MACHINE_DEFINE_PROP_BOOL(pcms, prop, field, defval)      \
> +        pcms->field = defval;                                       \
> +        object_property_add(OBJECT(pcms), prop, "bool",             \
> +                            pc_machine_get_prop_bool,               \
> +                            pc_machine_set_prop_bool,               \
> +                            NULL, &pcms->field, &error_abort);

This is triggers checkpatch.pl error:

ERROR: Macros with multiple statements should be enclosed in a do - while loop
#76: FILE: hw/i386/pc.c:2022:
+#define PC_MACHINE_DEFINE_PROP_BOOL(pcms, prop, field, defval)      \
+        pcms->field = defval;                                       \
+        object_property_add(OBJECT(pcms), prop, "bool",             \
+                            pc_machine_get_prop_bool,               \
+                            pc_machine_set_prop_bool,               \
+                            NULL, &pcms->field, &error_abort);


> +
>  static void
>  pc_machine_get_hotplug_memory_region_size(Object *obj, Visitor *v,
>                                            const char *name, void *opaque,
> @@ -2168,6 +2189,8 @@ static void pc_machine_initfn(Object *obj)
>      pcms->acpi_nvdimm_state.is_enabled = false;
>      object_property_add_bool(obj, PC_MACHINE_NVDIMM, pc_machine_get_nvdimm,
>                               pc_machine_set_nvdimm, &error_abort);
> +
> +    PC_MACHINE_DEFINE_PROP_BOOL(pcms, PC_MACHINE_SMBUS, smbus, true);

I suggest using object_class_property_add_bool() and registering
properties at class_init.

>  }
>  
[...]

-- 
Eduardo