mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-11 12:25:52 +00:00
4fe4ffdbdf
vircapstest has code to add a full host NUMA topology, that is, one that includes all information about nodes and CPUs including IDs; testQemuCapsInit(), which is used to create a mock virCapsPtr for QEMU tests, however, just fakes it by setting nnumaCell_max to some number. While the latter approach has served us well so far, we're going to need all the information to be filled in soon. In order to do that, we can just move the existing code from vircapstest to testutils and, with some renaming and trivial tweaking, use it as-is. Interestingly, the NUMA topology generated by the function is rigged up so that the NUMA nodes aren't (necessarily) numbered starting from 0, which is a nice way to spot mistaken assumptions in our codebase. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
258 lines
7.8 KiB
C
258 lines
7.8 KiB
C
/*
|
|
* Copyright (C) IBM Corp 2014
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "testutils.h"
|
|
#include "testutilslxc.h"
|
|
#include "testutilsqemu.h"
|
|
#include "capabilities.h"
|
|
#include "virbitmap.h"
|
|
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
|
|
static int
|
|
test_virCapabilitiesGetCpusForNodemask(const void *data ATTRIBUTE_UNUSED)
|
|
{
|
|
const char *nodestr = "3,4,5,6";
|
|
virBitmapPtr nodemask = NULL;
|
|
virBitmapPtr cpumap = NULL;
|
|
virCapsPtr caps = NULL;
|
|
int mask_size = 8;
|
|
int ret = -1;
|
|
|
|
|
|
if (!(caps = virCapabilitiesNew(VIR_ARCH_X86_64, false, false)))
|
|
goto error;
|
|
|
|
if (virTestCapsBuildNUMATopology(caps, 3) < 0)
|
|
goto error;
|
|
|
|
if (virBitmapParse(nodestr, &nodemask, mask_size) < 0)
|
|
goto error;
|
|
|
|
if (!(cpumap = virCapabilitiesGetCpusForNodemask(caps, nodemask)))
|
|
goto error;
|
|
|
|
ret = 0;
|
|
|
|
error:
|
|
virObjectUnref(caps);
|
|
virBitmapFree(nodemask);
|
|
virBitmapFree(cpumap);
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
static bool ATTRIBUTE_UNUSED
|
|
doCapsExpectFailure(virCapsPtr caps,
|
|
int ostype,
|
|
virArch arch,
|
|
int domaintype,
|
|
const char *emulator,
|
|
const char *machinetype)
|
|
{
|
|
virCapsDomainDataPtr data = virCapabilitiesDomainDataLookup(caps, ostype,
|
|
arch, domaintype, emulator, machinetype);
|
|
|
|
if (data) {
|
|
VIR_FREE(data);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
static bool ATTRIBUTE_UNUSED
|
|
doCapsCompare(virCapsPtr caps,
|
|
int ostype,
|
|
virArch arch,
|
|
int domaintype,
|
|
const char *emulator,
|
|
const char *machinetype,
|
|
int expect_ostype,
|
|
virArch expect_arch,
|
|
int expect_domaintype,
|
|
const char *expect_emulator,
|
|
const char *expect_machinetype)
|
|
{
|
|
bool ret = false;
|
|
virCapsDomainDataPtr data = virCapabilitiesDomainDataLookup(caps, ostype,
|
|
arch, domaintype, emulator, machinetype);
|
|
|
|
if (!data)
|
|
goto error;
|
|
|
|
if (data->ostype != expect_ostype) {
|
|
fprintf(stderr, "data->ostype=%s doesn't match expect_ostype=%s\n",
|
|
virDomainOSTypeToString(data->ostype),
|
|
virDomainOSTypeToString(expect_ostype));
|
|
goto error;
|
|
}
|
|
|
|
if (data->arch != expect_arch) {
|
|
fprintf(stderr, "data->arch=%s doesn't match expect_arch=%s\n",
|
|
virArchToString(data->arch),
|
|
virArchToString(expect_arch));
|
|
goto error;
|
|
}
|
|
|
|
if (data->domaintype != expect_domaintype) {
|
|
fprintf(stderr, "data->domaintype=%s doesn't match "
|
|
"expect_domaintype=%s\n",
|
|
virDomainVirtTypeToString(data->domaintype),
|
|
virDomainVirtTypeToString(expect_domaintype));
|
|
goto error;
|
|
}
|
|
|
|
if (STRNEQ(data->emulator, expect_emulator)) {
|
|
fprintf(stderr, "data->emulator=%s doesn't match expect_emulator=%s\n",
|
|
data->emulator, expect_emulator);
|
|
goto error;
|
|
}
|
|
|
|
if (STRNEQ_NULLABLE(data->machinetype, expect_machinetype)) {
|
|
fprintf(stderr, "data->machinetype=%s doesn't match "
|
|
"expect_machinetype=%s\n",
|
|
NULLSTR(data->machinetype), NULLSTR(expect_machinetype));
|
|
goto error;
|
|
}
|
|
|
|
ret = true;
|
|
error:
|
|
VIR_FREE(data);
|
|
return ret;
|
|
}
|
|
|
|
#define CAPSCOMP(o, a, d, e, m, fo, fa, fd, fe, fm) \
|
|
if (!doCapsCompare(caps, o, a, d, e, m, fo, fa, fd, fe, fm)) \
|
|
ret = -1;
|
|
|
|
#define CAPS_EXPECT_ERR(o, a, d, e, m) \
|
|
if (!doCapsExpectFailure(caps, o, a, d, e, m)) \
|
|
ret = -1;
|
|
|
|
#ifdef WITH_QEMU
|
|
static int
|
|
test_virCapsDomainDataLookupQEMU(const void *data ATTRIBUTE_UNUSED)
|
|
{
|
|
int ret = 0;
|
|
virCapsPtr caps = NULL;
|
|
|
|
if (!(caps = testQemuCapsInit())) {
|
|
ret = -1;
|
|
goto out;
|
|
}
|
|
|
|
/* Checking each parameter individually */
|
|
CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, NULL,
|
|
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64,
|
|
VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-x86_64", "pc-0.11");
|
|
CAPSCOMP(VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, NULL,
|
|
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64,
|
|
VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-x86_64", "pc-0.11");
|
|
CAPSCOMP(-1, VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_NONE, NULL, NULL,
|
|
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_AARCH64,
|
|
VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-aarch64", "virt");
|
|
CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_KVM, NULL, NULL,
|
|
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64,
|
|
VIR_DOMAIN_VIRT_KVM, "/usr/bin/qemu-system-x86_64", "pc");
|
|
CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, "/usr/bin/qemu-system-ppc64", NULL,
|
|
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64,
|
|
VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-ppc64", "pseries");
|
|
CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, "s390-virtio",
|
|
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_S390X,
|
|
VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-s390x",
|
|
"s390-virtio");
|
|
|
|
CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, "pseries",
|
|
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64,
|
|
VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-ppc64", "pseries");
|
|
CAPSCOMP(-1, VIR_ARCH_PPC64LE, VIR_DOMAIN_VIRT_NONE, NULL, "pseries",
|
|
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64LE,
|
|
VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-ppc64", "pseries");
|
|
|
|
CAPS_EXPECT_ERR(VIR_DOMAIN_OSTYPE_LINUX, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, NULL);
|
|
CAPS_EXPECT_ERR(-1, VIR_ARCH_PPC64LE, VIR_DOMAIN_VIRT_NONE, NULL, "pc");
|
|
CAPS_EXPECT_ERR(-1, VIR_ARCH_MIPS, VIR_DOMAIN_VIRT_NONE, NULL, NULL);
|
|
CAPS_EXPECT_ERR(-1, VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_KVM,
|
|
"/usr/bin/qemu-system-aarch64", NULL);
|
|
CAPS_EXPECT_ERR(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE,
|
|
"/usr/bin/qemu-system-aarch64", "pc");
|
|
CAPS_EXPECT_ERR(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_VMWARE, NULL, "pc");
|
|
|
|
out:
|
|
virObjectUnref(caps);
|
|
return ret;
|
|
}
|
|
#endif /* WITH_QEMU */
|
|
|
|
#ifdef WITH_LXC
|
|
static int
|
|
test_virCapsDomainDataLookupLXC(const void *data ATTRIBUTE_UNUSED)
|
|
{
|
|
int ret = 0;
|
|
virCapsPtr caps = NULL;
|
|
|
|
if (!(caps = testLXCCapsInit())) {
|
|
ret = -1;
|
|
goto out;
|
|
}
|
|
|
|
CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, NULL,
|
|
VIR_DOMAIN_OSTYPE_EXE, VIR_ARCH_X86_64,
|
|
VIR_DOMAIN_VIRT_LXC, "/usr/libexec/libvirt_lxc", NULL);
|
|
CAPSCOMP(-1, VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_NONE, NULL, NULL,
|
|
VIR_DOMAIN_OSTYPE_EXE, VIR_ARCH_X86_64,
|
|
VIR_DOMAIN_VIRT_LXC, "/usr/libexec/libvirt_lxc", NULL);
|
|
|
|
out:
|
|
virObjectUnref(caps);
|
|
return ret;
|
|
}
|
|
#endif /* WITH_LXC */
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = 0;
|
|
|
|
if (virTestRun("virCapabilitiesGetCpusForNodemask",
|
|
test_virCapabilitiesGetCpusForNodemask, NULL) < 0)
|
|
ret = -1;
|
|
#ifdef WITH_QEMU
|
|
if (virTestRun("virCapsDomainDataLookupQEMU",
|
|
test_virCapsDomainDataLookupQEMU, NULL) < 0)
|
|
ret = -1;
|
|
#endif
|
|
#ifdef WITH_LXC
|
|
if (virTestRun("virCapsDomainDataLookupLXC",
|
|
test_virCapsDomainDataLookupLXC, NULL) < 0)
|
|
ret = -1;
|
|
#endif /* WITH_LXC */
|
|
|
|
return ret;
|
|
}
|
|
|
|
VIR_TEST_MAIN(mymain)
|