- Devel - libvirt List Archives

[libvirt] [PATCH] tests: Fix virsh-snapshot/checkpoint without libreadline-devel
by Eric Blake 02 Aug '19

02 Aug '19

libreadline-devel is an optional build dependency; when it is not present, the output of 'virsh <<EOF ... EOF' is different in that the input provided by the user is not echoed, and prompts become interleaved on the same line as actual output, which in turn causes the sed doing prompt filtering to mess up: | ./virsh-snapshot | --- exp 2019-07-31 18:42:31.107399428 -0300 | +++ out.cooked 2019-07-31 18:42:31.108399437 -0300 | @@ -1,8 +1,3 @@ | - | - | -Domain snapshot s3 created from 's3.xml' | -Domain snapshot s2 created from 's2.xml' | -Name: s2 | Domain: test | Current: yes | State: running Maybe we should fix virsh in interactive mode to echo regardless of whether libreadline-devel was used, but the quicker fix is to make the test use 'virsh "..."' rather than reading its input from stdin. Reported-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm tempted to push this as a fix to a build-breaker, but as I did not actually build without libreadline-devel, I'd appreciate an ACK from Daniel that this fixes the problem on his setup. tests/virsh-checkpoint | 7 +++---- tests/virsh-snapshot | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/virsh-checkpoint b/tests/virsh-checkpoint index 75bdc293be..92962d2205 100755 --- a/tests/virsh-checkpoint +++ b/tests/virsh-checkpoint @@ -140,7 +140,7 @@ EOF compare exp err || fail=1 # Restore state with redefine -$abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1 +$abs_top_builddir/tools/virsh -c test:///default >out 2>err ' # Redefine must be in topological order; this will fail checkpoint-create test --redefine c2.xml echo --err marker @@ -149,7 +149,7 @@ $abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1 checkpoint-create test --redefine c2.xml checkpoint-list test --leaves --name checkpoint-info test c2 -EOF +' || fail=1 cat <<\EOF > exp || fail=1 @@ -165,8 +165,7 @@ Children: 0 Descendants: 0 EOF -sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=1 -compare exp out.cooked || fail=1 +compare exp out || fail=1 cat <<EOF > exp || fail=1 error: invalid argument: parent c3 for moment c2 not found diff --git a/tests/virsh-snapshot b/tests/virsh-snapshot index 20ff966a51..473e3b3f2d 100755 --- a/tests/virsh-snapshot +++ b/tests/virsh-snapshot @@ -191,7 +191,7 @@ EOF compare exp err || fail=1 # Restore state with redefine -$abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1 +$abs_top_builddir/tools/virsh -c test:///default >out 2>err ' # Redefine must be in topological order; this will fail snapshot-create test --redefine s2.xml --validate echo --err marker @@ -199,7 +199,7 @@ $abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1 snapshot-create test --redefine s3.xml --validate snapshot-create test --redefine s2.xml --current --validate snapshot-info test --current -EOF +' || fail=1 cat <<\EOF > exp || fail=1 @@ -217,8 +217,7 @@ Descendants: 0 Metadata: yes EOF -sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=1 -compare exp out.cooked || fail=1 +compare exp out || fail=1 cat <<EOF > exp || fail=1 error: invalid argument: parent s3 for moment s2 not found -- 2.20.1

2 1

[libvirt] [PATCH 1/1] tests/virsh-checkpoint/snapshot: changing 'sed' out filtering
by Daniel Henrique Barboza 02 Aug '19

02 Aug '19

