From patchwork Thu Feb 3 21:07:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 81764 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 75D52B70E9 for ; Fri, 4 Feb 2011 11:23:21 +1100 (EST) Received: from localhost ([127.0.0.1]:47371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl6df-0000eL-EQ for incoming@patchwork.ozlabs.org; Thu, 03 Feb 2011 16:22:51 -0500 Received: from [140.186.70.92] (port=43535 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl6Oi-0002S2-4v for qemu-devel@nongnu.org; Thu, 03 Feb 2011 16:07:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pl6Of-0006Gb-R8 for qemu-devel@nongnu.org; Thu, 03 Feb 2011 16:07:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:21522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pl6Of-0006GN-KD for qemu-devel@nongnu.org; Thu, 03 Feb 2011 16:07:21 -0500 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 p13L7KCw017132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 3 Feb 2011 16:07:21 -0500 Received: from playa.tlv.redhat.com (dhcp-3-110.tlv.redhat.com [10.35.3.110]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p13L7F5m004913 for ; Thu, 3 Feb 2011 16:07:20 -0500 From: Alon Levy To: qemu-devel@nongnu.org Date: Thu, 3 Feb 2011 23:07:00 +0200 Message-Id: <1296767234-9480-4-git-send-email-alevy@redhat.com> In-Reply-To: <1296767234-9480-1-git-send-email-alevy@redhat.com> References: <1296767234-9480-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 03/17] qdev-properties: add PROP_TYPE_ENUM 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 Example usage: EnumTable foo_enum_table[] = { {"bar", 1}, {"buz", 2}, {NULL, 0}, }; DEFINE_PROP_ENUM("foo", State, foo, 1, foo_enum_table) When using qemu -device foodev,? it will appear as: foodev.foo=bar/buz Signed-off-by: Alon Levy --- hw/qdev-properties.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ hw/qdev.h | 15 ++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index a493087..3157721 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -63,6 +63,66 @@ PropertyInfo qdev_prop_bit = { .print = print_bit, }; +/* --- Enumeration --- */ +/* Example usage: +EnumTable foo_enum_table[] = { + {"bar", 1}, + {"buz", 2}, + {NULL, 0}, +}; +DEFINE_PROP_ENUM("foo", State, foo, 1, foo_enum_table), + */ +static int parse_enum(DeviceState *dev, Property *prop, const char *str) +{ + uint8_t *ptr = qdev_get_prop_ptr(dev, prop); + EnumTable *option = (EnumTable*)prop->data; + + while (option->name != NULL) { + if (!strncmp(str, option->name, strlen(option->name))) { + *ptr = option->value; + return 0; + } + option++; + } + return -EINVAL; +} + +static int print_enum(DeviceState *dev, Property *prop, char *dest, size_t len) +{ + uint32_t *p = qdev_get_prop_ptr(dev, prop); + EnumTable *option = (EnumTable*)prop->data; + while (option->name != NULL) { + if (*p == option->value) { + return snprintf(dest, len, "%s", option->name); + } + option++; + } + return 0; +} + +static int print_enum_options(DeviceInfo *info, Property *prop, char *dest, size_t len) +{ + int ret = 0; + EnumTable *option = (EnumTable*)prop->data; + while (option->name != NULL) { + ret += snprintf(dest + ret, len - ret, "%s", option->name); + if (option[1].name != NULL) { + ret += snprintf(dest + ret, len - ret, "/"); + } + option++; + } + return ret; +} + +PropertyInfo qdev_prop_enum = { + .name = "enum", + .type = PROP_TYPE_ENUM, + .size = sizeof(uint32_t), + .parse = parse_enum, + .print = print_enum, + .print_options = print_enum_options, +}; + /* --- 8bit integer --- */ static int parse_uint8(DeviceState *dev, Property *prop, const char *str) diff --git a/hw/qdev.h b/hw/qdev.h index 3d9acd7..3701d83 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -102,6 +102,7 @@ enum PropertyType { PROP_TYPE_VLAN, PROP_TYPE_PTR, PROP_TYPE_BIT, + PROP_TYPE_ENUM, }; struct PropertyInfo { @@ -121,6 +122,11 @@ typedef struct GlobalProperty { QTAILQ_ENTRY(GlobalProperty) next; } GlobalProperty; +typedef struct EnumTable { + const char *name; + uint32_t value; +} EnumTable; + /*** Board API. This should go away once we have a machine config file. ***/ DeviceState *qdev_create(BusState *bus, const char *name); @@ -235,6 +241,7 @@ extern PropertyInfo qdev_prop_drive; extern PropertyInfo qdev_prop_netdev; extern PropertyInfo qdev_prop_vlan; extern PropertyInfo qdev_prop_pci_devfn; +extern PropertyInfo qdev_prop_enum; #define DEFINE_PROP(_name, _state, _field, _prop, _type) { \ .name = (_name), \ @@ -257,6 +264,14 @@ extern PropertyInfo qdev_prop_pci_devfn; + type_check(uint32_t,typeof_field(_state, _field)), \ .defval = (bool[]) { (_defval) }, \ } +#define DEFINE_PROP_ENUM(_name, _state, _field, _defval, _options) { \ + .name = (_name), \ + .info = &(qdev_prop_enum), \ + .offset = offsetof(_state, _field) \ + + type_check(uint32_t,typeof_field(_state, _field)), \ + .defval = (uint32_t[]) { (_defval) }, \ + .data = (void*)(_options), \ + } #define DEFINE_PROP_UINT8(_n, _s, _f, _d) \ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_uint8, uint8_t)