OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-3-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-05-05 17:29:10 +02:00
parent 975ac4559c
commit ddfb0baaf2
8 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/dma/xlnx-zdma.c
View File

@ -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);

2
hw/net/virtio-net.c
View File

@ -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);

2
hw/ppc/spapr_drc.c
View File

@ -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));

12
include/qom/object.h
View File

@ -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:

4
memory.c
View File

@ -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);

2
monitor/monitor-internal.h
View File

@ -91,7 +91,7 @@ struct Monitor {
bool skip_flush;
bool use_io_thread;
gchar *mon_cpu_path;
char *mon_cpu_path;
QTAILQ_ENTRY(Monitor) entry;
/*

2
qom/container.c
View File

@ -28,7 +28,7 @@ static void container_register_types(void)
Object *container_get(Object *root, const char *path)
{
Object *obj, *child;
gchar **parts;
char **parts;
int i;
parts = g_strsplit(path, "/", 0);

46
qom/object.c
View File

@ -1357,7 +1357,7 @@ void object_property_set_link(Object *obj, Object *value,
const char *name, Error **errp)
{
if (value) {
gchar *path = object_get_canonical_path(value);
char *path = object_get_canonical_path(value);
object_property_set_str(obj, path, name, errp);
g_free(path);
} else {
@ -1651,14 +1651,15 @@ static void object_get_child_property(Object *obj, Visitor *v,
Error **errp)
{
Object *child = opaque;
gchar *path;
char *path;
path = object_get_canonical_path(child);
visit_type_str(v, name, &path, errp);
g_free(path);
}
static Object *object_resolve_child_property(Object *parent, void *opaque, const gchar *part)
static Object *object_resolve_child_property(Object *parent, void *opaque,
const char *part)
{
return opaque;
}
@ -1679,7 +1680,7 @@ void object_property_add_child(Object *obj, const char *name,
Object *child, Error **errp)
{
Error *local_err = NULL;
gchar *type;
char *type;
ObjectProperty *op;
if (child->parent != NULL) {
@ -1738,14 +1739,14 @@ static void object_get_link_property(Object *obj, Visitor *v,
{
LinkProperty *lprop = opaque;
Object **targetp = object_link_get_targetp(obj, lprop);
gchar *path;
char *path;
if (*targetp) {
path = object_get_canonical_path(*targetp);
visit_type_str(v, name, &path, errp);
g_free(path);
} else {
path = (gchar *)"";
path = (char *)"";
visit_type_str(v, name, &path, errp);
}
}
@ -1763,7 +1764,7 @@ static Object *object_resolve_link(Object *obj, const char *name,
const char *path, Error **errp)
{
const char *type;
gchar *target_type;
char *target_type;
bool ambiguous = false;
Object *target;
@ -1826,7 +1827,8 @@ static void object_set_link_property(Object *obj, Visitor *v,
}
}
static Object *object_resolve_link_property(Object *parent, void *opaque, const gchar *part)
static Object *object_resolve_link_property(Object *parent, void *opaque,
const char *part)
{
LinkProperty *lprop = opaque;
@ -1856,7 +1858,7 @@ static void object_add_link_prop(Object *obj, const char *name,
{
Error *local_err = NULL;
LinkProperty *prop = g_malloc(sizeof(*prop));
gchar *full_type;
char *full_type;
ObjectProperty *op;
if (flags & OBJ_PROP_LINK_DIRECT) {
@ -1908,7 +1910,7 @@ object_class_property_add_link(ObjectClass *oc,
{
Error *local_err = NULL;
LinkProperty *prop = g_new0(LinkProperty, 1);
gchar *full_type;
char *full_type;
ObjectProperty *op;
prop->offset = offset;
@ -1943,7 +1945,7 @@ void object_property_add_const_link(Object *obj, const char *name,
NULL, OBJ_PROP_LINK_DIRECT, errp);
}
gchar *object_get_canonical_path_component(Object *obj)
char *object_get_canonical_path_component(Object *obj)
{
ObjectProperty *prop = NULL;
GHashTableIter iter;
@ -1968,7 +1970,7 @@ gchar *object_get_canonical_path_component(Object *obj)
return NULL;
}
gchar *object_get_canonical_path(Object *obj)
char *object_get_canonical_path(Object *obj)
{
Object *root = object_get_root();
char *newpath, *path = NULL;
@ -1998,7 +2000,7 @@ gchar *object_get_canonical_path(Object *obj)
return path;
}
Object *object_resolve_path_component(Object *parent, const gchar *part)
Object *object_resolve_path_component(Object *parent, const char *part)
{
ObjectProperty *prop = object_property_find(parent, part, NULL);
if (prop == NULL) {
@ -2013,9 +2015,9 @@ Object *object_resolve_path_component(Object *parent, const gchar *part)
}
static Object *object_resolve_abs_path(Object *parent,
gchar **parts,
const char *typename,
int index)
char **parts,
const char *typename,
int index)
{
Object *child;
@ -2036,9 +2038,9 @@ static Object *object_resolve_abs_path(Object *parent,
}
static Object *object_resolve_partial_path(Object *parent,
gchar **parts,
const char *typename,
bool *ambiguous)
char **parts,
const char *typename,
bool *ambiguous)
{
Object *obj;
GHashTableIter iter;
@ -2076,7 +2078,7 @@ Object *object_resolve_path_type(const char *path, const char *typename,
bool *ambiguousp)
{
Object *obj;
gchar **parts;
char **parts;
parts = g_strsplit(path, "/", 0);
assert(parts);
@ -2767,7 +2769,7 @@ static void property_set_alias(Object *obj, Visitor *v, const char *name,
}
static Object *property_resolve_alias(Object *obj, void *opaque,
const gchar *part)
const char *part)
{
AliasProperty *prop = opaque;
@ -2789,7 +2791,7 @@ void object_property_add_alias(Object *obj, const char *name,
AliasProperty *prop;
ObjectProperty *op;
ObjectProperty *target_prop;
gchar *prop_type;
char *prop_type;
Error *local_err = NULL;
target_prop = object_property_find(target_obj, target_name, errp);