[PATCH 21/21] qemuTestCapsCacheInsert: Rewrite caps cache insertion
Until now we did 2 weird things when inserting the qemuCaps used for
individual test cases into the capability cache:
1) we inserted the same caps for all emulators
2) we always (expensively) copied them
Now when real capabilities are used we don't touch them at all just
simply inser them. This allows us one big optimization, by trading a
copy for just a virObjectRef as we can borrow the caps object to the
cache.
For fake caps we still copy them as we insert the fake machine types
into them, but second big optimization is to insert the capabilities
only for the architecture they belong to.
Additionally this commit also ensures that all other entries in the
cache for the binary are poisoned by empty caps so that it's obvious
that the test is doing the right thing.
Apart from this making actually more sense this shaves off more than 40%
of runtime from qemuxml2argvtest.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/testutilsqemu.c | 85 +++++++++++++++++++++++++++++++++++--------
1 file changed, 70 insertions(+), 15 deletions(-)
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 94ff538382..cb665e501b 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -385,30 +385,85 @@ qemuTestCapsPopulateFakeMachines(virQEMUCaps *caps,
}
+static int
+qemuTestCapsCacheInsertData(virFileCache *cache,
+ const char *binary,
+ virQEMUCaps *caps)
+{
+ if (virFileCacheInsertData(cache, binary, virObjectRef(caps)) < 0) {
+ virObjectUnref(caps);
+ return -1;
+ }
+
+ return 0;
+}
+
+
int qemuTestCapsCacheInsert(virFileCache *cache,
virQEMUCaps *caps)
{
size_t i;
- for (i = 0; i < G_N_ELEMENTS(qemu_emulators); i++) {
- virQEMUCaps *tmpCaps;
- if (qemu_emulators[i] == NULL)
- continue;
- if (caps) {
- tmpCaps = virQEMUCapsNewCopy(caps);
- } else {
- tmpCaps = virQEMUCapsNew();
- }
+ if (caps && virQEMUCapsGetArch(caps) != VIR_ARCH_NONE) {
+ /* for capabilities which have architecture set we populate only the
+ * given architecture and poison all other so that the test doesn't
+ * accidentally test a weird combination */
+ virArch arch = virQEMUCapsGetArch(caps);
+ g_autoptr(virQEMUCaps) emptyCaps = virQEMUCapsNew();
+ g_autoptr(virQEMUCaps) copyCaps = NULL;
+ virQEMUCaps *effCaps = caps;
- if (!tmpCaps)
+ if (!emptyCaps)
return -1;
- if (!virQEMUCapsHasMachines(tmpCaps))
- qemuTestCapsPopulateFakeMachines(tmpCaps, i);
+ if (arch_alias[arch] != VIR_ARCH_NONE)
+ arch = arch_alias[arch];
- if (virFileCacheInsertData(cache, qemu_emulators[i], tmpCaps) < 0) {
- virObjectUnref(tmpCaps);
- return -1;
+ if (qemu_emulators[arch]) {
+ /* if we are dealing with fake caps we need to populate machine types */
+ if (!virQEMUCapsHasMachines(caps)) {
+ if (!(copyCaps = effCaps = virQEMUCapsNewCopy(caps)))
+ return -1;
+
+ qemuTestCapsPopulateFakeMachines(copyCaps, arch);
+ }
+
+ if (qemuTestCapsCacheInsertData(cache, qemu_emulators[arch], effCaps) <
0)
+ return -1;
+ }
+
+
+ for (i = 0; i < G_N_ELEMENTS(qemu_emulators); i++) {
+ if (!qemu_emulators[i])
+ continue;
+
+ if (i == arch)
+ continue;
+
+ if (qemuTestCapsCacheInsertData(cache, qemu_emulators[i], emptyCaps) < 0)
+ return -1;
+ }
+ } else {
+ /* in case when caps are missing or are missing architecture, we populate
+ * everything */
+ for (i = 0; i < G_N_ELEMENTS(qemu_emulators); i++) {
+ g_autoptr(virQEMUCaps) tmp = NULL;
+
+ if (qemu_emulators[i] == NULL)
+ continue;
+
+ if (caps)
+ tmp = virQEMUCapsNewCopy(caps);
+ else
+ tmp = virQEMUCapsNew();
+
+ if (!tmp)
+ return -1;
+
+ qemuTestCapsPopulateFakeMachines(tmp, i);
+
+ if (qemuTestCapsCacheInsertData(cache, qemu_emulators[i], tmp) < 0)
+ return -1;
}
}
--
2.31.1