67dada68-x86-mm-IS_ALIGNED-in-IS_LnE_ALIGNED.patch 67ea4268-x86-P2M-sync-fast-slow-p2m_get_page_from_gfn.patch 67ea428e-percpu-dont-init-on-resume.patch 67f8ecda-rangeset-incorrect-subtraction.patch 6800b54f-x86-HVM-update-repeat-count-upon.patch 68076044-x86emul-clip-rep-count-for-STOS.patch 6808f549-x86-Intel-work-around-MONITOR-MWAIT-errata.patch - Drop build-python3-conversion.patch - refresh replace-obsolete-network-configuration-commands-in-s.patch to not accidently enter untested brctl code paths - bsc#985503 - vif-route.patch is obsolete since Xen 4.15 - bsc#1035231 - remove SUSE specific changes for save/restore/migrate to reduce future maintainence overhead. The bottleneck during migration is the overhead of mapping HVM domU pages into dom0, which was not addressed by these changes. The options --abort_if_busy --max_iters --min_remaining will not be recognized anymore by xl or virsh. libxc-bitmap-long.patch libxc-sr-xl-migration-debug.patch libxc-sr-readv_exact.patch libxc-sr-save-show_transfer_rate.patch libxc-sr-save-mfns.patch libxc-sr-save-types.patch libxc-sr-save-errors.patch libxc-sr-save-iov.patch libxc-sr-save-rec_pfns.patch libxc-sr-save-guest_data.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=890
53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
References: bsc#1172356
|
|
The bug is that virt-manager reports a failure when in fact
|
|
the host and guest have added the network interface. The Xen
|
|
scripts are failing with an error when in fact that command
|
|
is succeeding.
|
|
|
|
The 'ip' commands seem to abort the script due to a 'set -e' in
|
|
xen-script-common.sh with what appears to be an error condition.
|
|
However, the command actually succeeds when checked from the
|
|
host console or also by inserting a sleep before each ip command
|
|
and executing it manually at the command line. This seems to be
|
|
an artifact of using 'set -e' everywhere.
|
|
|
|
---
|
|
tools/hotplug/Linux/xen-network-common.sh | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/tools/hotplug/Linux/xen-network-common.sh
|
|
+++ b/tools/hotplug/Linux/xen-network-common.sh
|
|
@@ -84,7 +84,7 @@
|
|
local virtual="$2"
|
|
|
|
# take interface down ...
|
|
- ip link set dev ${dev} down
|
|
+ ip link set dev ${dev} down || true
|
|
|
|
if [ $virtual -ne 0 ] ; then
|
|
# Initialise a dummy MAC address. We choose the numerically
|
|
@@ -95,7 +95,7 @@
|
|
fi
|
|
|
|
# ... and configure it
|
|
- ip address flush dev ${dev}
|
|
+ ip address flush dev ${dev} || true
|
|
}
|
|
|
|
setup_physical_bridge_port() {
|
|
@@ -123,12 +123,12 @@
|
|
# Don't add $dev to $bridge if it's already on the bridge.
|
|
if [ ! -e "/sys/class/net/${bridge}/brif/${dev}" ]; then
|
|
log debug "adding $dev to bridge $bridge"
|
|
- ip link set ${dev} master ${bridge}
|
|
+ ip link set ${dev} master ${bridge} || true
|
|
else
|
|
log debug "$dev already on bridge $bridge"
|
|
fi
|
|
|
|
- ip link set dev ${dev} up
|
|
+ ip link set dev ${dev} up || true
|
|
}
|
|
|
|
remove_from_bridge () {
|