047483513a
xen-4.6.0-testing-src.tar.bz2 mini-os.tar.bz2 blktap2-no-uninit.patch stubdom-have-iovec.patch - Renamed xsa149.patch to CVE-2015-7969-xsa149.patch - Dropped patches now contained in tarball or unnecessary xen-4.5.2-testing-src.tar.bz2 54c2553c-grant-table-use-uint16_t-consistently-for-offset-and-length.patch 54ca33bc-grant-table-refactor-grant-copy-to-reduce-duplicate-code.patch 54ca340e-grant-table-defer-releasing-pages-acquired-in-a-grant-copy.patch 54f4985f-libxl-fix-libvirtd-double-free.patch 55103616-vm-assist-prepare-for-discontiguous-used-bit-numbers.patch 551ac326-xentop-add-support-for-qdisk.patch 552d0fd2-x86-hvm-don-t-include-asm-spinlock-h.patch 552d0fe8-x86-mtrr-include-asm-atomic.h.patch 552d293b-x86-vMSI-X-honor-all-mask-requests.patch 552d2966-x86-vMSI-X-add-valid-bits-for-read-acceleration.patch 5537a4d8-libxl-use-DEBUG-log-level-instead-of-INFO.patch 5548e903-domctl-don-t-truncate-XEN_DOMCTL_max_mem-requests.patch 5548e95d-x86-allow-to-suppress-M2P-user-mode-exposure.patch 554c7aee-x86-provide-arch_fetch_and_add.patch 554c7b00-arm-provide-arch_fetch_and_add.patch 554cc211-libxl-add-qxl.patch 55534b0a-x86-provide-add_sized.patch 55534b25-arm-provide-add_sized.patch 5555a4f8-use-ticket-locks-for-spin-locks.patch 5555a5b9-x86-arm-remove-asm-spinlock-h.patch 5555a8ec-introduce-non-contiguous-allocation.patch 556d973f-unmodified-drivers-tolerate-IRQF_DISABLED-being-undefined.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=387
86 lines
3.4 KiB
Diff
86 lines
3.4 KiB
Diff
Index: xen-4.6.0-testing/tools/qemu-xen-traditional-dir-remote/net.h
|
|
===================================================================
|
|
--- xen-4.6.0-testing.orig/tools/qemu-xen-traditional-dir-remote/net.h
|
|
+++ xen-4.6.0-testing/tools/qemu-xen-traditional-dir-remote/net.h
|
|
@@ -107,8 +107,8 @@ void net_host_device_add(const char *dev
|
|
void net_host_device_remove(int vlan_id, const char *device);
|
|
|
|
#ifndef DEFAULT_NETWORK_SCRIPT
|
|
-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
|
|
-#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
|
|
+#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup"
|
|
+#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/xen/qemu-ifdown"
|
|
#endif
|
|
#ifdef __sun__
|
|
#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
|
|
Index: xen-4.6.0-testing/tools/qemu-xen-traditional-dir-remote/net.c
|
|
===================================================================
|
|
--- xen-4.6.0-testing.orig/tools/qemu-xen-traditional-dir-remote/net.c
|
|
+++ xen-4.6.0-testing/tools/qemu-xen-traditional-dir-remote/net.c
|
|
@@ -1765,9 +1765,10 @@ int net_client_init(const char *device,
|
|
}
|
|
if (get_param_value(script_arg, sizeof(script_arg), "scriptarg", p) == 0 &&
|
|
get_param_value(script_arg, sizeof(script_arg), "bridge", p) == 0) { /* deprecated; for xend compatibility */
|
|
- pstrcpy(script_arg, sizeof(script_arg), "");
|
|
+ ret = net_tap_init(vlan, device, name, ifname, setup_script, NULL, NULL);
|
|
+ } else {
|
|
+ ret = net_tap_init(vlan, device, name, ifname, setup_script, down_script, script_arg);
|
|
}
|
|
- ret = net_tap_init(vlan, device, name, ifname, setup_script, down_script, script_arg);
|
|
}
|
|
} else
|
|
#endif
|
|
Index: xen-4.6.0-testing/tools/qemu-xen-traditional-dir-remote/i386-dm/qemu-ifup-Linux
|
|
===================================================================
|
|
--- xen-4.6.0-testing.orig/tools/qemu-xen-traditional-dir-remote/i386-dm/qemu-ifup-Linux
|
|
+++ xen-4.6.0-testing/tools/qemu-xen-traditional-dir-remote/i386-dm/qemu-ifup-Linux
|
|
@@ -1,36 +1,22 @@
|
|
#!/bin/sh
|
|
|
|
-#. /etc/rc.d/init.d/functions
|
|
-#ulimit -c unlimited
|
|
-
|
|
echo 'config qemu network with xen bridge for ' $*
|
|
|
|
+# If bridge is not specified, try device with default route.
|
|
bridge=$2
|
|
+if [ -z "$bridge" ]; then
|
|
+ bridge=$(ip route list | awk '/^default / { print $NF }')
|
|
+fi
|
|
|
|
-#
|
|
-# Old style bridge setup with netloop, used to have a bridge name
|
|
-# of xenbrX, enslaving pethX and vif0.X, and then configuring
|
|
-# eth0.
|
|
-#
|
|
-# New style bridge setup does not use netloop, so the bridge name
|
|
-# is ethX and the physical device is enslaved pethX
|
|
-#
|
|
-# So if...
|
|
-#
|
|
-# - User asks for xenbrX
|
|
-# - AND xenbrX doesn't exist
|
|
-# - AND there is a ethX device which is a bridge
|
|
-#
|
|
-# ..then we translate xenbrX to ethX
|
|
-#
|
|
-# This lets old config files work without modification
|
|
-#
|
|
-if [ ! -e "/sys/class/net/$bridge" ] && [ -z "${bridge##xenbr*}" ]
|
|
+# Exit if $bridge is not a bridge. Exit with 0 status
|
|
+# so qemu-dm process is not terminated. No networking in
|
|
+# vm is bad but not catastrophic. The vm could still run
|
|
+# cpu and disk IO workloads.
|
|
+# Include an useful error message in qemu-dm log file.
|
|
+if [ ! -e "/sys/class/net/${bridge}/bridge" ]
|
|
then
|
|
- if [ -e "/sys/class/net/eth${bridge#xenbr}/bridge" ]
|
|
- then
|
|
- bridge="eth${bridge#xenbr}"
|
|
- fi
|
|
+ echo "WARNING! ${bridge} is not a bridge. qemu-ifup exiting. VM may not have a functioning networking stack."
|
|
+ exit 0
|
|
fi
|
|
|
|
ifconfig $1 0.0.0.0 up
|