- Devel - libvirt List Archives

[libvirt] [PATCH 0/9] Resolve libvirtd hang on termination with connected long running client
by John Ferlan 06 Jul '18

06 Jul '18

RFC: https://www.redhat.com/archives/libvir-list/2018-January/msg00318.html Adjustments since RFC... Patches 1&2: No change, were already R-B'd Patch 3: Removed code as noted in code review, update commit message Patch 4: From old series removed, see below for more details Patch 9: no change NB: Patches 5-8 and 10 from Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> are removed as they seemed to not be necessary Replaced the former patch 4 with series of patches to (slowly) provide support to disable new connections, handle removing waiting jobs, causing the waiting workers to quit, and allow any running jobs to complete. As it turns out, waiting for running jobs to complete cannot be done from the virNetServerClose callbacks because that means the event loop processing done during virNetServerRun will not allow any currently long running worker job thread a means to complete. So when virNetDaemonQuit is called as a result of the libvirtd signal handlers for SIG{QUIT|INT|TERM}, instead of just causing virNetServerRun to quit immediately, alter to using a quitRequested flag and then use that quitRequested flag to check for long running worker threads before causing the event loop to quit resulting in libvirtd being able to run through the virNetDaemonClose processing. John Ferlan (9): libvirtd: Alter refcnt processing for domain server objects libvirtd: Alter refcnt processing for server program objects netserver: Remove ServiceToggle during ServerDispose util: Introduce virThreadPoolDrain rpc: Introduce virNetServerQuitRequested rpc: Introduce virNetServerWorkerCount rpc: Alter virNetDaemonQuit processing docs: Add news article for libvirtd issue APPLY ONLY FOR TESTING PURPOSES daemon/libvirtd.c | 43 +++++++++++++++++++++++--------- docs/news.xml | 12 +++++++++ src/libvirt_private.syms | 1 + src/libvirt_remote.syms | 2 ++ src/qemu/qemu_driver.c | 5 ++++ src/rpc/virnetdaemon.c | 45 +++++++++++++++++++++++++++++++++- src/rpc/virnetserver.c | 52 ++++++++++++++++++++++++++++++++++++--- src/rpc/virnetserver.h | 4 +++ src/util/virthreadpool.c | 64 ++++++++++++++++++++++++++++++++++++++++-------- src/util/virthreadpool.h | 2 ++ 10 files changed, 204 insertions(+), 26 deletions(-) -- 2.13.6

5 29

[libvirt] [PATCHv1 00/12] BaselineHypervisorCPU using QEMU QMP exchanges
by Chris Venteicher 06 Jul '18

06 Jul '18

Some architectures (S390) depend on QEMU to compute baseline CPU model and expand a models feature set. Interacting with QEMU requires starting the QEMU process and completing one or more query-cpu-model-baseline QMP exchanges with QEMU in addition to a query-cpu-model-expansion QMP exchange to expand all features in the model. See "s390x CPU models: exposing features" patch set on Qemu-devel for discussion of QEMU aspects. This is part of resolution of: https://bugzilla.redhat.com/show_bug.cgi?id=1511999 Signed-off-by: Chris Venteicher <cventeic(a)redhat.com> Chris Venteicher (12): qemu_monitor_json: qemuMonitorCPUModelInfo / JSON conversion qemu_monitor: Introduce qemuMonitorCPUModelInfoInit and qemuMonitorCPUModelInfoFreeContents qemu_monitor: Introduce qemuMonitorGetCPUModelBaseline (query-cpu-model-baseline) qemu_monitor: Indicate when CPUModelInfo props report migratablity qemu_monitor: CPUModelExpansion on CPUModel with both name and properties cpu_conf: Calculate virCPUDef List Length function qemu_capabilities: virCPUDef / qemuMonitorCPUModelInfo conversions qemu_capabilities: QMPCommandPtr without shadow qmperr qemu_capabilities: Persist QEMU instance over multiple QMP Cmds qemu_capabilities: Introduce virQEMUCapsNewQMPCommandConnection qemu_capabilities: Introduce virQEMUCapsQMPBaselineCPUModel (baseline using QEMU) qemu_driver: BaselineHypervisorCPU supports S390 using QEMU/QMP src/conf/cpu_conf.c | 15 ++ src/conf/cpu_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 335 +++++++++++++++++++++++++++++------ src/qemu/qemu_capabilities.h | 33 ++++ src/qemu/qemu_driver.c | 66 ++++++- src/qemu/qemu_monitor.c | 90 +++++++++- src/qemu/qemu_monitor.h | 16 +- src/qemu/qemu_monitor_json.c | 226 +++++++++++++++++++---- src/qemu/qemu_monitor_json.h | 14 +- tests/cputest.c | 7 +- 11 files changed, 683 insertions(+), 123 deletions(-) -- 2.17.1

2 20

[libvirt] [PATCH] qemu: fix UNIX socket chardevs operating in client mode
by Daniel P. Berrangé 06 Jul '18

06 Jul '18

