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

qemuxml2argvtest: Remove cpu model faking for fake-caps tests

Browse Source 
Now that all fake-caps testing was removed we can also remove the
filling of the fake caps by cpu models.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-08-31 22:38:48 +02:00
parent 33f27cc978
commit 14106524cc
1 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tests/qemuxml2argvtest.c
View File

@ -256,32 +256,6 @@ static virNWFilterDriver fakeNWFilterDriver = {
}; };
static int
testAddCPUModels(virQEMUCaps *caps)
{
virArch arch = virQEMUCapsGetArch(caps);
const char *x86Models[] = {
"n270", "athlon", "pentium3", "pentium2", "pentium",
"486", "coreduo", "kvm32", "qemu32", "kvm64",
"core2duo", "phenom", "qemu64",
"Opteron_G3", "Opteron_G2", "Opteron_G1",
"Nehalem", "Penryn", "Conroe",
"Haswell-noTSX", "Haswell",
};
if (ARCH_IS_X86(arch)) {
if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, x86Models,
G_N_ELEMENTS(x86Models),
VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0 ||
virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU, x86Models,
G_N_ELEMENTS(x86Models),
VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0)
return -1;
}
return 0;
}
static void static void
testUpdateQEMUCapsHostCPUModel(virQEMUCaps *qemuCaps, virArch hostArch) testUpdateQEMUCapsHostCPUModel(virQEMUCaps *qemuCaps, virArch hostArch)
{ {
@ -289,24 +263,6 @@ testUpdateQEMUCapsHostCPUModel(virQEMUCaps *qemuCaps, virArch hostArch)
virQEMUCapsUpdateHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_QEMU); virQEMUCapsUpdateHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_QEMU);
} }
static int
testUpdateQEMUCaps(const struct testQemuInfo *info,
virArch arch,
virCaps *caps)
{
if (!caps)
return -1;
virQEMUCapsSetArch(info->qemuCaps, arch);
if (testAddCPUModels(info->qemuCaps) < 0)
return -1;
testUpdateQEMUCapsHostCPUModel(info->qemuCaps, caps->host.arch);
return 0;
}
static int static int
testCheckExclusiveFlags(int flags) testCheckExclusiveFlags(int flags)
@ -554,11 +510,6 @@ testCompareXMLToArgv(const void *data)
if (arch == VIR_ARCH_NONE) if (arch == VIR_ARCH_NONE)
arch = virArchFromHost(); arch = virArchFromHost();
if (!(info->flags & FLAG_REAL_CAPS)) {
if (testUpdateQEMUCaps(info, arch, driver.caps) < 0)
goto cleanup;
}
virFileCacheClear(driver.qemuCapsCache); virFileCacheClear(driver.qemuCapsCache);
if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0) if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)