- Devel - libvirt List Archives

[libvirt] [PATCH v4 0/3] capabilities: Provide info about host IOMMU
by Filip Alac 01 Jun '18

01 Jun '18

Provide information about host IOMMU support in capabilities XML. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=967231 v1: https://www.redhat.com/archives/libvir-list/2018-May/msg01914.html v2: https://www.redhat.com/archives/libvir-list/2018-May/msg01997.html - Remove incorrect warning message v3: https://www.redhat.com/archives/libvir-list/2018-May/msg02404.html v4: - Correct ordering of patches Filip Alac (3): qemu: hostdev: Move parts of qemuHostdevHostSupportsPassthroughVFIO() into separate function capabilities: Extend capabilities with iommu_support docs: news: Explain iommu_support improvement docs/news.xml | 8 +++++ docs/schemas/capability.rng | 13 +++++++++ src/conf/capabilities.c | 9 ++++++ src/conf/capabilities.h | 3 ++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_hostdev.c | 29 +++---------------- src/test/test_driver.c | 2 ++ src/util/virutil.c | 28 ++++++++++++++++++ src/util/virutil.h | 2 ++ tests/qemucaps2xmldata/all_1.6.0-1.xml | 1 + .../nodisksnapshot_1.6.0-1.xml | 1 + .../vircaps2xmldata/vircaps-aarch64-basic.xml | 1 + .../vircaps2xmldata/vircaps-x86_64-basic.xml | 1 + .../vircaps2xmldata/vircaps-x86_64-caches.xml | 1 + .../vircaps-x86_64-resctrl-cdp.xml | 1 + .../vircaps-x86_64-resctrl-skx-twocaches.xml | 1 + .../vircaps-x86_64-resctrl-skx.xml | 1 + .../vircaps-x86_64-resctrl.xml | 1 + 19 files changed, 83 insertions(+), 25 deletions(-) -- 2.17.0

3 8

[libvirt] [PATCH 0/2] qemu: Fix reporting completed migration stats on destination
by Jiri Denemark 01 Jun '18

01 Jun '18

https://bugzilla.redhat.com/show_bug.cgi?id=1584071 Jiri Denemark (2): qemu: Report error on unexpected job stats type qemu: Fix reporting completed migration stats on destination src/qemu/qemu_domain.c | 8 +++++--- src/qemu/qemu_migration.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) -- 2.17.1

3 8

[libvirt] [PATCH] qemu.conf: Change the example user from 'root' to 'qemu'
by Kashyap Chamarthy 01 Jun '18

01 Jun '18

Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- src/qemu/qemu.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 31738ff19c..444247cf31 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -403,13 +403,14 @@ # # user = "qemu" # A user named "qemu" # user = "+0" # Super user (uid=0) +# user = 'root' # The 'root' user # user = "100" # A user named "100" or a user with uid=100 # -#user = "root" +#user = "qemu" # The group for QEMU processes run by the system instance. It can be # specified in a similar way to user. -#group = "root" +#group = "qemu" # Whether libvirt should dynamically change file ownership # to match the configured user/group above. Defaults to 1. -- 2.17.0

4 9

[libvirt] Entering freeze for libvirt-4.4.0
by Daniel Veillard 01 Jun '18

01 Jun '18

Done, I tagged RC1 in git and pushed shigned tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ This seems to work fine with my limited testing, as usual before a release it would be good to get more testing scope, especially with other OSes and platforms. ci.centos.org seems to be raising a few issues with bindings, like perl python and go, so worth a check before the release, RC2 on Thursday and then a release over the w.e. is the plan if all goes well, thanks for giving it a try ! 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/

2 4

[libvirt] [PATCH] qemu: hotplug: Fix TLS setup on disk hotplug
by Peter Krempa 01 Jun '18

01 Jun '18

We need to check if TLS is enabled as the variable is a tristate. Currently we'd setup TLS even if it was explicitly turned off. Thankfully TLS for disks was only used with the vxhs protocol so hardly anybody would ever be able to hit the problem. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- This applies on top of my branch collecting all ACKed postings of recent blockdev-related work. Current version can be fetched by: git fetch git://pipo.sk/pipo/libvirt.git blockdev-staging src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 2f76c048aa..2b0d5df3bf 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -468,7 +468,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, else if (rv > 0) prdStarted = true; - if (disk->src->haveTLS && + if (disk->src->haveTLS == VIR_TRISTATE_BOOL_YES && qemuDomainAddDiskSrcTLSObject(driver, vm, disk->src) < 0) goto error; -- 2.16.2

2 1

[libvirt] [PATCH] spec: Fix requirement for "tc" on new distros
by Jiri Denemark 01 Jun '18

01 Jun '18