When support was adding for passing a pre-opened listener socket to UNIX chardevs, it accidentally passed the listener socket for client mode chardevs too with predictable amounts of fail resulting. Expand the unit test coverage to validate that we are only doing FD passing when operating in server mode. Reported-by: Richard W.M. Jones <rjones(a)redhat.com> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_command.c | 3 +- .../qemuxml2argvdata/serial-unix-chardev.args | 2 ++ .../serial-unix-chardev.x86_64-latest.args | 36 +++++++++++++++++++ .../qemuxml2argvdata/serial-unix-chardev.xml | 4 +++ tests/qemuxml2argvtest.c | 1 + 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 82d8030a33..32eb59b6ab 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5083,7 +5083,8 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, break; case VIR_DOMAIN_CHR_TYPE_UNIX: - if ((flags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) && + if (dev->data.nix.listen && + (flags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) { if (qemuSecuritySetSocketLabel(secManager, (virDomainDefPtr)def) < 0) goto cleanup; diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxml2argvdata/serial-unix-chardev.args index 584f4a1dd1..873d3263c6 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.args @@ -26,4 +26,6 @@ server,nowait \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev socket,id=charserial0,path=/tmp/serial.sock \ -device isa-serial,chardev=charserial0,id=serial0 \ +-chardev socket,id=charserial1,path=/tmp/serial-server.sock,server,nowait \ +-device isa-serial,chardev=charserial1,id=serial1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args new file mode 100644 index 0000000000..ce7a7f80d7 --- /dev/null +++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-chardev socket,id=charserial0,path=/tmp/serial.sock \ +-device isa-serial,chardev=charserial0,id=serial0 \ +-chardev socket,id=charserial1,fd=1729,server,nowait \ +-device isa-serial,chardev=charserial1,id=serial1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.xml b/tests/qemuxml2argvdata/serial-unix-chardev.xml index 04f83779ce..af513d6445 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.xml +++ b/tests/qemuxml2argvdata/serial-unix-chardev.xml @@ -25,6 +25,10 @@ <source mode='connect' path='/tmp/serial.sock'/> <target port='0'/> </serial> + <serial type='unix'> + <source mode='bind' path='/tmp/serial-server.sock'/> + <target port='1'/> + </serial> <console type='unix'> <source mode='connect' path='/tmp/serial.sock'/> <target port='0'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2d52f352b0..3be5af03aa 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1335,6 +1335,7 @@ mymain(void) QEMU_CAPS_CHARDEV_FILE_APPEND); DO_TEST("serial-unix-chardev", QEMU_CAPS_DEVICE_ISA_SERIAL); + DO_TEST_CAPS_LATEST("serial-unix-chardev"); DO_TEST("serial-tcp-chardev", QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("serial-udp-chardev", -- 2.17.1

2 2

[libvirt] [PATCH 0/1] Changed LPC slot from 1 to 31
by Ivan Mishonov 06 Jul '18

06 Jul '18

From: Ivan Mishonov <ivan(a)conquex.com> There was no keyboard input on Graphical UEFI guests running Windows 2016. Changed slot number according to the example given in the FreeBSD Handbook section related to bhyve and Graphical UEFI guests Ivan Mishonov (1): Changed LPC slot from 1 to 31 src/bhyve/bhyve_command.c | 2 +- src/bhyve/bhyve_device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.18.0

1 1

[libvirt] [PATCH 0/3] Fix regression with vhostuser and chardev FD passing
by Daniel P. Berrangé 05 Jul '18

05 Jul '18

QEMU has a validation bug which prevents vhostuser accepting the chardev when it uses FD passing, despite it being functionally correct. While the QEMU bug is being fixed, we need to avoid hitting this problem with existing QEMU releases. The easiest way todo this is to simply disable FD passing for the chardev used with vhostuser only. Daniel P. Berrangé (3): qemu: remove chardevStdioLogd param from vhostuser code path qemu: consolidate parameters of qemuBuildChrChardevStr into flags qemu: don't use chardev FD passing for vhostuser backend src/qemu/qemu_command.c | 117 ++++++++++++++-------- tests/qemuxml2argvdata/net-vhostuser.args | 3 +- tests/qemuxml2argvtest.c | 2 +- 3 files changed, 75 insertions(+), 47 deletions(-) -- 2.17.1

2 6

[libvirt] [PATCH v3] Loop through all resolved addresses in virNetSocketNewListenTCP
by Olaf Hering 05 Jul '18

05 Jul '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 some appropriate error. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- v3: more whitespace fixes, as suggested by Daniel P. Berrang�� 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..3a055acd39 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; }

3 7

[libvirt] [PATCH 0/5] AUTHORS: Cleanups and fixes
by Andrea Bolognani 05 Jul '18

05 Jul '18

Comparing the generated AUTHORS file before and after these changes: AUTHORS | 51 +-------------------------------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) There would be plenty of room for additional deduplication, but that's how far I can get based on concrete data as opposed to relying on (more or less educated) guesses. Andrea Bolognani (5): AUTHORS: Remove unnecessary remark AUTHORS: Fix entries disagreeing with mailmap mailmap: Fix consolidation rules mailmap: Consolidate current and past maintainers AUTHORS: Avoid duplicated entries .mailmap | 16 +++++++++++++--- AUTHORS.in | 6 ++---- Makefile.am | 18 +++++++++++++----- 3 files changed, 28 insertions(+), 12 deletions(-) -- 2.17.1

3 7

[libvirt] [PATCH] conf: initialize character pointer xml value to avoid random crash
by Luyao Huang 05 Jul '18

05 Jul '18

If the code jump to the cleanup before assagin value to xml pointer, libvirtd may get crashed when try to free an uninitialized pointer. backtrace: 0 0x00007ffff428d59c in free () from /lib64/libc.so.6 1 0x00007ffff721314a in virFree (ptrptr=ptrptr@entry=0x7fffc67f1b00) at util/viralloc.c:582 2 0x00007ffff7345ac4 in virDomainConfNWFilterInstantiate (vmname=<optimized out>, vmuuid=vmuuid@entry=0x7fffc0181ca8 "߉\237\\۔H\262\206z\340\302f\265\233z", net=<optimized out>, ignoreExists=ignoreExists@entry=true) at conf/domain_nwfilter.c:122 3 0x00007fffca5a77f6 in qemuProcessFiltersInstantiate (ignoreExists=true, def=0x7fffc0181ca0) at qemu/qemu_process.c:3028 4 qemuProcessReconnect (opaque=<optimized out>) at qemu/qemu_process.c:7653 5 0x00007ffff72c4895 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 6 0x00007ffff45dcdd5 in start_thread () from /lib64/libpthread.so.0 7 0x00007ffff4305ead in clone () from /lib64/libc.so.6 Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_nwfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c index 948b324..24b5f42 100644 --- a/src/conf/domain_nwfilter.c +++ b/src/conf/domain_nwfilter.c @@ -90,7 +90,7 @@ virDomainConfNWFilterInstantiate(const char *vmname, virConnectPtr conn = virGetConnectNWFilter(); virNWFilterBindingDefPtr def = NULL; virNWFilterBindingPtr binding = NULL; - char *xml; + char *xml = NULL; int ret = -1; VIR_DEBUG("vmname=%s portdev=%s filter=%s ignoreExists=%d", -- 1.8.3.1

2 2

[libvirt] [PATCH] virsh.pod: Drop --persistent for detach-device-alias
by Michal Privoznik 05 Jul '18

05 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1598087 The detach-device-alias never supported --persistent argument. Drop it from the man page. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index dc100db9f3..003becb7c3 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3197,7 +3197,7 @@ Note that older versions of virsh used I<--config> as an alias for I<--persistent>. =item B<detach-device-alias> I<domain> I<alias> -[[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] +[[[I<--live>] [I<--config>] | [I<--current>]]]] Detach a device with given I<alias> from the I<domain>. -- 2.16.4

1 0

Re: [libvirt] [PATCH] conf: initialize character pointer xml value to avoid random crash
by Luyao Huang 05 Jul '18

05 Jul '18

What !! This can not be true :D Okay, looks like that github offline in a short time. BTW, CC libvirt-ci@ maybe better than libvirt-list@ (does this mail-list ever exist ?) BR, Luyao ----- Original Message ----- From: no-reply(a)patchew.org To: famz(a)redhat.com, lhuang(a)redhat.com Cc: libvir-list(a)redhat.com, lhuang(a)redhat.com Sent: Thursday, July 5, 2018 12:43:16 PM Subject: Re: [libvirt] [PATCH] conf: initialize character pointer xml value to avoid random crash Hi, This series was run against 'syntax-check' test by patchew.org, which failed, please find the details below: Type: series Message-id: 1530765251-5291-1-git-send-email-lhuang(a)redhat.com Subject: [libvirt] [PATCH] conf: initialize character pointer xml value to avoid random crash === TEST SCRIPT BEGIN === #!/bin/bash # Testing script will be invoked under the git checkout with # HEAD pointing to a commit that has the patches applied on top of "base" # branch time bash -c './autogen.sh && make syntax-check' === TEST SCRIPT END === Updating bcb55ab053bc79561b55d0394490f4b64e0f2d01 fatal: unable to access 'https://github.com/patchew-project/libvirt/': Failed to connect to github.com port 443: Connection timed out error: Could not fetch bcb55ab053bc79561b55d0394490f4b64e0f2d01 Traceback (most recent call last): File "./patchew-cli", line 514, in test_one git_clone_repo(clone, r["repo"], r["head"], logf) File "./patchew-cli", line 48, in git_clone_repo stdout=logf, stderr=logf) File "/usr/lib64/python3.6/subprocess.py", line 291, in check_call raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['git', 'remote', 'add', '-f', '--mirror=fetch', 'bcb55ab053bc79561b55d0394490f4b64e0f2d01', 'https://github.com/patchew-project/libvirt']' returned non-zero exit status 1. --- Email generated automatically by Patchew [http://patchew.org/] Please send your feedback to patchew-devel(a)redhat.com

1 0

[libvirt] [PATCH] util:Fix with process number and pid file do not match
by Bobo Du 04 Jul '18

04 Jul '18

Bobo Du (1): util:Fix with process number and pid file do not match src/util/virpidfile.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 1.8.3.1

3 3

[libvirt] [PATCH] util:Fix with process number and pid file do not match
by dubo163 04 Jul '18

04 Jul '18

From: dubobo <dubobo(a)didichuxing.com> the libvirtd pid file is not match the os process pid number which is smaller than before. this would be exist if the libvirtd process coredump or the os process was killed which the next pid number is smaller. you can be also edit the pid file to write the longer number than before,then restart the libvirtd service. Signed-off-by: dubobo <dubobo(a)didichuxing.com> --- src/util/virpidfile.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 58ab29f..8b0ff99 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -445,6 +445,12 @@ int virPidFileAcquirePath(const char *path, } snprintf(pidstr, sizeof(pidstr), "%lld", (long long) pid); + if (ftruncate(fd, 0) < 0) { + VIR_FORCE_CLOSE(fd); + return -1; + } + + lseek(fd, 0, SEEK_SET); if (safewrite(fd, pidstr, strlen(pidstr)) < 0) { virReportSystemError(errno, -- 1.8.3.1

4 5

[libvirt] ANNOUNCE: libvirt-dbus 1.2.0 released
by Pavel Hrdina 04 Jul '18

04 Jul '18

I'm happy to announce the release of libvirt-dbus 1.2.0. libvirt-dbus wraps libvirt API to provide high-level object-oriented API better suited for dbus-based applications. You can download it here: https://libvirt.org/sources/dbus/libvirt-dbus-1.2.0.tar.xz * Bug fixes - Properly deregister NodeDevice event callback * Improvements - Allow system access to users in the libvirt group - Switch to xz compression for release archives * Build-system fixes - Fix default polkit rule directory and make it configurable - Fix typo to properly build binaries with PIE Thanks everybody who contributed! Pavel

1 0

[libvirt] [PATCH 0/2] Two almost trivial fixes
by Michal Privoznik 04 Jul '18

04 Jul '18

that I haven't pushed. Michal Privoznik (2): src: Mention DEVICE_REMOVAL_FAILED event in virDomainDetachDeviceAlias docs qemu: Check for guest NUMA nodes properly when validating hugepages src/libvirt-domain.c | 4 +++- src/qemu/qemu_command.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.16.4

4 7

[libvirt] [PATCH 0/7] Couple of PR fixes and improvements
by Michal Privoznik 04 Jul '18

04 Jul '18

QEMU implemented event when pr-manager connects to/disconnects from pr-helper process. Also, it implemented query command to learn the pr-manager state on libvirtd restart. Whilst working on patches for this, I've noticed couple of other bugs too. Michal Privoznik (7): qemuProcessStartPRDaemonHook: Try to set NS iff domain was started with one qemuDomainValidateStorageSource: Relax PR validation virStoragePRDefFormat: Suppress path formatting for migratable XML virstoragefile: Introduce virStorageSourceChainGetManagedPRAlias qemu: Wire up PR_MANAGER_STATUS_CHANGED event qemu_monitor: Introduce qemuMonitorJSONGetPRManagerInfo qemu: Fetch pr-helper process info on reconnect src/conf/domain_conf.c | 3 +- src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 21 +++---- src/qemu/qemu_monitor.c | 40 ++++++++++++ src/qemu/qemu_monitor.h | 20 ++++++ src/qemu/qemu_monitor_json.c | 113 ++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 4 ++ src/qemu/qemu_process.c | 143 +++++++++++++++++++++++++++++++++++++++++-- src/util/virstoragefile.c | 20 +++++- src/util/virstoragefile.h | 6 +- 10 files changed, 349 insertions(+), 22 deletions(-) -- 2.16.4

3 16

[libvirt] [PATCH] qemuDomainNestedJobAllowed: Allow QEMU_JOB_NONE
by Michal Privoznik 04 Jul '18

04 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1598084 When creating a snapshot with --quiesce an async job is grabbed and just before executing guest fs-freeze command an agent job is grabbed. This is achieved by calling qemuDomainObjBeginJobInternal(job = QEMU_JOB_NONE, agentJob = QEMU_AGENT_JOB_MODIFY); Since there already is an async job set on the domain (by the same thread) qemuDomainNestedJobAllowed(priv, job) is consulted if @job is allowed by job mask. But this function returns false (meaning sync @job is not allowed) which leads to a deadlock. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a60bca29ca..1b8fb71ba8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6414,7 +6414,9 @@ qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj) static bool qemuDomainNestedJobAllowed(qemuDomainObjPrivatePtr priv, qemuDomainJob job) { - return !priv->job.asyncJob || (priv->job.mask & JOB_MASK(job)) != 0; + return !priv->job.asyncJob || + job == QEMU_JOB_NONE || + (priv->job.mask & JOB_MASK(job)) != 0; } bool -- 2.16.4

2 1

[libvirt] perl-Sys-Virt docs and linker options
by Olaf Hering 04 Jul '18

04 Jul '18

The docs in libvirt-perl.git refer still to Makefile.PL. In the buildlog I noticed that somehow /usr/local is used, nothing uses the relevant flags from libvirt.pc: cc -shared -L/usr/local/lib64 -fstack-protector -o blib/arch/auto/Sys/Virt/Virt.so lib/Sys/Virt.o -lvirt But even the patch below just appends -L %{_libdir} to that command. Any idea how to suppress -L/usr/local/lib64? It happens to work for me, likely because the toolchain has /usr/lib64 in a default path. Olaf --- Sys-Virt-20180703T160550.57299b4.orig/Build.PL +++ Sys-Virt-20180703T160550.57299b4/Build.PL @@ -24,6 +24,7 @@ die "libvirt >= $libvirtver is required\ my $LIBVIRT_LIBS = `pkg-config --libs libvirt`; my $LIBVIRT_CFLAGS = `pkg-config --cflags libvirt`; +my $LIBVIRT_LIBDIR = `pkg-config --variable=libdir libvirt`; my $GCC_CFLAGS = ""; if ($ENV{TEST_MAINTAINER}) { @@ -76,7 +77,7 @@ my $b = Module::Build->new( 'perl' => '5.8.0', }, extra_compiler_flags => $GCC_CFLAGS . $LIBVIRT_CFLAGS, - extra_linker_flags => $LIBVIRT_LIBS, + extra_linker_flags => "-L" . $LIBVIRT_LIBDIR . $LIBVIRT_LIBS , build_requires => { 'ExtUtils::CBuilder' => 0, 'Sys::Hostname' => 0,

2 1

[libvirt] [dbus PATCH] AUTHORS: Avoid duplicated entries
by Andrea Bolognani 04 Jul '18

04 Jul '18

Instead of simply dumping the list of authors as obtained from git, we can be a bit smarter and filter out maintainers so that their names don't appear twice. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- AUTHORS.in | 2 +- Makefile.am | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/AUTHORS.in b/AUTHORS.in index 12e66e1..52202ea 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -13,4 +13,4 @@ The primary maintainers of libvirt-dbus are: Patches have been received from: -#authorslist# +#contributorslist# diff --git a/Makefile.am b/Makefile.am index 92eebcb..2c9e588 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,9 +28,17 @@ dist-hook: gen-AUTHORS # and insert it into the directory we're about to use to create a tarball. .PHONY: gen-AUTHORS gen-AUTHORS: - $(AM_V_GEN)if test -d $(srcdir)/.git; then \ - out="`cd $(srcdir) && git log --pretty=format:' %aN <%aE>' | sort -u`" && \ - perl -p -e "s/#authorslist#// and print '$$out'" \ - < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ - mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ + $(AM_V_GEN)\ + if test -d $(srcdir)/.git; then \ + ( \ + cd $(srcdir) && \ + git log --pretty=format:' %aN <%aE>' | sort -u \ + ) > all.list && \ + sort -u $(srcdir)/AUTHORS.in > maint.list && \ + comm -23 all.list maint.list > contrib.list && \ + contrib="`cat contrib.list`" && \ + perl -p -e "s/#contributorslist#// and print '$$contrib'" \ + < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS && \ + rm -f all.list maint.list contrib.list; \ fi -- 2.17.1

2 1

[libvirt] [PATCH] qemu: hotplug: Don't access srcPriv when it's not allocated
by Peter Krempa 04 Jul '18

04 Jul '18

The private data of a virStorageSource which is backing an iSCSI hostdev may be NULL if no authentication is present. The code handling the hotplug would attempt to extract the authentication info stored in 'secinfo' without checking if it is allocated which resulted in a crash. Here we opt the easy way to check if srcPriv is not NULL so that we don't duplicate all the logic which selects whether the disk source has a secret. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1597550 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_hotplug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fcd8eb0ffa..075f2fb72e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2240,7 +2240,8 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr driver, if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { qemuDomainStorageSourcePrivatePtr srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(scsisrc->u.iscsi.src); - secinfo = srcPriv->secinfo; + if (srcPriv) + secinfo = srcPriv->secinfo; } if (secinfo && secinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES) { -- 2.16.2

3 4

[libvirt] [dbus PATCH 0/2] AUTHORS: Style improvements
by Andrea Bolognani 04 Jul '18

04 Jul '18

Andrea Bolognani (2): AUTHORS: Remove unnecessary remark AUTHORS: Indent list of contributors AUTHORS.in | 2 -- Makefile.am | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) -- 2.17.1

2 5

[libvirt] [dbus PATCH] AUTHORS: Update maintainers and original authors
by Pavel Hrdina 04 Jul '18

04 Jul '18

Create section for authors that started the project and add Katerina into the list of primary maintainers. Suggested-by: Andrea Bolognani <abologna(a)redhat.com> Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- AUTHORS.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/AUTHORS.in b/AUTHORS.in index 988dd6a..4dcd915 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -1,11 +1,16 @@ libvirt-dbus Authors ==================== -The primary maintainers of libvirt-dbus are: +The libvirt-dbus project was initiated by: Lars Karlitski <lars(a)karlitski.net> Pavel Hrdina <phrdina(a)redhat.com> +The primary maintainers of libvirt-dbus are: + + Katerina Koukiou <kkoukiou(a)redhat.com> + Pavel Hrdina <phrdina(a)redhat.com> + Patches have been received from: #authorslist# -- 2.17.1

3 3

[libvirt] [PATCH -v2 0/2] esx: use coccinelle to avoid code duplication
by Marcos Paulo de Souza 04 Jul '18

04 Jul '18

Hi guys, in this second version I address the comments of Michal and Matthias. Changes from v1 are placed in each patch. Please let me know if you have more suggestions for the approach taken. Thanks, Marcos Paulo de Souza (2): esx_util.h: Add ESX_VI_CHECK_ARG_LIST macro esx: Use ESX_VI_CHECK_ARG_LIST macro to avoid code duplication src/esx/esx_driver.c | 5 +- src/esx/esx_network_driver.c | 10 +-- src/esx/esx_util.c | 5 +- src/esx/esx_util.h | 8 ++ src/esx/esx_vi.c | 165 +++++++---------------------------- src/esx/esx_vi_methods.c | 10 +-- src/esx/esx_vi_types.c | 51 +++-------- 7 files changed, 57 insertions(+), 197 deletions(-) -- 2.17.1

2 4

[libvirt] [dbus PATCH] AUTHORS: Update maintainers list
by Andrea Bolognani 04 Jul '18

04 Jul '18

List Katerina, who is currently the top libvirt-dbus contributor by number of commits, among the maintainers. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- AUTHORS.in | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.in b/AUTHORS.in index 988dd6a..bb09e0e 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -5,6 +5,7 @@ The primary maintainers of libvirt-dbus are: Lars Karlitski <lars(a)karlitski.net> Pavel Hrdina <phrdina(a)redhat.com> + Katerina Koukiou <kkoukiou(a)redhat.com> Patches have been received from: -- 2.17.1

1 0

[libvirt] [PATCH 0/4] domain_addr: make functions static
by Anya Harter 04 Jul '18

04 Jul '18

which are unused outside domain_addr.c The commit where the last external use was removed is linked in each commit when it exists Anya Harter (4): domain_addr: make virDomainPCIAddressBusIsEmpty static domain_addr: make virDomainCCWAddress funcs static domain_addr: make virDomainVirtioSerialAddr funcs static domain_addr: make virDomainUSBAddressPortFormat static src/conf/domain_addr.c | 197 +++++++++++++++++++-------------------- src/conf/domain_addr.h | 39 -------- src/libvirt_private.syms | 8 -- 3 files changed, 98 insertions(+), 146 deletions(-) -- 2.17.1

2 5

[libvirt] [dbus PATCH] connect: fix g_free order in virtDBusConnectFree
by Anya Harter 04 Jul '18

04 Jul '18

so that g_free(connect->nodeDevPath) line appears in alphabetical order with the rest of the lines Signed-off-by: Anya Harter <aharter(a)redhat.com> --- src/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/connect.c b/src/connect.c index 9ebceaa..9275121 100644 --- a/src/connect.c +++ b/src/connect.c @@ -1808,9 +1808,9 @@ virtDBusConnectFree(virtDBusConnect *connect) if (connect->connection) virtDBusConnectClose(connect, TRUE); - g_free(connect->nodeDevPath); g_free(connect->domainPath); g_free(connect->networkPath); + g_free(connect->nodeDevPath); g_free(connect->nwfilterPath); g_free(connect->secretPath); g_free(connect->storagePoolPath); -- 2.17.1

3 4

[libvirt] [PATCH] qemu: Added support L2 table cache for qcow2 disk.
by dujiancheng 04 Jul '18

04 Jul '18

From: Dujiancheng <dujiancheng10(a)gmail.com> dujiancheng (1): qemu: Added support L2 table cache for qcow2 disk. L2 table cache can be set by the new element diskCache. Use the following methods to set the L2 table cache and cache clean interval: <diskCache> <cache level='2'> <size unit='KiB'>10240</size> </cache> <clean interval='900'/> </diskCache> Signed-off-by: dujiancheng <dujiancheng10(a)gmail.com> --- docs/formatdomain.html.in | 25 +++++++++++++ docs/schemas/domaincommon.rng | 26 ++++++++++++++ src/conf/domain_conf.c | 63 ++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 5 +++ src/qemu/qemu_command.c | 6 ++++ src/qemu/qemu_domain.c | 6 ++++ tests/qemuxml2argvdata/disk-cache.args | 30 ++++++++++++++++ tests/qemuxml2argvdata/disk-cache.xml | 40 +++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/disk-cache.xml | 46 ++++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 11 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/disk-cache.args create mode 100644 tests/qemuxml2argvdata/disk-cache.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cache.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0d68596..2afeb2b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2719,6 +2719,12 @@ <backingStore type='file'> <format type='qcow2'/> <source file='/var/lib/libvirt/images/snapshot.qcow'/> + <diskCache> + <cache level='2'> + <size unit='KiB'>128</size> + </cache> + <clean interval='8'/> + </diskCache> <backingStore type='block'> <format type='raw'/> <source dev='/dev/mapper/base'/> @@ -3582,6 +3588,25 @@ </dd> </dl> </dd> + <dt><code>diskCache</code></dt> + <dd>The <code>diskCache</code> allows setting the L2 cache + and cache clean interval values of the qcow2 image with + the following properties. + <span class="since">Since 2.5(QEMU and KVM)</span> + <dl> + <dt><code>cache</code></dt> + <dd>The <code>level</code> attribute allows you to set the + level of the cache, temporarily only supports level 2 cache. + The <code>size</code> allows you to set the size of the cache + and can specify the unit + </dd> + <dt><code>clean</code></dt> + <dd>The <code>interval</code> allow setting cache expiration time + in seconds + </dd> + </dl> + + </dd> </dl> <h4><a id="elementsFilesystems">Filesystems</a></h4> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f46145c..04bc9e1 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1388,8 +1388,34 @@ </data> </element> </optional> + <optional> + <ref name="diskCache"/> + </optional> </interleave> </define> +<define name="diskCache"> + <element name="diskCache"> + <interleave> + <optional> + <element name="cache"> + <attribute name="level"> + <ref name="unsignedInt"/> + </attribute> + <element name="size"> + <ref name='scaledInteger'/> + </element> + </element> + </optional> + <optional> + <element name="clean"> + <attribute name="interval"> + <ref name="unsignedInt"/> + </attribute> + </element> + </optional> + </interleave> + </element> +</define> <define name="snapshot"> <attribute name="snapshot"> <choice> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b8b5345..9b6f445 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8894,6 +8894,37 @@ virDomainDiskSourceParse(xmlNodePtr node, return 0; } +static int +virDomainDiskCacheParse(xmlNodePtr node, + xmlXPathContextPtr ctxt, + virDomainDiskDefPtr def) +{ + int ret = -1; + xmlNodePtr saveNode = ctxt->node; + ctxt->node = node; + if (virXPathUInt("string(./clean/@interval)", ctxt, &def->disk_cache.clean_interval) < -1) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("malformed disk cache clean interval")); + goto cleanup; + } + + if (virXPathUInt("string(./cache/@level)", ctxt, &def->disk_cache.cache_level) < -1) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("malformed disk cache level")); + goto cleanup; + } + + if (virDomainParseMemory("./cache/size", NULL, ctxt, + &def->disk_cache.cache_size, false, true) < 0) + goto cleanup; + + ret = 0; + + cleanup: + ctxt->node = saveNode; + return ret; + +} static int virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt, @@ -9701,6 +9732,10 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, } } else if (virXMLNodeNameEqual(cur, "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ + } else if (virXMLNodeNameEqual(cur, "diskCache")) { + + if (virDomainDiskCacheParse(cur, ctxt, def) < 0) + goto error; } } @@ -23369,7 +23404,32 @@ virDomainDiskBlockIoDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } } - +static void +virDomainDiskCacheDefFormat(virBufferPtr buf, + virDomainDiskDefPtr def) +{ + if (def->disk_cache.cache_size > 0 || + def->disk_cache.clean_interval > 0) { + virBufferAddLit(buf, "<diskCache>\n"); + virBufferAdjustIndent(buf, 2); + if (def->disk_cache.cache_level == 2 && def->disk_cache.cache_size > 0) { + virBufferAddLit(buf, "<cache level='2'>\n"); + virBufferAdjustIndent(buf, 2); + virBufferAsprintf(buf, + "<size unit='KiB'>%llu</size>\n", + def->disk_cache.cache_size); + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</cache>\n"); + } + if (def->disk_cache.clean_interval > 0) { + virBufferAsprintf(buf, + "<clean interval='%u'/>\n", + def->disk_cache.clean_interval); + } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</diskCache>\n"); + } +} static void virDomainSourceDefFormatSeclabel(virBufferPtr buf, @@ -23869,6 +23929,7 @@ virDomainDiskDefFormat(virBufferPtr buf, virDomainDiskGeometryDefFormat(buf, def); virDomainDiskBlockIoDefFormat(buf, def); + virDomainDiskCacheDefFormat(buf, def); if (virDomainDiskDefFormatMirror(buf, def, flags, xmlopt) < 0) return -1; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 71437dc..7f87a1a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -647,6 +647,11 @@ struct _virDomainDiskDef { unsigned int physical_block_size; } blockio; + struct { + unsigned int cache_level; + unsigned long long cache_size; + unsigned int clean_interval; + } disk_cache; virDomainBlockIoTuneInfo blkdeviotune; char *driverName; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4fc3176..54fc642 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1637,6 +1637,12 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (qemuBuildDriveSourceStr(disk, qemuCaps, &opt) < 0) goto error; + if (disk->disk_cache.cache_level == 2 && disk->disk_cache.cache_size > 0) + virBufferAsprintf(&opt, "l2-cache-size=%llu,", + disk->disk_cache.cache_size); + if (disk->disk_cache.clean_interval > 0) + virBufferAsprintf(&opt, "cache-clean-interval=%u,", + disk->disk_cache.clean_interval); if (qemuDiskBusNeedsDeviceArg(disk->bus)) { char *drivealias = qemuAliasDiskDriveFromDisk(disk); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fee4481..cca78fc 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8627,6 +8627,12 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk, CHECK_EQ(ioeventfd, "ioeventfd", true); CHECK_EQ(event_idx, "event_idx", true); CHECK_EQ(copy_on_read, "copy_on_read", true); + CHECK_EQ(disk_cache.cache_level, + "diskCache cache_level", true); + CHECK_EQ(disk_cache.cache_size, + "diskCache cache_size", true); + CHECK_EQ(disk_cache.clean_interval, + "diskCache clean_interval", true); /* "snapshot" is a libvirt internal field and thus can be changed */ /* startupPolicy is allowed to be updated. Therefore not checked here. */ CHECK_EQ(transient, "transient", true); diff --git a/tests/qemuxml2argvdata/disk-cache.args b/tests/qemuxml2argvdata/disk-cache.args new file mode 100644 index 0000000..bbc61e4 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-cache.args @@ -0,0 +1,30 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/tmp/data.img,format=raw,l2-cache-size=10240,cache-clean-interval=900,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-drive file=/tmp/logs.img,format=raw,if=none,id=drive-virtio-disk1 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ +id=virtio-disk1 diff --git a/tests/qemuxml2argvdata/disk-cache.xml b/tests/qemuxml2argvdata/disk-cache.xml new file mode 100644 index 0000000..54cfa6c --- /dev/null +++ b/tests/qemuxml2argvdata/disk-cache.xml @@ -0,0 +1,40 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/tmp/data.img'/> + <diskCache> + <cache level='2'> + <size unit='KiB'>10240</size> + </cache> + <clean interval='900'/> + </diskCache> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/tmp/logs.img'/> + <target dev='vdb' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c279ac4..994afc4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1008,6 +1008,7 @@ mymain(void) QEMU_CAPS_VIRTIO_S390); DO_TEST("disk-many", NONE); DO_TEST("disk-virtio", QEMU_CAPS_DRIVE_BOOT); + DO_TEST("disk-cache", NONE); DO_TEST("disk-virtio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("disk-virtio-ccw-many", diff --git a/tests/qemuxml2xmloutdata/disk-cache.xml b/tests/qemuxml2xmloutdata/disk-cache.xml new file mode 100644 index 0000000..015ca3e --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-cache.xml @@ -0,0 +1,46 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/tmp/data.img'/> + <diskCache> + <cache level='2'> + <size unit='KiB'>10240</size> + </cache> + <clean interval='900'/> + </diskCache> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/tmp/logs.img'/> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index eac6d5b..7f6340d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -404,6 +404,7 @@ mymain(void) QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-mirror-old", NONE); DO_TEST("disk-mirror", NONE); + DO_TEST("disk-cache", NONE); DO_TEST_FULL("disk-active-commit", WHEN_ACTIVE, GIC_NONE, NONE); DO_TEST("graphics-listen-network", NONE); DO_TEST("graphics-vnc", NONE); -- 1.8.3.1

3 2

[libvirt] [PATCH] util:Fix with process number and pid file do not match
by dubobo 04 Jul '18

04 Jul '18

dubobo (1): util:Fix with process number and pid file do not match src/util/virpidfile.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 1.8.3.1

1 1

[libvirt] [PATCH 0/2] esx: Couple of fixes
by Michal Privoznik 03 Jul '18

03 Jul '18

*** BLURB HERE *** Michal Privoznik (2): esx: Report error in esxVI_LookupVirtualMachineByName esx: De-duplicate @virtualMachine check in esxDomainLookupByName src/esx/esx_driver.c | 7 +------ src/esx/esx_vi.c | 5 ++++- 2 files changed, 5 insertions(+), 7 deletions(-) -- 2.16.4

3 4

[libvirt] [PATCH v2] qemu: move qemuDomainCCWAddrSetCreateFromDomain
by Anya Harter 03 Jul '18

03 Jul '18

from src/qemu/qemu_domain_address.c to src/conf/domain_addr.c and rename to virDomainCCWAddressSetCreateFromDomain (rename to have Address in full instead of Addr to follow the naming convention of other virDomainCCWAddress functions) Signed-off-by: Anya Harter <aharter(a)redhat.com> --- renamed function in v2 patch (reason supplied in commit message) original patch email: https://www.redhat.com/archives/libvir-list/2018-June/msg01823.html src/conf/domain_addr.c | 24 ++++++++++++++++++++++++ src/conf/domain_addr.h | 4 ++++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain_address.c | 26 ++------------------------ src/qemu/qemu_domain_address.h | 4 ---- src/qemu/qemu_hotplug.c | 4 ++-- 6 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index fd66a74e9d..eb0784cd2c 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1185,6 +1185,30 @@ virDomainCCWAddressSetCreate(void) } +virDomainCCWAddressSetPtr +virDomainCCWAddressSetCreateFromDomain(virDomainDefPtr def) +{ + virDomainCCWAddressSetPtr addrs = NULL; + + if (!(addrs = virDomainCCWAddressSetCreate())) + goto error; + + if (virDomainDeviceInfoIterate(def, virDomainCCWAddressValidate, + addrs) < 0) + goto error; + + if (virDomainDeviceInfoIterate(def, virDomainCCWAddressAllocate, + addrs) < 0) + goto error; + + return addrs; + + error: + virDomainCCWAddressSetFree(addrs); + return NULL; +} + + #define VIR_DOMAIN_DEFAULT_VIRTIO_SERIAL_PORTS 31 diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h index 2764070cd2..776399eb63 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -202,6 +202,10 @@ int virDomainCCWAddressValidate(virDomainDefPtr def, virDomainCCWAddressSetPtr virDomainCCWAddressSetCreate(void); +virDomainCCWAddressSetPtr +virDomainCCWAddressSetCreateFromDomain(virDomainDefPtr def) + ATTRIBUTE_NONNULL(1); + struct _virDomainVirtioSerialController { unsigned int idx; virBitmapPtr ports; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ffe5dfd19b..7000620b41 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -107,6 +107,7 @@ virPCIDeviceAddressParseXML; virDomainCCWAddressAllocate; virDomainCCWAddressAssign; virDomainCCWAddressSetCreate; +virDomainCCWAddressSetCreateFromDomain; virDomainCCWAddressSetFree; virDomainCCWAddressValidate; virDomainPCIAddressAsString; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index e9f460d77a..eb11a660d7 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -376,28 +376,6 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDefPtr def, } } -virDomainCCWAddressSetPtr -qemuDomainCCWAddrSetCreateFromDomain(virDomainDefPtr def) -{ - virDomainCCWAddressSetPtr addrs = NULL; - - if (!(addrs = virDomainCCWAddressSetCreate())) - goto error; - - if (virDomainDeviceInfoIterate(def, virDomainCCWAddressValidate, - addrs) < 0) - goto error; - - if (virDomainDeviceInfoIterate(def, virDomainCCWAddressAllocate, - addrs) < 0) - goto error; - - return addrs; - - error: - virDomainCCWAddressSetFree(addrs); - return NULL; -} /* * Three steps populating CCW devnos @@ -420,7 +398,7 @@ qemuDomainAssignS390Addresses(virDomainDefPtr def, qemuDomainPrimeVirtioDeviceAddresses( def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW); - if (!(addrs = qemuDomainCCWAddrSetCreateFromDomain(def))) + if (!(addrs = virDomainCCWAddressSetCreateFromDomain(def))) goto cleanup; } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390)) { @@ -3027,7 +3005,7 @@ qemuDomainEnsureVirtioAddress(bool *releaseAddr, } if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { - if (!(ccwaddrs = qemuDomainCCWAddrSetCreateFromDomain(vm->def))) + if (!(ccwaddrs = virDomainCCWAddressSetCreateFromDomain(vm->def))) goto cleanup; if (virDomainCCWAddressAssign(info, ccwaddrs, !info->addr.ccw.assigned) < 0) diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index 83f8e81cad..89d7a5ac3e 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -59,10 +59,6 @@ void qemuDomainReleaseDeviceAddress(virDomainObjPtr vm, virDomainDeviceInfoPtr info, const char *devstr); -virDomainCCWAddressSetPtr -qemuDomainCCWAddrSetCreateFromDomain(virDomainDefPtr def) - ATTRIBUTE_NONNULL(1); - int qemuDomainAssignMemoryDeviceSlot(virDomainDefPtr def, virDomainMemoryDefPtr mem); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fcd8eb0ffa..f028175fb4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -964,7 +964,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, if (qemuDomainIsS390CCW(vm->def) && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW)) { net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; - if (!(ccwaddrs = qemuDomainCCWAddrSetCreateFromDomain(vm->def))) + if (!(ccwaddrs = virDomainCCWAddressSetCreateFromDomain(vm->def))) goto cleanup; if (virDomainCCWAddressAssign(&net->info, ccwaddrs, !net->info.addr.ccw.assigned) < 0) @@ -2375,7 +2375,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driver, if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) goto cleanup; } else if (hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { - if (!(ccwaddrs = qemuDomainCCWAddrSetCreateFromDomain(vm->def))) + if (!(ccwaddrs = virDomainCCWAddressSetCreateFromDomain(vm->def))) goto cleanup; if (virDomainCCWAddressAssign(hostdev->info, ccwaddrs, !hostdev->info->addr.ccw.assigned) < 0) -- 2.17.1

2 1

[libvirt] [PATCH] rpm: add new nwfilter RNGs to mingw-libvirt spec file
by Daniel P. Berrangé 03 Jul '18

03 Jul '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix mingw-libvirt.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 917d2143d8..cc1e619927 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -248,6 +248,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw32_datadir}/libvirt/schemas/networkcommon.rng %{mingw32_datadir}/libvirt/schemas/nodedev.rng %{mingw32_datadir}/libvirt/schemas/nwfilter.rng +%{mingw32_datadir}/libvirt/schemas/nwfilter_params.rng +%{mingw32_datadir}/libvirt/schemas/nwfilterbinding.rng %{mingw32_datadir}/libvirt/schemas/secret.rng %{mingw32_datadir}/libvirt/schemas/storagecommon.rng %{mingw32_datadir}/libvirt/schemas/storagepool.rng @@ -333,6 +335,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw64_datadir}/libvirt/schemas/networkcommon.rng %{mingw64_datadir}/libvirt/schemas/nodedev.rng %{mingw64_datadir}/libvirt/schemas/nwfilter.rng +%{mingw64_datadir}/libvirt/schemas/nwfilter_params.rng +%{mingw64_datadir}/libvirt/schemas/nwfilterbinding.rng %{mingw64_datadir}/libvirt/schemas/secret.rng %{mingw64_datadir}/libvirt/schemas/storagecommon.rng %{mingw64_datadir}/libvirt/schemas/storagepool.rng -- 2.17.1

1 0

[libvirt] [PATCH] util:Fix with process number and pid file do not match
by dubo163 03 Jul '18

03 Jul '18

dubo163 (1): util:Fix with process number and pid file do not match src/util/virpidfile.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 1.8.3.1

2 2

[libvirt] [PATCH 0/2] domain_addr: move qemu function and rename
by Anya Harter 03 Jul '18

03 Jul '18

qemuDomainCCWAddrSetCreateFromDomain moved from qemu_domain_addr to domain_addr and rename to virDomainCCWAddrSetCreateFromDomain because it is not a qemu-specific function Anya Harter (2): qemu: move qemuDomainCCWAddrSetCreateFromDomain domain_addr: refactor qemuDomainCCWAddrSetCreateFromDomain src/conf/domain_addr.c | 24 ++++++++++++++++++++++++ src/conf/domain_addr.h | 4 ++++ src/qemu/qemu_domain_address.c | 26 ++------------------------ src/qemu/qemu_domain_address.h | 4 ---- src/qemu/qemu_hotplug.c | 4 ++-- 5 files changed, 32 insertions(+), 30 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH 1/3] esx_vi.c: Simplify error handling in MachineByName
by Marcos Paulo de Souza 03 Jul '18

03 Jul '18

