- Devel - libvirt List Archives

[libvirt] [PATCH v1 0/8] domain_addr and qemu_domain cleanups
by Daniel Henrique Barboza 31 Jan '20

31 Jan '20

Hi, These are a few cleanups in some files that I'll end up messing with in a future series (which isn't Glibfied ATM). Figured it's best to clean them up now instead of adding more non-Glibfied code on top. Patches 7 and 8 are stuff that I noted some time ago and figured it might be worth sending as well. Daniel Henrique Barboza (8): conf/domain_addr.c: use g_autofree in strings conf/domain_addr.c: remove unneeded 'cleanup' labels qemu_domain.c: remove redundant virObjectUnref() qemu_domain.c: use g_autofree when possible qemu_domain.c: use g_autoptr when possible qemu_domain.c: removing unneeded cleanup labels qemu_domain.c: turn qemuDomainChrDefDropDefaultPath to void qemu_domain_address.c: turn qemuDomainFillDeviceIsolationGroup to void src/conf/domain_addr.c | 124 +++----- src/qemu/qemu_domain.c | 511 +++++++++++---------------------- src/qemu/qemu_domain_address.c | 20 +- src/qemu/qemu_domain_address.h | 2 +- src/qemu/qemu_hotplug.c | 6 +- 5 files changed, 227 insertions(+), 436 deletions(-) -- 2.24.1

2 11

[hooks PATCH] Don't allow @localhost email addresses in commit message
by Daniel P. Berrangé 31 Jan '20

31 Jan '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- update | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/update b/update index 247b008..966fe22 100755 --- a/update +++ b/update @@ -264,6 +264,19 @@ if [ $check_diff = yes ]; then fi done fi + + allow_localhost_email=$(git config --bool hooks.allowlocalhostemail) + if [ "$allow_localhost_email" != "true" ]; then + for rev in `git log --format=%h $oldrev..$newrev` + do + git show $rev | grep '@localhost' >/dev/null 2>&1 + if test $? != 0 + then + echo "*** Update hook: @localhost email address is forbidden $rev" >&2 + exit 1 + fi + done + fi fi # --- Finished -- 2.24.1

3 2

[libvirt PATCH] docs: Update godoc URLs for Go packages
by Andrea Bolognani 31 Jan '20

31 Jan '20

Since commit 201156ec6e65e08cdb04d6fdefe013652fb7fa87 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Mon Dec 16 10:06:50 2019 +0000 docs: add pages to support Go module package resolution it's possible to use import "libvirt.org/libvirt-go" import "libvirt.org/libvirt-go-xml" in Go programs, which will result in the Go packages being fetched directly from libvirt.org instead of GitHub. The godoc website offers the API documentation for the updated imports, and that's where we should send users. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/downloads.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index e84455ca04..d4b4701ee0 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -71,7 +71,7 @@ <a href="https://github.com/libvirt/libvirt-go">github</a> </td> <td> - <a href="https://godoc.org/github.com/libvirt/libvirt-go">api ref</a> + <a href="https://godoc.org/libvirt.org/libvirt-go">api ref</a> </td> </tr> <tr> @@ -206,7 +206,7 @@ <a href="https://github.com/libvirt/libvirt-go-xml">github</a> </td> <td> - <a href="https://godoc.org/github.com/libvirt/libvirt-go-xml">api ref</a> + <a href="https://godoc.org/libvirt.org/libvirt-go-xml">api ref</a> </td> </tr> <tr> -- 2.24.1

2 1

[libvirt PATCH] docs: Update download location for Go packages
by Andrea Bolognani 31 Jan '20

31 Jan '20

We haven't ever made releases of the Go components, which makes sense because that's just not how that specific ecosystem works. For people who are looking to use libvirt from Go, the brief introductory pages located at the same URLs used to import the packages are a much better entry point than an empty directory listing, so let's send them there instead. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/downloads.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index e84455ca04..7cbf3cadc0 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -61,7 +61,7 @@ <tr> <td>Go</td> <td> - <a href="https://libvirt.org/sources/go/">libvirt</a> + <a href="https://libvirt.org/libvirt-go">libvirt</a> </td> <td> <a href="https://libvirt.org/git/?p=libvirt-go.git;a=summary">libvirt</a> @@ -196,7 +196,7 @@ <tr> <td>Go XML</td> <td> - <a href="https://libvirt.org/sources/go/">libvirt</a> + <a href="https://libvirt.org/libvirt-go-xml">libvirt</a> </td> <td> <a href="https://libvirt.org/git/?p=libvirt-go-xml.git;a=summary">libvirt</a> -- 2.24.1

2 1

[PATCH] apparmor: fix qemu_bridge_helper for named profile
by Christian Ehrhardt 31 Jan '20

31 Jan '20

Since a3ab6d42 "apparmor: convert libvirtd profile to a named profile" the detection of the subelement for qemu_bridge_helper is wrong. In combination with the older 123cc3e1 "apparmor: allow /usr/lib/qemu/qemu-bridge-helper" it now detects qemu-bridge-helper no more with its path, but instead as a proper subelement of the named profile like: label=libvirtd//qemu_bridge_helper In the same fashion the reverse rule in the qemu_bridge_helper sub-profile still uses the path and not the named profile label. Triggering denies like: apparmor="DENIED" operation="file_inherit" profile="libvirtd//qemu_bridge_helper" pid=5629 comm="qemu-bridge-hel" family="unix" sock_type="stream" protocol=0 requested_mask="send receive" denied_mask="send receive" addr=none peer_addr=none peer="libvirtd" This patch fixes the unix socket rules for the communication between libvirtd and qemu-bridge-helper to match that. Fixes: a3ab6d42d825499af44b8f19f9299e150d9687bc Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1655111 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/apparmor/usr.sbin.libvirtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/security/apparmor/usr.sbin.libvirtd b/src/security/apparmor/usr.sbin.libvirtd index 29f9936ad9..172972e525 100644 --- a/src/security/apparmor/usr.sbin.libvirtd +++ b/src/security/apparmor/usr.sbin.libvirtd @@ -62,8 +62,8 @@ profile libvirtd /usr/sbin/libvirtd flags=(attach_disconnected) { signal (send) set=("kill", "term") peer=unconfined, # For communication/control to qemu-bridge-helper - unix (send, receive) type=stream addr=none peer=(label=/usr/sbin/libvirtd//qemu_bridge_helper), - signal (send) set=("term") peer=/usr/sbin/libvirtd//qemu_bridge_helper, + unix (send, receive) type=stream addr=none peer=(label=libvirtd//qemu_bridge_helper), + signal (send) set=("term") peer=libvirtd//qemu_bridge_helper, # allow connect with openGraphicsFD, direction reversed in newer versions unix (send, receive) type=stream addr=none peer=(label=libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*), @@ -121,7 +121,7 @@ profile libvirtd /usr/sbin/libvirtd flags=(attach_disconnected) { network inet stream, # For communication/control from libvirtd - unix (send, receive) type=stream addr=none peer=(label=/usr/sbin/libvirtd), + unix (send, receive) type=stream addr=none peer=(label=libvirtd), signal (receive) set=("term") peer=/usr/sbin/libvirtd, signal (receive) set=("term") peer=libvirtd, -- 2.25.0

2 2

[PATCH 00/10] qemu: Fix pre-creation of non-shared storage on migration
by Peter Krempa 30 Jan '20

30 Jan '20

The last patch fixes a bug where we'd fail to detect capacity of disks on migration source due to changes in disk topology related to blockdev. The rest of the series makes the function at least somewhat sane. Peter Krempa (10): util: hash: Use g_new0 for allocating hash internals conf: domain: Remove checking of return value of virHashCreateFull Remove checking of return value of virHashNew qemuMigrationCookieAddNBD: Exit early if there are no disks qemuMigrationCookieNBD: Extract embedded struct qemuMigrationCookieAddNBD: Use glib memory allocators qemuMigrationCookieAddNBD: Move monitor call out of the loop qemuMigrationCookieAddNBD: Use virHashNew and automatic freeing of virHashTablePtr qemuMigrationCookieAddNBD: Remove 'ret' variable and 'cleanup' label qemuMigrationCookieAddNBD: Fix filling of 'capacity' when blockdev is used src/conf/backup_conf.c | 6 +--- src/conf/domain_addr.c | 32 +++++++----------- src/qemu/qemu_migration_cookie.c | 58 +++++++++++++++----------------- src/qemu/qemu_migration_cookie.h | 10 +++--- src/qemu/qemu_monitor_json.c | 3 +- src/util/virhash.c | 14 +++----- 6 files changed, 54 insertions(+), 69 deletions(-) -- 2.24.1

2 14

[PATCH v2 00/21] PCI Multifunction hotplug/hotunplug support
by Daniel Henrique Barboza 30 Jan '20

30 Jan '20

This series adds PCI multifunction hotplug/unplug capabilities for Libvirt. Some of these patches were sent last year in a shorter prep series in [1]. The patches then got a bit of rework to keep up with Libvirt changes in master. This work follows the considerations made for the unplug design in [2]. A first version of this series were sent back in 2018 [3], so this is the official version 2 of that work. The design guideline for the patches can be summed up as: - attach/detach functions were changed to handle a list of devices instead of a single device definition. The regular device attach/detach is represented with a list with size = 1; - common code between single device and multifunction device mechanics were moved to 'internal' versions of the functions; - for the 'Live' operations, both attach and detach were handled in specialized functions for the multifunction case. The regular case is still being handled by the same functions. This allowed us to add the multifunction support without changing existing regular attach/detach device support. Attaching/detaching a multifunction device works by supplying the <devices> XML to the same attach/detach commands we already use. It is expected to supply the same XML when detaching the device, as discussed in [2]. Despite the changes and additions I've made, this is still adherent to the original 2018 series from Shivaprasad G Bhat. [1] https://www.redhat.com/archives/libvir-list/2019-August/msg01382.html [2] https://www.redhat.com/archives/libvir-list/2020-January/msg00865.html [3] https://www.redhat.com/archives/libvir-list/2018-March/msg00729.html Daniel Henrique Barboza (4): utils: PCI multifunction detection helpers qemu_hotplug.c: tune unplugTimeout for multifunction detach qemu_hotplug: do not hotplug/hotunplug 'unassigned' hostdevs qemu_hotplug.c: use enhanced multifunction unplug if available Shivaprasad G Bhat (17): qemu: address: Separate the slots into multiple aggregates virhostdev: Introduce virHostdevPCIDevicesBelongToSameSlot qemu: address: Enable auto addressing multifunction cards conf: qemu: validate multifunction hostdevice domain configs conf: Add helper to get active functions of a slot of domain qemu: hostdev: Move the hostdev preparation to a separate function qemu: hotplug: Move the detach of PCI device to the beginning of live hotplug qemu: hotplug: move assignment outside qemuDomainAttachHostPCIDevice Introduce virDomainDeviceDefParseXMLMany Introduce qemuDomainDeviceParseXMLMany qemu: refactor qemuDomain[Attach|Detach]DeviceConfig qemu: refactor qemuDomain[Attach|Detach]DeviceLive qemu: hotplug: Queue and wait for multiple devices domain: addr: Introduce virDomainPCIAddressEnsureMultifunctionAddress qemu: hotplug: Implement multifunction device hotplug qemu: hotplug: Prevent updates to multifunction device qemu: hotplug: Implement multifunction device unplug src/conf/device_conf.h | 7 + src/conf/domain_addr.c | 129 ++++- src/conf/domain_addr.h | 43 +- src/conf/domain_conf.c | 198 +++++++- src/conf/domain_conf.h | 35 ++ src/libvirt_private.syms | 10 + src/qemu/qemu_domain.c | 73 +++ src/qemu/qemu_domain.h | 21 +- src/qemu/qemu_domain_address.c | 366 ++++++++++++++- src/qemu/qemu_domain_address.h | 16 + src/qemu/qemu_driver.c | 242 +++++++--- src/qemu/qemu_hotplug.c | 440 +++++++++++++++--- src/qemu/qemu_hotplug.h | 14 + src/util/virhostdev.c | 54 +++ src/util/virhostdev.h | 5 + src/util/virpci.c | 17 + src/util/virpci.h | 4 + tests/qemuhotplugtest.c | 68 ++- ...emuhotplug-multifunction-hostdev-pci-2.xml | 14 + ...plug-multifunction-hostdev-pci-partial.xml | 27 ++ .../qemuhotplug-multifunction-hostdev-pci.xml | 26 ++ ...live+multifunction-hostdev-pci-partial.xml | 82 ++++ ...ug-base-live+multifunction-hostdev-pci.xml | 82 ++++ ...-base-live+multifunction-hostdev-pci-2.xml | 59 +++ ...es-base-live+multifunction-hostdev-pci.xml | 69 +++ .../hostdev-pci-address-unassigned.args | 9 +- .../hostdev-pci-multifunction.args | 18 +- .../hostdev-pci-multifunction.xml | 8 +- .../hostdev-pci-no-primary-function.xml | 23 + .../hostdev-pci-validate.args | 30 ++ .../qemuxml2argvdata/hostdev-pci-validate.xml | 29 ++ .../qemuxml2argvdata/pseries-hostdevs-1.args | 5 +- .../qemuxml2argvdata/pseries-hostdevs-3.args | 5 +- tests/qemuxml2argvtest.c | 14 +- .../hostdev-pci-address-unassigned.xml | 8 +- .../hostdev-pci-multifunction.xml | 24 +- .../qemuxml2xmloutdata/pseries-hostdevs-1.xml | 4 +- .../qemuxml2xmloutdata/pseries-hostdevs-3.xml | 4 +- tests/virpcitestdata/0005-90-01.1.config | Bin 256 -> 256 bytes tests/virpcitestdata/0005-90-01.2.config | Bin 256 -> 256 bytes tests/virpcitestdata/0005-90-01.3.config | Bin 0 -> 256 bytes 41 files changed, 2023 insertions(+), 259 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-multifunction-hostdev-pci-2.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-multifunction-hostdev-pci-partial.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-multifunction-hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+multifunction-hostdev-pci-partial.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+multifunction-hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live+multifunction-hostdev-pci-2.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live+multifunction-hostdev-pci.xml create mode 100644 tests/qemuxml2argvdata/hostdev-pci-no-primary-function.xml create mode 100644 tests/qemuxml2argvdata/hostdev-pci-validate.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-validate.xml create mode 100644 tests/virpcitestdata/0005-90-01.3.config -- 2.24.1

1 22

[PATCH] docs: update Rust releases and resources links
by Sahid Orentino Ferdjaoui 30 Jan '20

30 Jan '20

This is updating the releases and resources links so they point now to crates.io for the releases and docs.rs for the api ref. Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui(a)canonical.com> --- docs/downloads.html.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index e84455ca04..50e0c54046 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -165,7 +165,7 @@ <tr> <td>Rust</td> <td> - <a href="https://libvirt.org/sources/rust/">libvirt</a> + <a href="https://crates.io/crates/virt">crates.io</a> </td> <td> <a href="https://libvirt.org/git/?p=libvirt-rust.git;a=summary">libvirt</a> @@ -174,7 +174,9 @@ <a href="https://gitlab.com/libvirt/libvirt-rust">gitlab</a> <a href="https://github.com/libvirt/libvirt-rust">github</a> </td> - <td></td> + <td> + <a href="https://docs.rs/virt">api ref</a> + </td> </tr> <tr> <th colspan="7">Integration modules</th> -- 2.20.1

2 1

[PATCH 0/6] Couple of apparmor fixes
by Michal Privoznik 30 Jan '20

30 Jan '20

These are inspired by Gentoo patch [1]. However, they still match what we do upstream, so I figured we should merge them. 1: https://github.com/gentoo/gentoo/blob/master/app-emulation/libvirt/files/li… Michal Prívozník (6): apparmor: Fix parthelper, iohelper and virt-aa-helper paths in profiles apparmor: Allow libvirt to spawn virt-aa-helper and libvirt_lxc docs: Fix virt-aa-helper location apparmor: Rename virt-aa-helper profile apparmor: Sort paths in blocks in libvirt-qemu profile apparmor: Allow some more BIOS/UEFI paths docs/drvqemu.html.in | 2 +- src/security/Makefile.inc.am | 10 +-- src/security/apparmor/libvirt-qemu | 78 ++++++++++--------- ...t-aa-helper => usr.libexec.virt-aa-helper} | 6 +- src/security/apparmor/usr.sbin.libvirtd | 6 +- 5 files changed, 53 insertions(+), 49 deletions(-) rename src/security/apparmor/{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper} (90%) -- 2.24.1

4 18

[libvirt PATCH 0/2] Use immediate paket delivery mode instead of buffering in the DHCP snoop thread
by Erik Skultety 30 Jan '20

30 Jan '20

See patch 2 for the reasoning. Erik Skultety (2): libpcap: Bump the minimum required version to >= 1.5.0 nwfilter: Use immediate paket delivery mode rather than buffering libvirt.spec.in | 2 +- m4/virt-libpcap.m4 | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 24 +----------------------- 3 files changed, 3 insertions(+), 25 deletions(-) -- 2.24.1

3 5

[libvirt-rust PATCH v3 0/4] Map more functions in stream module
by Zixing Liu 30 Jan '20

30 Jan '20

This set of patches will add more functions to the Rust bindings. Newly mapped functions from C library: virStreamNew virStreamEventUpdateCallback virStreamEventRemoveCallback virStreamEventAddCallback. virStreamEventAddCallback can accept normal fn functions or closures (can capture variables outside) The changes are not very thoroughly tested since event module is not implemented at all so the virStreamEventAddCallback will always return "unsupported by the connection driver". Version 2: Addressed comments Version 3: Undo format changes and rebased against latest branch Zixing Liu (4): libvirt-rust: stream: add more functions in stream libvirt-rust: stream: add more functions in stream libvirt-rust: use reference instead of moving libvirt-rust: stream: addressed comments src/domain.rs | 2 +- src/stream.rs | 94 ++++++++++++++++++++++++++++++++++++++++++++++--- tests/stream.rs | 40 +++++++++++++++++++++ 3 files changed, 130 insertions(+), 6 deletions(-) create mode 100644 tests/stream.rs -- 2.25.0

2 5

[libvirt-go PATCH] Import from libvirt.org instead of github.com
by Andrea Bolognani 30 Jan '20

30 Jan '20

Since commit 201156ec6e65e08cdb04d6fdefe013652fb7fa87 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Mon Dec 16 10:06:50 2019 +0000 docs: add pages to support Go module package resolution it's possible to use import "libvirt.org/libvirt-go" in Go programs, which will result in the Go bindings being fetched directly from libvirt.org thus removing our reliance on GitHub. Update the documentation accordingly. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- README.md | 4 ++-- doc.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 326d6a0..c11e9ab 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# libvirt-go [![Build Status](https://travis-ci.org/libvirt/libvirt-go.svg?branch=master)](https:… [![GoDoc](https://godoc.org/github.com/libvirt/libvirt-go?status.svg)](https://godoc.org/github.com/libvirt/libvirt-go) +# libvirt-go [![Build Status](https://travis-ci.org/libvirt/libvirt-go.svg?branch=master)](https:… [![GoDoc](https://godoc.org/libvirt.org/libvirt-go?status.svg)](https://godoc.org/libvirt.org/libvirt-go) Go bindings for libvirt. @@ -32,7 +32,7 @@ changes may apply to future versions: ## Documentation -* [api documentation for the bindings](https://godoc.org/github.com/libvirt/libvirt-go) +* [api documentation for the bindings](https://godoc.org/libvirt.org/t libvirt-go) * [api documentation for libvirt](http://libvirt.org/html/libvirt-libvirt.html) ## Contributing diff --git a/doc.go b/doc.go index 55d75b0..35c9962 100644 --- a/doc.go +++ b/doc.go @@ -116,7 +116,7 @@ // To connect to libvirt // // import ( -// libvirt "github.com/libvirt/libvirt-go" +// libvirt "libvirt.org/libvirt-go" // ) // conn, err := libvirt.NewConnect("qemu:///system") // if err != nil { -- 2.24.1

3 3

[libvirt-go-xml PATCH] Import from libvirt.org instead of github.com
by Andrea Bolognani 30 Jan '20

30 Jan '20

Since commit 201156ec6e65e08cdb04d6fdefe013652fb7fa87 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Mon Dec 16 10:06:50 2019 +0000 docs: add pages to support Go module package resolution it's possible to use import "libvirt.org/libvirt-go-xml" in Go programs, which will result in the Go bindings being fetched directly from libvirt.org thus removing our reliance on GitHub. Update the documentation accordingly. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- README.md | 4 ++-- doc.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 79f42f4..fcc1ffb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# libvirt-go-xml [![Build Status](https://travis-ci.org/libvirt/libvirt-go-xml.svg?branch=master)](ht… [![GoDoc](https://godoc.org/github.com/libvirt/libvirt-go-xml?status.svg)](https://godoc.org/github.com/libvirt/libvirt-go-xml) +# libvirt-go-xml [![Build Status](https://travis-ci.org/libvirt/libvirt-go-xml.svg?branch=master)](ht… [![GoDoc](https://godoc.org/libvirt.org/libvirt-go-xml?status.svg)](https://godoc.org/libvirt.org/libvirt-go-xml) Go API for manipulating libvirt XML documents @@ -9,7 +9,7 @@ the way in which the application talks to libvirt. ## Documentation -* [API documentation for the bindings](https://godoc.org/github.com/libvirt/libvirt-go-xml) +* [API documentation for the bindings](https://godoc.org/libvirt.org/libvirt-go-xml) * [Libvirt XML schema documentation](https://libvirt.org/format.html): * [capabilities](https://libvirt.org/formatcaps.html) * [domain](https://libvirt.org/formatdomain.html) diff --git a/doc.go b/doc.go index 25bc1d5..f93fac0 100644 --- a/doc.go +++ b/doc.go @@ -36,7 +36,7 @@ // package main // // import ( -// "github.com/libvirt/libvirt-go-xml" +// "libvirt.org/libvirt-go-xml" // ) // // func main() { @@ -51,8 +51,8 @@ // package main // // import ( -// "github.com/libvirt/libvirt-go" -// "github.com/libvirt/libvirt-go-xml" +// "libvirt.org/libvirt-go" +// "libvirt.org/libvirt-go-xml" // "fmt" // ) // -- 2.24.1

2 1

[PATCH v3 0/4] lxc: Add suport to network indexes for LXC 3.X
by Julio Faracco 30 Jan '20

30 Jan '20

This series implement support for network syntax settings for LXC 3.X. Now, indexes are part of the settings to define network interfaces. Each interface has its own index. The old style uses 'type' tag to differentiate each interface and with this, it could use one single structure. Now, network interfaces are a single array with interface pointers. Old: lxc.network.type = veth lxc.network.flags = up lxc.network.link = virbr0 New: lxc.net.0.type = veth lxc.net.0.flags = up lxc.net.0.link = virbr0 v1-v2: Moving sscanf to virStrToLong_ull according Daniel's suggestion. v2-v3: Adding missing g_autofree from `suffix` variable. Julio Faracco (4): lxc: refactor lxcNetworkParseData pointers to use new structures lxc: add LXC version 3 network parser lxc: remove domain definition from lxc network struct tests: update LXC config dataset to support V3 indexes src/lxc/lxc_native.c | 189 ++++++++++++------ .../lxcconf2xml-ethernet-v3.config | 16 +- .../lxcconf2xml-fstab-v3.config | 10 +- .../lxcconf2xml-macvlannetwork-v3.config | 10 +- .../lxcconf2xml-simple-v3.config | 18 +- 5 files changed, 151 insertions(+), 92 deletions(-) -- 2.20.1

2 7

[PATCH] libxl: support getting and setting parameters for the Credit2
by Dario Faggioli 30 Jan '20

30 Jan '20

With Credit2 being Xen default scheduler, it's definitely the case to allow Credit2's scheduling parameters to be get and set via libvirt. This is easy, as Credit and Credit2 have (at least as of now) the very same parameters ('weight' and 'cap'). So we can just let credit2 pass the scheduler-type check and the same code will work for both. Signed-off-by: Dario Faggioli <dfaggioli(a)suse.com> --- Cc: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e0a8ec5c24..78ca77d0f6 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -75,6 +75,7 @@ VIR_LOG_INIT("libxl.libxl_driver"); /* Number of Xen scheduler parameters */ #define XEN_SCHED_CREDIT_NPARAM 2 +#define XEN_SCHED_CREDIT2_NPARAM 2 #define LIBXL_CHECK_DOM0_GOTO(name, label) \ do { \ @@ -4586,6 +4587,8 @@ libxlDomainGetSchedulerType(virDomainPtr dom, int *nparams) break; case LIBXL_SCHEDULER_CREDIT2: name = "credit2"; + if (nparams) + *nparams = XEN_SCHED_CREDIT2_NPARAM; break; case LIBXL_SCHEDULER_ARINC653: name = "arinc653"; @@ -4632,11 +4635,11 @@ libxlDomainGetSchedulerParametersFlags(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto cleanup; + /* Only credit and credit2 are supported for now. */ sched_id = libxl_get_scheduler(cfg->ctx); - - if (sched_id != LIBXL_SCHEDULER_CREDIT) { + if (sched_id != LIBXL_SCHEDULER_CREDIT && sched_id != LIBXL_SCHEDULER_CREDIT2) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Only 'credit' scheduler is supported")); + _("Only 'credit' and 'credit2' schedulers are supported")); goto cleanup; } @@ -4657,6 +4660,9 @@ libxlDomainGetSchedulerParametersFlags(virDomainPtr dom, goto cleanup; } + /* Credit and Credit2 have the same number (two) of parameters, + * so this is ok for both, at least as long as that stays true. */ + G_STATIC_ASSERT(XEN_SCHED_CREDIT_NPARAM == XEN_SCHED2_CREDIT_NPARAM); if (*nparams > XEN_SCHED_CREDIT_NPARAM) *nparams = XEN_SCHED_CREDIT_NPARAM; ret = 0; @@ -4711,9 +4717,11 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, sched_id = libxl_get_scheduler(cfg->ctx); - if (sched_id != LIBXL_SCHEDULER_CREDIT) { + /* Only credit and credit2 are supported for now. */ + sched_id = libxl_get_scheduler(cfg->ctx); + if (sched_id != LIBXL_SCHEDULER_CREDIT && sched_id != LIBXL_SCHEDULER_CREDIT2) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Only 'credit' scheduler is supported")); + _("Only 'credit' and 'credit2' schedulers are supported")); goto endjob; } -- 2.24.1 -- Dario Faggioli, Ph.D http://about.me/dario.faggioli Virtualization Software Engineer SUSE Labs, SUSE https://www.suse.com/ ------------------------------------------------------------------- <<This happens because _I_ choose it to happen!>> (Raistlin Majere)

2 1

RHEL 7.7/libvirt 5.10 Question
by bart.m.bailey＠verizon.com 29 Jan '20

29 Jan '20

Hello, RHEL 7.7 installation attempts of libvirt-5.10.0-1.fc30.src.rpm are encountering the following - make[4]: Entering directory `/root/rpm/BUILD/libvirt-5.10.0/x86_64-redhat-linux-gnu/gnulib/tests' CC test-accept.o CC test-alloca-opt.o CC test-arpa_inet.o CC test-binary-io.o ============================================================================ Testsuite summary for libvirt 5.10.0 ============================================================================ # TOTAL: 197 # PASS: 187 # SKIP: 10 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ============================================================================ With subsequent testsuite execcuiton registering the following failure - ============================================================================ Testsuite summary for libvirt 5.10.0 ============================================================================ # TOTAL: 131 # PASS: 130 # SKIP: 0 # XFAIL: 0 # FAIL: 1 # XPASS: 0 # ERROR: 0 ============================================================================ See tests/test-suite.log Please report to libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> ============================================================================ make[3]: *** [test-suite.log] Error 1 make[3]: Leaving directory `/root/rpm/BUILD/libvirt-5.10.0/x86_64-redhat-linux-gnu/tests' make[2]: *** [check-TESTS] Error 2 make[2]: Leaving directory `/root/rpm/BUILD/libvirt-5.10.0/x86_64-redhat-linux-gnu/tests' make[1]: *** [check-am] Error 2 make[1]: Leaving directory `/root/rpm/BUILD/libvirt-5.10.0/x86_64-redhat-linux-gnu/tests' make: *** [check-recursive] Error 1 + cat test-suite.log cat: test-suite.log: No such file or directory + true + exit 1 error: Bad exit status from /var/tmp/rpm-tmp.eMOkrN (%check) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.eMOkrN (%check) The gnulib-test-suite.log file attachment registers the following event ... 35) Checking luks-disk-invalid.xml against domain.rng ... libvirt: XML Util error : XML document failed to validate against schema: Unable to validate doc against /root/rpm/BUILD/libvirt-5.10.0/x86_64-redhat-linux-gnu/../docs/schemas/domain.rng Extra element devices in interleave Element domain failed to validate content OK 36) Checking disk-serial.xml against domain.rng ... OK 37) Checking pseries-no-parallel.xml against domain.rng ... OK ...with subsequent xml errors following similar to below. 2115) Checking dir-missing-target-path-invalid.xml against storagepool.rng ... libvirt: XML Util error : XML document failed to validate against schema: Unable to validate doc against /root/rpm/BUILD/libvirt-5.10.0/x86_64-redhat-linux-gnu/../docs/schemas/storagepool.rng Expecting an element path, got nothing Invalid sequence in interleave Element target failed to validate content Invalid sequence in interleave Element pool failed to validate content OK File attachments x86_64-redhat-linux-gnu/gnulib/tests/test-suite.log, x86_64-redhat-linux-gnu/tests/test-suite.log are provided and not sure if this helps but libvirt 5.10 candidate release libvirt-5.10.0-0rc2.fc30.src.rpm<https://libvirt.org/sources/libvirt-5.10.0-0rc2.fc30.src.rpm> completed RPM builds successfully. Libvirt 5.10 release libvirt-5.10.0-1.fc30.src.rpm is required for this application. Thanks and let us know if anything else is needed from this end. [cid:image002.png@01D5D5B6.9ADA0040] Bart Bailey (216) 462-2173 Verizon ME Lab Richardson 400 International Parkway Richardson, TX 75081

2 2

[PATCH v1 0/2] DAC,SELinux: do not remember/recall labels for
by Daniel Henrique Barboza 29 Jan '20

29 Jan '20

Libvirt is trying to do multiple open() calls in /dev/vfio files, which results in errors inside the security drivers and QEMU returning error 125 when attempting to hotplug a hostdev which belongs to the same IOMMU group as an existing domain hostdev. See patch 2 commit msg for more details. I found this problem when testing a PCI multifunction hotplug implementation. Since this is a problem that can happen in other currently supported scenarios, I decided it was worth sending the fix right away. Michal, I'm CCing you because I mentioned commit 4e95cdcbb3 ("security: Don't remember labels for TPM") in patch 2, which seems to fix a very similar problem. Figured you might want to take a look. Daniel Henrique Barboza (2): security: Allow 'remember' to be set for HostdevLabelHelper security: do not remember/recall labels for VFIO src/security/security_dac.c | 20 ++++++++++++-------- src/security/security_selinux.c | 20 ++++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) -- 2.24.1

2 3

[libvirt PATCH] docs: add warning about virt-qemu-run being experimental
by Daniel P. Berrangé 29 Jan '20

29 Jan '20

We currently note that the QEMU embedded driver in experimental in the drvqemu.html file, but we should do the same in the virt-qemu-run man page. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/manpages/virt-qemu-run.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/manpages/virt-qemu-run.rst b/docs/manpages/virt-qemu-run.rst index 5074a928b7..b06c311b1d 100644 --- a/docs/manpages/virt-qemu-run.rst +++ b/docs/manpages/virt-qemu-run.rst @@ -33,6 +33,11 @@ If the virt-qemu-run program is interrupted (eg Ctrl-C) it will immediately terminate the virtual machine without giving the guest OS any opportunity to gracefully shutdown. +**NOTE: this tool is currently considered experimental.** Its +usage and behaviour is still subject to change in future libvirt +releases. For further information on its usage consult the +`QEMU driver documentation <https://libvirt.org/drvqemu.html#uriembedded>`_. + OPTIONS ======= -- 2.24.1

2 1

[libvirt PATCH 0/2] docs: make rst docs generation more robust
by Daniel P. Berrangé 29 Jan '20

29 Jan '20

This will avoid the various issues with generated docs containing build warnings. Daniel P. Berrangé (2): docs: fix various duplicate link targets in virsh.rst docs: use --strict arg when processing rst docs docs/Makefile.am | 10 +++++----- docs/manpages/virsh.rst | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 23 deletions(-) -- 2.24.1

2 3

[libvirt-rust] change in coding style to follow rustfmt
by Sahid Orentino Ferdjaoui 29 Jan '20

29 Jan '20

