From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N0bCO-0007lh-ST for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:25:57 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N0bCJ-0007ep-Ps for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:25:56 -0400 Received: from [199.232.76.173] (port=55709 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0bCJ-0007eS-HT for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:25:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10944) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N0bCI-0007OG-KQ for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:25:51 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9LDPn9a030941 for ; Wed, 21 Oct 2009 09:25:49 -0400 From: Gerd Hoffmann Date: Wed, 21 Oct 2009 15:25:24 +0200 Message-Id: <1256131543-28416-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1256131543-28416-1-git-send-email-kraxel@redhat.com> References: <1256131543-28416-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 03/22] qdev: add netdev 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 Signed-off-by: Gerd Hoffmann --- hw/qdev-properties.c | 36 ++++++++++++++++++++++++++++++++++++ hw/qdev.h | 4 ++++ net.c | 2 +- net.h | 1 + 4 files changed, 42 insertions(+), 1 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 1d68125..76925c8 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -251,6 +251,37 @@ PropertyInfo qdev_prop_chr = { .print = print_chr, }; +/* --- netdev device --- */ + +static int parse_netdev(DeviceState *dev, Property *prop, const char *str) +{ + VLANClientState **ptr = qdev_get_prop_ptr(dev, prop); + + *ptr = qemu_find_netdev(str); + if (*ptr == NULL) + return -1; + return 0; +} + +static int print_netdev(DeviceState *dev, Property *prop, char *dest, size_t len) +{ + VLANClientState **ptr = qdev_get_prop_ptr(dev, prop); + + if (*ptr && (*ptr)->name) { + return snprintf(dest, len, "%s", (*ptr)->name); + } else { + return snprintf(dest, len, ""); + } +} + +PropertyInfo qdev_prop_netdev = { + .name = "netdev", + .type = PROP_TYPE_NETDEV, + .size = sizeof(VLANClientState*), + .parse = parse_netdev, + .print = print_netdev, +}; + /* --- pointer --- */ static int print_ptr(DeviceState *dev, Property *prop, char *dest, size_t len) @@ -460,6 +491,11 @@ void qdev_prop_set_chr(DeviceState *dev, const char *name, CharDriverState *valu qdev_prop_set(dev, name, &value, PROP_TYPE_CHR); } +void qdev_prop_set_netdev(DeviceState *dev, const char *name, VLANClientState *value) +{ + qdev_prop_set(dev, name, &value, PROP_TYPE_NETDEV); +} + void qdev_prop_set_macaddr(DeviceState *dev, const char *name, uint8_t *value) { qdev_prop_set(dev, name, value, PROP_TYPE_MACADDR); diff --git a/hw/qdev.h b/hw/qdev.h index 118e886..c0d59bc 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -79,6 +79,7 @@ enum PropertyType { PROP_TYPE_MACADDR, PROP_TYPE_DRIVE, PROP_TYPE_CHR, + PROP_TYPE_NETDEV, PROP_TYPE_PTR, }; @@ -227,6 +228,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_NETDEV(_n, _s, _f) \ + DEFINE_PROP(_n, _s, _f, qdev_prop_netdev, VLANClientState*) #define DEFINE_PROP_DRIVE(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, qdev_prop_drive, DriveInfo*) #define DEFINE_PROP_MACADDR(_n, _s, _f) \ @@ -245,6 +248,7 @@ 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_netdev(DeviceState *dev, const char *name, VLANClientState *value); void qdev_prop_set_drive(DeviceState *dev, const char *name, DriveInfo *value); void qdev_prop_set_macaddr(DeviceState *dev, const char *name, uint8_t *value); /* FIXME: Remove opaque pointer properties. */ diff --git a/net.c b/net.c index 3b69d3b..75a01d2 100644 --- a/net.c +++ b/net.c @@ -2363,7 +2363,7 @@ VLANState *qemu_find_vlan(int id, int allocate) return vlan; } -static VLANClientState *qemu_find_netdev(const char *id) +VLANClientState *qemu_find_netdev(const char *id) { VLANClientState *vc; diff --git a/net.h b/net.h index 605092a..6a24f55 100644 --- a/net.h +++ b/net.h @@ -47,6 +47,7 @@ struct VLANState { }; VLANState *qemu_find_vlan(int id, int allocate); +VLANClientState *qemu_find_netdev(const char *id); VLANClientState *qemu_new_vlan_client(VLANState *vlan, VLANClientState *peer, const char *model, -- 1.6.2.5