[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/19] net: Add interface to bridge when SIOCBRADDIF
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 01/19] net: Add interface to bridge when SIOCBRADDIF isn't available |
Date: |
Wed, 1 Aug 2012 13:54:33 +0100 |
From: Corey Bryant <address@hidden>
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 <address@hidden>
Signed-off-by: Corey Bryant <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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;
--
1.7.10.4
- [Qemu-devel] [PULL 00/19] Net patches for QEMU 1.2, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 03/19] net: Use hubs for the vlan feature, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 06/19] net: Drop vlan argument to qemu_new_net_client(), Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 17/19] hub: add the support for hub own flow control, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 05/19] hub: Check that hubs are configured correctly, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 07/19] net: Convert qdev_prop_vlan to peer with hub, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 10/19] net: Rename non_vlan_clients to net_clients, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 01/19] net: Add interface to bridge when SIOCBRADDIF isn't available,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 14/19] net: Make "info network" output more readable info, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 16/19] net: determine if packets can be sent before net queue deliver packets, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 19/19] net: add the support for -netdev socket, listen, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 18/19] net: fix the coding style, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 08/19] net: Remove vlan code from net.c, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 12/19] net: Rename vc local variables to nc, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 13/19] net: Rename qemu_del_vlan_client() to qemu_del_net_client(), Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 11/19] net: Rename VLANClientState to NetClientState, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 09/19] net: Remove VLANState, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 04/19] net: Look up 'vlan' net clients using hubs, Stefan Hajnoczi, 2012/08/01