|
 |
3e5111 |
From bd25ad4689524e4212a72c7d40a18e91071cfa35 Mon Sep 17 00:00:00 2001
|
|
|
3e5111 |
Message-Id: <bd25ad4689524e4212a72c7d40a18e91071cfa35@dist-git>
|
|
|
3e5111 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
3e5111 |
Date: Fri, 2 Jun 2017 12:52:56 +0200
|
|
|
3e5111 |
Subject: [PATCH] qemu: Don't error out if allocation info can't be queried
|
|
|
3e5111 |
|
|
|
3e5111 |
qemuDomainGetBlockInfo would error out if qemu did not report
|
|
|
3e5111 |
'wr_highest_offset'. This usually does not happen, but can happen
|
|
|
3e5111 |
briefly during active layer block commit. There's no need to report the
|
|
|
3e5111 |
error, we can simply report that the disk is fully alocated at that
|
|
|
3e5111 |
point.
|
|
|
3e5111 |
|
|
|
3e5111 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452045
|
|
|
3e5111 |
(cherry picked from commit c245f558369de5eb404e54728bf69ad27942e912)
|
|
|
3e5111 |
|
|
|
3e5111 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
3e5111 |
---
|
|
|
3e5111 |
src/qemu/qemu_driver.c | 8 --------
|
|
|
3e5111 |
1 file changed, 8 deletions(-)
|
|
|
3e5111 |
|
|
|
3e5111 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
3e5111 |
index b741c1b5a6..fdfa4a50e1 100644
|
|
|
3e5111 |
--- a/src/qemu/qemu_driver.c
|
|
|
3e5111 |
+++ b/src/qemu/qemu_driver.c
|
|
|
3e5111 |
@@ -11555,14 +11555,6 @@ qemuDomainGetBlockInfo(virDomainPtr dom,
|
|
|
3e5111 |
}
|
|
|
3e5111 |
|
|
|
3e5111 |
if (!entry->wr_highest_offset_valid) {
|
|
|
3e5111 |
- if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_BLOCK &&
|
|
|
3e5111 |
- disk->src->format != VIR_STORAGE_FILE_RAW) {
|
|
|
3e5111 |
- virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
3e5111 |
- _("failed to query the maximum written offset of "
|
|
|
3e5111 |
- "block device '%s'"), disk->dst);
|
|
|
3e5111 |
- goto endjob;
|
|
|
3e5111 |
- }
|
|
|
3e5111 |
-
|
|
|
3e5111 |
info->allocation = entry->physical;
|
|
|
3e5111 |
} else {
|
|
|
3e5111 |
if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_FILE &&
|
|
|
3e5111 |
--
|
|
|
3e5111 |
2.13.1
|
|
|
3e5111 |
|