278a149fdc
Note: tarball verification is now done using %gpg_verify, along
with the .asc file the upstream libvirt maintainer now generates
for each release. This approach requires using the upstream .gz
tarball, which is slightly larger than the regenerated .bz2 one.
- Update to libvirt 1.2.9
- Introduce virNodeAllocPages
- event: introduce new event for tunable values
- Add support for fetching statistics of completed jobs
- CVE-2014-3657: domain_conf: fix domain deadlock
- CVE-2014-3633: qemu: blkiotune: Use correct definition when
looking up disk
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Drop upstream patches: 3e745e8f-CVE-2014-3633.patch,
libvirt-guests-wait-for-ntp.patch
- Verify tarball with associated .asc file
Add: libvirt.keyring, libvirt-1.2.9.tar.gz.asc
Use upstream .gz tarball instead of locally generated .bz2
OBS-URL: https://build.opensuse.org/request/show/253577
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=411
92 lines
3.0 KiB
Diff
92 lines
3.0 KiB
Diff
Index: libvirt-1.2.9/tests/vircgrouptest.c
|
|
===================================================================
|
|
--- libvirt-1.2.9.orig/tests/vircgrouptest.c
|
|
+++ libvirt-1.2.9/tests/vircgrouptest.c
|
|
@@ -33,7 +33,6 @@
|
|
# include "virlog.h"
|
|
# include "virfile.h"
|
|
# include "testutilslxc.h"
|
|
-# include "nodeinfo.h"
|
|
|
|
# define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
@@ -533,68 +532,6 @@ static int testCgroupAvailable(const voi
|
|
return 0;
|
|
}
|
|
|
|
-static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED)
|
|
-{
|
|
- virCgroupPtr cgroup = NULL;
|
|
- size_t i;
|
|
- int rv, ret = -1;
|
|
- virTypedParameter params[2];
|
|
-
|
|
- // TODO: mock nodeGetCPUCount() as well & check 2nd cpu, too
|
|
- unsigned long long expected[] = {
|
|
- 1413142688153030ULL
|
|
- };
|
|
-
|
|
- 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() < 1) {
|
|
- fprintf(stderr, "Unexpected: nodeGetCPUCount() yields: %d\n", nodeGetCPUCount());
|
|
- goto cleanup;
|
|
- }
|
|
-
|
|
- if ((rv = virCgroupGetPercpuStats(cgroup,
|
|
- params,
|
|
- 2, 0, 1, 0)) < 0) {
|
|
- fprintf(stderr, "Failed call to virCgroupGetPercpuStats for /virtualmachines cgroup: %d\n", -rv);
|
|
- goto cleanup;
|
|
- }
|
|
-
|
|
- for (i = 0; i < ARRAY_CARDINALITY(expected); i++) {
|
|
- if (!STREQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) {
|
|
- fprintf(stderr,
|
|
- "Wrong parameter name value from virCgroupGetPercpuStats (is: %s)\n",
|
|
- params[i].field);
|
|
- goto cleanup;
|
|
- }
|
|
-
|
|
- if (params[i].type != VIR_TYPED_PARAM_ULLONG) {
|
|
- fprintf(stderr,
|
|
- "Wrong parameter value type from virCgroupGetPercpuStats (is: %d)\n",
|
|
- params[i].type);
|
|
- goto cleanup;
|
|
- }
|
|
-
|
|
- if (params[i].value.ul != expected[i]) {
|
|
- fprintf(stderr,
|
|
- "Wrong value from virCgroupGetMemoryUsage (expected %llu)\n",
|
|
- params[i].value.ul);
|
|
- goto cleanup;
|
|
- }
|
|
- }
|
|
-
|
|
- ret = 0;
|
|
-
|
|
- cleanup:
|
|
- virCgroupFree(&cgroup);
|
|
- return ret;
|
|
-}
|
|
-
|
|
static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED)
|
|
{
|
|
virCgroupPtr cgroup = NULL;
|
|
@@ -800,9 +737,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;
|