|
 |
6ae9ed |
From c087402082daa56d2141208e404f8a38b7569a2b Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <c087402082daa56d2141208e404f8a38b7569a2b@dist-git>
|
|
|
6ae9ed |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
6ae9ed |
Date: Wed, 24 Aug 2016 16:11:02 -0400
|
|
|
6ae9ed |
Subject: [PATCH] qemu: cap: Refactor access to array in
|
|
|
6ae9ed |
virQEMUCapsProbeQMPMachineTypes
|
|
|
6ae9ed |
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1097930
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1224341
|
|
|
6ae9ed |
|
|
|
6ae9ed |
Use a temporary pointer rather than always recalculating the index in a
|
|
|
6ae9ed |
very verbose way.
|
|
|
6ae9ed |
|
|
|
6ae9ed |
(cherry picked from commit e44cdaf80b3af528a7b9ab5b555cd09cd27b3f1e)
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
src/qemu/qemu_capabilities.c | 16 +++++++++-------
|
|
|
6ae9ed |
1 file changed, 9 insertions(+), 7 deletions(-)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
6ae9ed |
index f6a42e7..49ad9df 100644
|
|
|
6ae9ed |
--- a/src/qemu/qemu_capabilities.c
|
|
|
6ae9ed |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
6ae9ed |
@@ -2485,18 +2485,20 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
|
|
|
6ae9ed |
goto cleanup;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
for (i = 0; i < nmachines; i++) {
|
|
|
6ae9ed |
+ struct virQEMUCapsMachineType *mach;
|
|
|
6ae9ed |
if (STREQ(machines[i]->name, "none"))
|
|
|
6ae9ed |
continue;
|
|
|
6ae9ed |
- qemuCaps->nmachineTypes++;
|
|
|
6ae9ed |
- if (VIR_STRDUP(qemuCaps->machineTypes[qemuCaps->nmachineTypes -1].alias,
|
|
|
6ae9ed |
- machines[i]->alias) < 0 ||
|
|
|
6ae9ed |
- VIR_STRDUP(qemuCaps->machineTypes[qemuCaps->nmachineTypes - 1].name,
|
|
|
6ae9ed |
- machines[i]->name) < 0)
|
|
|
6ae9ed |
+
|
|
|
6ae9ed |
+ mach = &(qemuCaps->machineTypes[qemuCaps->nmachineTypes++]);
|
|
|
6ae9ed |
+
|
|
|
6ae9ed |
+ if (VIR_STRDUP(mach->alias, machines[i]->alias) < 0 ||
|
|
|
6ae9ed |
+ VIR_STRDUP(mach->name, machines[i]->name) < 0)
|
|
|
6ae9ed |
goto cleanup;
|
|
|
6ae9ed |
+
|
|
|
6ae9ed |
+ mach->maxCpus = machines[i]->maxCpus;
|
|
|
6ae9ed |
+
|
|
|
6ae9ed |
if (machines[i]->isDefault)
|
|
|
6ae9ed |
defIdx = qemuCaps->nmachineTypes - 1;
|
|
|
6ae9ed |
- qemuCaps->machineTypes[qemuCaps->nmachineTypes - 1].maxCpus =
|
|
|
6ae9ed |
- machines[i]->maxCpus;
|
|
|
6ae9ed |
}
|
|
|
6ae9ed |
|
|
|
6ae9ed |
if (defIdx)
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.10.0
|
|
|
6ae9ed |
|