57 lines
2.5 KiB
Diff
57 lines
2.5 KiB
Diff
|
From be8bbeb7368db79f3a2e0502a772daf951089357 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: wangmeiyang <wangmeiyang_yewu@cmss.chinamobile.com>
|
|||
|
|
Date: Wed, 23 Nov 2022 14:46:20 +0800
|
|||
|
|
Subject: [PATCH 02/23] qemu: fix null string specifier argument in
|
|||
|
|
qemuDomainBlockJobAbort
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
Detected by gcc 11 -Wformat-overflow:
|
|||
|
|
../../src/qemu/qemu_driver.c: In function ‘qemuDomainBlockJobAbort’:
|
|||
|
|
../../src/util/virerror.h:176:5: warning: ‘%s’ directive argument is null [-Wformat-overflow=]
|
|||
|
|
176 | virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \
|
|||
|
|
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|||
|
|
177 | __FUNCTION__, __LINE__, __VA_ARGS__)
|
|||
|
|
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|||
|
|
../../src/qemu/qemu_driver.c:14475:17: note: in expansion of macro ‘virReportError’
|
|||
|
|
14475 | virReportError(VIR_ERR_OPERATION_FAILED,
|
|||
|
|
| ^~~~~~~~~~~~~~
|
|||
|
|
../../src/qemu/qemu_driver.c:14476:73: note: format string is defined here
|
|||
|
|
14476 | _("block job '%s' failed while pivoting: %s"),
|
|||
|
|
| ^~
|
|||
|
|
cherry-pick from 8c6fa38efca52adabec48989fd6e4244a44859a5
|
|||
|
|
|
|||
|
|
Signed-off-by: Scott Davis <scott.davis@starlab.io>
|
|||
|
|
Signed-off-by: Meiyang Wang <wangmeiyang@cmss.chinamobile.com>
|
|||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|||
|
|
---
|
|||
|
|
src/qemu/qemu_driver.c | 8 ++++----
|
|||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|||
|
|
|
|||
|
|
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|||
|
|
index a3617b4d73..167b74acfd 100644
|
|||
|
|
--- a/src/qemu/qemu_driver.c
|
|||
|
|
+++ b/src/qemu/qemu_driver.c
|
|||
|
|
@@ -17590,13 +17590,13 @@ qemuDomainBlockJobAbort(virDomainPtr dom,
|
|||
|
|
if (pivot &&
|
|||
|
|
job->state == QEMU_BLOCKJOB_STATE_FAILED) {
|
|||
|
|
if (job->errmsg) {
|
|||
|
|
- virReportError(VIR_ERR_OPERATION_FAILED,
|
|||
|
|
- _("block job '%s' failed while pivoting"),
|
|||
|
|
- job->name);
|
|||
|
|
- } else {
|
|||
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|||
|
|
_("block job '%s' failed while pivoting: %s"),
|
|||
|
|
job->name, job->errmsg);
|
|||
|
|
+ } else {
|
|||
|
|
+ virReportError(VIR_ERR_OPERATION_FAILED,
|
|||
|
|
+ _("block job '%s' failed while pivoting"),
|
|||
|
|
+ job->name);
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
ret = -1;
|
|||
|
|
--
|
|||
|
|
2.27.0
|
|||
|
|
|