The same pattern is used in lots of other places. Signed-off-by: Marcos Paulo de Souza <marcos.souza.org(a)gmail.com> --- src/esx/esx_vi.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 43ff7ea048..25fbdc7e44 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -3014,16 +3014,10 @@ esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char *name, break; } - if (!(*virtualMachine)) { - if (occurrence == esxVI_Occurrence_OptionalItem) { - result = 0; - - goto cleanup; - } else { - virReportError(VIR_ERR_NO_DOMAIN, - _("Could not find domain with name '%s'"), name); - goto cleanup; - } + if (!(*virtualMachine) && occurrence != esxVI_Occurrence_OptionalItem) { + virReportError(VIR_ERR_NO_DOMAIN, + _("Could not find domain with name '%s'"), name); + goto cleanup; } result = 0; -- 2.17.1

3 9

[libvirt] [PATCH 0/5] viriscsi: Couple of fixes
by Michal Privoznik 03 Jul '18

03 Jul '18

I've noticed that I'm unable to start my iscsi pool if I put my own IQN into the pool XML. This is very surprising because iscsiadm would read it from initiatorname.conf file, right? Well, no. If IQN is provided in pool XML the code calls slightly different iscsiadm commands (e.g. to set up iSCSI interface) and we don't pass the interface everywhere we should. Michal Privoznik (5): virStorageBackendIQNFound: Fix ret value assignment virStorageBackendIQNFound: Rename out label virStorageBackendIQNFound: Rework iscsiadm output parsing virISCSIScanTargets: Honour iSCSI interface virISCSIScanTargets: Allow making targets persistent src/storage/storage_backend_iscsi.c | 5 +- src/util/viriscsi.c | 197 +++++++++++++++++++++++------------- src/util/viriscsi.h | 2 + tests/viriscsitest.c | 3 +- 4 files changed, 137 insertions(+), 70 deletions(-) -- 2.16.4

4 21

[libvirt] [PATCH] qemuOpenFileAs: Lose bypassSecurityDriver
by Michal Privoznik 03 Jul '18

03 Jul '18

This argument is not used anymore. The only function that is passing non-NULL (qemuDomainSaveMemory) does not actually care for the value (after 23087cfdb) and every other caller just passes NULL anyway. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 825b2b27e6..9a35e04a85 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -152,7 +152,7 @@ static int qemuDomainManagedSaveLoad(virDomainObjPtr vm, static int qemuOpenFileAs(uid_t fallback_uid, gid_t fallback_gid, bool dynamicOwnership, const char *path, int oflags, - bool *needUnlink, bool *bypassSecurityDriver); + bool *needUnlink); static int qemuGetDHCPInterfaces(virDomainPtr dom, virDomainObjPtr vm, @@ -2984,9 +2984,6 @@ qemuCompressGetCommand(virQEMUSaveFormat compression) * @path: path to file to open * @oflags: flags for opening/creation of the file * @needUnlink: set to true if file was created by this function - * @bypassSecurityDriver: optional pointer to a boolean that will be set to true - * if security driver operations are pointless (due to - * NFS mount) * * Internal function to properly create or open existing files, with * ownership affected by qemu driver setup and domain DAC label. @@ -3001,8 +2998,7 @@ qemuOpenFile(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *path, int oflags, - bool *needUnlink, - bool *bypassSecurityDriver) + bool *needUnlink) { int ret = -1; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); @@ -3021,7 +3017,7 @@ qemuOpenFile(virQEMUDriverPtr driver, goto cleanup; ret = qemuOpenFileAs(user, group, dynamicOwnership, - path, oflags, needUnlink, bypassSecurityDriver); + path, oflags, needUnlink); cleanup: return ret; @@ -3031,12 +3027,11 @@ static int qemuOpenFileAs(uid_t fallback_uid, gid_t fallback_gid, bool dynamicOwnership, const char *path, int oflags, - bool *needUnlink, bool *bypassSecurityDriver) + bool *needUnlink) { struct stat sb; bool is_reg = true; bool need_unlink = false; - bool bypass_security = false; unsigned int vfoflags = 0; int fd = -1; int path_shared = virFileIsSharedFS(path); @@ -3134,19 +3129,11 @@ qemuOpenFileAs(uid_t fallback_uid, gid_t fallback_gid, path); goto cleanup; } - - /* Since we had to setuid to create the file, and the fstype - is NFS, we assume it's a root-squashing NFS share, and that - the security driver stuff would have failed anyway */ - - bypass_security = true; } } cleanup: if (needUnlink) *needUnlink = need_unlink; - if (bypassSecurityDriver) - *bypassSecurityDriver = bypass_security; return fd; error: @@ -3198,7 +3185,6 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, unsigned int flags, qemuDomainAsyncJob asyncJob) { - bool bypassSecurityDriver = false; bool needUnlink = false; int ret = -1; int fd = -1; @@ -3218,7 +3204,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, } fd = qemuOpenFile(driver, vm, path, O_WRONLY | O_TRUNC | O_CREAT | directFlag, - &needUnlink, &bypassSecurityDriver); + &needUnlink); if (fd < 0) goto cleanup; @@ -3249,7 +3235,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, if (qemuFileWrapperFDClose(vm, wrapperFd) < 0) goto cleanup; - if ((fd = qemuOpenFile(driver, vm, path, O_WRONLY, NULL, NULL)) < 0 || + if ((fd = qemuOpenFile(driver, vm, path, O_WRONLY, NULL)) < 0 || virQEMUSaveDataFinish(data, &fd, path) < 0) goto cleanup; @@ -3809,7 +3795,7 @@ doCoreDump(virQEMUDriverPtr driver, * created. */ if ((fd = qemuOpenFile(driver, vm, path, O_CREAT | O_TRUNC | O_WRONLY | directFlag, - NULL, NULL)) < 0) + NULL)) < 0) goto cleanup; if (!(wrapperFd = virFileWrapperFdNew(&fd, path, flags))) @@ -6419,7 +6405,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto error; - if ((fd = qemuOpenFile(driver, NULL, path, oflags, NULL, NULL)) < 0) + if ((fd = qemuOpenFile(driver, NULL, path, oflags, NULL)) < 0) goto error; if (bypass_cache && !(*wrapperFd = virFileWrapperFdNew(&fd, path, @@ -11863,7 +11849,7 @@ qemuDomainStorageOpenStat(virQEMUDriverPtr driver, { if (virStorageSourceIsLocalStorage(src)) { if ((*ret_fd = qemuOpenFile(driver, vm, src->path, O_RDONLY, - NULL, NULL)) < 0) + NULL)) < 0) return -1; if (fstat(*ret_fd, ret_sb) < 0) { -- 2.16.4

2 1

[libvirt] [PATCH v4] qemu: format serial and geometry on frontend disk device
by Daniel P. Berrangé 03 Jul '18

03 Jul '18

Currently we format the serial, geometry and error policy on the -drive backend argument. QEMU added the ability to set serial and geometry on the frontend in the 1.2 release deprecating use of -drive, with support being deleted from -drive in 3.0. We keep formatting error policy on -drive for now, because we don't ahve support for that with -device for usb-storage just yet. Note that some disk buses (sd) still don't support -device. Although QEMU allowed these properties to be set on -drive for if=sd, they have been ignored so we now report an error in this case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Changed in v4: - Move error checks to post parse validator src/qemu/qemu_command.c | 13 ++++----- src/qemu/qemu_domain.c | 27 +++++++++++++++++++ .../disk-drive-network-tlsx509.args | 12 ++++----- .../disk-drive-network-vxhs.args | 4 +-- tests/qemuxml2argvdata/disk-drive-shared.args | 5 ++-- tests/qemuxml2argvdata/disk-geometry.args | 6 ++--- tests/qemuxml2argvdata/disk-ide-wwn.args | 5 ++-- .../qemuxml2argvdata/disk-scsi-disk-wwn.args | 4 +-- tests/qemuxml2argvdata/disk-serial.args | 10 +++---- tests/qemuxml2argvdata/disk-serial.xml | 1 - tests/qemuxml2xmloutdata/disk-serial.xml | 1 - 11 files changed, 57 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 70acbde80a..04c5c28438 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1613,7 +1613,7 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk, disk->geometry.sectors); if (disk->geometry.trans != VIR_DOMAIN_DISK_TRANS_DEFAULT) - virBufferAsprintf(buf, ",trans=%s", + virBufferAsprintf(buf, ",bios-chs-trans=%s", virDomainDiskGeometryTransTypeToString(disk->geometry.trans)); } @@ -1621,8 +1621,6 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk, virBufferAddLit(buf, ",serial="); virBufferEscape(buf, '\\', " ", "%s", disk->serial); } - - qemuBuildDiskFrontendAttributeErrorPolicy(disk, buf); } @@ -1664,9 +1662,10 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAsprintf(&opt, ",index=%d", idx); } - /* Format attributes for the drive itself (not the storage backing it) which - * we've formatted historically with -drive */ - qemuBuildDiskFrontendAttributes(disk, &opt); + /* werror/rerror are really frontend attributes, but older + * qemu requires them on -drive instead of -device */ + qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt); + /* While this is a frontend attribute, it only makes sense to be used when * legacy -drive is used. In modern qemu the 'ide-cd' or 'scsi-cd' are used. @@ -2125,6 +2124,8 @@ qemuBuildDriveDevStr(const virDomainDef *def, if (qemuBuildDriveDevCacheStr(disk, &opt, qemuCaps) < 0) goto error; + qemuBuildDiskFrontendAttributes(disk, &opt); + if (virBufferCheckError(&opt) < 0) goto error; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e671656121..a60bca29ca 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4657,6 +4657,33 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk, } } + if (disk->geometry.cylinders > 0 && + disk->geometry.heads > 0 && + disk->geometry.sectors > 0) { + if (disk->bus == VIR_DOMAIN_DISK_BUS_USB || + disk->bus == VIR_DOMAIN_DISK_BUS_SD) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("CHS geometry can not be set for '%s' bus"), + virDomainDiskBusTypeToString(disk->bus)); + return -1; + } + + if (disk->geometry.trans != VIR_DOMAIN_DISK_TRANS_DEFAULT && + disk->bus != VIR_DOMAIN_DISK_BUS_IDE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("CHS translation mode can only be set for 'ide' bus not '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + return -1; + } + } + + if (disk->serial && disk->bus == VIR_DOMAIN_DISK_BUS_SD) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Serial property not supported for drive bus '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + return -1; + } + if (driverName && STRNEQ(driverName, "qemu")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported driver name '%s' for disk '%s'"), diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args index e25f45742c..b5e73064c0 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args +++ b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args @@ -28,22 +28,22 @@ server,nowait \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \ +id=drive-virtio-disk0,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ +id=virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \ -object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/libvirt-vxhs/dummy,\ ,path,endpoint=client,verify-peer=yes \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk1_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc252,\ file.server.host=192.168.0.2,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ +id=drive-virtio-disk1,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\ -id=virtio-disk1 \ +id=virtio-disk1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc253,\ file.server.host=192.168.0.3,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ +id=drive-virtio-disk2,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\ -id=virtio-disk2 \ +id=virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ -object tls-creds-x509,id=objvirtio-disk3_tls0,dir=/etc/pki/libvirt-nbd/dummy,,\ path,endpoint=client,verify-peer=yes \ -drive file.driver=nbd,file.server.type=inet,file.server.host=example.com,\ diff --git a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args index c2a1d4681f..fad4dfd942 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args +++ b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args @@ -25,6 +25,6 @@ server,nowait \ -usb \ -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \ +id=drive-virtio-disk0,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -id=virtio-disk0 +id=virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 diff --git a/tests/qemuxml2argvdata/disk-drive-shared.args b/tests/qemuxml2argvdata/disk-drive-shared.args index 5306fdf750..032e86e291 100644 --- a/tests/qemuxml2argvdata/disk-drive-shared.args +++ b/tests/qemuxml2argvdata/disk-drive-shared.args @@ -23,8 +23,9 @@ server,nowait \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ -serial=XYZXYZXYZYXXYZYZYXYZY,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +cache=none \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ +serial=XYZXYZXYZYXXYZYZYXYZY \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ media=cdrom,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args index b173ab6407..f3e35b5f9e 100644 --- a/tests/qemuxml2argvdata/disk-geometry.args +++ b/tests/qemuxml2argvdata/disk-geometry.args @@ -22,7 +22,7 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ -cyls=16383,heads=16,secs=63,trans=lba \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,cyls=16383,\ +heads=16,secs=63,bios-chs-trans=lba \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args index e6d2758ec3..a0e3f06b68 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.args +++ b/tests/qemuxml2argvdata/disk-ide-wwn.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\ -serial=WD-WMAP9A966149 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \ -device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ -wwn=0x5000c50015ea71ad \ +wwn=0x5000c50015ea71ad,serial=WD-WMAP9A966149 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args index 29607e8927..6407fd002d 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args @@ -25,9 +25,9 @@ server,nowait \ -device lsi,id=scsi1,bus=pci.0,addr=0x4 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,\ -serial=WD-WMAP9A966149,readonly=on \ +readonly=on \ -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,\ -id=scsi0-0-1-0,wwn=0x5000c50015ea71ac \ +id=scsi0-0-1-0,wwn=0x5000c50015ea71ac,serial=WD-WMAP9A966149 \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-0-0 \ -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0,wwn=0x5000c50015ea71ad \ diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args index 88310b009f..5892f64c29 100644 --- a/tests/qemuxml2argvdata/disk-serial.args +++ b/tests/qemuxml2argvdata/disk-serial.args @@ -22,11 +22,11 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive 'file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \ +-device 'ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ serial=\ \ WD-WMAP9A966149' \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive 'file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2,\ +-drive file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2 \ +-device 'ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,\ serial=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_\ .+' \ --device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ --drive file=/some/file,format=raw,if=sd,index=0,serial=sdserial \ +-drive file=/some/file,format=raw,if=sd,index=0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-serial.xml b/tests/qemuxml2argvdata/disk-serial.xml index ea71f2c339..18e72bb4ba 100644 --- a/tests/qemuxml2argvdata/disk-serial.xml +++ b/tests/qemuxml2argvdata/disk-serial.xml @@ -29,7 +29,6 @@ <disk type='file' device='disk'> <source file='/some/file'/> <target dev='sda' bus='sd'/> - <serial>sdserial</serial> </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml b/tests/qemuxml2xmloutdata/disk-serial.xml index 9313c699b6..a803cd959c 100644 --- a/tests/qemuxml2xmloutdata/disk-serial.xml +++ b/tests/qemuxml2xmloutdata/disk-serial.xml @@ -32,7 +32,6 @@ <driver name='qemu' type='raw'/> <source file='/some/file'/> <target dev='sda' bus='sd'/> - <serial>sdserial</serial> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> -- 2.17.1

2 1

[libvirt] [PATCH 00/25] util:Fix with process number and pid file do not match
by dubo163 03 Jul '18

03 Jul '18

Andrea Bolognani (5): news: Update for 4.5.0 release qemu: Add capability for the HTM pSeries feature conf: Parse and format the HTM pSeries feature qemu: Format the HTM pSeries feature news: Update for the HTM pSeries feature Anya Harter (2): domain_addr: delete virDomainCCWAddressReleaseAddr domain_addr: delete virDomainVirtioSerialAddrRelease Daniel Veillard (1): Release of libvirt-4.5.0 Jiri Denemark (2): qemu_migration: Rename 'offline' variable in SrcPerformPeer2Peer qemu_migration: Check for active domain after talking to remote daemon John Ferlan (3): Post-release version bump to 4.6.0 lxc: Remove FORCE flag from lxcDomainUpdateDeviceFlags lxc: Rearrange order in lxcDomainUpdateDeviceFlags Julio Faracco (2): lxc: moving 'type' argument to avoid issues with mount() syscall. util: moving 'type' argument to avoid issues with mount() syscall. Laine Stump (3): util: new function virNetDevOpenvswitchInterfaceGetMaster() util: add some debug log to virNetDevGetMaster network: properly check for taps that are connected to an OVS bridge Marcos Paulo de Souza (1): esx_driver: Simplify IsEncrypted and IsSecure Michal Privoznik (2): qemuDomainDeviceDefValidateNetwork: Check for range only if IP prefix set virsh: Provide completer for detach-device-alias Peter Krempa (3): qemu: domain: update only newly detected images in qemuDomainDetermineDiskChain tests: qemumonitorjson: Add only required replies for blockstats test tests: qemumonitorjson: Fix name and call apropriate API dubo163 (1): util:Fix with process number and pid file do not match configure.ac | 2 +- docs/formatdomain.html.in | 8 ++ docs/news.xml | 100 ++++++++++++++++++++++- docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_addr.c | 68 --------------- src/conf/domain_addr.h | 8 -- src/conf/domain_conf.c | 19 +++++ src/conf/domain_conf.h | 1 + src/esx/esx_driver.c | 12 +-- src/libvirt_private.syms | 3 +- src/lxc/lxc_container.c | 26 +++--- src/lxc/lxc_driver.c | 66 +++++---------- src/network/bridge_driver.c | 21 ++++- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 20 +++++ src/qemu/qemu_domain.c | 32 +++++++- src/qemu/qemu_domain.h | 5 +- src/qemu/qemu_migration.c | 60 +++++++------- src/util/vircgroup.c | 2 +- src/util/virnetdev.c | 1 + src/util/virnetdevopenvswitch.c | 56 +++++++++++++ src/util/virnetdevopenvswitch.h | 6 ++ src/util/virpidfile.c | 8 ++ tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + tests/qemumonitorjsontest.c | 19 ++--- tests/qemuxml2argvdata/pseries-features.args | 2 +- tests/qemuxml2argvdata/pseries-features.xml | 1 + tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/pseries-features.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-completer.c | 48 +++++++++++ tools/virsh-completer.h | 4 + tools/virsh-domain.c | 1 + 35 files changed, 414 insertions(+), 198 deletions(-) -- 1.8.3.1

1 10

[libvirt] [PATCH] qemuDomainSaveMemory: Don't enforce dynamicOwnership
by Michal Privoznik 03 Jul '18

03 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1589115 When doing a memory snapshot qemuOpenFile() is used. This means that the file where memory is saved is firstly attempted to be created under root:root (because that's what libvirtd is running under) and if this fails the second attempt is done under domain's uid:gid. This does not make much sense - qemu is given opened FD so it does not need to access the file. Moreover, if dynamicOwnership is set in qemu.conf and the file lives on a squashed NFS this is deadly combination and very likely to fail. The fix consists of using: qemuOpenFileAs(fallback_uid = cfg->user, fallback_gid = cfg->group, dynamicOwnership = false) In other words, dynamicOwnership is turned off for memory snapshot (chown() will still be attempted if the file does not live on NFS) and instead of using domain DAC label, configured user:group is set as fallback. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 129bacdd34..6af7e6e171 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3223,6 +3223,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, unsigned int flags, qemuDomainAsyncJob asyncJob) { + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); bool bypassSecurityDriver = false; bool needUnlink = false; int ret = -1; @@ -3241,9 +3242,10 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, goto cleanup; } } - fd = qemuOpenFile(driver, vm, path, - O_WRONLY | O_TRUNC | O_CREAT | directFlag, - &needUnlink, &bypassSecurityDriver); + + fd = qemuOpenFileAs(cfg->user, cfg->group, false, path, + O_WRONLY | O_TRUNC | O_CREAT | directFlag, + &needUnlink, &bypassSecurityDriver); if (fd < 0) goto cleanup; @@ -3283,6 +3285,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, cleanup: VIR_FORCE_CLOSE(fd); virFileWrapperFdFree(wrapperFd); + virObjectUnref(cfg); if (ret < 0 && needUnlink) unlink(path); -- 2.16.4

3 2

[libvirt] [PATCH 0/3] fix bad error log on libvirtd restart when using OVS
by Laine Stump 02 Jul '18

02 Jul '18

This BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1596176 and the log message of patch 3 explain the problem. Laine Stump (3): util: new function virNetDevOpenvswitchInterfaceGetMaster() util: add some debug log to virNetDevGetMaster network: properly check for taps that are connected to an OVS bridge src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 21 ++++++++++++++-- src/util/virnetdev.c | 1 + src/util/virnetdevopenvswitch.c | 55 +++++++++++++++++++++++++++++++++++++++++ src/util/virnetdevopenvswitch.h | 6 +++++ 5 files changed, 82 insertions(+), 2 deletions(-) -- 2.14.4

2 6

[libvirt] [PATCH 0/2] domain_addr: delete unused functions
by Anya Harter 02 Jul '18

02 Jul '18

each commit references the commit where the last use was removed Anya Harter (2): domain_addr: delete virDomainCCWAddressReleaseAddr domain_addr: delete virDomainVirtioSerialAddrRelease src/conf/domain_addr.c | 68 ---------------------------------------- src/conf/domain_addr.h | 8 ----- src/libvirt_private.syms | 2 -- 3 files changed, 78 deletions(-) -- 2.17.1

2 3

[libvirt] [PATCH] Post-release version bump to 4.6.0
by John Ferlan 02 Jul '18

02 Jul '18

Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- configure.ac | 2 +- docs/news.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) Pushed under trivial rule. diff --git a/configure.ac b/configure.ac index e25bf0a6ec..59d2d09611 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], [4.5.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] +AC_INIT([libvirt], [4.6.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/news.xml b/docs/news.xml index 33824ddadb..1ddfbd1df8 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -33,6 +33,14 @@ --> <libvirt> + <release version="v4.6.0" date="unreleased"> + <section title="New features"> + </section> + <section title="Improvements"> + </section> + <section title="Bug fixes"> + </section> + </release> <release version="v4.5.0" date="2018-07-02"> <section title="New features"> <change> -- 2.14.4

1 0

[libvirt] Release of libvirt-4.5.0
by Daniel Veillard 02 Jul '18

02 Jul '18

As planned the release is out, it is tagged in git and I have pushed the signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ I also made a release of the python bindings 4.5.0 also tagged in git with signed tarball and rpms at: ftp://libvirt.org/libvirt/python This release has a distinct flavour around security, with one added feature and improvement in that direction but also removal of some features which might prove insecure. Beside that a potential crasher was fixed so user are invited to update to this new version: New features: - qemu: Provide TPM emulator support Support QEMU's TPM emulator based on swtpm. Each QEMU guest gets its own virtual TPM. - bhyve: Support specifying guest CPU topology Bhyve's guest CPU topology could be specified using the <cpu><topology ../></cpu> element. - qemu: Add support for extended TSEG size Support specifying extended TSEG size for SMM in QEMU. - qemu: Add support for SEV guests SEV (Secure Encrypted Virtualization) is a feature available on AMD CPUs that encrypts the guest memory and makes it inaccessible even to the host OS. Removed features: - Remove support for qcow/default encrypted volumes Disallow using a qcow encrypted volume for the guest and disallow creation of the qcow or default encrypted volume from the storage driver. Support for qcow encrypted volumes has been phasing out since QEMU 2.3 and by QEMU 2.9 creation of a qcow encrypted volume via qemu-img required usage of secret objects, but that support was never added to libvirt. - Make GnuTLS mandatory Building without GnuTLS is no longer possible. - qemu: Remove allow_disk_format_probing configuration option The option represented a security risk when used with malicious disk images, so users were recommended against enabling it; with this release, it's been removed altogether. Improvements: - capabilities: Provide info about host IOMMU support Capabilities XML now provide information about host IOMMU support. - virsh: Add --all to domblkinfo command Alter the domblkinfo command to add the option --all in order to display the size details of each domain block device from one command in a output table. - qemu: Allow concurrent access to monitor and guest agent Historically libvirt prevented concurrent accesses to the qemu monitor and the guest agent. Therefore two independent calls (one querying the monitor and the other querying guest agent) would serialize which hurts performance. The code was reworked to allow two independent calls run at the same time. - qemu: Allow configuring the page size for HPT pSeries guests For HPT pSeries guests, the size of the host pages used to back guest memory and the usable guest page sizes are connected; the new setting can be used to request that a certain page size is available in the guest. - Add support to use an raw input volume for encryption It is now possible to provide a raw input volume as input for to generate a luks encrypted volume via either virsh vol-create-from or virStorageVolCreateXMLFrom. - qemu: Add support for vsock hot (un)plug and cold (un)plug - qemu: Add support for NBD over TLS NBD volumes can now be accessed securely. - qemu: Implement FD passing for Unix sockets Instead of having QEMU open the socket and then connecting to it, which is inherently racy, starting with QEMU 2.12 we can open the socket ourselves and pass it to QEMU, avoiding race conditions. - virsh: Introduce --nowait option for domstat command When this option is specified, virsh will try to fetch the guest stats but abort instead of stalling if they can't be retrieved right away. Bug fixes: - qemu: Fix a potential libvirtd crash on VM reconnect Initialization of the driver worker pool needs to come before libvirtd trying to reconnect to all machines, since one of the QEMU processes migh have already emitted events which need to be handled prior to us getting to the worker pool initialization. - qemu: Fix domain resume after failed migration Recent versions of QEMU activate block devices before the guest CPU has been started, which makes it impossible to roll back a failed migration. Use the late-block-activate migration capability if supported to avoid the issue. - vmx: Permit guests to have an odd number of vCPUs An odd number of vCPUs greater than 1 was forbidden in the past, but current versions of ESXi have lifted that restriction. Thanks everybody for your contributions to this release, be it with code, ideas, bug reports, patch reviews, documentation, etc... Enjoy the release ! 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] qemu: don't use chardev FD passing with standalone args
by Daniel P. Berrangé 02 Jul '18

02 Jul '18

When using domxml-to-native, we must generate CLI args that can be used in a standalone scenario. This means no FD passing can be used. To achieve this we must clear the QEMU_CAPS_CHARDEV_FD_PASS capability bit. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 5 +++++ src/qemu/qemu_process.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ac32dafcbe..40d35cbe6b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5124,6 +5124,9 @@ qemuProcessInit(virQEMUDriverPtr driver, vm->def->os.machine))) goto cleanup; + if (flags & VIR_QEMU_PROCESS_START_STANDALONE) + virQEMUCapsClear(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS); + if (qemuDomainUpdateCPU(vm, updatedCPU, &origCPU) < 0) goto cleanup; @@ -6632,6 +6635,8 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver, flags |= VIR_QEMU_PROCESS_START_PRETEND; flags |= VIR_QEMU_PROCESS_START_NEW; + if (standalone) + flags |= VIR_QEMU_PROCESS_START_STANDALONE; if (qemuProcessInit(driver, vm, NULL, QEMU_ASYNC_JOB_NONE, !!migrateURI, flags) < 0) diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 531c2a0cc7..07ce3a9915 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -81,6 +81,8 @@ typedef enum { VIR_QEMU_PROCESS_START_PRETEND = 1 << 3, VIR_QEMU_PROCESS_START_NEW = 1 << 4, /* internal, new VM is starting */ VIR_QEMU_PROCESS_START_GEN_VMID = 1 << 5, /* Generate a new VMID */ + VIR_QEMU_PROCESS_START_STANDALONE = 1 << 6, /* Require CLI args to be usable standalone, + ie no FD passing and the like */ } qemuProcessStartFlags; int qemuProcessStart(virConnectPtr conn, -- 2.17.1

3 3

[libvirt] [PATCH v2 0/2] {lxc, util}: Fix issues with NULL argument 'type' for mount().
by Julio Faracco 02 Jul '18

02 Jul '18

This serie fixes the argument 'type' of syscall mount(). Valgrind is throwing an issue when that parameter 'type' of the syscall is NULL. The best option to fix this issue is replace NULL to "none" filesystem. For more details about the Valgrind bug, see the commit message at 794b576c. Julio Faracco (2): lxc: moving 'type' argument to avoid issues with mount() syscall. util: moving 'type' argument to avoid issues with mount() syscall. src/lxc/lxc_container.c | 26 +++++++++++++------------- src/util/vircgroup.c | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH v3] qemu: format serial and geometry on frontend disk device
by Daniel P. Berrangé 02 Jul '18