There is a chance that the current sed filtering used in these new tests might fail in some machines due to the repetition of the 'virsh #' prompt at the same line, together with valid output that shouldn't be filtered. This is output of virsh-snapshot test in my T480 dev box: ./virsh-snapshot --- exp 2019-07-31 18:42:31.107399428 -0300 +++ out.cooked 2019-07-31 18:42:31.108399437 -0300 @@ -1,8 +1,3 @@ - - -Domain snapshot s3 created from 's3.xml' -Domain snapshot s2 created from 's2.xml' -Name: s2 Domain: test Current: yes State: running There are 3 valid lines missing. This is the unfiltered output: === out === Welcome to lt-virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # virsh # virsh # virsh # virsh # Domain snapshot s3 created from 's3.xml' virsh # Domain snapshot s2 created from 's2.xml' virsh # Name: s2 Domain: test Current: yes State: running Location: internal Parent: s3 Children: 0 Descendants: 0 Metadata: yes virsh # ============ We can see that the 3 lines being erased are being followed by the 'virsh #' prompt and the filtering is erasing those. A similar situation happens with virsh-checkpoint as well. This patch makes the 'sed' filtering less elegant and more crude than the current version, but more reliable to these outputs that may vary from each dev machine. We're also removing the blank lines in the expected output to make it less prone to errors as well. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- Eric, feel free to accept this patch, tweak it, discard it and try something else or whatever. I was going to send the commit msg as a reply to your query in the ML, then realized that I might as well propose a fix for it. tests/virsh-checkpoint | 6 +----- tests/virsh-snapshot | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tests/virsh-checkpoint b/tests/virsh-checkpoint index 75bdc293be..a3cad74f74 100755 --- a/tests/virsh-checkpoint +++ b/tests/virsh-checkpoint @@ -152,20 +152,16 @@ $abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1 EOF cat <<\EOF > exp || fail=1 - - Domain checkpoint c3 created from 'c3.xml' Domain checkpoint c2 created from 'c2.xml' c2 - Name: c2 Domain: test Parent: c3 Children: 0 Descendants: 0 - EOF -sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=1 +sed '1,/^virsh #/d; s/virsh #\s//g; /^$/d' < out > out.cooked || fail=1 compare exp out.cooked || fail=1 cat <<EOF > exp || fail=1 diff --git a/tests/virsh-snapshot b/tests/virsh-snapshot index 20ff966a51..874093ea3c 100755 --- a/tests/virsh-snapshot +++ b/tests/virsh-snapshot @@ -201,9 +201,8 @@ $abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1 snapshot-info test --current EOF -cat <<\EOF > exp || fail=1 - +cat <<\EOF > exp || fail=1 Domain snapshot s3 created from 's3.xml' Domain snapshot s2 created from 's2.xml' Name: s2 @@ -215,9 +214,8 @@ Parent: s3 Children: 0 Descendants: 0 Metadata: yes - EOF -sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=1 +sed '1,/^virsh #/d; s/virsh #\s//g; /^$/d' < out > out.cooked || fail=1 compare exp out.cooked || fail=1 cat <<EOF > exp || fail=1 -- 2.21.0

2 7

[libvirt] [PATCH] RFC: security: Make sure to decrease ref count label value
by Stefan Berger 02 Aug '19

02 Aug '19

