Commit d7bce999 authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

qom: Swap 'name' next to visitor in ObjectPropertyAccessor 



Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.

Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).

    @ rule1 @
    identifier fn;
    typedef Object, Visitor, Error;
    identifier obj, v, opaque, name, errp;
    @@
     void fn
    - (Object *obj, Visitor *v, void *opaque, const char *name,
    + (Object *obj, Visitor *v, const char *name, void *opaque,
       Error **errp) { ... }

    @@
    identifier rule1.fn;
    expression obj, v, opaque, name, errp;
    @@
     fn(obj, v,
    -   opaque, name,
    +   name, opaque,
        errp)

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 51e72bc1

backends/hostmem.c

+8 −8
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ QEMU_BUILD_BUG_ON(HOST_MEM_POLICY_INTERLEAVE != MPOL_INTERLEAVE); 
#endif



static void

host_memory_backend_get_size(Object *obj, Visitor *v, void *opaque,

                             const char *name, Error **errp)

host_memory_backend_get_size(Object *obj, Visitor *v, const char *name,

                             void *opaque, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    uint64_t value = backend->size;
@@ -37,8 +37,8 @@ host_memory_backend_get_size(Object *obj, Visitor *v, void *opaque, 
}



static void

host_memory_backend_set_size(Object *obj, Visitor *v, void *opaque,

                             const char *name, Error **errp)

host_memory_backend_set_size(Object *obj, Visitor *v, const char *name,

                             void *opaque, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    Error *local_err = NULL;
@@ -64,8 +64,8 @@ out: 
}



static void

host_memory_backend_get_host_nodes(Object *obj, Visitor *v, void *opaque,

                                   const char *name, Error **errp)

host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name,

                                   void *opaque, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    uint16List *host_nodes = NULL;
@@ -96,8 +96,8 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, void *opaque, 
}



static void

host_memory_backend_set_host_nodes(Object *obj, Visitor *v, void *opaque,

                                   const char *name, Error **errp)

host_memory_backend_set_host_nodes(Object *obj, Visitor *v, const char *name,

                                   void *opaque, Error **errp)

{

#ifdef CONFIG_NUMA

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

bootdevice.c

+4 −4
Original line number Diff line number Diff line
@@ -271,15 +271,15 @@ typedef struct { 
    DeviceState *dev;

} BootIndexProperty;



static void device_get_bootindex(Object *obj, Visitor *v, void *opaque,

                                 const char *name, Error **errp)

static void device_get_bootindex(Object *obj, Visitor *v, const char *name,

                                 void *opaque, Error **errp)

{

    BootIndexProperty *prop = opaque;

    visit_type_int32(v, name, prop->bootindex, errp);

}



static void device_set_bootindex(Object *obj, Visitor *v, void *opaque,

                                 const char *name, Error **errp)

static void device_set_bootindex(Object *obj, Visitor *v, const char *name,

                                 void *opaque, Error **errp)

{

    BootIndexProperty *prop = opaque;

    int32_t boot_index;

hw/acpi/ich9.c

+14 −21
Original line number Diff line number Diff line
@@ -283,9 +283,8 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, 
    }

}



static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v,

                                 void *opaque, const char *name,

                                 Error **errp)

static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v, const char *name,

                                 void *opaque, Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    uint32_t value = pm->pm_io_base + ICH9_PMIO_GPE0_STS;
@@ -308,9 +307,8 @@ static void ich9_pm_set_memory_hotplug_support(Object *obj, bool value, 
    s->pm.acpi_memory_hotplug.is_enabled = value;

}



static void ich9_pm_get_disable_s3(Object *obj, Visitor *v,

                                   void *opaque, const char *name,

                                   Error **errp)