At least since Fedora 26 (maybe earlier, but we don't support older Fedora releases), the "tc" tool is provided by a separate iproute-tc package. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 17d5d4dff7..55057e353c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -482,8 +482,14 @@ Requires: %{name}-libs = %{version}-%{release} # for modprobe of pci devices Requires: module-init-tools + # for /sbin/ip & /sbin/tc Requires: iproute +# tc is provided by iproute-tc since at least Fedora 26 +%if 0%{?fedora} || 0%{?rhel} > 7 +Requires: iproute-tc +%endif + Requires: avahi-libs %if 0%{?fedora} || 0%{?rhel} >= 7 Requires: polkit >= 0.112 -- 2.17.1

2 1

Re: [libvirt] [libvirt-users] virRandomBits - not very random
by Eric Blake 01 Jun '18

01 Jun '18

Reviving an ancient thread: On 11/04/2014 02:18 AM, Daniel P. Berrange wrote: > On Mon, Nov 03, 2014 at 11:09:12AM -0500, Brian Rak wrote: >> I just ran into an issue where I had about 30 guests get duplicate mac >> addresses assigned. These were scattered across 30 different machines. >> >> Some debugging revealed that: >> >> 1) All the host machines were restarted within a couple seconds of each >> other >> 2) All the host machines had fairly similar libvirtd pids (within ~100 PIDs >> of each other) >> 3) Libvirt seeds the RNG using 'time(NULL) ^ getpid()' >> >> This perfectly explains why I saw so many duplicate mac addresses. >> >> Why is the RNG seed such a predictable value? Surely there has to be a >> better source of a random seed then the timestamp and the pid? >> >> The PID seems to me to be a very bad source of any randomness. I just ran a >> test across 60 of our hosts. 43 of them shared their PID with at least one >> other machine. > > We should probably seed it with data from /dev/urandom, and/or the new > Linux getrandom() syscall (or BSD equivalent). Did anyone ever open a BZ to track this? As far as I can tell, we still have a very predictable (meaning bad) seeding algorithm that permits large clusters to create collisions when their random number sequences sync up. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org

6 11

[libvirt] [PATCH 0/2] last minute vsock tune-ups
by Ján Tomko 01 Jun '18

01 Jun '18

Last-minute change of the element name suggested by Dan: https://www.redhat.com/archives/libvir-list/2018-June/msg00034.html The news patch is rebased on top of Michal's addition: [PATCH for 4.4.0] news: Document two new features introduced in this release <ede7ef017a0a7621c29f01321d1ac4ca436f1ce6.1527839220.git.mprivozn(a)redhat.com> Ján Tomko (2): conf: rename <vsock><source> to <vsock><cid> news: add vsock docs/formatdomain.html.in | 6 +++--- docs/news.xml | 9 +++++++++ docs/schemas/domaincommon.rng | 4 ++-- src/conf/domain_conf.c | 20 ++++++++++---------- tests/qemuxml2argvdata/vhost-vsock-auto.xml | 2 +- tests/qemuxml2argvdata/vhost-vsock.xml | 2 +- tests/qemuxml2xmloutdata/vhost-vsock-auto.xml | 2 +- 7 files changed, 27 insertions(+), 18 deletions(-) -- 2.16.1

3 5

[libvirt] [PATCH 00/10] Use better PRNG
by Michal Privoznik 01 Jun '18

01 Jun '18

This is inspired by bug reported here [1]. Even though Eric suggested calling this Linux syscall when building without gnutls [2] I've decided to not implement it. Firstly, we build with gnuls everywhere (even Windows), secondly I see no appealing reason to special case Linux - /dev/urandom is good for both Linux and FreeBSD. Once these are merged I'm probably going to send patch set that makes gnutls mandatory. I'm tired of all those WITH_GNUTLS if-defs (esp. in function arguments). But that is orthogonal to what I'm solving here. Also, I'm not quite sure this is a release material, so I'm fine with merging this after the release. 1: https://www.redhat.com/archives/libvirt-users/2018-May/msg00097.html 2: https://www.redhat.com/archives/libvirt-users/2018-May/msg00100.html Michal Privoznik (10): virRandomBytes: Fix return value virCryptoGenerateRandom: rename ret virCryptoGenerateRandom: Explain gnults error virCryptoGenerateRandom: Don't allocate return buffer virRandomBytes: Prefer saferead over plain read virRandomBytes: Report error virRandomBytes: Use gnutls_rnd whenever possible virrandom: Make virRandomBits better virUUIDGenerate don't fall back to virRandomBits vircrypto: Drop virCryptoGenerateRandom src/libvirt_private.syms | 1 - src/qemu/qemu_domain.c | 13 ++++-- src/util/vircrypto.c | 41 ------------------- src/util/vircrypto.h | 2 - src/util/virrandom.c | 103 ++++++++++++++++------------------------------- src/util/viruuid.c | 25 ++---------- tests/qemuxml2argvmock.c | 13 ------ tests/vircryptotest.c | 4 +- 8 files changed, 48 insertions(+), 154 deletions(-) -- 2.16.1

4 24

[libvirt] VMX parser: limitation of numvcpus
by Pino Toscano 01 Jun '18

01 Jun '18

