[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/24] qdev: make get_pointer() handle temporary stri
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 11/24] qdev: make get_pointer() handle temporary strings |
Date: |
Wed, 12 Mar 2014 11:29:19 +0100 |
From: Igor Mammedov <address@hidden>
get_pointer()'s print() callback might return a heap allocated
string, to avoid adding dedicated get_pointer_foo for this case
convert current print() callbacks to return temporary heap
allocated string and make get_pointer() free it.
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/core/qdev-properties-system.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 5f5957e..878c3bc 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -20,15 +20,16 @@
#include "sysemu/char.h"
static void get_pointer(Object *obj, Visitor *v, Property *prop,
- const char *(*print)(void *ptr),
+ char *(*print)(void *ptr),
const char *name, Error **errp)
{
DeviceState *dev = DEVICE(obj);
void **ptr = qdev_get_prop_ptr(dev, prop);
char *p;
- p = (char *) (*ptr ? print(*ptr) : "");
+ p = *ptr ? print(*ptr) : g_strdup("");
visit_type_str(v, &p, name, errp);
+ g_free(p);
}
static void set_pointer(Object *obj, Visitor *v, Property *prop,
@@ -91,9 +92,9 @@ static void release_drive(Object *obj, const char *name, void
*opaque)
}
}
-static const char *print_drive(void *ptr)
+static char *print_drive(void *ptr)
{
- return bdrv_get_device_name(ptr);
+ return g_strdup(bdrv_get_device_name(ptr));
}
static void get_drive(Object *obj, Visitor *v, void *opaque,
@@ -145,11 +146,12 @@ static void release_chr(Object *obj, const char *name,
void *opaque)
}
-static const char *print_chr(void *ptr)
+static char *print_chr(void *ptr)
{
CharDriverState *chr = ptr;
+ const char *val = chr->label ? chr->label : "";
- return chr->label ? chr->label : "";
+ return g_strdup(val);
}
static void get_chr(Object *obj, Visitor *v, void *opaque,
@@ -224,11 +226,12 @@ err:
return ret;
}
-static const char *print_netdev(void *ptr)
+static char *print_netdev(void *ptr)
{
NetClientState *netdev = ptr;
+ const char *val = netdev->name ? netdev->name : "";
- return netdev->name ? netdev->name : "";
+ return g_strdup(val);
}
static void get_netdev(Object *obj, Visitor *v, void *opaque,
--
1.8.5.3
- [Qemu-devel] [PULL 07/24] object: add object_get_canonical_path_component(), (continued)
- [Qemu-devel] [PULL 07/24] object: add object_get_canonical_path_component(), Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 08/24] rfifolock: add recursive FIFO lock, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 10/24] iothread: add I/O thread object, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 09/24] aio: add aio_context_acquire() and aio_context_release(), Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 12/24] iothread: add "iothread" qdev property type, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 13/24] dataplane: replace internal thread with IOThread, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 17/24] qcow2: Don't write with BDRV_O_INCOMING, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 14/24] iothread: stash thread ID away, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 03/24] qcow2: Check bs->drv in copy_sectors(), Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 05/24] iotests: Test corruption during COW request, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 11/24] qdev: make get_pointer() handle temporary strings,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 15/24] qmp: add query-iothreads command, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 21/24] block/raw-posix: bdrv_parse_filename() for floppy, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 19/24] qemu-io: Fix warnings from static code analysis, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 24/24] block/raw-win32: bdrv_parse_filename() for hdev, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 16/24] qcow2: Keep option in qcow2_invalidate_cache(), Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 18/24] block: Unlink temporary file, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 20/24] block/raw-posix: bdrv_parse_filename() for hdev, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 22/24] block/raw-posix: bdrv_parse_filename() for cdrom, Stefan Hajnoczi, 2014/03/12
- [Qemu-devel] [PULL 23/24] block/raw-posix: Strip protocol prefix on creation, Stefan Hajnoczi, 2014/03/12
- Re: [Qemu-devel] [PULL 00/24] Block patches for QEMU 2.0, Peter Maydell, 2014/03/12