From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MsbSY-0004xl-VE for qemu-devel@nongnu.org; Tue, 29 Sep 2009 08:05:35 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MsbSU-0004xY-B8 for qemu-devel@nongnu.org; Tue, 29 Sep 2009 08:05:34 -0400 Received: from [199.232.76.173] (port=56960 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MsbSU-0004xV-7H for qemu-devel@nongnu.org; Tue, 29 Sep 2009 08:05:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64638) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MsbST-0004RR-JH for qemu-devel@nongnu.org; Tue, 29 Sep 2009 08:05:29 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8TC5Swb014300 for ; Tue, 29 Sep 2009 08:05:28 -0400 From: Amit Shah Date: Tue, 29 Sep 2009 17:34:44 +0530 Message-Id: <1254225888-17093-3-git-send-email-amit.shah@redhat.com> In-Reply-To: <1254225888-17093-2-git-send-email-amit.shah@redhat.com> References: <1254225888-17093-1-git-send-email-amit.shah@redhat.com> <1254225888-17093-2-git-send-email-amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH 2/6] qdev: add string property. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann From: Gerd Hoffmann --- hw/qdev-properties.c | 28 ++++++++++++++++++++++++++++ hw/qdev.h | 4 ++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 2ecb58d..7e085f6 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -165,6 +165,34 @@ PropertyInfo qdev_prop_hex64 = { .print = print_hex64, }; +/* --- string --- */ + +static int parse_string(DeviceState *dev, Property *prop, const char *str) +{ + char **ptr = qdev_get_prop_ptr(dev, prop); + + if (*ptr) + qemu_free(*ptr); + *ptr = qemu_strdup(str); + return 0; +} + +static int print_string(DeviceState *dev, Property *prop, char *dest, size_t len) +{ + char **ptr = qdev_get_prop_ptr(dev, prop); + if (!*ptr) + return snprintf(dest, len, ""); + return snprintf(dest, len, "\"%s\"", *ptr); +} + +PropertyInfo qdev_prop_string = { + .name = "string", + .type = PROP_TYPE_STRING, + .size = sizeof(char*), + .parse = parse_string, + .print = print_string, +}; + /* --- drive --- */ static int parse_drive(DeviceState *dev, Property *prop, const char *str) diff --git a/hw/qdev.h b/hw/qdev.h index 623ded5..cd9da17 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -68,6 +68,7 @@ enum PropertyType { PROP_TYPE_MACADDR, PROP_TYPE_DRIVE, PROP_TYPE_CHR, + PROP_TYPE_STRING, PROP_TYPE_PTR, }; @@ -161,6 +162,7 @@ extern PropertyInfo qdev_prop_int32; extern PropertyInfo qdev_prop_uint64; extern PropertyInfo qdev_prop_hex32; extern PropertyInfo qdev_prop_hex64; +extern PropertyInfo qdev_prop_string; extern PropertyInfo qdev_prop_chr; extern PropertyInfo qdev_prop_ptr; extern PropertyInfo qdev_prop_macaddr; @@ -200,6 +202,8 @@ extern PropertyInfo qdev_prop_pci_devfn; DEFINE_PROP(_n, _s, _f, qdev_prop_ptr, void*) #define DEFINE_PROP_CHR(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, qdev_prop_chr, CharDriverState*) +#define DEFINE_PROP_STRING(_n, _s, _f) \ + DEFINE_PROP(_n, _s, _f, qdev_prop_string, char*) #define DEFINE_PROP_DRIVE(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, qdev_prop_drive, DriveInfo*) #define DEFINE_PROP_MACADDR(_n, _s, _f) \ -- 1.6.2.5