[PATCH 15/23] qemu: Clean up check of maximum cpu count supported by a machine type

[Peter Krempa <pkrempa@xxxxxxxxxx>]

Reword the error message and change formating to avoid exceeding 80
columns of text.
---
 src/qemu/qemu_process.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 354e079..20d8394 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3460,13 +3460,13 @@ qemuValidateCpuMax(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
 {
     unsigned int maxCpus;

-    maxCpus = virQEMUCapsGetMachineMaxCpus(qemuCaps, def->os.machine);
-    if (!maxCpus)
+    if (!(maxCpus = virQEMUCapsGetMachineMaxCpus(qemuCaps, def->os.machine)))
         return true;

     if (def->maxvcpus > maxCpus) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       "%s", _("Maximum CPUs greater than specified machine type limit"));
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("Specified maximum VCPU count exceeds machine type "
+                         "limit"));
         return false;
     }

-- 
1.8.3.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list