02 Jul '18

Currently we format the serial, geometry and error policy on the -drive backend argument. QEMU added the ability to set serial and geometry on the frontend in the 1.2 release deprecating use of -drive, with support being deleted from -drive in 3.0. We keep formatting error policy on -drive for now, because we don't ahve support for that with -device for usb-storage just yet. Note that some disk buses (sd) still don't support -device. Although QEMU allowed these properties to be set on -drive for if=sd, they have been ignored so we now report an error in this case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Changed in v3: - Report error for setting CHS on USB - Report error for setting CHS translation mode for bus != IDE - Use 'bios-chs-trans' property not 'trans' src/qemu/qemu_command.c | 46 ++++++++++++++++--- .../disk-drive-network-tlsx509.args | 12 ++--- .../disk-drive-network-vxhs.args | 4 +- tests/qemuxml2argvdata/disk-drive-shared.args | 5 +- tests/qemuxml2argvdata/disk-geometry.args | 6 +-- tests/qemuxml2argvdata/disk-ide-wwn.args | 5 +- .../qemuxml2argvdata/disk-scsi-disk-wwn.args | 4 +- tests/qemuxml2argvdata/disk-serial.args | 10 ++-- tests/qemuxml2argvdata/disk-serial.xml | 1 - tests/qemuxml2xmloutdata/disk-serial.xml | 1 - 10 files changed, 62 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4fc3176ad3..46726b055e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1599,7 +1599,7 @@ qemuBuildDiskFrontendAttributeErrorPolicy(virDomainDiskDefPtr disk, } -static void +static int qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk, virBufferPtr buf) { @@ -1607,14 +1607,27 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk, if (disk->geometry.cylinders > 0 && disk->geometry.heads > 0 && disk->geometry.sectors > 0) { + if (disk->bus == VIR_DOMAIN_DISK_BUS_USB) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("CHS geometry can not be set for 'usb' bus")); + return -1; + } + virBufferAsprintf(buf, ",cyls=%u,heads=%u,secs=%u", disk->geometry.cylinders, disk->geometry.heads, disk->geometry.sectors); - if (disk->geometry.trans != VIR_DOMAIN_DISK_TRANS_DEFAULT) - virBufferAsprintf(buf, ",trans=%s", + if (disk->geometry.trans != VIR_DOMAIN_DISK_TRANS_DEFAULT) { + if (disk->bus != VIR_DOMAIN_DISK_BUS_IDE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("CHS translation mode can only be set for 'ide' bus not '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + return -1; + } + virBufferAsprintf(buf, ",bios-chs-trans=%s", virDomainDiskGeometryTransTypeToString(disk->geometry.trans)); + } } if (disk->serial) { @@ -1622,7 +1635,7 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk, virBufferEscape(buf, '\\', " ", "%s", disk->serial); } - qemuBuildDiskFrontendAttributeErrorPolicy(disk, buf); + return 0; } @@ -1662,11 +1675,27 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAsprintf(&opt, "if=%s", virDomainDiskQEMUBusTypeToString(disk->bus)); virBufferAsprintf(&opt, ",index=%d", idx); + + if (disk->serial) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Serial property not supported for drive bus '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + goto error; + } + if (disk->geometry.cylinders > 0 && + disk->geometry.heads > 0 && + disk->geometry.sectors > 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Geometry not supported for drive bus '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + goto error; + } } - /* Format attributes for the drive itself (not the storage backing it) which - * we've formatted historically with -drive */ - qemuBuildDiskFrontendAttributes(disk, &opt); + /* werror/rerror are really frontend attributes, but older + * qemu requires them on -drive instead of -device */ + qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt); + /* While this is a frontend attribute, it only makes sense to be used when * legacy -drive is used. In modern qemu the 'ide-cd' or 'scsi-cd' are used. @@ -2125,6 +2154,9 @@ qemuBuildDriveDevStr(const virDomainDef *def, if (qemuBuildDriveDevCacheStr(disk, &opt, qemuCaps) < 0) goto error; + if (qemuBuildDiskFrontendAttributes(disk, &opt) < 0) + goto error; + if (virBufferCheckError(&opt) < 0) goto error; diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args index e25f45742c..b5e73064c0 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args +++ b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args @@ -28,22 +28,22 @@ server,nowait \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \ +id=drive-virtio-disk0,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ +id=virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \ -object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/libvirt-vxhs/dummy,\ ,path,endpoint=client,verify-peer=yes \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk1_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc252,\ file.server.host=192.168.0.2,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ +id=drive-virtio-disk1,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\ -id=virtio-disk1 \ +id=virtio-disk1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc253,\ file.server.host=192.168.0.3,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ +id=drive-virtio-disk2,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\ -id=virtio-disk2 \ +id=virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ -object tls-creds-x509,id=objvirtio-disk3_tls0,dir=/etc/pki/libvirt-nbd/dummy,,\ path,endpoint=client,verify-peer=yes \ -drive file.driver=nbd,file.server.type=inet,file.server.host=example.com,\ diff --git a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args index c2a1d4681f..fad4dfd942 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args +++ b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args @@ -25,6 +25,6 @@ server,nowait \ -usb \ -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \ +id=drive-virtio-disk0,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -id=virtio-disk0 +id=virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 diff --git a/tests/qemuxml2argvdata/disk-drive-shared.args b/tests/qemuxml2argvdata/disk-drive-shared.args index 5306fdf750..032e86e291 100644 --- a/tests/qemuxml2argvdata/disk-drive-shared.args +++ b/tests/qemuxml2argvdata/disk-drive-shared.args @@ -23,8 +23,9 @@ server,nowait \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ -serial=XYZXYZXYZYXXYZYZYXYZY,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +cache=none \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ +serial=XYZXYZXYZYXXYZYZYXYZY \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ media=cdrom,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args index b173ab6407..f3e35b5f9e 100644 --- a/tests/qemuxml2argvdata/disk-geometry.args +++ b/tests/qemuxml2argvdata/disk-geometry.args @@ -22,7 +22,7 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ -cyls=16383,heads=16,secs=63,trans=lba \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,cyls=16383,\ +heads=16,secs=63,bios-chs-trans=lba \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args index e6d2758ec3..a0e3f06b68 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.args +++ b/tests/qemuxml2argvdata/disk-ide-wwn.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\ -serial=WD-WMAP9A966149 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \ -device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ -wwn=0x5000c50015ea71ad \ +wwn=0x5000c50015ea71ad,serial=WD-WMAP9A966149 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args index 29607e8927..6407fd002d 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args @@ -25,9 +25,9 @@ server,nowait \ -device lsi,id=scsi1,bus=pci.0,addr=0x4 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,\ -serial=WD-WMAP9A966149,readonly=on \ +readonly=on \ -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,\ -id=scsi0-0-1-0,wwn=0x5000c50015ea71ac \ +id=scsi0-0-1-0,wwn=0x5000c50015ea71ac,serial=WD-WMAP9A966149 \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-0-0 \ -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0,wwn=0x5000c50015ea71ad \ diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args index 88310b009f..5892f64c29 100644 --- a/tests/qemuxml2argvdata/disk-serial.args +++ b/tests/qemuxml2argvdata/disk-serial.args @@ -22,11 +22,11 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive 'file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \ +-device 'ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ serial=\ \ WD-WMAP9A966149' \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive 'file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2,\ +-drive file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2 \ +-device 'ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,\ serial=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_\ .+' \ --device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ --drive file=/some/file,format=raw,if=sd,index=0,serial=sdserial \ +-drive file=/some/file,format=raw,if=sd,index=0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-serial.xml b/tests/qemuxml2argvdata/disk-serial.xml index ea71f2c339..18e72bb4ba 100644 --- a/tests/qemuxml2argvdata/disk-serial.xml +++ b/tests/qemuxml2argvdata/disk-serial.xml @@ -29,7 +29,6 @@ <disk type='file' device='disk'> <source file='/some/file'/> <target dev='sda' bus='sd'/> - <serial>sdserial</serial> </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml b/tests/qemuxml2xmloutdata/disk-serial.xml index 9313c699b6..a803cd959c 100644 --- a/tests/qemuxml2xmloutdata/disk-serial.xml +++ b/tests/qemuxml2xmloutdata/disk-serial.xml @@ -32,7 +32,6 @@ <driver name='qemu' type='raw'/> <source file='/some/file'/> <target dev='sda' bus='sd'/> - <serial>sdserial</serial> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> -- 2.17.1

2 4

[libvirt] [PATCH] util: return generic error in virCopyLastError if error is not set
by Nikolay Shirokovskiy 02 Jul '18

02 Jul '18

virCopyLastError is intended to be used after last error is set. However due to virLastErrorObject failures (very unlikely through as thread local error is allocated on first use) we can have zero fields in a copy as a result. In particular code field can be set to VIR_ERR_OK. In some places (qemu monitor, qemu agent and qemu migaration code for example) we use copy result as a flag and this leads to bugs. Let's set copy result to generic error ("cause unknown") in this case. Approach is based on John Ferlan comments in [1] and [2] to initial attempt which fixes issue in much less generic way. [1] https://www.redhat.com/archives/libvir-list/2018-April/msg02700.html [2] https://www.redhat.com/archives/libvir-list/2018-May/msg00124.html --- src/util/virerror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virerror.c b/src/util/virerror.c index c000b00..9f158af 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -343,7 +343,7 @@ virCopyLastError(virErrorPtr to) if (err) virCopyError(err, to); else - virResetError(to); + virErrorGenericFailure(err); return to->code; } -- 1.8.3.1

2 9

[libvirt] [PATCH v3 0/3] Implement the HTM pSeries feature
by Andrea Bolognani 02 Jul '18

02 Jul '18

Applies cleanly on top of aa51063927a0d48768ff88b11f12075ad5efc89f. Changes from [v2]: * rebase on top of master; the series is much smaller now. Changes from [v1]: * drop qom-list-properties machinery, as equivalent functionality has been merged in the meantime; * don't introduce scaffolding for uniform machine option handling as a requirement for implementing this specific feature: we can do ad-hoc processing for now, per the status quo, then clean up everything (including existing features) with a separate series later. Changes from [RFC v3]: * can be considered for merging, since the QEMU part already has; * fix compatibility issues with QEMU <2.12 spotted by Shivaprasad; * drop all features except for HTM, at least for the time being; * add documentation. Changes from [RFC v2]: * use qom-list-properties to probe availability; * test all features with a single XML file. Changes from [RFC v1]: * don't nest features inside a <pseries/> element; * implement all optional features. [v2] https://www.redhat.com/archives/libvir-list/2018-June/msg01374.html [v1] https://www.redhat.com/archives/libvir-list/2018-March/msg00474.html [RFC v3] https://www.redhat.com/archives/libvir-list/2018-March/msg00042.html [RFC v2] https://www.redhat.com/archives/libvir-list/2018-February/msg00310.html [RFC v1] https://www.redhat.com/archives/libvir-list/2018-January/msg00779.html Andrea Bolognani (3): qemu: Add capability for the HTM pSeries feature qemu: Implement the HTM pSeries feature news: Update for the HTM pSeries feature docs/formatdomain.html.in | 8 ++++++++ docs/news.xml | 9 +++++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 19 ++++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 20 +++++++++++++++++++ src/qemu/qemu_domain.c | 13 ++++++++++++ .../caps_2.12.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + tests/qemuxml2argvdata/pseries-features.args | 2 +- tests/qemuxml2argvdata/pseries-features.xml | 1 + tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/pseries-features.xml | 1 + tests/qemuxml2xmltest.c | 1 + 16 files changed, 85 insertions(+), 1 deletion(-) -- 2.17.1

2 9

[libvirt] [PATCH] util:Fix with process number and pid file do not match
by dubo163 02 Jul '18

02 Jul '18

dubobo (1): util:Fix with process number and pid file do not match src/util/virpidfile.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 1.8.3.1

1 0

[libvirt] [jenkins-ci PATCH] projects: libvirt-dbus uses xz now
by Andrea Bolognani 02 Jul '18

02 Jul '18

Since commit 28ad40b3d4ab, libvirt-dbus uses xz rather than gzip to compress release archives. Adapt to the change. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- projects/libvirt-dbus.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/libvirt-dbus.yaml b/projects/libvirt-dbus.yaml index c460db4..eaf5a61 100644 --- a/projects/libvirt-dbus.yaml +++ b/projects/libvirt-dbus.yaml @@ -2,6 +2,7 @@ - project: name: libvirt-dbus title: Libvirt D-Bus + archive_format: xz jobs: - autotools-build-job: parent_jobs: 'libvirt-glib-master-build' -- 2.17.1

2 1

[libvirt] [PATCH v2] qemu: format serial and geometry on frontend disk device
by Daniel P. Berrangé 02 Jul '18

02 Jul '18

Currently we format the serial, geometry and error policy on the -drive backend argument. QEMU added the ability to set serial and geometry on the frontend in the 1.2 release deprecating use of -drive, with support being deleted from -drive in 3.0. We keep formatting error policy on -drive for now, because we don't ahve support for that with -device for usb-storage just yet. Note that some disk buses (sd) still don't support -device. Although QEMU allowed these properties to be set on -drive for if=sd, they have been ignored so we now report an error in this case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_command.c | 26 +++++++++++++++---- .../disk-drive-network-tlsx509.args | 12 ++++----- .../disk-drive-network-vxhs.args | 4 +-- tests/qemuxml2argvdata/disk-drive-shared.args | 5 ++-- tests/qemuxml2argvdata/disk-geometry.args | 6 ++--- tests/qemuxml2argvdata/disk-ide-wwn.args | 5 ++-- .../qemuxml2argvdata/disk-scsi-disk-wwn.args | 4 +-- tests/qemuxml2argvdata/disk-serial.args | 10 +++---- tests/qemuxml2argvdata/disk-serial.xml | 1 - tests/qemuxml2xmloutdata/disk-serial.xml | 1 - 10 files changed, 44 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4fc3176ad3..86d4b10f74 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1621,8 +1621,6 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk, virBufferAddLit(buf, ",serial="); virBufferEscape(buf, '\\', " ", "%s", disk->serial); } - - qemuBuildDiskFrontendAttributeErrorPolicy(disk, buf); } @@ -1662,11 +1660,27 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAsprintf(&opt, "if=%s", virDomainDiskQEMUBusTypeToString(disk->bus)); virBufferAsprintf(&opt, ",index=%d", idx); + + if (disk->serial) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Serial property not supported for drive bus '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + goto error; + } + if (disk->geometry.cylinders > 0 && + disk->geometry.heads > 0 && + disk->geometry.sectors > 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Geometry not supported for drive bus '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + goto error; + } } - /* Format attributes for the drive itself (not the storage backing it) which - * we've formatted historically with -drive */ - qemuBuildDiskFrontendAttributes(disk, &opt); + /* werror/rerror are really frontend attributes, but older + * qemu requires them on -drive instead of -device */ + qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt); + /* While this is a frontend attribute, it only makes sense to be used when * legacy -drive is used. In modern qemu the 'ide-cd' or 'scsi-cd' are used. @@ -2125,6 +2139,8 @@ qemuBuildDriveDevStr(const virDomainDef *def, if (qemuBuildDriveDevCacheStr(disk, &opt, qemuCaps) < 0) goto error; + qemuBuildDiskFrontendAttributes(disk, &opt); + if (virBufferCheckError(&opt) < 0) goto error; diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args index e25f45742c..b5e73064c0 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args +++ b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args @@ -28,22 +28,22 @@ server,nowait \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \ +id=drive-virtio-disk0,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ +id=virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \ -object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/libvirt-vxhs/dummy,\ ,path,endpoint=client,verify-peer=yes \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk1_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc252,\ file.server.host=192.168.0.2,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ +id=drive-virtio-disk1,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\ -id=virtio-disk1 \ +id=virtio-disk1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc253,\ file.server.host=192.168.0.3,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ +id=drive-virtio-disk2,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\ -id=virtio-disk2 \ +id=virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ -object tls-creds-x509,id=objvirtio-disk3_tls0,dir=/etc/pki/libvirt-nbd/dummy,,\ path,endpoint=client,verify-peer=yes \ -drive file.driver=nbd,file.server.type=inet,file.server.host=example.com,\ diff --git a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args index c2a1d4681f..fad4dfd942 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args +++ b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args @@ -25,6 +25,6 @@ server,nowait \ -usb \ -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \ +id=drive-virtio-disk0,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -id=virtio-disk0 +id=virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 diff --git a/tests/qemuxml2argvdata/disk-drive-shared.args b/tests/qemuxml2argvdata/disk-drive-shared.args index 5306fdf750..032e86e291 100644 --- a/tests/qemuxml2argvdata/disk-drive-shared.args +++ b/tests/qemuxml2argvdata/disk-drive-shared.args @@ -23,8 +23,9 @@ server,nowait \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ -serial=XYZXYZXYZYXXYZYZYXYZY,cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +cache=none \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ +serial=XYZXYZXYZYXXYZYZYXYZY \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ media=cdrom,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args index b173ab6407..db0c7fb561 100644 --- a/tests/qemuxml2argvdata/disk-geometry.args +++ b/tests/qemuxml2argvdata/disk-geometry.args @@ -22,7 +22,7 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ -cyls=16383,heads=16,secs=63,trans=lba \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,cyls=16383,\ +heads=16,secs=63,trans=lba \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args index e6d2758ec3..a0e3f06b68 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.args +++ b/tests/qemuxml2argvdata/disk-ide-wwn.args @@ -22,8 +22,7 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\ -serial=WD-WMAP9A966149 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \ -device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ -wwn=0x5000c50015ea71ad \ +wwn=0x5000c50015ea71ad,serial=WD-WMAP9A966149 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args index 29607e8927..6407fd002d 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args @@ -25,9 +25,9 @@ server,nowait \ -device lsi,id=scsi1,bus=pci.0,addr=0x4 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,\ -serial=WD-WMAP9A966149,readonly=on \ +readonly=on \ -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,\ -id=scsi0-0-1-0,wwn=0x5000c50015ea71ac \ +id=scsi0-0-1-0,wwn=0x5000c50015ea71ac,serial=WD-WMAP9A966149 \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-0-0 \ -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0,wwn=0x5000c50015ea71ad \ diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args index 88310b009f..5892f64c29 100644 --- a/tests/qemuxml2argvdata/disk-serial.args +++ b/tests/qemuxml2argvdata/disk-serial.args @@ -22,11 +22,11 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive 'file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \ +-device 'ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ serial=\ \ WD-WMAP9A966149' \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive 'file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2,\ +-drive file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2 \ +-device 'ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,\ serial=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_\ .+' \ --device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ --drive file=/some/file,format=raw,if=sd,index=0,serial=sdserial \ +-drive file=/some/file,format=raw,if=sd,index=0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-serial.xml b/tests/qemuxml2argvdata/disk-serial.xml index ea71f2c339..18e72bb4ba 100644 --- a/tests/qemuxml2argvdata/disk-serial.xml +++ b/tests/qemuxml2argvdata/disk-serial.xml @@ -29,7 +29,6 @@ <disk type='file' device='disk'> <source file='/some/file'/> <target dev='sda' bus='sd'/> - <serial>sdserial</serial> </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml b/tests/qemuxml2xmloutdata/disk-serial.xml index 9313c699b6..a803cd959c 100644 --- a/tests/qemuxml2xmloutdata/disk-serial.xml +++ b/tests/qemuxml2xmloutdata/disk-serial.xml @@ -32,7 +32,6 @@ <driver name='qemu' type='raw'/> <source file='/some/file'/> <target dev='sda' bus='sd'/> - <serial>sdserial</serial> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> -- 2.17.1

2 2

[libvirt] [PATCH 0/2] qemu_migration: Check for active domain after talking to remote daemon
by Jiri Denemark 02 Jul '18

02 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1589730 Jiri Denemark (2): qemu_migration: Rename 'offline' variable in SrcPerformPeer2Peer qemu_migration: Check for active domain after talking to remote daemon src/qemu/qemu_domain.c | 14 ++++++++++- src/qemu/qemu_domain.h | 5 ++-- src/qemu/qemu_migration.c | 51 +++++++++++++++++++++------------------ 3 files changed, 44 insertions(+), 26 deletions(-) -- 2.18.0

2 4

[libvirt] [dbus PATCH] Fix 'make rpm'
by Andrea Bolognani 02 Jul '18

02 Jul '18

Commit 28ad40b3d4ab changed the compression algorithm for release archives from gzip to xz, but the 'rpm' target has not been updated accordingly. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the (pre-emptive) build breaker rule. Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 93941c6..8abba68 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ DISTCLEAN_FILES = \ $(NULL) rpm: clean - @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz) + @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.xz) dist-hook: gen-AUTHORS -- 2.17.1

1 0

[libvirt] [dbus PATCH 00/15] Build system fixes, cleanups and tweaks
by Andrea Bolognani 02 Jul '18

02 Jul '18

It all started when I got tests/Makefile.am:17: warning: source file '$(top_srcdir)/src/util.c' is in a subdirectory, tests/Makefile.am:17: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. when running autogen.sh and decided to investigate; before I realized it, I was already deep down the rabbit hole and falling towards Wonderland at an increasingly concerning speed. Andrea Bolognani (15): gitignore: Fix man page pattern gitignore: Fix aclocal.m4 pattern tests: Don't distribute compiled binaries src: Fix typo in PIE_LDFLAGS src: Remove empty CLEANFILES src: Don't list source files in EXTRA_DIST tests: Move includes to AM_CPPFLAGS src: Make CFLAGS and LDFLAGS global configure: Enable libtool src: Build libutil.la separately configure: Enable subdir-objects configure: Enable -Wno-obsolete and tar-pax configure: Use xz for release archives data: Rename some variables to *_in_files autotools: Use consistent style .gitignore | 15 ++++++++-- Makefile.am | 12 ++++++-- configure.ac | 3 +- data/Makefile.am | 40 +++++++++++++++++-------- docs/Makefile.am | 16 +++++++--- libvirt-dbus.spec.in | 2 +- src/Makefile.am | 70 ++++++++++++++++++++++++++------------------ tests/Makefile.am | 36 ++++++++++++++++------- 8 files changed, 130 insertions(+), 64 deletions(-) -- 2.17.1

2 21

[libvirt] [PATCH] qemuDomainDeviceDefValidateNetwork: Check for range only if IP prefix set
by Michal Privoznik 02 Jul '18

02 Jul '18

The @prefix attribute to <ip/> element for interface type user is optional. Therefore, if left out it has value of zero in which case we should not check whether it falls into <4, 27> range. Otherwise we fail parsing domain XML for no good reason. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index afd572fc5e..c1798edf41 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4373,7 +4373,8 @@ qemuDomainDeviceDefValidateNetwork(const virDomainNetDef *net) } hasIPv4 = true; - if (ip->prefix < 4 || ip->prefix > 27) { + if (ip->prefix > 0 && + (ip->prefix < 4 || ip->prefix > 27)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid prefix, must be in range of 4-27")); return -1; -- 2.16.4

2 1

[libvirt] [PATCH v2 0/2] Rearrange order in lxcDomainUpdateDeviceFlags
by John Ferlan 01 Jul '18

01 Jul '18

v1: https://www.redhat.com/archives/libvir-list/2018-June/msg01706.html Changes since v1, - Insert patch 1 to remove the FORCE flag from the possible/allowed list of flags - it was only useful for live anyway - Continue to rearrange things as suggested from review. John Ferlan (2): lxc: Remove FORCE flag from lxcDomainUpdateDeviceFlags lxc: Rearrange order in lxcDomainUpdateDeviceFlags src/lxc/lxc_driver.c | 66 ++++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 44 deletions(-) -- 2.14.4

2 4

[libvirt] [PATCH] virsh: Provide completer for detach-device-alias
by Michal Privoznik 30 Jun '18

30 Jun '18

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-completer.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 4 ++++ tools/virsh-domain.c | 1 + 3 files changed, 53 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index d3effe59ea..ae579a5bdb 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -811,3 +811,51 @@ virshCellnoCompleter(vshControl *ctl, VIR_FREE(ret); goto cleanup; } + + +char ** +virshDomainDeviceAliasCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + xmlDocPtr xmldoc = NULL; + xmlXPathContextPtr ctxt = NULL; + int naliases; + xmlNodePtr *aliases = NULL; + size_t i; + unsigned int domainXMLFlags = 0; + char **ret = NULL; + char **tmp = NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL; + + if (vshCommandOptBool(cmd, "config")) + domainXMLFlags = VIR_DOMAIN_XML_INACTIVE; + + if (virshDomainGetXML(ctl, cmd, domainXMLFlags, &xmldoc, &ctxt) < 0) + goto cleanup; + + naliases = virXPathNodeSet("./devices//alias/@name", ctxt, &aliases); + if (naliases < 0) + goto cleanup; + + if (VIR_ALLOC_N(tmp, naliases + 1) < 0) + goto cleanup; + + for (i = 0; i < naliases; i++) { + if (!(tmp[i] = virXMLNodeContentString(aliases[i]))) + goto cleanup; + } + + VIR_STEAL_PTR(ret, tmp); + cleanup: + VIR_FREE(aliases); + xmlFreeDoc(xmldoc); + xmlXPathFreeContext(ctxt); + virStringListFree(tmp); + return ret; +} diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index ee7eec68c5..50dc068d73 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -94,6 +94,10 @@ char ** virshNodedevEventNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshDomainDeviceAliasCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + char ** virshCellnoCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6aa79f11b9..e9b88f0013 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11684,6 +11684,7 @@ static const vshCmdOptDef opts_detach_device_alias[] = { {.name = "alias", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, + .completer = virshDomainDeviceAliasCompleter, .help = N_("device alias") }, VIRSH_COMMON_OPT_DOMAIN_CONFIG, -- 2.16.4

2 1

[libvirt] Entering freeze for libvirt-4.5.0
by Daniel Veillard 29 Jun '18

29 Jun '18

As planned I just tagged it in the git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ Seems to work fine in my very limited testing, but there seems to be a few things weird on the ci: https://ci.centos.org/view/libvirt/ though it look hard to pinpoint a single culprit, different oses ... Please give it some testing this week it, if everything is fine I will push an RC2 on Friday with hopefully an final release next Monday, please give it a try, thanks, 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 3

[libvirt] CPU model versioning separate from machine type versioning ?
by Daniel P. Berrangé 29 Jun '18

29 Jun '18

This post is to raise question about helping use of named CPU models with KVM ie any case not using -cpu host. In the old days (ie before 2018), the world was innocent and we had a nice set of named CPU models that corresponded to different Intel/AMD physical CPU families/generations (lets temporarily ignore the -noTSX fiasco). An application could query libvirt to determine what the host CPU model was/is and use that model name in the guest XML and be fairly happy. If they wanted to, they could explicitly include the extra features listed by capabilities XML, or just rely on the host-model. Then Spectre happened, and QEMU took the decision to almost double the number of x86 models, adding in -IBRS / -IBPB variants for most CPU model, so that applications could get the spec_ctrl / ibpb flags set without having to manually list them. In retrospect this was somewhat pointless, at least at the QEMU level, because there is little difference in complexity between the two approaches: -cpu Westmere,+spec-ctrl -cpu Westmere-IBRS At a higher level the extra named CPU models were slightly useful in so much as many application developers had taken a lazy approach and not provided users any way to explicitly turn on extra flags. This affected oVirt, OpenStack and virt-manager, and probably more. Though OpenStack since added ability to turn on arbitrary flags in response to the Spectre flaw, others have not. Then a recently along came the Speculative Store Bypass hardware vulnerability requiring addition of yet another CPU flag to guest configs. This required use of 'ssbd' on Intel and 'virt-ssbd' on AMD. While QEMU could have now added yet more CPU models, eg Westmere-SSBD, this does not feel like a winning strategy long term. Looking at the models how would a user have any clue whether the -IBRS or -SSBD or -NEXT-FLAW or -YET-ANOTHER-FLAW suffix is "better" ? So QEMU and libvirt took the joint decision to stop adding new named CPU models when CPU vulnerabilities are discovered from this point forwards. Applications / users would be expected to turn on CPU features explicitly as needed and are considered broken if they don't provide this functionality. As briefly mentioned above though, even before Spectre we had the pain of dealing with the -noTSX CPU models working around brokenness in the Intel TSX impl where they had to delete a CPU feature during microcode updates. This was rather painful to roll out at the time. An alternative to adding CPU models is to change meaning of existing CPU models. QEMU has a way todo this by tieing the change to machine types, and it has in fact been used to correct mistakes in the specification of CPU models in the past, when those mistakes have not had dependancies on microcode changes. This is not a particularly attractice way to deal with the errata. Short life distros tend to stick with upstream QEMU machine types and won't want to diverge by adding their own machine types. This gates them on having upstream define the extra machine types which is tricky under embargo. Long life distros do typically take on the burden of defining custom machine types, but usually only add them when doing major updates. The pain point with machine types is that the testing matrix grows at O(n^2) Using machine types for CPU security errata would significant increase the number of machine types and thus the testing matrix. eg if a security fix is needed in rhel-7.3, 7.4, 7.5 we can't just add a pc-rhel-7.5.1 machine with the fix, as it would not be possible to implement that in 7.3. So we would need would need pc-rhel-7.3.1, pc-rhel-7.4.1, pc-rhel-7.5.1, machine types, with 7.5 gaining all three. Finally CPU model changes have host hardware dependancies and machine types need to be independant of the host, since they are decided statically are build time. The only nice thing about machine type is that it is reasonably obvious what the "best" machine type is as they include a version number in the name, and users automatically get the best if they use an unversioned name. What if we can borrow the concept of versioning from machine types and apply it to CPU models directly. For example, considering the history of "Haswell" in QEMU, if we had versioned things, we would by now have: Haswell-1.3.0 - first version (37507094f350b75c62dc059f998e7185de3ab60a) Haswell-2.2.0 - added 'rdrand' (78a611f1936b3eac8ed78a2be2146a742a85212c_ Haswell-2.3.0 - removed 'hle' & 'rtm' (a356850b80b3d13b2ef737dad2acb05e6da03753) Haswell-2.5.0 - added 'abm' (becb66673ec30cb604926d247ab9449a60ad8b11 Haswell-2.12.0 - added 'spec-ctrl' (ac96c41354b7e4c70b756342d9b686e31ab87458) Haswell-3.0.0 - added 'ssbd' (never done) If we followed the machine type approach, then a bare "Haswell" would statically resolve at build time to the most recent Haswell-X.X.X version associated with the QEMU release. This is unhelpful as we have a direct dependancy on the host hardware features. Better would be for a bare "Haswell" to be dynamically resolved at runtime, picking the most recent version that is capable of launching given the current hardware, KVM/TCG impl and QEMU version. ie -cpu Haswell should use Haswell-2.5.0 if on silicon with the TSX errata applied, but use Haswell-2.12.0 if the Spectre errata is applied in microcode, and use Haswell-3.0.0 once Intel finally releases SSBD microcode errata. Versioning of CPU models as opposed to using arbitrary string suffixes (-noTSX, -IBRS) has a number of usability improvements that we would gain with versioned machine types, while avoiding exploding the machine type matrix. With versioned CPU models we can - Automatically tailor the best model based on hardware support - Users always get the best model if they use the bare CPU name - It is obvious to users which is the "best" / "newest" CPU model - Avoid combinatorial expansion of machines since same CPU model version can be added to all releases without adding machine types. - Users can still force a specific downgraded model by using the fully versioned name. Such versioning of CPU models would largely "just work" with existing libvirt versions, but to libvirt would really want to expand the bare CPU name to a versioned CPU name when recording new guest XML, so the ABI is preserved long term. An application like virt-manager which wants a simple UI can forever be happy simply giving users a list of bare CPU model names, and allowing libvirt / QEMU to automatically expand to the best versioned model for their host. An application like oVirt/OpenStack which wants direct control can allow the admin to choice if a bare name, or explicitly picking a versioned name if they need to cope with possibility of outdated hosts. Regards, Daniel -- |: 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 :|

4 14

[libvirt] [dbus PATCH] configure: Use HTTPS URL for libvirt.org
by Andrea Bolognani 29 Jun '18

29 Jun '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1a0a457..d7820dd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libvirt-dbus], [1.1.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt-dbus], [1.1.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] AC_CONFIG_SRCDIR(src/main.c) AC_CONFIG_AUX_DIR([build-aux]) -- 2.17.1

1 0

[libvirt] [PATCH] Add support L2 table cache for qcow2 disk
by dujiancheng 29 Jun '18

29 Jun '18

The patch add support L2 table cache for qcow2 disk. L2 table cache can improve IO read and write performance for qcow2 img. Example: random 4K read requests on a fully populated 100GB image (SSD backend and vm with directsync cacha mode), IOPS increased by 7 times. --- src/conf/domain_conf.c | 25 +++++++++++++++++++++++++ src/conf/domain_conf.h | 4 ++++ src/qemu/qemu_command.c | 7 +++++++ src/qemu/qemu_domain.c | 4 ++++ 4 files changed, 40 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b8b5345..cb9fb05 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9502,6 +9502,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, char *vendor = NULL; char *product = NULL; char *domain_name = NULL; + char *disk_l2_cache_size = NULL; + char *disk_cache_clean_interval = NULL; if (!(def = virDomainDiskDefNew(xmlopt))) return NULL; @@ -9701,6 +9703,27 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, } } else if (virXMLNodeNameEqual(cur, "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ + } else if (virXMLNodeNameEqual(cur, "diskCache")) { + disk_l2_cache_size = + virXMLPropString(cur, "disk_l2_cache_size"); + if (disk_l2_cache_size && + virStrToLong_ui(disk_l2_cache_size, NULL, 0, + &def->disk_cache.disk_l2_cache_size) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid disk L2 cache size '%s'"), + disk_l2_cache_size); + goto error; + } + disk_cache_clean_interval = + virXMLPropString(cur, "disk_cache_clean_interval"); + if (disk_cache_clean_interval && + virStrToLong_ui(disk_cache_clean_interval, NULL, 0, + &def->disk_cache.disk_cache_clean_interval) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid disk cache clean interval '%s'"), + disk_cache_clean_interval); + goto error; + } } } @@ -9903,6 +9926,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(vendor); VIR_FREE(product); VIR_FREE(domain_name); + VIR_FREE(disk_l2_cache_size); + VIR_FREE(disk_cache_clean_interval); ctxt->node = save_ctxt; return def; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 71437dc..6396475 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -647,6 +647,10 @@ struct _virDomainDiskDef { unsigned int physical_block_size; } blockio; + struct { + unsigned int disk_l2_cache_size; + unsigned int disk_cache_clean_interval; + } disk_cache; virDomainBlockIoTuneInfo blkdeviotune; char *driverName; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4fc3176..4bc9412 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1637,6 +1637,13 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (qemuBuildDriveSourceStr(disk, qemuCaps, &opt) < 0) goto error; + + if (disk->disk_cache.disk_l2_cache_size > 0) + virBufferAsprintf(&opt, "l2-cache-size=%u,", + disk->disk_cache.disk_l2_cache_size); + if (disk->disk_cache.disk_cache_clean_interval > 0) + virBufferAsprintf(&opt, "cache-clean-interval=%u,", + disk->disk_cache.disk_cache_clean_interval); if (qemuDiskBusNeedsDeviceArg(disk->bus)) { char *drivealias = qemuAliasDiskDriveFromDisk(disk); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fee4481..4896bf7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8627,6 +8627,10 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk, CHECK_EQ(ioeventfd, "ioeventfd", true); CHECK_EQ(event_idx, "event_idx", true); CHECK_EQ(copy_on_read, "copy_on_read", true); + CHECK_EQ(disk_cache.disk_l2_cache_size, + "diskCache disk_l2_cache_size", true); + CHECK_EQ(disk_cache.disk_cache_clean_interval, + "diskCache disk_cache_clean_interval", true); /* "snapshot" is a libvirt internal field and thus can be changed */ /* startupPolicy is allowed to be updated. Therefore not checked here. */ CHECK_EQ(transient, "transient", true); -- 1.8.3.1

