External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemumemlocktest: Use 'testQemuInsertRealCaps'

Browse Source 
Rewrite the capability fetching to use the new helper, thus simplifying
the code.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2023-07-03 15:39:58 +02:00
parent bb142b6db1
commit faa4d488e5
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/qemumemlocktest.c
View File

@ -47,14 +47,8 @@ mymain(void)
{ {
g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps(); g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps();
g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref); g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref);
g_autoptr(virQEMUCaps) qemuCaps_x86_64 = NULL;
g_autoptr(virQEMUCaps) qemuCaps_ppc64 = NULL;
int ret = 0; int ret = 0;
if (!(qemuCaps_x86_64 = testQemuGetRealCaps("x86_64", "latest", "", capslatest, capscache, NULL, NULL)) ||
!(qemuCaps_ppc64 = testQemuGetRealCaps("ppc64", "latest", "", capslatest, capscache, NULL, NULL)))
return EXIT_FAILURE;
if (qemuTestDriverInit(&driver) < 0) if (qemuTestDriverInit(&driver) < 0)
return EXIT_FAILURE; return EXIT_FAILURE;
@ -85,11 +79,11 @@ mymain(void)
qemuTestSetHostArch(&driver, VIR_ARCH_X86_64); qemuTestSetHostArch(&driver, VIR_ARCH_X86_64);
virFileCacheClear(driver.qemuCapsCache); if (testQemuInsertRealCaps(driver.qemuCapsCache, "x86_64", "latest", "",
if (qemuTestCapsCacheInsert(driver.qemuCapsCache, qemuCaps_x86_64) < 0) { capslatest, capscache, NULL, NULL) < 0) {
ret = -1; ret = -1;
goto cleanup; goto cleanup;
}; }
DO_TEST("pc-kvm", 0); DO_TEST("pc-kvm", 0);
DO_TEST("pc-tcg", 0); DO_TEST("pc-tcg", 0);
@ -105,11 +99,12 @@ mymain(void)
DO_TEST("pc-locked+hostdev", VIR_DOMAIN_MEMORY_PARAM_UNLIMITED); DO_TEST("pc-locked+hostdev", VIR_DOMAIN_MEMORY_PARAM_UNLIMITED);
qemuTestSetHostArch(&driver, VIR_ARCH_PPC64); qemuTestSetHostArch(&driver, VIR_ARCH_PPC64);
virFileCacheClear(driver.qemuCapsCache);
if (qemuTestCapsCacheInsert(driver.qemuCapsCache, qemuCaps_ppc64) < 0) { if (testQemuInsertRealCaps(driver.qemuCapsCache, "ppc64", "latest", "",
capslatest, capscache, NULL, NULL) < 0) {
ret = -1; ret = -1;
goto cleanup; goto cleanup;
}; }
DO_TEST("pseries-kvm", 20971520); DO_TEST("pseries-kvm", 20971520);
DO_TEST("pseries-tcg", 0); DO_TEST("pseries-tcg", 0);