static void ich9_pm_get_disable_s3(Object *obj, Visitor *v, const char *name,

                                   void *opaque, Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    uint8_t value = pm->disable_s3;
@@ -318,9 +316,8 @@ static void ich9_pm_get_disable_s3(Object *obj, Visitor *v, 
    visit_type_uint8(v, name, &value, errp);

}



static void ich9_pm_set_disable_s3(Object *obj, Visitor *v,

                                   void *opaque, const char *name,

                                   Error **errp)

static void ich9_pm_set_disable_s3(Object *obj, Visitor *v, const char *name,

                                   void *opaque, Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    Error *local_err = NULL;
@@ -335,9 +332,8 @@ out: 
    error_propagate(errp, local_err);

}



static void ich9_pm_get_disable_s4(Object *obj, Visitor *v,

                                   void *opaque, const char *name,

                                   Error **errp)

static void ich9_pm_get_disable_s4(Object *obj, Visitor *v, const char *name,

                                   void *opaque, Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    uint8_t value = pm->disable_s4;
@@ -345,9 +341,8 @@ static void ich9_pm_get_disable_s4(Object *obj, Visitor *v, 
    visit_type_uint8(v, name, &value, errp);

}



static void ich9_pm_set_disable_s4(Object *obj, Visitor *v,

                                   void *opaque, const char *name,

                                   Error **errp)

static void ich9_pm_set_disable_s4(Object *obj, Visitor *v, const char *name,

                                   void *opaque, Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    Error *local_err = NULL;
@@ -362,9 +357,8 @@ out: 
    error_propagate(errp, local_err);

}



static void ich9_pm_get_s4_val(Object *obj, Visitor *v,

                               void *opaque, const char *name,

                               Error **errp)

static void ich9_pm_get_s4_val(Object *obj, Visitor *v, const char *name,

                               void *opaque, Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    uint8_t value = pm->s4_val;
@@ -372,9 +366,8 @@ static void ich9_pm_get_s4_val(Object *obj, Visitor *v, 
    visit_type_uint8(v, name, &value, errp);

}



static void ich9_pm_set_s4_val(Object *obj, Visitor *v,

                               void *opaque, const char *name,

                               Error **errp)

static void ich9_pm_set_s4_val(Object *obj, Visitor *v, const char *name,

                               void *opaque, Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    Error *local_err = NULL;

hw/core/machine.c

+7 −7
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static void machine_set_accel(Object *obj, const char *value, Error **errp) 
}



static void machine_set_kernel_irqchip(Object *obj, Visitor *v,

                                       void *opaque, const char *name,

                                       const char *name, void *opaque,

                                       Error **errp)

{

    Error *err = NULL;
@@ -69,7 +69,7 @@ static void machine_set_kernel_irqchip(Object *obj, Visitor *v, 
}



static void machine_get_kvm_shadow_mem(Object *obj, Visitor *v,

                                       void *opaque, const char *name,

                                       const char *name, void *opaque,

                                       Error **errp)

{

    MachineState *ms = MACHINE(obj);
@@ -79,7 +79,7 @@ static void machine_get_kvm_shadow_mem(Object *obj, Visitor *v, 
}



static void machine_set_kvm_shadow_mem(Object *obj, Visitor *v,

                                       void *opaque, const char *name,

                                       const char *name, void *opaque,

                                       Error **errp)

{

    MachineState *ms = MACHINE(obj);
@@ -171,7 +171,7 @@ static void machine_set_dumpdtb(Object *obj, const char *value, Error **errp) 
}



static void machine_get_phandle_start(Object *obj, Visitor *v,

                                       void *opaque, const char *name,

                                      const char *name, void *opaque,

                                      Error **errp)

{

    MachineState *ms = MACHINE(obj);
@@ -181,7 +181,7 @@ static void machine_get_phandle_start(Object *obj, Visitor *v, 
}



static void machine_set_phandle_start(Object *obj, Visitor *v,

                                       void *opaque, const char *name,

                                      const char *name, void *opaque,

                                      Error **errp)

{

    MachineState *ms = MACHINE(obj);

hw/core/qdev-properties-system.c

+16 −16
Original line number Diff line number Diff line
@@ -112,14 +112,14 @@ static char *print_drive(void *ptr) 
    return g_strdup(blk_name(ptr));

}



static void get_drive(Object *obj, Visitor *v, void *opaque,

                      const char *name, Error **errp)

static void get_drive(Object *obj, Visitor *v, const char *name, void *opaque,

                      Error **errp)

{

    get_pointer(obj, v, opaque, print_drive, name, errp);

}



static void set_drive(Object *obj, Visitor *v, void *opaque,

                      const char *name, Error **errp)

static void set_drive(Object *obj, Visitor *v, const char *name, void *opaque,

                      Error **errp)

{

    set_pointer(obj, v, opaque, parse_drive, name, errp);

}
@@ -173,14 +173,14 @@ static char *print_chr(void *ptr) 
    return g_strdup(val);

}



static void get_chr(Object *obj, Visitor *v, void *opaque,

                    const char *name, Error **errp)

static void get_chr(Object *obj, Visitor *v, const char *name, void *opaque,

                    Error **errp)

{

    get_pointer(obj, v, opaque, print_chr, name, errp);

}



static void set_chr(Object *obj, Visitor *v, void *opaque,

                    const char *name, Error **errp)

static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque,

                    Error **errp)

{

    set_pointer(obj, v, opaque, parse_chr, name, errp);

}
@@ -194,8 +194,8 @@ PropertyInfo qdev_prop_chr = { 
};



/* --- netdev device --- */

static void get_netdev(Object *obj, Visitor *v, void *opaque,

                       const char *name, Error **errp)

static void get_netdev(Object *obj, Visitor *v, const char *name,

                       void *opaque, Error **errp)

{

    DeviceState *dev = DEVICE(obj);

    Property *prop = opaque;
@@ -206,8 +206,8 @@ static void get_netdev(Object *obj, Visitor *v, void *opaque, 
    g_free(p);

}



static void set_netdev(Object *obj, Visitor *v, void *opaque,

                       const char *name, Error **errp)

static void set_netdev(Object *obj, Visitor *v, const char *name,

                       void *opaque, Error **errp)

{

    DeviceState *dev = DEVICE(obj);

    Property *prop = opaque;
@@ -293,8 +293,8 @@ static int print_vlan(DeviceState *dev, Property *prop, char *dest, size_t len) 
    return snprintf(dest, len, "<null>");

}



static void get_vlan(Object *obj, Visitor *v, void *opaque,

                     const char *name, Error **errp)

static void get_vlan(Object *obj, Visitor *v, const char *name, void *opaque,

                     Error **errp)

{

    DeviceState *dev = DEVICE(obj);

    Property *prop = opaque;
@@ -311,8 +311,8 @@ static void get_vlan(Object *obj, Visitor *v, void *opaque, 
    visit_type_int32(v, name, &id, errp);

}



static void set_vlan(Object *obj, Visitor *v, void *opaque,

                     const char *name, Error **errp)

static void set_vlan(Object *obj, Visitor *v, const char *name, void *opaque,

                     Error **errp)

{

    DeviceState *dev = DEVICE(obj);

    Property *prop = opaque;