4 3

[libvirt] [dbus PATCH] data: Allow system access to users in the libvirt group
by Andrea Bolognani 29 Jun '18

29 Jun '18

This is consistent with libvirt's own polkit configuration, which grants users in the libvirt group full administrative access to the system daemon. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- data/system/org.libvirt.conf.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/system/org.libvirt.conf.in b/data/system/org.libvirt.conf.in index fe61b70..45fd4de 100644 --- a/data/system/org.libvirt.conf.in +++ b/data/system/org.libvirt.conf.in @@ -12,4 +12,8 @@ <allow send_destination="org.libvirt"/> </policy> + <policy group="libvirt"> + <allow send_destination="org.libvirt"/> + </policy> + </busconfig> -- 2.17.1

2 1

[libvirt] [dbus PATCH 0/2] Fix polkit rules directory
by Andrea Bolognani 29 Jun '18

29 Jun '18

See patch 2/2 for the details. Andrea Bolognani (2): configure: Make polkit rules directory configurable configure: Fix default polkit rules directory configure.ac | 5 +++++ data/Makefile.am | 2 +- libvirt-dbus.spec.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) -- 2.17.1

2 3

[libvirt] [dbus PATCH] data: Fix indentation in Makefile.am
by Andrea Bolognani 29 Jun '18

29 Jun '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Makefile.am b/data/Makefile.am index b3fa614..b0e6b31 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -23,7 +23,7 @@ interfaces_files = \ org.libvirt.Domain.xml \ org.libvirt.Network.xml \ org.libvirt.NodeDevice.xml \ - org.libvirt.NWFilter.xml \ + org.libvirt.NWFilter.xml \ org.libvirt.Secret.xml \ org.libvirt.StoragePool.xml \ org.libvirt.StorageVol.xml \ -- 2.17.1

1 0

[libvirt] [PATCH] qemu: Report error on unexpected job stats type
by Jiri Denemark 28 Jun '18

28 Jun '18

If we ever fail to properly set jobinfo->statsType, qemuDomainJobInfoToParams would return -1 without setting an error. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fee44812c1..9afe705929 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -730,6 +730,12 @@ qemuDomainJobInfoToParams(qemuDomainJobInfoPtr jobInfo, return qemuDomainDumpJobInfoToParams(jobInfo, type, params, nparams); case QEMU_DOMAIN_JOB_STATS_TYPE_NONE: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid job statistics type")); + break; + + default: + virReportEnumRangeError(qemuDomainJobStatsType, jobInfo->statsType); break; } -- 2.18.0

2 3

[libvirt] [PATCH python] Fix bugs in nwfilter binding APIs
by Daniel P. Berrangé 28 Jun '18

28 Jun '18

We did not correctly mangle the API names in two cases, and we also forgot to specialize the lookup method name in the sanity test. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- generator.py | 5 ++++- sanitytest.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/generator.py b/generator.py index ae0e45c..bd7ff11 100755 --- a/generator.py +++ b/generator.py @@ -1127,7 +1127,10 @@ def nameFixup(name, classe, type, file): func = func[0:1].lower() + func[1:] elif name[0:27] == "virNWFilterBindingCreateXML": func = name[3:] - func = func[0:1].lower() + func[1:] + func = func[0:3].lower() + func[3:] + elif name[0:24] == "virNWFilterBindingLookup": + func = name[3:] + func = func[0:3].lower() + func[3:] elif name[0:24] == "virNWFilterBindingDefine": func = name[3:] func = func[0:3].lower() + func[3:] diff --git a/sanitytest.py b/sanitytest.py index d5c23dc..68dde6b 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -260,7 +260,7 @@ for name in sorted(basicklassmap): "LookupByUUIDString", "LookupByVolume" "LookupByName", "LookupByID", "LookupByName", "LookupByKey", "LookupByPath", "LookupByMACString", "LookupByUsage", "LookupByVolume", - "LookupByTargetPath","LookupSCSIHostByWWN", + "LookupByTargetPath","LookupSCSIHostByWWN", "LookupByPortDev", "Restore", "RestoreFlags", "SaveImageDefineXML", "SaveImageGetXMLDesc", "DefineXMLFlags"]: if klass != "virDomain": -- 2.17.1

2 1

[libvirt] [PATCH] qemu: Allow cachetune only for KVM domains
by Michal Privoznik 28 Jun '18

28 Jun '18

https://bugzilla.redhat.com/show_bug.cgi?id=1541921 In TCG mode, there are no vCPU threads and thus there's nothing to be placed into resctrl CGroup. Forbid such configuration. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fee44812c1..a39d9a46a0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3980,6 +3980,13 @@ qemuDomainDefValidate(const virDomainDef *def, } } + if (def->ncachetunes && + def->virtType != VIR_DOMAIN_VIRT_KVM) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("cachetune is only supported for KVM domains")); + goto cleanup; + } + if (qemuDomainDefValidateFeatures(def, qemuCaps) < 0) goto cleanup; -- 2.16.4

3 2

[libvirt] [PATCH] security: Add swtpm paths to the domain's AppArmor profile
by Stefan Berger 28 Jun '18

28 Jun '18

This patch extends the AppArmor domain profile with file paths the swtpm accesses for state, log, pid, and socket files. Both, QEMU and swtpm, use this AppArmor profile. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> Cc: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- examples/apparmor/libvirt-qemu | 5 +++++ src/security/virt-aa-helper.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index 874aca2092..df5f512487 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -158,6 +158,11 @@ /usr/{lib,lib64}/qemu/*.so mr, /usr/lib/(a){multiarch}/qemu/*.so mr, + # swtpm + /{usr/,}bin/swtpm rmix, + /usr/{lib,lib64}/libswtpm_libtpms.so mr, + /usr/lib/(a){multiarch}/libswtpm_libtpms.so mr, + # for save and resume /{usr/,}bin/dash rmix, /{usr/,}bin/dd rmix, diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 971ee6733c..952b496f21 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1181,6 +1181,51 @@ get_files(vahControl * ctl) } } + if (ctl->def->tpm) { + char *shortName = NULL; + const char *tpmpath = NULL; + + switch (ctl->def->tpm->type) { + case VIR_DOMAIN_TPM_TYPE_EMULATOR: + shortName = virDomainDefGetShortName(ctl->def); + + switch (ctl->def->tpm->version) { + case VIR_DOMAIN_TPM_VERSION_1_2: + tpmpath = "tpm1.2"; + break; + case VIR_DOMAIN_TPM_VERSION_2_0: + tpmpath = "tpm2"; + break; + case VIR_DOMAIN_TPM_VERSION_DEFAULT: + case VIR_DOMAIN_TPM_VERSION_LAST: + break; + } + + /* Unix socket for QEMU and swtpm to use */ + virBufferAsprintf(&buf, + " \"/run/libvirt/qemu/swtpm/%s-swtpm.sock\" rw,\n", + shortName); + /* Paths for swtpm to use: give it access to its state + * directory, log, and PID files. + */ + virBufferAsprintf(&buf, + " \"%s/lib/libvirt/swtpm/%s/%s/**\" rw,\n", + LOCALSTATEDIR, uuidstr, tpmpath); + virBufferAsprintf(&buf, + " \"%s/log/swtpm/libvirt/qemu/%s-swtpm.log\" a,\n", + LOCALSTATEDIR, ctl->def->name); + virBufferAsprintf(&buf, + " \"/run/libvirt/qemu/swtpm/%s-swtpm.pid\" rw,\n", + shortName); + + VIR_FREE(shortName); + break; + case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: + case VIR_DOMAIN_TPM_TYPE_LAST: + break; + } + } + if (ctl->def->virtType == VIR_DOMAIN_VIRT_KVM) { for (i = 0; i < ctl->def->nnets; i++) { virDomainNetDefPtr net = ctl->def->nets[i]; -- 2.14.4

2 3

[libvirt] [PATCH] lxc: Rearrange order in lxcDomainUpdateDeviceFlags
by John Ferlan 28 Jun '18

28 Jun '18

Although commit e3497f3f noted that the LIVE option doesn't matter and removed the call to virDomainDefCompatibleDevice, it didn't go quite far enough and change the order of the checks. Since we don't have the possibility of LIVE succeeding and thus the need for a delayed update in order to write the CONFIG change let's just merge the saving of the config into one if statement. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/lxc/lxc_driver.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index bde0ff6ad4..6afb36765a 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -4862,6 +4862,12 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr dom, goto endjob; } + if (flags & VIR_DOMAIN_AFFECT_LIVE) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Unable to modify live devices")); + goto endjob; + } + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ vmdef = virDomainObjCopyPersistentDef(vm, caps, driver->xmlopt); @@ -4872,17 +4878,7 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr dom, * device we're going to update. */ if ((ret = lxcDomainUpdateDeviceConfig(vmdef, dev)) < 0) goto endjob; - } - - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("Unable to modify live devices")); - - goto endjob; - } - /* Finally, if no error until here, we can save config. */ - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { ret = virDomainSaveConfig(cfg->configDir, driver->caps, vmdef); if (!ret) { virDomainObjAssignDef(vm, vmdef, false, NULL); -- 2.14.4

2 1

[libvirt] [PATCH 0/2] tests: qemumonitorjson: Fix blockstats test case
by Peter Krempa 28 Jun '18

28 Jun '18

Peter Krempa (2): tests: qemumonitorjson: Add only required replies for blockstats test tests: qemumonitorjson: Fix name and call apropriate API tests/qemumonitorjsontest.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) -- 2.16.2

2 3

[libvirt] [PATCH] qemu: domain: update only newly detected images in qemuDomainDetermineDiskChain
by Peter Krempa 28 Jun '18

28 Jun '18

The processing code which prepares images should be executed really only for the images which were detected. The code actually tried to update the last user-specified layer as well. Thankfully we don't do anything that would be a problem at this point. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f8a662f747..0fe9bc4b2a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8377,7 +8377,7 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver, if (virStorageFileGetMetadata(src, uid, gid, report_broken) < 0) goto cleanup; - for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) { + for (n = src->backingStore; virStorageSourceIsBacking(n); n = n->backingStore) { if (qemuDomainValidateStorageSource(n, priv->qemuCaps) < 0) goto cleanup; -- 2.16.2

2 1

[libvirt] [PATCH] esx_driver: Simplify IsEncrypted and IsSecure
by Marcos Paulo de Souza 28 Jun '18

