0c76f22ef1
- bnc#633573 - System fail to boot after running several warm reboot tests 22749-vtd-workarounds.patch - Upstream patches from Jan 22744-ept-pod-locking.patch 22777-vtd-ats-fixes.patch 22781-pod-hap-logdirty.patch 22782-x86-emul-smsw.patch 22789-i386-no-x2apic.patch 22790-svm-resume-migrate-pirqs.patch 22816-x86-pirq-drop-priv-check.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=94
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
Subject: hotplug: allow hardlinked files for block device images
|
|
|
|
tools/hotplug/Linux/block change for this losetup -a output:
|
|
inode 12 is listed twice due to hardlinks
|
|
|
|
/dev/loop0: [0809]:139267 (/abuild/vdisk-sles11_2-disk0)
|
|
/dev/loop1: [0809]:139266 (/abuild/vdisk-sles11_1-disk1)
|
|
/dev/loop3: [0809]:139267 (/abuild/vdisk-sles11_2-disk0)
|
|
/dev/loop5: [0809]:139273 (/abuild/vdisk-sles11_5-disk1)
|
|
/dev/loop8: [0809]:12 (/abuild/bootiso-xenpaging-sles11_5.iso)
|
|
/dev/loop10: [0809]:12 (/abuild/bootiso-xenpaging-sles11_4.iso)
|
|
/dev/loop11: [0809]:139271 (/abuild/vdisk-sles11_4-disk0)
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
---
|
|
tools/hotplug/Linux/block | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: xen-4.0.2-testing/tools/hotplug/Linux/block
|
|
===================================================================
|
|
--- xen-4.0.2-testing.orig/tools/hotplug/Linux/block
|
|
+++ xen-4.0.2-testing/tools/hotplug/Linux/block
|
|
@@ -279,8 +279,8 @@ mount it read-write in a guest domain."
|
|
fatal "Unable to lookup $file: dev: $dev inode: $inode"
|
|
fi
|
|
|
|
- shared_list=$(losetup -a | grep ' \[0*'${dev}'\]:'${inode} |
|
|
- cut -d : -f 1)
|
|
+ shared_list=$(losetup -a |
|
|
+ sed -n -e "s@^\([^:]\+\)\(:[[:blank:]]\[${dev}\]:${inode}[[:blank:]](${file})\)@\1@p" )
|
|
for dev in "$shared_list"
|
|
do
|
|
if [ -n "$dev" ]
|