[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/7] net: don't use set/get_pointer() in set/get_netd
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 2/7] net: don't use set/get_pointer() in set/get_netdev() |
Date: |
Thu, 4 Sep 2014 16:50:06 +0100 |
From: Jason Wang <address@hidden>
Commit 1ceef9f27359cbe92ef124bf74de6f792e71f6fb (net: multiqueue
support) tries to use set_pointer() and get_pointer() to set and get
NICPeers which is not a pointer defined in DEFINE_PROP_NETDEV. This
trick works but result a unclean and fragile implementation (e.g
print_netdev and parse_netdev).
This patch solves this issue by not using set/get_pinter() and set and
get netdev directly in set_netdev() and get_netdev(). After this the
parse_netdev() and print_netdev() were no longer used and dropped from
the source.
Cc: Markus Armbruster <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/core/qdev-properties-system.c | 71 ++++++++++++++++++++++------------------
1 file changed, 39 insertions(+), 32 deletions(-)
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index ae0900f..b3753ce 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -176,41 +176,67 @@ PropertyInfo qdev_prop_chr = {
};
/* --- netdev device --- */
+static void get_netdev(Object *obj, Visitor *v, void *opaque,
+ const char *name, Error **errp)
+{
+ DeviceState *dev = DEVICE(obj);
+ Property *prop = opaque;
+ NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);
+ char *p = g_strdup(peers_ptr->ncs[0]->name);
-static int parse_netdev(DeviceState *dev, const char *str, void **ptr)
+ visit_type_str(v, &p, name, errp);
+ g_free(p);
+}
+
+static void set_netdev(Object *obj, Visitor *v, void *opaque,
+ const char *name, Error **errp)
{
- NICPeers *peers_ptr = (NICPeers *)ptr;
+ DeviceState *dev = DEVICE(obj);
+ Property *prop = opaque;
+ NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);
NetClientState **ncs = peers_ptr->ncs;
NetClientState *peers[MAX_QUEUE_NUM];
- int queues, i = 0;
- int ret;
+ Error *local_err = NULL;
+ int err, queues, i = 0;
+ char *str;
+
+ if (dev->realized) {
+ qdev_prop_set_after_realize(dev, name, errp);
+ return;
+ }
+
+ visit_type_str(v, &str, name, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
queues = qemu_find_net_clients_except(str, peers,
NET_CLIENT_OPTIONS_KIND_NIC,
MAX_QUEUE_NUM);
if (queues == 0) {
- ret = -ENOENT;
+ err = -ENOENT;
goto err;
}
if (queues > MAX_QUEUE_NUM) {
- ret = -E2BIG;
+ err = -E2BIG;
goto err;
}
for (i = 0; i < queues; i++) {
if (peers[i] == NULL) {
- ret = -ENOENT;
+ err = -ENOENT;
goto err;
}
if (peers[i]->peer) {
- ret = -EEXIST;
+ err = -EEXIST;
goto err;
}
if (ncs[i]) {
- ret = -EINVAL;
+ err = -EINVAL;
goto err;
}
@@ -219,31 +245,12 @@ static int parse_netdev(DeviceState *dev, const char
*str, void **ptr)
}
peers_ptr->queues = queues;
-
- return 0;
+ g_free(str);
+ return;
err:
- return ret;
-}
-
-static char *print_netdev(void *ptr)
-{
- NetClientState *netdev = ptr;
- const char *val = netdev->name ? netdev->name : "";
-
- return g_strdup(val);
-}
-
-static void get_netdev(Object *obj, Visitor *v, void *opaque,
- const char *name, Error **errp)
-{
- get_pointer(obj, v, opaque, print_netdev, name, errp);
-}
-
-static void set_netdev(Object *obj, Visitor *v, void *opaque,
- const char *name, Error **errp)
-{
- set_pointer(obj, v, opaque, parse_netdev, name, errp);
+ error_set_from_qdev_prop_error(errp, err, dev, prop, str);
+ g_free(str);
}
PropertyInfo qdev_prop_netdev = {
--
1.9.3
- [Qemu-devel] [PULL 0/7] Net patches, Stefan Hajnoczi, 2014/09/04
- [Qemu-devel] [PULL 2/7] net: don't use set/get_pointer() in set/get_netdev(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 1/7] net: Forbid dealing with packets when VM is not running, Stefan Hajnoczi, 2014/09/04
- [Qemu-devel] [PULL 4/7] virtio: don't call device on !vm_running, Stefan Hajnoczi, 2014/09/04
- [Qemu-devel] [PULL 5/7] net: invoke callback when purging queue, Stefan Hajnoczi, 2014/09/04
- [Qemu-devel] [PULL 3/7] virtio-net: don't run bh on vm stopped, Stefan Hajnoczi, 2014/09/04
- [Qemu-devel] [PULL 6/7] net: complete all queued packets on VM stop, Stefan Hajnoczi, 2014/09/04
- [Qemu-devel] [PULL 7/7] virtio-net: purge outstanding packets when starting vhost, Stefan Hajnoczi, 2014/09/04