From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:35817)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1StOOw-0002lB-IX
	for qemu-devel@nongnu.org; Mon, 23 Jul 2012 15:34:43 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1StOOv-0003JX-LR
	for qemu-devel@nongnu.org; Mon, 23 Jul 2012 15:34:42 -0400
Received: from mx1.redhat.com ([209.132.183.28]:39127)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1StOOv-0003JF-E4
	for qemu-devel@nongnu.org; Mon, 23 Jul 2012 15:34:41 -0400
Message-ID: <500DA77F.5010008@redhat.com>
Date: Mon, 23 Jul 2012 21:35:27 +0200
From: Laszlo Ersek <lersek@redhat.com>
MIME-Version: 1.0
References: <1342785709-3152-1-git-send-email-stefanha@linux.vnet.ibm.com>
	<1342785709-3152-6-git-send-email-stefanha@linux.vnet.ibm.com>
In-Reply-To: <1342785709-3152-6-git-send-email-stefanha@linux.vnet.ibm.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 05/16] net: Drop vlan argument to
	qemu_new_net_client()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>, Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>, qemu-devel@nongnu.org, Zhi Yong Wu <wuzhy@cn.ibm.com>

On 07/20/12 14:01, Stefan Hajnoczi wrote:
> Since hubs are now used to implement the 'vlan' feature and the vlan
> argument is always NULL, remove the argument entirely and update all net
> clients that use qemu_new_net_client().

> @@ -249,7 +242,7 @@ NICState *qemu_new_nic(NetClientInfo *info,
>      assert(info->type == NET_CLIENT_OPTIONS_KIND_NIC);
>      assert(info->size >= sizeof(NICState));
>  
> -    nc = qemu_new_net_client(info, conf->vlan, conf->peer, model, name);
> +    nc = qemu_new_net_client(info, conf->peer, model, name);

The vlan argument depends on the caller here. I found the following
three callers that (may) set a non-NULL conf->vlan (at this point in the
series):

dp83932_init()
mcf_fec_init()
net_init() [hw/xen_nic.c]

However patch 8 ("net: Remove VLANState") fixes up the first two, and
patch 7 ("net: Remove vlan code from net.c") the last one.

Reviewed-by: Laszlo Ersek <lersek@redhat.com>