From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vfju3-00012R-11 for qemu-devel@nongnu.org; Mon, 11 Nov 2013 00:19:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vfjtw-0007Ov-IG for qemu-devel@nongnu.org; Mon, 11 Nov 2013 00:19:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41209) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vfjtw-0007Oi-A3 for qemu-devel@nongnu.org; Mon, 11 Nov 2013 00:19:04 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAB5J2WZ012813 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 11 Nov 2013 00:19:03 -0500 Message-ID: <528068C1.7030107@redhat.com> Date: Mon, 11 Nov 2013 13:18:57 +0800 From: Jason Wang MIME-Version: 1.0 References: <1383876789-15496-1-git-send-email-vyasevic@redhat.com> In-Reply-To: <1383876789-15496-1-git-send-email-vyasevic@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] qdev-properties-system.c: Allow vlan or netdev for -device, not both List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vlad Yasevich , qemu-devel@nongnu.org Cc: stefanha@redhat.com On 11/08/2013 10:13 AM, Vlad Yasevich wrote: > 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 > --- > 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) { Acked-by: Jason Wang