28 Jun '18

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org(a)gmail.com> --- src/esx/esx_driver.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 60aa5fc252..bb8eeecd42 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4000,11 +4000,7 @@ esxConnectIsEncrypted(virConnectPtr conn) { esxPrivate *priv = conn->privateData; - if (STRCASEEQ(priv->parsedUri->transport, "https")) { - return 1; - } else { - return 0; - } + return STRCASEEQ(priv->parsedUri->transport, "https"); } @@ -4014,11 +4010,7 @@ esxConnectIsSecure(virConnectPtr conn) { esxPrivate *priv = conn->privateData; - if (STRCASEEQ(priv->parsedUri->transport, "https")) { - return 1; - } else { - return 0; - } + return STRCASEEQ(priv->parsedUri->transport, "https"); } -- 2.17.1

2 1

[libvirt] [PATCH] nwfilter: Remove redundant check if object exists
by Pavel Hrdina 28 Jun '18

28 Jun '18

The same check is done by virNWFilterBindingObjListAdd(). The main issue with the current code is that if the object already exists we would leak 'def' because 'obj' would be set and the cleanup code frees 'def' only if 'obj' is NULL. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index ed34586105..ac3a964388 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -752,13 +752,6 @@ nwfilterBindingCreateXML(virConnectPtr conn, if (virNWFilterBindingCreateXMLEnsureACL(conn, def) < 0) goto cleanup; - obj = virNWFilterBindingObjListFindByPortDev(driver->bindings, def->portdevname); - if (obj) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Filter already present for NIC %s"), def->portdevname); - goto cleanup; - } - obj = virNWFilterBindingObjListAdd(driver->bindings, def); if (!obj) -- 2.17.1

2 1

[libvirt] [PATCH] nwfilter: variable 'obj' must be initialized inside nwfilterBindingCreateXML().
by Julio Faracco 28 Jun '18

28 Jun '18

The function nwfilterBindingCreateXML() is failing to compile due to a conditional branch which leads to a undefined 'obj' variable. So 'obj' must have a initial value to avoid compilation errors. See the problem: CC nwfilter/libvirt_driver_nwfilter_impl_la-nwfilter_driver.lo nwfilter/nwfilter_driver.c:752:9: error: variable 'obj' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (virNWFilterBindingCreateXMLEnsureACL(conn, def) < 0) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ nwfilter/nwfilter_driver.c:779:10: note: uninitialized use occurs here if (!obj) ^~~ nwfilter/nwfilter_driver.c:752:5: note: remove the 'if' if its condition is always false if (virNWFilterBindingCreateXMLEnsureACL(conn, def) < 0) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ nwfilter/nwfilter_driver.c:742:33: note: initialize the variable 'obj' to silence this warning virNWFilterBindingObjPtr obj; ^ = NULL This commit initialized 'obj' with NULL to fix the error properly. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/nwfilter/nwfilter_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index d385b46f5f..ed34586105 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -739,8 +739,8 @@ nwfilterBindingCreateXML(virConnectPtr conn, const char *xml, unsigned int flags) { - virNWFilterBindingObjPtr obj; virNWFilterBindingDefPtr def; + virNWFilterBindingObjPtr obj = NULL; virNWFilterBindingPtr ret = NULL; virCheckFlags(0, NULL); -- 2.17.1

2 1

[libvirt] [python PATCH] Add support for nwfilter binding objects / apis
by Daniel P. Berrangé 28 Jun '18

28 Jun '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- generator.py | 33 ++++++++++++++++++++-- libvirt-override-api.xml | 6 ++++ libvirt-override-virConnect.py | 12 ++++++++ libvirt-override.c | 51 ++++++++++++++++++++++++++++++++++ typewrappers.c | 13 +++++++++ typewrappers.h | 10 +++++++ 6 files changed, 122 insertions(+), 3 deletions(-) diff --git a/generator.py b/generator.py index 353adab..ae0e45c 100755 --- a/generator.py +++ b/generator.py @@ -356,6 +356,10 @@ py_types = { 'virNWFilter *': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"), 'const virNWFilter *': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"), + 'virNWFilterBindingPtr': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr"), + 'virNWFilterBinding *': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr"), + 'const virNWFilterBinding *': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr"), + 'virStreamPtr': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'const virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), @@ -539,6 +543,7 @@ skip_function = ( 'virConnectListAllInterfaces', # overridden in virConnect.py 'virConnectListAllNodeDevices', # overridden in virConnect.py 'virConnectListAllNWFilters', # overridden in virConnect.py + 'virConnectListAllNWFilterBindings', # overridden in virConnect.py 'virConnectListAllSecrets', # overridden in virConnect.py 'virConnectGetAllDomainStats', # overridden in virConnect.py 'virDomainListGetStats', # overriden in virConnect.py @@ -572,6 +577,7 @@ skip_function = ( "virNodeDeviceRef", "virSecretRef", "virNWFilterRef", + "virNWFilterBindingRef", "virStoragePoolRef", "virStorageVolRef", "virStreamRef", @@ -1010,6 +1016,8 @@ classes_type = { "virSecret *": ("._o", "virSecret(self, _obj=%s)", "virSecret"), "virNWFilterPtr": ("._o", "virNWFilter(self, _obj=%s)", "virNWFilter"), "virNWFilter *": ("._o", "virNWFilter(self, _obj=%s)", "virNWFilter"), + "virNWFilterBindingPtr": ("._o", "virNWFilterBinding(self, _obj=%s)", "virNWFilterBinding"), + "virNWFilterBinding *": ("._o", "virNWFilterBinding(self, _obj=%s)", "virNWFilterBinding"), "virStreamPtr": ("._o", "virStream(self, _obj=%s)", "virStream"), "virStream *": ("._o", "virStream(self, _obj=%s)", "virStream"), "virConnectPtr": ("._o", "virConnect(_obj=%s)", "virConnect"), @@ -1021,7 +1029,8 @@ classes_type = { primary_classes = ["virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virConnect", "virNodeDevice", "virSecret", - "virNWFilter", "virStream", "virDomainSnapshot"] + "virNWFilter", "virNWFilterBinding", + "virStream", "virDomainSnapshot"] classes_destructors = { "virDomain": "virDomainFree", @@ -1032,6 +1041,7 @@ classes_destructors = { "virNodeDevice" : "virNodeDeviceFree", "virSecret": "virSecretFree", "virNWFilter": "virNWFilterFree", + "virNWFilterBinding": "virNWFilterBindingFree", "virDomainSnapshot": "virDomainSnapshotFree", # We hand-craft __del__ for this one #"virStream": "virStreamFree", @@ -1058,6 +1068,8 @@ functions_noexcept = { 'virSecretGetUsageType': True, 'virSecretGetUsageID': True, 'virNWFilterGetName': True, + 'virNWFilterBindingGetFilterName': True, + 'virNWFilterBindingGetPortDev': True, } function_classes = {} @@ -1113,6 +1125,15 @@ def nameFixup(name, classe, type, file): elif name[0:15] == "virSecretLookup": func = name[3:] func = func[0:1].lower() + func[1:] + elif name[0:27] == "virNWFilterBindingCreateXML": + func = name[3:] + func = func[0:1].lower() + func[1:] + elif name[0:24] == "virNWFilterBindingDefine": + func = name[3:] + func = func[0:3].lower() + func[3:] + elif name[0:24] == "virNWFilterBindingLookup": + func = name[3:] + func = func[0:3].lower() + func[3:] elif name[0:17] == "virNWFilterDefine": func = name[3:] func = func[0:3].lower() + func[3:] @@ -1189,6 +1210,12 @@ def nameFixup(name, classe, type, file): elif name[0:9] == 'virSecret': func = name[9:] func = func[0:1].lower() + func[1:] + elif name[0:21] == 'virNWFilterBindingGet': + func = name[21:] + func = func[0:1].lower() + func[1:] + elif name[0:18] == 'virNWFilterBinding': + func = name[18:] + func = func[0:1].lower() + func[1:] elif name[0:14] == 'virNWFilterGet': func = name[14:] func = func[0:1].lower() + func[1:] @@ -1468,7 +1495,7 @@ def buildWrappers(module): classes.write("class %s(object):\n" % (classname)) if classname in [ "virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virNodeDevice", "virSecret","virStream", - "virNWFilter" ]: + "virNWFilter", "virNWFilterBinding" ]: classes.write(" def __init__(self, conn, _obj=None):\n") elif classname in [ 'virDomainSnapshot' ]: classes.write(" def __init__(self, dom, _obj=None):\n") @@ -1476,7 +1503,7 @@ def buildWrappers(module): classes.write(" def __init__(self, _obj=None):\n") if classname in [ "virDomain", "virNetwork", "virInterface", "virNodeDevice", "virSecret", "virStream", - "virNWFilter" ]: + "virNWFilter", "virNWFilterBinding" ]: classes.write(" self._conn = conn\n") elif classname in [ "virStorageVol", "virStoragePool" ]: classes.write(" self._conn = conn\n" + \ diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index ecbdac2..4e8d6c0 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -485,6 +485,12 @@ <arg name='flags' type='unsigned int' info='optional flags'/> <return type='char *' info='the list of network filters or None in case of error'/> </function> + <function name='virConnectListAllNWFilterBindings' file='python'> + <info>returns list of all network fitler bindings</info> + <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> + <arg name='flags' type='unsigned int' info='optional flags'/> + <return type='char *' info='the list of network filter bindings or None in case of error'/> + </function> <function name='virNWFilterLookupByUUID' file='python'> <info>Try to lookup a network filter on the given hypervisor based on its UUID.</info> <return type='virNWFilterPtr' info='a new network filter object or NULL in case of failure'/> diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index a24eae7..7fe08e0 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -531,6 +531,18 @@ return retlist + def listAllNWFilterBindings(self, flags=0): + """Returns a list of network filter binding objects""" + ret = libvirtmod.virConnectListAllNWFilterBindings(self._o, flags) + if ret is None: + raise libvirtError("virConnectListAllNWFilterBindings() failed", conn=self) + + retlist = list() + for filter_ptr in ret: + retlist.append(virNWFilterBinding(self, _obj=filter_ptr)) + + return retlist + def listAllSecrets(self, flags=0): """Returns a list of secret objects""" ret = libvirtmod.virConnectListAllSecrets(self._o, flags) diff --git a/libvirt-override.c b/libvirt-override.c index 012de3f..e74c7dd 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -4446,6 +4446,54 @@ libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED, } #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ +#if LIBVIR_CHECK_VERSION(4, 5, 0) +static PyObject * +libvirt_virConnectListAllNWFilterBindings(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *pyobj_conn; + PyObject *py_retval = NULL; + virConnectPtr conn; + virNWFilterBindingPtr *bindings = NULL; + int c_retval = 0; + ssize_t i; + unsigned int flags; + + if (!PyArg_ParseTuple(args, (char *)"OI:virConnectListAllNWFilterBindings", + &pyobj_conn, &flags)) + return NULL; + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virConnectListAllNWFilterBindings(conn, &bindings, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + if (!(py_retval = PyList_New(c_retval))) + goto cleanup; + + for (i = 0; i < c_retval; i++) { + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virNWFilterBindingPtrWrap(bindings[i]), error); + /* python steals the pointer */ + bindings[i] = NULL; + } + + cleanup: + for (i = 0; i < c_retval; i++) + if (bindings[i]) + virNWFilterBindingFree(bindings[i]); + VIR_FREE(bindings); + return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; +} +#endif /* LIBVIR_CHECK_VERSION(4, 5, 0) */ + static PyObject * libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -9971,6 +10019,9 @@ static PyMethodDef libvirtMethods[] = { #if LIBVIR_CHECK_VERSION(0, 10, 2) {(char *) "virConnectListAllNWFilters", libvirt_virConnectListAllNWFilters, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ +#if LIBVIR_CHECK_VERSION(4, 5, 0) + {(char *) "virConnectListAllNWFilterBindings", libvirt_virConnectListAllNWFilterBindings, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(4, 5, 0) */ {(char *) "virConnectListInterfaces", libvirt_virConnectListInterfaces, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedInterfaces", libvirt_virConnectListDefinedInterfaces, METH_VARARGS, NULL}, #if LIBVIR_CHECK_VERSION(0, 10, 2) diff --git a/typewrappers.c b/typewrappers.c index 99a8fb8..9ba14b4 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -542,6 +542,19 @@ libvirt_virNWFilterPtrWrap(virNWFilterPtr node) return ret; } +PyObject * +libvirt_virNWFilterBindingPtrWrap(virNWFilterBindingPtr node) +{ + PyObject *ret; + + if (node == NULL) { + return VIR_PY_NONE; + } + + ret = libvirt_buildPyObject(node, "virNWFilterBindingPtr", NULL); + return ret; +} + PyObject * libvirt_virStreamPtrWrap(virStreamPtr node) { diff --git a/typewrappers.h b/typewrappers.h index ed1e4a3..1570c6a 100644 --- a/typewrappers.h +++ b/typewrappers.h @@ -106,6 +106,15 @@ typedef struct { } PyvirNWFilter_Object; +#define PyvirNWFilterBinding_Get(v) (((v) == Py_None) ? NULL : \ + (((PyvirNWFilterBinding_Object *)(v))->obj)) + +typedef struct { + PyObject_HEAD + virNWFilterBindingPtr obj; +} PyvirNWFilterBinding_Object; + + #define PyvirStream_Get(v) (((v) == Py_None) ? NULL : \ (((PyvirStream_Object *)(v))->obj)) @@ -189,6 +198,7 @@ PyObject * libvirt_virVoidPtrWrap(void* node); PyObject * libvirt_virNodeDevicePtrWrap(virNodeDevicePtr node); PyObject * libvirt_virSecretPtrWrap(virSecretPtr node); PyObject * libvirt_virNWFilterPtrWrap(virNWFilterPtr node); +PyObject * libvirt_virNWFilterBindingPtrWrap(virNWFilterBindingPtr node); PyObject * libvirt_virStreamPtrWrap(virStreamPtr node); PyObject * libvirt_virDomainSnapshotPtrWrap(virDomainSnapshotPtr node); -- 2.17.1

2 1

[libvirt] [PATCH v2 00/12] PCI passthrough support on s390
by Yi Min Zhao 28 Jun '18

28 Jun '18

Abstract ======== The PCI representation in QEMU has recently been extended for S390 allowing configuration of zPCI attributes like uid (user-defined identifier) and fid (PCI function identifier). The details can be found here: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg07262.html To support the new zPCI feature of the S390 platform, two new XML attributes, @uid and @fid, are introduced for device addresses of type 'pci', i.e.: <hostdev mode='subsystem' type='pci'> <driver name='vfio'/> <source> <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' uid='0x0003' fid='0x00000027'/> </hostdev> uid and fid are optional attributes. If they are defined by the user, unique values within the guest domain must be used. If they are not specified and the architecture requires them, they are automatically generated with non-conflicting values. Current implementation is the most seamless one for the user as it unites the address specific data of a PCI device on one XML element. It could accommodate both specifying our special parameters (uid and fid) and re-using standard statements (domain, bus, slot and function) for PCI devices. User can still specify bus/slot/function for the virtualized PCI devices in the XML. Thus uid/fid act as an extension to the PCI address and are stored in a new structure 'virZPCIDeviceAddress' which is a member of common PCI Address structure. Additionally, two hashtables are used for assignment and reservation of uid/fid. In support of extending the PCI address, a new PCI address extension flag is introduced. This extension flag allows is not only dedicated for the S390 platform but also other architectures needing certain extensions to PCI address space. Code Base ========= commit in master: 0c4408c832368b45c8246175e2a75132d3ff0302 qemu: Don't use asyncJob after stop during snapshot revert Change Log ========== v1->v2: 1. Separate test commit and merge testcases into corresponding commits that introduce the functionalities firstly. 2. Spare some checks for zpci device. 3. Add vsock and controller support. 4. Add uin32 type schema. 5. Rename zpciuid and zpcifid to zpci_uid and zpci_fid. 6. Always return multibus support on S390. Yi Min Zhao (12): conf: Add definitions for 'uid' and 'fid' PCI address attributes qemu: Introduce zPCI capability conf: Introduce a new PCI address extension flag qemu: Enable PCI multi bus for S390 guests qemu: Auto add pci-root for s390/s390x guests conf: Introduce address caching for PCI extensions conf: Introduce parser, formatter for uid and fid conf: Allocate/release 'uid' and 'fid' in PCI address qemu: Generate and use zPCI device in QEMU command line qemu: Add hotpluging support for PCI devices on S390 guests docs: Add 'uid' and 'fid' information news: Update news for PCI address extension attributes docs/formatdomain.html.in | 9 +- docs/news.xml | 11 + docs/schemas/basictypes.rng | 31 ++ docs/schemas/domaincommon.rng | 1 + src/conf/device_conf.c | 73 +++++ src/conf/device_conf.h | 1 + src/conf/domain_addr.c | 346 +++++++++++++++++++++ src/conf/domain_addr.h | 29 ++ src/conf/domain_conf.c | 6 + src/libvirt_private.syms | 4 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 105 +++++++ src/qemu/qemu_command.h | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 181 ++++++++++- src/qemu/qemu_hotplug.c | 201 ++++++++++-- src/util/virpci.h | 13 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemuxml2argvdata/disk-virtio-s390-zpci.args | 27 ++ tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml | 17 + .../hostdev-vfio-zpci-autogenerate.args | 26 ++ .../hostdev-vfio-zpci-autogenerate.xml | 18 ++ .../hostdev-vfio-zpci-boundaries.args | 30 ++ .../hostdev-vfio-zpci-boundaries.xml | 26 ++ .../hostdev-vfio-zpci-multidomain-many.args | 40 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 67 ++++ tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 26 ++ tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 19 ++ tests/qemuxml2argvtest.c | 14 + tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml | 29 ++ tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml | 30 ++ tests/qemuxml2xmltest.c | 3 + 38 files changed, 1377 insertions(+), 24 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml -- Yi Min

1 12

[libvirt] [dbus PATCH] mailmap: Add mailmap file
by Andrea Bolognani 27 Jun '18

27 Jun '18

The AUTHORS file included in releases contains some duplicated or incorrect information; having a mailmap file will make sure future ones wont't suffer from the same issue. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .mailmap | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..9a35b7c --- /dev/null +++ b/.mailmap @@ -0,0 +1,9 @@ +# 'git shortlog --help' and look for mailmap for the format of each line + +# Email consolidation: +# <Preferred address in AUTHORS> <other alias used by same author> +<martin(a)piware.de> <martinpitt(a)users.noreply.github.com> + +# Name consolidation: +# Preferred author spelling <preferred email> +Daniel P. Berrangé <berrange(a)redhat.com> -- 2.17.1

2 1

[libvirt] [PATCH v2 0/3] Deny live device alias change
by Michal Privoznik 27 Jun '18

27 Jun '18

v2 of: https://www.redhat.com/archives/libvir-list/2018-June/msg00971.html Note that 1/3 is already reviewed (not pushed though, yet). diff to v1: - Fixed <interface/> hotplug issue raised during review of v1, - Removed alias change checks for disks and interfaces since there's one common place for that now. Michal Privoznik (3): qemuDomainUpdateDeviceFlags: Parse device as live if needed conf: Reintroduce action to virDomainDefCompatibleDevice conf: Forbid device alias change on device-update src/conf/domain_conf.c | 14 +++++++++++++- src/conf/domain_conf.h | 4 +++- src/lxc/lxc_driver.c | 12 +++++++++--- src/qemu/qemu_domain.c | 8 -------- src/qemu/qemu_driver.c | 44 ++++++++++++++++++++++++++++++++------------ src/qemu/qemu_hotplug.c | 5 ----- 6 files changed, 57 insertions(+), 30 deletions(-) -- 2.16.4

2 10

[libvirt] [PATCH python] libvirtaio: Fix compat with python 3.7
by Cole Robinson 27 Jun '18

27 Jun '18

In python 3.7, async is now a keyword, so this throws a syntax error: File "/usr/lib64/python3.7/site-packages/libvirtaio.py", line 49 from asyncio import async as ensure_future ^ SyntaxError: invalid syntax Switch to getattr trickery to accomplish the same goal Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirtaio.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) If we don't care about python3 < 3.4.4 compat, we can just do from asyncio import ensure_future diff --git a/libvirtaio.py b/libvirtaio.py index 1c432dd..9d517e6 100644 --- a/libvirtaio.py +++ b/libvirtaio.py @@ -43,10 +43,12 @@ import warnings import libvirt -try: - from asyncio import ensure_future -except ImportError: - from asyncio import async as ensure_future +# python < 3.4.4: we want 'async' +# python >= 3.4.4 < 3.7, we want 'ensure_future' +# python >= 3.7, 'async' is a reserved keyword, so we can't import it +ensure_future = getattr(asyncio, "ensure_future", None) +if not ensure_future: + ensure_future = getattr(asyncio, "async") class Callback(object): -- 2.17.1

3 5

[libvirt] [PATCH] Fix syntax error on Python 3.7
by Miro Hrončok 27 Jun '18

27 Jun '18

From 0d3b7cc9ba787a139ecbe6dac490b1f5bb021b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz> Date: Wed, 27 Jun 2018 13:00:28 +0200 Subject: [PATCH] Fix syntax error on Python 3.7 async is a keyword now. `asyncio import ensure_future` works on Python 3.4 to 3.7 `from asyncio import async as ensure_future` is not needed. --- libvirtaio.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libvirtaio.py b/libvirtaio.py index 1c432dd..b100a5f 100644 --- a/libvirtaio.py +++ b/libvirtaio.py @@ -43,10 +43,7 @@ import warnings import libvirt -try: - from asyncio import ensure_future -except ImportError: - from asyncio import async as ensure_future +from asyncio import ensure_future class Callback(object): -- 2.17.0

2 3

[libvirt] [PATCH] qemu:Add support L2 table cache for qcow2 disk
by Allen Do 27 Jun '18

27 Jun '18

The patch add support L2 table cache for qcow2 disk. L2 table cache can improve IO read and write performance for qcow2 img. Diff follows: src/conf/domain_conf.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 5 +++++ src/qemu/qemu_command.c | 7 +++++++ src/qemu/qemu_domain.c | 6 ++++++ tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 3 ++- 6 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index beca0be..0a6afca 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8058,6 +8058,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, char *domain_name = NULL; int expected_secret_usage = -1; int auth_secret_usage = -1; + char *disk_l2_cache_size = NULL; + char *disk_cache_clean_interval = NULL; if (!(def = virDomainDiskDefNew(xmlopt))) return NULL; @@ -8233,6 +8235,27 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, } } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ + } else if (xmlStrEqual(cur->name, BAD_CAST "diskCache")) { + disk_l2_cache_size = + virXMLPropString(cur, "disk_l2_cache_size"); + if (disk_l2_cache_size && + virStrToLong_ui(disk_l2_cache_size, NULL, 0, + &def->disk_cache.disk_l2_cache_size) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid disk L2 cache size '%s'"), + disk_l2_cache_size); + goto error; + } + disk_cache_clean_interval = + virXMLPropString(cur, "disk_cache_clean_interval"); + if (disk_cache_clean_interval && + virStrToLong_ui(disk_cache_clean_interval, NULL, 0, + &def->disk_cache.disk_cache_clean_interval) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid disk cache clean interval '%s'"), + disk_cache_clean_interval); + goto error; + } } } @@ -8472,6 +8495,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(vendor); VIR_FREE(product); VIR_FREE(domain_name); + VIR_FREE(disk_l2_cache_size); + VIR_FREE(disk_cache_clean_interval); ctxt->node = save_ctxt; return def; @@ -20646,6 +20671,27 @@ virDomainDiskBlockIoDefFormat(virBufferPtr buf, } } +static void +virDomainDiskCacheDefFormat(virBufferPtr buf, + virDomainDiskDefPtr def) +{ + if (def->disk_cache.disk_l2_cache_size > 0 || + def->disk_cache.disk_cache_clean_interval > 0) { + virBufferAddLit(buf, "<diskCache"); + if (def->disk_cache.disk_l2_cache_size > 0) { + virBufferAsprintf(buf, + " disk_l2_cache_size='%u'", + def->disk_cache.disk_l2_cache_size); + } + if (def->disk_cache.disk_cache_clean_interval > 0) { + virBufferAsprintf(buf, + " disk_cache_clean_interval='%u'", + def->disk_cache.disk_cache_clean_interval); + } + virBufferAddLit(buf, "/>\n"); + } +} + /* virDomainSourceDefFormatSeclabel: * @@ -20990,6 +21036,7 @@ virDomainDiskDefFormat(virBufferPtr buf, virDomainDiskGeometryDefFormat(buf, def); virDomainDiskBlockIoDefFormat(buf, def); + virDomainDiskCacheDefFormat(buf, def); /* For now, mirroring is currently output-only: we only output it * for live domains, therefore we ignore it on input except for diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 91a33cb..83ea9d3 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -647,6 +647,11 @@ struct _virDomainDiskDef { unsigned int physical_block_size; } blockio; + struct { + unsigned int disk_l2_cache_size; + unsigned int disk_cache_clean_interval; + } disk_cache; + virDomainBlockIoTuneInfo blkdeviotune; char *serial; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e087891..7c47cd3 100755 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1662,6 +1662,13 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (qemuBuildDriveSourceStr(disk, cfg, &opt, qemuCaps) < 0) goto error; + if (disk->disk_cache.disk_l2_cache_size > 0) + virBufferAsprintf(&opt, "l2-cache-size=%u,", + disk->disk_cache.disk_l2_cache_size); + if (disk->disk_cache.disk_cache_clean_interval > 0) + virBufferAsprintf(&opt, "cache-clean-interval=%u,", + disk->disk_cache.disk_cache_clean_interval); + if (emitDeviceSyntax) virBufferAddLit(&opt, "if=none"); else diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9f165c1..de334a7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5408,6 +5408,12 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk, CHECK_EQ(ioeventfd, "ioeventfd", true); CHECK_EQ(event_idx, "event_idx", true); CHECK_EQ(copy_on_read, "copy_on_read", true); + + CHECK_EQ(disk_cache.disk_l2_cache_size, + "diskCache disk_l2_cache_size", true); + CHECK_EQ(disk_cache.disk_cache_clean_interval, + "diskCache disk_cache_clean_interval", true); + /* "snapshot" is a libvirt internal field and thus can be changed */ /* startupPolicy is allowed to be updated. Therefore not checked here. */ CHECK_EQ(transient, "transient", true); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args index b405242..b968302 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args @@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,media=cdrom,\ id=drive-ide0-1-0,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive file=/tmp/data.img,format=raw,if=none,id=drive-virtio-disk0 \ +-drive file=/tmp/data.img,format=qcow2,l2-cache-size=536870912,cache-clean-interval=900,if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ id=virtio-disk0 \ -drive file=/tmp/logs.img,format=raw,if=none,id=drive-virtio-disk1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml index b843878..43298fb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml @@ -28,8 +28,9 @@ <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> + <driver name='qemu' type='qcow2'/> <source file='/tmp/data.img'/> + <diskCache disk_l2_cache_size='53687' disk_cache_clean_interval='900' /> <target dev='vda' bus='virtio'/> </disk> <disk type='file' device='disk'> Thanks

