|
 |
99cbc7 |
From 9fba5e8ed9e58e65e2e043e39eea5c9792df64df Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <9fba5e8ed9e58e65e2e043e39eea5c9792df64df@dist-git>
|
|
|
99cbc7 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
99cbc7 |
Date: Fri, 16 Aug 2019 14:36:58 +0200
|
|
|
99cbc7 |
Subject: [PATCH] qemu: Don't report some ignored errors in
|
|
|
99cbc7 |
qemuDomainGetStatsOneBlockFallback
|
|
|
99cbc7 |
MIME-Version: 1.0
|
|
|
99cbc7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
99cbc7 |
Content-Transfer-Encoding: 8bit
|
|
|
99cbc7 |
|
|
|
99cbc7 |
The function ignores all errors from qemuStorageLimitsRefresh by calling
|
|
|
99cbc7 |
virResetLastError. This still logs them. Since qemuStorageLimitsRefresh
|
|
|
99cbc7 |
allows suppressing some, do so.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit 60b862cf9d6a335db65bbf2b011499dfa729ca2e)
|
|
|
99cbc7 |
https: //bugzilla.redhat.com/show_bug.cgi?id=1724808
|
|
|
99cbc7 |
Message-Id: <8d6542c54e9518384b1c1eca081edae31a74fed6.1565958906.git.pkrempa@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
src/qemu/qemu_driver.c | 2 +-
|
|
|
99cbc7 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
99cbc7 |
index 88a9f565c4..d95c97928d 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_driver.c
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_driver.c
|
|
|
99cbc7 |
@@ -20035,7 +20035,7 @@ qemuDomainGetStatsOneBlockFallback(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
if (virStorageSourceIsEmpty(src))
|
|
|
99cbc7 |
return 0;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
- if (qemuStorageLimitsRefresh(driver, cfg, dom, src, false) < 0) {
|
|
|
99cbc7 |
+ if (qemuStorageLimitsRefresh(driver, cfg, dom, src, true) <= 0) {
|
|
|
99cbc7 |
virResetLastError();
|
|
|
99cbc7 |
return 0;
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.22.1
|
|
|
99cbc7 |
|