From patchwork Thu Sep 10 09:43:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 33299 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 bilbo.ozlabs.org (Postfix) with ESMTPS id B66CAB7088 for ; Thu, 10 Sep 2009 20:33:04 +1000 (EST) Received: from localhost ([127.0.0.1]:49900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlgxY-0007R1-Pf for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2009 06:33:00 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlgBw-0008Tn-Gm for qemu-devel@nongnu.org; Thu, 10 Sep 2009 05:43:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlgBr-0008RJ-MX for qemu-devel@nongnu.org; Thu, 10 Sep 2009 05:43:47 -0400 Received: from [199.232.76.173] (port=39540 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlgBr-0008R7-Dx for qemu-devel@nongnu.org; Thu, 10 Sep 2009 05:43:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52523) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlgBq-0005VJ-Uv for qemu-devel@nongnu.org; Thu, 10 Sep 2009 05:43:43 -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 n8A9hgtI030234 for ; Thu, 10 Sep 2009 05:43:42 -0400 Received: from zweiblum.home.kraxel.org (vpn2-9-74.ams2.redhat.com [10.36.9.74]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n8A9hbow031362; Thu, 10 Sep 2009 05:43:39 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id AF01C700D7; Thu, 10 Sep 2009 11:43:35 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 11:43:25 +0200 Message-Id: <1252575815-7824-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1252575815-7824-1-git-send-email-kraxel@redhat.com> References: <1252575815-7824-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2 03/13] qdev: add property type for 32bit signed integers. 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 Signed-off-by: Gerd Hoffmann --- hw/qdev-properties.c | 28 ++++++++++++++++++++++++++++ hw/qdev.h | 5 +++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 12ff46b..28b2716 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -64,6 +64,29 @@ PropertyInfo qdev_prop_uint32 = { .print = print_uint32, }; +static int parse_int32(DeviceState *dev, Property *prop, const char *str) +{ + int32_t *ptr = qdev_get_prop_ptr(dev, prop); + + if (sscanf(str, "%" PRId32, ptr) != 1) + return -1; + return 0; +} + +static int print_int32(DeviceState *dev, Property *prop, char *dest, size_t len) +{ + int32_t *ptr = qdev_get_prop_ptr(dev, prop); + return snprintf(dest, len, "%" PRId32, *ptr); +} + +PropertyInfo qdev_prop_int32 = { + .name = "int32", + .type = PROP_TYPE_INT32, + .size = sizeof(int32_t), + .parse = parse_int32, + .print = print_int32, +}; + /* --- 32bit hex value --- */ static int parse_hex32(DeviceState *dev, Property *prop, const char *str) @@ -367,6 +390,11 @@ void qdev_prop_set_uint32(DeviceState *dev, const char *name, uint32_t value) qdev_prop_set(dev, name, &value, PROP_TYPE_UINT32); } +void qdev_prop_set_int32(DeviceState *dev, const char *name, int32_t value) +{ + qdev_prop_set(dev, name, &value, PROP_TYPE_INT32); +} + void qdev_prop_set_uint64(DeviceState *dev, const char *name, uint64_t value) { qdev_prop_set(dev, name, &value, PROP_TYPE_UINT64); diff --git a/hw/qdev.h b/hw/qdev.h index 6d0d7f4..c2609b4 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -62,6 +62,7 @@ enum PropertyType { PROP_TYPE_UNSPEC = 0, PROP_TYPE_UINT16, PROP_TYPE_UINT32, + PROP_TYPE_INT32, PROP_TYPE_UINT64, PROP_TYPE_TADDR, PROP_TYPE_MACADDR, @@ -156,6 +157,7 @@ void do_info_qdm(Monitor *mon); extern PropertyInfo qdev_prop_uint16; extern PropertyInfo qdev_prop_uint32; +extern PropertyInfo qdev_prop_int32; extern PropertyInfo qdev_prop_uint64; extern PropertyInfo qdev_prop_hex32; extern PropertyInfo qdev_prop_hex64; @@ -183,6 +185,8 @@ extern PropertyInfo qdev_prop_pci_devfn; DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_uint16, uint16_t) #define DEFINE_PROP_UINT32(_n, _s, _f, _d) \ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_uint32, uint32_t) +#define DEFINE_PROP_INT32(_n, _s, _f, _d) \ + DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_int32, int32_t) #define DEFINE_PROP_UINT64(_n, _s, _f, _d) \ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_uint64, uint64_t) #define DEFINE_PROP_HEX32(_n, _s, _f, _d) \ @@ -210,6 +214,7 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value); void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum PropertyType type); void qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t value); void qdev_prop_set_uint32(DeviceState *dev, const char *name, uint32_t value); +void qdev_prop_set_int32(DeviceState *dev, const char *name, int32_t value); void qdev_prop_set_uint64(DeviceState *dev, const char *name, uint64_t value); void qdev_prop_set_chr(DeviceState *dev, const char *name, CharDriverState *value); void qdev_prop_set_drive(DeviceState *dev, const char *name, DriveInfo *value);