[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULLv2 21/25] bus: simplify name handling
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULLv2 21/25] bus: simplify name handling |
Date: |
Thu, 8 Sep 2016 18:17:16 +0400 |
Simplify a bit the code by using g_strdup_printf() and store it in a
non-const value so casting is no longer needed, and ownership is
clearer.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
hw/core/bus.c | 21 ++++++---------------
include/hw/qdev-core.h | 2 +-
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/hw/core/bus.c b/hw/core/bus.c
index 3e3f8ac..cf383fc 100644
--- a/hw/core/bus.c
+++ b/hw/core/bus.c
@@ -78,8 +78,7 @@ static void qbus_realize(BusState *bus, DeviceState *parent,
const char *name)
{
const char *typename = object_get_typename(OBJECT(bus));
BusClass *bc;
- char *buf;
- int i, len, bus_id;
+ int i, bus_id;
bus->parent = parent;
@@ -88,23 +87,15 @@ static void qbus_realize(BusState *bus, DeviceState
*parent, const char *name)
} else if (bus->parent && bus->parent->id) {
/* parent device has id -> use it plus parent-bus-id for bus name */
bus_id = bus->parent->num_child_bus;
-
- len = strlen(bus->parent->id) + 16;
- buf = g_malloc(len);
- snprintf(buf, len, "%s.%d", bus->parent->id, bus_id);
- bus->name = buf;
+ bus->name = g_strdup_printf("%s.%d", bus->parent->id, bus_id);
} else {
/* no id -> use lowercase bus type plus global bus-id for bus name */
bc = BUS_GET_CLASS(bus);
bus_id = bc->automatic_ids++;
-
- len = strlen(typename) + 16;
- buf = g_malloc(len);
- len = snprintf(buf, len, "%s.%d", typename, bus_id);
- for (i = 0; i < len; i++) {
- buf[i] = qemu_tolower(buf[i]);
+ bus->name = g_strdup_printf("%s.%d", typename, bus_id);
+ for (i = 0; bus->name[i]; i++) {
+ bus->name[i] = qemu_tolower(bus->name[i]);
}
- bus->name = buf;
}
if (bus->parent) {
@@ -229,7 +220,7 @@ static void qbus_finalize(Object *obj)
{
BusState *bus = BUS(obj);
- g_free((char *)bus->name);
+ g_free(bus->name);
}
static const TypeInfo bus_info = {
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 4b4b33b..2c97347 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -224,7 +224,7 @@ typedef struct BusChild {
struct BusState {
Object obj;
DeviceState *parent;
- const char *name;
+ char *name;
HotplugHandler *hotplug_handler;
int max_index;
bool realized;
--
2.10.0
- [Qemu-devel] [PULLv2 13/25] pc: don't leak a20_line, (continued)
- [Qemu-devel] [PULLv2 13/25] pc: don't leak a20_line, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 14/25] machine: use class base init generated name, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 16/25] tests: fix qom-test leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 15/25] acpi-build: fix array leak, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 17/25] pc: free i8259, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 18/25] pc: keep gsi reference, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 20/25] ipmi: free extern timer, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 19/25] sd: free timer, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 22/25] tests: add qtest_add_data_func_full, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 23/25] tests: pc-cpu-test leaks fixes, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 21/25] bus: simplify name handling,
Marc-André Lureau <=
- [Qemu-devel] [PULLv2 24/25] tests: fix rsp leak in postcopy-test, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 25/25] tests: fix postcopy-test leaks, Marc-André Lureau, 2016/09/08
- Re: [Qemu-devel] [PULLv2 00/25] Leak patches, Peter Maydell, 2016/09/09