[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/17] qom: Clean up inconsistent use of gchar * vs. char *
|
From: |
Markus Armbruster |
|
Subject: |
[PATCH 02/17] qom: Clean up inconsistent use of gchar * vs. char * |
|
Date: |
Tue, 28 Apr 2020 18:34:04 +0200 |
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 <address@hidden>
---
include/qom/object.h | 12 +++++-----
monitor/monitor-internal.h | 2 +-
hw/dma/xlnx-zdma.c | 4 ++--
hw/net/virtio-net.c | 2 +-
hw/ppc/spapr_drc.c | 2 +-
memory.c | 4 ++--
qom/container.c | 2 +-
qom/object.c | 46 ++++++++++++++++++++------------------
8 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index 784c97c0e1..ccfa82e33d 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -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:
diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h
index 8f60ccc70a..b39e03b744 100644
--- a/monitor/monitor-internal.h
+++ b/monitor/monitor-internal.h
@@ -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;
/*
diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c
index 1c45367f3c..880630a0b0 100644
--- a/hw/dma/xlnx-zdma.c
+++ b/hw/dma/xlnx-zdma.c
@@ -710,7 +710,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);
@@ -729,7 +729,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);
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index a46e3b37a7..836be2787e 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -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);
diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index 47e6bb12f9..0b66d59867 100644
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -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));
diff --git a/memory.c b/memory.c
index 601b749906..936c1b23d4 100644
--- a/memory.c
+++ b/memory.c
@@ -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);
diff --git a/qom/container.c b/qom/container.c
index f6ccaf7ea7..e635e8ee76 100644
--- a/qom/container.c
+++ b/qom/container.c
@@ -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);
diff --git a/qom/object.c b/qom/object.c
index e06c78f9a5..0c9e2052fa 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -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 {
@@ -1653,14 +1653,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;
}
@@ -1681,7 +1682,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) {
@@ -1740,14 +1741,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);
}
}
@@ -1765,7 +1766,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;
@@ -1828,7 +1829,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;
@@ -1858,7 +1860,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) {
@@ -1910,7 +1912,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;
@@ -1945,7 +1947,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;
@@ -1970,7 +1972,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;
@@ -2000,7 +2002,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) {
@@ -2015,9 +2017,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;
@@ -2038,9 +2040,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;
@@ -2078,7 +2080,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);
@@ -2769,7 +2771,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;
@@ -2791,7 +2793,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);
--
2.21.1
- [PATCH 00/17] qom: Spring cleaning, Markus Armbruster, 2020/04/28
- [PATCH 01/17] qom: Clearer reference counting in object_initialize_childv(), Markus Armbruster, 2020/04/28
- [PATCH 04/17] qom: Change object_property_get_uint16List() to match its doc, Markus Armbruster, 2020/04/28
- [PATCH 03/17] qom: Drop object_property_del_child()'s unused parameter @errp, Markus Armbruster, 2020/04/28
- [PATCH 02/17] qom: Clean up inconsistent use of gchar * vs. char *,
Markus Armbruster <=
- [PATCH 07/17] tests/check-qom-proplist: Improve iterator coverage, Markus Armbruster, 2020/04/28
- [PATCH 06/17] qom: Drop object_property_set_description() parameter @errp, Markus Armbruster, 2020/04/28
- [PATCH 12/17] qdev: Clean up qdev_connect_gpio_out_named(), Markus Armbruster, 2020/04/28
- [PATCH 05/17] qom: Make all the object_property_add_FOO() return the property, Markus Armbruster, 2020/04/28
- [PATCH 11/17] hw/arm/bcm2835: Drop futile attempts at QOM-adopting memory, Markus Armbruster, 2020/04/28