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

tests: utils: Allow parsing test capability file without virCaps

Browse Source 
virCaps was used only to propagate the host architecture, so the
function can be extracted in a way which does not require it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Peter Krempa 2018-04-04 09:17:52 +02:00
parent 53fa2edb62
commit 7de761a67b
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/testutilsqemu.c
View File

@ -486,16 +486,13 @@ qemuTestSetHostCPU(virCapsPtr caps,
virQEMUCapsPtr virQEMUCapsPtr
qemuTestParseCapabilities(virCapsPtr caps, qemuTestParseCapabilitiesArch(virArch arch,
const char *capsFile) const char *capsFile)
{ {
virQEMUCapsPtr qemuCaps = NULL; virQEMUCapsPtr qemuCaps = NULL;
if (!caps)
return NULL;
if (!(qemuCaps = virQEMUCapsNew()) || if (!(qemuCaps = virQEMUCapsNew()) ||
virQEMUCapsLoadCache(caps->host.arch, qemuCaps, capsFile) < 0) virQEMUCapsLoadCache(arch, qemuCaps, capsFile) < 0)
goto error; goto error;
return qemuCaps; return qemuCaps;
@ -505,6 +502,18 @@ qemuTestParseCapabilities(virCapsPtr caps,
return NULL; return NULL;
} }
virQEMUCapsPtr
qemuTestParseCapabilities(virCapsPtr caps,
const char *capsFile)
{
if (!caps)
return NULL;
return qemuTestParseCapabilitiesArch(caps->host.arch, capsFile);
}
void qemuTestDriverFree(virQEMUDriver *driver) void qemuTestDriverFree(virQEMUDriver *driver)
{ {
virMutexDestroy(&driver->lock); virMutexDestroy(&driver->lock);

3
tests/testutilsqemu.h
View File

@ -16,6 +16,9 @@ enum {
virCapsPtr testQemuCapsInit(void); virCapsPtr testQemuCapsInit(void);
virDomainXMLOptionPtr testQemuXMLConfInit(void); virDomainXMLOptionPtr testQemuXMLConfInit(void);
virQEMUCapsPtr qemuTestParseCapabilitiesArch(virArch arch,
const char *capsFile);
virQEMUCapsPtr qemuTestParseCapabilities(virCapsPtr caps, virQEMUCapsPtr qemuTestParseCapabilities(virCapsPtr caps,
const char *capsFile); const char *capsFile);