diff options
| author | Markus Armbruster <armbru@redhat.com> | 2010-02-26 15:50:51 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-09 08:47:20 -0600 |
| commit | 27f3f8a362570c5e9eb89b36b6c6d5db7b6e70e3 (patch) | |
| tree | d0de32edc07951138978e8425d09084d3930838d /hw/qdev-properties.c | |
| parent | 6bf38816df80a3b50529119c5458b151b3e2c728 (diff) | |
qdev: Catch attempt to attach more than one device to a netdev
Guest device and host netdev are peers, i.e. it's a 1:1 relation.
However, we fail to enforce that:
$ qemu -nodefaults --nographic -netdev user,id=net0 -device e1000,netdev=net0 -device virtio-net-pci,netdev=net0 -monitor stdio
QEMU 0.12.50 monitor - type 'help' for more information
(qemu) info network
Devices not on any VLAN:
net0: net=10.0.2.0, restricted=n peer=virtio-net-pci.0
e1000.0: model=e1000,macaddr=52:54:00:12:34:56 peer=net0
virtio-net-pci.0: model=virtio-net-pci,macaddr=52:54:00:12:34:57 peer=net0
It's all downhill from there.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/qdev-properties.c')
| -rw-r--r-- | hw/qdev-properties.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 438eaea4d8..24671aff9f 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -341,6 +341,9 @@ static int parse_netdev(DeviceState *dev, Property *prop, const char *str) *ptr = qemu_find_netdev(str); if (*ptr == NULL) return -ENOENT; + if ((*ptr)->peer) { + return -EEXIST; + } return 0; } @@ -557,6 +560,10 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value) ret = prop->info->parse(dev, prop, value); if (ret < 0) { switch (ret) { + case -EEXIST: + fprintf(stderr, "property \"%s.%s\": \"%s\" is already in use\n", + dev->info->name, name, value); + break; default: case -EINVAL: fprintf(stderr, "property \"%s.%s\": failed to parse \"%s\"\n", |