Hi Matthias, while testing the recent improvements I did in the VMX parser for CPU topology (see https://bugzilla.redhat.com/1568148) our QE Ming Xie set a guest in ESXi 5.5 to 7 cores. The result was the error triggered by the following code: /* vmx:numvcpus -> def:vcpus */ if (virVMXGetConfigLong(conf, "numvcpus", &numvcpus, 1, true) < 0) goto cleanup; if (numvcpus <= 0 || (numvcpus % 2 != 0 && numvcpus != 1)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'numvcpus' to be an unsigned " "integer (1 or a multiple of 2) but found %lld"), numvcpus); goto cleanup; } Looking into the history, this check dates back to the initial addition of the esx driver, commit e2aeee6811917bc5ad28326c6a860ded39802a88. Considering the VMX format is proprietary of VMware, and officially undocumented, do you know remember why that limitation was added? Do you think removing it might break anything? Thanks, -- Pino Toscano

2 1

[libvirt] [PATCH for 4.4.0] news: Document two new features introduced in this release
by Michal Privoznik 01 Jun '18

01 Jun '18

The first feature is SCSI persistent reservation, the other is support for multihead screenshots. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/news.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index c45850f625..453ac1d02a 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -94,6 +94,25 @@ both new APIs consider capabilities of a specific hypervisor. </description> </change> + <change> + <summary> + Introduce SCSI persistent reservations support + </summary> + <description> + The QEMU driver gained support for qemu-pr-helper which enables + guests to issue SCSI commands for persistent reservation. + </description> + </change> + <change> + <summary> + qemu: Implement multiple screen support for virDomainScreenshot + </summary> + <description> + While the virDomainScreenshot API supported multihead video cards, + the implementation was missing. But now that QEMU implemented it + libvirt has done as well. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.16.4

2 1

[libvirt] [PATCH 0/2] travis: Minor macOS improvements
by Andrea Bolognani 01 Jun '18

01 Jun '18

Andrea Bolognani (2): travis: Move PATH to macOS-specific environment travis: Install and use ccache on macOS .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.17.0

2 3

[libvirt] [PATCHv2 0/7] qemu: add vhost-vsock-pci support
by Ján Tomko 01 Jun '18

01 Jun '18

v1: https://www.redhat.com/archives/libvir-list/2018-May/msg01517.html v2: * use <vsock> instead of <interface> * use <source> for the guest address * add <source auto> attribute and auto-assign the guest CID * fixed PCI address allocation https://bugzilla.redhat.com/show_bug.cgi?id=1291851 Ján Tomko (7): Introduce virDomainVsockDef Add privateData to virDomainVsockDef conf: introduce <vsock> element qemu: add private data for vsock Introduce QEMU_CAPS_DEVICE_VHOST_VSOCK util: create virvsock.c qemu: add support for vhost-vsock-pci configure.ac | 8 + docs/formatdomain.html.in | 20 ++ docs/schemas/domaincommon.rng | 29 +++ src/conf/domain_conf.c | 228 ++++++++++++++++++++- src/conf/domain_conf.h | 27 +++ src/libvirt_private.syms | 6 + src/qemu/qemu_alias.c | 16 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 45 ++++ src/qemu/qemu_domain.c | 42 ++++ src/qemu/qemu_domain.h | 9 + src/qemu/qemu_domain_address.c | 11 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 35 ++++ src/util/Makefile.inc.am | 2 + src/util/virvsock.c | 89 ++++++++ src/util/virvsock.h | 29 +++ tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.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.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../vhost-vsock-auto.x86_64-latest.args | 32 +++ tests/qemuxml2argvdata/vhost-vsock-auto.xml | 35 ++++ .../vhost-vsock.x86_64-latest.args | 32 +++ tests/qemuxml2argvdata/vhost-vsock.xml | 36 ++++ tests/qemuxml2argvtest.c | 14 ++ tests/qemuxml2xmloutdata/vhost-vsock-auto.xml | 36 ++++ tests/qemuxml2xmloutdata/vhost-vsock.xml | 1 + tests/qemuxml2xmltest.c | 3 + 41 files changed, 808 insertions(+), 1 deletion(-) create mode 100644 src/util/virvsock.c create mode 100644 src/util/virvsock.h create mode 100644 tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock-auto.xml create mode 100644 tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock.xml create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-auto.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock.xml -- 2.16.1

3 21

[libvirt] [GSoC] Design ideas for implementing cleanup attribute
by Sukrit Bhatnagar 01 Jun '18

01 Jun '18

Hi, I am interested in implementing the GCC cleanup attribute for automatic resource freeing as part of GSoC'18. I have shared a proposal for the same. This mail is to discuss the code design for implementing it. Here are some of my ideas: This attribute requires a cleanup function that is called automatically when the corresponding variable goes out of scope. There are some functions whose logic can be reused: - Functions such as virCommandFree, virConfFreeList and virCgroupFree can be directly used as cleanup functions. They have parameter and return type valid for a cleanup function. - Functions such as virFileClose and virFileFclose need some additional consideration as they return a value. I think we can set some global variable in a separate source file (just like errno variable from errno.h). Then the value to be returned can be accessed globally. - Functions such as virDomainEventGraphicsDispose need an entirely new design. They are used as callbacks in object classes and passed as an argument in virClassNew. This would require making changes to virObjectUnref's code too. *This is the part I am not sure how to implement cleanup logic for.* Also, since the __attribute__((__cleanup__(anyfunc))) looks ugly, a macro like autoclean (ideas for macro name welcome!) can be used instead. As Martin pointed out in my proposal, for some types, this can be done right after typedef declarations, so that the type itself contains this attribute. Basically, at most places where VIR_FREE is used to release memory explicitly, the corresponding variable can use the attribute. The existing virFree function also can be reused as it takes void pointer as an argument and returns nothing. One of the exceptions to this will be those variables which are struct members. The cleanup of member has to be done when the enclosing struct variable is cleaned. I can create new files vircleanup.{c,h} for defining cleanup functions for types which do not have an existing cleanup/free function. This can be done separately for each driver supported. For example, cleanups pertaining to lxc driver will be in src/lxc/lxc_cleanup.c. Your suggestions are welcome. Thanks, Sukrit Bhatnagar

7 25

[libvirt] [jenkins-ci PATCH v3 0/3] Enable out-of-the-box parallel make
by Andrea Bolognani 01 Jun '18

01 Jun '18

Changes from [v2]: * now that libvirt-perl uses Module::Build and ExtUtils::MakeMaker support has been dropped, we don't need to special case any job, so revert back to [v1] and rebase on top of master because the original series doesn't apply anymore. Changes from [v1]: * turns out some versions of ExtUtils::MakeMaker output Makefiles that are not entirely compatible with parallel make, which forces us to introduce an exception in the relevant template and shuffle patches around. [v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00732.html [v2] https://www.redhat.com/archives/libvir-list/2018-May/msg01070.html Andrea Bolognani (3): jobs: Enable parallel make everywhere guests: Set MAKEFLAGS for out-of-the-box parallel make jobs: Drop explicit parallel make usage guests/templates/bashrc | 2 ++ jobs/autotools.yaml | 10 +++++----- jobs/defaults.yaml | 1 - projects/libvirt.yaml | 4 ++-- projects/osinfo-db.yaml | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) -- 2.17.0

2 4

[libvirt] [PATCH v2] util: Loop through all resolved addresses in virNetSocketNewListenTCP
by Olaf Hering 01 Jun '18

01 Jun '18

Currently virNetSocketNewListenTCP bails out early under the following conditions: - the hostname resolves to at least one IPv4 and at least one IPv6 address - the local interfaces have that one IPv4 address assigned, but not any of the IPv6 addresses - the local interfaces have just IPv6 link-local addresses In this case the resolver returns not only the IPv4 addresses but also IPv6. Binding the IPv6 address will obviously fail. But this terminates the entire loop, even if binding to IPv4 succeeded. To fix this error, just keep going and loop through all returned addresses. In case none of the attempts to bind to some address succeeded, try to report the appropriate error. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- v2: whitespace fixes, as suggested by John Ferlan src/rpc/virnetsocket.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 7087abec9c..60a7187348 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -382,11 +382,8 @@ int virNetSocketNewListenTCP(const char *nodename, #endif if (bind(fd, runp->ai_addr, runp->ai_addrlen) < 0) { - if (errno != EADDRINUSE) { - virReportSystemError(errno, "%s", _("Unable to bind to port")); - goto error; - } - addrInUse = true; + if (errno == EADDRINUSE) + addrInUse = true; VIR_FORCE_CLOSE(fd); runp = runp->ai_next; continue; @@ -409,14 +406,14 @@ int virNetSocketNewListenTCP(const char *nodename, fd = -1; } - if (nsocks == 0 && familyNotSupported) { - virReportSystemError(EAFNOSUPPORT, "%s", _("Unable to bind to port")); - goto error; - } - - if (nsocks == 0 && - addrInUse) { - virReportSystemError(EADDRINUSE, "%s", _("Unable to bind to port")); + if (nsocks == 0) { + if (familyNotSupported) + errno = EAFNOSUPPORT; + else if (addrInUse) + errno = EADDRINUSE; + else + errno = EDESTADDRREQ; + virReportSystemError(errno, "%s", _("Unable to bind to port")); goto error; }

2 1

[libvirt] [RFC PATCH 0/9] qemu: add vhost-vsock-pci support
by Ján Tomko 01 Jun '18

01 Jun '18

@Stefan, please take a look at the docs/ changes in patch 6 Add <interface type='vsock'>, mapping to vhost-vsock-pci Missing: hotplug support Similar to vhost-net, we cannot apply a SELinux label on the file descriptor, so an adjustment of the policy will probably be needed to make it work in enforcing mode. https://bugzilla.redhat.com/show_bug.cgi?id=1291851 Ján Tomko (9): conf: split interface target element condition qemu: prepare for missing interface model Introduce virDomainNetDefNew Add privateData to virDomainNetDef qemu: add private data for interfaces conf: add interface type vsock Introduce QEMU_CAPS_DEVICE_VHOST_VSOCK Introduce virNetDevVsockSetGuestCid qemu: implement vhost-vsock-pci support configure.ac | 8 ++ docs/formatdomain.html.in | 15 ++++ docs/schemas/domaincommon.rng | 14 ++++ src/bhyve/bhyve_parse_command.c | 2 +- src/conf/domain_conf.c | 85 ++++++++++++++++++---- src/conf/domain_conf.h | 8 ++ src/conf/netdev_bandwidth_conf.h | 1 + src/libvirt_private.syms | 2 + src/libxl/libxl_conf.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 3 + src/lxc/lxc_process.c | 1 + src/openvz/openvz_conf.c | 4 +- src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 43 +++++++++-- src/qemu/qemu_domain.c | 47 ++++++++++++ src/qemu/qemu_domain.h | 13 ++++ src/qemu/qemu_domain_address.c | 6 +- src/qemu/qemu_hotplug.c | 3 + src/qemu/qemu_interface.c | 33 +++++++++ src/qemu/qemu_interface.h | 4 + src/qemu/qemu_parse_command.c | 2 +- src/qemu/qemu_process.c | 6 ++ src/uml/uml_conf.c | 5 ++ src/util/virnetdev.c | 30 ++++++++ src/util/virnetdev.h | 4 + src/vbox/vbox_common.c | 2 +- src/vmx/vmx.c | 3 +- src/xenconfig/xen_common.c | 3 +- src/xenconfig/xen_sxpr.c | 3 +- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.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.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../vhost-vsock.x86_64-latest.args | 32 ++++++++ tests/qemuxml2argvdata/vhost-vsock.xml | 36 +++++++++ tests/qemuxml2argvtest.c | 15 ++++ tests/qemuxml2xmloutdata/vhost-vsock.xml | 1 + tests/qemuxml2xmltest.c | 2 + tools/virsh-domain.c | 1 + 51 files changed, 425 insertions(+), 32 deletions(-) create mode 100644 tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock.xml -- 2.16.1

2 12

[libvirt] [PATCH] util: storage: remove virStorageSource->tlsVerify
by Peter Krempa 01 Jun '18

01 Jun '18

Disks are client-only so we don't need to have this variable. We also always pass false for 'isListen' to qemuBuildTLSx509BackendProps for all disk-related code-paths. --- This applies on top of my branch collecting all ACKed postings of recent blockdev-related work. Current version can be fetched by: git fetch git://pipo.sk/pipo/libvirt.git blockdev-staging src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 2 -- src/qemu/qemu_hotplug.c | 3 +-- src/util/virstoragefile.c | 1 - src/util/virstoragefile.h | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 26e61f26f4..c75595ca6d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -774,7 +774,7 @@ qemuBuildDiskSrcTLSx509CommandLine(virCommandPtr cmd, return 0; return qemuBuildTLSx509CommandLine(cmd, src->tlsCertdir, - false, src->tlsVerify, + false, true, NULL, src->tlsAlias, qemuCaps); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4368e9be35..873bcec50d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9928,8 +9928,6 @@ qemuProcessPrepareStorageSourceTLSVxhs(virStorageSourcePtr src, if (src->haveTLS == VIR_TRISTATE_BOOL_YES) { if (VIR_STRDUP(src->tlsCertdir, cfg->vxhsTLSx509certdir) < 0) return -1; - - src->tlsVerify = true; } return 0; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c656409eaa..2f76c048aa 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -164,8 +164,7 @@ qemuDomainAddDiskSrcTLSObject(virQEMUDriverPtr driver, if (qemuDomainGetTLSObjects(priv->qemuCaps, NULL, src->tlsCertdir, - false, - src->tlsVerify, + false, true, src->tlsAlias, &tlsProps, NULL) < 0) goto cleanup; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 54de2c1c30..10fe0f201a 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2171,7 +2171,6 @@ virStorageSourceCopy(const virStorageSource *src, ret->shared = src->shared; ret->haveTLS = src->haveTLS; ret->tlsFromConfig = src->tlsFromConfig; - ret->tlsVerify = src->tlsVerify; ret->detected = src->detected; ret->debugLevel = src->debugLevel; ret->debug = src->debug; diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 1631c4cf66..4591e6e213 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -310,7 +310,6 @@ struct _virStorageSource { * certificate directory with listen and verify bools. */ char *tlsAlias; char *tlsCertdir; - bool tlsVerify; bool detected; /* true if this entry was not provided by the user */ -- 2.16.2

2 1

[libvirt] [RFC PATCH 0/9] tests: Record commands used to gather capability replies
by Peter Krempa 01 Jun '18

01 Jun '18

De-confusify the 'replies' files for human usage by recording which commands were used for gathering given block. Additionally this tests that the commands emitted by libvirt are as recorded. This series is in RFC state, since it creates some churn in the capability files and also 'tests/qemucapsfixreplies' will no longer work. Patch 8 contains the changed files for ease of review and patch 9 contains the tool used to regenerate them from the current state. Peter Krempa (9): qemu: monitor: Add possibility to reset command sequence in tests tests: qemumonitor: Simplify handling of end of file in full file test tests: qemumonitor: Optimize control flow when concatenating replies tests: qemucapsprobemock: Simplify and extract skipping of empty lines tests: qemucapsprobemock: Fail if JSON reply from qemu can't be reformatted tests: qemucapsprobemock: Prepare 'qemucapsprobe' for the new format tests: qemucapabilities: Test commands used to query capabilities FIXUP: Tweak capability files to conform to the new approach DO_NOT_APPLY: HACK: Regenerate qemucapabilitiestest data fix-files.sh | 1 + src/qemu/qemu_monitor.c | 11 + src/qemu/qemu_monitor_priv.h | 31 + tests/Makefile.am | 1 + .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.aarch64.replies | 319 +++++- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 322 +++++- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 342 +++++- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.replies | 1120 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 350 +++++- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- .../caps_2.12.0.aarch64.replies | 328 +++++- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 331 +++++- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 358 +++++- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.replies | 1173 +++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 341 +++++- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0.aarch64.replies | 319 +++++- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 322 +++++- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 306 ++++- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 342 +++++- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 322 +++++- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 342 +++++- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 1120 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- tests/qemucapabilitiestest.c | 17 +- tests/qemucapsprobemock.c | 77 +- tests/qemumonitortestutils.c | 52 +- 57 files changed, 10564 insertions(+), 385 deletions(-) create mode 100755 fix-files.sh create mode 100644 src/qemu/qemu_monitor_priv.h -- 2.16.2

1 10

[libvirt] Why does vnc show blackscreen after using mstsc to connect to a windows vm with a nvidia gpu passtrough
by Wu Zongyong 01 Jun '18

01 Jun '18

Hi, As the title says, VNC inside a windows virtual machine doesn’t work after I try to use mstsc to access the vm with a gpu passthrough. It seems that the scenario is normal, but could someone tell me something deeply about the reason why vnc shows blackscreen? Thanks.

1 0

[libvirt] Question about using cpu mode "host-model" while providing a cpu model name
by Collin Walling 31 May '18

31 May '18

Hi I have noticed something that may be misconstrued regarding the libvirt domain xml format for defining a cpu model. There seems to be a misalignment where the libvirt documentation states something that is not supported, but libvirt itself gives no clear indication of such. This is regarding the cpu mode "host-model" and providing a cpu model name between the <model> tags. >From the libvirt docs under header "CPU model and topology" paragraph "cpu" subparagraph "host-model", the following rule is defined (bolded or between asterisks): "... The match attribute can't be used in this mode. *Specifying CPU model is not supported* either, but model's fallback attribute may still be used. ..." https://libvirt.org/formatdomain.html#elementsCPU The above rule reads as "if mode is 'host-model' (and the architecture is not PowerPC) then specifying a model name should not be allowed". However, this is not the observed behavior. For example, I can define and start a guest with the following xml snippet without any issues: <cpu mode='host-model'> <model>cpu-name</model> </cpu> Which seems to contradict what the documentation states. This issue was reported by a colleague of mine who was confused by the cpu features that were available to a guest when host-model and a model name are provided. Personally, I tend to err on the side of providing host-model and a cpu-model-name being mutually exclusive. I've attempted to find a solution to this problem myself by looking at virCPUDefParseXML, but the fact that PowerPC exists as an exception and we do not know the architecture when parsing a guest cpu xml makes minimal code changes challenging. If we want to make changes to the code, then I imagine that the ideal solution would revolve around only allowing <model>cpu-name</model> to be valid iff the cpu mode is set to "custom". Otherwise some clarity on the documentation would suffice. Something like "A CPU model specified in the domain xml will be ignored." Thoughts? Thank you for your time. -- Respectfully, - Collin Walling

5 6

[libvirt] [python PATCH] Add support for virConnectBaselineHypervisorCPU
by Jiri Denemark 31 May '18

31 May '18

The python bindings for this API cannot be generated because are generator is not capable of handling string arrays (char **) parameters. https://bugzilla.redhat.com/show_bug.cgi?id=1584676 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- generator.py | 1 + libvirt-override-api.xml | 11 ++++++++ libvirt-override.c | 60 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/generator.py b/generator.py index a0fc720..b7d96a1 100755 --- a/generator.py +++ b/generator.py @@ -488,6 +488,7 @@ skip_impl = ( 'virDomainGetPerfEvents', 'virDomainSetPerfEvents', 'virDomainGetGuestVcpus', + 'virConnectBaselineHypervisorCPU', ) lxc_skip_impl = ( diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index b63a403..36d3577 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -717,5 +717,16 @@ <arg name='flags' type='unsigned int' info='extra flags; not used yet, so callers should always pass 0'/> <return type='int' info="dictionary of vcpu data returned by the guest agent"/> </function> + <function name='virConnectBaselineHypervisorCPU' file='python'> + <info>Computes the most feature-rich CPU which is compatible with all given CPUs and can be provided by the specified hypervisor.</info> + <return type='char *' info='XML description of the computed CPU or NULL on error.'/> + <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> + <arg name='emulator' type='const char *' info='path to the emulator binary'/> + <arg name='arch' type='const char *' info='CPU architecture'/> + <arg name='machine' type='const char *' info='machine type'/> + <arg name='virttype' type='const char *' info='virtualization type'/> + <arg name='xmlCPUs' type='const char **' info='array of XML descriptions of CPUs'/> + <arg name='flags' type='unsigned int' info='bitwise-OR of virConnectBaselineCPUFlags'/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index b4c1529..1c95c18 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -9708,6 +9708,63 @@ libvirt_virStreamRecvFlags(PyObject *self ATTRIBUTE_UNUSED, #endif /* LIBVIR_CHECK_VERSION(3, 4, 0) */ +#if LIBVIR_CHECK_VERSION(4, 4, 0) +static PyObject * +libvirt_virConnectBaselineHypervisorCPU(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virConnectPtr conn; + PyObject *pyobj_conn; + char *emulator; + char *arch; + char *machine; + char *virttype; + PyObject *list; + unsigned int flags; + char **xmlCPUs = NULL; + int ncpus = 0; + size_t i; + char *cpu; + PyObject *ret = NULL; + + if (!PyArg_ParseTuple(args, (char *)"OzzzzOI:virConnectBaselineHypervisorCPU", + &pyobj_conn, &emulator, &arch, &machine, &virttype, + &list, &flags)) + return NULL; + + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + if (PyList_Check(list)) { + ncpus = PyList_Size(list); + if (VIR_ALLOC_N(xmlCPUs, ncpus) < 0) + return PyErr_NoMemory(); + + for (i = 0; i < ncpus; i++) { + if (libvirt_charPtrUnwrap(PyList_GetItem(list, i), + &(xmlCPUs[i])) < 0 || + !xmlCPUs[i]) + goto cleanup; + } + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + cpu = virConnectBaselineHypervisorCPU(conn, emulator, arch, machine, virttype, + (const char **)xmlCPUs, ncpus, flags); + LIBVIRT_END_ALLOW_THREADS; + + ret = libvirt_constcharPtrWrap(cpu); + + cleanup: + for (i = 0; i < ncpus; i++) + VIR_FREE(xmlCPUs[i]); + VIR_FREE(xmlCPUs); + VIR_FREE(cpu); + + return ret; +} +#endif /* LIBVIR_CHECK_VERSION(4, 4, 0) */ + + /************************************************************************ * * * The registration stuff * @@ -9941,6 +9998,9 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virStreamSendHole", libvirt_virStreamSendHole, METH_VARARGS, NULL}, {(char *) "virStreamRecvFlags", libvirt_virStreamRecvFlags, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(3, 4, 0) */ +#if LIBVIR_CHECK_VERSION(4, 4, 0) + {(char *) "virConnectBaselineHypervisorCPU", libvirt_virConnectBaselineHypervisorCPU, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(4, 4, 0) */ {NULL, NULL, 0, NULL} }; -- 2.17.0

2 1

[libvirt] [PATCH 00/13] qemu: Refactor how we handle 'object's on the monitor
by Peter Krempa 31 May '18

31 May '18

This applies on top of the tls/secret alias refactoring series I've posted earlier today: https://www.redhat.com/archives/libvir-list/2018-May/msg02174.html The main idea is to clarify the lifecycle of the objects used on the monitor and clean up the code using it. Peter Krempa (13): qemu: command: Fix name of qemuBuildMemoryBackendStr qemu: monitor: Rename qemuMonitorAddObject to qemuMonitorAddObjectType qemu: Rename virQEMUBuildObjectCommandlineFromJSON qemu: monitor: Add better APIs for adding of objects to qemu util: qemu: Introduce helper for formatting command line from new object props qemu: hotplug: Refactor PR props formatting to use qemuMonitorCreateObjectProps qemu: hotplug: Refactor RNG props formatting to use qemuMonitorCreateObjectProps qemu: hotplug: Refactor memory props formatting to qemuMonitorCreateObjectProps qemu: hotplug: Refactor shmem props formatting to qemuMonitorCreateObjectProps qemu: hotplug: Refactor tls-credential props formatting to qemuMonitorCreateObjectProps qemu: hotplug: Refactor 'secret' props formatting to qemuMonitorCreateObjectProps qemu: Convert iothread hotplug to qemuMonitorCreateObjectProps qemu: Delete old unused code for adding objects to qemu src/qemu/qemu_command.c | 300 +++++++++++++++++---------------------- src/qemu/qemu_command.h | 18 +-- src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_hotplug.c | 148 +++++++------------ src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_migration_params.c | 5 +- src/qemu/qemu_monitor.c | 98 +++++++++++-- src/qemu/qemu_monitor.h | 14 +- src/qemu/qemu_monitor_json.c | 15 +- src/qemu/qemu_monitor_json.h | 2 - src/util/virqemu.c | 40 ++++-- src/util/virqemu.h | 5 +- 12 files changed, 336 insertions(+), 326 deletions(-) -- 2.16.2

2 26

[libvirt] [PATCH v3 0/4] capabilities: Provide info about host IOMMU
by Filip Alac 31 May '18

31 May '18

Filip Alac (4): virutil: Introduce virHostHasIOMMU qemu: hostdev: Refactor code capabilities: Extend capabilities with iommu_support docs: news: Explain iommu_support improvement docs/news.xml | 8 +++++ docs/schemas/capability.rng | 13 +++++++++ src/conf/capabilities.c | 9 ++++++ src/conf/capabilities.h | 3 ++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_hostdev.c | 29 +++---------------- src/test/test_driver.c | 2 ++ src/util/virutil.c | 28 ++++++++++++++++++ src/util/virutil.h | 2 ++ tests/qemucaps2xmldata/all_1.6.0-1.xml | 1 + .../nodisksnapshot_1.6.0-1.xml | 1 + .../vircaps2xmldata/vircaps-aarch64-basic.xml | 1 + .../vircaps2xmldata/vircaps-x86_64-basic.xml | 1 + .../vircaps2xmldata/vircaps-x86_64-caches.xml | 1 + .../vircaps-x86_64-resctrl-cdp.xml | 1 + .../vircaps-x86_64-resctrl-skx-twocaches.xml | 1 + .../vircaps-x86_64-resctrl-skx.xml | 1 + .../vircaps-x86_64-resctrl.xml | 1 + 19 files changed, 83 insertions(+), 25 deletions(-) -- 2.17.0

2 7

[libvirt] [PATCH] qemu: hotplug: Fix detach of disk with managed persistent reservations
by Peter Krempa 31 May '18

31 May '18

In commit 8bebb2b735d I've refactored how the detach of disk with a managed persistent reservations object is handled. After the commit if any disk with a managed PR object would be removed libvirt would also attempt to remove the shared 'pr-manager-helper' object potentially used by other disks. Thankfully this should not have practical impact as qemu should reject deletion of the object if it was still used and the rest of the code is correct. Fix this by removing the disk from the definition earlier and checking if the shared/managed pr-manager-helper object is still needed. This basically splits the detach code for the managed PR object from the unmanaged ones. The same separation will follow for the attachment code as well as it greatly simplifies -blockdev support for this. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_hotplug.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b4bbe62c75..a14281203a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3839,6 +3839,8 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, char *drivestr; char *objAlias = NULL; char *encAlias = NULL; + bool prManaged = priv->prDaemonRunning; + bool prUsed = false; VIR_DEBUG("Removing disk %s from domain %p %s", disk->info.alias, vm, vm->def->name); @@ -3876,6 +3878,16 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, } } + for (i = 0; i < vm->def->ndisks; i++) { + if (vm->def->disks[i] == disk) { + virDomainDiskRemove(vm->def, i); + break; + } + } + + /* check if the last disk with managed PR was just removed */ + prUsed = virDomainDefHasManagedPR(vm->def); + qemuDomainObjEnterMonitor(driver, vm); qemuMonitorDriveDel(priv->mon, drivestr); @@ -3892,12 +3904,16 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, VIR_FREE(encAlias); /* If it fails, then so be it - it was a best shot */ - if (disk->src->pr) + if (disk->src->pr && + !virStoragePRDefIsManaged(disk->src->pr)) ignore_value(qemuMonitorDelObject(priv->mon, disk->src->pr->mgralias)); if (disk->src->haveTLS) ignore_value(qemuMonitorDelObject(priv->mon, disk->src->tlsAlias)); + if (prManaged && !prUsed) + ignore_value(qemuMonitorDelObject(priv->mon, qemuDomainGetManagedPRAlias())); + if (qemuDomainObjExitMonitor(driver, vm) < 0) return -1; @@ -3906,16 +3922,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, event = virDomainEventDeviceRemovedNewFromObj(vm, disk->info.alias); qemuDomainEventQueue(driver, event); - for (i = 0; i < vm->def->ndisks; i++) { - if (vm->def->disks[i] == disk) { - virDomainDiskRemove(vm->def, i); - break; - } - } - - /* check if the last disk with managed PR was just removed */ - if (priv->prDaemonRunning && - !virDomainDefHasManagedPR(vm->def)) + if (prManaged && !prUsed) qemuProcessKillManagedPRDaemon(vm); qemuDomainReleaseDeviceAddress(vm, &disk->info, src); -- 2.16.2

2 1