Commit ddfb0baa authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qom: Clean up inconsistent use of gchar * vs. char * 



Uses of gchar * in qom/object.h:

* ObjectProperty member @name

  Functions that take a property name argument all use char *.  Change
  the member to match.

* ObjectProperty member @type

  Functions that take a property type argument or return it all use
  char *.  Change the member to match.

* ObjectProperty member @description

  Functions that take a property description argument all use char *.
  Change the member to match.

* object_resolve_path_component() parameter @part

  Path components are property names.  Most callers pass char *
  arguments.  Change the parameter to match.  Adjust the few callers
  that pass gchar * to pass char *.

* Return value of object_get_canonical_path_component(),
  object_get_canonical_path()

  Most callers convert their return values right back to char *.
  Change the return value to match.  Adjust the few callers where that
  would add a conversion to gchar * to use char * instead.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-3-armbru@redhat.com>
parent 975ac455

hw/dma/xlnx-zdma.c

+2 −2
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ static uint64_t zdma_read(void *opaque, hwaddr addr, unsigned size) 
    RegisterInfo *r = &s->regs_info[addr / 4];



    if (!r->data) {

        gchar *path = object_get_canonical_path(OBJECT(s));

        char *path = object_get_canonical_path(OBJECT(s));

        qemu_log("%s: Decode error: read from %" HWADDR_PRIx "\n",

                 path,

                 addr);
@@ -738,7 +738,7 @@ static void zdma_write(void *opaque, hwaddr addr, uint64_t value, 
    RegisterInfo *r = &s->regs_info[addr / 4];



    if (!r->data) {

        gchar *path = object_get_canonical_path(OBJECT(s));

        char *path = object_get_canonical_path(OBJECT(s));

        qemu_log("%s: Decode error: write to %" HWADDR_PRIx "=%" PRIx64 "\n",

                 path,

                 addr, value);

hw/net/virtio-net.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static void rxfilter_notify(NetClientState *nc) 
    VirtIONet *n = qemu_get_nic_opaque(nc);



    if (nc->rxfilter_notify_enabled) {

        gchar *path = object_get_canonical_path(OBJECT(n->qdev));

        char *path = object_get_canonical_path(OBJECT(n->qdev));

        qapi_event_send_nic_rx_filter_changed(!!n->netclient_name,

                                              n->netclient_name, path);

        g_free(path);

hw/ppc/spapr_drc.c

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ static void realize(DeviceState *d, Error **errp) 
    SpaprDrc *drc = SPAPR_DR_CONNECTOR(d);

    Object *root_container;

    gchar *link_name;

    gchar *child_name;

    char *child_name;

    Error *err = NULL;



    trace_spapr_drc_realize(spapr_drc_index(drc));

include/qom/object.h

+6 −6
Original line number Diff line number Diff line
@@ -369,9 +369,9 @@ typedef void (ObjectPropertyInit)(Object *obj, ObjectProperty *prop); 


struct ObjectProperty

{

    gchar *name;

    gchar *type;

    gchar *description;

    char *name;

    char *type;

    char *description;

    ObjectPropertyAccessor *get;

    ObjectPropertyAccessor *set;

    ObjectPropertyResolve *resolve;
@@ -1421,7 +1421,7 @@ Object *object_get_internal_root(void); 
 * path is the path within the composition tree starting from the root.

 * %NULL if the object doesn't have a parent (and thus a canonical path).

 */

gchar *object_get_canonical_path_component(Object *obj);

char *object_get_canonical_path_component(Object *obj);



/**

 * object_get_canonical_path:
@@ -1429,7 +1429,7 @@ gchar *object_get_canonical_path_component(Object *obj); 
 * Returns: The canonical path for a object.  This is the path within the

 * composition tree starting from the root.

 */

gchar *object_get_canonical_path(Object *obj);

char *object_get_canonical_path(Object *obj);



/**

 * object_resolve_path:
@@ -1487,7 +1487,7 @@ Object *object_resolve_path_type(const char *path, const char *typename, 
 *

 * Returns: The resolved object or NULL on path lookup failure.

 */

Object *object_resolve_path_component(Object *parent, const gchar *part);

Object *object_resolve_path_component(Object *parent, const char *part);



/**

 * object_property_add_child:

memory.c

+2 −2
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ static void memory_region_get_container(Object *obj, Visitor *v, 
                                        Error **errp)

{

    MemoryRegion *mr = MEMORY_REGION(obj);

    gchar *path = (gchar *)"";

    char *path = (char *)"";



    if (mr->container) {

        path = object_get_canonical_path(OBJECT(mr->container));
@@ -2845,7 +2845,7 @@ static void mtree_expand_owner(const char *label, Object *obj) 
    if (dev && dev->id) {

        qemu_printf(" id=%s", dev->id);

    } else {

        gchar *canonical_path = object_get_canonical_path(obj);

        char *canonical_path = object_get_canonical_path(obj);

        if (canonical_path) {

            qemu_printf(" path=%s", canonical_path);

            g_free(canonical_path);