From f2f33082336f258ce6c057b021c4cee5a1d08864576ed522201465b8f6a03b1d Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Mon, 24 Aug 2015 16:33:48 +0000 Subject: [PATCH] - storage: only run safezero if allocation is > 0 269d39af-storage-allocation-fix.patch bsc#942085 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=477 --- 269d39af-storage-allocation-fix.patch | 35 +++++++++++++++++++++++++++ libvirt.changes | 7 ++++++ libvirt.spec | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 269d39af-storage-allocation-fix.patch diff --git a/269d39af-storage-allocation-fix.patch b/269d39af-storage-allocation-fix.patch new file mode 100644 index 0000000..5ff079f --- /dev/null +++ b/269d39af-storage-allocation-fix.patch @@ -0,0 +1,35 @@ +commit 269d39afe5c59ecb3d3d64dba52f8cfa8d63d197 +Author: Guido Günther +Date: Sun Aug 23 22:03:54 2015 +0200 + + storage: only run safezero if allocation is > 0 + + While a zero allocation in safezero should be fine it isn't when we use + posix_fallocate which returns EINVAL on a zero allocation. + + While we could skip the zero allocation in safezero_posix_fallocate it's + an optimization to do it for all allocations. + + This fixes vm installation via virtinst for me which otherwise aborts + like: + + Starting install... + Retrieving file linux... | 5.9 MB 00:01 ... + Retrieving file initrd.gz... | 29 MB 00:07 ... + ERROR Couldn't create storage volume 'virtinst-linux.sBgds4': 'cannot fill file '/var/lib/libvirt/boot/virtinst-linux.sBgds4': Invalid argument' + + The error was introduced by e30297b0 as spotted by Chunyan Liu + +Index: libvirt-1.2.18/src/storage/storage_backend.c +=================================================================== +--- libvirt-1.2.18.orig/src/storage/storage_backend.c ++++ libvirt-1.2.18/src/storage/storage_backend.c +@@ -455,7 +455,7 @@ createRawFile(int fd, virStorageVolDefPt + pos = inputvol->target.capacity - remain; + } + +- if (need_alloc) { ++ if (need_alloc && (vol->target.allocation - pos > 0)) { + if (safezero(fd, pos, vol->target.allocation - pos) < 0) { + ret = -errno; + virReportSystemError(errno, _("cannot fill file '%s'"), diff --git a/libvirt.changes b/libvirt.changes index fb35fe0..f5c5ff7 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 24 16:18:10 UTC 2015 - jfehlig@suse.com + +- storage: only run safezero if allocation is > 0 + 269d39af-storage-allocation-fix.patch + bsc#942085 + ------------------------------------------------------------------- Mon Aug 3 23:32:39 UTC 2015 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 320e3e2..813a6d8 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -446,6 +446,7 @@ Source3: libvirtd.init Source4: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches +Patch0: 269d39af-storage-allocation-fix.patch # Patches pending upstream review Patch100: 0003-libxl-fix-ref-counting-of-libxlMigrationDstArgs.patch Patch101: 0004-libxl-don-t-attempt-to-resume-domain-when-suspend-fa.patch @@ -979,6 +980,7 @@ Provides a dissector for the libvirt RPC protocol to help debugging it. %prep %setup -q +%patch0 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1