I'm proposing to merge a change [0] so the CI would check whether the source code is well-formatted using rustfmt [1]. The aim is to add an easy convention to follow regarding the coding style. For contributors the natural thing to do before to submit any patches is to verify the format using: `cargo fmt -v -- --check` The support of rustfmt via cargo can be added using: `rustup component add rustfmt` I did not want to pollute the mailing list with such big change which doesn't bring anything. Please let me know if you have any objections. commit 851296786626d61ebec985a9caeb515514955dd8 Author: Sahid Orentino Ferdjaoui <sahid.ferdjaoui(a)canonical.com> Date: Tue Jan 28 15:05:44 2020 +0100 ensure that the code is well formatted using rustfmt. In this commit we add CI rule so travis would check whether the code is well formatted using rustfmt. Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui(a)canonical.com> .travis.yml | 4 + README.md | 6 + examples/auth.rs | 19 +- examples/hello.rs | 76 +-- examples/migrate.rs | 35 +- examples/suspend.rs | 31 +- src/connect.rs | 534 ++++++++++-------- src/domain.rs | 1323 +++++++++++++++++++++++++-------------------- src/domain_snapshot.rs | 88 +-- src/error.rs | 13 +- src/interface.rs | 38 +- src/lib.rs | 30 +- src/network.rs | 75 +-- src/nodedev.rs | 122 +++-- src/nwfilter.rs | 14 +- src/secret.rs | 79 +-- src/storage_pool.rs | 99 ++-- src/storage_vol.rs | 218 ++++---- src/stream.rs | 27 +- tests/common/mod.rs | 115 ++-- tests/connect.rs | 74 +-- tests/domain.rs | 14 +- tests/integration_qemu.rs | 39 +- tests/interface.rs | 2 - tests/network.rs | 1 - tests/storage_pool.rs | 18 +- 26 files changed, 1717 insertions(+), 1377 deletions(-) Thanks. s. [0] https://github.com/sahid/libvirt-rust/commit/851296786626d61ebec985a9caeb51… [1] https://travis-ci.org/sahid/libvirt-rust/builds/642931039

3 2

[PATCH v2 0/7] qemu: block iotune group fixes/improvements
by Michal Privoznik 29 Jan '20

29 Jan '20

This series was originally posted by Nikolay here: https://www.redhat.com/archives/libvir-list/2020-January/msg00283.html I've delayed review too much. Sorry for that. To make it up to you, I've fixed some patches and resending the series. Basically, I want to know whether you agree with my adjustments. I will add Dan's Reviewed-by when merging. Nikolay Shirokovskiy (7): qemu: Move qemuDiskConfigBlkdeviotuneHas* to conf conf: expand iotune params if only group name is given qemu: propagate iotune settings to all disks in the group qemu: check iotune params same for all disk in group qemu: fix using defaults when setting persistent iotune params qemu: get defaults from iotune group we move disk into qemu: when leaving iotune group update xml properly src/conf/domain_conf.c | 108 +++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 22 ++++++++ src/libvirt_private.syms | 6 +++ src/qemu/qemu_command.c | 91 ++++++++++++++------------------- src/qemu/qemu_command.h | 3 ++ src/qemu/qemu_driver.c | 94 ++++++++++++++++++++++++++++++++-- src/qemu/qemu_hotplug.c | 2 +- tests/qemublocktest.c | 8 ++- 8 files changed, 275 insertions(+), 59 deletions(-) -- 2.24.1

2 9

[libvirt] [PATCH 0/7] qemu: block iotune group fixes/improvements
by Nikolay Shirokovskiy 29 Jan '20

29 Jan '20

Currently iotune group impl has several bugs/oddities this patchset aims to fix. Also patches (2) and (3) add/change functionality so that group iotune became easier/saner to use. TODO: add docs to API/virsh in respect to using iotune group Nikolay Shirokovskiy (7): conf: refactor virDomainBlockIoTuneInfoHas* conf: expand iotune params if only group name is given (2) qemu: check iotune params same for all disk in group qemu: fix using defaults when setting persistent iotune params qemu: propagate iotune settings to all disks in the group qemu: get defaults from iotune group we move disk into (3) qemu: when leaving iotune group update xml properly src/conf/domain_conf.c | 104 +++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 16 ++++++ src/libvirt_private.syms | 5 ++ src/qemu/qemu_command.c | 90 ++++++++++++++------------------- src/qemu/qemu_command.h | 3 ++ src/qemu/qemu_driver.c | 98 ++++++++++++++++++++++++++++++++++-- src/qemu/qemu_hotplug.c | 2 +- tests/qemublocktest.c | 2 +- 8 files changed, 262 insertions(+), 58 deletions(-) -- 2.23.0

3 17

[libvirt PATCH 00/10] Various cleanups (virtio-fs epopee)
by Ján Tomko 29 Jan '20

29 Jan '20

2 22

[PATCH v2 0/4] lxc: Add suport to network indexes for LXC 3.X
by Julio Faracco 28 Jan '20

28 Jan '20

This series implement support for network syntax settings for LXC 3.X. Now, indexes are part of the settings to define network interfaces. Each interface has its own index. The old style uses 'type' tag to differentiate each interface and with this, it could use one single structure. Now, network interfaces are a single array with interface pointers. Old: lxc.network.type = veth lxc.network.flags = up lxc.network.link = virbr0 New: lxc.net.0.type = veth lxc.net.0.flags = up lxc.net.0.link = virbr0 v1-v2: Moving sscanf to virStrToLong_ull according Daniel's suggestion. Julio Faracco (4): lxc: refactor lxcNetworkParseData pointers to use new structures lxc: add LXC version 3 network parser lxc: remove domain definition from lxc network struct tests: update LXC config dataset to support V3 indexes src/lxc/lxc_native.c | 189 ++++++++++++------ .../lxcconf2xml-ethernet-v3.config | 16 +- .../lxcconf2xml-fstab-v3.config | 10 +- .../lxcconf2xml-macvlannetwork-v3.config | 10 +- .../lxcconf2xml-simple-v3.config | 18 +- 5 files changed, 151 insertions(+), 92 deletions(-) -- 2.20.1

1 4

[PATCH 0/4] lxc: Add suport to network indexes for LXC 3.X
by Julio Faracco 28 Jan '20

28 Jan '20

This series implement support for network syntax settings for LXC 3.X. Now, indexes are part of the settings to define network interfaces. Each interface has its own index. The old style uses 'type' tag to differentiate each interface and with this, it could use one single structure. Now, network interfaces are a single array with interface pointers. Old: lxc.network.type = veth lxc.network.flags = up lxc.network.link = virbr0 New: lxc.net.0.type = veth lxc.net.0.flags = up lxc.net.0.link = virbr0 Julio Faracco (4): lxc: refactor lxcNetworkParseData pointers to use new structures. lxc: add LXC version 3 network parser. lxc: remove domain definition from lxc network struct tests: update LXC config dataset to support V3 indexes src/lxc/lxc_native.c | 183 +++++++++++------- .../lxcconf2xml-ethernet-v3.config | 16 +- .../lxcconf2xml-fstab-v3.config | 10 +- .../lxcconf2xml-macvlannetwork-v3.config | 10 +- .../lxcconf2xml-simple-v3.config | 18 +- 5 files changed, 145 insertions(+), 92 deletions(-) -- 2.20.1

2 9

[libvirt PATCH v2 0/6] <interface> <teaming> element (was: virtio failover / vfio auto-plug-on-migrate)
by Laine Stump 28 Jan '20

28 Jan '20

V1: https://www.redhat.com/archives/libvir-list/2020-January/msg00813.html This all used different names in V1 - in that incarnation the configuration was done using "failover" and "backupAlias" attributes added to the <driver> subelement of <interface>. But the resulting code was cumbersome and had little bits scattered all over the place due to needing it in both hostdev and interface parsing/formatting. In his review of V1, danpb suggesting just adding a new subelement for this configuration to free ourselves from the constraints of <driver> parsing/formatting. This ended up dramatically simplifying the code (hence the lack of V1's refactoring patches in V2, and a decrease in patch count from 12 to 6). During further discussion in email and on IRC, we decided that naming the element <failover> was too limiting, as it implied the behavior of what is, to libvirt, just two network devices that should be teamed/bonded together - it's completely up to the hypervisor and guest what is done with this information. In light of that, we decided to name the new subelement <teaming>, and to specify the two interfaces as "persistent" (an interface that will always remain plugged in) and "transient" (an interface that may be periodically unplugged (during migration, in the case of QEMU). So the virtio device will have <teaming type='persistent'/> and the hostdev device will have <teaming type='transient' persistent='ua-myvirtio'/> (note that the persistent interface must have <alias name='ua-myvirtio'/>) Given this config, libvirt will add "failover=on" to the device commandline arg for the virtio device, and "failover_pair_id=ua-myvirtio" to the arg for the hostdev device (and when a migration is requested, it will notice if there is a hostdev that has <teaming type='transient'/> set, and will allow the migration in this case, but still disallow migrations of domains with normal hostdevs). In response to these extra commandline options, QEMU will set some extra capabilities in the virtio device PCI capabilities data, and will also automatically unplug/re-plug the hostdev device before and after migration. In the guest, the virtio-net driver will notice the extra PCI capabilities and use this as a clue that it should search for another device with matching MAC address (NB: the guest driver requires the two devices to have matching MAC addresses) to join into a bond with the virtio-net device. This bond is hard-wired to always prefer the hostdev device whenever it is present, and use the virtio device as backup when the hostdev is unplugged. ---- As mentioned in a followup to the V1 cover letter, there is a regression in QEMU 4.2.0 that causes QEMU to segv when a hostdev is unplugged. That bug is fixed with this upstream QEMU patch: https://git.qemu.org/?p=qemu.git;a=commitdiff;h=0446f8121723b134ca1d1ed0b73… Be sure to use a qemu build with this patch applied, or you may not even be able to start the guest! Also we've found that the DEVICE_DELETED event is never sent to libvirt when one of these hostdevs is manually unplugged, meaning that libvirt keeps the device marked as "in-use", and it therefore cannot be re-plugged to the guest until after a complete guest "power cycle". AFAIK there isn't yet a fix for that bug, so don't expect manual unplug of the device to work. Laine Stump (6): qemu: add capabilities flag for failover feature conf: parse/format <teaming> subelement of <interface> qemu: support interface <teaming> functionality qemu: allow migration with assigned PCI hostdev if <teaming> is set qemu: add wait-unplug to qemu migration status enum docs: document <interface> subelement <teaming> docs/formatdomain.html.in | 100 ++++++++++++++++++ docs/news.xml | 28 +++++ docs/schemas/domaincommon.rng | 19 ++++ src/conf/domain_conf.c | 45 ++++++++ src/conf/domain_conf.h | 14 +++ src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 9 ++ src/qemu/qemu_domain.c | 36 ++++++- src/qemu/qemu_migration.c | 53 +++++++++- src/qemu/qemu_monitor.c | 1 + src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../net-virtio-teaming-network.xml | 37 +++++++ .../qemuxml2argvdata/net-virtio-teaming.args | 40 +++++++ tests/qemuxml2argvdata/net-virtio-teaming.xml | 50 +++++++++ tests/qemuxml2argvtest.c | 4 + .../net-virtio-teaming-network.xml | 51 +++++++++ .../qemuxml2xmloutdata/net-virtio-teaming.xml | 66 ++++++++++++ tests/qemuxml2xmltest.c | 6 ++ 22 files changed, 563 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming-network.xml create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.args create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.xml create mode 100644 tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml create mode 100644 tests/qemuxml2xmloutdata/net-virtio-teaming.xml -- 2.24.1

3 13

[PATCH v2 0/9] virsh: secret: Improve handling of secret value
by Peter Krempa 28 Jan '20

28 Jan '20

Improve handling of secrets for security. 'secret-passwd' command was dropped in favor of '--interactive' and few other changes requested at review. Peter Krempa (9): virsh: Work around virSecretFree quirks virsh: secret: Refactor cleanup in cmdSecretSetValue virsh: secret: Refactor cleanup in cmdSecretGetValue virsh: secret: Add --plain flag for secret-get-value virsh: secret: Add --file 'filename' support for secret-set-value virsh: secret: Print warning that passing secret on command-line is insecure virsh: secret: Add --plain switch for secret-set-value tools: virsh: Add --interactive flag for secret-set-value command docs: secret: Unify and sanitize examples on how to set secret value build-aux/syntax-check.mk | 2 +- docs/formatsecret.html.in | 88 +++++++++++++-------- docs/manpages/virsh.rst | 20 ++++- tools/virsh-completer-secret.c | 3 +- tools/virsh-secret.c | 140 ++++++++++++++++++++++++--------- tools/virsh-util.c | 11 +++ tools/virsh-util.h | 5 ++ 7 files changed, 195 insertions(+), 74 deletions(-) -- 2.24.1

3 21

[libvirt] [RFC PATCH 00/16] qemu: checkpoint: Add support for deleting checkpoints accross snapshots
by Peter Krempa 28 Jan '20

28 Jan '20

Posted as RFC because qemu probably doesn't reopen backing images for bitmap operations resulting in: $ virsh checkpoint-delete vm --checkpointname a error: Failed to delete checkpoint a error: internal error: unable to execute QEMU command 'transaction': Bitmap 'a' is readonly and cannot be modified Unfortunately this can't be done manually because 'blockdev-reopen' is still experimental. Peter Krempa (16): qemu: checkpoint: Store whether deleted checkpoint is current in a variable qemu: checkpoint: split out checkpoint deletion bitmaps qemu: checkpoint: rename disk->chkdisk in qemuCheckpointDiscardBitmaps qemu: checkpoint: rename disk->chkdisk in qemuCheckpointAddActions qemu: checkpoint: Use disk definition directly when creating checkpoint qemu: checkpoint: tolerate missing disks on checkpoint deletion qemu: domain: Remove unused qemuDomainDiskNodeFormatLookup qemu: checkpoint: Introduce helper to find checkpoint disk definition in parents qemu: checkpoint: Extract calculation of bitmap merging for checkpoint deletion tests: qemublock: Add test for checkpoint deletion bitmap merge tests: qemublock: Add few more test cases for checkpoint deletion tests: qemublock: Add synthetic snapshot+checkpoint test data qemu: checkpoint: Introduce support for deleting checkpoints accross snapshots tests: qemublock: Add checkpoint deletion test for deep backing chain tests: qemublock: Add checkpoint deletion tests for some special cases qemu: checkpoint: Track and relabel images for bitmap merging src/qemu/qemu_checkpoint.c | 329 +++++-- src/qemu/qemu_checkpoint.h | 9 + src/qemu/qemu_domain.c | 14 - src/qemu/qemu_domain.h | 3 - tests/qemublocktest.c | 102 +++ .../snapshots-synthetic-checkpoint.json | 827 ++++++++++++++++++ .../bitmap/snapshots-synthetic-checkpoint.out | 13 + .../checkpointdelete/basic-current-out.json | 29 + .../basic-intermediate1-out.json | 22 + .../basic-intermediate2-out.json | 22 + .../basic-intermediate3-out.json | 22 + .../checkpointdelete/basic-noparent-out.json | 9 + .../snapshots-current-out.json | 29 + .../snapshots-intermediate1-out.json | 24 + .../snapshots-intermediate2-out.json | 62 ++ .../snapshots-intermediate3-out.json | 61 ++ .../snapshots-noparent-out.json | 27 + ...hots-synthetic-checkpoint-current-out.json | 29 + ...ynthetic-checkpoint-intermediate1-out.json | 31 + ...ynthetic-checkpoint-intermediate2-out.json | 34 + ...ynthetic-checkpoint-intermediate3-out.json | 61 ++ ...ots-synthetic-checkpoint-noparent-out.json | 27 + 22 files changed, 1680 insertions(+), 106 deletions(-) create mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json create mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-current-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json -- 2.24.1

2 33

[libvirt PATCH 00/32] the gnulib saga: revenge of the gnus
by Daniel P. Berrangé 27 Jan '20

27 Jan '20

We currently have 25 gnulib modules in bootstrap.conf and after this series we're down to 7. Except this is a lie, because we've been failing to count the indirect dependencies, so after this series, libvirt is actually pulling in 41 modules. Still, that's better than the 115 modules we indirectly use before this series :-) I have actually eliminated the remaining modules too, but I'm having trouble with the event loop impl in the RPC client on Windows that I'm still debugging. I'll poist the remaining patches once I've figured out that problem. Daniel P. Berrangé (32): tests: stop setting $SHELL env variable util: add a virArchFromHost() impl for Windows util: add API for reading password from the console src: remove usage of strchrnul function build: generate configmake.h in root directory util: use getgrouplist() directly instead of mgetgroups tools: replace wcwidth() with g_unichar_* APIs src: remove unused sys/utsname.h includes util: explicitly include windows.h storage: remove use of stat-time.h headers src: implement APIs for passing FDs over UNIX sockets rpc: conditionalize signal handling src: only import sys/uio.h when journald is built src: replace mkdir() with g_mkdir() m4: disable polkit build on Windows util: conditionalize more of virCommand on WIN32 src: remove all traces of Cygwin support util: conditionalize virProcess APIs on Windows src: conditionalize use of net/if.h configure: add check for sys/ioctl.h src: conditionalize use of S_ISSOCK macro configure: request system specific extensions src: stop using O_DIRECTORY in resctrl src: ensure O_CLOEXEC is defined on Windows src: conditionalize use of F_DUPFD_CLOEXEC src: conditionalize use of O_DIRECT src: conditionalize use of O_BINARY src: conditionalize use of chown & stat constants src: convert all code to use virsocket.h tests: conditionalize use of SIGPIPE src: conditionalize EAI_ADDRFAMILY bootstrap: remove 18 more gnulib modules Makefile.am | 44 ++++++++ bootstrap.conf | 36 ------ build-aux/syntax-check.mk | 2 +- configure.ac | 35 +++--- m4/virt-compile-pie.m4 | 2 +- m4/virt-polkit.m4 | 4 + m4/virt-win-common.m4 | 8 +- m4/virt-win-cygwin.m4 | 32 ------ m4/virt-win-symbols.m4 | 4 +- m4/virt-win-windres.m4 | 4 +- m4/virt-xdr.m4 | 9 +- po/POTFILES.in | 1 - src/Makefile.am | 8 +- src/admin/Makefile.inc.am | 1 - src/conf/network_conf.c | 2 - src/esx/esx_util.c | 3 +- src/esx/esx_util.h | 1 - src/internal.h | 10 ++ src/libvirt-domain.c | 2 + src/libvirt.c | 9 +- src/libvirt_private.syms | 6 + src/libxl/libxl_conf.c | 2 - src/locking/Makefile.inc.am | 1 - src/logging/Makefile.inc.am | 1 - src/lxc/lxc_controller.c | 4 +- src/lxc/lxc_driver.c | 4 +- src/nwfilter/nwfilter_dhcpsnoop.c | 3 - src/nwfilter/nwfilter_learnipaddr.c | 4 +- src/openvz/openvz_conf.c | 4 +- src/qemu/qemu_agent.c | 4 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_interface.c | 4 +- src/qemu/qemu_migration.c | 3 +- src/qemu/qemu_monitor.c | 3 +- src/qemu/qemu_monitor_json.c | 4 +- src/remote/qemu_protocol.x | 1 - src/remote/remote_protocol.x | 2 +- src/rpc/Makefile.inc.am | 3 - src/rpc/genprotocol.pl | 2 +- src/rpc/virnetclient.c | 33 ++++-- src/rpc/virnetdaemon.c | 35 +++++- src/rpc/virnetdaemon.h | 4 + src/rpc/virnetprotocol.x | 2 +- src/rpc/virnetsocket.c | 42 ++++--- src/security/security_dac.c | 4 + src/security/security_manager.c | 2 + src/security/security_selinux.c | 16 +-- src/storage/storage_util.c | 24 +++- src/util/virarch.c | 52 ++++++++- src/util/virarptable.c | 1 - src/util/vircgroup.c | 10 +- src/util/vircommand.c | 165 +++++++++++++++++----------- src/util/virdnsmasq.c | 9 +- src/util/virfdstream.c | 13 +-- src/util/virfile.c | 58 ++++++++-- src/util/virhostcpu.c | 1 - src/util/virhostmem.c | 1 - src/util/virlog.c | 8 +- src/util/virnetdev.c | 1 - src/util/virnetdev.h | 4 +- src/util/virnetdevbridge.c | 8 +- src/util/virnetdevip.c | 4 +- src/util/virnetdevmacvlan.c | 3 +- src/util/virnetdevtap.c | 4 +- src/util/virnetdevvportprofile.c | 3 +- src/util/virnetlink.c | 3 +- src/util/virprocess.c | 103 +++++++++++++---- src/util/virresctrl.c | 2 +- src/util/virsocket.c | 142 +++++++++++++++++++++++- src/util/virsocket.h | 6 +- src/util/virsocketaddr.c | 2 - src/util/virsocketaddr.h | 20 +--- src/util/virsysinfo.c | 14 ++- src/util/virsystemd.c | 9 +- src/util/virutil.c | 76 +++++++++---- src/util/virutil.h | 2 + src/util/virxdrdefs.h | 12 +- src/vbox/vbox_MSCOMGlue.c | 6 +- tests/Makefile.am | 3 - tests/libxlmock.c | 2 +- tests/nsstest.c | 3 +- tests/testutils.c | 2 +- tests/virauthconfigtest.c | 2 + tests/virkeyfiletest.c | 2 + tests/virlockspacetest.c | 4 +- tests/virnetmessagetest.c | 2 + tests/virnetsockettest.c | 3 +- tests/virnettlscontexttest.c | 3 +- tests/virnettlshelpers.c | 1 - tests/virnettlssessiontest.c | 3 +- tests/virportallocatormock.c | 5 +- tests/virtestmock.c | 9 +- tests/virtimetest.c | 2 + tests/viruritest.c | 2 + tests/vshtabletest.c | 8 +- tools/nss/libvirt_nss.c | 7 +- tools/virsh-domain.c | 46 +++++++- tools/virt-login-shell.c | 6 +- tools/vsh-table.c | 2 +- tools/vsh.c | 12 +- 101 files changed, 859 insertions(+), 452 deletions(-) delete mode 100644 m4/virt-win-cygwin.m4 -- 2.24.1

2 49

[PATCH 0/3] Trivial fixes
by Andrea Bolognani 27 Jan '20

27 Jan '20

Pushed as - wait for it - trivial. Andrea Bolognani (3): docs: Fix link to virt-qemu-run(1) qemu_shim: Fix typos qemu_shim: Update temporary directory template docs/manpages/index.rst | 2 +- src/qemu/qemu_shim.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.24.1

1 3

[libvirt] [PATCH v4 0/6] introduce support for an embedded driver mode
by Daniel P. Berrangé 27 Jan '20

27 Jan '20

This is a followup to: v1: https://www.redhat.com/archives/libvir-list/2019-May/msg00467.html v2: https://www.redhat.com/archives/libvir-list/2019-December/msg00050.html v3: https://www.redhat.com/archives/libvir-list/2019-December/msg01364.html This series implements support for an embedded driver mode for libvirt, with initial support in the QEMU and secrets drivers. In this mode of operation, the driver stores all its config and state under a private directory tree. See the individual patches for the illustrated directory hierarchy used. The intent of this embedded mode is to suit cases where the application is using virtualization as a building block for some functionality, as opposed to running traditional "full OS" builds. The long time posterchild example would be libguestfs, while a more recent example could be Kata containers. The general principal in enabling this embedded mode is that the functionality available should be identical to that seen when the driver is running inside libvirtd. This is achieved by loading the exact same driver .so module as libvirtd would load, and simply configuring it with a different directory layout. The result of this is that when running in embedded mode, the driver can still talk to other secondary drivers running inside libvirtd if desired. This is useful, for example, to connect a VM to the default virtual network. The secondary drivers can be made to operate in embedded mode as well, however, this will require some careful consideration for each driver to ensure they don't clash with each other. Thus in this series only the secret driver is enabled for embedded mode. This is required to enable use of VMs with encrypted disks, or authenticated network block storage. In this series we introduce a new command line tool 'virt-qemu-run' which is a really simple tool for launching a VM in embedded mode. I'm not entirely sure whether we should provide this as an official supported tool in this way, or merely put it into the 'examples' directory as demo-ware. With testing of the virt-qemu-run tool we can immediately see what the next important thing to tackle is: performance. We have not really cared too much about the startup performance of libvirtd as this is a one time cost when the mgmt application connects. We did none the less cache capabilities because probing caps for 30 QEMU binaries takes a long time. Even with this caching it takes an unacceptably long time to start a VM in embedded mode. About 100 ms to open the embedded QEMU driver, assuming pre-cached capabilies - ~2 seconds if not cached and all 30 QEMU targets are present. Then about 300 ms to actually start the QEMU guest. IOW, about 400 ms to get QEMU running. NB this is measuring time from launching the virt-run-qemu program, to the point at which the API call 'virDomainCreate' returns control. This has both libvirt & QEMU overhead in & I don't have clear figures to distinguish, but I can see a 40 ms delay between issuing the 'qmp_capabilities' call and getting a reply, which is QEMU startup overead. This is a i440fx based QEMU with a general purpose virtio-pci config (disk, net, etc) tyupical for running a full OS. I've not tried any kind of optimized QEMU config with microvm. I've already started on measuring & optimizing & identified several key areas that can be addressed, but it is all ultimately about not doing work before we need the answers from that work (which often means we will never do the work at all). For example, we shouldn't probe all 30 QEMU's upfront. If the app is only going to create an x86_64 KVM guest we should only care about that 1 QEMU. This is painful because parsing any guest XML requires a virCapsPtr which in turn causes probing of every QEMU binary. I've got in progress patches to eliminate virCapsPtr almost entirely and work directly with the virQEMUCapsPtr instead. It is possible we'll want to use a different file format for storing the cached QEMU capabilities, and the CPU feature/model info. Parsing this XML is a non-negligible time sink. A binary format is likely way quicker, especially if its designed to be just mmap'able for direct read. To be investigated... We shouldn't probe for whether host PM suspend is possible unless someone wants that info, or tries to issue that API call. After starting QEMU we spend 150-200 ms issuing a massive number of qom-get calls to check whether QEMU enabled each individual CPU feature flag. We only need this info if someone asks for the live XML or we intend to live migrate etc. So we shouldn't issue these qom-get calls in the "hot path" of QEMU startup. It can be done later in a non-time critical point. Also the QEMU API for this is horribly inefficient to require so many qom-get calls. There's more but I won't talk about it now. Suffice to say that I think we can get libvirt overhead down to less than 100 ms fairly easily and probably even down to less than 50 ms without much effort. The exact figure will depend on what libvirt features you want enabled, and how much work we want/need to put into optimization. We'll want to fix the really gross mistakes & slow downs, but we'll want guidance from likely users as to their VM startup targets to decide how much work needs investing. This optimization will ultimately help non-embedded QEMU mode too, making it faster to respond & start. Changed in v4: - Prevent opening the embedded drivers many times with different root paths - Add docs warning about not running APIs from the event loop thread Changed in v3: - Rebased to master - Merge some simple acked patches Changed in v2: - Use a simplified directory layout for embedded mode. Previously we just put a dir prefix onto the normal paths. This has the downside that the embedded drivers paths are needlessly different for privileged vs unprivileged user. It also results in very long paths which can be a problem for the UNIX socket name length limits. - Also ported the secret driver to support embedded mode - Check to validate that the event loop is registered. - Add virt-qemu-run tool for embedded usage. - Added docs for the qemu & secret driver explaining embedded mode Daniel P. Berrangé (6): util: add helper API for getting URI parameters libvirt: pass a directory path into drivers for embedded usage libvirt: support an "embed" URI path selector for opening drivers qemu: add support for running QEMU driver in embedded mode secrets: add support for running secret driver in embedded mode qemu: introduce a new "virt-qemu-run" program build-aux/syntax-check.mk | 2 +- docs/Makefile.am | 5 + docs/drivers.html.in | 1 + docs/drvqemu.html.in | 99 ++++++++ docs/drvsecret.html.in | 82 ++++++ docs/manpages/index.rst | 1 + docs/manpages/virt-qemu-run.rst | 114 +++++++++ libvirt.spec.in | 2 + src/Makefile.am | 1 + src/driver-state.h | 2 + src/driver.h | 2 + src/interface/interface_backend_netcf.c | 7 + src/interface/interface_backend_udev.c | 7 + src/libvirt.c | 93 ++++++- src/libvirt_internal.h | 4 +- src/libvirt_private.syms | 1 + src/libxl/libxl_driver.c | 7 + src/lxc/lxc_driver.c | 8 + src/network/bridge_driver.c | 7 + src/node_device/node_device_hal.c | 7 + src/node_device/node_device_udev.c | 7 + src/nwfilter/nwfilter_driver.c | 7 + src/qemu/Makefile.inc.am | 13 + src/qemu/qemu_conf.c | 45 +++- src/qemu/qemu_conf.h | 8 +- src/qemu/qemu_driver.c | 34 ++- src/qemu/qemu_process.c | 15 +- src/qemu/qemu_shim.c | 322 ++++++++++++++++++++++++ src/remote/remote_daemon.c | 1 + src/remote/remote_driver.c | 1 + src/secret/secret_driver.c | 53 +++- src/storage/storage_driver.c | 7 + src/util/viruri.c | 16 ++ src/util/viruri.h | 2 + src/vz/vz_driver.c | 7 + tests/domaincapstest.c | 2 +- tests/testutilsqemu.c | 3 +- 37 files changed, 967 insertions(+), 28 deletions(-) create mode 100644 docs/drvsecret.html.in create mode 100644 docs/manpages/virt-qemu-run.rst create mode 100644 src/qemu/qemu_shim.c -- 2.23.0

3 11

[libvirt PATCH 0/4] fix recent commits
by Ján Tomko 27 Jan '20

27 Jan '20

Ján Tomko (4): docs: fix virt-qemu-run man page docs: fix since version in driver documentation qemu_shim: cosmetic fixes qemu: snapshot: go through cleanup on error docs/drvqemu.html.in | 4 ++-- docs/drvsecret.html.in | 2 +- docs/manpages/virt-qemu-run.rst | 4 ++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_shim.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) -- 2.21.0

3 6

[libvirt] [PATCH] gitdm: Add missing entries
by Andrea Bolognani 27 Jan '20

27 Jan '20

A few new companies and individuals contributed to libvirt since the last time the gitdm configuration was updated. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/gitdm/aliases | 1 + docs/gitdm/companies/others | 3 +++ docs/gitdm/groups/unaffiliated | 3 +++ 3 files changed, 7 insertions(+) diff --git a/docs/gitdm/aliases b/docs/gitdm/aliases index c3c837f89f..83637bdff9 100644 --- a/docs/gitdm/aliases +++ b/docs/gitdm/aliases @@ -2,6 +2,7 @@ "jdenemar redhat com" jdenemar(a)redhat.com "pkrempa@redhat st.com" pkrempa(a)redhat.com +berrange(a)localhost.localdomain berrange(a)redhat.com jyang@redhat jyang(a)redhat.com wangjie88.huawei.com wangjie88(a)huawei.com diff --git a/docs/gitdm/companies/others b/docs/gitdm/companies/others index 43f2cc116d..affbaf3ea2 100644 --- a/docs/gitdm/companies/others +++ b/docs/gitdm/companies/others @@ -1,4 +1,5 @@ 6wind.com 6WIND +cmss.chinamobile.com China Mobile active.by ActiveCloud aero.org Aerospace akamai.com Akamai @@ -37,6 +38,7 @@ hitachi.com Hitachi hoster-ok.com hoster-ok.com hp.com HP huawei.com Huawei +hygon.cn Hygon inktank.com Inktank Storage intel.com Intel intellilink.co.jp NTT DATA INTELLILINK @@ -60,6 +62,7 @@ nicira.com Nicira nimboxx.com NIMBOXX novell.com Novell ntt.co.jp NTT Group +nutanix.com Nutanix ohmu.fi OHMU open-minds.org OpenThink oracle.com Oracle diff --git a/docs/gitdm/groups/unaffiliated b/docs/gitdm/groups/unaffiliated index f52338c736..70e82ba894 100644 --- a/docs/gitdm/groups/unaffiliated +++ b/docs/gitdm/groups/unaffiliated @@ -5,6 +5,7 @@ 126.com gmail.com gmx.com +gmx.de googlemail.com hotmail.com mail.ru @@ -24,6 +25,7 @@ adam(a)pandorasboxen.com agx(a)sigxcpu.org alexander.nusov(a)nfvexpress.com andres(a)lagarcavilla.org +andrew(a)interpretmath.pw asad.saeed(a)acidseed.com atler(a)pld-linux.org benoar(a)dolka.fr @@ -40,6 +42,7 @@ exo(a)tty.sk fritz(a)fritz-elfert.de gene(a)czarc.net gordon(a)dragonsdawn.net +gregor(a)kopka.net heathpetersen(a)kandre.com ibaldo(a)adinet.com.uy igor47(a)moomers.org -- 2.24.1

2 2

[PATCH] qemu: fix linking virt-qemu-run on some distros
by Daniel P. Berrangé 27 Jan '20

27 Jan '20