3 2

[libvirt] [PATCH v2 00/11] RISC-V Guest Support
by Lubomir Rintel 27 Jun '18

27 Jun '18

Hello, here's a second version of the RISV-V support patch set, initally submitted just under a month ago [1]. [1] https://www.redhat.com/archives/libvir-list/2018-May/thread.html#01008 Thanks to the Andrea's suggestions the patch is now considerably thinner, and split to hopefully more manageable changes. Aside from the test suite, my test case is this (with images from [2]): virt-install \ --import --name riscv64 \ --arch riscv64 --machine virt \ --memory 2048 \ --rng /dev/urandom \ --disk /var/lib/libvirt/images/stage4-disk.img,bus=virtio \ --boot kernel=/var/lib/libvirt/images/bbl,kernel_args="console=ttyS0 ro root=/dev/vda" [2] https://fedorapeople.org/groups/risc-v/disk-images/ Note that the large test suite changes that touch the '*.replies' files seem to upset the mail server, thus you're unlikely to receive them from the list. You can get them straight from my repository instead: git fetch https://github.com/lkundrak/libvirt.git lr/riscv-v2:riscv-v2 git checkout riscv-v2 Thanks! Lubo Diffstat follows. Lubomir Rintel (11): qemu: rename qemuDomainMachineIsVirt() qemu: rename qemuDomainArmVirt() util: add RISC-V architectures docs/schemas: add RISC-V architectures qemu: no USB by default on RISC-V machines qemu: assign addresses to virtio devices on RISC-V tests/capabilitiestest: add RISC-V capability tests tests/util: add RISC-V capabilities tests/captest: check RISC-V capabilities lookup tests/qemuxml2argvtest: test RISC-V virt machine arguments tests/virschematest: add RISC-V to capabilityschemadata/caps-qemu-kvm docs/schemas/basictypes.rng | 2 + src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_domain.c | 27 +- src/qemu/qemu_domain.h | 6 +- src/qemu/qemu_domain_address.c | 23 +- src/util/virarch.c | 3 + src/util/virarch.h | 6 + tests/capabilityschemadata/caps-qemu-kvm.xml | 36 + .../caps_2.12.0.riscv32.replies | 14679 ++++++++++++++++ .../caps_2.12.0.riscv32.xml | 126 + .../caps_2.12.0.riscv64.replies | 14679 ++++++++++++++++ .../caps_2.12.0.riscv64.xml | 126 + tests/qemucapabilitiestest.c | 2 + tests/qemuxml2argvdata/riscv64-virt.args | 31 + tests/qemuxml2argvdata/riscv64-virt.xml | 32 + tests/qemuxml2argvtest.c | 3 + .../riscv64-virt.xml | 39 + tests/testutilsqemu.c | 72 + tests/vircapstest.c | 6 + 20 files changed, 29887 insertions(+), 21 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv32.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv32.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv64.xml create mode 100644 tests/qemuxml2argvdata/riscv64-virt.args create mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml create mode 100644 tests/qemuxml2startupxmloutdata/riscv64-virt.xml -- 2.17.1

2 22

[libvirt] [PATCH 0/2] {lxc, util}: Fixing issues with NULL argument for
by Julio Faracco 27 Jun '18

27 Jun '18

This serie fixes the argument 'type' of syscall mount(). Valgrind is throwing a memory issue when that parameter is NULL. The best option to fix this issue is replace NULL to "none" filesystem. Julio Faracco (2): lxc: moving 'type' argument to avoid issues with mount() syscall. util: moving 'type' argument to avoid issues with mount() syscall. src/lxc/lxc_container.c | 26 +++++++++++++------------- src/util/vircgroup.c | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) -- 2.17.1

2 3

[libvirt] [PATCH] spec: list new nwfilter schema files
by Pavel Hrdina 27 Jun '18

27 Jun '18

Commit <41d619e99c2015eab2d56bea874e23ba9f52f829> introduced new RNG schema files for nwfilter but forgot to update spec file. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 54549cc737..720870e2b1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2052,6 +2052,8 @@ exit 0 %{_datadir}/libvirt/schemas/networkcommon.rng %{_datadir}/libvirt/schemas/nodedev.rng %{_datadir}/libvirt/schemas/nwfilter.rng +%{_datadir}/libvirt/schemas/nwfilter_params.rng +%{_datadir}/libvirt/schemas/nwfilterbinding.rng %{_datadir}/libvirt/schemas/secret.rng %{_datadir}/libvirt/schemas/storagecommon.rng %{_datadir}/libvirt/schemas/storagepool.rng -- 2.17.1

1 0

[libvirt] [PATCH] qemu: hotplug: fix mdev attach for vfio-ccw
by Bjoern Walk 27 Jun '18

27 Jun '18

