External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuTestCapsCacheInsertImpl: Require that callers always pass capabilities

Browse Source 
There's just one case when we're populating the cache with empty caps so
that can allocate a dummy virQEMUCaps object rather than having the
logic inside qemuTestCapsCacheInsertImpl.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-03 12:42:05 +01:00
parent b048218a8a
commit f7fa1d4e11
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/testutilsqemu.c
View File

@ -495,7 +495,7 @@ qemuTestCapsCacheInsertImpl(virFileCache *cache,
{ {
size_t i; size_t i;
if (caps && virQEMUCapsGetArch(caps) != VIR_ARCH_NONE) { if (virQEMUCapsGetArch(caps) != VIR_ARCH_NONE) {
/* all tests using real caps or arcitecture are expected to call: /* all tests using real caps or arcitecture are expected to call:
* *
* virFileCacheClear(driver.qemuCapsCache); * virFileCacheClear(driver.qemuCapsCache);
@ -534,10 +534,7 @@ qemuTestCapsCacheInsertImpl(virFileCache *cache,
if (qemu_emulators[i] == NULL) if (qemu_emulators[i] == NULL)
continue; continue;
if (caps)
tmp = virQEMUCapsNewCopy(caps); tmp = virQEMUCapsNewCopy(caps);
else
tmp = virQEMUCapsNew();
qemuTestCapsPopulateFakeMachines(tmp, i, hostOS); qemuTestCapsPopulateFakeMachines(tmp, i, hostOS);
@ -573,6 +570,7 @@ int qemuTestDriverInit(virQEMUDriver *driver)
virSecurityManager *mgr = NULL; virSecurityManager *mgr = NULL;
char statedir[] = STATEDIRTEMPLATE; char statedir[] = STATEDIRTEMPLATE;
char configdir[] = CONFIGDIRTEMPLATE; char configdir[] = CONFIGDIRTEMPLATE;
g_autoptr(virQEMUCaps) emptyCaps = NULL;
memset(driver, 0, sizeof(*driver)); memset(driver, 0, sizeof(*driver));
@ -643,7 +641,9 @@ int qemuTestDriverInit(virQEMUDriver *driver)
if (!driver->xmlopt) if (!driver->xmlopt)
goto error; goto error;
if (qemuTestCapsCacheInsert(driver->qemuCapsCache, NULL) < 0) /* Populate the capabilities cache with fake empty caps */
emptyCaps = virQEMUCapsNew();
if (qemuTestCapsCacheInsert(driver->qemuCapsCache, emptyCaps) < 0)
goto error; goto error;
if (!(mgr = virSecurityManagerNew("none", "qemu", if (!(mgr = virSecurityManagerNew("none", "qemu",