Re: [Qemu-devel] [PATCH] machine: replace underscores in machine's property names

[Michael S. Tsirkin]

On Sun, Jun 29, 2014 at 12:09:15PM +0300, Marcel Apfelbaum wrote:
> Replaced '_' with '-' to comply with QOM guidelines.
> Made the conversion from HMP to QMP in vl.c
> 
> Signed-off-by: Marcel Apfelbaum <address@hidden>

Nothing to do with me, pls merge through Andrea's or Paolo's tree.
FWIW

Acked-by: Michael S. Tsirkin <address@hidden>


> ---
>  hw/core/machine.c |  8 ++++----
>  vl.c              | 12 +++++++++++-
>  2 files changed, 15 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index cbba679..7a66c57 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -239,11 +239,11 @@ static void machine_initfn(Object *obj)
>  {
>      object_property_add_str(obj, "accel",
>                              machine_get_accel, machine_set_accel, NULL);
> -    object_property_add_bool(obj, "kernel_irqchip",
> +    object_property_add_bool(obj, "kernel-irqchip",
>                               machine_get_kernel_irqchip,
>                               machine_set_kernel_irqchip,
>                               NULL);
> -    object_property_add(obj, "kvm_shadow_mem", "int",
> +    object_property_add(obj, "kvm-shadow-mem", "int",
>                          machine_get_kvm_shadow_mem,
>                          machine_set_kvm_shadow_mem,
>                          NULL, NULL, NULL);
> @@ -257,11 +257,11 @@ static void machine_initfn(Object *obj)
>                              machine_get_dtb, machine_set_dtb, NULL);
>      object_property_add_str(obj, "dumpdtb",
>                              machine_get_dumpdtb, machine_set_dumpdtb, NULL);
> -    object_property_add(obj, "phandle_start", "int",
> +    object_property_add(obj, "phandle-start", "int",
>                          machine_get_phandle_start,
>                          machine_set_phandle_start,
>                          NULL, NULL, NULL);
> -    object_property_add_str(obj, "dt_compatible",
> +    object_property_add_str(obj, "dt-compatible",
>                              machine_get_dt_compatible,
>                              machine_set_dt_compatible,
>                              NULL);
> diff --git a/vl.c b/vl.c
> index a1686ef..7587c97 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2820,15 +2820,25 @@ static int object_set_property(const char *name, 
> const char *value, void *opaque
>      Object *obj = OBJECT(opaque);
>      StringInputVisitor *siv;
>      Error *local_err = NULL;
> +    char *c, *qom_name;
>  
>      if (strcmp(name, "qom-type") == 0 || strcmp(name, "id") == 0 ||
>          strcmp(name, "type") == 0) {
>          return 0;
>      }
>  
> +    qom_name = g_strdup(name);
> +    c = qom_name;
> +    while (*c++) {
> +        if (*c == '_') {
> +            *c = '-';
> +        }
> +    }
> +
>      siv = string_input_visitor_new(value);
> -    object_property_set(obj, string_input_get_visitor(siv), name, 
> &local_err);
> +    object_property_set(obj, string_input_get_visitor(siv), qom_name, 
> &local_err);
>      string_input_visitor_cleanup(siv);
> +    free(qom_name);
>  
>      if (local_err) {
>          qerror_report_err(local_err);
> -- 
> 1.8.3.1