Debian/Ubuntu linkers are more strict that other distros requiring glib to be linked explicitly. macOS needs -export-dynamic instead of -Wl,--export-dynamic Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI build fix for Debian/Ubuntu/macOS src/qemu/Makefile.inc.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index c6b04c3217..d04a87e659 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -253,6 +253,9 @@ bin_PROGRAMS += virt-qemu-run virt_qemu_run_SOURCES = $(QEMU_SHIM_SOURCES) -virt_qemu_run_LDADD = libvirt.la -virt_qemu_run_LDFLAGS = -Wl,--export-dynamic +virt_qemu_run_LDADD = \ + libvirt.la \ + $(GLIB_LIBS) \ + $(NULL) +virt_qemu_run_LDFLAGS = -export-dynamic endif WITH_QEMU -- 2.24.1

1 0

[PATCH] bhyve: add 'root' parameter to driver initializer
by Daniel P. Berrangé 27 Jan '20

27 Jan '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a FreeBSD build fix src/bhyve/bhyve_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 5b8fba7467..713301399e 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1175,11 +1175,18 @@ bhyveStateCleanup(void) static int bhyveStateInitialize(bool privileged, + const char *root, virStateInhibitCallback callback G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { bool autostart = true; + if (root != NULL) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("Driver does not support embedded mode")); + return -1; + } + if (!privileged) { VIR_INFO("Not running privileged, disabling driver"); return VIR_DRV_STATE_INIT_SKIPPED; -- 2.24.1

1 0

[PATCH 00/21] qemu: Validate machine type and clean up test suite
by Peter Krempa 27 Jan '20

27 Jan '20

I was experimenting with a qemu-5.0 feature and figured out that qemu-5.0 will drop support for machine types prior to 'pc-1.0'. What was unexpected though is that I've figured it out as some very strange and seemingly unrelated changes happened in the test output of the 'latest' tests while bumping the caps data. It turned out that the CPU driver now actually takes data from the machine type and since the machine type was no longer present the test data result has changed. This lead me down a rabbit hole of trying to make our test suite more robust and such changes easier to debug. The result is these 21 patches that fix numerous tests, clean up some stale and downstream machine types and in the end add validation of the machine type and harden the testsuite to use it properly. Note that 30k lines of the diffstat is just the qemu-5.0 capabilities data so that we can verify that nothing changes during the capbility upgrade. Some of the yak-shaving done here is incomplete though as I've figured out we have a bunch of network-device related tests which are not enabled in the xml->argv test suite, but also are not easy to enable. Peter Krempa (21): tests: qemuxml2argv: Use 64 bit qemu binary and 1.5 machine type in 'disk-cache' case tests: qemuxml2xml: Modernize 'disk-cache' test tests: qemuxml2argv: Modernize tpm-passthrough tests tests: qemuxml: Fix and enable default-video-type* tests tests: qemu: Unify fake machine types filled in for KVM and TCG caps of x86_64 tests: qemuxml2argv: Use existing machine type for 'numatune-distances' case tests: qemuxml2argv: Remove downstream machine type in 'controller-order' case tests: qemuxml2argv: Use existing non-virt machine in 'aarch64-gic-not-virt' tests: qemuxml2argv: Use proper replacement for 'pc-i440fx-wily' machine tests: qemuxml: Use existing machine type in 'iothreads-virtio-scsi-ccw' case tests: qemu: Add machine types used by the test code to fake capabilities qemu: domain: Validate that machine type is supported by qemu qemu: capabilities: Extract code from virQEMUCapsStripMachineAliases qemu: capabilities: Replace aliased machine type by copy of the canonical machine qemu: capabilities: Add accessor to qemu caps machine types presence tests: qemu: Don't add fake machine types when testing with real data tests: qemuxml: Purge prehistoric machine type 'pc-0.13' from "latest" tests tests: Add caps for upcoming qemu-5.0 tests: qemuxml: Remove prehistoric machine types from legacy tests tests: qemuxml2xml: Remove prehistoric machine types from legacy tests tests: qemu: Remove prehistoric machine types from faked data tests src/qemu/qemu_capabilities.c | 50 +- src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_capspriv.h | 3 + src/qemu/qemu_domain.c | 8 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 181 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 191 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 181 + .../caps_5.0.0.x86_64.replies | 27179 ++++++++++++++++ .../caps_5.0.0.x86_64.xml | 2697 ++ .../qemuxml2argvdata/aarch64-gic-not-virt.xml | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 1 + .../aarch64-virt-headless.aarch64-latest.args | 1 + .../channel-unix-guestfwd.x86_64-latest.args | 1 + .../console-virtio-unix.x86_64-latest.args | 1 + tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/controller-order.xml | 2 +- .../controller-virtio-scsi.x86_64-latest.args | 1 + .../default-qemu-host-arch.args | 2 +- ...ult-video-type-aarch64.aarch64-latest.args | 35 + .../default-video-type-aarch64.xml | 1 - ...default-video-type-ppc64.ppc64-latest.args | 35 + .../default-video-type-ppc64.xml | 3 +- ...ult-video-type-riscv64.riscv64-latest.args | 34 + .../default-video-type-riscv64.xml | 1 - ...default-video-type-s390x.s390x-latest.args | 34 + .../default-video-type-s390x.xml | 3 +- .../default-video-type-x86_64-caps-test-0.xml | 3 +- .../default-video-type-x86_64-caps-test-1.xml | 3 +- .../disk-aio.x86_64-latest.args | 1 + ...-backing-chains-noindex.x86_64-latest.args | 1 + .../disk-cache.x86_64-1.5.3.args | 4 +- .../disk-cache.x86_64-2.12.0.args | 4 +- .../disk-cache.x86_64-2.6.0.args | 4 +- .../disk-cache.x86_64-2.7.0.args | 4 +- .../disk-cache.x86_64-latest.args | 4 +- tests/qemuxml2argvdata/disk-cache.xml | 4 +- .../disk-cdrom-bus-other.x86_64-latest.args | 1 + ...m-empty-network-invalid.x86_64-latest.args | 1 + tests/qemuxml2argvdata/disk-cdrom-tray.args | 2 +- .../disk-cdrom-tray.x86_64-2.12.0.args | 2 +- .../disk-cdrom-tray.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-tray.xml | 2 +- .../disk-cdrom.x86_64-latest.args | 1 + tests/qemuxml2argvdata/disk-copy_on_read.args | 2 +- .../disk-copy_on_read.x86_64-2.12.0.args | 2 +- .../disk-copy_on_read.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-copy_on_read.xml | 2 +- .../qemuxml2argvdata/disk-detect-zeroes.args | 2 +- .../disk-detect-zeroes.x86_64-2.12.0.args | 2 +- .../disk-detect-zeroes.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-detect-zeroes.xml | 2 +- tests/qemuxml2argvdata/disk-discard.args | 2 +- tests/qemuxml2argvdata/disk-discard.xml | 2 +- .../disk-error-policy.x86_64-latest.args | 1 + .../disk-floppy.x86_64-latest.args | 1 + tests/qemuxml2argvdata/disk-ioeventfd.args | 2 +- tests/qemuxml2argvdata/disk-ioeventfd.xml | 2 +- .../disk-network-gluster.x86_64-latest.args | 1 + .../disk-network-iscsi.x86_64-latest.args | 1 + .../disk-network-nbd.x86_64-latest.args | 1 + .../disk-network-rbd.x86_64-latest.args | 1 + .../disk-network-sheepdog.x86_64-latest.args | 1 + ...isk-network-source-auth.x86_64-latest.args | 1 + .../disk-network-tlsx509.x86_64-latest.args | 2 +- .../disk-nvme.x86_64-latest.args | 1 + .../disk-readonly-disk.x86_64-latest.args | 1 + .../disk-scsi-device-auto.x86_64-latest.args | 1 + .../disk-scsi.x86_64-latest.args | 1 + .../disk-shared.x86_64-latest.args | 1 + ...irtio-scsi-reservations.x86_64-latest.args | 1 + .../eoi-disabled.x86_64-latest.args | 2 +- .../eoi-enabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/event_idx.args | 2 +- tests/qemuxml2argvdata/event_idx.xml | 2 +- .../fd-memory-no-numa-topology.args | 2 +- .../fd-memory-no-numa-topology.xml | 2 +- .../fd-memory-numa-topology.args | 2 +- .../fd-memory-numa-topology.xml | 2 +- .../fd-memory-numa-topology2.args | 2 +- .../fd-memory-numa-topology2.xml | 2 +- .../fd-memory-numa-topology3.args | 2 +- .../fd-memory-numa-topology3.xml | 2 +- .../floppy-drive-fat.x86_64-latest.args | 1 + .../fs9p-ccw.s390x-latest.args | 1 + .../qemuxml2argvdata/fs9p.x86_64-latest.args | 1 + .../genid-auto.x86_64-latest.args | 1 + .../qemuxml2argvdata/genid.x86_64-latest.args | 1 + ...egl-headless-rendernode.x86_64-latest.args | 1 + .../graphics-egl-headless.x86_64-latest.args | 1 + ...pice-gl-auto-rendernode.x86_64-latest.args | 1 + ...graphics-vnc-tls-secret.x86_64-latest.args | 1 + .../graphics-vnc-tls.x86_64-latest.args | 1 + ...tdev-mdev-display-ramfb.x86_64-latest.args | 1 + ...play-spice-egl-headless.x86_64-latest.args | 1 + ...ev-display-spice-opengl.x86_64-latest.args | 1 + ...isplay-vnc-egl-headless.x86_64-latest.args | 1 + ...ostdev-mdev-display-vnc.x86_64-latest.args | 1 + ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 1 + ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 1 + .../hugepages-nvdimm.x86_64-latest.args | 1 + .../hyperv-off.x86_64-latest.args | 1 + .../hyperv-panic.x86_64-latest.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 1 + .../intel-iommu-caching-mode.xml | 3 + ...ntel-iommu-device-iotlb.x86_64-latest.args | 1 + .../intel-iommu-device-iotlb.xml | 3 + .../intel-iommu-eim.x86_64-latest.args | 1 + tests/qemuxml2argvdata/intel-iommu-eim.xml | 3 + .../intel-iommu.x86_64-2.6.0.args | 1 + .../intel-iommu.x86_64-latest.args | 1 + tests/qemuxml2argvdata/intel-iommu.xml | 3 + tests/qemuxml2argvdata/interface-driver.xml | 2 +- .../iommu-smmuv3.aarch64-latest.args | 1 + ...othreads-virtio-scsi-ccw.s390x-latest.args | 3 +- .../iothreads-virtio-scsi-ccw.xml | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 1 + .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +- ...memory-default-hugepage.x86_64-latest.args | 3 +- .../memfd-memory-default-hugepage.xml | 2 +- .../memfd-memory-numa.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/memfd-memory-numa.xml | 2 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 1 + ...ry-hotplug-nvdimm-align.x86_64-latest.args | 1 + ...ry-hotplug-nvdimm-label.x86_64-latest.args | 1 + ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 1 + ...hotplug-nvdimm-readonly.x86_64-latest.args | 1 + .../memory-hotplug-nvdimm.x86_64-latest.args | 1 + .../mlock-off.x86_64-latest.args | 1 + .../mlock-on.x86_64-latest.args | 1 + tests/qemuxml2argvdata/net-bandwidth.xml | 2 +- tests/qemuxml2argvdata/net-bandwidth2.xml | 2 +- tests/qemuxml2argvdata/net-coalesce.xml | 2 +- tests/qemuxml2argvdata/net-mtu.xml | 2 +- .../net-vhostuser.x86_64-latest.args | 1 + .../qemuxml2argvdata/numatune-distances.args | 4 +- tests/qemuxml2argvdata/numatune-distances.xml | 2 +- .../parallel-unix-chardev.x86_64-latest.args | 1 + .../ppc64-pseries-graphics.ppc64-latest.args | 1 + .../ppc64-pseries-headless.ppc64-latest.args | 1 + .../pv-spinlock-disabled.x86_64-latest.args | 2 +- .../pv-spinlock-enabled.x86_64-latest.args | 2 +- .../qemu-ns.x86_64-latest.args | 1 + .../s390x-ccw-graphics.s390x-latest.args | 1 + .../s390x-ccw-headless.s390x-latest.args | 1 + .../serial-unix-chardev.x86_64-latest.args | 1 + ...rtcard-passthrough-unix.x86_64-latest.args | 1 + .../qemuxml2argvdata/tap-vhost-incorrect.xml | 2 +- tests/qemuxml2argvdata/tap-vhost.xml | 2 +- ...=> tpm-passthrough-crb.x86_64-latest.args} | 19 +- ...rgs => tpm-passthrough.x86_64-latest.args} | 21 +- tests/qemuxml2argvdata/tpm-passthrough.xml | 2 +- .../usb-redir-unix.x86_64-latest.args | 1 + ...host-user-gpu-secondary.x86_64-latest.args | 1 + .../vhost-user-vga.x86_64-latest.args | 1 + .../vhost-vsock-ccw-auto.s390x-latest.args | 1 + .../vhost-vsock-ccw.s390x-latest.args | 1 + .../vhost-vsock.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/vhost-vsock.xml | 2 +- tests/qemuxml2argvdata/vhost_queues.xml | 2 +- ...eo-bochs-display-device.x86_64-latest.args | 1 + .../video-device-pciaddr-default.args | 2 +- .../video-device-pciaddr-default.xml | 2 +- ...video-qxl-device-vram64.x86_64-latest.args | 1 + ...o-qxl-sec-device-vram64.x86_64-latest.args | 1 + ...eo-ramfb-display-device.x86_64-latest.args | 1 + tests/qemuxml2argvdata/virtio-lun.args | 2 +- tests/qemuxml2argvdata/virtio-lun.xml | 2 +- ...virtio-non-transitional.x86_64-latest.args | 1 + .../virtio-rng-egd-unix.x86_64-latest.args | 1 + .../virtio-transitional.x86_64-latest.args | 1 + .../x86_64-pc-graphics.x86_64-latest.args | 1 + .../x86_64-pc-headless.x86_64-latest.args | 1 + .../x86_64-q35-graphics.x86_64-latest.args | 1 + .../x86_64-q35-headless.x86_64-latest.args | 1 + tests/qemuxml2argvtest.c | 11 +- .../aarch64-virt-graphics.aarch64-latest.xml | 3 + .../aarch64-virt-headless.aarch64-latest.xml | 3 + .../default-qemu-host-arch.xml | 2 +- ...ault-video-type-aarch64.aarch64-latest.xml | 1 - .../default-video-type-ppc64.ppc64-latest.xml | 14 +- ...ault-video-type-riscv64.riscv64-latest.xml | 1 - .../default-video-type-s390x.s390x-latest.xml | 8 +- .../default-video-type-x86_64-caps-test-0.xml | 5 +- .../default-video-type-x86_64-caps-test-1.xml | 5 +- ...-cache.xml => disk-cache.x86_64-1.5.3.xml} | 6 +- .../disk-cache.x86_64-2.12.0.xml | 60 + .../disk-cache.x86_64-2.6.0.xml | 60 + .../disk-cache.x86_64-2.7.0.xml | 60 + .../disk-cache.x86_64-latest.xml | 63 + ...om-empty-network-invalid.x86_64-latest.xml | 3 + .../qemuxml2xmloutdata/disk-copy_on_read.xml | 2 +- tests/qemuxml2xmloutdata/disk-discard.xml | 2 +- tests/qemuxml2xmloutdata/event_idx.xml | 2 +- .../genid-active.x86_64-latest.xml | 3 + .../genid-auto-active.x86_64-latest.xml | 3 + .../genid-auto-inactive.x86_64-latest.xml | 3 + .../genid-inactive.x86_64-latest.xml | 3 + ...subsys-mdev-vfio-ccw-boot.s390x-latest.xml | 3 + .../intel-iommu.x86_64-2.6.0.xml | 3 + tests/qemuxml2xmloutdata/interface-driver.xml | 2 +- .../iommu-smmuv3.aarch64-latest.xml | 3 + .../iothreads-virtio-scsi-ccw.xml | 2 +- tests/qemuxml2xmloutdata/net-bandwidth.xml | 2 +- tests/qemuxml2xmloutdata/net-bandwidth2.xml | 2 +- tests/qemuxml2xmloutdata/net-coalesce.xml | 2 +- tests/qemuxml2xmloutdata/net-mtu.xml | 2 +- .../ppc64-pseries-graphics.ppc64-latest.xml | 3 + .../ppc64-pseries-headless.ppc64-latest.xml | 3 + .../s390x-ccw-graphics.s390x-latest.xml | 3 + .../s390x-ccw-headless.s390x-latest.xml | 3 + .../tap-vhost-incorrect.xml | 2 +- tests/qemuxml2xmloutdata/tap-vhost.xml | 2 +- .../tpm-passthrough.x86_64-latest.xml | 2 +- tests/qemuxml2xmloutdata/vhost_queues.xml | 2 +- .../video-device-pciaddr-default.xml | 2 +- tests/qemuxml2xmloutdata/virtio-lun.xml | 2 +- .../virtio-non-transitional.x86_64-latest.xml | 3 + .../virtio-transitional.x86_64-latest.xml | 3 + .../x86_64-pc-graphics.x86_64-latest.xml | 3 + .../x86_64-pc-headless.x86_64-latest.xml | 3 + .../x86_64-q35-graphics.x86_64-latest.xml | 3 + .../x86_64-q35-headless.x86_64-latest.xml | 3 + tests/qemuxml2xmltest.c | 6 +- tests/testutilsqemu.c | 71 +- tests/vircapstest.c | 4 +- 227 files changed, 31219 insertions(+), 182 deletions(-) create mode 100644 tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_5.0.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args create mode 100644 tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args rename tests/qemuxml2argvdata/{tpm-passthrough-crb.args => tpm-passthrough-crb.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{tpm-passthrough.args => tpm-passthrough.x86_64-latest.args} (56%) rename tests/qemuxml2xmloutdata/{disk-cache.xml => disk-cache.x86_64-1.5.3.xml} (92%) create mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml -- 2.24.1

3 25

[libvirt PATCHv2 00/10] add virtiofs support (virtio-fs epopee)
by Ján Tomko 27 Jan '20

27 Jan '20

v1: https://www.redhat.com/archives/libvir-list/2019-November/msg00005.html https://bugzilla.redhat.com/show_bug.cgi?id=1694166 Ján Tomko (10): conf: use virXMLFormatElement in virDomainFSDefFormat qemu: add QEMU_CAPS_VHOST_USER_FS schema: wrap fsDriver in a choice group conf: qemu: add virtiofs fsdriver type conf: add virtiofs-related elements and attributes qemu: add virtiofs_debug to qemu.conf qemu: validate virtiofs filesystems qemu: add code for handling virtiofsd qemu: build vhost-user-fs device command line docs: add virtiofs kbase docs/formatdomain.html.in | 23 ++ docs/kbase.html.in | 3 + docs/kbase/virtiofs.rst | 153 +++++++++++ docs/schemas/domaincommon.rng | 117 +++++++-- po/POTFILES.in | 1 + src/conf/domain_conf.c | 161 +++++++++++- src/conf/domain_conf.h | 17 ++ src/libvirt_private.syms | 1 + src/qemu/Makefile.inc.am | 2 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 7 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 49 +++- src/qemu/qemu_conf.c | 2 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 36 +++ src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_domain_address.c | 4 + src/qemu/qemu_extdevice.c | 19 ++ src/qemu/qemu_virtiofs.c | 241 ++++++++++++++++++ src/qemu/qemu_virtiofs.h | 37 +++ src/qemu/test_libvirtd_qemu.aug.in | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + ...vhost-user-fs-fd-memory.x86_64-latest.args | 38 +++ .../vhost-user-fs-fd-memory.xml | 42 +++ ...vhost-user-fs-hugepages.x86_64-latest.args | 46 ++++ .../vhost-user-fs-hugepages.xml | 75 ++++++ tests/qemuxml2argvtest.c | 9 + .../vhost-user-fs-fd-memory.x86_64-latest.xml | 1 + .../vhost-user-fs-hugepages.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 3 + 34 files changed, 1064 insertions(+), 35 deletions(-) create mode 100644 docs/kbase/virtiofs.rst create mode 100644 src/qemu/qemu_virtiofs.c create mode 100644 src/qemu/qemu_virtiofs.h create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-user-fs-fd-memory.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-user-fs-hugepages.x86_64-latest.xml -- 2.21.0

4 26

[PATCH ocaml 0/3] Small fixes for OCaml 4.10.
by Richard W.M. Jones 27 Jan '20

27 Jan '20

Basically OCaml 4.10 is much more strict about the difference between string (immutable) and bytes (mutable). Rich.

2 13

[libvirt PATCH] qemu: explicitly disable virgl when requested
by Jonathon Jongsma 25 Jan '20

25 Jan '20

If a domain is configured to have an egl-headless display and a virtio video device, virgl will be enabled automatically within the guest, even if the video device is configured with accel3d='no'. In this case we should explicitly pass 'virgl=off' to qemu. See https://bugzilla.redhat.com/show_bug.cgi?id=1791236 for more information. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/qemu/qemu_command.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 46680fd829..3378413ee1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4429,7 +4429,10 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, if (video->backend != VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER && video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { - if (video->accel && video->accel->accel3d == VIR_TRISTATE_SWITCH_ON) { + if (video->accel && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL) && + (video->accel->accel3d == VIR_TRISTATE_SWITCH_ON || + video->accel->accel3d == VIR_TRISTATE_SWITCH_OFF)) { virBufferAsprintf(&buf, ",virgl=%s", virTristateSwitchTypeToString(video->accel->accel3d)); } -- 2.21.0

2 1

[PATCH v2 0/2] qemu: prevent too-deeply nested backing XML
by Peter Krempa 24 Jan '20

24 Jan '20

Patch 1 is new in the series. Patch 2 deals (partially) with review feedback on v1. Peter Krempa (2): qemu: snapshot: Always rewrite backingStore data when reusing existing images qemu: snapshot: Prevent too-nested domain XML when doing inactive snapshot src/qemu/qemu_driver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.24.1

2 3

[libvirt] [PATCH v2 0/5] Support rng backend model builtin
by Han Han 24 Jan '20

24 Jan '20

https://bugzilla.redhat.com/show_bug.cgi?id=1785091 Implement 'rng-builtin' backend from QEMU. This feature is introduced to QEMU since v4.2. It uses getrandom() to get random, no external random source needed. github repo: https://github.com/qiankehan/libvirt/tree/rng-builtin_v2 Changes from v1: - Fix failures in 'make check' and 'make syntax-check' - Adjust the structure of patches v1: https://www.redhat.com/archives/libvir-list/2020-January/msg00000.html Han Han (5): qemu_capabilities: Introduce QEMU_CAPS_OBJECT_RNG_BUILTIN util: Do not assume comma after object id conf: Add rng backend model builtin qemu: Implement builtin rng backend news: Update news for rng backend type builtin docs/formatdomain.html.in | 10 ++++++ docs/formatdomaincaps.html.in | 1 + docs/news.xml | 10 ++++++ docs/schemas/domaincommon.rng | 6 ++++ src/conf/domain_audit.c | 2 ++ src/conf/domain_conf.c | 9 +++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 15 ++++++++ src/qemu/qemu_domain.c | 3 ++ src/util/virqemu.c | 12 ++++--- .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../virtio-rng-builtin.x86_64-latest.args | 35 +++++++++++++++++++ tests/qemuxml2argvdata/virtio-rng-builtin.xml | 26 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../virtio-rng-builtin.x86_64-latest.xml | 31 ++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 28 files changed, 174 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-builtin.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-latest.xml -- 2.24.0.rc1

2 7

Re: [Bug 1860759] Re: [REGRESSION] option `-snapshot` ignored with blockdev
by Eric Blake 24 Jan '20

24 Jan '20

On 1/24/20 4:41 AM, Ildar wrote: > Max, thanks a lot for the explanation. > Do you mean that snapshot-ing isn't possible totally for blockdev? Then I > guess some libvirt users are in trouble :(( > Actually I didn't quite caught the reason why a blockdev supports backing > but not {backing to a file on /tmp then promptly deleted} ? What's the > technical difference? > On 1/24/20 4:05 AM, Max Reitz wrote: > > > I don’t know much about libvirt, but I would have thought that any > manual modification of the qemu command line isn’t supported and might > always break. > > Anyway, from a QEMU POV, -snapshot only works with -drive (this includes > -hda, etc.). It doesn’t work with -blockdev. I can see that this isn’t > documented for -snapshot, but basically whenever -blockdev is used, the > user assumes full responsibility for the block graph (or at least that > particular subgraph). We cannot enable snapshot functionality then. Libvirt has never produced a qemu command line containing '-snapshot'. Part of this is that libvirt wants to control SELinux settings, and letting qemu create a temporary overlay in /tmp in order to implement -snapshot does not play nicely with libvirt pre-creating all files that qemu is allowed to access. The fact that you were able to manually add -snapshot to your qemu command line with older libvirt using -drive (I'm assuming you were also not using libvirt's SELinux support, because if you were, qemu would have been unable to create/access the temporary wrapper in /tmp), is a nice hack. But since modern qemu has declared -snapshot to be unsupported with -blockdev, and modern libvirt has switched to -blockdev, I claim that this is not a qemu bug, but a libvirt feature request. That said, libvirt has had a vision for a design for implementing the equivalent of -drive -snapshot: the <transient/> sub-element added to the domain/disk/source/driver element has been documented for a long time: https://libvirt.org/formatdomain.html "transient If present, this indicates that changes to the device contents should be reverted automatically when the guest exits. With some hypervisors, marking a disk transient prevents the domain from participating in migration or snapshots. Since 0.9.5 " However, no one has yet implemented it for libvirt's qemu driver. Part of our reluctance has been that we knew that implementing it would require libvirt to precreate the wrapper file on every guest start, and it is only very recently that we've even had enough functionality in libvirt's qemu driver coupled with new qemu commands to create qcow2 images using QMP rather than having to shell out to qemu-img. And part of it is that there was no point in implementing something to work with -drive, when we knew we had to rework everything for -blockdev anyways. But now that the work in libvirt to switch to -blockdev is done, it should be a lot easier to implement PROPER support for the <transient/> tag, at least for -blockdev usage. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org

1 0

[PATCH 0/3] qemu_capabilities: Reword domain caps cache
by Michal Privoznik 24 Jan '20

24 Jan '20

It's fairly easy to reproduce the bug (see its description in 3/3). Just put a sleep here: diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index b62dd1df52..eeae967420 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1399,6 +1399,7 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr driver, key = g_strdup_printf("%d:%d:%s:%s", data.arch, data.virttype, NULLSTR(data.machine), NULLSTR(data.path)); + sleep(5); if (virHashAddEntry(domCapsCache, key, domCaps) < 0) return NULL; } And then try to get domcaps from two consoles at once: virsh domcapabilities One will succeed, the other will fail with an error. Michal Prívozník (3): cpu.c: Check properly for virCapabilitiesGetNodeInfo() retval qemu_conf: Avoid dereferencing NULL in virQEMUDriverGetHost{NUMACaps,CPU} qemu_capabilities: Reword domain caps cache src/cpu/cpu.c | 2 +- src/qemu/qemu_capabilities.c | 118 +++++++++++++++++++++++++++++++++-- src/qemu/qemu_capabilities.h | 14 ++++- src/qemu/qemu_conf.c | 86 +++++++++---------------- 4 files changed, 155 insertions(+), 65 deletions(-) -- 2.24.1

2 8

[PATCH 0/4] qemu: fix block jobs when copy_on_read is enabled
by Peter Krempa 24 Jan '20

24 Jan '20

QEMU requires us to pass the topmost node(-name) in the backing chain as the 'device' argument for the blockdev-mirror/block-commit commands. Otherwise QEMU complains: "Need a root block node" Since libvirt always puts the copy-on-read driver on top of the backing chain, blockjobs on disks which use "copy_on_read" fail. The series below fixes that by passing the proper node. This fixes it just fine for the mirror, but for block-commit we still get another error due to a bug in qemu: "'libvirt-4-format' is not in this backing file chain" Additionally one weird thing happens with block-stream (blockpull). If I pass the layer below the copy-on-read as 'device', everything works. This is kind of weird as the documentation for that is the same. If I pass the nodename of copy-on-read. Max, Kevin, could you please comment on the block-stream part and possibly also on the plans to fix the issue with block-commit? Cc: Max Reitz <mreitz(a)redhat.com> CC: Kevin Wolf <kwolf(a)redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=1792195 Peter Krempa (4): qemu: blockcopy: Actually unplug unused images when mirror job fails to start qemu: domain: Extract code to determine topmost nodename to qemuDomainDiskGetTopNodename qemu: Fix value of 'device' argument for blockdev-mirror qemu: Fix value of 'device' argument for block-commit src/qemu/qemu_domain.c | 38 ++++++++++++++++++++++++++------------ src/qemu/qemu_domain.h | 4 ++++ src/qemu/qemu_driver.c | 6 +++--- src/qemu/qemu_migration.c | 2 +- 4 files changed, 34 insertions(+), 16 deletions(-) -- 2.24.1

3 10

[PATCH] qemu: block: Don't skip creation of 'luks' formatted images
by Peter Krempa 23 Jan '20

23 Jan '20

