|
 |
6d3351 |
From 498fbdbe081260f7e42a1659e11912f9f2c0e5ad Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <498fbdbe081260f7e42a1659e11912f9f2c0e5ad@dist-git>
|
|
|
6d3351 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
6d3351 |
Date: Tue, 4 Apr 2017 09:31:21 +0200
|
|
|
6d3351 |
Subject: [PATCH] qemu: hotplug: Fix formatting strings in
|
|
|
6d3351 |
qemuDomainFilterHotplugVcpuEntities
|
|
|
6d3351 |
|
|
|
6d3351 |
'next' is declared as 'ssize_t' so use '%zd'
|
|
|
6d3351 |
|
|
|
6d3351 |
(cherry picked from commit 86d69c309181ed7782427261abd85a4b3fdc704f)
|
|
|
6d3351 |
|
|
|
6d3351 |
https://bugzilla.redhat.com/show_bug.cgi?id=1437010
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/qemu/qemu_hotplug.c | 8 ++++----
|
|
|
6d3351 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
|
|
|
6d3351 |
index b5b520d8c..48de6b815 100644
|
|
|
6d3351 |
--- a/src/qemu/qemu_hotplug.c
|
|
|
6d3351 |
+++ b/src/qemu/qemu_hotplug.c
|
|
|
6d3351 |
@@ -5823,13 +5823,13 @@ qemuDomainFilterHotplugVcpuEntities(virDomainDefPtr def,
|
|
|
6d3351 |
|
|
|
6d3351 |
if (vcpu->online == state) {
|
|
|
6d3351 |
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
6d3351 |
- _("vcpu '%zu' is already in requested state"), next);
|
|
|
6d3351 |
+ _("vcpu '%zd' is already in requested state"), next);
|
|
|
6d3351 |
goto cleanup;
|
|
|
6d3351 |
}
|
|
|
6d3351 |
|
|
|
6d3351 |
if (vcpu->online && !vcpu->hotpluggable) {
|
|
|
6d3351 |
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
6d3351 |
- _("vcpu '%zu' can't be hotunplugged"), next);
|
|
|
6d3351 |
+ _("vcpu '%zd' can't be hotunplugged"), next);
|
|
|
6d3351 |
goto cleanup;
|
|
|
6d3351 |
}
|
|
|
6d3351 |
}
|
|
|
6d3351 |
@@ -5845,7 +5845,7 @@ qemuDomainFilterHotplugVcpuEntities(virDomainDefPtr def,
|
|
|
6d3351 |
|
|
|
6d3351 |
if (vcpupriv->vcpus == 0) {
|
|
|
6d3351 |
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
6d3351 |
- _("vcpu '%zu' belongs to a larger hotpluggable entity, "
|
|
|
6d3351 |
+ _("vcpu '%zd' belongs to a larger hotpluggable entity, "
|
|
|
6d3351 |
"but siblings were not selected"), next);
|
|
|
6d3351 |
goto cleanup;
|
|
|
6d3351 |
}
|
|
|
6d3351 |
@@ -5854,7 +5854,7 @@ qemuDomainFilterHotplugVcpuEntities(virDomainDefPtr def,
|
|
|
6d3351 |
if (!virBitmapIsBitSet(map, i)) {
|
|
|
6d3351 |
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
6d3351 |
_("vcpu '%zu' was not selected but it belongs to "
|
|
|
6d3351 |
- "hotpluggable entity '%zu-%zu' which was "
|
|
|
6d3351 |
+ "hotpluggable entity '%zd-%zd' which was "
|
|
|
6d3351 |
"partially selected"),
|
|
|
6d3351 |
i, next, next + vcpupriv->vcpus - 1);
|
|
|
6d3351 |
goto cleanup;
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.12.2
|
|
|
6d3351 |
|