I noticed that if a domain fails to restore, the ref count in the xattr 'trusted.libvirt.security.ref_selinux' keeps on increasing indefinitely and the VM will never restore even if the root cause for the restore failure has been removed. The reason seems to be that the code to decrease the ref count never gets called because the block above it fails due to virSecuritySELinuxTransactionAppend() failing. The simple solution seems to be to revert the order in which things are done. Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/security/security_selinux.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index ea20373a90..9fd29e9bca 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1499,14 +1499,9 @@ virSecuritySELinuxRestoreFileLabel(virSecurityManagerPtr mgr, goto cleanup; } - if ((rc = virSecuritySELinuxTransactionAppend(path, NULL, - false, recall, true)) < 0) { - goto cleanup; - } else if (rc > 0) { - ret = 0; - goto cleanup; - } - + /* Recall the label so the ref count label decreases its counter + * even if transaction append below fails. + */ if (recall) { rc = virSecuritySELinuxRecallLabel(newpath, &fcon); if (rc == -2) { @@ -1519,6 +1514,14 @@ virSecuritySELinuxRestoreFileLabel(virSecurityManagerPtr mgr, } } + if ((rc = virSecuritySELinuxTransactionAppend(path, NULL, + false, recall, true)) < 0) { + goto cleanup; + } else if (rc > 0) { + ret = 0; + goto cleanup; + } + if (!recall || rc == -2) { if (stat(newpath, &buf) != 0) { VIR_WARN("cannot stat %s: %s", newpath, -- 2.20.1

3 3

[libvirt] [PATCH v3 0/2] test_driver: implement virDomainMemoryStats
by Ilias Stamatis 02 Aug '19

02 Aug '19

Ilias Stamatis (2): test_driver: add a memballoon device in the default config test_driver: implement virDomainMemoryStats src/test/test_driver.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) -- 2.22.0

2 4

[libvirt] [PATCH v2] test_driver: implement virDomainMemoryStats
by Ilias Stamatis 02 Aug '19

02 Aug '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index aae9875194..0e0acf2baf 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7367,6 +7367,59 @@ testDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) return 0; } + +static int +testDomainMemoryStats(virDomainPtr dom, + virDomainMemoryStatPtr stats, + unsigned int nr_stats, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int cur_memory; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + cur_memory = vm->def->mem.cur_balloon; + ret = 0; + +#define STATS_SET_PARAM(name, value) \ + if (ret < nr_stats) { \ + stats[ret].tag = name; \ + stats[ret].val = value; \ + ret++; \ + } + + if (virDomainDefHasMemballoon(vm->def)) { + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON, cur_memory); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_SWAP_IN, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_SWAP_OUT, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_UNUSED, cur_memory / 2); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_AVAILABLE, cur_memory); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_USABLE, cur_memory / 2); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE, 627319920); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_DISK_CACHES, cur_memory / 10); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_HUGETLB_PGALLOC, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_HUGETLB_PGFAIL, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_RSS, cur_memory); + } + +#undef STATS_SET_PARAM + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainMemoryPeek(virDomainPtr dom, unsigned long long start, @@ -8697,6 +8750,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainManagedSave = testDomainManagedSave, /* 1.1.4 */ .domainHasManagedSaveImage = testDomainHasManagedSaveImage, /* 1.1.4 */ .domainManagedSaveRemove = testDomainManagedSaveRemove, /* 1.1.4 */ + .domainMemoryStats = testDomainMemoryStats, /* 5.7.0 */ .domainMemoryPeek = testDomainMemoryPeek, /* 5.4.0 */ .domainSnapshotNum = testDomainSnapshotNum, /* 1.1.4 */ -- 2.22.0

2 1

[libvirt] [PATCH] vircgroup: fix partition creation for cgroups v2 without systemd
by Pavel Hrdina 02 Aug '19

02 Aug '19

On hosts without systemd libvirt is responsible for creating cgroups topology. With cgroups v2 the logic changed a bit. If we need to create new directory the detection of controllers fails because the directory doesn't exists so there is no cgroup.controllers file. To fix that issue we need to have a parent cgroup where we can look into cgroup.subtree_control to get a list of enabled controllers. To fix the issue reorder the operations to get a parent group fist so we can use it to create a new partition. <https://www.redhat.com/archives/libvir-list/2019-July/msg01309.html> Reported-by: Raghav Gururajan <rvgn(a)disroot.org> Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/vircgroup.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 825f62a97b..0789630b47 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -842,6 +842,7 @@ virCgroupNewPartition(const char *path, virCgroupPtr *group) { int ret = -1; + char *tmp; VIR_AUTOFREE(char *) parentPath = NULL; VIR_AUTOFREE(char *) newPath = NULL; virCgroupPtr parent = NULL; @@ -858,25 +859,27 @@ virCgroupNewPartition(const char *path, if (virCgroupSetPartitionSuffix(path, &newPath) < 0) goto cleanup; - if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0) + if (STREQ(newPath, "/")) { + ret = 0; goto cleanup; - - if (STRNEQ(newPath, "/")) { - char *tmp; - if (VIR_STRDUP(parentPath, newPath) < 0) - goto cleanup; - - tmp = strrchr(parentPath, '/'); - tmp++; - *tmp = '\0'; - - if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0) - goto cleanup; - - if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) - goto cleanup; } + if (VIR_STRDUP(parentPath, newPath) < 0) + goto cleanup; + + tmp = strrchr(parentPath, '/'); + tmp++; + *tmp = '\0'; + + if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0) + goto cleanup; + + if (virCgroupNew(-1, newPath, parent, controllers, group) < 0) + goto cleanup; + + if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) + goto cleanup; + ret = 0; cleanup: if (ret != 0) -- 2.21.0

1 0

[libvirt] virtio pmem support in libvirt
by Pankaj Gupta 01 Aug '19

01 Aug '19

Hi all, Virtio-pmem support has been added to kernel[1] and qemu[2] upstream. User document[3] has more details on how to use this new device. We now need support in libvirt. Required support would be a subset of features already implemented for emulated nvdimm. We will use new virtio-pmem-pci device and don't require advance ACPI configurations. Can libvirt upstream community implement libvirt support for virtio pmem to complete the entire stack. Thank you in advance. Best regards, Pankaj [1] http://lkml.iu.edu/hypermail/linux/kernel/1907.2/02509.html [2] https://lists.sr.ht/~philmd/qemu/%3C20190702150606.24851-1-mst%40redhat.com… [3] https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg06535.html

2 2

[libvirt] [PATCH] news: add entry for new max_threads_per_process option in qemu.conf
by Jim Fehlig 01 Aug '19

01 Aug '19

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 82a4ec9c84..3a20f95a0d 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -74,6 +74,17 @@ which portions of a disk have changed since a point in time. </description> </change> + <change> + <summary> + qemu: Add support for overriding max threads per process limit + </summary> + <description> + systemd-based systems impose a limit on the number of threads a + process can spawn, which in some cases can be exceeded by qemu + processes running VMs. Add a <code>max_threads_per_process</code> + option to qemu.conf to override the system default. + </description> + </change> </section> <section title="Removed features"> <change> -- 2.22.0

2 1

[libvirt] [jenkins-ci PATCH 0/6] Update libosinfo (& friends) dependencies
by Fabiano Fidêncio 31 Jul '19

31 Jul '19

libsoup & mingw-libsoup are new dependencies for both libosinfo & osinfo-db-tools since v1.6.0 release libcurl & mingw-curl are no longer a dependency for libosinfo since v1.5.0 release Fabiano Fidêncio (6): mappings: Add mingw*-libsoup mingw*-libosinfo: Add mingw*-libsoup as dependency mingw*-osinfo-db-tools: Add mingw*-libsoup as dependency osinfo-db-tools: Add libsoup as dependency mingw*-libosinfo: Remove mingw*-curl dependency ibosinfo: Remove libcurl dependency guests/vars/mappings.yml | 6 ++++++ guests/vars/projects/libosinfo+mingw32.yml | 2 +- guests/vars/projects/libosinfo+mingw64.yml | 2 +- guests/vars/projects/libosinfo.yml | 1 - guests/vars/projects/osinfo-db-tools+mingw32.yml | 1 + guests/vars/projects/osinfo-db-tools+mingw64.yml | 1 + guests/vars/projects/osinfo-db-tools.yml | 1 + 7 files changed, 11 insertions(+), 3 deletions(-) -- 2.21.0

3 14

[libvirt] [PATCH v2 0/3] misc virhostdevs cleanups
by Daniel Henrique Barboza 31 Jul '19

31 Jul '19

changes in v2: - changed the parameter order in the function calls - gave up on moving virPCIDeviceSetX(pci, true) calls to virPCIDeviceReattach(). The attributes being set changes the behavior of virPCIDeviceReattach() in a more complex way than I expected. I still believe a simplification can be done there, but it became out of scope for a more simplistic cleanup such as this one. These are cleanups that I made together with an attempt to enable parcial PCI Multifunction assignment with managed=true. That work will be scrapped after discussions with Laine in [1], but these cleanups kind of make sense on their own, so here they are. [1] https://www.redhat.com/archives/libvir-list/2019-July/msg01175.html *** BLURB HERE *** Daniel Henrique Barboza (3): virhostdev: introduce virHostdevResetAllPCIDevices virhostdev: remove virHostdevReattachPCIDevice virhostdev: introduce virHostdevReattachAllPCIDevices src/util/virhostdev.c | 148 +++++++++++++++++------------------------- src/util/virpci.c | 14 ++++ 2 files changed, 75 insertions(+), 87 deletions(-) -- 2.21.0

2 6