libvirt treats 'luks' images as raw+encryption. The logic in qemuBlockStorageSourceCreateFormat skipped the creation if the requested image was raw but didn't take into account the encryption. This manifested itself e.g. when attempting to do a virsh blockcopy with the following XML: <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/tmp/enccpy'> <encryption format='luks'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> </disk> Where qemu would report the following error: unable to execute QEMU command 'blockdev-add': Volume is not in LUKS format rather than actually formatting the image first. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_block.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index eab21bc107..22f03da485 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -2479,7 +2479,8 @@ qemuBlockStorageSourceCreateFormat(virDomainObjPtr vm, g_autoptr(virJSONValue) createformatprops = NULL; int ret; - if (src->format == VIR_STORAGE_FILE_RAW) + if (src->format == VIR_STORAGE_FILE_RAW && + !src->encryption) return 0; if (qemuBlockStorageSourceCreateGetFormatProps(src, backingStore, -- 2.24.1

2 1

[libvirt] [PATCH 0/3] qemu: backup: Allow configuring and reading back of export an backup bitmap name
by Peter Krempa 23 Jan '20

23 Jan '20

These were already posted before. oVirt folks would like to be able to read the export and bitmap names. Given that I already wrote support for configuring it and it's rather simple I'm re-posting these as they were before. Peter Krempa (3): conf: backup: Allow configuration of names exported via NBD qemu: backup: Implement support for backup disk export name configuration qemu: backup: Implement support for backup disk bitmap name configuration docs/formatbackup.html.in | 9 +++++++++ docs/schemas/domainbackup.rng | 8 ++++++++ src/conf/backup_conf.c | 11 +++++++++++ src/conf/backup_conf.h | 2 ++ src/qemu/qemu_backup.c | 14 ++++++++++++-- .../domainbackupxml2xmlin/backup-pull-seclabel.xml | 2 +- .../backup-pull-seclabel.xml | 2 +- 7 files changed, 44 insertions(+), 4 deletions(-) -- 2.24.1

3 11

[PATCH 0/2] util: hash: Aid in debugging of duplicate keys
by Peter Krempa 23 Jan '20

23 Jan '20

See patch 1 for rationale. Peter Krempa (2): util: hash: Improve debugability of "Duplicate key" error message tests: hash: Test case for adding duplicate hash entry src/conf/domain_addr.c | 9 +++++++++ src/util/vircgroup.c | 8 ++++++++ src/util/virhash.c | 22 ++++++++++++++++++++-- src/util/virhash.h | 13 +++++++++++++ tests/virhashtest.c | 23 +++++++++++++++++++++++ 5 files changed, 73 insertions(+), 2 deletions(-) -- 2.24.1

2 4

[libvirt] [PATCH] qemu: Refuse to use "ps2" on machines that do not have this bus
by Thomas Huth 23 Jan '20

23 Jan '20

The "ps2" bus is only available on certain machines like x86. On machines like s390x, we should refuse to add a device to this bus instead of silently ignoring it. Looking at the QEMU sources, PS/2 is only available if the QEMU binary has the "i8042" device, so let's check for that and only allow "ps2" devices if this QEMU device is available, or if we're on x86 anyway (so we don't have to fake the QEMU_CAPS_DEVICE_I8042 capability in all the tests that use <input ... bus='ps2'/> in their xml data). Reported-by: Sebastian Mitterle <smitterl(a)redhat.com> Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1763191 Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 10 +++++++++- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 + .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 6 ------ ...cw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 6 ------ ...ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 6 ------ .../qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 6 ------ ...-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 6 ------ ...plug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 6 ------ .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 6 ------ .../qemuhotplug-base-ccw-live.xml | 6 ------ 37 files changed, 38 insertions(+), 49 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 84c62a4e28..e22ef28662 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -553,6 +553,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "blockdev-file-dynamic-auto-read-only", "savevm-monitor-nodes", "drive-nvme", + "i8042", ); @@ -1244,6 +1245,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "vhost-user-vga", QEMU_CAPS_DEVICE_VHOST_USER_VGA }, { "ramfb", QEMU_CAPS_DEVICE_RAMFB }, { "max-arm-cpu", QEMU_CAPS_ARM_MAX_CPU }, + { "i8042", QEMU_CAPS_DEVICE_I8042 }, }; static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 193c19fc81..c1ce590cab 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -534,6 +534,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC, /* the auto-read-only property of block backends for files is dynamic */ QEMU_CAPS_SAVEVM_MONITOR_NODES, /* 'savevm' handles monitor-owned nodes properly */ QEMU_CAPS_DRIVE_NVME, /* -drive file.driver=nvme */ + QEMU_CAPS_DEVICE_I8042, /* PS/2 controller */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a6dde15bad..ada7d9b318 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8039,13 +8039,21 @@ qemuDomainDeviceDefValidateGraphics(const virDomainGraphicsDef *graphics, static int qemuDomainDeviceDefValidateInput(const virDomainInputDef *input, - const virDomainDef *def G_GNUC_UNUSED, + const virDomainDef *def, virQEMUCapsPtr qemuCaps) { const char *baseName; int cap; int ccwCap; + if (input->bus == VIR_DOMAIN_INPUT_BUS_PS2 && !ARCH_IS_X86(def->os.arch) && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_I8042)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("%s is not supported by this QEMU binary"), + virDomainInputBusTypeToString(input->bus)); + return -1; + } + if (input->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO) return 0; diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index f2257d6bd2..b57cb2ab59 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -84,6 +84,7 @@ <flag name='isa-serial'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>1005003</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100245</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 3a70ec8146..5d0a14a5db 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -89,6 +89,7 @@ <flag name='isa-serial'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>1006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index cbb29ef2de..c196fe5e45 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -91,6 +91,7 @@ <flag name='isa-serial'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>1007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index a6d0981224..1edcaa4657 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -107,6 +107,7 @@ <flag name='isa-serial'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>2001001</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 5a57cb7760..b95a9d42ad 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -139,6 +139,7 @@ <flag name='vhost-vsock'/> <flag name='egl-headless'/> <flag name='iothread.poll-max-ns'/> + <flag name='i8042'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900287</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 53872abf2f..7ebe97b6ab 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -182,6 +182,7 @@ <flag name='egl-headless'/> <flag name='iothread.poll-max-ns'/> <flag name='x86-max-cpu'/> + <flag name='i8042'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100287</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index f70335db8f..b8eb3abd40 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -188,6 +188,7 @@ <flag name='egl-headless'/> <flag name='iothread.poll-max-ns'/> <flag name='x86-max-cpu'/> + <flag name='i8042'/> <version>2011000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100288</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 74c80d2fe9..38a3103c4a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -153,6 +153,7 @@ <flag name='iothread.poll-max-ns'/> <flag name='memory-backend-file.align'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index b51cee9f28..0c30cc75da 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -197,6 +197,7 @@ <flag name='memory-backend-file.align'/> <flag name='x86-max-cpu'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 86d85faa73..9b486effe1 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -133,6 +133,7 @@ <flag name='sdl-gl'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>2004000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index b217238307..147b179fdb 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -139,6 +139,7 @@ <flag name='sdl-gl'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>2005000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 862464c2f0..deb5c28790 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -118,6 +118,7 @@ <flag name='nbd-tls'/> <flag name='sdl-gl'/> <flag name='hda-output'/> + <flag name='i8042'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 6b96e37a16..fc508aba8a 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -151,6 +151,7 @@ <flag name='sdl-gl'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index bc1359b0dd..ed199057dc 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -156,6 +156,7 @@ <flag name='sdl-gl'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>2007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100245</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index c7f3be3a1b..489b67f99a 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -159,6 +159,7 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='mch'/> + <flag name='i8042'/> <version>2008000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100246</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index a00d4b3d4c..3bc6ec8dab 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -131,6 +131,7 @@ <flag name='blockdev-del'/> <flag name='vhost-vsock'/> <flag name='iothread.poll-max-ns'/> + <flag name='i8042'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900247</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 3d96f5f5b3..83fc6cde97 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -176,6 +176,7 @@ <flag name='mch'/> <flag name='iothread.poll-max-ns'/> <flag name='x86-max-cpu'/> + <flag name='i8042'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100247</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 3b5a021dcf..9a0b9c05c2 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -155,6 +155,7 @@ <flag name='bochs-display'/> <flag name='ramfb'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>2012050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900239</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index c955994ac0..9d12215600 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -202,6 +202,7 @@ <flag name='bochs-display'/> <flag name='ramfb'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100239</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index cab38d442b..2cf2e4f655 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -159,6 +159,7 @@ <flag name='overcommit'/> <flag name='bochs-display'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>3000091</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 3e89d7f933..5df9b5ef1b 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -205,6 +205,7 @@ <flag name='bochs-display'/> <flag name='ramfb'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>3000092</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index 4e13888042..964f02b062 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -173,6 +173,7 @@ <flag name='migration-file-drop-cache'/> <flag name='machine.pseries.cap-ccf-assist'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index ba32d4c592..d545c3d9e8 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -210,6 +210,7 @@ <flag name='migration-file-drop-cache'/> <flag name='ramfb'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index a98945de0e..f54db10cd9 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -215,6 +215,7 @@ <flag name='ramfb'/> <flag name='blockdev-file-dynamic-auto-read-only'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>4001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index ee9fb23640..404a2a9168 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -176,6 +176,7 @@ <flag name='machine.pseries.cap-ccf-assist'/> <flag name='blockdev-file-dynamic-auto-read-only'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>4001050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 4857e2f5a5..fa87b72e2b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -218,6 +218,7 @@ <flag name='blockdev-file-dynamic-auto-read-only'/> <flag name='savevm-monitor-nodes'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>4002000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml index f501cde333..59c969e0f2 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml @@ -44,12 +44,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml index 301658178f..d10b29be7e 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml @@ -54,12 +54,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'> <alias name='balloon0'/> </memballoon> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml index 223e929ad5..6eadbdcd18 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml @@ -54,12 +54,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml index c745d48558..68561b50a3 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml @@ -44,12 +44,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml index 3189294b65..0900f3c8e3 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml @@ -53,12 +53,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml index 3189294b65..0900f3c8e3 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml @@ -53,12 +53,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml index edf57fcd3f..31979c40f0 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml @@ -43,12 +43,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml index b97bba78c6..844b951940 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml @@ -34,12 +34,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> -- 2.18.1

3 3

[PATCH] qemu-nbd: Removed deprecated --partition option
by Eric Blake 23 Jan '20

23 Jan '20

The option was deprecated in 4.0.0 (commit 0ae2d546); it's now been long enough with no complaints to follow through with that process. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- qemu-deprecated.texi | 49 ++++++---------- qemu-nbd.c | 133 +------------------------------------------ qemu-nbd.texi | 13 ++--- 3 files changed, 24 insertions(+), 171 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 8471eef9c22d..1b4c638db8e0 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -304,37 +304,6 @@ The above, converted to the current supported format: @section Related binaries -@subsection qemu-nbd --partition (since 4.0.0) - -The ``qemu-nbd --partition $digit'' code (also spelled @option{-P}) -can only handle MBR partitions, and has never correctly handled -logical partitions beyond partition 5. If you know the offset and -length of the partition (perhaps by using @code{sfdisk} within the -guest), you can achieve the effect of exporting just that subset of -the disk by use of the @option{--image-opts} option with a raw -blockdev using the @code{offset} and @code{size} parameters layered on -top of any other existing blockdev. For example, if partition 1 is -100MiB long starting at 1MiB, the old command: - -@code{qemu-nbd -t -P 1 -f qcow2 file.qcow2} - -can be rewritten as: - -@code{qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.backing.driver=file,file.backing.filename=file.qcow2} - -Alternatively, the @code{nbdkit} project provides a more powerful -partition filter on top of its nbd plugin, which can be used to select -an arbitrary MBR or GPT partition on top of any other full-image NBD -export. Using this to rewrite the above example results in: - -@code{qemu-nbd -t -k /tmp/sock -f qcow2 file.qcow2 &} -@code{nbdkit -f --filter=partition nbd socket=/tmp/sock partition=1} - -Note that if you are exposing the export via /dev/nbd0, it is easier -to just export the entire image and then mount only /dev/nbd0p1 than -it is to reinvoke @command{qemu-nbd -c /dev/nbd0} limited to just a -subset of the image. - @subsection qemu-img convert -n -o (since 4.2.0) All options specified in @option{-o} are image creation options, so @@ -383,3 +352,21 @@ trouble after a recent upgrade. The "autoload" parameter has been ignored since 2.12.0. All bitmaps are automatically loaded from qcow2 images. + +@section Related binaries + +@subsection qemu-nbd --partition (removed in 5.0.0) + +The ``qemu-nbd --partition $digit'' code (also spelled @option{-P}) +could only handle MBR partitions, and never correctly handled logical +partitions beyond partition 5. Exporting a partition can still be +done by utilizing the @option{--image-opts} option with a raw blockdev +using the @code{offset} and @code{size} parameters layered on top of +any other existing blockdev. For example, if partition 1 is 100MiB +long starting at 1MiB, the old command: + +@code{qemu-nbd -t -P 1 -f qcow2 file.qcow2} + +can be rewritten as: + +@code{qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.backing.driver=file,file.backing.filename=file.qcow2} diff --git a/qemu-nbd.c b/qemu-nbd.c index bc125370dd36..e6f2eb76a3f2 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -100,7 +100,6 @@ static void usage(const char *name) "\n" "Exposing part of the image:\n" " -o, --offset=OFFSET offset into the image\n" -" -P, --partition=NUM only expose partition NUM\n" " -B, --bitmap=NAME expose a persistent dirty bitmap\n" "\n" "General purpose options:\n" @@ -156,96 +155,6 @@ QEMU_COPYRIGHT "\n" , name); } -struct partition_record -{ - uint8_t bootable; - uint8_t start_head; - uint32_t start_cylinder; - uint8_t start_sector; - uint8_t system; - uint8_t end_head; - uint8_t end_cylinder; - uint8_t end_sector; - uint32_t start_sector_abs; - uint32_t nb_sectors_abs; -}; - -static void read_partition(uint8_t *p, struct partition_record *r) -{ - r->bootable = p[0]; - r->start_head = p[1]; - r->start_cylinder = p[3] | ((p[2] << 2) & 0x0300); - r->start_sector = p[2] & 0x3f; - r->system = p[4]; - r->end_head = p[5]; - r->end_cylinder = p[7] | ((p[6] << 2) & 0x300); - r->end_sector = p[6] & 0x3f; - - r->start_sector_abs = ldl_le_p(p + 8); - r->nb_sectors_abs = ldl_le_p(p + 12); -} - -static int find_partition(BlockBackend *blk, int partition, - uint64_t *offset, uint64_t *size) -{ - struct partition_record mbr[4]; - uint8_t data[MBR_SIZE]; - int i; - int ext_partnum = 4; - int ret; - - ret = blk_pread(blk, 0, data, sizeof(data)); - if (ret < 0) { - error_report("error while reading: %s", strerror(-ret)); - exit(EXIT_FAILURE); - } - - if (data[510] != 0x55 || data[511] != 0xaa) { - return -EINVAL; - } - - for (i = 0; i < 4; i++) { - read_partition(&data[446 + 16 * i], &mbr[i]); - - if (!mbr[i].system || !mbr[i].nb_sectors_abs) { - continue; - } - - if (mbr[i].system == 0xF || mbr[i].system == 0x5) { - struct partition_record ext[4]; - uint8_t data1[MBR_SIZE]; - int j; - - ret = blk_pread(blk, mbr[i].start_sector_abs * MBR_SIZE, - data1, sizeof(data1)); - if (ret < 0) { - error_report("error while reading: %s", strerror(-ret)); - exit(EXIT_FAILURE); - } - - for (j = 0; j < 4; j++) { - read_partition(&data1[446 + 16 * j], &ext[j]); - if (!ext[j].system || !ext[j].nb_sectors_abs) { - continue; - } - - if ((ext_partnum + j + 1) == partition) { - *offset = (uint64_t)ext[j].start_sector_abs << 9; - *size = (uint64_t)ext[j].nb_sectors_abs << 9; - return 0; - } - } - ext_partnum += 4; - } else if ((i + 1) == partition) { - *offset = (uint64_t)mbr[i].start_sector_abs << 9; - *size = (uint64_t)mbr[i].nb_sectors_abs << 9; - return 0; - } - } - - return -ENOENT; -} - static void termsig_handler(int signum) { atomic_cmpxchg(&state, RUNNING, TERMINATE); @@ -620,7 +529,7 @@ int main(int argc, char **argv) int64_t fd_size; QemuOpts *sn_opts = NULL; const char *sn_id_or_name = NULL; - const char *sopt = "hVb:o:p:rsnP:c:dvk:e:f:tl:x:T:D:B:L"; + const char *sopt = "hVb:o:p:rsnc:dvk:e:f:tl:x:T:D:B:L"; struct option lopt[] = { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, 'V' }, @@ -629,7 +538,6 @@ int main(int argc, char **argv) { "socket", required_argument, NULL, 'k' }, { "offset", required_argument, NULL, 'o' }, { "read-only", no_argument, NULL, 'r' }, - { "partition", required_argument, NULL, 'P' }, { "bitmap", required_argument, NULL, 'B' }, { "connect", required_argument, NULL, 'c' }, { "disconnect", no_argument, NULL, 'd' }, @@ -660,7 +568,6 @@ int main(int argc, char **argv) int ch; int opt_ind = 0; int flags = BDRV_O_RDWR; - int partition = 0; int ret = 0; bool seen_cache = false; bool seen_discard = false; @@ -796,15 +703,6 @@ int main(int argc, char **argv) readonly = true; flags &= ~BDRV_O_RDWR; break; - case 'P': - warn_report("The '-P' option is deprecated; use --image-opts with " - "a raw device wrapper for subset exports instead"); - if (qemu_strtoi(optarg, NULL, 0, &partition) < 0 || - partition < 1 || partition > 8) { - error_report("Invalid partition '%s'", optarg); - exit(EXIT_FAILURE); - } - break; case 'B': bitmap = optarg; break; @@ -901,7 +799,7 @@ int main(int argc, char **argv) error_report("List mode is incompatible with a file name"); exit(EXIT_FAILURE); } - if (export_name || export_description || dev_offset || partition || + if (export_name || export_description || dev_offset || device || disconnect || fmt || sn_id_or_name || bitmap || seen_aio || seen_discard || seen_cache) { error_report("List mode is incompatible with per-device settings"); @@ -1165,33 +1063,6 @@ int main(int argc, char **argv) } fd_size -= dev_offset; - if (partition) { - uint64_t limit; - - if (dev_offset) { - error_report("Cannot request partition and offset together"); - exit(EXIT_FAILURE); - } - ret = find_partition(blk, partition, &dev_offset, &limit); - if (ret < 0) { - error_report("Could not find partition %d: %s", partition, - strerror(-ret)); - exit(EXIT_FAILURE); - } - /* - * MBR partition limits are (32-bit << 9); this assert lets - * the compiler know that we can't overflow 64 bits. - */ - assert(dev_offset + limit >= dev_offset); - if (dev_offset + limit > fd_size) { - error_report("Discovered partition %d at offset %" PRIu64 - " size %" PRIu64 ", but size exceeds file length %" - PRId64, partition, dev_offset, limit, fd_size); - exit(EXIT_FAILURE); - } - fd_size = limit; - } - export = nbd_export_new(bs, dev_offset, fd_size, export_name, export_description, bitmap, readonly, shared > 1, nbd_export_closed, writethrough, NULL, diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 7f55657722bd..36f4188a3f27 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -55,11 +55,6 @@ Force the use of the block driver for format @var{fmt} instead of auto-detecting. @item -r, --read-only Export the disk as read-only. -@item -P, --partition=@var{num} -Deprecated: Only expose MBR partition @var{num}. Understands physical -partitions 1-4 and logical partition 5. New code should instead use -@option{--image-opts} with the raw driver wrapping a subset of the -original image. @item -B, --bitmap=@var{name} If @var{filename} has a qcow2 persistent bitmap @var{name}, expose that bitmap via the ``qemu:dirty-bitmap:@var{name}'' context @@ -161,13 +156,13 @@ qemu-nbd \ --image-opts driver=raw,offset=1M,size=1M,file.driver=file,file.filename=file.raw @end example -Serve a read-only copy of just the first MBR partition of a guest -image over a Unix socket with as many as 5 simultaneous readers, with -a persistent process forked as a daemon: +Serve a read-only copy of a guest image over a Unix socket with as +many as 5 simultaneous readers, with a persistent process forked as a +daemon: @example qemu-nbd --fork --persistent --shared=5 --socket=/path/to/sock \ - --partition=1 --read-only --format=qcow2 file.qcow2 + --read-only --format=qcow2 file.qcow2 @end example Expose the guest-visible contents of a qcow2 file via a block device -- 2.24.1

3 4

[libvirt PATCH v2] qemu: fixing auto-detecting binary in domain capabilities
by Daniel P. Berrangé 23 Jan '20

23 Jan '20

The virConnectGetDomainCapabilities API accepts either a binary path to the emulator, or desired guest arch. If guest arch is not given, then the host arch is assumed. In the case where the binary is not given, the code tried to find the emulator binary in the existing list of cached emulator capabilities. This is not valid since we switched to lazy population of the cache in: commit 3dd91af01f30c5bda6328454ef49f3afece755d6 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Mon Dec 2 13:04:26 2019 +0000 qemu: stop creating capabilities at driver startup As a result of this change, if there are no persistent guests defined using the requested guest architecture, virConnectGetDomainCapabilities will fail to find an emulator binary. The solution is to stop relying on the cached capabilities to find the binary and instead use the same logic we use to pick default a binary per arch when populating capabilities. Tested-by: Richard W.M. Jones <rjones(a)redhat.com> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 45 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 498348ad58..14c2aa34d2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5280,10 +5280,13 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, const char **retMachine) { int virttype = VIR_DOMAIN_VIRT_NONE; - int arch = virArchFromHost(); + virArch hostarch = virArchFromHost(); + virArch arch = hostarch; virDomainVirtType capsType; virQEMUCapsPtr qemuCaps = NULL; virQEMUCapsPtr ret = NULL; + virArch arch_from_caps; + g_autofree char *probedbinary = NULL; if (virttypeStr && (virttype = virDomainVirtTypeFromString(virttypeStr)) < 0) { @@ -5299,31 +5302,27 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, goto cleanup; } - if (binary) { - virArch arch_from_caps; + if (!binary) { + probedbinary = virQEMUCapsGetDefaultEmulator(hostarch, arch); + binary = probedbinary; + } - if (!(qemuCaps = virQEMUCapsCacheLookup(cache, binary))) - goto cleanup; + if (!(qemuCaps = virQEMUCapsCacheLookup(cache, binary))) + goto cleanup; - arch_from_caps = virQEMUCapsGetArch(qemuCaps); + arch_from_caps = virQEMUCapsGetArch(qemuCaps); - if (arch_from_caps != arch && - !((ARCH_IS_X86(arch) && ARCH_IS_X86(arch_from_caps)) || - (ARCH_IS_PPC(arch) && ARCH_IS_PPC(arch_from_caps)) || - (ARCH_IS_ARM(arch) && ARCH_IS_ARM(arch_from_caps)) || - (ARCH_IS_S390(arch) && ARCH_IS_S390(arch_from_caps)))) { - virReportError(VIR_ERR_INVALID_ARG, - _("architecture from emulator '%s' doesn't " - "match given architecture '%s'"), - virArchToString(arch_from_caps), - virArchToString(arch)); - goto cleanup; - } - } else { - if (!(qemuCaps = virQEMUCapsCacheLookupByArch(cache, arch))) - goto cleanup; - - binary = virQEMUCapsGetBinary(qemuCaps); + if (arch_from_caps != arch && + !((ARCH_IS_X86(arch) && ARCH_IS_X86(arch_from_caps)) || + (ARCH_IS_PPC(arch) && ARCH_IS_PPC(arch_from_caps)) || + (ARCH_IS_ARM(arch) && ARCH_IS_ARM(arch_from_caps)) || + (ARCH_IS_S390(arch) && ARCH_IS_S390(arch_from_caps)))) { + virReportError(VIR_ERR_INVALID_ARG, + _("architecture from emulator '%s' doesn't " + "match given architecture '%s'"), + virArchToString(arch_from_caps), + virArchToString(arch)); + goto cleanup; } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) -- 2.23.0

3 3

[PATCH 0/2] lxc: Implement lxcDomainInterfaceAddresses() function
by Julio Faracco 23 Jan '20

23 Jan '20

It is not able to retrieve IP addresses from LXC domains. This method was not implemented before. LXC uses the same operations to retrieve this information, but QEMU has their own functions to process this data. This series turn them into global functions, moving them into domain conf methods, to make them available for other drivers. The only source that LXC does not support is agent which is a specific source from QEMU. Julio Faracco (2): qemu: Converting DHCP and ARP functions to domain conf lxc: Add support to lxcDomainInterfaceAddresses() function src/conf/domain_conf.c | 134 ++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 2 + src/lxc/lxc_driver.c | 44 +++++++++++++ src/qemu/qemu_driver.c | 137 +-------------------------------------- 5 files changed, 184 insertions(+), 135 deletions(-) -- 2.20.1

2 5

[libvirt] [PATCH] nodedev: use autofree for more local variables
by Jonathon Jongsma 23 Jan '20

23 Jan '20

Simplify function logic by using g_autofree to free local variables so that we can remove some goto statements that are used for cleanup. Introduce a g_autoptr cleanup function for virNodeDeviceDef. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/conf/node_device_conf.h | 2 ++ src/node_device/node_device_driver.c | 47 +++++++++++----------------- 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index bf7939fbb3..4ff616ee90 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -344,6 +344,8 @@ virNodeDeviceGetWWNs(virNodeDeviceDefPtr def, void virNodeDeviceDefFree(virNodeDeviceDefPtr def); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNodeDeviceDef, virNodeDeviceDefFree); + void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps); diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index b630be4399..fda77ede24 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -106,10 +106,9 @@ int nodeConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) static int nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def) { - char *driver_link = NULL; - char *devpath = NULL; + g_autofree char *driver_link = NULL; + g_autofree char *devpath = NULL; char *p; - int ret = -1; VIR_FREE(def->driver); @@ -117,26 +116,20 @@ nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def) /* Some devices don't have an explicit driver, so just return without a name */ - if (access(driver_link, R_OK) < 0) { - ret = 0; - goto cleanup; - } + if (access(driver_link, R_OK) < 0) + return 0; if (virFileResolveLink(driver_link, &devpath) < 0) { virReportSystemError(errno, _("cannot resolve driver link %s"), driver_link); - goto cleanup; + return -1; } p = strrchr(devpath, '/'); if (p) def->driver = g_strdup(p + 1); - ret = 0; - cleanup: - VIR_FREE(driver_link); - VIR_FREE(devpath); - return ret; + return 0; } #else /* XXX: Implement me for non-linux */ @@ -468,8 +461,9 @@ nodeDeviceCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - virNodeDeviceDefPtr def = NULL; - char *wwnn = NULL, *wwpn = NULL; + g_autoptr(virNodeDeviceDef) def = NULL; + g_autofree char *wwnn = NULL; + g_autofree char *wwpn = NULL; int parent_host = -1; virNodeDevicePtr device = NULL; const char *virt_type = NULL; @@ -478,19 +472,19 @@ nodeDeviceCreateXML(virConnectPtr conn, virt_type = virConnectGetType(conn); if (!(def = virNodeDeviceDefParseString(xmlDesc, CREATE_DEVICE, virt_type))) - goto cleanup; + return NULL; if (virNodeDeviceCreateXMLEnsureACL(conn, def) < 0) - goto cleanup; + return NULL; if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) == -1) - goto cleanup; + return NULL; if ((parent_host = virNodeDeviceObjListGetParentHost(driver->devs, def)) < 0) - goto cleanup; + return NULL; if (virVHBAManageVport(parent_host, wwpn, wwnn, VPORT_CREATE) < 0) - goto cleanup; + return NULL; device = nodeDeviceFindNewDevice(conn, wwnn, wwpn); /* We don't check the return value, because one way or another, @@ -501,10 +495,7 @@ nodeDeviceCreateXML(virConnectPtr conn, _("no node device for '%s' with matching " "wwnn '%s' and wwpn '%s'"), def->name, wwnn, wwpn); - cleanup: - virNodeDeviceDefFree(def); - VIR_FREE(wwnn); - VIR_FREE(wwpn); + return device; } @@ -515,8 +506,9 @@ nodeDeviceDestroy(virNodeDevicePtr device) int ret = -1; virNodeDeviceObjPtr obj = NULL; virNodeDeviceDefPtr def; - char *parent = NULL; - char *wwnn = NULL, *wwpn = NULL; + g_autofree char *parent = NULL; + g_autofree char *wwnn = NULL; + g_autofree char *wwpn = NULL; unsigned int parent_host; if (!(obj = nodeDeviceObjFindByName(device->name))) @@ -554,9 +546,6 @@ nodeDeviceDestroy(virNodeDevicePtr device) cleanup: virNodeDeviceObjEndAPI(&obj); - VIR_FREE(parent); - VIR_FREE(wwnn); - VIR_FREE(wwpn); return ret; } -- 2.21.0

2 1

[libvirt PATCH] src: remove WITH_GNUTLS usage
by Pavel Hrdina 22 Jan '20

22 Jan '20

