From patchwork Thu Jul 12 13:24:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Bryant X-Patchwork-Id: 170657 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F38A62C0225 for ; Thu, 12 Jul 2012 23:27:07 +1000 (EST) Received: from localhost ([::1]:57161 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpJQA-0006h7-3O for incoming@patchwork.ozlabs.org; Thu, 12 Jul 2012 09:27:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpJQ3-0006gY-BR for qemu-devel@nongnu.org; Thu, 12 Jul 2012 09:27:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SpJPy-00040q-86 for qemu-devel@nongnu.org; Thu, 12 Jul 2012 09:26:59 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:54843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpJPy-00040h-3w for qemu-devel@nongnu.org; Thu, 12 Jul 2012 09:26:54 -0400 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 12 Jul 2012 09:26:53 -0400 Received: from d01dlp01.pok.ibm.com (9.56.224.56) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 12 Jul 2012 09:26:51 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id D66F238C8084 for ; Thu, 12 Jul 2012 09:26:38 -0400 (EDT) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6CDQaGp254648 for ; Thu, 12 Jul 2012 09:26:38 -0400 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6CDOXP6032014 for ; Thu, 12 Jul 2012 07:24:33 -0600 Received: from localhost ([9.80.85.118]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6CDOW3U031961; Thu, 12 Jul 2012 07:24:32 -0600 From: Corey Bryant To: qemu-devel@nongnu.org Date: Thu, 12 Jul 2012 09:24:31 -0400 Message-Id: <1342099471-4993-1-git-send-email-coreyb@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12071213-7182-0000-0000-000001F77CFB X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.139 Cc: markmc@redhat.com, aliguori@us.ibm.com, rmarwah@linux.vnet.ibm.com, Corey Bryant , chouteau@adacore.com, pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH] net: Add interface to bridge when SIOCBRADDIF isn't available X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. Reported-by: Fabien Chouteau Signed-off-by: Corey Bryant Acked-by: Fabien Chouteau --- 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 +#ifndef SIOCBRADDIF +#include +#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;