forked from pool/libvirt
379397c0f7
- Update to libvirt 1.2.18
- libxl: support dom0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped upstream patches:
e44bcae-virt-aa-helper-trailing-slash.patch,
a55a5e7-virt-aa-helper-log.patch,
61dab0f-virt-aa-helper-renaming.patch,
24f3c2f-virt-aa-helper-fix-caps.patch,
45697fe5-libxl-support-dom0.patch,
e9c27344-libxl-fix-virDomainObj-state.patch,
4ffb21c8-libxl-dom0-state-fix.patch,
qemu-nbd-cleanup-fix.patch
OBS-URL: https://build.opensuse.org/request/show/320420
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=475
114 lines
3.9 KiB
Diff
114 lines
3.9 KiB
Diff
Index: libvirt-1.2.18/tests/vircgrouptest.c
|
|
===================================================================
|
|
--- libvirt-1.2.18.orig/tests/vircgrouptest.c
|
|
+++ libvirt-1.2.18/tests/vircgrouptest.c
|
|
@@ -34,7 +34,6 @@
|
|
# include "virfile.h"
|
|
# include "virbuffer.h"
|
|
# include "testutilslxc.h"
|
|
-# include "nodeinfo.h"
|
|
|
|
# define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
@@ -607,90 +606,6 @@ static int testCgroupControllerAvailable
|
|
return ret;
|
|
}
|
|
|
|
-static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED)
|
|
-{
|
|
- virCgroupPtr cgroup = NULL;
|
|
- size_t i;
|
|
- int rv, ret = -1;
|
|
- virTypedParameterPtr params = NULL;
|
|
-# define EXPECTED_NCPUS 160
|
|
-
|
|
- unsigned long long expected[EXPECTED_NCPUS] = {
|
|
- 0, 0, 0, 0, 0, 0, 0, 0,
|
|
- 7059492996ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 4180532496ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 0, 0, 0, 0, 0, 0, 0, 0,
|
|
- 0, 0, 0, 0, 0, 0, 0, 0,
|
|
- 0, 0, 0, 0, 0, 0, 0, 0,
|
|
- 1957541268ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 2065932204ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 18228689414ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 4245525148ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 2911161568ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 1407758136ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 1836807700ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 1065296618ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 2046213266ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 747889778ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 709566900ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 444777342ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 5683512916ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- 635751356ULL, 0, 0, 0, 0, 0, 0, 0,
|
|
- };
|
|
-
|
|
- if (VIR_ALLOC_N(params, EXPECTED_NCPUS) < 0)
|
|
- goto cleanup;
|
|
-
|
|
- if ((rv = virCgroupNewPartition("/virtualmachines", true,
|
|
- (1 << VIR_CGROUP_CONTROLLER_CPU) |
|
|
- (1 << VIR_CGROUP_CONTROLLER_CPUACCT),
|
|
- &cgroup)) < 0) {
|
|
- fprintf(stderr, "Could not create /virtualmachines cgroup: %d\n", -rv);
|
|
- goto cleanup;
|
|
- }
|
|
-
|
|
- if (nodeGetCPUCount(NULL) != EXPECTED_NCPUS) {
|
|
- fprintf(stderr, "Unexpected: nodeGetCPUCount() yields: %d\n", nodeGetCPUCount(NULL));
|
|
- goto cleanup;
|
|
- }
|
|
-
|
|
- if ((rv = virCgroupGetPercpuStats(cgroup,
|
|
- params,
|
|
- 1, 0, EXPECTED_NCPUS, 0)) < 0) {
|
|
- fprintf(stderr, "Failed call to virCgroupGetPercpuStats for /virtualmachines cgroup: %d\n", -rv);
|
|
- goto cleanup;
|
|
- }
|
|
-
|
|
- for (i = 0; i < EXPECTED_NCPUS; i++) {
|
|
- if (!STREQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) {
|
|
- fprintf(stderr,
|
|
- "Wrong parameter name value from virCgroupGetPercpuStats at %zu (is: %s)\n",
|
|
- i, params[i].field);
|
|
- goto cleanup;
|
|
- }
|
|
-
|
|
- if (params[i].type != VIR_TYPED_PARAM_ULLONG) {
|
|
- fprintf(stderr,
|
|
- "Wrong parameter value type from virCgroupGetPercpuStats at %zu (is: %d)\n",
|
|
- i, params[i].type);
|
|
- goto cleanup;
|
|
- }
|
|
-
|
|
- if (params[i].value.ul != expected[i]) {
|
|
- fprintf(stderr,
|
|
- "Wrong value from virCgroupGetMemoryUsage at %zu (expected %llu)\n",
|
|
- i, params[i].value.ul);
|
|
- goto cleanup;
|
|
- }
|
|
- }
|
|
-
|
|
- ret = 0;
|
|
-
|
|
- cleanup:
|
|
- virCgroupFree(&cgroup);
|
|
- VIR_FREE(params);
|
|
- return ret;
|
|
-}
|
|
|
|
static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED)
|
|
{
|
|
@@ -919,9 +834,6 @@ mymain(void)
|
|
if (virtTestRun("virCgroupGetMemoryUsage works", testCgroupGetMemoryUsage, NULL) < 0)
|
|
ret = -1;
|
|
|
|
- if (virtTestRun("virCgroupGetPercpuStats works", testCgroupGetPercpuStats, NULL) < 0)
|
|
- ret = -1;
|
|
-
|
|
setenv("VIR_CGROUP_MOCK_MODE", "allinone", 1);
|
|
if (virtTestRun("New cgroup for self (allinone)", testCgroupNewForSelfAllInOne, NULL) < 0)
|
|
ret = -1;
|