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 <ler...@redhat.com>
