forked from rpms/libvirt
66 lines
2.3 KiB
Diff
66 lines
2.3 KiB
Diff
|
From d08dae3e94778cf5860b6bd7b34bfbdc4741464c Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <d08dae3e94778cf5860b6bd7b34bfbdc4741464c@dist-git>
|
||
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Date: Wed, 19 Feb 2020 15:09:52 +0100
|
||
|
|
Subject: [PATCH] qemuBlockStorageSourceGetBackendProps: Report errors on all
|
||
|
|
switch cases
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Few switch cases returned failure but didn't report an error. For a
|
||
|
|
situation when the backingStore type='volume' was not translated the
|
||
|
|
following error would occur:
|
||
|
|
|
||
|
|
$ virsh start VM
|
||
|
|
error: Failed to start domain VM
|
||
|
|
error: An error occurred, but the cause is unknown
|
||
|
|
|
||
|
|
After this patch:
|
||
|
|
|
||
|
|
$ virsh start VM
|
||
|
|
error: Failed to start domain VM
|
||
|
|
error: internal error: storage source pool 'tmp' volume 'pull3.qcow2' is not translated
|
||
|
|
|
||
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
(cherry picked from commit 4e3e69fed45ac58bf19ebbe910213cb552d51f01)
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1804603
|
||
|
|
Message-Id: <43cca40afafd5de0aad1f477d63b21d1b10ba796.1582120424.git.pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_block.c | 7 +++++++
|
||
|
|
1 file changed, 7 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
|
||
|
|
index 63116ef5f2..0ee10dd770 100644
|
||
|
|
--- a/src/qemu/qemu_block.c
|
||
|
|
+++ b/src/qemu/qemu_block.c
|
||
|
|
@@ -1081,8 +1081,14 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src,
|
||
|
|
break;
|
||
|
|
|
||
|
|
case VIR_STORAGE_TYPE_VOLUME:
|
||
|
|
+ virReportError(VIR_ERR_INTERNAL_ERROR,
|
||
|
|
+ _("storage source pool '%s' volume '%s' is not translated"),
|
||
|
|
+ src->srcpool->pool, src->srcpool->volume);
|
||
|
|
+ return NULL;
|
||
|
|
+
|
||
|
|
case VIR_STORAGE_TYPE_NONE:
|
||
|
|
case VIR_STORAGE_TYPE_LAST:
|
||
|
|
+ virReportEnumRangeError(virStorageType, actualType);
|
||
|
|
return NULL;
|
||
|
|
|
||
|
|
case VIR_STORAGE_TYPE_NETWORK:
|
||
|
|
@@ -1141,6 +1147,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src,
|
||
|
|
|
||
|
|
case VIR_STORAGE_NET_PROTOCOL_NONE:
|
||
|
|
case VIR_STORAGE_NET_PROTOCOL_LAST:
|
||
|
|
+ virReportEnumRangeError(virStorageNetProtocol, src->protocol);
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
--
|
||
|
|
2.25.0
|
||
|
|
|