From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:54379)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <chouteau@adacore.com>) id 1Sphbp-00012e-2i
	for qemu-devel@nongnu.org; Fri, 13 Jul 2012 11:16:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <chouteau@adacore.com>) id 1Sphbf-0005CN-DE
	for qemu-devel@nongnu.org; Fri, 13 Jul 2012 11:16:45 -0400
Received: from mel.act-europe.fr ([194.98.77.210]:43339)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <chouteau@adacore.com>) id 1Sphbf-0005Bp-4F
	for qemu-devel@nongnu.org; Fri, 13 Jul 2012 11:16:35 -0400
Message-ID: <50003BC5.2000200@adacore.com>
Date: Fri, 13 Jul 2012 17:16:21 +0200
From: Fabien Chouteau <chouteau@adacore.com>
MIME-Version: 1.0
References: <1342099471-4993-1-git-send-email-coreyb@linux.vnet.ibm.com>
In-Reply-To: <1342099471-4993-1-git-send-email-coreyb@linux.vnet.ibm.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] net: Add interface to bridge when
	SIOCBRADDIF isn't available
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: Corey Bryant <coreyb@linux.vnet.ibm.com>
Cc: markmc@redhat.com, aliguori@us.ibm.com, rmarwah@linux.vnet.ibm.com, qemu-devel@nongnu.org, pbonzini@redhat.com, afaerber@suse.de

On 07/12/2012 03:24 PM, Corey Bryant wrote:
> The bridge helper uses the SIOCBRADDIF ioctl to add an inteface to
> a bridge.  SIOCBRADDIF is not available on old Linux versions.  This
> patch adds support to use the SIOCDEVPRIVATE ioctl with BRCTL_ADD_IF
> if SIOCBRADDIF is not available.
> 

I don't have time to test it, but the code looks good and in compiles.

Acked-by: Fabien Chouteau <chouteau@adacore.com>

> Reported-by: Fabien Chouteau <chouteau@adacore.com>
> Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
> ---
>  qemu-bridge-helper.c |   24 +++++++++++++++++++++---
>  1 file changed, 21 insertions(+), 3 deletions(-)
> 
> diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
> index aec5008..652eec9 100644
> --- a/qemu-bridge-helper.c
> +++ b/qemu-bridge-helper.c
> @@ -35,6 +35,10 @@
>  
>  #include <linux/sockios.h>
>  
> +#ifndef SIOCBRADDIF
> +#include <linux/if_bridge.h>
> +#endif
> +
>  #include "qemu-queue.h"
>  
>  #include "net/tap-linux.h"
> @@ -221,6 +225,10 @@ static int drop_privileges(void)
>  int main(int argc, char **argv)
>  {
>      struct ifreq ifr;
> +#ifndef SIOCBRADDIF
> +    unsigned long ifargs[4];
> +#endif
> +    int ifindex;
>      int fd, ctlfd, unixfd = -1;
>      int use_vnet = 0;
>      int mtu;
> @@ -361,9 +369,19 @@ int main(int argc, char **argv)
>  
>      /* add the interface to the bridge */
>      prep_ifreq(&ifr, bridge);
> -    ifr.ifr_ifindex = if_nametoindex(iface);
> -
> -    if (ioctl(ctlfd, SIOCBRADDIF, &ifr) == -1) {
> +    ifindex = if_nametoindex(iface);
> +#ifndef SIOCBRADDIF
> +    ifargs[0] = BRCTL_ADD_IF;
> +    ifargs[1] = ifindex;
> +    ifargs[2] = 0;
> +    ifargs[3] = 0;
> +    ifr.ifr_data = (void *)ifargs;
> +    ret = ioctl(ctlfd, SIOCDEVPRIVATE, &ifr);
> +#else
> +    ifr.ifr_ifindex = ifindex;
> +    ret = ioctl(ctlfd, SIOCBRADDIF, &ifr);
> +#endif
> +    if (ret == -1) {
>          fprintf(stderr, "failed to add interface `%s' to bridge `%s': %s\n",
>                  iface, bridge, strerror(errno));
>          ret = EXIT_FAILURE;
> 


-- 
Fabien Chouteau