From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:43674)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1StJ6H-0005Kr-EB
	for qemu-devel@nongnu.org; Mon, 23 Jul 2012 09:55:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1StJ66-0005V9-Fk
	for qemu-devel@nongnu.org; Mon, 23 Jul 2012 09:55:05 -0400
Received: from mx1.redhat.com ([209.132.183.28]:55653)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1StJ66-0005V5-6F
	for qemu-devel@nongnu.org; Mon, 23 Jul 2012 09:54:54 -0400
Message-ID: <500D57EB.2070603@redhat.com>
Date: Mon, 23 Jul 2012 15:55:55 +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-3-git-send-email-stefanha@linux.vnet.ibm.com>
In-Reply-To: <1342785709-3152-3-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 02/16] net: Use hubs for the vlan feature
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:

> diff --git a/net.c b/net.c
> index e7a8d81..f2752c7 100644
> --- a/net.c
> +++ b/net.c
> @@ -25,6 +25,7 @@
>  
>  #include "config-host.h"
>  
> +#include "net/hub.h"
>  #include "net/tap.h"
>  #include "net/socket.h"
>  #include "net/dump.h"

This includes "net/hub.h" for the second time in "net.c" (still true at
the end of the series). Causes no problems, of course.


> @@ -876,17 +879,17 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp)
>      }
>  
>      if (net_client_init_fun[opts->kind]) {
> -        VLANState *vlan = NULL;
> +        VLANClientState *peer = NULL;
>  
>          /* Do not add to a vlan if it's a -netdev or a nic with a netdev=
>           * parameter. */
>          if (!is_netdev &&
>              (opts->kind != NET_CLIENT_OPTIONS_KIND_NIC ||
>               !opts->nic->has_netdev)) {
> -            vlan = qemu_find_vlan(u.net->has_vlan ? u.net->vlan : 0, true);
> +            peer = net_hub_add_port(u.net->has_vlan ? u.net->vlan : 0, NULL);
>          }

"u.net->vlan" is int32_t ('int32' in the schema
<http://lists.nongnu.org/archive/html/qemu-devel/2012-06/msg01675.html>); net_hub_add_port()
expects unsigned.


> diff --git a/net/dump.h b/net/dump.h
> index 0fa2dd7..a1beb0d 100644
> --- a/net/dump.h
> +++ b/net/dump.h
> @@ -28,6 +28,6 @@
>  #include "qapi-types.h"
>  
>  int net_init_dump(const NetClientOptions *opts, const char *name,
> -                  VLANState *vlan);
> +                  VLANClientState *vlan);
>  
>  #endif /* QEMU_NET_DUMP_H */

Should be called "peer", but it will be renamed later on. Same for
"net/slirp.h".

Laszlo