From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO6MQ-0006Gx-Rc for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:11:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WO6ML-0006ZY-OU for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:11:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47625) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO6ML-0006ZT-FV for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:11:45 -0400 From: Stefan Hajnoczi Date: Thu, 13 Mar 2014 15:10:55 +0100 Message-Id: <1394719868-24312-12-git-send-email-stefanha@redhat.com> In-Reply-To: <1394719868-24312-1-git-send-email-stefanha@redhat.com> References: <1394719868-24312-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 for-2.0 11/24] qdev: make get_pointer() handle temporary strings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi , Anthony Liguori , Igor Mammedov From: Igor Mammedov 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=C3=A4rber Signed-off-by: Igor Mammedov Signed-off-by: Stefan Hajnoczi --- 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-s= ystem.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" =20 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 =3D DEVICE(obj); void **ptr =3D qdev_get_prop_ptr(dev, prop); char *p; =20 - p =3D (char *) (*ptr ? print(*ptr) : ""); + p =3D *ptr ? print(*ptr) : g_strdup(""); visit_type_str(v, &p, name, errp); + g_free(p); } =20 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) } } =20 -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)); } =20 static void get_drive(Object *obj, Visitor *v, void *opaque, @@ -145,11 +146,12 @@ static void release_chr(Object *obj, const char *na= me, void *opaque) } =20 =20 -static const char *print_chr(void *ptr) +static char *print_chr(void *ptr) { CharDriverState *chr =3D ptr; + const char *val =3D chr->label ? chr->label : ""; =20 - return chr->label ? chr->label : ""; + return g_strdup(val); } =20 static void get_chr(Object *obj, Visitor *v, void *opaque, @@ -224,11 +226,12 @@ err: return ret; } =20 -static const char *print_netdev(void *ptr) +static char *print_netdev(void *ptr) { NetClientState *netdev =3D ptr; + const char *val =3D netdev->name ? netdev->name : ""; =20 - return netdev->name ? netdev->name : ""; + return g_strdup(val); } =20 static void get_netdev(Object *obj, Visitor *v, void *opaque, --=20 1.8.5.3