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
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
From cb982fd919a52ff86f01025d0f92225bc7b2a956 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@suse.de>
|
|
Date: Tue, 10 Mar 2009 16:44:31 +0100
|
|
Subject: [PATCH 5/6] ioemu: Fail on too small blktap disks
|
|
|
|
The blktap infrastructure doesn't seems to be able to cope with images
|
|
that are smaller than a sector, it produced hangs for me. Such an
|
|
image isn't really useful anyway, so just fail gracefully.
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@suse.de>
|
|
---
|
|
hw/xen_blktap.c | 6 ++++++
|
|
1 files changed, 6 insertions(+), 0 deletions(-)
|
|
|
|
Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
|
|
===================================================================
|
|
--- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
|
|
+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
|
|
@@ -268,6 +268,12 @@ static int open_disk(struct td_state *s,
|
|
s->size = bs->total_sectors;
|
|
s->sector_size = 512;
|
|
|
|
+ if (s->size == 0) {
|
|
+ fprintf(stderr, "Error: Disk image %s is too small\n",
|
|
+ path);
|
|
+ return -ENOMEM;
|
|
+ }
|
|
+
|
|
s->info = ((s->flags & TD_RDONLY) ? VDISK_READONLY : 0);
|
|
|
|
return 0;
|
|
Index: xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py
|
|
===================================================================
|
|
--- xen-4.0.2-testing.orig/tools/python/xen/xend/server/DevController.py
|
|
+++ xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py
|
|
@@ -155,7 +155,7 @@ class DevController:
|
|
(devid, self.deviceClass))
|
|
|
|
elif status == Error:
|
|
- self.destroyDevice(devid, False)
|
|
+ self.destroyDevice(devid, True)
|
|
if err is None:
|
|
raise VmError("Device %s (%s) could not be connected. "
|
|
"Backend device not found." %
|