mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-08 02:45:45 +00:00
6cc992bd1a
The NUMA cells are stored directly in the virCapsHostPtr struct. This moves them into their own struct allowing them to be stored independantly of the rest of the host capabilities. The change is used as an excuse to switch the representation to use a GPtrArray too. Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
119 lines
3.4 KiB
C
119 lines
3.4 KiB
C
/*
|
|
* Copyright (C) Red Hat, Inc. 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 "testutils.h"
|
|
#include "capabilities.h"
|
|
#include "virbitmap.h"
|
|
#include "virfilewrapper.h"
|
|
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
struct virCapabilitiesData {
|
|
const char *filename;
|
|
virArch arch;
|
|
bool offlineMigrate;
|
|
bool liveMigrate;
|
|
};
|
|
|
|
static int
|
|
test_virCapabilities(const void *opaque)
|
|
{
|
|
struct virCapabilitiesData *data = (struct virCapabilitiesData *) opaque;
|
|
const char *archStr = virArchToString(data->arch);
|
|
virCapsPtr caps = NULL;
|
|
char *capsXML = NULL;
|
|
char *path = NULL;
|
|
char *system = NULL;
|
|
char *resctrl = NULL;
|
|
int ret = -1;
|
|
|
|
system = g_strdup_printf("%s/vircaps2xmldata/linux-%s/system", abs_srcdir,
|
|
data->filename);
|
|
|
|
resctrl = g_strdup_printf("%s/vircaps2xmldata/linux-%s/resctrl", abs_srcdir,
|
|
data->filename);
|
|
|
|
virFileWrapperAddPrefix("/sys/devices/system", system);
|
|
virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl);
|
|
caps = virCapabilitiesNew(data->arch, data->offlineMigrate, data->liveMigrate);
|
|
|
|
if (!caps)
|
|
goto cleanup;
|
|
|
|
if (!(caps->host.numa = virCapabilitiesHostNUMANewHost()))
|
|
goto cleanup;
|
|
|
|
if (virCapabilitiesInitCaches(caps) < 0)
|
|
goto cleanup;
|
|
|
|
virFileWrapperClearPrefixes();
|
|
|
|
if (!(capsXML = virCapabilitiesFormatXML(caps)))
|
|
goto cleanup;
|
|
|
|
path = g_strdup_printf("%s/vircaps2xmldata/vircaps-%s-%s.xml", abs_srcdir,
|
|
archStr, data->filename);
|
|
|
|
if (virTestCompareToFile(capsXML, path) < 0)
|
|
goto cleanup;
|
|
|
|
ret = 0;
|
|
|
|
cleanup:
|
|
VIR_FREE(system);
|
|
VIR_FREE(resctrl);
|
|
VIR_FREE(path);
|
|
VIR_FREE(capsXML);
|
|
virObjectUnref(caps);
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = 0;
|
|
|
|
#define DO_TEST_FULL(filename, arch, offlineMigrate, liveMigrate) \
|
|
do { \
|
|
struct virCapabilitiesData data = {filename, arch, \
|
|
offlineMigrate, \
|
|
liveMigrate}; \
|
|
if (virTestRun(filename, test_virCapabilities, &data) < 0) \
|
|
ret = -1; \
|
|
} while (0)
|
|
|
|
DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false);
|
|
DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false);
|
|
|
|
DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true);
|
|
|
|
DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true);
|
|
DO_TEST_FULL("resctrl-cmt", VIR_ARCH_X86_64, true, true);
|
|
DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true);
|
|
DO_TEST_FULL("resctrl-skx", VIR_ARCH_X86_64, true, true);
|
|
DO_TEST_FULL("resctrl-skx-twocaches", VIR_ARCH_X86_64, true, true);
|
|
DO_TEST_FULL("resctrl-fake-feature", VIR_ARCH_X86_64, true, true);
|
|
|
|
return ret;
|
|
}
|
|
|
|
VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virnuma"))
|