9a05aa7fc4
22707-x2apic-preenabled-check.patch - bnc#641419 - L3: Xen: qemu-dm reports "xc_map_foreign_batch: mmap failed: Cannot allocate memory" 7434-qemu-rlimit-as.patch - Additional or upstream patches from Jan 22693-fam10-mmio-conf-base-protect.patch 22694-x86_64-no-weak.patch 22708-xenctx-misc.patch 21432-4.0-cpu-boot-failure.patch 22645-amd-flush-filter.patch qemu-fix-7433.patch - Maintain compatibility with the extid flag even though it is deprecated for both legacy and sxp config files. hv_extid_compatibility.patch - bnc#649209-improve suspend eventchn lock suspend_evtchn_lock.patch - Removed the hyper-v shim patches in favor of using the upstream version. - bnc#641419 - L3: Xen: qemu-dm reports "xc_map_foreign_batch: mmap failed: Cannot allocate memory" qemu-rlimit-as.patch - Upstream c/s 7433 to replace qemu_altgr_more.patch 7433-qemu-altgr.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=90
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.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
|
|
===================================================================
|
|
--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
|
|
+++ xen-4.0.1-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.1-testing/tools/python/xen/xend/server/DevController.py
|
|
===================================================================
|
|
--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/DevController.py
|
|
+++ xen-4.0.1-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." %
|