Since commit <60d9ad6f1e42618fce10baeb0f02c35e5ebd5b24> we require GnuTLS so it doesn't make sense to ifdef the code. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/libvirt.c | 6 +----- src/remote/remote_driver.c | 19 ------------------- src/rpc/virnetclient.c | 20 ++++---------------- src/rpc/virnetclient.h | 8 +------- src/rpc/virnetsocket.c | 16 ---------------- src/rpc/virnetsocket.h | 6 +----- src/util/virrandom.c | 36 ++---------------------------------- 7 files changed, 9 insertions(+), 102 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index f1ffc97261..86bb6551ed 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -45,9 +45,7 @@ #include "viralloc.h" #include "configmake.h" #include "virconf.h" -#if WITH_GNUTLS -# include "rpc/virnettlscontext.h" -#endif +#include "rpc/virnettlscontext.h" #include "vircommand.h" #include "virfile.h" #include "virrandom.h" @@ -233,9 +231,7 @@ virGlobalInit(void) virLogSetFromEnv(); -#ifdef WITH_GNUTLS virNetTLSInit(); -#endif #if WITH_CURL curl_global_init(CURL_GLOBAL_DEFAULT); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 66472a6cc1..f6e725dcbf 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -124,9 +124,7 @@ struct private_data { int counter; /* Serial number for RPC */ -#ifdef WITH_GNUTLS virNetTLSContextPtr tls; -#endif int is_secure; /* Secure if TLS or SASL or UNIX sockets */ char *type; /* Cached return from remoteType. */ @@ -1132,7 +1130,6 @@ doRemoteOpen(virConnectPtr conn, virConfGetValueString(conf, "tls_priority", &tls_priority) < 0) goto failed; -#ifdef WITH_GNUTLS priv->tls = virNetTLSContextNewClientPath(pkipath, geteuid() != 0 ? true : false, tls_priority, @@ -1141,27 +1138,17 @@ doRemoteOpen(virConnectPtr conn, goto failed; priv->is_secure = 1; G_GNUC_FALLTHROUGH; -#else - (void)tls_priority; - (void)sanity; - (void)verify; - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("GNUTLS support not available in this build")); - goto failed; -#endif case REMOTE_DRIVER_TRANSPORT_TCP: priv->client = virNetClientNewTCP(priv->hostname, port, AF_UNSPEC); if (!priv->client) goto failed; -#ifdef WITH_GNUTLS if (priv->tls) { VIR_DEBUG("Starting TLS session"); if (virNetClientSetTLSSession(priv->client, priv->tls) < 0) goto failed; } -#endif break; @@ -1388,10 +1375,8 @@ doRemoteOpen(virConnectPtr conn, priv->client = NULL; virObjectUnref(priv->closeCallback); priv->closeCallback = NULL; -#ifdef WITH_GNUTLS virObjectUnref(priv->tls); priv->tls = NULL; -#endif VIR_FREE(priv->hostname); return VIR_DRV_OPEN_ERROR; @@ -1533,10 +1518,8 @@ doRemoteClose(virConnectPtr conn, struct private_data *priv) (xdrproc_t) xdr_void, (char *) NULL) == -1) ret = -1; -#ifdef WITH_GNUTLS virObjectUnref(priv->tls); priv->tls = NULL; -#endif virNetClientSetCloseCallback(priv->client, NULL, @@ -4271,7 +4254,6 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, /* saslcb is now owned by sasl */ saslcb = NULL; -# ifdef WITH_GNUTLS /* Initialize some connection props we care about */ if (priv->tls) { if ((ssf = virNetClientGetTLSKeySize(priv->client)) < 0) @@ -4283,7 +4265,6 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, if (virNetSASLSessionExtKeySize(sasl, ssf) < 0) goto cleanup; } -# endif /* If we've got a secure channel (TLS or UNIX sock), we don't care about SSF */ /* If we're not secure, then forbid any anonymous or trivially crackable auth */ diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 50489b754c..000b937cdd 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -70,9 +70,7 @@ struct _virNetClient { virNetSocketPtr sock; bool asyncIO; -#if WITH_GNUTLS virNetTLSSessionPtr tls; -#endif char *hostname; virNetClientProgramPtr *programs; @@ -708,9 +706,7 @@ void virNetClientDispose(void *obj) if (client->sock) virNetSocketRemoveIOCallback(client->sock); virObjectUnref(client->sock); -#if WITH_GNUTLS virObjectUnref(client->tls); -#endif #if WITH_SASL virObjectUnref(client->sasl); #endif @@ -750,10 +746,8 @@ virNetClientCloseLocked(virNetClientPtr client) virObjectUnref(client->sock); client->sock = NULL; -#if WITH_GNUTLS virObjectUnref(client->tls); client->tls = NULL; -#endif #if WITH_SASL virObjectUnref(client->sasl); client->sasl = NULL; @@ -837,7 +831,6 @@ void virNetClientSetSASLSession(virNetClientPtr client, #endif -#if WITH_GNUTLS int virNetClientSetTLSSession(virNetClientPtr client, virNetTLSContextPtr tls) { @@ -848,12 +841,12 @@ int virNetClientSetTLSSession(virNetClientPtr client, sigset_t oldmask, blockedsigs; sigemptyset(&blockedsigs); -# ifdef SIGWINCH +#ifdef SIGWINCH sigaddset(&blockedsigs, SIGWINCH); -# endif -# ifdef SIGCHLD +#endif +#ifdef SIGCHLD sigaddset(&blockedsigs, SIGCHLD); -# endif +#endif sigaddset(&blockedsigs, SIGPIPE); virObjectLock(client); @@ -940,16 +933,13 @@ int virNetClientSetTLSSession(virNetClientPtr client, virObjectUnlock(client); return -1; } -#endif bool virNetClientIsEncrypted(virNetClientPtr client) { bool ret = false; virObjectLock(client); -#if WITH_GNUTLS if (client->tls) ret = true; -#endif #if WITH_SASL if (client->sasl) ret = true; @@ -1041,7 +1031,6 @@ const char *virNetClientRemoteAddrStringSASL(virNetClientPtr client) return virNetSocketRemoteAddrStringSASL(client->sock); } -#if WITH_GNUTLS int virNetClientGetTLSKeySize(virNetClientPtr client) { int ret = 0; @@ -1051,7 +1040,6 @@ int virNetClientGetTLSKeySize(virNetClientPtr client) virObjectUnlock(client); return ret; } -#endif static int virNetClientCallDispatchReply(virNetClientPtr client) diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 07b399c1a9..778910b575 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -20,9 +20,7 @@ #pragma once -#ifdef WITH_GNUTLS -# include "virnettlscontext.h" -#endif +#include "virnettlscontext.h" #include "virnetmessage.h" #ifdef WITH_SASL # include "virnetsaslcontext.h" @@ -120,10 +118,8 @@ void virNetClientSetSASLSession(virNetClientPtr client, virNetSASLSessionPtr sasl); #endif -#ifdef WITH_GNUTLS int virNetClientSetTLSSession(virNetClientPtr client, virNetTLSContextPtr tls); -#endif bool virNetClientIsEncrypted(virNetClientPtr client); bool virNetClientIsOpen(virNetClientPtr client); @@ -131,9 +127,7 @@ bool virNetClientIsOpen(virNetClientPtr client); const char *virNetClientLocalAddrStringSASL(virNetClientPtr client); const char *virNetClientRemoteAddrStringSASL(virNetClientPtr client); -#ifdef WITH_GNUTLS int virNetClientGetTLSKeySize(virNetClientPtr client); -#endif void virNetClientClose(virNetClientPtr client); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 973827ebde..23384e5250 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -93,9 +93,7 @@ struct _virNetSocket { char *remoteAddrStrSASL; char *remoteAddrStrURI; -#if WITH_GNUTLS virNetTLSSessionPtr tlsSession; -#endif #if WITH_SASL virNetSASLSessionPtr saslSession; @@ -1288,13 +1286,11 @@ virJSONValuePtr virNetSocketPreExecRestart(virNetSocketPtr sock) goto error; } #endif -#if WITH_GNUTLS if (sock->tlsSession) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Unable to save socket state when TLS session is active")); goto error; } -#endif if (!(object = virJSONValueNewObject())) goto error; @@ -1358,12 +1354,10 @@ void virNetSocketDispose(void *obj) unlink(sock->localAddr.data.un.sun_path); #endif -#if WITH_GNUTLS /* Make sure it can't send any more I/O during shutdown */ if (sock->tlsSession) virNetTLSSessionSetIOCallbacks(sock->tlsSession, NULL, NULL, NULL); virObjectUnref(sock->tlsSession); -#endif #if WITH_SASL virObjectUnref(sock->saslSession); #endif @@ -1660,7 +1654,6 @@ const char *virNetSocketRemoteAddrStringURI(virNetSocketPtr sock) return sock->remoteAddrStrURI; } -#if WITH_GNUTLS static ssize_t virNetSocketTLSSessionWrite(const char *buf, size_t len, void *opaque) @@ -1691,7 +1684,6 @@ void virNetSocketSetTLSSession(virNetSocketPtr sock, sock); virObjectUnlock(sock); } -#endif #if WITH_SASL void virNetSocketSetSASLSession(virNetSocketPtr sock, @@ -1789,17 +1781,13 @@ static ssize_t virNetSocketReadWire(virNetSocketPtr sock, char *buf, size_t len) #endif reread: -#if WITH_GNUTLS if (sock->tlsSession && virNetTLSSessionGetHandshakeStatus(sock->tlsSession) == VIR_NET_TLS_HANDSHAKE_COMPLETE) { ret = virNetTLSSessionRead(sock->tlsSession, buf, len); } else { -#endif ret = read(sock->fd, buf, len); -#if WITH_GNUTLS } -#endif if ((ret < 0) && (errno == EINTR)) goto reread; @@ -1862,17 +1850,13 @@ static ssize_t virNetSocketWriteWire(virNetSocketPtr sock, const char *buf, size #endif rewrite: -#if WITH_GNUTLS if (sock->tlsSession && virNetTLSSessionGetHandshakeStatus(sock->tlsSession) == VIR_NET_TLS_HANDSHAKE_COMPLETE) { ret = virNetTLSSessionWrite(sock->tlsSession, buf, len); } else { -#endif ret = write(sock->fd, buf, len); -#if WITH_GNUTLS } -#endif if (ret < 0) { if (errno == EINTR) diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h index 8d075464cb..f2b74f3ccb 100644 --- a/src/rpc/virnetsocket.h +++ b/src/rpc/virnetsocket.h @@ -23,9 +23,7 @@ #include "virsocketaddr.h" #include "vircommand.h" -#ifdef WITH_GNUTLS -# include "virnettlscontext.h" -#endif +#include "virnettlscontext.h" #include "virobject.h" #ifdef WITH_SASL # include "virnetsaslcontext.h" @@ -152,10 +150,8 @@ ssize_t virNetSocketWrite(virNetSocketPtr sock, const char *buf, size_t len); int virNetSocketSendFD(virNetSocketPtr sock, int fd); int virNetSocketRecvFD(virNetSocketPtr sock, int *fd); -#ifdef WITH_GNUTLS void virNetSocketSetTLSSession(virNetSocketPtr sock, virNetTLSSessionPtr sess); -#endif #ifdef WITH_SASL void virNetSocketSetSASLSession(virNetSocketPtr sock, diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 39ac36a76e..eae7f3db3c 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -24,10 +24,8 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> -#ifdef WITH_GNUTLS -# include <gnutls/gnutls.h> -# include <gnutls/crypto.h> -#endif +#include <gnutls/gnutls.h> +#include <gnutls/crypto.h> #include "virrandom.h" #include "virthread.h" @@ -116,7 +114,6 @@ int virRandomBytes(unsigned char *buf, size_t buflen) { -#if WITH_GNUTLS int rv; /* Generate the byte stream using gnutls_rnd() if possible */ @@ -127,35 +124,6 @@ virRandomBytes(unsigned char *buf, return -1; } -#else /* !WITH_GNUTLS */ - - int fd; - - if ((fd = open(RANDOM_SOURCE, O_RDONLY)) < 0) { - virReportSystemError(errno, - _("unable to open %s"), - RANDOM_SOURCE); - return -1; - } - - while (buflen > 0) { - ssize_t n; - - if ((n = saferead(fd, buf, buflen)) <= 0) { - virReportSystemError(errno, - _("unable to read from %s"), - RANDOM_SOURCE); - VIR_FORCE_CLOSE(fd); - return n < 0 ? -errno : -ENODATA; - } - - buf += n; - buflen -= n; - } - - VIR_FORCE_CLOSE(fd); -#endif /* !WITH_GNUTLS */ - return 0; } -- 2.24.1

3 2

[libvirt] [PATCH v2 0/2] fix segfaults on qemuhotplugtest
by Christian Ehrhardt 22 Jan '20

22 Jan '20

After debugging for a while and eventually finding the root cause we discussed this on IRC today: <cpaelzer> danpb: BTW the test crash in 6.0 that I'm tracing (asked yesterday) is virHostdevManagerInitialize failing <cpaelzer> the test goes on with mgr set to 0x0 and that is the segfault later on <cpaelzer> virSetError was helpful as "Could not initialize HostdevManager operation failed: Failed to create state dir '/sbuild-nonexistent/.cache/libvirt/hostdevmgr'" sounds like a very testbed-specific issue that I might be able to solve when invoking the tests <danpb> hmm, seems like we're missing a mock for mkdir() <danpb> i guess we should mock virFileMakePath in this case This series got v6.0.0 building in Ubuntu, so I thought it is worth to submit it for review. Updates in v2: - improve indent of virGetLastErrorMessage - drop superfluous curly brackets - added the Reviewed-by of Daniel Henrique Barboza (Thanks !) Christian Ehrhardt (2): test: let qemuhotplugtest report details of init fails test: qemuhotplugtest mock virFileMakePath tests/qemuhotplugmock.c | 17 +++++++++++++++++ tests/qemuhotplugtest.c | 5 +++++ 2 files changed, 22 insertions(+) -- 2.25.0

2 6

[PATCH] libxl: initialize shutdown inhibit callback
by Marek Marczykowski-Górecki 22 Jan '20

22 Jan '20

The libxl driver already tries to call shutdown inhibit callback in the right places, but only if it's set. That last part was missing, resulting in premature shutdown when running libvirtd --timeout=... Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/libxl/libxl_driver.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index bece313ec5..d45e42c100 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -648,8 +648,8 @@ libxlAddDom0(libxlDriverPrivatePtr driver) static int libxlStateInitialize(bool privileged, - virStateInhibitCallback callback G_GNUC_UNUSED, - void *opaque G_GNUC_UNUSED) + virStateInhibitCallback callback, + void *opaque) { libxlDriverConfigPtr cfg; char *driverConf = NULL; @@ -670,6 +670,9 @@ libxlStateInitialize(bool privileged, return VIR_DRV_STATE_INIT_ERROR; } + libxl_driver->inhibitCallback = callback; + libxl_driver->inhibitOpaque = opaque; + /* Allocate bitmap for vnc port reservation */ if (!(libxl_driver->reservedGraphicsPorts = virPortAllocatorRangeNew(_("VNC"), -- 2.21.0

2 1

[libvirt-tck PATCH 0/2] Convert to SSH pubkey auth rather than password-based auth
by Erik Skultety 21 Jan '20

21 Jan '20

Most of the nwfilter tests utilize SSH connections to execute some commands to cross reference whether the requested change in libvirt took effect. However, fedora 31 disables password-based auth for root login which breaks the test suite. Erik Skultety (2): lib: TCK.pm: Favour pubkey auth over passwords on SSH connections nwfilter: Make use of the SSH pubkey auth rather than password-based auth lib/Sys/Virt/TCK.pm | 30 ++++++++++++++++++++++++- scripts/nwfilter/210-no-mac-spoofing.t | 2 +- scripts/nwfilter/220-no-ip-spoofing.t | 2 +- scripts/nwfilter/230-no-mac-broadcast.t | 2 +- scripts/nwfilter/240-no-arp-spoofing.t | 2 +- 5 files changed, 33 insertions(+), 5 deletions(-) -- 2.24.1

2 8

[libvirt] [tck PATCH 0/3] A few network related fixes to get the network suite running
by Erik Skultety 21 Jan '20

21 Jan '20

Erik Skultety (3): network: Fix the iptables FORWARD chain name being queried network: Fix the dhcp range output being matched nwfilter: Fix the expected output from ebtables .../networks/networkxml2hostout/tck-testnet-1.dat | 5 +++-- .../networks/networkxml2hostout/tck-testnet-2.dat | 5 +++-- .../networks/networkxml2hostout/tck-testnet-3.dat | 14 ++++++++------ .../nwfilter/nwfilterxml2fwallout/ipv6-test.fwall | 12 ++++++------ 4 files changed, 20 insertions(+), 16 deletions(-) -- 2.24.1

2 7

[libvirt] [PATCH] create a thread to handle MigrationParamReset to avoid deadlock
by Yi Wang 21 Jan '20

21 Jan '20

From: Li XueLei <li.xuelei1(a)zte.com.cn> Libvirtd no longer receives external requests, after I do the following. Steps to reproduce: 1.Virsh tool initiates a non-p2p migrations. 2.After the phase of qemuDomainMigratePerform3 and before the phase of qemuDomainMigrateConfirm3, kill the virsh client which initiated the migration. What happens: Libvirtd will be blocked in the next call stack because it can't get the condition variables, and it will not be able to receive new requests. Thread 1 (Thread 0x7f36a7b9f8c0 (LWP 27556)): #0 0x00007f36a45799f5 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00007f36a6e7a97e in virCondWait () from /lib64/libvirt.so.0 #2 0x00007f3679c6a1b3 in qemuMonitorSend () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so #3 0x00007f3679c837de in qemuMonitorJSONCommandWithFd () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so #4 0x00007f3679c93c5a in qemuMonitorJSONSetMigrationCapabilities () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so #5 0x00007f3679c786ed in qemuMonitorSetMigrationCapabilities () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so #6 0x00007f3679c67857 in qemuMigrationParamsApply () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so #7 0x00007f3679c67eff in qemuMigrationParamsReset () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so #8 0x00007f3679c5198a in qemuMigrationSrcCleanup () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so #9 0x00007f36a6dcd862 in virCloseCallbacksRun () from /lib64/libvirt.so.0 #10 0x00007f3679cc28f6 in qemuConnectClose () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so #11 0x00007f36a70a0870 in virConnectDispose () from /lib64/libvirt.so.0 #12 0x00007f36a6e3f43b in virObjectUnref () from /lib64/libvirt.so.0 #13 0x00007f36a70a55c4 in virConnectClose () from /lib64/libvirt.so.0 #14 0x000056058a206f92 in remoteClientFree () #15 0x00007f36a6fa49a0 in virNetServerClientDispose () from /lib64/libvirt.so.0 #16 0x00007f36a6e3f43b in virObjectUnref () from /lib64/libvirt.so.0 #17 0x00007f36a6e3fd21 in virObjectFreeCallback () from /lib64/libvirt.so.0 #18 0x00007f36a6f9942e in virNetSocketEventFree () from /lib64/libvirt.so.0 #19 0x00007f36a6de8439 in virEventPollCleanupHandles () from /lib64/libvirt.so.0 #20 0x00007f36a6de9ab6 in virEventPollRunOnce () from /lib64/libvirt.so.0 #21 0x00007f36a6de817a in virEventRunDefaultImpl () from /lib64/libvirt.so.0 #22 0x00007f36a6faadb5 in virNetDaemonRun () from /lib64/libvirt.so.0 #23 0x000056058a1c5cc1 in main () Here's a patch to solve this bug, that is to create a thread to do MigrationParamReset. Signed-off-by: Li XueLei <li.xuelei1(a)zte.com.cn> Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/remote/remote_daemon_dispatch.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 76c676c..3962ee3 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1741,9 +1741,10 @@ remoteClientFreePrivateCallbacks(struct daemonClientPrivate *priv) * We keep the libvirt connection open until any async * jobs have finished, then clean it up elsewhere */ -void remoteClientFree(void *data) + +static void remoteClientFreeFun(void *opaque) { - struct daemonClientPrivate *priv = data; + struct daemonClientPrivate *priv = opaque; if (priv->conn) virConnectClose(priv->conn); @@ -1760,7 +1761,16 @@ void remoteClientFree(void *data) if (priv->storageConn) virConnectClose(priv->storageConn); - VIR_FREE(priv); + VIR_FREE(priv); +} + +void remoteClientFree(void *data) +{ + virThread thread; + + if (virThreadCreate(&thread, false, remoteClientFreeFun, data) < 0) { + VIR_ERROR("Unable to create remoteClientFreeFun thread"); + } } -- 1.8.3.1

4 6

RFC - (re)design of PCI multifunction hot-unplug
by Daniel Henrique Barboza 21 Jan '20

21 Jan '20

Hi, This is a request for comments in the design of the PCI multifunction hotplug/hot-unplug feature for the QEMU driver that hopefully I'll be sending shortly for review. The feature went through code changes since [1] mostly because of Libvirt changes itself, but Shiva's 2016 original design [2] was preserved. The design consists of a new 'devices' XML element that will contain all hostdevs of the multifunction device to be hotplugged: <devices> --- hostdev function 0 XML --- --- hostdev function 1 XML --- (...) --- hostdev function N XML --- </devices> The only requirement is function 0 to be present. We'll not force all functions to be hotplugged. Internally, Libvirt will hotplug each non-zero function first, then the zero function for last, which is what QEMU expects for both x86 and Pseries (the 2 archs that supports this feature AFAIK). For unplug, the same <devices> XML is required. And this is where the archs starts to behave differently. x86 guests will hot-unplug all functions, regardless of which function is unplugged first. In the example above, hot-unplugging function 1 will trigger all functions to be unplugged. Pseries does not work like that - all non-zero functions need to be unplugged, then the function zero unplug finally triggers the unplug of the slot. And the Libvirt side was doing exactly that. Back in 2019 I interpreted this as a case of a x86 feature paying the price for a Pseries behavior - if Pseries hot-unplug worked the same way, we could hot-unplug all functions with a single call like x86 does, and the user won't need the <devices> XML for hot-unplug. I ended up tweaking the Pseries guest in QEMU to execute hot-unplug of all functions in case function 0 is hot-unplugged, emulating the x86 behavior for function 0 [3]. This change alone already eases the unplug code in Libvirt side for Pseries, which is good. But my idea was to not use the <devices> XML for hot-unplug. Instead, use regular hot-unplug of function 0 to hot-unplug the whole slot, for both archs. However, recent discussions when contributing the new address='unassigned' type made me re-think the decision I made above: - using <devices> XML for hot-unplug isn't too much of a deal, given that the user would need it for hot-plugging the slot anyway. The gain is marginal, at best. - making a single hot-unplug command 'magically' unplug more than one hostdev is not a good idea. First, there's always the chance that the user hot-unplugs the function 0 of a multifunction device, thinking that it's a regular hostdev, just to see whole slot disappearing from the guest. Granted, I can put more code in this case, warning the user about the removal of the whole slot instead of a single hostdev. But in the end, this breaks Laine's golden rule [4] of do not tamper with devices unless the user is explicitly telling to do so, which aims to avoid these cases of devices appearing/disappearing without user consent. All this said, what I'm leaning up to do is to keep Shiva's design, but simplifying the hot-unplug mechanic considering the changes I made in QEMU for Pseries guests. I'm not adamant on it though, so I'd like to hear if I'm missing something and I should go the 'single unplug removes it all' route instead. Thanks, DHB [1] https://www.redhat.com/archives/libvir-list/2018-March/msg00729.html [2] https://www.redhat.com/archives/libvir-list/2016-April/msg01057.html [3] https://lists.gnu.org/archive/html/qemu-ppc/2019-08/msg00447.html [4] this is something Laine talks about here and there in threads I happen to be involved. If someone wants to claim authorship let me know

1 0

[libvirt] [PATCH 0/4] virsh: secret: Improve handling of secret value
by Peter Krempa 21 Jan '20

21 Jan '20

The currently existing virsh APIs for secrets are awful for human use and don't promote security. Peter Krempa (4): virsh: secret: Add 'secret-passwd' command virsh: secret: Allow getting secret's value without base64 encoding virsh: secret: Allow setting secrets from file docs: secret: Unify and sanitize examples on how to set secret value docs/formatsecret.html.in | 86 ++++++++++++++++++---------- docs/manpages/virsh.rst | 26 ++++++++- tools/virsh-secret.c | 116 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 189 insertions(+), 39 deletions(-) -- 2.24.1

4 16

[libvirt] [PATCH 0/2] implement crashloaded event for pvpanic
by zhenwei pi 21 Jan '20

21 Jan '20

Guest may handle panic by itself, then just reboot without pvpanic notification. Then We can't separate the abnormal reboot from normal operation. Declear bit 1 for pvpanic as crashloaded event. It should work with guest kernel side. Link: https://lkml.org/lkml/2019/12/14/265 Before running kexec, guest could wirte this bit to notify host side. Host side handles crashloaded event, posts event to upper layer. Then guest side continues to run kexec. Test with libvirt, libvirt could recieve the new event. The patch of libvirt will be sent soon. Zhenwei Pi (2): pvpanic: introduce crashloaded for pvpanic pvpanic: implement crashloaded event handling docs/specs/pvpanic.txt | 8 ++++++-- hw/misc/pvpanic.c | 11 +++++++++-- include/sysemu/runstate.h | 1 + qapi/run-state.json | 22 +++++++++++++++++++++- vl.c | 12 ++++++++++++ 5 files changed, 49 insertions(+), 5 deletions(-) -- 2.11.0

3 6

[libvirt] [PATCH v4 0/7] Fix virConnectRegisterCloseCallback and get rid of global variables
by Marc Hartmayer 21 Jan '20

21 Jan '20

The second patch of this patch series fixes the behavior of virConnectRegisterCloseCallback. The subsequent patches remove the need to have the global variables 'qemuProgram' and 'remoteProgram' in libvirtd.[ch]. They only work in combination with the fixed behavior of virConnectRegisterCloseCallback. Changelog: + v3->v4: - Rebased to current master - Added Pavel's r-bs - Worked in Pavel's comments - Added patch "remote: shrink the critical sections" in preparation for patch "remote/rpc: Use virNetServerGetProgram() to determine the program" + v2->v3: - Rebased to current master - Added Johns r-b to the first patch, all other r-b's I have dropped as there were to many changes in the meantime - Removed accepted patches - Dropped patches 8 and 9 + v1->v2: - Removed accepted patches - Removed NACKed patches - Added r-b to patch 5 - Worked in comments - Rebased - Added patches 7-9 Marc Hartmayer (7): rpc: use the return value of virObjectRef directly virConnectRegisterCloseCallback: Cleanup 'opaque' if there is no connectRegisterCloseCallback remote: Save reference to program in daemonClientEventCallback remote: Use domainClientEventCallbacks for remoteReplayConnectionClosedEvent rpc: Introduce virNetServerGetProgramLocked helper function remote: shrink the critical sections remote/rpc: Use virNetServerGetProgram() to determine the program src/libvirt-host.c | 16 +- src/libvirt_remote.syms | 1 + src/remote/remote_daemon.c | 4 +- src/remote/remote_daemon.h | 2 - src/remote/remote_daemon_dispatch.c | 363 +++++++++++++++++----------- src/rpc/gendispatch.pl | 6 + src/rpc/virnetserver.c | 53 +++- src/rpc/virnetserver.h | 2 + 8 files changed, 293 insertions(+), 154 deletions(-) -- 2.21.0

3 18

[PATCH 0/2] Simple fixes for run.in
by Richard W.M. Jones 21 Jan '20

21 Jan '20

The ./run script is a very useful way to run the libguestfs and virt-v2v test suites against a locally compiled copy of libvirt. These two patches contain some minor fixes. Rich.

3 6

[PATCH] Fix syntax-check 'always true header test' for virvsock.c
by Daniel Henrique Barboza 20 Jan '20

20 Jan '20

Commit 05a38d4c4a ("src: conditionalize / remove use of sys/ioctl.h") aimed to remove imports of ioctl.h and conditionalize them for compilation on Windows. However, the change made in virvsock.c: -#include <sys/ioctl.h> +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif Makes the 'sc_prohibit_always_true_header_tests' rule complain about the redundancy of this test when building it on Linux. ../src/util/virvsock.c:20:#ifdef HAVE_SYS_IOCTL_H build-aux/syntax-check.mk: do not test the above HAVE_<header>_H symbol(s); with the corresponding gnulib module, they are always true make: *** [../build-aux/syntax-check.mk:1679: sc_prohibit_always_true_header_tests] Error 1 make: *** Waiting for unfinished jobs.... This patch fixes it by changing the conditional to #ifndef WIN32 instead, like the other changes made by that patch. CC: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- src/util/virvsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virvsock.c b/src/util/virvsock.c index 2638c5095a..1e2eb553d2 100644 --- a/src/util/virvsock.c +++ b/src/util/virvsock.c @@ -17,7 +17,7 @@ #include <config.h> -#ifdef HAVE_SYS_IOCTL_H +#ifndef WIN32 # include <sys/ioctl.h> #endif -- 2.24.1

1 1

[libvirt RFC 0/2] qemu: handle 'raw' format options 'size' and 'offset'
by Peter Krempa 20 Jan '20

20 Jan '20

See patch 2 please. Peter Krempa (2): tests: storage: Add test data for json specified raw image with offset/size qemu: Handle 'offset' and 'size' parameters of 'raw' driver src/conf/domain_conf.c | 19 +++++++++++++++++++ src/qemu/qemu_block.c | 10 ++++------ src/util/virstoragefile.c | 21 +++++++++++++++++---- src/util/virstoragefile.h | 4 ++++ tests/virstoragetest.c | 15 +++++++++++++++ 5 files changed, 59 insertions(+), 10 deletions(-) -- 2.24.1

3 5

[PATCH] qemu: snapshot: Prevent too-nested domain XML when doing inactive snapshot
by Peter Krempa 20 Jan '20

20 Jan '20

Similarly to 510d154a0b41aa70aadabc0918d16dee22882394 we need to prevent doing too deeply nested backing chains and reject them with a sane error message. Add a loop to go through the snapshots prior to attempting actually creating them to prevent some possible inconsistent scenarios. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2f66d7cd9a..4cebb54913 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14618,6 +14618,16 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, if (!(created = virBitmapNew(snapdef->ndisks))) goto cleanup; + for (i = 0; i < snapdef->ndisks && !reuse; i++) { + snapdisk = &(snapdef->disks[i]); + defdisk = snapdef->parent.dom->disks[snapdisk->idx]; + if (snapdisk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) + continue; + + if (qemuDomainStorageSourceValidateDepth(defdisk->src, 1, defdisk->dst) < 0) + return -1; + } + /* If reuse is true, then qemuDomainSnapshotPrepare already * ensured that the new files exist, and it was up to the user to * create them correctly. */ -- 2.24.1

2 1

[PATCH] qemu: monitor: Improve error message when QEMU reply is too large
by Peter Krempa 20 Jan '20

20 Jan '20

Don't use ERANGE as it doesn't make much sense in the error message. Also point out that the reply from qemu was too large which is not obvious from the original error: error: No complete monitor response found in 10485760 bytes: Numerical result out of range The new message will read: error: internal error: QEMU monitor reply exceeds buffer size (10485760 bytes) Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_monitor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ccd20b3740..e3bd000ccb 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -484,9 +484,9 @@ qemuMonitorIORead(qemuMonitorPtr mon) if (avail < 1024) { if (mon->bufferLength >= QEMU_MONITOR_MAX_RESPONSE) { - virReportSystemError(ERANGE, - _("No complete monitor response found in %d bytes"), - QEMU_MONITOR_MAX_RESPONSE); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("QEMU monitor reply exceeds buffer size (%d bytes)"), + QEMU_MONITOR_MAX_RESPONSE); return -1; } if (VIR_REALLOC_N(mon->buffer, -- 2.24.1

2 1

[libvirt PATCH] qemu: end the agent job in qemuDomainSetTimeAgent
by Ján Tomko 20 Jan '20

20 Jan '20

This function grabs an agent job but ends a monitor job. End the agent job instead. https://bugzilla.redhat.com/show_bug.cgi?id=1792723 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Reported-by: Dan Zheng <dzheng(a)redhat.com> Fixes: e005c95f56fee9ed780be7f8db103d690bd34cbd --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7e379fe83a..2f66d7cd9a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20464,7 +20464,7 @@ qemuDomainSetTimeAgent(virQEMUDriverPtr driver, qemuDomainObjExitAgent(vm, agent); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndAgentJob(vm); return ret; } -- 2.21.0

2 1

[libvirt] [PATCH] Don't check if the path exists for LVM
by ebenner 17 Jan '20

17 Jan '20

I'm not entirely sure why Libvirt is checking to see if the target file exists for LVM but it is a problem. Empty volume groups do not appear in /dev. When libvirt starts these pools then fail to autostart because their path does not exist. This is not useful, this is the patch we are running to resolve this issue. --- src/storage/storage_backend_logical.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 42dec05ba0..2c60719b8c 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -641,11 +641,9 @@ virStorageBackendLogicalCheckPool(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - /* If we can find the target.path as well as ensure that the - * pool's def source - */ - *isActive = virFileExists(def->target.path) && - virStorageBackendLogicalMatchPoolSource(pool); + /* Ensure that the pool's def source is correct */ + *isActive = virStorageBackendLogicalMatchPoolSource(pool); + return 0; } -- 2.24.1

3 2

[PATCH] Re: storage: Cleaning up pools is not always ideal
by ebenner＠vultr.com 17 Jan '20

17 Jan '20

From: Eric Benner <ebenner(a)vultr.com> Didn't have a sign off and was formatted by a mail client. This is a functional copy of this patch with the requirements. Signed-off-by: Eric Benner <ebenner(a)vultr.com> --- src/remote/libvirtd.conf.in | 7 +++++++ src/storage/storage_driver.c | 38 ++++++++++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/remote/libvirtd.conf.in b/src/remote/libvirtd.conf.in index 34741183cc..5600c26eca 100644 --- a/src/remote/libvirtd.conf.in +++ b/src/remote/libvirtd.conf.in @@ -506,3 +506,10 @@ # potential infinite waits blocking libvirt. # #ovs_timeout = 5 + +################################################################### +# This decides whether to disable pools that errors in some way such as during a refresh +# This can negatively affect LVM pools. 1 = disable the pools, 2 = don't disable the pools +# Do not use this if you are not using only LVM pools +# +cleanup_pools = 1 diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 0bb116cf08..5f8bc8a835 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -55,6 +55,7 @@ VIR_LOG_INIT("storage.storage_driver"); static virStorageDriverStatePtr driver; +static int cleanup_pools = -1; static int storageStateCleanup(void); @@ -74,6 +75,20 @@ static void storageDriverUnlock(void) virMutexUnlock(&driver->lock); } +static int cleanupPools(void) +{ + if (cleanup_pools == -1) { + g_autoptr(virConf) libvirtConf = NULL; + virConfLoadConfig(&libvirtConf, "libvirtd.conf"); + + if (!virConfGetValueInt(libvirtConf, "cleanup_pools", &cleanup_pools) + || (cleanup_pools != 0 && cleanup_pools != 1)) + cleanup_pools = 1; + } + + return cleanup_pools; +} + static void storagePoolRefreshFailCleanup(virStorageBackendPtr backend, @@ -81,14 +96,26 @@ storagePoolRefreshFailCleanup(virStorageBackendPtr backend, const char *stateFile) { virErrorPtr orig_err; - virErrorPreserveLast(&orig_err); virStoragePoolObjClearVols(obj); if (stateFile) unlink(stateFile); - if (backend->stopPool) - backend->stopPool(obj); + + if (!cleanupPools()) { + virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to refresh storage pool '%s'. Would have disabled this pool but clean_pools = 0: %s"), + def->name, virGetLastErrorMessage()); + } else { + virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to refresh storage pool '%s'. Disabled this pool because clean_pools = 1: %s"), + def->name, virGetLastErrorMessage()); + if (backend->stopPool) { + backend->stopPool(obj); + } + } virErrorRestore(&orig_err); } @@ -101,7 +128,10 @@ storagePoolRefreshImpl(virStorageBackendPtr backend, virStoragePoolObjClearVols(obj); if (backend->refreshPool(obj) < 0) { storagePoolRefreshFailCleanup(backend, obj, stateFile); - return -1; + if (!cleanupPools()) + return 0; + else + return -1; } return 0; -- 2.24.1

1 0

[RFC PATCH] libxl: support configuring paravirtualized keyboard
by Marek Marczykowski-Górecki 17 Jan '20

17 Jan '20

Xen since 4.13 allows to configure whether PV vkb device is created or not - instead of always creating it. Plug it into <input/> device configuration and give the user a choice - setting PS2 keyboard disables PV one, and setting XEN keyboard enables PV. There is one issue with this approach: there are implicit keyboard and mouse device added with bus 'ps2'. This is at least done by the xen-xl -> libvirt xml config converter (why?). When one use a config generated this way, this commit will make behavior change - PV keyboard will get disabled. I'm not sure if that's a big issue - both keyboards works. Can it be this way? Or maybe some better idea how to represent vkb_device option in libvirt xml? Once the above is sorted out (or chosen to ignore), I'll send updated patch with tests and config converter support. Because the implicit keyboard is added, I also avoided to reject keybord device on too old Xen versions. This means <input type='keyboard' bus='xen'/> will be _silently_ ignored on older Xen. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/libxl/libxl_conf.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 27de67d266..0999fb5678 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -637,6 +637,24 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, for (i = 0; i < def->ninputs; i++) { char **usbdevice; +#ifdef LIBXL_HAVE_BUILDINFO_VKB_DEVICE + if (def->inputs[i]->type == VIR_DOMAIN_INPUT_TYPE_KBD) { + switch (def->inputs[i]->bus) { + case VIR_DOMAIN_INPUT_BUS_PS2: + libxl_defbool_set(&b_info->u.hvm.vkb_device, false); + break; + case VIR_DOMAIN_INPUT_BUS_XEN: + libxl_defbool_set(&b_info->u.hvm.vkb_device, true); + break; + case VIR_DOMAIN_INPUT_BUS_VIRTIO: + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("libxenlight supports only ps2/xen keyboard device")); + return -1; + } + } +#endif + if (def->inputs[i]->bus != VIR_DOMAIN_INPUT_BUS_USB) continue; -- 2.21.0

1 0

[libvirt] [rust PATCH v2 0/5] Map more functions in stream module
by Zixing Liu 17 Jan '20

17 Jan '20

This set of patches will add more functions to the Rust bindings. Newly mapped functions from C library: virStreamNew virStreamEventUpdateCallback virStreamEventRemoveCallback virStreamEventAddCallback. virStreamEventAddCallback can accept normal fn functions or closures (can capture variables outside) The changes are not very thoroughly tested since event module is not implemented at all so the virStreamEventAddCallback will always return "unsupported by the connection driver". Also the changes have run though the rustfmt to ensure the format conforms to Rust officially recommended code style. Version 2: Addressed comments Zixing Liu (5): libvirt-rust: stream: add more functions in stream libvirt-rust: stream: add more functions in stream libvirt-rust: stream: automated lint libvirt-rust: use reference instead of moving libvirt-rust: stream: addressed comments src/domain.rs | 2 +- src/stream.rs | 129 +++++++++++++++++++++++++++++++++++++++++------- tests/stream.rs | 40 +++++++++++++++ 3 files changed, 153 insertions(+), 18 deletions(-) create mode 100644 tests/stream.rs -- 2.24.1

2 15

[PATCH] docs: fixing typos 'libivrt' > 'libvirt'
by Julio Faracco 17 Jan '20

17 Jan '20

This is only 2 simple typo fixes for wrong documentation wording. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- docs/apps.html.in | 2 +- docs/auditlog.html.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 41dd26f7ff..629d740c28 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -224,7 +224,7 @@ <dd> Eucalyptus is an on-premise Infrastructure as a Service cloud software platform that is open source and - AWS-compatible. Eucalyptus uses libivrt virtualization API to + AWS-compatible. Eucalyptus uses libvirt virtualization API to directly interact with Xen and KVM hypervisors. </dd> diff --git a/docs/auditlog.html.in b/docs/auditlog.html.in index f8f0c99b23..eb00d9742e 100644 --- a/docs/auditlog.html.in +++ b/docs/auditlog.html.in @@ -42,7 +42,7 @@ In addition to have formal messages sent to the audit subsystem it is possible to tell libvirt to inject messages into its own logging layer. This will result in messages ending up in the systemd journal - or <code>/var/log/libvirt/libivrtd.log</code> on non-systemd hosts. + or <code>/var/log/libvirt/libvirtd.log</code> on non-systemd hosts. This is disabled by default, but can be requested by setting the <code>audit_logging=1</code> configuration parameter in the same file mentioned above. -- 2.20.1

2 1

[libvirt PATCH v3 00/10] build system cleanup
by Pavel Hrdina 17 Jan '20

17 Jan '20

This patch series is motivated by the effort to adopt Meson as our build system but all of it improves the current build system on its own. Changes in v3: - dropped a patches that stores bootstrap result in git and removes some options from autogen.sh, I'll repost once we get rid of gnulib - added a new patch that fixes threadlib dependency Pavel Hrdina (10): secret: move virSecretGetSecretString into virsecret configure.ac: add check for getegid function bootstrap.conf: add threadlib module bootstrap.conf: drop gnulib tests from libvirt bootstrap.conf: always copy files bootstrap.conf: declare bootstrap sync in configuration file bootstrap.conf: disable VC ignore files bootstrap.conf: stop creating AUTHORS file syntax-check: remove deleted daemon directory from space_indent_check autogen.sh: fix autoreconf step .gitignore | 7 +- Makefile.am | 2 +- autogen.sh | 6 +- bootstrap.conf | 29 ++---- build-aux/syntax-check.mk | 2 +- configure.ac | 2 +- gnulib/tests/Makefile.am | 32 ------- po/POTFILES.in | 1 - src/libvirt_private.syms | 5 +- src/libxl/libxl_conf.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_process.c | 2 +- src/qemu/qemu_tpm.c | 2 +- src/secret/Makefile.inc.am | 11 --- src/secret/secret_util.c | 102 --------------------- src/secret/secret_util.h | 33 ------- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_iscsi_direct.c | 2 +- src/storage/storage_backend_rbd.c | 2 +- src/storage/storage_util.c | 2 +- src/util/virsecret.c | 69 ++++++++++++++ src/util/virsecret.h | 8 ++ 22 files changed, 104 insertions(+), 221 deletions(-) delete mode 100644 gnulib/tests/Makefile.am delete mode 100644 src/secret/secret_util.c delete mode 100644 src/secret/secret_util.h -- 2.23.0

2 11

[libvirt] [PATCH] man: fix section of virt-sanlock-cleanup
by Christian Ehrhardt 17 Jan '20

17 Jan '20

Reported at buld time by litian: manpage-section-mismatch usr/share/man/man8/virt-sanlock-cleanup.8.gz:3 8 != 1 And indeed the rst file says 1 while the makefile say 8: if WITH_SANLOCK manpages8_rst += manpages/virt-sanlock-cleanup.rst else ! WITH_SANLOCK 8 "System administration commands and daemons" seems to match, so fix the rst file to match. Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- docs/manpages/virt-sanlock-cleanup.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manpages/virt-sanlock-cleanup.rst b/docs/manpages/virt-sanlock-cleanup.rst index ac49fa4191..3ad70ce683 100644 --- a/docs/manpages/virt-sanlock-cleanup.rst +++ b/docs/manpages/virt-sanlock-cleanup.rst @@ -6,7 +6,7 @@ virt-sanlock-cleanup remove stale sanlock resource lease files ----------------------------------------- -:Manual section: 1 +:Manual section: 8 :Manual group: Virtualization Support .. contents:: -- 2.25.0

3 2

[libvirt PATCH] qemu: fixing auto-detecting binary in domain capabilities
by Daniel P. Berrangé 17 Jan '20

17 Jan '20

The virConnectGetDomainCapabilities API accepts either a binary path to the emulator, or desired guest arch. If guest arch is not given, then the host arch is assumed. In the case where the binary is not given, the code tried to find the emulator binary in the existing list of cached emulator capabilities. This is not valid since we switched to lazy population of the cache in: commit 3dd91af01f30c5bda6328454ef49f3afece755d6 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Mon Dec 2 13:04:26 2019 +0000 qemu: stop creating capabilities at driver startup As a result of this change, if there are no persistent guests defined using the requested guest architecture, virConnectGetDomainCapabilities will fail to find an emulator binary. The solution is to stop relying on the cached capabilities to find the binary and instead use the same logic we use to pick default a binary per arch when populating capabilities. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 42 ++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 498348ad58..9017e8d920 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5280,10 +5280,12 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, const char **retMachine) { int virttype = VIR_DOMAIN_VIRT_NONE; - int arch = virArchFromHost(); + virArch hostarch = virArchFromHost(); + virArch arch = hostarch; virDomainVirtType capsType; virQEMUCapsPtr qemuCaps = NULL; virQEMUCapsPtr ret = NULL; + virArch arch_from_caps; if (virttypeStr && (virttype = virDomainVirtTypeFromString(virttypeStr)) < 0) { @@ -5299,31 +5301,25 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, goto cleanup; } - if (binary) { - virArch arch_from_caps; + if (!binary) + binary = virQEMUCapsGetDefaultEmulator(hostarch, arch); - if (!(qemuCaps = virQEMUCapsCacheLookup(cache, binary))) - goto cleanup; + if (!(qemuCaps = virQEMUCapsCacheLookup(cache, binary))) + goto cleanup; - arch_from_caps = virQEMUCapsGetArch(qemuCaps); + arch_from_caps = virQEMUCapsGetArch(qemuCaps); - if (arch_from_caps != arch && - !((ARCH_IS_X86(arch) && ARCH_IS_X86(arch_from_caps)) || - (ARCH_IS_PPC(arch) && ARCH_IS_PPC(arch_from_caps)) || - (ARCH_IS_ARM(arch) && ARCH_IS_ARM(arch_from_caps)) || - (ARCH_IS_S390(arch) && ARCH_IS_S390(arch_from_caps)))) { - virReportError(VIR_ERR_INVALID_ARG, - _("architecture from emulator '%s' doesn't " - "match given architecture '%s'"), - virArchToString(arch_from_caps), - virArchToString(arch)); - goto cleanup; - } - } else { - if (!(qemuCaps = virQEMUCapsCacheLookupByArch(cache, arch))) - goto cleanup; - - binary = virQEMUCapsGetBinary(qemuCaps); + if (arch_from_caps != arch && + !((ARCH_IS_X86(arch) && ARCH_IS_X86(arch_from_caps)) || + (ARCH_IS_PPC(arch) && ARCH_IS_PPC(arch_from_caps)) || + (ARCH_IS_ARM(arch) && ARCH_IS_ARM(arch_from_caps)) || + (ARCH_IS_S390(arch) && ARCH_IS_S390(arch_from_caps)))) { + virReportError(VIR_ERR_INVALID_ARG, + _("architecture from emulator '%s' doesn't " + "match given architecture '%s'"), + virArchToString(arch_from_caps), + virArchToString(arch)); + goto cleanup; } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) -- 2.23.0

3 3

[libvirt PATCH] src: conditionalize / remove use of sys/ioctl.h
by Daniel P. Berrangé 17 Jan '20

17 Jan '20

Remove many imports of sys/ioctl.h which are redundant, and conditionalize remaining usage that needs to compile on Windows platforms. The previous change to remove the "nonblocking" gnulib module indirectly caused the loss of the "ioctl" gnulib module that we did not explicitly list in bootstrap.conf despite relying on. Rather than re-introduce the "ioctl" module this patch makes it redundant. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virhostcpu.c | 4 +++- src/util/virhostdev.c | 1 - src/util/virhostmem.c | 1 - src/util/virnetdev.c | 4 +++- src/util/virnetdevbridge.c | 4 +++- src/util/virnetdevip.c | 4 +++- src/util/virnetdevtap.c | 4 +++- src/util/virperf.c | 4 +++- src/util/virvsock.c | 4 +++- 9 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index f9d5db59b9..0bde532a0c 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -24,7 +24,9 @@ #include <dirent.h> #include <sys/utsname.h> #include <fcntl.h> -#include <sys/ioctl.h> +#ifndef WIN32 +# include <sys/ioctl.h> +#endif #include <unistd.h> #if HAVE_LINUX_KVM_H diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 9b4ea30216..f8f7989206 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -22,7 +22,6 @@ #include <config.h> #include <fcntl.h> -#include <sys/ioctl.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 9c08b9bd78..f37d1ad588 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -23,7 +23,6 @@ #include <sys/utsname.h> #include <fcntl.h> -#include <sys/ioctl.h> #include <unistd.h> #if defined(__FreeBSD__) || defined(__APPLE__) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e2aad07c24..b896a7507e 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -31,7 +31,9 @@ #include "virutil.h" #include "virjson.h" -#include <sys/ioctl.h> +#ifndef WIN32 +# include <sys/ioctl.h> +#endif #include <net/if.h> #include <fcntl.h> diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index a37bcb4004..5bb533f1f0 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -27,7 +27,9 @@ #include "virlog.h" #include "virstring.h" -#include <sys/ioctl.h> +#ifndef WIN32 +# include <sys/ioctl.h> +#endif #include <sys/socket.h> #include <net/if.h> #include <netinet/in.h> diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 5696bc367e..5897c4aa76 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -33,7 +33,9 @@ # include <ifaddrs.h> #endif -#include <sys/ioctl.h> +#ifndef WIN32 +# include <sys/ioctl.h> +#endif #include <net/if.h> #include <fcntl.h> diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 6a16b58d60..8656e267cb 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -33,7 +33,9 @@ #include <unistd.h> #include <sys/types.h> -#include <sys/ioctl.h> +#ifndef WIN32 +# include <sys/ioctl.h> +#endif #include <net/if.h> #include <fcntl.h> #ifdef __linux__ diff --git a/src/util/virperf.c b/src/util/virperf.c index 29c388a1f2..04d27309e1 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -17,7 +17,9 @@ */ #include <config.h> -#include <sys/ioctl.h> +#ifndef WIN32 +# include <sys/ioctl.h> +#endif #if defined HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif diff --git a/src/util/virvsock.c b/src/util/virvsock.c index b28287fdee..2638c5095a 100644 --- a/src/util/virvsock.c +++ b/src/util/virvsock.c @@ -17,7 +17,9 @@ #include <config.h> -#include <sys/ioctl.h> +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif #if HAVE_DECL_VHOST_VSOCK_SET_GUEST_CID # include <linux/vhost.h> -- 2.24.1

2 1

[libvirt PATCH] bhyve: fix typos checking CPU dies
by Daniel P. Berrangé 17 Jan '20

17 Jan '20

This fixes a build bug introduced by commit fbf27730a36da573b1065c179f4d96b9a751f22f Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Mon Dec 16 11:16:51 2019 +0000 conf: add support for specifying CPU "dies" parameter Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix for FreeBSD src/bhyve/bhyve_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index d78221aea8..a8bfc0aa72 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -453,10 +453,10 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, /* CPUs */ virCommandAddArg(cmd, "-c"); if (def->cpu && def->cpu->sockets) { - if (def->dies != 1) { + if (def->cpu->dies != 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only 1 die per socket is supported")); - goto cleanup; + goto error; } if (nvcpus != def->cpu->sockets * def->cpu->cores * def->cpu->threads) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", -- 2.23.0

1 0

[libvirt PATCH v2 00/13] even less gnulib: 25 more modules purged, leaving 25 to go
by Daniel P. Berrangé 17 Jan '20

17 Jan '20

A continued effort to purge gnulib from the libvirt build system. The bulk of the win comes from implementing our own Winsock portability wrappers. The use of GSocket turned out to have many complications, making it hard for us to achieve the same level of functionality as we currently have. Thus we take a simpler wrapping approach that GNULIB does for Winsock too. Changed in v2: - Don't import intprops.h, use replacement macros instead - Various fixes to windows socket portability patch and actually verify virsh works - Simplify some ifdef checks to use WIN32 instead of a more complex conditional Daniel P. Berrangé (13): src: replace use of INT_BUFSIZE_BOUND macros src: remove use of the INT_MULTIPLY_OVERFLOW macro tests: always declare environ build: validate headers against local gnulib not git repo util: add detection of openpty function util: introduce compat wrappers for Winsock2 src: convert code to use new socket portability wrappers util: pull gnulib physmem impl into local code util: replace atomic ops impls with g_atomic_int* src: replace verify(expr) with G_STATIC_ASSERT(expr) src: conditionally exclude cfmakeraw/termios.h on WIN32 src: replace gmtime_r/localtime_r/strftime with GDateTime bootstrap: remove 25 more gnulib modules bootstrap.conf | 50 --- build-aux/syntax-check.mk | 29 +- configure.ac | 5 +- examples/c/misc/event-test.c | 12 +- m4/virt-manywarnings.m4 | 339 ++++++++++++++++++++ m4/virt-warnings.m4 | 115 +++++++ src/conf/capabilities.c | 1 - src/conf/domain_conf.c | 11 +- src/conf/snapshot_conf.h | 2 +- src/conf/virdomaincheckpointobjlist.c | 8 +- src/esx/esx_network_driver.c | 2 +- src/esx/esx_storage_backend_iscsi.c | 2 +- src/esx/esx_storage_backend_vmfs.c | 2 +- src/hyperv/hyperv_driver.c | 3 +- src/internal.h | 3 +- src/libvirt-domain.c | 6 +- src/libxl/libxl_domain.c | 12 +- src/libxl/libxl_driver.c | 2 +- src/libxl/xen_xm.c | 3 +- src/lxc/lxc_process.c | 4 +- src/nwfilter/nwfilter_dhcpsnoop.c | 10 +- src/nwfilter/nwfilter_ebiptables_driver.c | 35 +- src/nwfilter/nwfilter_learnipaddr.c | 14 +- src/qemu/qemu_blockjob.h | 4 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 17 +- src/qemu/qemu_driver.c | 12 +- src/qemu/qemu_firmware.h | 2 +- src/qemu/qemu_migration_params.c | 2 +- src/qemu/qemu_process.c | 4 +- src/remote/remote_daemon_dispatch.c | 15 +- src/remote/remote_driver.c | 5 +- src/rpc/virnetsocket.c | 34 +- src/util/Makefile.inc.am | 3 + src/util/virarch.c | 3 +- src/util/viratomic.h | 351 +------------------- src/util/vircgroup.h | 2 +- src/util/vircrypto.c | 2 +- src/util/virenum.h | 8 +- src/util/virfdstream.c | 10 +- src/util/virfile.c | 25 +- src/util/virhostcpu.c | 4 +- src/util/virhostmem.c | 182 +++++++++-- src/util/virinitctl.c | 4 +- src/util/virkeycode.c | 22 +- src/util/virlog.c | 3 +- src/util/virmacaddr.h | 2 +- src/util/virnetdevbridge.c | 10 +- src/util/virobject.h | 8 +- src/util/virperf.c | 2 +- src/util/virpidfile.c | 7 +- src/util/virportallocator.c | 8 +- src/util/virprocess.c | 2 +- src/util/virsocket.c | 369 ++++++++++++++++++++++ src/util/virsocket.h | 92 ++++++ src/util/virstoragefile.c | 4 +- src/util/virstring.h | 2 + src/util/virtime.c | 35 +- src/util/virtypedparam.h | 2 +- src/util/virutil.c | 33 +- src/vz/vz_driver.c | 2 +- tests/commandhelper.c | 3 + tests/commandtest.c | 3 + tests/qemuxml2argvmock.c | 12 +- tests/viratomictest.c | 2 +- tests/virstringtest.c | 7 +- tests/virsystemdtest.c | 5 +- tests/virtimetest.c | 39 ++- tools/virsh-checkpoint.c | 20 +- tools/virsh-domain-monitor.c | 17 +- tools/virsh-domain.c | 15 +- tools/virsh-network.c | 13 +- tools/virsh-nodedev.c | 2 +- tools/virsh-pool.c | 2 +- tools/virsh-secret.c | 2 +- tools/virsh-snapshot.c | 19 +- tools/virsh.h | 1 - tools/virt-admin.c | 55 +--- tools/virt-host-validate-common.c | 4 +- tools/virt-login-shell.c | 7 +- tools/vsh.c | 31 +- tools/vsh.h | 4 +- 82 files changed, 1400 insertions(+), 827 deletions(-) create mode 100644 m4/virt-manywarnings.m4 create mode 100644 m4/virt-warnings.m4 create mode 100644 src/util/virsocket.c create mode 100644 src/util/virsocket.h -- 2.24.1

2 20

Re: [libvirt] [PATCH] Don't check if the path exists for LVM
by ebennerit＠gmail.com 17 Jan '20

17 Jan '20

From: Eric Benner <ebenner(a)vultr.com> Sorry I attempted to use a mail client since SMTP wasn't working for me at the time. I cleaned up the commit, I believe this is how it needed to be. Signed-off-by: Eric Benner <ebenner(a)vultr.com> --- src/storage/storage_backend_logical.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 42dec05ba0..2c60719b8c 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -641,11 +641,9 @@ virStorageBackendLogicalCheckPool(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - /* If we can find the target.path as well as ensure that the - * pool's def source - */ - *isActive = virFileExists(def->target.path) && - virStorageBackendLogicalMatchPoolSource(pool); + /* Ensure that the pool's def source is correct */ + *isActive = virStorageBackendLogicalMatchPoolSource(pool); + return 0; } -- 2.24.1

1 0

[libvirt] [PATCH v2 0/8] Don't hold both monitor and agent jobs at the same time
by Jonathon Jongsma 16 Jan '20

16 Jan '20

We have to assume that the guest agent may be malicious, so we don't want to allow any agent queries to block any other libvirt API. By holding a monitor job and an agent job while we're querying the agent, any other threads will be blocked from using the monitor while the agent is unresponsive. Because libvirt waits forever for an agent response, this makes us vulnerable to a denial of service from a malicious (or simply buggy) guest agent. Most of the patches in the first series were already reviewed and pushed, but a couple remain: the filesystem info functions. The problem with these functions is that the agent functions access the vm definition (owned by the domain). If a monitor job is not held while this is done, the vm definition could change while we are looking up the disk alias, leading to a potentional crash. This series tries to fix this by moving the disk alias searching up a level from qemu_agent.c to qemu_driver.c. The code in qemu_agent.c will only return the raw data returned from the agent command response. After the agent response is returned and the agent job is ended, we can then look up the disk alias from the vm definition while the domain object is locked. In addition, a few nearby cleanups are included in this series, notably changing to glib allocation API in a couple of places. Jonathon Jongsma (8): qemu: rename qemuAgentGetFSInfoInternalDisk() qemu: store complete agent filesystem information qemu: Don't store disk alias in qemuAgentDiskInfo qemu: don't access vmdef within qemu_agent.c qemu: remove qemuDomainObjBegin/EndJobWithAgent() qemu: use glib alloc in qemuAgentGetFSInfoFillDisks() qemu: use glib allocation apis for qemuAgentFSInfo Use glib alloc API for virDomainFSInfo src/libvirt-domain.c | 12 +- src/qemu/THREADS.txt | 58 +----- src/qemu/qemu_agent.c | 268 ++++------------------------ src/qemu/qemu_agent.h | 33 +++- src/qemu/qemu_domain.c | 56 +----- src/qemu/qemu_domain.h | 7 - src/qemu/qemu_driver.c | 246 +++++++++++++++++++++++-- src/remote/remote_daemon_dispatch.c | 2 +- tests/qemuagenttest.c | 196 ++++---------------- 9 files changed, 336 insertions(+), 542 deletions(-) -- 2.21.0

3 12

[libvirt] [PATCH v2 82/86] numa: forbid '-numa node, mem' for 5.0 and newer machine types
by Igor Mammedov 16 Jan '20

16 Jan '20

Deprecation period is ran out and it's a time to flip the switch introduced by cd5ff8333a. Disable legacy option for new machine types and amend documentation. Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- CC: peter.maydell(a)linaro.org CC: ehabkost(a)redhat.com CC: marcel.apfelbaum(a)gmail.com CC: mst(a)redhat.com CC: pbonzini(a)redhat.com CC: rth(a)twiddle.net CC: david(a)gibson.dropbear.id.au CC: libvir-list(a)redhat.com CC: qemu-arm(a)nongnu.org CC: qemu-ppc(a)nongnu.org --- hw/arm/virt.c | 2 +- hw/core/numa.c | 6 ++++++ hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + hw/ppc/spapr.c | 2 +- qemu-deprecated.texi | 16 ---------------- qemu-options.hx | 8 ++++---- 8 files changed, 14 insertions(+), 23 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index e2fbca3..49de0d8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2049,7 +2049,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) hc->pre_plug = virt_machine_device_pre_plug_cb; hc->plug = virt_machine_device_plug_cb; hc->unplug_request = virt_machine_device_unplug_request_cb; - mc->numa_mem_supported = true; mc->auto_enable_numa_with_memhp = true; mc->default_ram_id = "mach-virt.ram"; } @@ -2153,6 +2152,7 @@ DEFINE_VIRT_MACHINE_AS_LATEST(5, 0) static void virt_machine_4_2_options(MachineClass *mc) { compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); + mc->numa_mem_supported = true; } DEFINE_VIRT_MACHINE(4, 2) diff --git a/hw/core/numa.c b/hw/core/numa.c index 0970a30..3177066 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -117,6 +117,12 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, } if (node->has_mem) { + if (!mc->numa_mem_supported) { + error_setg(errp, "Parameter -numa node,mem is not supported by this" + " machine type. Use -numa node,memdev instead"); + return; + } + numa_info[nodenr].node_mem = node->mem; if (!qtest_enabled()) { warn_report("Parameter -numa node,mem is deprecated," diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 21b8290..fa8d024 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1947,7 +1947,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) hc->unplug = pc_machine_device_unplug_cb; mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE; mc->nvdimm_supported = true; - mc->numa_mem_supported = true; mc->default_ram_id = "pc.ram"; object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int", diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index fa12203..0a9b9e0 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -435,6 +435,7 @@ static void pc_i440fx_4_2_machine_options(MachineClass *m) pc_i440fx_5_0_machine_options(m); m->alias = NULL; m->is_default = 0; + m->numa_mem_supported = true; compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len); compat_props_add(m->compat_props, pc_compat_4_2, pc_compat_4_2_len); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 84cf925..4d6e2be 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -363,6 +363,7 @@ static void pc_q35_4_2_machine_options(MachineClass *m) { pc_q35_5_0_machine_options(m); m->alias = NULL; + m->numa_mem_supported = true; compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len); compat_props_add(m->compat_props, pc_compat_4_2, pc_compat_4_2_len); } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index bcbe1f1..2686b73 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4383,7 +4383,6 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) * in which LMBs are represented and hot-added */ mc->numa_mem_align_shift = 28; - mc->numa_mem_supported = true; mc->auto_enable_numa = true; smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_OFF; @@ -4465,6 +4464,7 @@ static void spapr_machine_4_2_class_options(MachineClass *mc) { spapr_machine_5_0_class_options(mc); compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); + mc->numa_mem_supported = true; } DEFINE_SPAPR_MACHINE(4_2, "4.2", false); diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 982af95..17a0e1d 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -89,22 +89,6 @@ error in the future. The @code{-realtime mlock=on|off} argument has been replaced by the @code{-overcommit mem-lock=on|off} argument. -@subsection -numa node,mem=@var{size} (since 4.1) - -The parameter @option{mem} of @option{-numa node} is used to assign a part of -guest RAM to a NUMA node. But when using it, it's impossible to manage specified -RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), -so guest end-ups with the fake NUMA configuration with suboptiomal performance. -However since 2014 there is an alternative way to assign RAM to a NUMA node -using parameter @option{memdev}, which does the same as @option{mem} and adds -means to actualy manage node RAM on the host side. Use parameter @option{memdev} -with @var{memory-backend-ram} backend as an replacement for parameter @option{mem} -to achieve the same fake NUMA effect or a properly configured -@var{memory-backend-file} backend to actually benefit from NUMA configuration. -In future new machine versions will not accept the option but it will still -work with old machine types. User can check QAPI schema to see if the legacy -option is supported by looking at MachineInfo::numa-mem-supported property. - @subsection -numa node (without memory specified) (since 4.1) Splitting RAM by default between NUMA nodes has the same issues as @option{mem} diff --git a/qemu-options.hx b/qemu-options.hx index 709162c..55500bd 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -223,10 +223,10 @@ For example: -numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1 @end example -@samp{mem} assigns a given RAM amount to a node. @samp{memdev} -assigns RAM from a given memory backend device to a node. If -@samp{mem} and @samp{memdev} are omitted in all nodes, RAM is -split equally between them. +Legacy @samp{mem} assigns a given RAM amount to a node (not supported for 5.0 +and newer machine types). @samp{memdev} assigns RAM from a given memory backend +device to a node. If @samp{mem} and @samp{memdev} are omitted in all nodes, RAM +is split equally between them. @samp{mem} and @samp{memdev} are mutually exclusive. Furthermore, if one node uses @samp{memdev}, all of them have to use it. -- 2.7.4

5 9

[PATCH] qemu: Don't emit SUSPENDED_POSTCOPY event on destination
by Jiri Denemark 16 Jan '20

16 Jan '20

When pause-before-switchover QEMU capability is enabled, we get STOP event before MIGRATION event with postcopy-active state. To properly handle post-copy migration and emit correct events commit v4.10.0-rc1-4-geca9d21e6c added a hack to qemuProcessHandleMigrationStatus which translates the paused state reason to VIR_DOMAIN_PAUSED_POSTCOPY and emits VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY event when migration state changes to post-copy. However, the code was effective on both sides of migration resulting in a confusing VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY event on the destination host, where entering post-copy mode is already properly advertised by VIR_DOMAIN_EVENT_RESUMED_POSTCOPY event. https://bugzilla.redhat.com/show_bug.cgi?id=1791458 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4195042194..a7bbab9e56 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1653,6 +1653,7 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjBroadcast(vm); if (status == QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY && + priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT && virDomainObjGetState(vm, &reason) == VIR_DOMAIN_PAUSED && reason == VIR_DOMAIN_PAUSED_MIGRATION) { VIR_DEBUG("Correcting paused state reason for domain %s to %s", -- 2.25.0

2 1

[libvirt] [PATCH] util: storagefile: Properly set transport type when parsing NBD strings
by Peter Krempa 16 Jan '20

16 Jan '20

When parsing legacy NBD backing file strings such as 'nbd:unix:/tmp/sock:exportname=/' we'd fail to set the transport to VIR_STORAGE_NET_HOST_TRANS_UNIX. This started to be a problem once we actually started to generate config of the backing store on the command line with -blockdev as the JSON code would try to format it as TCP and fail with: internal error: argument key 'host' must not have null value Set the type properly and add a test. This bug was found by the libguestfs test suite in: https://bugzilla.redhat.com/show_bug.cgi?id=1791614 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virstoragefile.c | 2 +- tests/virstoragetest.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 1397f532fd..7a2af0ad94 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2964,7 +2964,7 @@ virStorageSourceParseNBDColonString(const char *nbdstr, } src->hosts->socket = g_strdup(backing[2]); - + src->hosts->transport = VIR_STORAGE_NET_HOST_TRANS_UNIX; } else { src->hosts->name = g_strdup(backing[1]); diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 2862758752..370e19252b 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -1258,6 +1258,10 @@ mymain(void) "<source protocol='nbd' name=':test'>\n" " <host name='example.org' port='6000'/>\n" "</source>\n"); + TEST_BACKING_PARSE("nbd:unix:/tmp/sock:exportname=/", + "<source protocol='nbd' name='/'>\n" + " <host transport='unix' socket='/tmp/sock'/>\n" + "</source>\n"); TEST_BACKING_PARSE("nbd://example.org:1234", "<source protocol='nbd'>\n" " <host name='example.org' port='1234'/>\n" -- 2.24.1

3 4

[libvirt] [PATCH 0/4] virchrdev: Couple of cleanups
by Michal Privoznik 16 Jan '20

16 Jan '20

Patches 1/4 and 2/4 fix some memleaks, the rest cleans up the code a bit. Michal Prívozník (4): virchrdev: Don't leak @dev member of virChrdevHashEntry struct virchrdev: Don't leak mutex if virChrdevAlloc() fails virchrdev: Use more g_autofree and VIR_AUTOCLOSE virchrdev: Drop needless 'cleanup' label in virChrdevLockFileCreate() src/conf/virchrdev.c | 48 ++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) -- 2.24.1

2 9

[PATCH] tests: virstorage: Add tests for NBD URI style syntax over UNIX
by Peter Krempa 16 Jan '20

16 Jan '20

Add few test cases for nbd+unix style URIs with few corner cases.t Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/virstoragetest.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 370e19252b..4341c04b1e 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -1274,6 +1274,26 @@ mymain(void) "<source protocol='nbd' name='exportname'>\n" " <host name='example.org' port='1234'/>\n" "</source>\n"); + TEST_BACKING_PARSE("nbd+unix://?socket=/tmp/sock", + "<source protocol='nbd'>\n" + " <host transport='unix' socket='/tmp/sock'/>\n" + "</source>\n"); + TEST_BACKING_PARSE("nbd+unix:///?socket=/tmp/sock", + "<source protocol='nbd'>\n" + " <host transport='unix' socket='/tmp/sock'/>\n" + "</source>\n"); + TEST_BACKING_PARSE("nbd+unix:////?socket=/tmp/sock", + "<source protocol='nbd' name='/'>\n" + " <host transport='unix' socket='/tmp/sock'/>\n" + "</source>\n"); + TEST_BACKING_PARSE("nbd+unix:///exp?socket=/tmp/sock", + "<source protocol='nbd' name='exp'>\n" + " <host transport='unix' socket='/tmp/sock'/>\n" + "</source>\n"); + TEST_BACKING_PARSE("nbd+unix:////exp?socket=/tmp/sock", + "<source protocol='nbd' name='/exp'>\n" + " <host transport='unix' socket='/tmp/sock'/>\n" + "</source>\n"); TEST_BACKING_PARSE_FULL("iscsi://testuser:testpass@example.org:1234/exportname", "<source protocol='iscsi' name='exportname'>\n" " <host name='example.org' port='1234'/>\n" -- 2.24.1

3 2

[libvirt PATCH] gitpublish: add a subject prefix
by Daniel P. Berrangé 16 Jan '20

16 Jan '20

Now that we removed the subject prefix tag from the mailman config we should set 'libvirt' as the subject when sending patches. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitpublish | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitpublish b/.gitpublish index 857f0d552c..d37bf4174a 100644 --- a/.gitpublish +++ b/.gitpublish @@ -1,3 +1,4 @@ [gitpublishprofile "default"] base = master to = libvir-list(a)redhat.com +prefix = libvirt PATCH -- 2.23.0

2 2

[libvirt] [PATCH] esx: remove compatibility for old libcurl
by Daniel P. Berrangé 16 Jan '20

16 Jan '20

RHEL7 has libcurl 7.29.0, which is the oldest of any supported build platform. Thus we no longer need the back compat for libcurl < 7.28.0. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/esx/esx_vi.c | 151 ----------------------------------------------- src/esx/esx_vi.h | 9 --- 2 files changed, 160 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 4e67d76bfe..421905c693 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -22,7 +22,6 @@ #include <config.h> -#include <poll.h> #include <libxml/parser.h> #include <libxml/xpathInternals.h> @@ -641,67 +640,6 @@ esxVI_SharedCURL_Remove(esxVI_SharedCURL *shared, esxVI_CURL *curl) * MultiCURL */ -#if ESX_EMULATE_CURL_MULTI_WAIT - -static int -esxVI_MultiCURL_SocketCallback(CURL *handle G_GNUC_UNUSED, - curl_socket_t fd, int action, - void *callback_opaque, - void *socket_opaque G_GNUC_UNUSED) -{ - esxVI_MultiCURL *multi = callback_opaque; - size_t i; - struct pollfd *pollfd = NULL; - struct pollfd dummy; - - if (action & CURL_POLL_REMOVE) { - for (i = 0; i < multi->npollfds; ++i) { - if (multi->pollfds[i].fd == fd) { - VIR_DELETE_ELEMENT(multi->pollfds, i, multi->npollfds); - break; - } - } - } else { - for (i = 0; i < multi->npollfds; ++i) { - if (multi->pollfds[i].fd == fd) { - pollfd = &multi->pollfds[i]; - break; - } - } - - if (pollfd == NULL) { - if (VIR_APPEND_ELEMENT(multi->pollfds, multi->npollfds, dummy) < 0) - return 0; /* curl_multi_socket() doc says "The callback MUST return 0." */ - - pollfd = &multi->pollfds[multi->npollfds - 1]; - } - - pollfd->fd = fd; - pollfd->events = 0; - - if (action & CURL_POLL_IN) - pollfd->events |= POLLIN; - - if (action & CURL_POLL_OUT) - pollfd->events |= POLLOUT; - } - - return 0; -} - -static int -esxVI_MultiCURL_TimerCallback(CURLM *handle G_GNUC_UNUSED, - long timeout_ms G_GNUC_UNUSED, - void *callback_opaque) -{ - esxVI_MultiCURL *multi = callback_opaque; - - multi->timeoutPending = true; - - return 0; -} - -#endif /* esxVI_MultiCURL_Alloc */ ESX_VI__TEMPLATE__ALLOC(MultiCURL) @@ -717,10 +655,6 @@ ESX_VI__TEMPLATE__FREE(MultiCURL, if (item->handle) curl_multi_cleanup(item->handle); - -#if ESX_EMULATE_CURL_MULTI_WAIT - VIR_FREE(item->pollfds); -#endif }) int @@ -747,14 +681,6 @@ esxVI_MultiCURL_Add(esxVI_MultiCURL *multi, esxVI_CURL *curl) return -1; } -#if ESX_EMULATE_CURL_MULTI_WAIT - curl_multi_setopt(multi->handle, CURLMOPT_SOCKETFUNCTION, - esxVI_MultiCURL_SocketCallback); - curl_multi_setopt(multi->handle, CURLMOPT_SOCKETDATA, multi); - curl_multi_setopt(multi->handle, CURLMOPT_TIMERFUNCTION, - esxVI_MultiCURL_TimerCallback); - curl_multi_setopt(multi->handle, CURLMOPT_TIMERDATA, multi); -#endif } virMutexLock(&curl->lock); @@ -803,81 +729,6 @@ esxVI_MultiCURL_Remove(esxVI_MultiCURL *multi, esxVI_CURL *curl) return 0; } -#if ESX_EMULATE_CURL_MULTI_WAIT - -int -esxVI_MultiCURL_Wait(esxVI_MultiCURL *multi, int *runningHandles) -{ - long timeout = -1; - CURLMcode errorCode; - int rc; - size_t i; - int action; - - if (multi->timeoutPending) { - do { - errorCode = curl_multi_socket_action(multi->handle, CURL_SOCKET_TIMEOUT, - 0, runningHandles); - } while (errorCode == CURLM_CALL_MULTI_SOCKET); - - if (errorCode != CURLM_OK) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not trigger socket action: %s (%d)"), - curl_multi_strerror(errorCode), errorCode); - return -1; - } - - multi->timeoutPending = false; - } - - if (multi->npollfds == 0) - return 0; - - curl_multi_timeout(multi->handle, &timeout); - - if (timeout < 0) - timeout = 1000; /* default to 1 sec timeout */ - - do { - rc = poll(multi->pollfds, multi->npollfds, timeout); - } while (rc < 0 && (errno == EAGAIN || errno == EINTR)); - - if (rc < 0) { - virReportSystemError(errno, "%s", _("Could not wait for transfer")); - return -1; - } - - for (i = 0; i < multi->npollfds && rc > 0; ++i) { - if (multi->pollfds[i].revents == 0) - continue; - - --rc; - action = 0; - - if (multi->pollfds[i].revents & POLLIN) - action |= CURL_POLL_IN; - - if (multi->pollfds[i].revents & POLLOUT) - action |= CURL_POLL_OUT; - - do { - errorCode = curl_multi_socket_action(multi->handle, - multi->pollfds[i].fd, action, - runningHandles); - } while (errorCode == CURLM_CALL_MULTI_SOCKET); - - if (errorCode != CURLM_OK) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not trigger socket action: %s (%d)"), - curl_multi_strerror(errorCode), errorCode); - return -1; - } - } - - return 0; -} - -#else int esxVI_MultiCURL_Wait(esxVI_MultiCURL *multi, int *runningHandles) @@ -902,8 +753,6 @@ esxVI_MultiCURL_Wait(esxVI_MultiCURL *multi, int *runningHandles) return esxVI_MultiCURL_Perform(multi, runningHandles); } -#endif - int esxVI_MultiCURL_Perform(esxVI_MultiCURL *multi, int *runningHandles) { diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index bff2782ba1..5c60fd58f4 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -32,10 +32,6 @@ #include "esx_vi_types.h" #include "esx_util.h" -/* curl_multi_wait was added in libcurl 7.28.0, emulate it on older versions */ -#define ESX_EMULATE_CURL_MULTI_WAIT (LIBCURL_VERSION_NUM < 0x071C00) - - #define ESX_VI__SOAP__REQUEST_HEADER \ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \ @@ -159,11 +155,6 @@ int esxVI_SharedCURL_Remove(esxVI_SharedCURL *shared, esxVI_CURL *curl); struct _esxVI_MultiCURL { CURLM *handle; size_t count; /* number of added easy handle */ -#if ESX_EMULATE_CURL_MULTI_WAIT - struct pollfd *pollfds; - size_t npollfds; - bool timeoutPending; -#endif }; int esxVI_MultiCURL_Alloc(esxVI_MultiCURL **multi); -- 2.24.1

2 1

[libvirt] [PATCH v2 00/12] include result of bootstrap in git
by Pavel Hrdina 16 Jan '20

16 Jan '20

This patch series is motivated by the effort to adopt Meson as our build system but all of it improves the current build system on its own. It moves the burden to run bootstrap/autoreconf to developers which means it will save some time for others when there is any change to the build system. Since one of the patches is slightly bigger here is link to git: <https://gitlab.com/phrdina/libvirt.git> branch <configure> Changes in v2: - some patches removed Pavel Hrdina (12): secret: move virSecretGetSecretString into virsecret configure.ac: add check for getegid function bootstrap.conf: drop gnulib tests from libvirt bootstrap.conf: always copy files bootstrap.conf: declare bootstrap sync in configuration file bootstrap.conf: disable VC ignore files bootstrap.conf: stop creating AUTHORS file syntax-check: remove deleted daemon directory from space_indent_check autogen.sh: fix autoreconf step gnulib: store result of bootstrap in git autogen.sh: remove --dry-run option autogen.sh: remove --no-git and --gnulib-srcdir options .git-module-status | 2 + .gitignore | 18 - INSTALL | 368 + Makefile.am | 2 +- Makefile.in | 2193 + aclocal.m4 | 1717 + autogen.sh | 82 +- bootstrap.conf | 27 +- build-aux/compile | 348 + build-aux/config.guess | 1667 + build-aux/config.sub | 1793 + build-aux/depcomp | 791 + build-aux/install-sh | 529 + build-aux/ltmain.sh | 11149 ++++ build-aux/missing | 215 + build-aux/syntax-check.mk | 23 +- build-aux/test-driver | 148 + config.h.in | 2288 + configure | 55547 +++++++++++++++++++ configure.ac | 2 +- docs/Makefile.in | 2484 + docs/compiling.html.in | 13 - examples/Makefile.in | 2364 + gnulib/lib/Makefile.in | 3705 ++ gnulib/lib/_Noreturn.h | 40 + gnulib/lib/accept.c | 52 + gnulib/lib/alloca.c | 478 + gnulib/lib/alloca.in.h | 71 + gnulib/lib/arg-nonnull.h | 26 + gnulib/lib/arpa_inet.in.h | 150 + gnulib/lib/asnprintf.c | 34 + gnulib/lib/assure.h | 37 + gnulib/lib/binary-io.c | 39 + gnulib/lib/binary-io.h | 77 + gnulib/lib/bind.c | 49 + gnulib/lib/c++defs.h | 316 + gnulib/lib/chown.c | 151 + gnulib/lib/cloexec.c | 83 + gnulib/lib/cloexec.h | 38 + gnulib/lib/close.c | 71 + gnulib/lib/connect.c | 56 + gnulib/lib/dup2.c | 235 + gnulib/lib/errno.in.h | 279 + gnulib/lib/fchown-stub.c | 16 + gnulib/lib/fcntl.c | 627 + gnulib/lib/fcntl.in.h | 392 + gnulib/lib/fd-hook.c | 116 + gnulib/lib/fd-hook.h | 119 + gnulib/lib/filename.h | 54 + gnulib/lib/float+.h | 147 + gnulib/lib/float.c | 33 + gnulib/lib/float.in.h | 188 + gnulib/lib/fseek.c | 30 + gnulib/lib/fseeko.c | 164 + gnulib/lib/fstat.c | 94 + gnulib/lib/gai_strerror.c | 92 + gnulib/lib/getaddrinfo.c | 473 + gnulib/lib/getdelim.c | 147 + gnulib/lib/getdtablesize.c | 124 + gnulib/lib/getgroups.c | 131 + gnulib/lib/gethostname.c | 104 + gnulib/lib/getline.c | 27 + gnulib/lib/getpass.c | 231 + gnulib/lib/getpass.h | 4 + gnulib/lib/getpeername.c | 49 + gnulib/lib/getsockname.c | 49 + gnulib/lib/gettext.h | 301 + gnulib/lib/getugroups.c | 128 + gnulib/lib/getugroups.h | 19 + gnulib/lib/glthread/threadlib.c | 73 + gnulib/lib/gnulib.mk | 2629 + gnulib/lib/inet_ntop.c | 260 + gnulib/lib/intprops.h | 584 + gnulib/lib/ioctl.c | 92 + gnulib/lib/itold.c | 28 + gnulib/lib/limits.in.h | 104 + gnulib/lib/listen.c | 49 + gnulib/lib/localcharset.c | 1159 + gnulib/lib/localcharset.h | 137 + gnulib/lib/locale.in.h | 305 + gnulib/lib/localeconv.c | 103 + gnulib/lib/lseek.c | 71 + gnulib/lib/malloc.c | 56 + gnulib/lib/malloca.c | 105 + gnulib/lib/malloca.h | 123 + gnulib/lib/memchr.c | 172 + gnulib/lib/memchr.valgrind | 30 + gnulib/lib/mgetgroups.c | 201 + gnulib/lib/mgetgroups.h | 22 + gnulib/lib/msvc-inval.c | 129 + gnulib/lib/msvc-inval.h | 222 + gnulib/lib/msvc-nothrow.c | 51 + gnulib/lib/msvc-nothrow.h | 43 + gnulib/lib/net_if.in.h | 53 + gnulib/lib/netdb.in.h | 293 + gnulib/lib/netinet_in.in.h | 47 + gnulib/lib/nonblocking.c | 159 + gnulib/lib/nonblocking.h | 62 + gnulib/lib/open.c | 203 + gnulib/lib/openpty.c | 136 + gnulib/lib/passfd.c | 205 + gnulib/lib/passfd.h | 32 + gnulib/lib/pathmax.h | 83 + gnulib/lib/physmem.c | 330 + gnulib/lib/physmem.h | 26 + gnulib/lib/pipe.c | 50 + gnulib/lib/pipe2.c | 167 + gnulib/lib/poll.c | 621 + gnulib/lib/poll.in.h | 125 + gnulib/lib/posix_openpt.c | 108 + gnulib/lib/printf-args.c | 183 + gnulib/lib/printf-args.h | 150 + gnulib/lib/printf-parse.c | 632 + gnulib/lib/printf-parse.h | 193 + gnulib/lib/pthread_sigmask.c | 92 + gnulib/lib/pty.in.h | 131 + gnulib/lib/raise.c | 83 + gnulib/lib/rawmemchr.c | 136 + gnulib/lib/rawmemchr.valgrind | 28 + gnulib/lib/realloc.c | 79 + gnulib/lib/recv.c | 49 + gnulib/lib/select.c | 583 + gnulib/lib/send.c | 49 + gnulib/lib/setsockopt.c | 65 + gnulib/lib/sig-handler.c | 3 + gnulib/lib/sig-handler.h | 51 + gnulib/lib/sigaction.c | 204 + gnulib/lib/signal.in.h | 475 + gnulib/lib/sigprocmask.c | 349 + gnulib/lib/size_max.h | 30 + gnulib/lib/snprintf.c | 71 + gnulib/lib/socket.c | 49 + gnulib/lib/sockets.c | 161 + gnulib/lib/sockets.h | 66 + gnulib/lib/stat-time.c | 3 + gnulib/lib/stat-time.h | 252 + gnulib/lib/stat-w32.c | 425 + gnulib/lib/stat-w32.h | 37 + gnulib/lib/stat.c | 433 + gnulib/lib/stdalign.in.h | 121 + gnulib/lib/stdbool.in.h | 132 + gnulib/lib/stddef.in.h | 121 + gnulib/lib/stdint.in.h | 746 + gnulib/lib/stdio-impl.h | 212 + gnulib/lib/stdio-read.c | 164 + gnulib/lib/stdio-write.c | 202 + gnulib/lib/stdio.in.h | 1444 + gnulib/lib/stdlib.in.h | 1112 + gnulib/lib/strchrnul.c | 142 + gnulib/lib/strchrnul.valgrind | 28 + gnulib/lib/strdup.c | 54 + gnulib/lib/streq.h | 176 + gnulib/lib/string.in.h | 1067 + gnulib/lib/strtok_r.c | 76 + gnulib/lib/sys_ioctl.in.h | 79 + gnulib/lib/sys_select.in.h | 319 + gnulib/lib/sys_socket.c | 4 + gnulib/lib/sys_socket.in.h | 721 + gnulib/lib/sys_stat.in.h | 823 + gnulib/lib/sys_time.in.h | 224 + gnulib/lib/sys_types.in.h | 106 + gnulib/lib/sys_uio.in.h | 63 + gnulib/lib/sys_utsname.in.h | 108 + gnulib/lib/sys_wait.in.h | 131 + gnulib/lib/termios.in.h | 73 + gnulib/lib/time.in.h | 364 + gnulib/lib/time_r.c | 44 + gnulib/lib/ttyname_r.c | 114 + gnulib/lib/uname.c | 268 + gnulib/lib/unistd.c | 4 + gnulib/lib/unistd.in.h | 1719 + gnulib/lib/unitypes.in.h | 46 + gnulib/lib/uniwidth.in.h | 72 + gnulib/lib/uniwidth/cjk.h | 37 + gnulib/lib/uniwidth/width.c | 468 + gnulib/lib/vasnprintf.c | 5615 ++ gnulib/lib/vasnprintf.h | 79 + gnulib/lib/verify.h | 301 + gnulib/lib/w32sock.h | 140 + gnulib/lib/waitpid.c | 30 + gnulib/lib/warn-on-use.h | 131 + gnulib/lib/wchar.in.h | 1144 + gnulib/lib/wctype-h.c | 4 + gnulib/lib/wctype.in.h | 679 + gnulib/lib/wcwidth.c | 73 + gnulib/lib/xalloc-oversized.h | 60 + gnulib/lib/xsize.c | 3 + gnulib/lib/xsize.h | 117 + gnulib/tests/Makefile.am | 32 - include/libvirt/Makefile.in | 1778 + m4/00gnulib.m4 | 46 + m4/absolute-header.m4 | 102 + m4/alloca.m4 | 128 + m4/arpa_inet_h.m4 | 59 + m4/asm-underscore.m4 | 72 + m4/chown.m4 | 216 + m4/close.m4 | 35 + m4/codeset.m4 | 24 + m4/configmake.m4 | 27 + m4/dup2.m4 | 117 + m4/eealloc.m4 | 31 + m4/environ.m4 | 45 + m4/errno_h.m4 | 133 + m4/exponentd.m4 | 116 + m4/extensions.m4 | 189 + m4/extern-inline.m4 | 114 + m4/fcntl-o.m4 | 139 + m4/fcntl.m4 | 126 + m4/fcntl_h.m4 | 52 + m4/float_h.m4 | 108 + m4/fseek.m4 | 15 + m4/fseeko.m4 | 77 + m4/fstat.m4 | 39 + m4/getaddrinfo.m4 | 239 + m4/getdelim.m4 | 98 + m4/getdtablesize.m4 | 60 + m4/getgroups.m4 | 109 + m4/gethostname.m4 | 107 + m4/getline.m4 | 109 + m4/getpass.m4 | 106 + m4/getugroups.m4 | 11 + m4/gnulib-cache.m4 | 162 + m4/gnulib-common.m4 | 459 + m4/gnulib-comp.m4 | 1070 + m4/gnulib-tool.m4 | 57 + m4/hostent.m4 | 49 + m4/include_next.m4 | 224 + m4/inet_ntop.m4 | 70 + m4/intmax_t.m4 | 59 + m4/inttypes_h.m4 | 29 + m4/ioctl.m4 | 44 + m4/largefile.m4 | 177 + m4/libtool.m4 | 8372 +++ m4/libunistring-base.m4 | 141 + m4/limits-h.m4 | 43 + m4/localcharset.m4 | 11 + m4/locale_h.m4 | 158 + m4/localeconv.m4 | 22 + m4/lseek.m4 | 71 + m4/ltoptions.m4 | 437 + m4/ltsugar.m4 | 124 + m4/ltversion.m4 | 23 + m4/lt~obsolete.m4 | 99 + m4/malloc.m4 | 104 + m4/malloca.m4 | 14 + m4/manywarnings-c++.m4 | 245 + m4/manywarnings.m4 | 339 + m4/math_h.m4 | 369 + m4/memchr.m4 | 112 + m4/mgetgroups.m4 | 10 + m4/mmap-anon.m4 | 55 + m4/mode_t.m4 | 26 + m4/msvc-inval.m4 | 19 + m4/msvc-nothrow.m4 | 10 + m4/multiarch.m4 | 62 + m4/net_if_h.m4 | 32 + m4/netdb_h.m4 | 44 + m4/netinet_in_h.m4 | 31 + m4/nonblocking.m4 | 29 + m4/off_t.m4 | 18 + m4/open-cloexec.m4 | 21 + m4/open-slash.m4 | 59 + m4/open.m4 | 56 + m4/passfd.m4 | 23 + m4/pathmax.m4 | 42 + m4/physmem.m4 | 46 + m4/pipe.m4 | 15 + m4/pipe2.m4 | 18 + m4/poll.m4 | 107 + m4/poll_h.m4 | 49 + m4/posix-shell.m4 | 63 + m4/posix_openpt.m4 | 19 + m4/printf.m4 | 1692 + m4/pthread_sigmask.m4 | 273 + m4/pty.m4 | 160 + m4/pty_h.m4 | 73 + m4/raise.m4 | 36 + m4/rawmemchr.m4 | 20 + m4/realloc.m4 | 82 + m4/select.m4 | 116 + m4/servent.m4 | 51 + m4/sigaction.m4 | 40 + m4/signal_h.m4 | 83 + m4/signalblocking.m4 | 25 + m4/sigpipe.m4 | 29 + m4/size_max.m4 | 75 + m4/snprintf.m4 | 62 + m4/socketlib.m4 | 90 + m4/sockets.m4 | 17 + m4/socklen.m4 | 76 + m4/sockpfaf.m4 | 84 + m4/ssize_t.m4 | 23 + m4/stat-time.m4 | 83 + m4/stat.m4 | 74 + m4/stdalign.m4 | 57 + m4/stdbool.m4 | 122 + m4/stddef_h.m4 | 72 + m4/stdint.m4 | 535 + m4/stdint_h.m4 | 27 + m4/stdio_h.m4 | 225 + m4/stdlib_h.m4 | 136 + m4/strchrnul.m4 | 50 + m4/strdup.m4 | 36 + m4/string_h.m4 | 122 + m4/strtok_r.m4 | 73 + m4/sys_ioctl_h.m4 | 64 + m4/sys_select_h.m4 | 95 + m4/sys_socket_h.m4 | 188 + m4/sys_stat_h.m4 | 100 + m4/sys_time_h.m4 | 110 + m4/sys_types_h.m4 | 60 + m4/sys_uio_h.m4 | 31 + m4/sys_utsname_h.m4 | 54 + m4/sys_wait_h.m4 | 36 + m4/termios_h.m4 | 43 + m4/threadlib.m4 | 586 + m4/time_h.m4 | 144 + m4/time_r.m4 | 99 + m4/ttyname_r.m4 | 133 + m4/uname.m4 | 19 + m4/unistd_h.m4 | 201 + m4/vasnprintf.m4 | 288 + m4/waitpid.m4 | 14 + m4/warn-on-use.m4 | 51 + m4/warnings.m4 | 115 + m4/wchar_h.m4 | 241 + m4/wchar_t.m4 | 24 + m4/wctype_h.m4 | 216 + m4/wcwidth.m4 | 131 + m4/wint_t.m4 | 74 + m4/xsize.m4 | 12 + po/Makefile.in | 1750 + po/POTFILES.in | 1 - src/Makefile.in | 15723 ++++++ src/libvirt_private.syms | 5 +- src/libxl/libxl_conf.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_process.c | 2 +- src/qemu/qemu_tpm.c | 2 +- src/secret/Makefile.inc.am | 11 - src/secret/secret_util.c | 102 - src/secret/secret_util.h | 33 - src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_iscsi_direct.c | 2 +- src/storage/storage_backend_rbd.c | 2 +- src/storage/storage_util.c | 2 +- src/util/virsecret.c | 69 + src/util/virsecret.h | 8 + tests/Makefile.in | 7432 +++ tools/Makefile.in | 3597 ++ 350 files changed, 182955 insertions(+), 323 deletions(-) create mode 100644 .git-module-status create mode 100644 INSTALL create mode 100644 Makefile.in create mode 100644 aclocal.m4 create mode 100755 build-aux/compile create mode 100755 build-aux/config.guess create mode 100755 build-aux/config.sub create mode 100755 build-aux/depcomp create mode 100755 build-aux/install-sh create mode 100644 build-aux/ltmain.sh create mode 100755 build-aux/missing create mode 100755 build-aux/test-driver create mode 100644 config.h.in create mode 100755 configure create mode 100644 docs/Makefile.in create mode 100644 examples/Makefile.in create mode 100644 gnulib/lib/Makefile.in create mode 100644 gnulib/lib/_Noreturn.h create mode 100644 gnulib/lib/accept.c create mode 100644 gnulib/lib/alloca.c create mode 100644 gnulib/lib/alloca.in.h create mode 100644 gnulib/lib/arg-nonnull.h create mode 100644 gnulib/lib/arpa_inet.in.h create mode 100644 gnulib/lib/asnprintf.c create mode 100644 gnulib/lib/assure.h create mode 100644 gnulib/lib/binary-io.c create mode 100644 gnulib/lib/binary-io.h create mode 100644 gnulib/lib/bind.c create mode 100644 gnulib/lib/c++defs.h create mode 100644 gnulib/lib/chown.c create mode 100644 gnulib/lib/cloexec.c create mode 100644 gnulib/lib/cloexec.h create mode 100644 gnulib/lib/close.c create mode 100644 gnulib/lib/connect.c create mode 100644 gnulib/lib/dup2.c create mode 100644 gnulib/lib/errno.in.h create mode 100644 gnulib/lib/fchown-stub.c create mode 100644 gnulib/lib/fcntl.c create mode 100644 gnulib/lib/fcntl.in.h create mode 100644 gnulib/lib/fd-hook.c create mode 100644 gnulib/lib/fd-hook.h create mode 100644 gnulib/lib/filename.h create mode 100644 gnulib/lib/float+.h create mode 100644 gnulib/lib/float.c create mode 100644 gnulib/lib/float.in.h create mode 100644 gnulib/lib/fseek.c create mode 100644 gnulib/lib/fseeko.c create mode 100644 gnulib/lib/fstat.c create mode 100644 gnulib/lib/gai_strerror.c create mode 100644 gnulib/lib/getaddrinfo.c create mode 100644 gnulib/lib/getdelim.c create mode 100644 gnulib/lib/getdtablesize.c create mode 100644 gnulib/lib/getgroups.c create mode 100644 gnulib/lib/gethostname.c create mode 100644 gnulib/lib/getline.c create mode 100644 gnulib/lib/getpass.c create mode 100644 gnulib/lib/getpass.h create mode 100644 gnulib/lib/getpeername.c create mode 100644 gnulib/lib/getsockname.c create mode 100644 gnulib/lib/gettext.h create mode 100644 gnulib/lib/getugroups.c create mode 100644 gnulib/lib/getugroups.h create mode 100644 gnulib/lib/glthread/threadlib.c create mode 100644 gnulib/lib/gnulib.mk create mode 100644 gnulib/lib/inet_ntop.c create mode 100644 gnulib/lib/intprops.h create mode 100644 gnulib/lib/ioctl.c create mode 100644 gnulib/lib/itold.c create mode 100644 gnulib/lib/limits.in.h create mode 100644 gnulib/lib/listen.c create mode 100644 gnulib/lib/localcharset.c create mode 100644 gnulib/lib/localcharset.h create mode 100644 gnulib/lib/locale.in.h create mode 100644 gnulib/lib/localeconv.c create mode 100644 gnulib/lib/lseek.c create mode 100644 gnulib/lib/malloc.c create mode 100644 gnulib/lib/malloca.c create mode 100644 gnulib/lib/malloca.h create mode 100644 gnulib/lib/memchr.c create mode 100644 gnulib/lib/memchr.valgrind create mode 100644 gnulib/lib/mgetgroups.c create mode 100644 gnulib/lib/mgetgroups.h create mode 100644 gnulib/lib/msvc-inval.c create mode 100644 gnulib/lib/msvc-inval.h create mode 100644 gnulib/lib/msvc-nothrow.c create mode 100644 gnulib/lib/msvc-nothrow.h create mode 100644 gnulib/lib/net_if.in.h create mode 100644 gnulib/lib/netdb.in.h create mode 100644 gnulib/lib/netinet_in.in.h create mode 100644 gnulib/lib/nonblocking.c create mode 100644 gnulib/lib/nonblocking.h create mode 100644 gnulib/lib/open.c create mode 100644 gnulib/lib/openpty.c create mode 100644 gnulib/lib/passfd.c create mode 100644 gnulib/lib/passfd.h create mode 100644 gnulib/lib/pathmax.h create mode 100644 gnulib/lib/physmem.c create mode 100644 gnulib/lib/physmem.h create mode 100644 gnulib/lib/pipe.c create mode 100644 gnulib/lib/pipe2.c create mode 100644 gnulib/lib/poll.c create mode 100644 gnulib/lib/poll.in.h create mode 100644 gnulib/lib/posix_openpt.c create mode 100644 gnulib/lib/printf-args.c create mode 100644 gnulib/lib/printf-args.h create mode 100644 gnulib/lib/printf-parse.c create mode 100644 gnulib/lib/printf-parse.h create mode 100644 gnulib/lib/pthread_sigmask.c create mode 100644 gnulib/lib/pty.in.h create mode 100644 gnulib/lib/raise.c create mode 100644 gnulib/lib/rawmemchr.c create mode 100644 gnulib/lib/rawmemchr.valgrind create mode 100644 gnulib/lib/realloc.c create mode 100644 gnulib/lib/recv.c create mode 100644 gnulib/lib/select.c create mode 100644 gnulib/lib/send.c create mode 100644 gnulib/lib/setsockopt.c create mode 100644 gnulib/lib/sig-handler.c create mode 100644 gnulib/lib/sig-handler.h create mode 100644 gnulib/lib/sigaction.c create mode 100644 gnulib/lib/signal.in.h create mode 100644 gnulib/lib/sigprocmask.c create mode 100644 gnulib/lib/size_max.h create mode 100644 gnulib/lib/snprintf.c create mode 100644 gnulib/lib/socket.c create mode 100644 gnulib/lib/sockets.c create mode 100644 gnulib/lib/sockets.h create mode 100644 gnulib/lib/stat-time.c create mode 100644 gnulib/lib/stat-time.h create mode 100644 gnulib/lib/stat-w32.c create mode 100644 gnulib/lib/stat-w32.h create mode 100644 gnulib/lib/stat.c create mode 100644 gnulib/lib/stdalign.in.h create mode 100644 gnulib/lib/stdbool.in.h create mode 100644 gnulib/lib/stddef.in.h create mode 100644 gnulib/lib/stdint.in.h create mode 100644 gnulib/lib/stdio-impl.h create mode 100644 gnulib/lib/stdio-read.c create mode 100644 gnulib/lib/stdio-write.c create mode 100644 gnulib/lib/stdio.in.h create mode 100644 gnulib/lib/stdlib.in.h create mode 100644 gnulib/lib/strchrnul.c create mode 100644 gnulib/lib/strchrnul.valgrind create mode 100644 gnulib/lib/strdup.c create mode 100644 gnulib/lib/streq.h create mode 100644 gnulib/lib/string.in.h create mode 100644 gnulib/lib/strtok_r.c create mode 100644 gnulib/lib/sys_ioctl.in.h create mode 100644 gnulib/lib/sys_select.in.h create mode 100644 gnulib/lib/sys_socket.c create mode 100644 gnulib/lib/sys_socket.in.h create mode 100644 gnulib/lib/sys_stat.in.h create mode 100644 gnulib/lib/sys_time.in.h create mode 100644 gnulib/lib/sys_types.in.h create mode 100644 gnulib/lib/sys_uio.in.h create mode 100644 gnulib/lib/sys_utsname.in.h create mode 100644 gnulib/lib/sys_wait.in.h create mode 100644 gnulib/lib/termios.in.h create mode 100644 gnulib/lib/time.in.h create mode 100644 gnulib/lib/time_r.c create mode 100644 gnulib/lib/ttyname_r.c create mode 100644 gnulib/lib/uname.c create mode 100644 gnulib/lib/unistd.c create mode 100644 gnulib/lib/unistd.in.h create mode 100644 gnulib/lib/unitypes.in.h create mode 100644 gnulib/lib/uniwidth.in.h create mode 100644 gnulib/lib/uniwidth/cjk.h create mode 100644 gnulib/lib/uniwidth/width.c create mode 100644 gnulib/lib/vasnprintf.c create mode 100644 gnulib/lib/vasnprintf.h create mode 100644 gnulib/lib/verify.h create mode 100644 gnulib/lib/w32sock.h create mode 100644 gnulib/lib/waitpid.c create mode 100644 gnulib/lib/warn-on-use.h create mode 100644 gnulib/lib/wchar.in.h create mode 100644 gnulib/lib/wctype-h.c create mode 100644 gnulib/lib/wctype.in.h create mode 100644 gnulib/lib/wcwidth.c create mode 100644 gnulib/lib/xalloc-oversized.h create mode 100644 gnulib/lib/xsize.c create mode 100644 gnulib/lib/xsize.h delete mode 100644 gnulib/tests/Makefile.am create mode 100644 include/libvirt/Makefile.in create mode 100644 m4/00gnulib.m4 create mode 100644 m4/absolute-header.m4 create mode 100644 m4/alloca.m4 create mode 100644 m4/arpa_inet_h.m4 create mode 100644 m4/asm-underscore.m4 create mode 100644 m4/chown.m4 create mode 100644 m4/close.m4 create mode 100644 m4/codeset.m4 create mode 100644 m4/configmake.m4 create mode 100644 m4/dup2.m4 create mode 100644 m4/eealloc.m4 create mode 100644 m4/environ.m4 create mode 100644 m4/errno_h.m4 create mode 100644 m4/exponentd.m4 create mode 100644 m4/extensions.m4 create mode 100644 m4/extern-inline.m4 create mode 100644 m4/fcntl-o.m4 create mode 100644 m4/fcntl.m4 create mode 100644 m4/fcntl_h.m4 create mode 100644 m4/float_h.m4 create mode 100644 m4/fseek.m4 create mode 100644 m4/fseeko.m4 create mode 100644 m4/fstat.m4 create mode 100644 m4/getaddrinfo.m4 create mode 100644 m4/getdelim.m4 create mode 100644 m4/getdtablesize.m4 create mode 100644 m4/getgroups.m4 create mode 100644 m4/gethostname.m4 create mode 100644 m4/getline.m4 create mode 100644 m4/getpass.m4 create mode 100644 m4/getugroups.m4 create mode 100644 m4/gnulib-cache.m4 create mode 100644 m4/gnulib-common.m4 create mode 100644 m4/gnulib-comp.m4 create mode 100644 m4/gnulib-tool.m4 create mode 100644 m4/hostent.m4 create mode 100644 m4/include_next.m4 create mode 100644 m4/inet_ntop.m4 create mode 100644 m4/intmax_t.m4 create mode 100644 m4/inttypes_h.m4 create mode 100644 m4/ioctl.m4 create mode 100644 m4/largefile.m4 create mode 100644 m4/libtool.m4 create mode 100644 m4/libunistring-base.m4 create mode 100644 m4/limits-h.m4 create mode 100644 m4/localcharset.m4 create mode 100644 m4/locale_h.m4 create mode 100644 m4/localeconv.m4 create mode 100644 m4/lseek.m4 create mode 100644 m4/ltoptions.m4 create mode 100644 m4/ltsugar.m4 create mode 100644 m4/ltversion.m4 create mode 100644 m4/lt~obsolete.m4 create mode 100644 m4/malloc.m4 create mode 100644 m4/malloca.m4 create mode 100644 m4/manywarnings-c++.m4 create mode 100644 m4/manywarnings.m4 create mode 100644 m4/math_h.m4 create mode 100644 m4/memchr.m4 create mode 100644 m4/mgetgroups.m4 create mode 100644 m4/mmap-anon.m4 create mode 100644 m4/mode_t.m4 create mode 100644 m4/msvc-inval.m4 create mode 100644 m4/msvc-nothrow.m4 create mode 100644 m4/multiarch.m4 create mode 100644 m4/net_if_h.m4 create mode 100644 m4/netdb_h.m4 create mode 100644 m4/netinet_in_h.m4 create mode 100644 m4/nonblocking.m4 create mode 100644 m4/off_t.m4 create mode 100644 m4/open-cloexec.m4 create mode 100644 m4/open-slash.m4 create mode 100644 m4/open.m4 create mode 100644 m4/passfd.m4 create mode 100644 m4/pathmax.m4 create mode 100644 m4/physmem.m4 create mode 100644 m4/pipe.m4 create mode 100644 m4/pipe2.m4 create mode 100644 m4/poll.m4 create mode 100644 m4/poll_h.m4 create mode 100644 m4/posix-shell.m4 create mode 100644 m4/posix_openpt.m4 create mode 100644 m4/printf.m4 create mode 100644 m4/pthread_sigmask.m4 create mode 100644 m4/pty.m4 create mode 100644 m4/pty_h.m4 create mode 100644 m4/raise.m4 create mode 100644 m4/rawmemchr.m4 create mode 100644 m4/realloc.m4 create mode 100644 m4/select.m4 create mode 100644 m4/servent.m4 create mode 100644 m4/sigaction.m4 create mode 100644 m4/signal_h.m4 create mode 100644 m4/signalblocking.m4 create mode 100644 m4/sigpipe.m4 create mode 100644 m4/size_max.m4 create mode 100644 m4/snprintf.m4 create mode 100644 m4/socketlib.m4 create mode 100644 m4/sockets.m4 create mode 100644 m4/socklen.m4 create mode 100644 m4/sockpfaf.m4 create mode 100644 m4/ssize_t.m4 create mode 100644 m4/stat-time.m4 create mode 100644 m4/stat.m4 create mode 100644 m4/stdalign.m4 create mode 100644 m4/stdbool.m4 create mode 100644 m4/stddef_h.m4 create mode 100644 m4/stdint.m4 create mode 100644 m4/stdint_h.m4 create mode 100644 m4/stdio_h.m4 create mode 100644 m4/stdlib_h.m4 create mode 100644 m4/strchrnul.m4 create mode 100644 m4/strdup.m4 create mode 100644 m4/string_h.m4 create mode 100644 m4/strtok_r.m4 create mode 100644 m4/sys_ioctl_h.m4 create mode 100644 m4/sys_select_h.m4 create mode 100644 m4/sys_socket_h.m4 create mode 100644 m4/sys_stat_h.m4 create mode 100644 m4/sys_time_h.m4 create mode 100644 m4/sys_types_h.m4 create mode 100644 m4/sys_uio_h.m4 create mode 100644 m4/sys_utsname_h.m4 create mode 100644 m4/sys_wait_h.m4 create mode 100644 m4/termios_h.m4 create mode 100644 m4/threadlib.m4 create mode 100644 m4/time_h.m4 create mode 100644 m4/time_r.m4 create mode 100644 m4/ttyname_r.m4 create mode 100644 m4/uname.m4 create mode 100644 m4/unistd_h.m4 create mode 100644 m4/vasnprintf.m4 create mode 100644 m4/waitpid.m4 create mode 100644 m4/warn-on-use.m4 create mode 100644 m4/warnings.m4 create mode 100644 m4/wchar_h.m4 create mode 100644 m4/wchar_t.m4 create mode 100644 m4/wctype_h.m4 create mode 100644 m4/wcwidth.m4 create mode 100644 m4/wint_t.m4 create mode 100644 m4/xsize.m4 create mode 100644 po/Makefile.in create mode 100644 src/Makefile.in delete mode 100644 src/secret/secret_util.c delete mode 100644 src/secret/secret_util.h create mode 100644 tests/Makefile.in create mode 100644 tools/Makefile.in -- 2.24.1

2 25

[libvirt] [PATCH v4 0/5] Introduce flags to virDomainGetHostname()
by Michal Privoznik 16 Jan '20

16 Jan '20

v4 of: https://www.redhat.com/archives/libvir-list/2019-December/msg01453.html diff to v3: - I've split Julio's one patch into 4 smaller ones, - I've fixed issues I've raised in v3, like new error code (patch 1/5 is completely new that's why I'm authoring it), fixed the completer and some memleaks. Julio Faracco (4): Introduce source flags to virDomainGetHostname() qemu: Implement virDomainGetHostnameFlags lxc: Implement virDomainGetHostnameFlags virsh: Expose virDomainGetHostnameFlags Michal Prívozník (1): virerror: Make it easier to add new error number docs/manpages/virsh.rst | 7 +- include/libvirt/libvirt-domain.h | 6 ++ include/libvirt/virterror.h | 1 + scripts/apibuild.py | 6 ++ src/libvirt-domain.c | 9 ++- src/lxc/lxc_driver.c | 79 +++++++++++++++++++ src/qemu/qemu_driver.c | 125 +++++++++++++++++++++++++++---- src/remote/remote_daemon.c | 1 + src/util/virerror.c | 7 +- tools/virsh-completer-domain.c | 19 +++++ tools/virsh-completer-domain.h | 4 + tools/virsh-domain.c | 37 ++++++++- tools/virsh-domain.h | 8 ++ 13 files changed, 286 insertions(+), 23 deletions(-) -- 2.24.1

2 14

[libvirt] [PATCH] gnulib: Pull in latest changes
by Andrea Bolognani 16 Jan '20

16 Jan '20

In particular, we're interested in the following commits: commit 43b5194d5b156f8dd7ae576952568d331978f5f0 Author: Bruno Haible <bruno(a)clisp.org> Date: Sun Jan 5 20:42:12 2020 +0100 tests: Avoid GCC over-optimization caused by _GL_ARG_NONNULL attributes. * lib/stdlib.in.h: Tweak last commit. commit b7d7afe10ddf599452bd80b8a840c830cd474b09 Author: Bruno Haible <bruno(a)clisp.org> Date: Sun Jan 5 09:13:25 2020 +0100 tests: Avoid GCC over-optimization caused by _GL_ARG_NONNULL attributes. Reported by Jim Meyering in <https://lists.gnu.org/archive/html/bug-gnulib/2020-01/msg00040.html>. * lib/stdlib.in.h (GNULIB_defined_canonicalize_file_name): New macro. (GNULIB_defined_ptsname_r): New macro. * tests/test-canonicalize.c (_GL_ARG_NONNULL): Define to empty. (main): Disable the NULL argument test if canonicalize_file_name does not come from gnulib. * tests/test-canonicalize-lgpl.c (_GL_ARG_NONNULL): Define to empty. (main): Disable the NULL argument test if canonicalize_file_name does not come from gnulib. * tests/test-ptsname_r.c (_GL_ARG_NONNULL): Define to empty. (test_errors): Disable the NULL argument test if ptsname_r does not come from gnulib. since they fix a build failure caused by the gnulib tests failing on ppc64le, as reported in https://www.redhat.com/archives/libvir-list/2020-January/msg00616.html Reported-by: Satheesh Rajendran <sathnaga(a)linux.vnet.ibm.com> Tracked-down-by: Bruno Haible <bruno(a)clisp.org> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Note that I have not actually had the time to confirm this fixes the problem, or to reproduce it in the first place (I'll do that tomorrow). Either way, it's waaaaay too late for this to make it into v6.0.0; I'm mostly posting this so that the reporter can have a go at testing it in the meantime. .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 7d06937892..611869be9f 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 7d069378921bfa0d7c7198ea177aac0a2440016f +Subproject commit 611869be9f1083e53305446d90a2909fc89914ef -- 2.24.1

2 2

[libvirt] [libvirt-tck PATCH] Support version compare
by dzheng＠redhat.com 16 Jan '20

16 Jan '20

From: Dan Zheng <dzheng(a)redhat.com> Some APIs are only supported from new version. This is to compare the current running version to the supporting version in order to decide if one test should be skipped. Signed-off-by: Dan Zheng <dzheng(a)redhat.com> --- lib/Sys/Virt/TCK.pm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index a641d01..98ea945 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -1229,6 +1229,21 @@ sub get_host_block_device { return $match ? $device : undef; } +sub compare_version { + my $self = shift; + my $to_version = shift; + + my $from_version = `rpm -q perl-Sys-Virt | cut -d'-' -f4`; + $from_version =~ s/\R//g; + print "Current version:$from_version compares to $to_version\n"; + $from_version =~ /(\d+).(\d+).(\d+)/; + $from_version = $1 * 1000000 + $2 * 1000 + $3; + + $to_version =~ /(\d+).(\d+).(\d+)/; + $to_version = $1 * 1000000 + $2 * 1000 + $3; + return ($from_version ge $to_version)? 1 : 0; +} + sub get_host_network_device { my $self = shift; my $devindex = @_ ? shift : 0; -- 2.18.1

1 0

[libvirt] FYI: intention to remove mail subject prefix & footer text
by Daniel P. Berrangé 15 Jan '20

15 Jan '20

Hi List Subscribers, In recent months we have been seeing an increasing number of bounced deliveries from libvirt mailing lists[1] due to DMARC policies on list subscriber's mail servers. IOW, many subscribers are only receiving a subset of mails sent to the libvirt mailing lists. We believe the root cause of many of the problems is that mailman is modifying the mail subject to add the "[libvirt]" / "[libvirt-users]" prefix, and modifying the mail body to add the footer with links to the listinfo page. These modifications invalidate the DKIM signatures on mails sent to the list by some of our subscribers. This in turn causes DMARC policy rejections by the destination SMTP servers when mailman delivers messages. The solution is to disable any feature in mailman which modifies parts of the mail validated by the DKIM signature. This means removing the subject prefix and the mail body header. Further information on this approach can be seen here: https://begriffs.com/posts/2018-09-18-dmarc-mailing-list.html QEMU has made the same change on their mailing list last year: https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg00416.html If you are currently doing mail filtering / sorting based on the subject prefix, you will need to change to use the List-Id header instead. I will wait until the latter part of next week before making this change to allow people time to adapt any filters. Regards, Daniel [1] technically moderators have only been seeing bounces for messages on libvirt-users-list, but that's because we've got mailman configured to send libvir-list bounces to /dev/null. -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 2

[libvirt] [PATCH 0/2] fix segfaults on qemuhotplugtest
by Christian Ehrhardt 15 Jan '20

15 Jan '20

After debugging for a while and eventually finding the root cause we discussed this on IRC today: <cpaelzer> danpb: BTW the test crash in 6.0 that I'm tracing (asked yesterday) is virHostdevManagerInitialize failing <cpaelzer> the test goes on with mgr set to 0x0 and that is the segfault later on <cpaelzer> virSetError was helpful as "Could not initialize HostdevManager operation failed: Failed to create state dir '/sbuild-nonexistent/.cache/libvirt/hostdevmgr'" sounds like a very testbed-specific issue that I might be able to solve when invoking the tests <danpb> hmm, seems like we're missing a mock for mkdir() <danpb> i guess we should mock virFileMakePath in this case This series got v6.0.0 building in Ubuntu, so I thought it is worth to submit it for review. Christian Ehrhardt (2): test: let qemuhotplugtest report details of init fails test: qemuhotplugtest mock virFileMakePath tests/qemuhotplugmock.c | 18 ++++++++++++++++++ tests/qemuhotplugtest.c | 5 +++++ 2 files changed, 23 insertions(+) -- 2.25.0

2 4

[libvirt] [PATCH] maint: Post-release version bump to 6.1.0
by Ján Tomko 15 Jan '20

15 Jan '20

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- configure.ac | 2 +- docs/news.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 002a3dcdb0..8837928358 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [6.0.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] +AC_INIT([libvirt], [6.1.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] if test $srcdir = "." then diff --git a/docs/news.xml b/docs/news.xml index 731f010297..056c7ef026 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -42,6 +42,14 @@ --> <libvirt> + <release version="v6.1.0" date="unreleased"> + <section title="New features"> + </section> + <section title="Improvements"> + </section> + <section title="Bug fixes"> + </section> + </release> <release version="v6.0.0" date="2020-01-15"> <section title="Packaging changes"> <change> -- 2.19.2

1 0

[libvirt] Release of libvirt-6.0.0
by Daniel Veillard 15 Jan '20

15 Jan '20

As planned the release is available, tagged in git, and the signed tarball and source rpm are available from the usual place: https://libvirt.org/sources/ I also made the release of the pythn bindings which can be found at: https://libvirt.org/sources/python/ This release carries some serious changes, dropping the support for python2 and the phyp Power Hypervisor. This comes with a set of new features and improvements too: Packaging changes: - support for python2 is removed Libvirt is no longer able to be built using the Python 2 binary. Python 3 must be used instead. - docs: the python docutils toolset is now required The use of rst2html has been introduced for the website build process since docs are now being written in the RST as an alternative to HTML. New features: - new PCI hostdev address type: unassigned A new PCI hostdev address type 'unassigned' is introduced. An unassigned PCI hostdev behaves like any regular PCI hostdev inside Libvirt, but it is not usable by the guest. This gives the user a new option to manage the binding of PCI devices via Libvirt, declaring PCI hostdevs in the domain XML but allowing just a subset of them to be assigned to the guest. - Provide init scripts for sub-deaemons So far libvirt shipped systemd unit files for sub-daemons. With this release, init scripts are available too. Package maintainers can choose which one to install via --with-init-script configure option. - qemu: Support cold-unplug of sound devices - qemu: Implement VIR_MIGRATE_PARAM_TLS_DESTINATION This flag, which can be enabled using virsh's --tls-destination option, allows migration to succeed in situations where there is a mismatch between the destination's hostname and the information stored in its TLS certificate. - qemu: Support reporting memory bandwidth usage stats Implement Intel RDT-MBM in libvirt. The stats can be obtained via virsh domstats --memory. - qemu: Allow accessing NVMe disks directly Before this release there were two ways to configure a NVMe disk for a domain. The first was using <disk/> with the <source/> pointing to the /dev/nvmeXXXX. The other was using PCI assignment via <hostdev/> element. Both have their disadvantages: the former adds latency of file system and block layers of the host kernel, the latter prohibits domain migration. In this release the third way of configuring NVMe disk is added which combines the advantages and drops disadvantages of the previous two ways. It's accessible via <disk type='nvme'/>. Removed features: - 'phyp' Power Hypervisor driver removed The 'phyp' Power Hypervisor driver has not seen active development since 2011 and does not seem to have any real world usage. It has now been removed. Improvements: - qemu: xz save image compression is faster When using the xz format to compressed virtual machine saved state images, the "-3" compression level preset is now used. This results in slightly larger files, but with a massively reduced time to compress. The xz format offers the best compression level for saved state images, albeit still with the slowest running time. For the fastest possible running time, at cost of the larest compressed size, lzop should be used. - domain: Improve job stat handling It is now possible to retrieve stats for completed and failed jobs. - qemu: Don't hold monitor and agent job at the same time Before this change, a malicious (or buggy) qemu-guest-agent running in the guest could make other libvirt APIs unavailable for an unbounded amount of time. Bug fixes: - qemu: Report error if backing image format is not specified explicitly For a long time libvirt was assuming that a backing file is RAW when the format was not specified. This didn't pose a problem until blockdev support was enabled in last release. Libvirt now requires that the format is specified in the image metadata or domain XML and the VM will refuse to start otherwise. Additionally the error message now links to the knowledge base which summarizes how to fix the images. - qemu: Fix non-shared storage migration over NBD - qemu: Generate a single MAC address for hotplugged network devices Since libvirt 4.6.0, when hotplugging a network device that didn't have a MAC address already assigned by the user, two separate addresses would be generated: one for the live configuration, which would show up immediately, and one for the inactive configuration, which would show up after the first reboot. This situation was clearly undesirable, so a single MAC address is now generated and used both for the live configuration and the inactive one. thanks everybody who helped on this release, with reports, fixes, reviews, ideas, documentation, etc ... Enjoy the release, next one will be scheduled at the end of February ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH v2 86/86] numa: remove deprecated implicit RAM distribution between nodes
by Igor Mammedov 15 Jan '20

15 Jan '20

Feature has been deprecated since 4.1 (4bb4a273), remove it. As result if RAM distribution wasn't specified explicitly, the machine won't start and CLI should be changed to explicitly assign RAM to nodes using options: -node node,memdev (5.0 and newer machine types) -node node,mem (4.2 and older machine types) It's recommended to use "memdev" variant for new virtual machines and use "mem" only when it's necessary to migrate already existing virtual machine started with implicit RAM distribution. Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- CC: ehabkost(a)redhat.com CC: marcel.apfelbaum(a)gmail.com CC: mst(a)redhat.com CC: pbonzini(a)redhat.com CC: david(a)gibson.dropbear.id.au CC: libvir-list(a)redhat.com CC: qemu-ppc(a)nongnu.org CC: rth(a)twiddle.net --- include/hw/boards.h | 3 --- include/sysemu/numa.h | 4 ---- hw/core/machine.c | 6 ----- hw/core/numa.c | 61 +++++---------------------------------------------- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - hw/ppc/spapr.c | 7 ------ qemu-deprecated.texi | 8 ------- qemu-options.hx | 16 +++++++------- 9 files changed, 13 insertions(+), 94 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 7f09bc9..916bb50 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -192,12 +192,9 @@ struct MachineClass { int minimum_page_bits; bool has_hotpluggable_cpus; bool ignore_memory_transaction_failures; - int numa_mem_align_shift; const char **valid_cpu_types; strList *allowed_dynamic_sysbus_devices; bool auto_enable_numa_with_memhp; - void (*numa_auto_assign_ram)(MachineClass *mc, NodeInfo *nodes, - int nb_nodes, ram_addr_t size); bool ignore_boot_device_suffixes; bool smbus_no_migration_support; bool nvdimm_supported; diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index ad58ee8..4173ef2 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -106,10 +106,6 @@ void parse_numa_hmat_cache(MachineState *ms, NumaHmatCacheOptions *node, void numa_complete_configuration(MachineState *ms); void query_numa_node_mem(NumaNodeMem node_mem[], MachineState *ms); extern QemuOptsList qemu_numa_opts; -void numa_legacy_auto_assign_ram(MachineClass *mc, NodeInfo *nodes, - int nb_nodes, ram_addr_t size); -void numa_default_auto_assign_ram(MachineClass *mc, NodeInfo *nodes, - int nb_nodes, ram_addr_t size); void numa_cpu_pre_plug(const struct CPUArchId *slot, DeviceState *dev, Error **errp); bool numa_uses_legacy_mem(void); diff --git a/hw/core/machine.c b/hw/core/machine.c index d8fa45c..0862f45 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -747,12 +747,6 @@ static void machine_class_init(ObjectClass *oc, void *data) mc->rom_file_has_mr = true; mc->smp_parse = smp_parse; - /* numa node memory size aligned on 8MB by default. - * On Linux, each node's border has to be 8MB aligned - */ - mc->numa_mem_align_shift = 23; - mc->numa_auto_assign_ram = numa_default_auto_assign_ram; - object_class_property_add_str(oc, "kernel", machine_get_kernel, machine_set_kernel, &error_abort); object_class_property_set_description(oc, "kernel", diff --git a/hw/core/numa.c b/hw/core/numa.c index 47d5ea1..591e62a 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -627,42 +627,6 @@ static void complete_init_numa_distance(MachineState *ms) } } -void numa_legacy_auto_assign_ram(MachineClass *mc, NodeInfo *nodes, - int nb_nodes, ram_addr_t size) -{ - int i; - uint64_t usedmem = 0; - - /* Align each node according to the alignment - * requirements of the machine class - */ - - for (i = 0; i < nb_nodes - 1; i++) { - nodes[i].node_mem = (size / nb_nodes) & - ~((1 << mc->numa_mem_align_shift) - 1); - usedmem += nodes[i].node_mem; - } - nodes[i].node_mem = size - usedmem; -} - -void numa_default_auto_assign_ram(MachineClass *mc, NodeInfo *nodes, - int nb_nodes, ram_addr_t size) -{ - int i; - uint64_t usedmem = 0, node_mem; - uint64_t granularity = size / nb_nodes; - uint64_t propagate = 0; - - for (i = 0; i < nb_nodes - 1; i++) { - node_mem = (granularity + propagate) & - ~((1 << mc->numa_mem_align_shift) - 1); - propagate = granularity + propagate - node_mem; - nodes[i].node_mem = node_mem; - usedmem += node_mem; - } - nodes[i].node_mem = size - usedmem; -} - static void numa_init_memdev_container(MachineState *ms, MemoryRegion *ram) { int i; @@ -732,30 +696,15 @@ void numa_complete_configuration(MachineState *ms) ms->numa_state->num_nodes = MAX_NODES; } - /* If no memory size is given for any node, assume the default case - * and distribute the available memory equally across all nodes - */ - for (i = 0; i < ms->numa_state->num_nodes; i++) { - if (numa_info[i].node_mem != 0) { - break; - } - } - if (i == ms->numa_state->num_nodes) { - assert(mc->numa_auto_assign_ram); - mc->numa_auto_assign_ram(mc, numa_info, - ms->numa_state->num_nodes, ram_size); - if (!qtest_enabled()) { - warn_report("Default splitting of RAM between nodes is deprecated," - " Use '-numa node,memdev' to explictly define RAM" - " allocation per node"); - } - } - numa_total = 0; for (i = 0; i < ms->numa_state->num_nodes; i++) { numa_total += numa_info[i].node_mem; } - if (numa_total != ram_size) { + if (numa_total == 0) { + error_report(" Use '-numa node,memdev' to explictly assign RAM" + " to node"); + exit(EXIT_FAILURE); + } else if (numa_total != ram_size) { error_report("total memory for NUMA nodes (0x%" PRIx64 ")" " should equal RAM size (0x" RAM_ADDR_FMT ")", numa_total, ram_size); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0a9b9e0..7941b0d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -532,7 +532,6 @@ static void pc_i440fx_2_9_machine_options(MachineClass *m) pc_i440fx_2_10_machine_options(m); compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len); compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len); - m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; } DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 4d6e2be..9715413 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -466,7 +466,6 @@ static void pc_q35_2_10_machine_options(MachineClass *m) pc_q35_2_11_machine_options(m); compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len); compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len); - m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; m->auto_enable_numa_with_memhp = false; } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 2686b73..712548f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4378,11 +4378,6 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) xic->ics_resend = spapr_ics_resend; xic->icp_get = spapr_icp_get; ispc->print_info = spapr_pic_print_info; - /* Force NUMA node memory size to be a multiple of - * SPAPR_MEMORY_BLOCK_SIZE (256M) since that's the granularity - * in which LMBs are represented and hot-added - */ - mc->numa_mem_align_shift = 28; mc->auto_enable_numa = true; smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_OFF; @@ -4635,7 +4630,6 @@ static void spapr_machine_2_9_class_options(MachineClass *mc) spapr_machine_2_10_class_options(mc); compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); - mc->numa_auto_assign_ram = numa_legacy_auto_assign_ram; smc->pre_2_10_has_unused_icps = true; smc->resize_hpt_default = SPAPR_RESIZE_HPT_DISABLED; } @@ -4655,7 +4649,6 @@ static void spapr_machine_2_8_class_options(MachineClass *mc) spapr_machine_2_9_class_options(mc); compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); - mc->numa_mem_align_shift = 23; } DEFINE_SPAPR_MACHINE(2_8, "2.8", false); diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 17a0e1d..9ad6778 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -89,14 +89,6 @@ error in the future. The @code{-realtime mlock=on|off} argument has been replaced by the @code{-overcommit mem-lock=on|off} argument. -@subsection -numa node (without memory specified) (since 4.1) - -Splitting RAM by default between NUMA nodes has the same issues as @option{mem} -parameter described above with the difference that the role of the user plays -QEMU using implicit generic or board specific splitting rule. -Use @option{memdev} with @var{memory-backend-ram} backend or @option{mem} (if -it's supported by used machine type) to define mapping explictly instead. - @subsection RISC-V -bios (since 4.1) QEMU 4.1 introduced support for the -bios option in QEMU for RISC-V for the diff --git a/qemu-options.hx b/qemu-options.hx index 55500bd..f959bbe 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -172,16 +172,16 @@ If any on the three values is given, the total number of CPUs @var{n} can be omi ETEXI DEF("numa", HAS_ARG, QEMU_OPTION_numa, - "-numa node[,mem=size][,cpus=firstcpu[-lastcpu]][,nodeid=node][,initiator=node]\n" - "-numa node[,memdev=id][,cpus=firstcpu[-lastcpu]][,nodeid=node][,initiator=node]\n" + "-numa node,mem=size[,cpus=firstcpu[-lastcpu]][,nodeid=node][,initiator=node]\n" + "-numa node,memdev=id[,cpus=firstcpu[-lastcpu]][,nodeid=node][,initiator=node]\n" "-numa dist,src=source,dst=destination,val=distance\n" "-numa cpu,node-id=node[,socket-id=x][,core-id=y][,thread-id=z]\n" "-numa hmat-lb,initiator=node,target=node,hierarchy=memory|first-level|second-level|third-level,data-type=access-latency|read-latency|write-latency[,latency=lat][,bandwidth=bw]\n" "-numa hmat-cache,node-id=node,size=size,level=level[,associativity=none|direct|complex][,policy=none|write-back|write-through][,line=size]\n", QEMU_ARCH_ALL) STEXI -@item -numa node[,mem=@var{size}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}][,initiator=@var{initiator}] -@itemx -numa node[,memdev=@var{id}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}][,initiator=@var{initiator}] +@item -numa node,mem=@var{size}[,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}][,initiator=@var{initiator}] +@itemx -numa node,memdev=@var{id}[,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}][,initiator=@var{initiator}] @itemx -numa dist,src=@var{source},dst=@var{destination},val=@var{distance} @itemx -numa cpu,node-id=@var{node}[,socket-id=@var{x}][,core-id=@var{y}][,thread-id=@var{z}] @itemx -numa hmat-lb,initiator=@var{node},target=@var{node},hierarchy=@var{hierarchy},data-type=@var{tpye}[,latency=@var{lat}][,bandwidth=@var{bw}] @@ -202,7 +202,7 @@ split between them. For example, the following option assigns VCPUs 0, 1, 2 and 5 to a NUMA node: @example --numa node,cpus=0-2,cpus=5 +-numa node,cpus=0-2,cpus=5,memdev=ram-backend-id @end example @samp{cpu} option is a new alternative to @samp{cpus} option @@ -219,14 +219,14 @@ For example: @example -M pc \ -smp 1,sockets=2,maxcpus=2 \ --numa node,nodeid=0 -numa node,nodeid=1 \ +-m 512M -object memory-backend-ram,id=mem,size=512M \ +-numa node,nodeid=0,memdev=mem -numa node,nodeid=1 \ -numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1 @end example Legacy @samp{mem} assigns a given RAM amount to a node (not supported for 5.0 and newer machine types). @samp{memdev} assigns RAM from a given memory backend -device to a node. If @samp{mem} and @samp{memdev} are omitted in all nodes, RAM -is split equally between them. +device to a node. @samp{mem} and @samp{memdev} are mutually exclusive. Furthermore, if one node uses @samp{memdev}, all of them have to use it. -- 2.7.4

1 0

[libvirt] Getting memory usage info for domains with balloon driver disabled
by Tomasz Barański 15 Jan '20

15 Jan '20

Hello, I'm looking for a way to read guest memory usage information (RAM used, RAM available) for VMs with balloon driver disabled. oVirt used to read that information using ovirt guest agent, but OGA is no longer used (and not even available for RHEL8). I've seen that there was a discussion about adding it to the QEMU guest agent a couple years back[1] but it has not been implemented. dominfo doesn't help: # virsh dominfo 306c001c-f569-4afa-b024-81135c566a73 | grep memory Max memory: 1048576 KiB Used memory: 1048576 KiB dommemstat doesn't help: # virsh dommemstat 306c001c-f569-4afa-b024-81135c566a73 rss 1049432 Neither does domstats. Is there any other way to get the info? [1] https://bugzilla.redhat.com/show_bug.cgi?id=1101915 Tomo

2 1

[libvirt] [PATCH 00/12] even less gnulib: 25 more modules purged, leaving 25 to go
by Daniel P. Berrangé 15 Jan '20

15 Jan '20

A continued effort to purge gnulib from the libvirt build system. The bulk of the win comes from implementing our own Winsock portability wrappers. The use of GSocket turned out to have many complications, making it hard for us to achieve the same level of functionality as we currently have. Thus we take a simpler wrapping approach that GNULIB does for Winsock too. NB this has only been compile tested so far. The sockets stuff definitely needs functional testing on Windows before I dare push it Daniel P. Berrangé (12): src: import gnulib's intprops.h header tests: always declare environ build: validate headers against local gnulib not git repo util: add detection of openpty function util: introduce compat wrappers for Winsock2 src: convert code to use new socket portability wrappers util: pull gnulib physmem impl into local code util: replace atomic ops impls with g_atomic_int* src: replace verify(expr) with G_STATIC_ASSERT(expr) src: add check for termios.h and conditionally include it src: replace gmtime_r/localtime_r/strftime with GDateTime bootstrap: remove 25 more gnulib modules bootstrap.conf | 50 -- build-aux/syntax-check.mk | 18 +- configure.ac | 5 + m4/virt-manywarnings.m4 | 339 ++++++++++++++ m4/virt-warnings.m4 | 115 +++++ src/conf/capabilities.c | 1 - src/conf/domain_conf.c | 11 +- src/conf/snapshot_conf.h | 2 +- src/conf/virdomaincheckpointobjlist.c | 8 +- src/esx/esx_network_driver.c | 2 +- src/esx/esx_storage_backend_iscsi.c | 2 +- src/esx/esx_storage_backend_vmfs.c | 2 +- src/hyperv/hyperv_driver.c | 2 +- src/internal.h | 1 - src/libvirt-domain.c | 2 +- src/libxl/libxl_domain.c | 12 +- src/libxl/libxl_driver.c | 2 +- src/libxl/xen_xm.c | 3 +- src/lxc/lxc_process.c | 4 +- src/nwfilter/nwfilter_dhcpsnoop.c | 10 +- src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/qemu/qemu_blockjob.h | 4 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 17 +- src/qemu/qemu_driver.c | 12 +- src/qemu/qemu_firmware.h | 2 +- src/qemu/qemu_migration_params.c | 2 +- src/qemu/qemu_process.c | 4 +- src/remote/remote_daemon_dispatch.c | 12 +- src/remote/remote_driver.c | 2 +- src/rpc/virnetsocket.c | 34 +- src/util/Makefile.inc.am | 4 + src/util/virarch.c | 3 +- src/util/viratomic.h | 351 +-------------- src/util/vircgroup.h | 2 +- src/util/vircrypto.c | 2 +- src/util/virenum.h | 8 +- src/util/virfdstream.c | 4 +- src/util/virfile.c | 18 +- src/util/virhostcpu.c | 3 +- src/util/virhostmem.c | 182 ++++++-- src/util/virinitctl.c | 4 +- src/util/virintprops.h | 526 ++++++++++++++++++++++ src/util/virkeycode.c | 22 +- src/util/virlog.c | 2 +- src/util/virmacaddr.h | 2 +- src/util/virnetdevbridge.c | 2 +- src/util/virobject.h | 8 +- src/util/virperf.c | 2 +- src/util/virpidfile.c | 2 +- src/util/virportallocator.c | 8 +- src/util/virprocess.c | 2 +- src/util/virsocket.c | 346 ++++++++++++++ src/util/virsocket.h | 89 ++++ src/util/virstoragefile.c | 4 +- src/util/virtime.c | 35 +- src/util/virtypedparam.h | 2 +- src/util/virutil.c | 4 +- src/vz/vz_driver.c | 2 +- tests/commandhelper.c | 3 + tests/commandtest.c | 3 + tests/qemuxml2argvmock.c | 12 +- tests/viratomictest.c | 2 +- tests/virstringtest.c | 7 +- tests/virsystemdtest.c | 2 +- tests/virtimetest.c | 39 +- tools/virsh-checkpoint.c | 20 +- tools/virsh-domain-monitor.c | 16 +- tools/virsh-domain.c | 15 +- tools/virsh-network.c | 13 +- tools/virsh-nodedev.c | 2 +- tools/virsh-pool.c | 2 +- tools/virsh-secret.c | 2 +- tools/virsh-snapshot.c | 19 +- tools/virsh.h | 1 - tools/virt-admin.c | 55 +-- tools/virt-host-validate-common.c | 4 +- tools/virt-login-shell.c | 7 +- tools/vsh.c | 16 +- tools/vsh.h | 4 +- 81 files changed, 1836 insertions(+), 733 deletions(-) create mode 100644 m4/virt-manywarnings.m4 create mode 100644 m4/virt-warnings.m4 create mode 100644 src/util/virintprops.h create mode 100644 src/util/virsocket.c create mode 100644 src/util/virsocket.h -- 2.24.1

3 26

[libvirt] [PATCH 0/4][RFC] Drop media update support in virDomainAttachDevice*
by Han Han 15 Jan '20

15 Jan '20

https://bugzilla.redhat.com/show_bug.cgi?id=1788793 Before virDomainUpdateDeviceFlags, virDomainAttachDevice* were used for media update. Now we have introduced virDomainUpdateDeviceFlags for 9 years(since commit 46a2ea3689) but keep that compatibility of virDomainAttachDevice* until now. I think it is time to remove the compatibility since it doesn't work as well as virDomainUpdateDeviceFlags on disk xml validation. I wonder if any uplayer software relying on this compatibility... My git repo: https://github.com/qiankehan/libvirt/tree/attach-device-nocdrom Han Han (4): virsh.rst: Mention media update is not supported in attach-{disk,device} libvirt: Remove comments of media update in virDomainAttachDeviceFlags qemu: Drop support of media update in live disk attach API libxl: Drop cdrom media update support in live disk attch APIs docs/manpages/virsh.rst | 14 +++++++------- src/libvirt-domain.c | 4 ---- src/libxl/libxl_driver.c | 6 ++++-- src/qemu/qemu_hotplug.c | 12 ++++-------- 4 files changed, 15 insertions(+), 21 deletions(-) -- 2.24.0.rc1

2 5