Commit 0ff1e1da authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/net' into staging 



# By Vlad Yasevich
# Via Stefan Hajnoczi
* stefanha/net:
  qdev-properties-system.c: Allow vlan or netdev for -device, not both

Message-id: 1385118544-28482-1-git-send-email-stefanha@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 607bb022 30c367ed

hw/core/qdev-properties-system.c

+9 −0
Original line number Diff line number Diff line
@@ -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) {