[Qemu-devel] [PULL for-1.7 0/1] Net patches

[Qemu-devel] [PULL for-1.7 0/1] Net patches

[Stefan Hajnoczi]

A fix for the smc91c111 NIC.

The following changes since commit 5c5432e7d630592ddcc1876ac8a1505f8f14ef15:

  Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-11-13 11:49:27 -0800)

are available in the git repository at:


  git://github.com/stefanha/qemu.git net

for you to fetch changes up to 8b7acc79b9adb4dda6cc867b90e3a1e873f4f7e8:

  smc91c111: Fix receive starvation (2013-11-15 13:25:39 +0100)

----------------------------------------------------------------
Sebastian Huber (1):
      smc91c111: Fix receive starvation

 hw/net/smc91c111.c | 1 +
 1 file changed, 1 insertion(+)

-- 
1.8.3.1

[Qemu-devel] [PULL for-1.7 0/1] net patches

[Stefan Hajnoczi]

Bug fix for netdev/vlan configuration.

The following changes since commit 607bb022f2a44797cbf40e85e84da4134e2f0e01:

  Update version for 1.7.0-rc1 release (2013-11-21 08:11:47 -0800)

are available in the git repository at:

  git://github.com/stefanha/qemu.git net

for you to fetch changes up to 30c367ed446b6ea53245589a5cf373578ac075d7:

  qdev-properties-system.c: Allow vlan or netdev for -device, not both (2013-11-22 09:47:00 +0100)

----------------------------------------------------------------
Vlad Yasevich (1):
      qdev-properties-system.c: Allow vlan or netdev for -device, not both

 hw/core/qdev-properties-system.c | 9 +++++++++
 1 file changed, 9 insertions(+)

-- 
1.8.4.2

[Qemu-devel] [PULL 1/1] qdev-properties-system.c: Allow vlan or netdev for -device, not both

[Stefan Hajnoczi]

From: Vlad Yasevich <vyasevic@redhat.com>

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>
---
 hw/core/qdev-properties-system.c | 9 +++++++++
 1 file changed, 9 insertions(+)

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) {
-- 
1.8.4.2