summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation/xen-tools/files/xen-4.4-qemu-bridge.patch')
-rw-r--r--app-emulation/xen-tools/files/xen-4.4-qemu-bridge.patch79
1 files changed, 0 insertions, 79 deletions
diff --git a/app-emulation/xen-tools/files/xen-4.4-qemu-bridge.patch b/app-emulation/xen-tools/files/xen-4.4-qemu-bridge.patch
deleted file mode 100644
index 8544561..0000000
--- a/app-emulation/xen-tools/files/xen-4.4-qemu-bridge.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/tools/qemu-xen/Makefile b/tools/qemu-xen/Makefile
-index 4d257f1..db2c2ad 100644
---- a/tools/qemu-xen/Makefile
-+++ b/tools/qemu-xen/Makefile
-@@ -62,7 +62,7 @@ $(call set-vpath, $(SRC_PATH))
-
- LIBS+=-lz $(LIBS_TOOLS)
-
--HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
-+HELPERS-$(CONFIG_LINUX) = xen-bridge-helper$(EXESUF)
-
- ifdef BUILD_DOCS
- DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
-@@ -186,7 +186,7 @@ qemu-img$(EXESUF): qemu-img.o $(block-obj-y) libqemuutil.a libqemustub.a
- qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) libqemuutil.a libqemustub.a
- qemu-io$(EXESUF): qemu-io.o $(block-obj-y) libqemuutil.a libqemustub.a
-
--qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
-+xen-bridge-helper$(EXESUF): xen-bridge-helper.o
-
- fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o libqemuutil.a libqemustub.a
- fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
-diff --git a/tools/qemu-xen/include/net/net.h b/tools/qemu-xen/include/net/net.h
-index 30e4b04..6691ff0 100644
---- a/tools/qemu-xen/include/net/net.h
-+++ b/tools/qemu-xen/include/net/net.h
-@@ -178,7 +178,7 @@ NetClientState *net_hub_port_find(int hub_id);
-
- #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
- #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
--#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper"
-+#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/xen-bridge-helper"
- #define DEFAULT_BRIDGE_INTERFACE "br0"
-
- void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
-diff --git a/tools/qemu-xen/qemu-bridge-helper.c b/tools/qemu-xen/qemu-bridge-helper.c
-index 6a0974e..74b4635 100644
---- a/tools/qemu-xen/qemu-bridge-helper.c
-+++ b/tools/qemu-xen/qemu-bridge-helper.c
-@@ -67,7 +67,7 @@ typedef QSIMPLEQ_HEAD(ACLList, ACLRule) ACLList;
- static void usage(void)
- {
- fprintf(stderr,
-- "Usage: qemu-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n");
-+ "Usage: xen-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n");
- }
-
- static int parse_acl_file(const char *filename, ACLList *acl_list)
-diff --git a/tools/qemu-xen/qemu-options.hx b/tools/qemu-xen/qemu-options.hx
-index d15338e..f7104f1 100644
---- a/tools/qemu-xen/qemu-options.hx
-+++ b/tools/qemu-xen/qemu-options.hx
-@@ -1601,7 +1601,7 @@ to disable script execution.
-
- If running QEMU as an unprivileged user, use the network helper
- @var{helper} to configure the TAP interface. The default network
--helper executable is @file{/usr/local/libexec/qemu-bridge-helper}.
-+helper executable is @file{/usr/local/libexec/xen-bridge-helper}.
-
- @option{fd}=@var{h} can be used to specify the handle of an already
- opened host TAP interface.
-@@ -1625,7 +1625,7 @@ qemu-system-i386 linux.img \
- #launch a QEMU instance with the default network helper to
- #connect a TAP device to bridge br0
- qemu-system-i386 linux.img \
-- -net nic -net tap,"helper=/usr/local/libexec/qemu-bridge-helper"
-+ -net nic -net tap,"helper=/usr/local/libexec/xen-bridge-helper"
- @end example
-
- @item -netdev bridge,id=@var{id}[,br=@var{bridge}][,helper=@var{helper}]
-@@ -1634,7 +1634,7 @@ Connect a host TAP network interface to a host bridge device.
-
- Use the network helper @var{helper} to configure the TAP interface and
- attach it to the bridge. The default network helper executable is
--@file{/usr/local/libexec/qemu-bridge-helper} and the default bridge
-+@file{/usr/local/libexec/xen-bridge-helper} and the default bridge
- device is @file{br0}.
-
- Examples: