From patchwork Thu Nov 12 20:29:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 38272 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 3B50CB7B9A for ; Fri, 13 Nov 2009 07:33:53 +1100 (EST) Received: from localhost ([127.0.0.1]:37675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8gMY-0004Wd-E5 for incoming@patchwork.ozlabs.org; Thu, 12 Nov 2009 15:33:50 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8gKU-0003FS-IO for qemu-devel@nongnu.org; Thu, 12 Nov 2009 15:31:42 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8gKO-0003Bv-Qo for qemu-devel@nongnu.org; Thu, 12 Nov 2009 15:31:40 -0500 Received: from [199.232.76.173] (port=58766 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8gKO-0003BW-4U for qemu-devel@nongnu.org; Thu, 12 Nov 2009 15:31:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28411) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8gKN-0005B2-F3 for qemu-devel@nongnu.org; Thu, 12 Nov 2009 15:31:35 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nACKVYjD007127 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 12 Nov 2009 15:31:34 -0500 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nACKVXQj025064; Thu, 12 Nov 2009 15:31:34 -0500 Received: by blaa.localdomain (Postfix, from userid 500) id 62A5862C4; Thu, 12 Nov 2009 20:29:03 +0000 (GMT) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Thu, 12 Nov 2009 20:29:01 +0000 Message-Id: <1258057742-18699-7-git-send-email-markmc@redhat.com> In-Reply-To: <1258057742-18699-1-git-send-email-markmc@redhat.com> References: <1258057742-18699-1-git-send-email-markmc@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin , kraxel@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 6/7] qdev: add qdev_prop_get_{macaddr, net_client}() 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 Probably the second worst idea in the world, ever. While iterating over all NICs in the system, we need to be able to query their 'net-client' and 'macaddr' properties. Signed-off-by: Mark McLoughlin --- hw/qdev-properties.c | 31 ++++++++++++++++++++++++++++--- hw/qdev.h | 3 +++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index fe40813..11ae6ad 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -458,10 +458,10 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value) return prop->info->parse(dev, prop, value); } -void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum PropertyType type) +static void *qdev_prop_get(DeviceState *dev, const char *name, + enum PropertyType type, Property **prop_ret) { Property *prop; - void *dst; prop = qdev_prop_find(dev, name); if (!prop) { @@ -474,7 +474,20 @@ void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum PropertyT __FUNCTION__, dev->info->name, name); abort(); } - dst = qdev_get_prop_ptr(dev, prop); + + if (prop_ret) { + *prop_ret = prop; + } + + return qdev_get_prop_ptr(dev, prop); +} + +void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum PropertyType type) +{ + Property *prop; + void *dst; + + dst = qdev_prop_get(dev, name, type, &prop); memcpy(dst, src, prop->info->size); } @@ -518,11 +531,23 @@ void qdev_prop_set_net_client(DeviceState *dev, const char *name, VLANClientStat qdev_prop_set(dev, name, &value, PROP_TYPE_NET_CLIENT); } +VLANClientState *qdev_prop_get_net_client(DeviceState *dev, const char *name) +{ + VLANClientState **clientp = qdev_prop_get(dev, name, PROP_TYPE_NET_CLIENT, NULL); + return *clientp; +} + void qdev_prop_set_macaddr(DeviceState *dev, const char *name, uint8_t *value) { qdev_prop_set(dev, name, value, PROP_TYPE_MACADDR); } +uint8_t *qdev_prop_get_macaddr(DeviceState *dev, const char *name) +{ + uint8_t *mac = qdev_prop_get(dev, name, PROP_TYPE_MACADDR, NULL); + return mac; +} + void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value) { qdev_prop_set(dev, name, &value, PROP_TYPE_PTR); diff --git a/hw/qdev.h b/hw/qdev.h index 712ae3b..41b2f07 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -267,6 +267,9 @@ void qdev_prop_set_defaults(DeviceState *dev, Property *props); void qdev_prop_register_compat(CompatProperty *props); void qdev_prop_set_compat(DeviceState *dev); +VLANClientState *qdev_prop_get_net_client(DeviceState *dev, const char *name); +uint8_t *qdev_prop_get_macaddr(DeviceState *dev, const char *name); + /* This is a nasty hack to allow passing a NULL bus to qdev_create. */ extern struct BusInfo system_bus_info;