|
 |
c1c534 |
From 73e3efc5dae126514b00a8538664609810cadbc4 Mon Sep 17 00:00:00 2001
|
|
|
c1c534 |
Message-Id: <73e3efc5dae126514b00a8538664609810cadbc4@dist-git>
|
|
|
c1c534 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
c1c534 |
Date: Mon, 13 Nov 2017 13:48:09 +0100
|
|
|
c1c534 |
Subject: [PATCH] conf: Fix message when maximum vCPU count is less than
|
|
|
c1c534 |
current
|
|
|
c1c534 |
|
|
|
c1c534 |
Reword the message and drop the numbers (which were reversed) from it
|
|
|
c1c534 |
so that it actually makes sense.
|
|
|
c1c534 |
|
|
|
c1c534 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1509151
|
|
|
c1c534 |
(cherry picked from commit 50712e14f40ffdac8a71ce9ef091e4e7bd822585)
|
|
|
c1c534 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c1c534 |
---
|
|
|
c1c534 |
src/conf/domain_conf.c | 6 +++---
|
|
|
c1c534 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
c1c534 |
|
|
|
c1c534 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
c1c534 |
index 3b337d1a64..ca5d0bcc54 100644
|
|
|
c1c534 |
--- a/src/conf/domain_conf.c
|
|
|
c1c534 |
+++ b/src/conf/domain_conf.c
|
|
|
c1c534 |
@@ -1505,9 +1505,9 @@ virDomainDefSetVcpus(virDomainDefPtr def,
|
|
|
c1c534 |
size_t i;
|
|
|
c1c534 |
|
|
|
c1c534 |
if (vcpus > def->maxvcpus) {
|
|
|
c1c534 |
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
c1c534 |
- _("maxvcpus must not be less than current vcpus (%u < %zu)"),
|
|
|
c1c534 |
- vcpus, def->maxvcpus);
|
|
|
c1c534 |
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
|
c1c534 |
+ _("maximum vCPU count must not be less than current "
|
|
|
c1c534 |
+ "vCPU count"));
|
|
|
c1c534 |
return -1;
|
|
|
c1c534 |
}
|
|
|
c1c534 |
|
|
|
c1c534 |
--
|
|
|
c1c534 |
2.15.0
|
|
|
c1c534 |
|