Mediated devices of model 'vfio-ccw' are using CCW addresses, so make sure to call the correct address preparation code for the model. Reviewed-by: Shalini Chellathurai Saroja <shalini(a)linux.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com> --- src/qemu/qemu_hotplug.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7a1bbc7c..46d30ddd 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2446,8 +2446,15 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr driver, virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_HOSTDEV, { .hostdev = hostdev } }; - if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) - return -1; + switch (hostdev->source.subsys.u.mdev.model) { + case VIR_MDEV_MODEL_TYPE_VFIO_PCI: + if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) + return -1; + break; + case VIR_MDEV_MODEL_TYPE_VFIO_CCW: + case VIR_MDEV_MODEL_TYPE_LAST: + break; + } if (qemuHostdevPrepareMediatedDevices(driver, vm->def->name, -- 2.17.0

2 2

[libvirt] [PATCH] syms: Fix placement of virDomainGetBlkioParametersAssignFromDef
by Cole Robinson 26 Jun '18

26 Jun '18

It's in the domain_addr.h section, but should be in the domain_conf.h section Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- Pushed as trivial src/libvirt_private.syms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f81333baf6..5499a368c0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -110,7 +110,6 @@ virDomainCCWAddressReleaseAddr; virDomainCCWAddressSetCreate; virDomainCCWAddressSetFree; virDomainCCWAddressValidate; -virDomainGetBlkioParametersAssignFromDef; virDomainPCIAddressAsString; virDomainPCIAddressBusIsFullyReserved; virDomainPCIAddressBusSetModel; @@ -364,6 +363,7 @@ virDomainFSTypeToString; virDomainFSWrpolicyTypeFromString; virDomainFSWrpolicyTypeToString; virDomainGenerateMachineName; +virDomainGetBlkioParametersAssignFromDef; virDomainGetFilesystemForTarget; virDomainGraphicsAuthConnectedTypeFromString; virDomainGraphicsAuthConnectedTypeToString; -- 2.17.1

1 0

[libvirt] [PATCH] domain_addr: Fix weird comment format
by Cole Robinson 26 Jun '18

26 Jun '18

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- Pushed as trivial src/conf/domain_addr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 8964973e03..39f22b82eb 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1348,12 +1348,12 @@ virDomainVirtioSerialAddrSetFree(virDomainVirtioSerialAddrSetPtr addrs) /* virDomainVirtioSerialAddrSetCreateFromDomain -+ * -+ * @def: Domain def to introspect -+ * -+ * Inspect the domain definition and return an address set containing -+ * every virtio serial address we find -+ */ + * + * @def: Domain def to introspect + * + * Inspect the domain definition and return an address set containing + * every virtio serial address we find + */ virDomainVirtioSerialAddrSetPtr virDomainVirtioSerialAddrSetCreateFromDomain(virDomainDefPtr def) { -- 2.17.1

1 0

[libvirt] [PATCH v4 0/6] nwfilter: refactor the driver to make it independent of virt drivers
by Daniel P. Berrangé 26 Jun '18

26 Jun '18

v1: https://www.redhat.com/archives/libvir-list/2018-April/msg02616.html v2: https://www.redhat.com/archives/libvir-list/2018-May/msg01145.html v3: https://www.redhat.com/archives/libvir-list/2018-June/msg01121.html Today the nwfilter driver is entangled with the virt drivers in both directions. At various times when rebuilding filters nwfilter will call out to the virt driver to iterate over running guest's NICs. This has caused very complicated lock ordering rules to be required. If we are to split the virt drivers out into separate daemons we need to get rid of this coupling since we don't want the separate daemons calling each other, as that risks deadlock if all of the RPC workers are busy. The obvious way to solve this is to have the nwfilter driver remember all the filters it has active, avoiding the need to iterate over running guests. Changed in v4: - Merged already reviewed patches - Correctly handle nwfilter recreate on daemon startup - Added virsh docs Changed in v3: - Updated API version numbers - Use accessors for virNWFilterBindingObjPtr struct - Other fixes John mentioned Changed in v2: - The virNWFilterBindingPtr was renamed virNWFilterBindingDefPtr - New virNWFilterBindingObjPtr & virNWFilterBindingObjListPtr structs added to track the objects in the driver - New virNWFilterBindingPtr public API type was added - New public APIs for listing filter bindings, querying XML, and creating/deleting them - Convert the virt drivers to use the public API for creating and deleting bindings - Persistent active bindings out to disk so they're preserved across restarts - Added RNG schema and XML-2-XML test - New virsh commands for listing/querying XML/creating/deleting bindings Daniel P. Berrangé (6): virsh: add manpage docs for nwfilter-binding commands. nwfilter: keep track of active filter bindings nwfilter: remove virt driver callback layer for rebuilding filters nwfilter: wire up new APIs for listing and querying filter bindings nwfilter: wire up new APIs for creating and deleting nwfilter bindings nwfilter: convert virt drivers to use public API for nwfilter bindings src/conf/domain_nwfilter.c | 135 ++++++++++++-- src/conf/domain_nwfilter.h | 16 +- src/conf/nwfilter_conf.c | 136 ++------------ src/conf/nwfilter_conf.h | 51 +----- src/conf/virnwfilterobj.c | 4 +- src/conf/virnwfilterobj.h | 4 + src/libvirt_private.syms | 8 +- src/lxc/lxc_driver.c | 28 --- src/lxc/lxc_process.c | 2 +- src/nwfilter/nwfilter_driver.c | 236 ++++++++++++++++++++----- src/nwfilter/nwfilter_gentech_driver.c | 187 ++++++++++---------- src/nwfilter/nwfilter_gentech_driver.h | 8 +- src/qemu/qemu_driver.c | 25 --- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_interface.c | 4 +- src/qemu/qemu_process.c | 6 +- src/remote/remote_daemon.c | 1 + src/uml/uml_conf.c | 2 +- src/uml/uml_driver.c | 29 --- tools/virsh.pod | 35 ++++ 20 files changed, 478 insertions(+), 443 deletions(-) -- 2.17.1

2 9

[libvirt] [PATCH 0/2] qemu: add comma escaping in qemuBuildSCSIiSCSIHostdevDrvStr
by Anya Harter 26 Jun '18

26 Jun '18

In order to use the virQEMUBuildBufferEscapeComma function to escape the commas, the function first had to be converted to use a buffer. Added a test case for comma escaping in name-escape.xml. This should complete the BiteSizedTask entry at https://wiki.libvirt.org/page/BiteSizedTasks#qemu:_Use_comma_escaping_for_m…. Anya Harter (2): qemu: use virBuffer in qemuBuildSCSIiSCSIHostdevDrvStr qemu: Escape commas for qemuBuildSCSIiSCSIHostdevDrvStr src/qemu/qemu_command.c | 19 +++++++++++++------ tests/qemuxml2argvdata/name-escape.args | 6 +++++- tests/qemuxml2argvdata/name-escape.xml | 7 +++++++ tests/qemuxml2argvtest.c | 5 ++++- 4 files changed, 29 insertions(+), 8 deletions(-) -- 2.17.1

2 6

[libvirt] [PATCH v2] qemuDomainObjBeginJobInternal: Report agent job in error message
by Michal Privoznik 26 Jun '18

26 Jun '18

If a thread is unable to acquire a job (e.g. because of timeout) an error is reported and the error message contains reference to the other thread holding the job. Well, the error message should report agent job too as it is yet another source of possible failure. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - Expand messages to cover all @blocker and @agentBlocker possibilities (as Jira requested in review) src/qemu/qemu_domain.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 95c3e3a8aa..3410774781 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6420,6 +6420,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, bool async = job == QEMU_JOB_ASYNC; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); const char *blocker = NULL; + const char *agentBlocker = NULL; int ret = -1; unsigned long long duration = 0; unsigned long long agentDuration = 0; @@ -6549,16 +6550,32 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, priv->job.apiFlags, duration / 1000, agentDuration / 1000, asyncDuration / 1000); - if (nested || qemuDomainNestedJobAllowed(priv, job)) - blocker = priv->job.ownerAPI; - else - blocker = priv->job.asyncOwnerAPI; + if (job) { + if (nested || qemuDomainNestedJobAllowed(priv, job)) + blocker = priv->job.ownerAPI; + else + blocker = priv->job.asyncOwnerAPI; + } + + if (agentJob) + agentBlocker = priv->job.agentOwnerAPI; if (errno == ETIMEDOUT) { - if (blocker) { + if (blocker && agentBlocker) { virReportError(VIR_ERR_OPERATION_TIMEOUT, - _("cannot acquire state change lock (held by %s)"), + _("cannot acquire state change " + "lock (held by monitor=%s agent=%s)"), + blocker, agentBlocker); + } else if (blocker) { + virReportError(VIR_ERR_OPERATION_TIMEOUT, + _("cannot acquire state change " + "lock (held by monitor=%s)"), blocker); + } else if (agentBlocker) { + virReportError(VIR_ERR_OPERATION_TIMEOUT, + _("cannot acquire state change " + "lock (held by agent=%s)"), + agentBlocker); } else { virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s", _("cannot acquire state change lock")); @@ -6566,11 +6583,24 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, ret = -2; } else if (cfg->maxQueuedJobs && priv->jobs_queued > cfg->maxQueuedJobs) { - if (blocker) { + if (blocker && agentBlocker) { virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot acquire state change lock (held by %s) " + _("cannot acquire state change " + "lock (held by monitor=%s agent=%s) " + "due to max_queued limit"), + blocker, agentBlocker); + } else if (blocker) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("cannot acquire state change " + "lock (held by monitor=%s) " "due to max_queued limit"), blocker); + } else if (agentBlocker) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("cannot acquire state change " + "lock (held by agent=%s) " + "due to max_queued limit"), + agentBlocker); } else { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot acquire state change lock " -- 2.16.4

2 1

[libvirt] [PATCH v2 0/2] Alter qemu live/cold device attach algorithm
by John Ferlan 26 Jun '18

26 Jun '18

v1: https://www.redhat.com/archives/libvir-list/2018-June/msg00465.html The first patch is essentially a repeat of the v1 patch, but with a more correct commit message. During testing if the same address was supplied for the --config it wasn't checked. The second patch rearranges qemuDomainAttachDeviceLiveAndConfig to perform CONFIG and LIVE actions separately since the generated @devConf or @devLive could be different depending on whether the incoming XML has an <address> or not and whether the corresponding domain parse and post parse algorithms need to generate some sort of address for the device. John Ferlan (2): qemu: Check for existing hostdev address for cold attach device qemu: Use the correct vm def on cold attach src/qemu/qemu_driver.c | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) -- 2.14.4

4 16

[libvirt] [PATCH] set-lifecycle-action: add description of type and action
by Chen Hanxiao 26 Jun '18

26 Jun '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> In [1], <type> are described as "on_poweroff", "on_reboot", "on_crash". but we accept "poweroff", "reboot" and "crash". This patch adds docs about them. [1]: https://libvirt.org/formatdomain.html#elementsEvents Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh.pod | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 7cb8c8a6e4..1b479f318d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2414,8 +2414,12 @@ the B<virsh dominfo> command. =item B<set-lifecycle-action> I<domain> I<type> I<action> [[I<--config>] [I<--live>] | [I<--current>]] -Set the lifecycle I<action> for specified lifecycle I<type>. For the list of -lifecycle types and actions and possible combinations see the documentation at +Set the lifecycle I<action> for specified lifecycle I<type>. +The valid I<type> are "poweroff", "reboot" and "crash", each of them +allow valid I<action> are "destroy", "restart", "rename-restart", "preserve". +For I<type> "crash", additional actions "coredump-destroy" +and "coredump-restart" are supported. For the list of lifecycle types +and actions and possible combinations see the documentation at L<https://libvirt.org/formatdomain.html#elementsEvents>. =item B<set-user-password> I<domain> I<user> I<password> [I<--encrypted>] -- 2.17.1

2 2

[libvirt] [PATCH v3 00/10] Storage encryption adjustments
by John Ferlan 26 Jun '18

26 Jun '18

v2: https://www.redhat.com/archives/libvir-list/2018-May/msg01268.html Try #3 - this time since Peter removed support for qcow encrypted volumes for domains, I'm taking the same approach for storage. This is totally different from the previous approach which tried to actually create a qcow2 encrypted volume. This time slowly extricate the qcow2 encryption support from the storage driver - at least anything that can have a result via qemu-img. Additionally, added some more luks tests and added the capability to create a luks encrypted volume from a raw image using the two step process that was part of v2. John Ferlan (10): storage: Don't allow encryption secretPath to be NULL tests: Add luks creation examples to storagevolxml2argvtest storage: Rename encryption info variable for clarity tests: Remove qcow2 encryption from storagevol tests storage: Disallow create/resize of qcow2 encrypted images storage: Clean up storageBackendCreateQemuImgCheckEncryption storage: Clean up storageBackendCreateQemuImgOpts storage: Remove storageBackendGenerateSecretData storage: Add support for using inputvol for encryption docs: Add news article for volume encryption modifications docs/formatsecret.html.in | 22 +- docs/formatstorageencryption.html.in | 29 +- docs/news.xml | 25 ++ src/storage/storage_util.c | 303 +++++++-------------- src/storage/storage_util.h | 10 +- src/util/virqemu.c | 26 +- tests/storagevolxml2argvdata/luks-cipher.argv | 5 + tests/storagevolxml2argvdata/luks-convert.argv | 9 + tests/storagevolxml2argvdata/luks.argv | 4 + tests/storagevolxml2argvdata/qcow2-1.1.argv | 2 +- tests/storagevolxml2argvdata/qcow2-compat.argv | 2 +- .../qcow2-from-logical-compat.argv | 2 +- tests/storagevolxml2argvdata/qcow2-lazy.argv | 2 +- .../qcow2-nobacking-convert-prealloc-compat.argv | 2 +- .../qcow2-nobacking-prealloc-compat.argv | 2 +- .../qcow2-nocapacity-convert-prealloc.argv | 2 +- tests/storagevolxml2argvdata/qcow2-nocapacity.argv | 2 +- .../storagevolxml2argvdata/qcow2-nocow-compat.argv | 2 +- tests/storagevolxml2argvtest.c | 76 +++++- tests/storagevolxml2xmlin/vol-luks-convert.xml | 21 ++ tests/storagevolxml2xmlin/vol-qcow2-0.10-lazy.xml | 3 - tests/storagevolxml2xmlin/vol-qcow2-1.1.xml | 3 - tests/storagevolxml2xmlin/vol-qcow2-encryption.xml | 31 +++ tests/storagevolxml2xmlin/vol-qcow2-lazy.xml | 3 - tests/storagevolxml2xmlin/vol-qcow2-nobacking.xml | 3 - .../vol-qcow2-nocapacity-backing.xml | 3 - tests/storagevolxml2xmlin/vol-qcow2-nocapacity.xml | 3 - tests/storagevolxml2xmlin/vol-qcow2-nocow.xml | 3 - tests/storagevolxml2xmlin/vol-qcow2.xml | 3 - tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml | 3 - tests/storagevolxml2xmlout/vol-qcow2-1.1.xml | 3 - .../storagevolxml2xmlout/vol-qcow2-encryption.xml | 31 +++ tests/storagevolxml2xmlout/vol-qcow2-lazy.xml | 3 - tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml | 3 - .../storagevolxml2xmlout/vol-qcow2-nocapacity.xml | 3 - tests/storagevolxml2xmlout/vol-qcow2-nocow.xml | 3 - tests/storagevolxml2xmlout/vol-qcow2.xml | 3 - tests/storagevolxml2xmltest.c | 1 + 38 files changed, 344 insertions(+), 312 deletions(-) create mode 100644 tests/storagevolxml2argvdata/luks-cipher.argv create mode 100644 tests/storagevolxml2argvdata/luks-convert.argv create mode 100644 tests/storagevolxml2argvdata/luks.argv create mode 100644 tests/storagevolxml2xmlin/vol-luks-convert.xml create mode 100644 tests/storagevolxml2xmlin/vol-qcow2-encryption.xml create mode 100644 tests/storagevolxml2xmlout/vol-qcow2-encryption.xml -- 2.14.4

2 12

[libvirt] [PATCH 0/7] qemu: Support page size tuning for pSeries guests
by Andrea Bolognani 26 Jun '18

26 Jun '18

This applies cleanly on top of a0d6894af1b1. Patch 1/7 is too big to go through the list; it can be fetched, along with the rest of the series, from [1]. Patch 2/7 conflicts with patch 1/3 from [2], but making this one depend on it didn't feel right; whichever of the two series gets reviewed and merged first, I'll probably post a rebase of the other one immediately afterwards. Changes from [RFC]: * the QEMU interface has changed based on feedback, which means some of the code is no longer useful and has been dropped; * switched to virXMLFormatElement(), as suggested during review; * added documentation and release notes entry. [1] https://github.com/andreabolognani/libvirt/tree/pseries-hpt-maxpagesize [2] https://www.redhat.com/archives/libvir-list/2018-June/msg01374.html [RFC] https://www.redhat.com/archives/libvir-list/2018-May/msg01710.html Andrea Bolognani (7): tests: Add replies for QEMU 3.0.0 on ppc64 qemu: Add capability for the HPT maxpagesize feature conf: Reintroduce virDomainDef::hpt_resizing conf: Tweak HPT feature parsing and formatting conf: Parse and format HPT maxpagesize qemu: Format HPT maxpagesize on the command line news: Update for HPT maxpagesize feature docs/formatdomain.html.in | 11 +- docs/news.xml | 11 + docs/schemas/domaincommon.rng | 21 +- src/conf/domain_conf.c | 60 +- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 43 +- src/qemu/qemu_domain.c | 2 +- .../caps_2.12.0.aarch64.replies | 48 +- .../caps_2.12.0.aarch64.xml | 2 +- .../caps_2.12.0.ppc64.replies | 197 +- .../caps_2.12.0.ppc64.xml | 2 +- .../caps_2.12.0.s390x.replies | 52 +- .../caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.replies | 64 +- .../caps_2.12.0.x86_64.xml | 2 +- ...ppc64.replies => caps_3.0.0.ppc64.replies} | 5268 ++++++++++------- ..._2.12.0.ppc64.xml => caps_3.0.0.ppc64.xml} | 19 +- tests/qemucapabilitiestest.c | 1 + tests/qemuxml2argvdata/pseries-features.args | 3 +- tests/qemuxml2argvdata/pseries-features.xml | 18 +- tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/pseries-features.xml | 31 +- tests/qemuxml2xmltest.c | 1 + 25 files changed, 3624 insertions(+), 2246 deletions(-) copy tests/qemucapabilitiesdata/{caps_2.12.0.ppc64.replies => caps_3.0.0.ppc64.replies} (92%) copy tests/qemucapabilitiesdata/{caps_2.12.0.ppc64.xml => caps_3.0.0.ppc64.xml} (99%) mode change 120000 => 100644 tests/qemuxml2xmloutdata/pseries-features.xml -- 2.17.1

2 12

[libvirt] [jenkins-ci PATCH v2] jobs: Change git URL to fast external mirrors
by Pavel Hrdina 26 Jun '18

26 Jun '18

We had our own local copy of all projects synchronized by cron on the host where we have the CI VMs. This was to save the traffic from libvirt.org repositories and to make the cloning for our Jenkins jobs faster. We might move our VMs into a cloud in future we would not be able to have any local copy so this changes the git URL to use fast external mirrors. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- v1: <https://www.redhat.com/archives/libvir-list/2018-June/msg01513.html> jobs/autotools.yaml | 2 +- jobs/generic.yaml | 2 +- jobs/go.yaml | 2 +- jobs/perl-modulebuild.yaml | 2 +- jobs/python-distutils.yaml | 2 +- projects/libosinfo.yaml | 1 + projects/libvirt-cim.yaml | 1 + projects/libvirt-dbus.yaml | 1 + projects/libvirt-glib.yaml | 1 + projects/libvirt-go-xml.yaml | 1 + projects/libvirt-go.yaml | 1 + projects/libvirt-perl.yaml | 1 + projects/libvirt-python.yaml | 1 + projects/libvirt-sandbox.yaml | 1 + projects/libvirt-tck.yaml | 1 + projects/libvirt.yaml | 1 + projects/osinfo-db-tools.yaml | 1 + projects/osinfo-db.yaml | 1 + projects/virt-manager.yaml | 1 + projects/virt-viewer.yaml | 1 + 20 files changed, 20 insertions(+), 5 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index f526ed2..c1d0f27 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -21,7 +21,7 @@ num-to-keep: 1000 scm: - git: - url: git://n64.pufty.ci.centos.org/{name}.git + url: '{git-url}' branches: - origin/{branch} clean: diff --git a/jobs/generic.yaml b/jobs/generic.yaml index 3e20962..6c59c63 100644 --- a/jobs/generic.yaml +++ b/jobs/generic.yaml @@ -21,7 +21,7 @@ num-to-keep: 1000 scm: - git: - url: git://n64.pufty.ci.centos.org/{name}.git + url: '{git-url}' branches: - origin/{branch} clean: diff --git a/jobs/go.yaml b/jobs/go.yaml index bffe56e..10518c4 100644 --- a/jobs/go.yaml +++ b/jobs/go.yaml @@ -21,7 +21,7 @@ num-to-keep: 1000 scm: - git: - url: git://n64.pufty.ci.centos.org/{name}.git + url: '{git-url}' branches: - origin/{branch} clean: diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index 4a79bab..934b216 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -21,7 +21,7 @@ num-to-keep: 1000 scm: - git: - url: git://n64.pufty.ci.centos.org/{name}.git + url: '{git-url}' branches: - origin/{branch} clean: diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index c075245..0b20b17 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -21,7 +21,7 @@ num-to-keep: 1000 scm: - git: - url: git://n64.pufty.ci.centos.org/{name}.git + url: '{git-url}' branches: - origin/{branch} clean: diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml index 8e3d105..22c957e 100644 --- a/projects/libosinfo.yaml +++ b/projects/libosinfo.yaml @@ -3,6 +3,7 @@ name: libosinfo machines: '{all_machines}' title: libosinfo + git-url: https://gitlab.com/libosinfo/libosinfo.git jobs: - autotools-build-job: parent_jobs: 'osinfo-db-master-build' diff --git a/projects/libvirt-cim.yaml b/projects/libvirt-cim.yaml index dff3976..c6a7a6d 100644 --- a/projects/libvirt-cim.yaml +++ b/projects/libvirt-cim.yaml @@ -3,6 +3,7 @@ name: libvirt-cim machines: '{rpm_machines}' title: libvirt CIM + git-url: https://github.com/libvirt/libvirt-cim.git jobs: - autotools-build-job: parent_jobs: 'libvirt-master-build' diff --git a/projects/libvirt-dbus.yaml b/projects/libvirt-dbus.yaml index c460db4..44d1b23 100644 --- a/projects/libvirt-dbus.yaml +++ b/projects/libvirt-dbus.yaml @@ -2,6 +2,7 @@ - project: name: libvirt-dbus title: Libvirt D-Bus + git-url: https://github.com/libvirt/libvirt-dbus.git jobs: - autotools-build-job: parent_jobs: 'libvirt-glib-master-build' diff --git a/projects/libvirt-glib.yaml b/projects/libvirt-glib.yaml index 286d25b..f61ca1e 100644 --- a/projects/libvirt-glib.yaml +++ b/projects/libvirt-glib.yaml @@ -3,6 +3,7 @@ name: libvirt-glib machines: '{all_machines}' title: Libvirt GLib + git-url: https://github.com/libvirt/libvirt-glib.git jobs: - autotools-build-job: parent_jobs: 'libvirt-master-build' diff --git a/projects/libvirt-go-xml.yaml b/projects/libvirt-go-xml.yaml index 8d9c16d..6eb7ef0 100644 --- a/projects/libvirt-go-xml.yaml +++ b/projects/libvirt-go-xml.yaml @@ -3,6 +3,7 @@ name: libvirt-go-xml machines: '{all_machines}' title: Libvirt Go XML + git-url: https://github.com/libvirt/libvirt-go-xml.git jobs: - go-build-job: parent_jobs: 'libvirt-master-build' diff --git a/projects/libvirt-go.yaml b/projects/libvirt-go.yaml index f2eb87e..0495374 100644 --- a/projects/libvirt-go.yaml +++ b/projects/libvirt-go.yaml @@ -3,6 +3,7 @@ name: libvirt-go machines: '{all_machines}' title: Libvirt Go + git-url: https://github.com/libvirt/libvirt-go.git jobs: - go-build-job: parent_jobs: 'libvirt-master-build' diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index 28288e8..956ba93 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -3,6 +3,7 @@ name: libvirt-perl machines: '{all_machines}' title: Libvirt Perl + git-url: https://github.com/libvirt/libvirt-perl.git jobs: - perl-modulebuild-build-job: parent_jobs: 'libvirt-master-build' diff --git a/projects/libvirt-python.yaml b/projects/libvirt-python.yaml index 1e742da..fdc55e0 100644 --- a/projects/libvirt-python.yaml +++ b/projects/libvirt-python.yaml @@ -3,6 +3,7 @@ name: libvirt-python machines: '{all_machines}' title: Libvirt Python + git-url: https://github.com/libvirt/libvirt-python.git jobs: - python-distutils-build-job: parent_jobs: 'libvirt-master-build' diff --git a/projects/libvirt-sandbox.yaml b/projects/libvirt-sandbox.yaml index bb8bda6..518080a 100644 --- a/projects/libvirt-sandbox.yaml +++ b/projects/libvirt-sandbox.yaml @@ -7,6 +7,7 @@ - libvirt-fedora-28 - libvirt-fedora-rawhide title: Libvirt Sandbox + git-url: https://github.com/libvirt/libvirt-sandbox.git jobs: - autotools-build-job: parent_jobs: 'libvirt-glib-master-build' diff --git a/projects/libvirt-tck.yaml b/projects/libvirt-tck.yaml index 065678d..c406fda 100644 --- a/projects/libvirt-tck.yaml +++ b/projects/libvirt-tck.yaml @@ -10,6 +10,7 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 title: Libvirt TCK + git-url: https://github.com/libvirt/libvirt-tck.git jobs: - perl-modulebuild-build-job: parent_jobs: 'libvirt-perl-master-build' diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index 7a8392e..c64ac5b 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -4,6 +4,7 @@ machines: '{all_machines}' title: Libvirt archive_format: xz + git-url: https://github.com/libvirt/libvirt.git jobs: - autotools-build-job: parent_jobs: diff --git a/projects/osinfo-db-tools.yaml b/projects/osinfo-db-tools.yaml index cab85af..d4cef11 100644 --- a/projects/osinfo-db-tools.yaml +++ b/projects/osinfo-db-tools.yaml @@ -3,6 +3,7 @@ name: osinfo-db-tools machines: '{all_machines}' title: osinfo database tools + git-url: https://gitlab.com/libosinfo/osinfo-db-tools.git jobs: - autotools-build-job: parent_jobs: diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index a197bbd..141a373 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -4,6 +4,7 @@ machines: '{all_machines}' title: osinfo database archive_format: xz + git-url: https://gitlab.com/libosinfo/osinfo-db.git jobs: - generic-build-job: parent_jobs: 'osinfo-db-tools-master-build' diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index 74f7fc1..84a95a6 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -9,6 +9,7 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 title: Virtual Machine Manager + git-url: https://github.com/virt-manager/virt-manager.git jobs: - python-distutils-build-job: parent_jobs: diff --git a/projects/virt-viewer.yaml b/projects/virt-viewer.yaml index 633ac9a..12335f3 100644 --- a/projects/virt-viewer.yaml +++ b/projects/virt-viewer.yaml @@ -3,6 +3,7 @@ name: virt-viewer machines: '{all_machines}' title: Virt Viewer + git-url: https://pagure.io/virt-viewer.git jobs: - autotools-build-job: parent_jobs: 'libvirt-glib-master-build' -- 2.17.1

2 1

[libvirt] [PATCH] qemu: monitor: Fix memory leak in qemuMonitorJSONNBDServerStart()
by w00251574 26 Jun '18

26 Jun '18

Subject: [PATCH] qemu: monitor: Fix memory leak in qemuMonitorJSONNBDServerStart() Exiting early through the return path did result in 'port_str' being leaked. Signed-off-by: Jie Wang <wangjie88.huawei.com> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index aa89ea7056..3e90279b71 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6540,7 +6540,7 @@ qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon, return ret; if (!(addr = qemuMonitorJSONBuildInetSocketAddress(host, port_str))) - return ret; + goto cleanup; if (!(cmd = qemuMonitorJSONMakeCommand("nbd-server-start", "a:addr", &addr, -- 2.15.0.windows.1

3 2

[libvirt] [PATCH 0/2] Deny live device alias change
by Michal Privoznik 26 Jun '18

26 Jun '18

*** BLURB HERE *** Michal Privoznik (2): qemuDomainUpdateDeviceFlags: Parse device as live if needed conf: Forbid device alias change on device-update src/conf/domain_conf.c | 12 +++++++++++- src/conf/domain_conf.h | 3 ++- src/lxc/lxc_driver.c | 6 +++--- src/qemu/qemu_driver.c | 28 ++++++++++++++++------------ 4 files changed, 32 insertions(+), 17 deletions(-) -- 2.16.4

2 5

[libvirt] Plan for next releases
by Daniel Veillard 26 Jun '18

26 Jun '18

The end of the month is coming quickly, and if we want to release on time it seems we should enter freeze tomorrow wed 27. Then I can make RC2 on Friday and push next Monday assuming thereis no blocker. Hope this works for everybody, thanks, 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] [GSoC] Code design for scalar and external types
by Sukrit Bhatnagar 26 Jun '18

26 Jun '18

Hi, I am starting this discussion thread as a continuation of my GSoC weekly meeting with Erik and Pavel on 8th June. I was going through src/util/virstring.c for adding cleanup macros and saw that virStringListFree takes on char ** as an argument, and equivalently, we declare a list of strings as char **. For the cleanup function defined by VIR_DEFINE_AUTOPTR_FUNC, it is required that the associated type has a name like virSomethingPtr. It was also discussed that there are similar issues with DBus types, but VIR_AUTOFREE can work there as we use VIR_ALLOC. I honestly don't know much about that. We discussed that we have two solutions: - Create a virSomethingPtr by typedef-ing char** As Pavel told, GLib has typedef gchar** GStrv; which is used together with g_auto and it has g_strfreev(gchar **str_array) which is the same as we have virStringListFree() I have tried adding the following in src/util/virstrnig.h, and it seems to work fine: typedef char **virStringList; VIR_DEFINE_AUTOPTR_FUNC(virStringList, virStringListFree) We can use it as: VIR_AUTOPTR(virStringList) lines = NULL; There may be other scalar and external types where this problem occurs, and it is not good to create a typedef for each of them, but maybe we can make an exception for char ** and create a type for it. - Overload VIR_AUTOFREE macro by making it variadic As Erik told, we could make VIR_AUTOFREE a variadic macro whose varying parameter can be the Free function name. If left blank, we use virFree. I went ahead with trying it and after reading some posts on StackOverflow, I came up with this: #define _VIR_AUTOFREE_0(type) __attribute__((cleanup(virFree))) type #define _VIR_AUTOFREE_1(type, func) __attribute__((cleanup(func))) type #define _VIR_AUTOFREE_OVERLOADER(_1, _2, NAME, ...) NAME #define VIR_AUTOFREE(...) _VIR_AUTOFREE_OVERLOADER(__VA_ARGS__, _VIR_AUTOFREE_1, _VIR_AUTOFREE_0)(__VA_ARGS__) The required functionality is working as expected; passing only one argument will use virFree, and passing two arguments will use the function specified as 2nd argument. Passing more than 2 arguments will result in an error. The macros with _ prefix are meant to be for internal use only. Also, @func needs to be a wrapper around virStringListFree as it will take char ***, not just char **. We probably need to define a new function. Here we are specifying the Free function to use at the time of usage of the VIR_AUTOFREE macro, which may make the code look bad: VIR_AUTOFREE(char **, virStringListSomethingFree) lines = NULL; Suggestions and opinions are welcome. Thanks, Sukrit

6 20

[libvirt] [PATCH] util: fix mount issue by moving NULL value to "none" in syscall.
by Julio Faracco 26 Jun '18

26 Jun '18

After running libvirt daemon with valgrind tools, some errors are appearing when you try to start a domain. One example: ==18012== Syscall param mount(type) points to unaddressable byte(s) ==18012== at 0x6FEE3CA: mount (syscall-template.S:78) ==18012== by 0x531344D: virFileMoveMount (virfile.c:3828) ==18012== by 0x27FE7675: qemuDomainBuildNamespace (qemu_domain.c:11501) ==18012== by 0x2800C44E: qemuProcessHook (qemu_process.c:2870) ==18012== by 0x52F7E1D: virExec (vircommand.c:726) ==18012== by 0x52F7E1D: virCommandRunAsync (vircommand.c:2477) ==18012== by 0x52F4EDD: virCommandRun (vircommand.c:2309) ==18012== by 0x2800A731: qemuProcessLaunch (qemu_process.c:6235) ==18012== by 0x2800D6B4: qemuProcessStart (qemu_process.c:6569) ==18012== by 0x28074876: qemuDomainObjStart (qemu_driver.c:7314) ==18012== by 0x280522EB: qemuDomainCreateWithFlags (qemu_driver.c:7367) ==18012== by 0x55484BF: virDomainCreate (libvirt-domain.c:6531) ==18012== by 0x12CDBD: remoteDispatchDomainCreate (remote_daemon_dispatch_stubs.h:4350) ==18012== by 0x12CDBD: remoteDispatchDomainCreateHelper (remote_daemon_dispatch_stubs.h:4326) ==18012== Address 0x0 is not stack'd, malloc'd or (recently) free'd Some documentation recommends to use "none" when you don't have a filesystem type to use. Specially, for bind and move actions. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virfile.c | 2 +- src/util/virprocess.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 9296ccbe2a..378d03ecf0 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3825,7 +3825,7 @@ virFileMoveMount(const char *src, { const unsigned long mount_flags = MS_MOVE; - if (mount(src, dst, NULL, mount_flags, NULL) < 0) { + if (mount(src, dst, "none", mount_flags, NULL) < 0) { virReportSystemError(errno, _("Unable to move %s mount to %s"), src, dst); diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 1fbbbb3a27..f92b0dce37 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1181,7 +1181,7 @@ virProcessSetupPrivateMountNS(void) goto cleanup; } - if (mount("", "/", NULL, MS_SLAVE|MS_REC, NULL) < 0) { + if (mount("", "/", "none", MS_SLAVE|MS_REC, NULL) < 0) { virReportSystemError(errno, "%s", _("Failed to switch root mount into slave mode")); goto cleanup; -- 2.17.1

2 1

[libvirt] [RFC PATCH 0/3] RFC for X86 RDT Cache Monitoring Technology (CMT) support
by Wang Huaqiang 26 Jun '18

26 Jun '18

This is an RFC request for supporting CPU Cache Monitoring Technology (CMT) feature in libvirt. Since MBM is also another feature which is very close to CMT, for simplicity we only discuss CMT here. MBM is the followup that will be implemented after CMT. About CMT please refer to Intel x86 SDM section 17.18 of volume 3 (link:https://software.intel.com/en-us/articles/intel-sdm) ## About '_virResctrlMon' interface The cache allocation technology (CAT) has already been implemented in util/virresctrl.* which interacts with Linux kernel resctrl file system. Very simlimar to CAT, the CMT object is represented by 'struct _virResctrlMon', which is ``` struct _virResctrlMon { virObject parent; /* pairedalloc: pointer to a resctrl allocaion it paried with. * NULL for a resctrl monitoring group not associated with * any allocation. */ virResctrlAllocPtr pairedalloc; /* The identifier (any unique string for now) */ char *id; /* libvirt-generated path, may be identical to alloction path * may not if allocation is ready */ char *path; }; ``` Almost following the same logic behind '_virResctrlAlloc' which is mainly presented in file 'virresctrl.c', a group of APIs has been designed to manipulate '_virResctrlMon'. The '_virResctrlMon' shares a lot in common with '_virResctrlAlloc' except field 'pairedalloc'. 'pairedalloc' stores the pointer of paired resctrl allocation object. With current libvirt resctrl implementation, if a resctrl '_virResctrlAlloc' object is created, the CMT hardware is enabled automatically and shares the same folder under same resctrlfs, I call the CMT '_virResctrlMon' object that shares the same folder under resctrlfs as 'paired' _virResctrlMon, further, one '_virResctrlMon' and one '_virResctrlAlloc' are a pare. In '_virResctrlMon' the paired '_virResctrlAlloc' is tracked through pairedalloc. paired mon group could not be dynamically enabled or disabled during runtime. 'pairedalloc' could be set to NULL, which creates a non-paired mon group object. Which is necessory because CMT could work independently to monitor the utilization of critical CPU resouces (cache or memory bandwidth) without allocating any dedicated cache or memory bandwidth. A non-paired mon group object represents an independent working CMT. Non-paired mon group could be enabled or disabled during runtime. ## About virsh command 'resctrl' To set or get the resctrl mon group (hardware CMT), a virsh command 'resctrl' is created. here are the common usages: ``` [root@dl-c200 david]# virsh list --all Id Name State ---------------------------------------------------- 1 vm3 running 3 vm2 running - vm1 shut off ``` ### Test on a running domain vm3 To get RDT monitoring status, type 'virsh resctrl <domain>' ``` [root@dl-c200 david]# virsh resctrl vm3 RDT Monitoring Status: Enabled ``` To enable RDT monitoring, type 'virsh resctrl <domain> --enable' ``` [root@dl-c200 david]# virsh resctrl vm3 --enable RDT Monitoring Status: Enabled ``` To diable RDT monitoring, type 'virsh resctrl <domain> --disable' ``` [root@dl-c200 david]# virsh resctrl vm3 --disable RDT Monitoring Status: Disabled [root@dl-c200 david]# virsh resctrl vm3 RDT Monitoring Status: Disabled ``` ### test on domain not running vm1 if domain is not active, it will fail to set RDT monitoring status, and also get the state of 'disabled' ``` [root@dl-c200 david]# virsh resctrl vm1 RDT Monitoring Status: Disabled [root@dl-c200 david]# virsh resctrl vm1 --enable error: Requested operation is not valid: domain is not running [root@dl-c200 david]# virsh resctrl vm1 --disable error: Requested operation is not valid: domain is not running ``` ### test on domain vm2 domain vm2 is active and the CAT functionality is enabled through 'cachetune' (configured in 'cputune/cachetune' section). So the resctrl mon group is a 'paried' one, for 'pared' mon group, the RDT monitoring could not be disabled. If it is allowed to disable 'paire' mon group, we have to destroy resctrl allocation folders which is not supported by current cache allocation design. ``` [root@dl-c200 libvirt]# virsh resctrl vm2 --enable RDT Monitoring Status: Enabled (forced by cachetune) [root@dl-c200 libvirt]# virsh resctrl vm2 --disable RDT Monitoring Status: Enabled (forced by cachetune) [root@dl-c200 libvirt]# virsh resctrl vm2 RDT Monitoring Status: Enabled (forced by cachetune) ``` ## About showing the utilization information of RDT A domstats field has been created to show the utilization of RDT resources, the command is like this: ``` [root@dl-c200 libvirt]# virsh domstats --resctrl Domain: 'vm1' resctrl.cmt=0 Domain: 'vm3' resctrl.cmt=180224 Domain: 'vm2' resctrl.cmt=2613248 ``` Wang Huaqiang (3): util: add Intel x86 RDT/CMT support tools: virsh: add command for controling/monitoring resctrl tools: virsh domstats: show RDT CMT resource utilization information include/libvirt/libvirt-domain.h | 10 ++ src/conf/domain_conf.c | 28 ++++ src/conf/domain_conf.h | 3 + src/driver-hypervisor.h | 8 + src/libvirt-domain.c | 92 +++++++++++ src/libvirt_private.syms | 9 + src/libvirt_public.syms | 6 + src/qemu/qemu_driver.c | 189 +++++++++++++++++++++ src/qemu/qemu_process.c | 65 +++++++- src/remote/remote_daemon_dispatch.c | 45 +++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 28 +++- src/remote_protocol-structs | 12 ++ src/util/virresctrl.c | 316 +++++++++++++++++++++++++++++++++++- src/util/virresctrl.h | 44 +++++ tools/virsh-domain-monitor.c | 7 + tools/virsh-domain.c | 74 +++++++++ 17 files changed, 933 insertions(+), 5 deletions(-) -- 2.7.4

3 11