aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorVlad Yasevich <vyasevic@redhat.com>2013-11-07 21:13:09 -0500
committerStefan Hajnoczi <stefanha@redhat.com>2013-11-22 09:47:00 +0100
commit30c367ed446b6ea53245589a5cf373578ac075d7 (patch)
treeec3803f73d5d69c6f888ad63f65b8f34514d939e /hw
parent607bb022f2a44797cbf40e85e84da4134e2f0e01 (diff)
downloadqemu-30c367ed446b6ea53245589a5cf373578ac075d7.zip
qemu-30c367ed446b6ea53245589a5cf373578ac075d7.tar.gz
qemu-30c367ed446b6ea53245589a5cf373578ac075d7.tar.bz2
qdev-properties-system.c: Allow vlan or netdev for -device, not both
It is currently possible to specify things like: -device e1000,netdev=foo,vlan=1 With this usage, whichever argument was specified last (vlan or netdev) overwrites what was previousely set and results in a non-working configuration. Even worse, when used with multiqueue devices, it causes a segmentation fault on exit in qemu_free_net_client. That patch treates the above command line options as invalid and generates an error at start-up. Signed-off-by: Vlad Yasevich <vyasevic@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/core/qdev-properties-system.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 0eada32..729efa8 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -205,6 +205,11 @@ static int parse_netdev(DeviceState *dev, const char *str, void **ptr)
goto err;
}
+ if (ncs[i]) {
+ ret = -EINVAL;
+ goto err;
+ }
+
ncs[i] = peers[i];
ncs[i]->queue_index = i;
}
@@ -301,6 +306,10 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque,
*ptr = NULL;
return;
}
+ if (*ptr) {
+ error_set_from_qdev_prop_error(errp, -EINVAL, dev, prop, name);
+ return;
+ }
hubport = net_hub_port_find(id);
if (!hubport) {