From patchwork Thu Oct 8 08:51:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 35422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 07F97B7B79 for ; Thu, 8 Oct 2009 19:53:14 +1100 (EST) Received: from localhost ([127.0.0.1]:52154 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvokJ-0001kb-5T for incoming@patchwork.ozlabs.org; Thu, 08 Oct 2009 04:53:11 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mvojf-0001ir-UD for qemu-devel@nongnu.org; Thu, 08 Oct 2009 04:52:32 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mvoja-0001gP-WB for qemu-devel@nongnu.org; Thu, 08 Oct 2009 04:52:31 -0400 Received: from [199.232.76.173] (port=43781 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mvoja-0001gM-TV for qemu-devel@nongnu.org; Thu, 08 Oct 2009 04:52:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55855) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mvoja-0003Dt-F6 for qemu-devel@nongnu.org; Thu, 08 Oct 2009 04:52:26 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n988qP2t032649 for ; Thu, 8 Oct 2009 04:52:25 -0400 Received: from localhost (vpn-225-213.phx2.redhat.com [10.3.225.213]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n988qMIR015607; Thu, 8 Oct 2009 04:52:23 -0400 From: Amit Shah To: qemu-devel@nongnu.org Date: Thu, 8 Oct 2009 14:21:45 +0530 Message-Id: <1254991905-17703-1-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , Gerd Hoffmann Subject: [Qemu-devel] [PATCH] qdev: add string property. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Signed-off-by: Amit Shah --- 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) \