- Devel - libvirt List Archives

[libvirt] [PATCH] bugfix: add lock in ClientClose to avoid data race
by xinhua.Cao 13 Mar '18

13 Mar '18

From: l00425170 <liujunjie23(a)huawei.com> When libvirt client registers callback function, remoteDispatchConnectDomainEventCallbackRegisterAny is called, then virInsertElementsN will be called to add new callback for struct daemonClientPrivate *priv. But at the same time, if the corresponding socket is closed (one way is to kill the client process), the close callback remoteClientCloseFunc is called, then remoteFreePrivCallbacks(priv) is called to free priv. So there exists data race to cause libvirtd coredump. More details, in add callback, when memset for ptrptr (that is priv) is done in virExpandN at the process of virInsertElementsN. At this time point, priv can be free to be 0x0 when close client. So when the procedure goes to memcpy in virInsertElementsN, the libvirtd will coredump. And the stack are as follows: Thread 1 (Thread 0x7feadf7fe700 (LWP 8978)): #0 0x00007feb7b77f314 in __memcpy_ssse3_back() from /usr/lib64/libc.so.6 #1 0x00007feb7e769a82 in memcpy (__len=8, __src=0x7feadf7fdb58, __dest=<optimized out>) at /usr/include/bits/string3.h:51 #2 virInsertElementsN (ptrptr=ptrptr@entry=0x558e9c36fae8, size=size@entry=8, at=<optimized out>, at@entry=18446744073709551615, countptr=countptr@entry=0x558e9c36faf0, add=add@entry=1, newelems=newelems@entry=0x7feadf7fdb58, clearOriginal=clearOriginal@entry=true, inPlace=inPlace@entry=false, report=report@entry=true, domcode=domcode@entry=7, filename=filename@entry=0x558e9af16107 "remote.c", funcname=funcname@entry=0x558e9af24600 <__FUNCTION__.48097> "remoteDispatchConnectDomainEventCallbackRegisterAny", linenr=linenr@entry=4424) at util/viralloc.c:454 #3 0x0000558e9aed7001 in remoteDispatchConnectDomainEventCallbackRegisterAny (server=<optimized out>, msg=<optimized out>, ret=0x7feab805e6f0, args=0x7feab806aa40, rerr=0x7feadf7fdc90, client=<optimized out>) at remote.c:4422 #4 remoteDispatchConnectDomainEventCallbackRegisterAnyHelper (server=<optimized out>, client=<optimized out>, msg=<optimized out>, rerr=0x7feadf7fdc90, args=0x7feab806aa40, ret=0x7feab805e6f0) at remote_dispatch.h:424 #5 0x0000558e9af0ca48 in virNetServerProgramDispatchCall (msg=0x558e9c3925c0, client=0x558e9c36f970, server=0x558e9c351570, prog=0x558e9c367d50) at rpc/virnetserverprogram.c:474 #6 virNetServerProgramDispatch (prog=0x558e9c367d50, server=server@entry=0x558e9c351570, client=0x558e9c36f970, msg=0x558e9c3925c0) at rpc/virnetserverprogram.c:311 #7 0x0000558e9af085ed in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x558e9c351570) at rpc/virnetserver.c:148 #8 virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x558e9c351570) at rpc/virnetserver.c:169 #9 0x00007feb7e7f1861 in virThreadPoolWorker (opaque=opaque@entry=0x558e9c36b5f0) at util/virthreadpool.c:167 #10 0x00007feb7e7f0b78 in virThreadHelper (data=<optimized out>) at util/virthread.c:219 #11 0x00007feb7b9fcdc5 in start_thread () from /usr/lib64/libpthread.so.0 #12 0x00007feb7b72b75d in clone () from /usr/lib64/libc.so.6 Signed-off-by: l00425170 <liujunjie23(a)huawei.com> --- src/remote/remote_daemon.h | 2 ++ src/remote/remote_daemon_dispatch.c | 46 ++++++++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h index 4467f71..8accafc 100644 --- a/src/remote/remote_daemon.h +++ b/src/remote/remote_daemon.h @@ -76,6 +76,8 @@ struct daemonClientPrivate { virConnectPtr conn; daemonClientStreamPtr streams; + + bool clientClosed; }; diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index fdb0a36..59e69e6 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1752,8 +1752,12 @@ static void remoteClientCloseFunc(virNetServerClientPtr client) daemonRemoveAllClientStreams(priv->streams); /* Deregister event delivery callback */ - if (priv->conn) + if (priv->conn) { + virMutexLock(&priv->lock); remoteClientFreePrivateCallbacks(priv); + priv->clientClosed = true; + virMutexUnlock(&priv->lock); + } } @@ -3889,6 +3893,11 @@ remoteDispatchConnectDomainEventRegister(virNetServerPtr server ATTRIBUTE_UNUSED virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + /* If we call register first, we could append a complete callback * to our array, but on OOM append failure, we'd have to then hope * deregister works to undo our register. So instead we append an @@ -4116,6 +4125,11 @@ remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + /* We intentionally do not use VIR_DOMAIN_EVENT_ID_LAST here; any * new domain events added after this point should only use the * modern callback style of RPC. */ @@ -4192,6 +4206,11 @@ remoteDispatchConnectDomainEventCallbackRegisterAny(virNetServerPtr server ATTRI virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->dom && !(dom = get_nonnull_domain(priv->conn, *args->dom))) goto cleanup; @@ -5702,6 +5721,11 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetServerPtr server ATTRIBUTE_UN virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->net && !(net = get_nonnull_network(priv->conn, *args->net))) goto cleanup; @@ -5824,6 +5848,11 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virNetServerPtr server ATTRIBUT virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->pool && !(pool = get_nonnull_storage_pool(priv->conn, *args->pool))) goto cleanup; @@ -5945,6 +5974,11 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(virNetServerPtr server ATTRIBUTE virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->dev && !(dev = get_nonnull_node_device(priv->conn, *args->dev))) goto cleanup; @@ -6066,6 +6100,11 @@ remoteDispatchConnectSecretEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->secret && !(secret = get_nonnull_secret(priv->conn, *args->secret))) goto cleanup; @@ -6188,6 +6227,11 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetServerPtr server ATTRIBUTE_U virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->dom && !(dom = get_nonnull_domain(priv->conn, *args->dom))) goto cleanup; -- 2.13.3.windows.1

2 1

[libvirt] [PATCH] qemu: hotplug: fail when net device detach times out
by Jonathan Davies 13 Mar '18

13 Mar '18

qemuDomainDetachNetDevice should not treat a timeout in a call to qemuDomainWaitForDeviceRemoval as success. Instead, it should treat it as failure -- this is the intention behind having a timeout. If qemuDomainWaitForDeviceRemoval times out, it returns 0. In this instance, if qemuDomainDetachNetDevice returns 0, virsh detach-interface reports: Interface detached successfully with a zero exit status. But with a negative return value from qemuDomainDetachNetDevice, virsh detach-interface reports: error: Failed to detach interface error: An error occurred, but the cause is unknown with a non-zero exit status, which is more appropriate. Signed-off-by: Jonathan Davies <jonathan.davies(a)nutanix.com> --- src/qemu/qemu_hotplug.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4be0f546c..d9a2f2d4d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5082,8 +5082,13 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; - if ((ret = qemuDomainWaitForDeviceRemoval(vm)) == 1) + ret = qemuDomainWaitForDeviceRemoval(vm); + if (ret == 1) { ret = qemuDomainRemoveNetDevice(driver, vm, detach); + } else if (ret == 0) { + VIR_WARN("Detach of device %s timed out; treating as a failure", detach->ifname); + ret = -1; + } cleanup: qemuDomainResetDeviceRemoval(vm); -- 2.14.1

5 7

[libvirt] [PATCH security-notice 0/4] Add missing security notices
by Daniel P. Berrangé 13 Mar '18

13 Mar '18

This provides the security notices we've had so far in 2018 and a script to make future ones easier to create. Daniel P. Berrangé (4): LSN-2018-0001 / CVE-2017-5715 - Spectre variant 2 branch target injection LSN-2018-0002 / CVE-2018-5748 - QEMU monitor denial of service LSN-2018-0003 / CVE-2018-6764 - Insecure usage of NSS modules during container startup Add a script for generating a list of vulnerable tags & branches notices/2018/0001.xml | 276 ++++++++++++++++++++++++++++++++++++++ notices/2018/0002.xml | 274 +++++++++++++++++++++++++++++++++++++ notices/2018/0003.xml | 269 +++++++++++++++++++++++++++++++++++++ scripts/report-vulnerable-tags.pl | 108 +++++++++++++++ 4 files changed, 927 insertions(+) create mode 100644 notices/2018/0001.xml create mode 100644 notices/2018/0002.xml create mode 100644 notices/2018/0003.xml create mode 100644 scripts/report-vulnerable-tags.pl -- 2.14.3

1 4

[libvirt] [PATCH] tests: Fix path to status XML test directory in makefile
by Peter Krempa 13 Mar '18

13 Mar '18

Commit 99e30acfdce added 'qemustatusxml2xmloutdata' to EXTRA_DIST but the directory added in the commit is called 'qemustatusxml2xmldata' Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the I-didn't-run-distcheck-when-messing-with-files-in-the-tree-and-broke-the-build-rule. tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1f60ee0393..11a9b904ed 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -128,7 +128,7 @@ EXTRA_DIST = \ qemumonitorjsondata \ qemuxml2argvdata \ qemuxml2xmloutdata \ - qemustatusxml2xmloutdata \ + qemustatusxml2xmldata \ qemumemlockdata \ secretxml2xmlin \ securityselinuxhelperdata \ -- 2.16.2

1 0

[libvirt] [PATCH] tests: bhyvexml2xml: Fix call to testCompareDomXML2XMLFiles
by Peter Krempa 13 Mar '18

13 Mar '18

Commit 1b28038300b forgot to fix the arguments for this one caller. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-breaker rule. tests/bhyvexml2xmltest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index e483dac630..4d9c1681db 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -39,7 +39,7 @@ testCompareXMLToXMLHelper(const void *data) ret = testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, xml_in, is_different ? xml_out : xml_in, - false, NULL, NULL, 0, + false, 0, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); if ((ret != 0) && (info->flags & FLAG_EXPECT_FAILURE)) { -- 2.16.2

1 0

[libvirt] [PATCH] build: Add srpm make target
by Jiri Denemark 13 Mar '18

13 Mar '18

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0d46c16c22..81c7f52d9c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,9 @@ EXTRA_DIST += \ rpm: clean @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.xz) +srpm: clean + @(unset CDPATH ; $(MAKE) dist && rpmbuild -ts $(distdir).tar.xz) + check-local: all tests check-access: -- 2.16.2

2 1

[libvirt] [PATCH 0/2] Two small memleak fixes
by Michal Privoznik 13 Mar '18

13 Mar '18

*** BLURB HERE *** Michal Privoznik (2): virSysinfoParseX86Chassis: Store asset tag into correct pointer virSecurityDACChownListFree: Don't leak list->items array src/security/security_dac.c | 1 + src/util/virsysinfo.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.16.1

2 4

[libvirt] [PATCH] conf: allow more user friendly names for disk formats
by Daniel P. Berrangé 13 Mar '18

13 Mar '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/domain_conf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 04a6ee77af..007b73a84d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9152,6 +9152,12 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def, if (STREQ(tmp, "aio")) { /* Xen back-compat */ def->src->format = VIR_STORAGE_FILE_RAW; + } else if (STREQ(tmp, "🐄")) { + def->src->format = VIR_STORAGE_FILE_COW; + } else if (STREQ(tmp, "q🐄")) { + def->src->format = VIR_STORAGE_FILE_QCOW; + } else if (STREQ(tmp, "q🐄2")) { + def->src->format = VIR_STORAGE_FILE_QCOW2; } else { if ((def->src->format = virStorageFileFormatTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 2.14.3

3 2

[libvirt] [PATCH] qemuAssignDeviceInputAlias: Be tolerant to pre-existent alias
by Michal Privoznik 13 Mar '18

13 Mar '18

This is missing in 6bc4a371cf and therefore we are effectively overwriting user provided aliases for <input/> devices. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_alias.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index ae30f7df8..d0ca15bae 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -513,6 +513,9 @@ qemuAssignDeviceInputAlias(virDomainDefPtr def, virDomainInputDefPtr input, int idx) { + if (input->info.alias) + return 0; + if (idx == -1) { int thisidx; size_t i; -- 2.16.1

2 1

[libvirt] [dbus PATCH 00/18] rewrite to use libdbus and some other fixes
by Pavel Hrdina 13 Mar '18

13 Mar '18

The first 15 patches fixes some issues and bugs and cleanups the code. Patch 16 introduces support for libdbus and a lot of helper functions. Patch 17 switches the code to use libdbus instead of sd-bus and drops all sd-bus related code. Patch 18 introduces threading so every message is processed by separate thread. Pavel Hrdina (18): util: rename VIR_ATTR_UNUSED util: there is no need to mark cleanup functions as inline util: introduce VIRT_DBUS_ERROR_INTERFACE connect: introduce VIRT_DBUS_CONNECT_INTERFACE domain: introduce VIRT_DBUS_DOMAIN_INTERFACE events: fix signal message for TrayChange event events: fix function names for TrayChange and DiskChange events main: error out if signal handler is not registered main: fix error message spec: don't use hard-coded system_user maint: fix coding style maint: cleanup includes domain: ensure connection to libvirt connect: parse message arguments as first thing domain: create a helper function to get a domain object introduce support for libdbus library switch from sd-bus to libdbus main: introduce threads to process the dbus messages README | 2 +- configure.ac | 16 +- data/Makefile.am | 7 + data/org.libvirt.Connect.xml | 56 ++ data/org.libvirt.Domain.xml | 51 ++ libvirt-dbus.spec.in | 16 +- src/Makefile.am | 15 +- src/connect.c | 240 ++++----- src/connect.h | 44 +- src/dbus.c | 1226 ++++++++++++++++++++++++++++++++++++++++++ src/dbus.h | 158 ++++++ src/domain.c | 642 ++++++++++------------ src/domain.h | 5 +- src/events.c | 150 +++--- src/events.h | 3 - src/main.c | 208 ++++--- src/util.c | 310 ++++++++--- src/util.h | 82 ++- test/Makefile.am | 3 +- test/travis-run | 2 +- 20 files changed, 2446 insertions(+), 790 deletions(-) create mode 100644 data/org.libvirt.Connect.xml create mode 100644 data/org.libvirt.Domain.xml create mode 100644 src/dbus.c create mode 100644 src/dbus.h -- 2.14.3

2 37

[libvirt] [PATCH v2 00/10] Add proper testing of qemu status XML files
by Peter Krempa 13 Mar '18

13 Mar '18

Changes to v1: - added tests specifically for testing format probing (also formating of argv) - removed format probing from snapshot tests - added a synthetic test for <lockstate> - added <namespaces> to the 'modern' test (note that allowReboot is tested in one of the old tests which were preserved) This version also saves space by using symlinks in place of the output XML files since they are identical to the input ones in all cases added in this tests. Peter Krempa (10): tests: qemuxml2xml: Rename testInfoFree to testInfoClear tests: qemu: Explicitly add tests with format probing allowed tests: qemuxml2xml: Remove testing with allowed format detection tests: domainsnapshotxml2xml: Remove testing with allowed format detection tests: qemuxml2xml: Add proper domain status XML testing tests: qemuxml2xml: Add synthetic test for <lockstate> in status XML tests: qemuxml2xml: Remove fake status XML testing tests: util: Remove callback from testCompareDomXML2XMLFiles tests: qemuxml2xml: Add modern example of status XML to the test tests: qemuxml2xml: Add status XML with outgoing migration with NBD tests/Makefile.am | 1 + .../disk_snapshot_redefine.xml | 6 + .../external_vm_redefine.xml | 1 + tests/domainsnapshotxml2xmlout/full_domain.xml | 1 + tests/domainsnapshotxml2xmlout/metadata.xml | 1 + tests/domainsnapshotxml2xmltest.c | 3 - tests/genericxml2xmltest.c | 2 +- tests/lxcxml2xmltest.c | 2 +- tests/qemustatusxml2xmldata/blockjob-mirror-in.xml | 97 +++++ .../qemustatusxml2xmldata/blockjob-mirror-out.xml | 1 + .../qemustatusxml2xmldata/migration-out-nbd-in.xml | 449 +++++++++++++++++++++ .../migration-out-nbd-out.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 448 ++++++++++++++++++++ tests/qemustatusxml2xmldata/modern-out.xml | 1 + tests/qemustatusxml2xmldata/vcpus-multi-in.xml | 343 ++++++++++++++++ tests/qemustatusxml2xmldata/vcpus-multi-out.xml | 1 + .../qemuxml2argvdata/disk-drive-detect-zeroes.xml | 2 +- .../qemuxml2argvdata/disk-many-format-probing.args | 29 ++ .../qemuxml2argvdata/disk-many-format-probing.xml | 48 +++ tests/qemuxml2argvdata/hugepages-memaccess.xml | 1 + tests/qemuxml2argvdata/hugepages-memaccess2.xml | 1 + tests/qemuxml2argvdata/hugepages-pages4.xml | 1 + tests/qemuxml2argvdata/hugepages-pages5.xml | 1 + tests/qemuxml2argvdata/hugepages-pages6.xml | 1 + .../memory-hotplug-nvdimm-access.xml | 1 + .../memory-hotplug-nvdimm-label.xml | 1 + tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml | 1 + .../serial-tcp-tlsx509-chardev-notls.xml | 1 + tests/qemuxml2argvtest.c | 6 + .../aarch64-aavmf-virtio-mmio.xml | 1 + .../aarch64-virtio-pci-default.xml | 1 + .../aarch64-virtio-pci-manual-addresses.xml | 1 + tests/qemuxml2xmloutdata/autoindex.xml | 1 + tests/qemuxml2xmloutdata/balloon-device-auto.xml | 1 + tests/qemuxml2xmloutdata/balloon-device-period.xml | 1 + .../bios-nvram-os-interleave.xml | 1 + tests/qemuxml2xmloutdata/bios-nvram.xml | 1 + tests/qemuxml2xmloutdata/blkiotune-device.xml | 1 + tests/qemuxml2xmloutdata/blkiotune.xml | 1 + .../boot-menu-disable-with-timeout.xml | 1 + tests/qemuxml2xmloutdata/boot-menu-disable.xml | 1 + .../boot-menu-enable-with-timeout.xml | 1 + tests/qemuxml2xmloutdata/boot-multi.xml | 1 + tests/qemuxml2xmloutdata/boot-order.xml | 2 + tests/qemuxml2xmloutdata/channel-guestfwd.xml | 1 + tests/qemuxml2xmloutdata/channel-virtio-auto.xml | 1 + .../channel-virtio-state-active.xml | 1 + .../channel-virtio-state-inactive.xml | 1 + tests/qemuxml2xmloutdata/channel-virtio.xml | 1 + tests/qemuxml2xmloutdata/clock-catchup.xml | 1 + tests/qemuxml2xmloutdata/console-compat-auto.xml | 1 + tests/qemuxml2xmloutdata/console-virtio-many.xml | 1 + tests/qemuxml2xmloutdata/console-virtio.xml | 1 + .../cpu-host-passthrough-features.xml | 1 + tests/qemuxml2xmloutdata/cputune-iothreads.xml | 1 + .../cputune-iothreadsched-zeropriority.xml | 1 + tests/qemuxml2xmloutdata/cputune-iothreadsched.xml | 1 + tests/qemuxml2xmloutdata/cputune-zero-shares.xml | 1 + tests/qemuxml2xmloutdata/cputune.xml | 1 + .../qemuxml2xmloutdata/disk-drive-copy-on-read.xml | 2 +- tests/qemuxml2xmloutdata/disk-drive-discard.xml | 2 +- .../disk-many-format-probing.xml | 52 +++ tests/qemuxml2xmloutdata/disk-mirror-active.xml | 5 + tests/qemuxml2xmloutdata/disk-mirror-inactive.xml | 4 + .../disk-mirror-old-inactive.xml | 4 + tests/qemuxml2xmloutdata/disk-mirror-old.xml | 7 +- tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-device.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 2 + .../disk-scsi-lun-passthrough-sgio.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-megasas.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml | 2 + tests/qemuxml2xmloutdata/disk-serial.xml | 3 + tests/qemuxml2xmloutdata/disk-source-pool-mode.xml | 4 + tests/qemuxml2xmloutdata/disk-source-pool.xml | 2 + tests/qemuxml2xmloutdata/disk-usb-device.xml | 2 + .../disk-virtio-scsi-cmd_per_lun.xml | 1 + .../disk-virtio-scsi-ioeventfd.xml | 1 + .../disk-virtio-scsi-max_sectors.xml | 1 + .../disk-virtio-scsi-num_queues.xml | 1 + .../qemuxml2xmloutdata/graphics-listen-network.xml | 1 + .../graphics-listen-network2.xml | 1 + .../graphics-spice-compression.xml | 1 + .../qemuxml2xmloutdata/graphics-spice-qxl-vga.xml | 1 + tests/qemuxml2xmloutdata/graphics-spice.xml | 1 + .../hostdev-scsi-autogen-address.xml | 1 + .../qemuxml2xmloutdata/hostdev-scsi-large-unit.xml | 1 + .../hostdev-scsi-lsi-iscsi-auth.xml | 1 + .../qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 1 + .../qemuxml2xmloutdata/hostdev-scsi-shareable.xml | 1 + .../hostdev-scsi-vhost-scsi-ccw.xml | 1 + .../hostdev-scsi-vhost-scsi-pci.xml | 1 + .../hostdev-scsi-virtio-iscsi-auth.xml | 1 + .../hostdev-scsi-virtio-iscsi.xml | 1 + .../hostdev-scsi-virtio-scsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-vfio.xml | 1 + tests/qemuxml2xmloutdata/hugepages-pages.xml | 1 + tests/qemuxml2xmloutdata/hugepages-pages2.xml | 1 + tests/qemuxml2xmloutdata/hugepages-pages3.xml | 1 + tests/qemuxml2xmloutdata/hugepages-shared.xml | 1 + tests/qemuxml2xmloutdata/hugepages.xml | 1 + tests/qemuxml2xmloutdata/lease.xml | 2 + .../machine-loadparm-multiple-disks-nets-s390.xml | 2 + tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml | 1 + tests/qemuxml2xmloutdata/memory-hotplug.xml | 1 + tests/qemuxml2xmloutdata/memtune-unlimited.xml | 1 + tests/qemuxml2xmloutdata/memtune.xml | 1 + tests/qemuxml2xmloutdata/metadata-duplicate.xml | 1 + tests/qemuxml2xmloutdata/metadata.xml | 1 + tests/qemuxml2xmloutdata/minimal.xml | 1 + tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 1 + tests/qemuxml2xmloutdata/net-hostdev.xml | 1 + tests/qemuxml2xmloutdata/net-midonet.xml | 1 + tests/qemuxml2xmloutdata/net-openvswitch.xml | 1 + tests/qemuxml2xmloutdata/net-udp.xml | 1 + tests/qemuxml2xmloutdata/net-virtio-device.xml | 1 + .../net-virtio-disable-offloads.xml | 1 + .../net-virtio-network-portgroup.xml | 1 + .../net-virtio-rxtxqueuesize.xml | 1 + .../numad-auto-memory-vcpu-cpuset.xml | 1 + ...ad-auto-memory-vcpu-no-cpuset-and-placement.xml | 1 + .../numad-auto-vcpu-no-numatune.xml | 1 + .../numad-static-vcpu-no-numatune.xml | 1 + tests/qemuxml2xmloutdata/panic-isa.xml | 1 + tests/qemuxml2xmloutdata/panic-no-address.xml | 1 + tests/qemuxml2xmloutdata/panic.xml | 1 + tests/qemuxml2xmloutdata/pci-rom.xml | 1 + .../qemuxml2xmloutdata/pci-serial-dev-chardev.xml | 1 + tests/qemuxml2xmloutdata/pcie-expander-bus.xml | 1 + tests/qemuxml2xmloutdata/pcie-root-port.xml | 1 + .../pcie-switch-downstream-port.xml | 1 + .../pcie-switch-upstream-port.xml | 1 + tests/qemuxml2xmloutdata/pcihole64-q35.xml | 1 + tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml | 1 + tests/qemuxml2xmloutdata/q35-pcie.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2-multi.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2-reorder.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2.xml | 1 + tests/qemuxml2xmloutdata/q35-virtio-pci.xml | 1 + tests/qemuxml2xmloutdata/q35.xml | 1 + tests/qemuxml2xmloutdata/seclabel-dac-none.xml | 1 + .../seclabel-device-multiple.xml | 1 + .../seclabel-dynamic-baselabel.xml | 1 + .../seclabel-dynamic-labelskip.xml | 1 + tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml | 1 + .../seclabel-dynamic-override.xml | 2 + .../seclabel-dynamic-relabel.xml | 1 + tests/qemuxml2xmloutdata/seclabel-none.xml | 1 + .../seclabel-static-labelskip.xml | 1 + tests/qemuxml2xmloutdata/seclabel-static.xml | 1 + .../serial-spiceport-nospice.xml | 1 + tests/qemuxml2xmloutdata/serial-spiceport.xml | 1 + .../qemuxml2xmloutdata/serial-target-port-auto.xml | 1 + .../serial-tcp-tlsx509-chardev.xml | 1 + tests/qemuxml2xmloutdata/smbios-multiple-type2.xml | 1 + tests/qemuxml2xmloutdata/smbios.xml | 1 + tests/qemuxml2xmloutdata/sound-device.xml | 1 + tests/qemuxml2xmloutdata/video-qxl-heads.xml | 1 + tests/qemuxml2xmloutdata/video-qxl-noheads.xml | 1 + tests/qemuxml2xmloutdata/vmcoreinfo.xml | 1 + tests/qemuxml2xmltest.c | 288 ++++--------- tests/testutils.c | 8 +- tests/testutils.h | 5 - 169 files changed, 1754 insertions(+), 224 deletions(-) create mode 100644 tests/qemustatusxml2xmldata/blockjob-mirror-in.xml create mode 120000 tests/qemustatusxml2xmldata/blockjob-mirror-out.xml create mode 100644 tests/qemustatusxml2xmldata/migration-out-nbd-in.xml create mode 120000 tests/qemustatusxml2xmldata/migration-out-nbd-out.xml create mode 100644 tests/qemustatusxml2xmldata/modern-in.xml create mode 120000 tests/qemustatusxml2xmldata/modern-out.xml create mode 100644 tests/qemustatusxml2xmldata/vcpus-multi-in.xml create mode 120000 tests/qemustatusxml2xmldata/vcpus-multi-out.xml create mode 100644 tests/qemuxml2argvdata/disk-many-format-probing.args create mode 100644 tests/qemuxml2argvdata/disk-many-format-probing.xml create mode 100644 tests/qemuxml2xmloutdata/disk-many-format-probing.xml -- 2.16.2

2 20

[libvirt] [PATCH 0/2] [pushed] Trivial followup fixes for a trivial patch
by Ján Tomko 13 Mar '18

13 Mar '18

I managed to push commit 1cdc9ece without incorporating Andrea's review feedback. These are the follow-up fixes I pushed as trivial before the commit police gets me. Ján Tomko (2): Adjust whitespace in virDomainDefHasUSB prototype qemuDomainUSBAddressAddHubs: use numeric comparison src/conf/domain_conf.h | 3 +-- src/qemu/qemu_domain_address.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) -- 2.13.6

1 2

[libvirt] Two more libvirt GSOC ideas
by Erik Skultety 12 Mar '18

12 Mar '18

Hi, I'd like to add 2 more GSOC ideas to our wiki page, but I'd like to get some opinions whether you think these might even be appropriate GSOC project candidates. #1 PROJECT: Support wildcard with log filters SUMMARY: Enhance the log filters format to allow specifying a wildcard, i.e. <level>:* DESCRIPTION: Currently, libvirt admin interface allows (among other things) runtime tuning of daemon log settings with the exception of setting the global log priority. The main reason for not having an API to get/set the global log priority is that the same effect that setting global log level would have can be achieved with using log filters only which in terms of logging control provide us with more granularity. However, in order to achieve the same effect using filters only, one would end up with a filter similar to this: 1:access 1:daemon 1:conf 1:cpu 1:libvirt 1:locking 1:logging 1:network 1:nwfilter 1:util Therefore, we should enhance the format of a filter to allow us to simply use the following instead: 1:* other_filters #2 PROJECT: Extend node device driver's API set SUMMARY: Modify the existing set (adjust/add) of APIs for node device driver in order to provide similar functionality (conceptually) to other drivers. DESCRIPTION: The node device driver is responsible for host device management. In most cases, this means that we're simply just report device's capabilities and track its lifetime. This is enough for physical host devices, however, there are a few other virtualization features like NFV, NPIV, and MDEV where libvirt should also be able to create such virtual devices. Currently, libvirt is only able to create transient (temporary config) NPIV/vHBA devices, so besides having support for creating virtual functions and mediated devices on feature-capable physical device we also need to be able to store persistent configuration of such virtual devices. Besides extending the existing set of APIs, this will also require a certain amount of refactor of our current code base. Not all of the changes mentioned above are absolutely necessary to finish the project successfully. Thanks, Erik

2 2

[libvirt] [PATCH] bhyve: fix crash on missing interface model
by Roman Bogorodskiy 12 Mar '18

12 Mar '18

The bhyve driver crashes in bhyveBuildNetArgStr() when network interface model is not defined. As it has to be provided explicitly, add a check to report an error if it's missing. --- src/bhyve/bhyve_command.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index ec5d24012..9413ae5c1 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -56,6 +56,12 @@ bhyveBuildNetArgStr(virConnectPtr conn, int ret = -1; virDomainNetType actualType = virDomainNetGetActualType(net); + if (net->model == NULL) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("NIC model must be specified")); + return -1; + } + if (STREQ(net->model, "virtio")) { if (VIR_STRDUP(nic_model, "virtio-net") < 0) return -1; -- 2.16.2

2 2

[libvirt] [PATCH] Fix build with clang 6.0.0
by Roman Bogorodskiy 12 Mar '18

12 Mar '18

Clang 6.0.0 complains when initializing structure with { NULL }: conf/domain_addr.c:1494:38: error: missing field 'type' initializer [-Werror,-Wmissing-field-initializers] virDomainDeviceInfo nfo = { NULL }; Use { 0 } instead to make it happy. --- src/conf/domain_addr.c | 2 +- tests/sysinfotest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 5e875a3e6..0c914fe25 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1491,7 +1491,7 @@ virDomainVirtioSerialAddrAssign(virDomainDefPtr def, bool portOnly) { int ret = -1; - virDomainDeviceInfo nfo = { NULL }; + virDomainDeviceInfo nfo = { 0 }; virDomainDeviceInfoPtr ptr = allowZero ? &nfo : info; ptr->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL; diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index a61da017c..53d5725fd 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -91,7 +91,7 @@ sysinfotest_run(const char *test, const char *cpuinfo, const char *expected) { - struct testSysinfoData testdata = { NULL }; + struct testSysinfoData testdata = { 0 }; int ret = EXIT_FAILURE; testdata.func = func; -- 2.16.2

2 2

[libvirt] [PATCH v2 0/9] x86: Secure Encrypted Virtualization (AMD)
by Brijesh Singh 12 Mar '18

12 Mar '18

This patch series provides support for launching an encrypted guest using AMD's new Secure Encrypted Virtualization (SEV) feature. SEV is an extension to the AMD-V architecture which supports running multiple VMs under the control of a hypervisor. When enabled, SEV feature allows the memory contents of a virtual machine (VM) to be transparently encrypted with a key unique to the guest VM. In order to launch SEV guest we need QEMU SEV patch [1]. [1] https://marc.info/?l=kvm&m=152051337301616&w=2 The patch series implements some of recommendation from Daniel [2] [2] https://www.redhat.com/archives/libvir-list/2017-September/msg00197.html At very high level the flow looks this: 1. mgmt tool calls virConnectGetDomainCapabilities. This returns an XML document that includes the following <feature> ... <sev supported='yes'> <cbitpos> </cbitpos> <reduced-phys-bits> </reduced-phys-bits> <pdh> </pdh> <cert-chain> </cert-chain> </feature> If <sev> is provided then we indicate that hypervisor is capable of launching SEV guest. 2. (optional) mgmt tool can provide the PDH and Cert-chain to guest owner in case if guest owner wish to establish a secure connection with SEV firmware to negotiate a key used for validating the measurement. 3. mgmt tool requests to start a guest calling virCreateXML(), passing VIR_DOMAIN_START_PAUSED. The xml would include <launch-security type='sev'> <cbitpos> </cbitpos> /* the value is same as what is obtained via virConnectGetDomainCapabilities() <reduced-phys-bits> </reduced-phys-bits> /* the value is same as what is obtained via virConnectGetDomainCapabilities() <dh-cert> .. </dh> /* guest owners diffie-hellman key */ (optional) <session> ..</session> /* guest owners session blob */ (optional) <policy> ..</policy> /* guest policy */ (optional) 4. Libvirt generate the QEMU cli arg to enable the SEV feature, a typical args looks like this: # $QEMU .. -machine memory-encryption=sev0 \ -object sev-guest,id=sev0,dh-cert-file=<file>.... 5. Libvirt generates lifecycle VIR_DOMAIN_EVENT_SUSPENDED_PAUSED event 6. mgmt tool gets the VIR_DOMAIN_EVENT_SUSPENDED_PAUSED and calls virDomainGetLaunchSecretInfo() to retrieve the measurement of encrypted memory. 7. (optional) mgmt tool can provide the measurement value to guest owner, which can validate the measurement and gives GO/NO-GO answer. If mgmt tool gets GO then it resumes the guest otherwise it calls destroy() to kill the guest. 8. mgmt tool resumes the guest TODO: * SEV guest require to use DMA apis for the virtio devices. In order to use the DMA apis the virtio devices must have this tag <driver iommu=on ats=on> It is a bit unclear to me where these changes need to go. Do we need to modify the libvirt to automatically add these when SEV is enabled or we ask mgmt tool to make sure that it creates XML with right tag to enable the DMA APIs for virtio devices. I am looking for some suggestions. Using these patches we have succesfully booted and tested a guest both with and without SEV enabled. SEV Firmware API spec is available at: https://support.amd.com/TechDocs/55766_SEV-KM%20API_Specification.pdf Changes since v1: * rename <sev> -> <launch-security> for domain * add more information about policy and other fields in domaincaps.html * split the domain_conf support in two patches * add virDomainGetLaunchInfo() to retrieve the SEV measurement * extend virsh command to show the domain's launch security information * add test cases to validate newly added <launch-security> element * fix issues reported with 'make check' and 'make syntax-check' The complete git tree is available at: https://github.com/codomania/libvirt/tree/v2 Brijesh Singh (8): qemu: provide support to query the SEV capability qemu: introduce SEV feature in hypervisor capabilities conf: introduce launch-security element in domain qemu: add support to launch SEV guest libvirt: add new public API to get launch security info remote: implement the remote protocol for launch security qemu_driver: add support to launch security info virsh: implement new command for launch security Xiaogang Chen (1): tests: extend tests to include sev specific tag parsing docs/formatdomain.html.in | 120 ++++++++++++++++++++++++++++++++++++ docs/formatdomaincaps.html.in | 40 ++++++++++++ docs/schemas/domaincaps.rng | 20 ++++++ docs/schemas/domaincommon.rng | 39 ++++++++++++ include/libvirt/libvirt-domain.h | 17 +++++ src/conf/domain_capabilities.c | 20 ++++++ src/conf/domain_capabilities.h | 14 +++++ src/conf/domain_conf.c | 111 +++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 27 ++++++++ src/driver-hypervisor.h | 7 +++ src/libvirt-domain.c | 50 +++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_capabilities.c | 45 ++++++++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_capspriv.h | 4 ++ src/qemu/qemu_command.c | 33 ++++++++++ src/qemu/qemu_driver.c | 72 ++++++++++++++++++++++ src/qemu/qemu_monitor.c | 17 +++++ src/qemu/qemu_monitor.h | 6 ++ src/qemu/qemu_monitor_json.c | 105 +++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 5 ++ src/qemu/qemu_process.c | 91 +++++++++++++++++++++++++++ src/remote/remote_daemon_dispatch.c | 63 +++++++++++++++++++ src/remote/remote_driver.c | 52 +++++++++++++++- src/remote/remote_protocol.x | 22 ++++++- src/remote_protocol-structs | 13 ++++ tests/genericxml2xmlindata/sev.xml | 22 +++++++ tests/genericxml2xmloutdata/sev.xml | 22 +++++++ tests/genericxml2xmltest.c | 2 + tests/qemuxml2argvdata/sev.args | 25 ++++++++ tests/qemuxml2argvdata/sev.xml | 35 +++++++++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmloutdata/sev.xml | 39 ++++++++++++ tests/qemuxml2xmltest.c | 2 + tools/virsh-domain.c | 93 ++++++++++++++++++++++++++++ 35 files changed, 1239 insertions(+), 2 deletions(-) create mode 100644 tests/genericxml2xmlindata/sev.xml create mode 100644 tests/genericxml2xmloutdata/sev.xml create mode 100644 tests/qemuxml2argvdata/sev.args create mode 100644 tests/qemuxml2argvdata/sev.xml create mode 100644 tests/qemuxml2xmloutdata/sev.xml -- 2.14.3

3 21

[libvirt] [PATCH] keycodemapdb: Update submodule
by Andrea Bolognani 12 Mar '18

12 Mar '18

This time around it's not enough to just pick the latest commit, because with aed87bb2aa6ed83b49574eb982e3bdd4c36acf17 keycodemapdb renamed the 'rfb' keycode to 'qnum' and we need to accept the new name while maintaining backwards compatibility. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- include/libvirt/libvirt-domain.h | 9 ++++++++- src/keycodemapdb | 2 +- src/qemu/qemu_driver.c | 8 ++++---- src/util/Makefile.inc.am | 2 +- src/util/virkeycode.c | 8 ++++---- tests/virkeycodetest.c | 4 ++-- tools/virsh-domain.c | 5 +++++ tools/virsh.pod | 6 +++--- 8 files changed, 28 insertions(+), 16 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 4048acf38a..4128d55852 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2733,7 +2733,7 @@ typedef enum { VIR_KEYCODE_SET_XT_KBD = 6, VIR_KEYCODE_SET_USB = 7, VIR_KEYCODE_SET_WIN32 = 8, - VIR_KEYCODE_SET_RFB = 9, + VIR_KEYCODE_SET_QNUM = 9, # ifdef VIR_ENUM_SENTINELS VIR_KEYCODE_SET_LAST @@ -2745,6 +2745,13 @@ typedef enum { # endif } virKeycodeSet; +/** + * VIR_KEYCODE_SET_RFB: + * + * Compatibility alias for VIR_KEYCODE_SET_QNUM, which replaced it since 4.2.0. + */ +# define VIR_KEYCODE_SET_RFB VIR_KEYCODE_SET_QNUM + /** * VIR_DOMAIN_SEND_KEY_MAX_KEYS: * diff --git a/src/keycodemapdb b/src/keycodemapdb index 267157b96c..16e5b07876 160000 --- a/src/keycodemapdb +++ b/src/keycodemapdb @@ -1 +1 @@ -Subproject commit 267157b96c62b5445de9cddd21de42fcd943ffe6 +Subproject commit 16e5b0787687d8904dad2c026107409eb9bfcb95 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e13544f832..8c872c1f08 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2580,17 +2580,17 @@ static int qemuDomainSendKey(virDomainPtr domain, virCheckFlags(0, -1); - /* translate the keycode to RFB for qemu driver */ - if (codeset != VIR_KEYCODE_SET_RFB) { + /* translate the keycode to QNUM for qemu driver */ + if (codeset != VIR_KEYCODE_SET_QNUM) { size_t i; int keycode; for (i = 0; i < nkeycodes; i++) { - keycode = virKeycodeValueTranslate(codeset, VIR_KEYCODE_SET_RFB, + keycode = virKeycodeValueTranslate(codeset, VIR_KEYCODE_SET_QNUM, keycodes[i]); if (keycode < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot translate keycode %u of %s codeset to rfb keycode"), + _("cannot translate keycode %u of %s codeset to qnum keycode"), keycodes[i], virKeycodeSetTypeToString(codeset)); return -1; diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index a91b30dca5..d0e1ec3625 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -214,7 +214,7 @@ EXTRA_DIST += \ $(NULL) -KEYCODES = linux osx atset1 atset2 atset3 xtkbd usb win32 rfb +KEYCODES = linux osx atset1 atset2 atset3 xtkbd usb win32 qnum KEYNAMES = linux osx win32 KEYTABLES = \ diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c index eda263218c..8976bbf376 100644 --- a/src/util/virkeycode.c +++ b/src/util/virkeycode.c @@ -27,7 +27,7 @@ #include "virkeycodetable_atset3.h" #include "virkeycodetable_linux.h" #include "virkeycodetable_osx.h" -#include "virkeycodetable_rfb.h" +#include "virkeycodetable_qnum.h" #include "virkeycodetable_usb.h" #include "virkeycodetable_win32.h" #include "virkeycodetable_xtkbd.h" @@ -52,7 +52,7 @@ static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = { [VIR_KEYCODE_SET_XT_KBD] = virKeyCodeTable_xtkbd, [VIR_KEYCODE_SET_USB] = virKeyCodeTable_usb, [VIR_KEYCODE_SET_WIN32] = virKeyCodeTable_win32, - [VIR_KEYCODE_SET_RFB] = virKeyCodeTable_rfb, + [VIR_KEYCODE_SET_QNUM] = virKeyCodeTable_qnum, }; #define VIR_KEYMAP_ENTRY_MAX ARRAY_CARDINALITY(virKeyCodeTable_linux) @@ -64,7 +64,7 @@ verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_osx)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_xtkbd)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_usb)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_win32)); -verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_rfb)); +verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_qnum)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_linux)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_osx)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_win32)); @@ -79,7 +79,7 @@ VIR_ENUM_IMPL(virKeycodeSet, VIR_KEYCODE_SET_LAST, "xt_kbd", "usb", "win32", - "rfb", + "qnum", ); int virKeycodeValueFromString(virKeycodeSet codeset, diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index 24887a36d4..399a13fcae 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -54,8 +54,8 @@ static int testKeycodeMapping(const void *data ATTRIBUTE_UNUSED) TRANSLATE(LINUX, LINUX, 111, 111); TRANSLATE(LINUX, USB, 111, 76); - TRANSLATE(LINUX, RFB, 88, 88); - TRANSLATE(LINUX, RFB, 160, 163); + TRANSLATE(LINUX, QNUM, 88, 88); + TRANSLATE(LINUX, QNUM, 160, 163); TRANSLATE(ATSET2, ATSET3, 131, 55); TRANSLATE(OSX, WIN32, 90, 131); TRANSLATE(OSX, ATSET1, 90, 90); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index c78cf7f219..2b775fc4cc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8688,6 +8688,11 @@ cmdSendKey(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptUInt(ctl, cmd, "holdtime", &holdtime) < 0) goto cleanup; + /* The qnum codeset was originally called rfb, so we need to keep + * accepting the old name for backwards compatibility reasons */ + if (STREQ(codeset_option, "rfb")) + codeset_option = "qnum"; + codeset = virKeycodeSetTypeFromString(codeset_option); if (codeset < 0) { vshError(ctl, _("unknown codeset: '%s'"), codeset_option); diff --git a/tools/virsh.pod b/tools/virsh.pod index 8f0e8d74b0..378e26a20d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2249,14 +2249,14 @@ for keyboard input. No symbolic names are provided See L<virkeycode-usb(7)> -=item B<rfb> +=item B<qnum> -The numeric values are those defined by the RFB extension for sending +The numeric values are those defined by the QNUM extension for sending raw keycodes. These are a variant on the XT codeset, but extended keycodes have the low bit of the second byte set, instead of the high bit of the first byte. No symbolic names are provided. -See L<virkeycode-rfb(7)> +See L<virkeycode-qnum(7)> =back -- 2.14.3

2 7

[libvirt] [PATCH] qemu: different declarations for the same method.
by Julio Faracco 12 Mar '18

12 Mar '18

Recently, this warning is appearing while libvirt is being compiled: Function 'qemuAssignDeviceDiskAlias' argument order different: declaration 'vmdef, def' definition 'def, disk' This commit change the default declaration for qemuAssignDeviceDiskAlias specified at src/qemu/qemu_alias.c. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/qemu/qemu_alias.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 2246e712f..8c744138c 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -38,8 +38,8 @@ int qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef, virQEMUCapsPtr qemuCaps, virDomainControllerDefPtr controller); -int qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef, - virDomainDiskDefPtr def); +int qemuAssignDeviceDiskAlias(virDomainDefPtr def, + virDomainDiskDefPtr disk); int qemuAssignDeviceHostdevAlias(virDomainDefPtr def, char **alias, -- 2.14.1

3 4

[libvirt] [PATCH] libvirtd: fix potential deadlock when reloading
by Jim Fehlig 12 Mar '18

12 Mar '18

It is possible to deadlock libvirtd when concurrently starting a domain and restarting the daemon. Threads involved in the deadlock are Thread 4 (Thread 0x7fc13b53e700 (LWP 64084)): #0 0x00007fc13fba10bf in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00007fc14310213c in virCondWait (c=0x7fc110017fa8, m=0x7fc110017f80) at util/virthread.c:154 #2 0x00007fc1280244e9 in qemuMonitorSend (mon=0x7fc110017f70, msg=0x7fc13b53d240) at qemu/qemu_monitor.c:1083 #3 0x00007fc12803bf5a in qemuMonitorJSONCommandWithFd (mon=0x7fc110017f70, cmd=0x7fc110017700, scm_fd=-1, reply=0x7fc13b53d318) at qemu/qemu_monitor_json.c:305 #4 0x00007fc12803c09c in qemuMonitorJSONCommand (mon=0x7fc110017f70, cmd=0x7fc110017700, reply=0x7fc13b53d318) at qemu/qemu_monitor_json.c:335 #5 0x00007fc12803f116 in qemuMonitorJSONSetCapabilities (mon=0x7fc110017f70) at qemu/qemu_monitor_json.c:1298 #6 0x00007fc128026e14 in qemuMonitorSetCapabilities (mon=0x7fc110017f70) at qemu/qemu_monitor.c:1697 #7 0x00007fc127ffe250 in qemuProcessInitMonitor (driver=0x7fc12004e1e0, vm=0x7fc110003d00, asyncJob=QEMU_ASYNC_JOB_START) at qemu/qemu_process.c:1763 #8 0x00007fc127ffe564 in qemuConnectMonitor (driver=0x7fc12004e1e0, vm=0x7fc110003d00, asyncJob=6, logCtxt=0x7fc1100089c0) at qemu/qemu_process.c:1835 #9 0x00007fc127fff386 in qemuProcessWaitForMonitor (driver=0x7fc12004e1e0, vm=0x7fc110003d00, asyncJob=6, logCtxt=0x7fc1100089c0) at qemu/qemu_process.c:2180 #10 0x00007fc128009269 in qemuProcessLaunch (conn=0x7fc1100009a0, driver=0x7fc12004e1e0, vm=0x7fc110003d00, asyncJob=QEMU_ASYNC_JOB_START, incoming=0x0, snapshot=0x0, vmop=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, flags=17) at qemu/qemu_process.c:6111 #11 0x00007fc128009e85 in qemuProcessStart (conn=0x7fc1100009a0, driver=0x7fc12004e1e0, vm=0x7fc110003d00, updatedCPU=0x0, asyncJob=QEMU_ASYNC_JOB_START, migrateFrom=0x0, migrateFd=-1, migratePath=0x0, snapshot=0x0, vmop=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, flags=17) at qemu/qemu_process.c:6334 #12 0x00007fc1280552f1 in qemuDomainCreateXML (conn=0x7fc1100009a0, xml=0x7fc110000ed0 "<!--\nWARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE\nOVERWRITTEN AND LOST. Changes to this xml configuration should be made using:\n virsh edit testvv\nor other applicati"..., flags=0) at qemu/qemu_driver.c:1776 ... Thread 1 (Thread 0x7fc143c66880 (LWP 64081)): #0 0x00007fc13fb9aac8 in __pthread_rwlock_wrlock_slow () from /lib64/libpthread.so.0 #1 0x00007fc143101ffa in virRWLockWrite (m=0x7fc143678cc0 <updateLock>) at util/virthread.c:122 #2 0x00007fc1431a394f in virNWFilterWriteLockFilterUpdates () at conf/nwfilter_conf.c:159 #3 0x00007fc12a5230a0 in nwfilterStateReload () at nwfilter/nwfilter_driver.c:299 #4 0x00007fc1433170c2 in virStateReload () at libvirt.c:829 #5 0x0000558c522d5686 in daemonReloadHandler (dmn=0x558c5328b230, sig=0x7ffe0a831e30, opaque=0x0) at remote/remote_daemon.c:724 #6 0x00007fc14321e3c7 in virNetDaemonSignalEvent (watch=2, fd=9, events=1, opaque=0x558c5328b230) at rpc/virnetdaemon.c:654 #7 0x00007fc143085cc7 in virEventPollDispatchHandles (nfds=11, fds=0x558c532cd930) at util/vireventpoll.c:508 #8 0x00007fc143086586 in virEventPollRunOnce () at util/vireventpoll.c:657 #9 0x00007fc143084312 in virEventRunDefaultImpl () at util/virevent.c:327 #10 0x00007fc14321ecb8 in virNetDaemonRun (dmn=0x558c5328b230) at rpc/virnetdaemon.c:858 #11 0x0000558c522d7add in main (argc=3, argv=0x7ffe0a832758) at remote/remote_daemon.c:1496 (gdb) thr 1 [Switching to thread 1 (Thread 0x7fc143c66880 (LWP 64081))] #0 0x00007fc13fb9aac8 in __pthread_rwlock_wrlock_slow () from /lib64/libpthread.so.0 (gdb) f 1 #1 0x00007fc143101ffa in virRWLockWrite (m=0x7fc143678cc0 <updateLock>) at util/virthread.c:122 122 pthread_rwlock_wrlock(&m->lock); (gdb) p updateLock $1 = {lock = {__data = {__lock = 0, __nr_readers = 1, __readers_wakeup = 0, __writer_wakeup = 0, __nr_readers_queued = 0, __nr_writers_queued = 1, __writer = 0, __shared = 0, __rwelision = 0 '\000', __pad1 = "\000\000\000\000\000\000", __pad2 = 0, __flags = 0}, __size = "\000\000\000\000\001", '\000' <repeats 15 times>, "\001", '\000' <repeats 34 times>, __align = 4294967296}} Reloading of the nwfilter driver is stuck waiting for a write lock, which already has a reader (from qemuDomainCreateXML) in the critical section. Since the reload occurs in the context of the main event loop thread, libvirtd becomes deadlocked. The deadlock can be avoided by offloading the reload work to a thread. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Fix suggested by danpb https://www.redhat.com/archives/libvir-list/2018-March/msg00382.html src/remote/remote_daemon.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index f8082f62f..2146655b0 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -709,20 +709,32 @@ static void daemonShutdownHandler(virNetDaemonPtr dmn, virNetDaemonQuit(dmn); } +static void daemonReloadHandlerThread(void *opague ATTRIBUTE_UNUSED) +{ + VIR_INFO("Reloading configuration on SIGHUP"); + virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", + VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL, NULL); + if (virStateReload() < 0) + VIR_WARN("Error while reloading drivers"); +} + static void daemonReloadHandler(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, siginfo_t *sig ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { + virThread thr; + if (!driversInitialized) { VIR_WARN("Drivers are not initialized, reload ignored"); return; } - VIR_INFO("Reloading configuration on SIGHUP"); - virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", - VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL, NULL); - if (virStateReload() < 0) - VIR_WARN("Error while reloading drivers"); + if (virThreadCreate(&thr, false, daemonReloadHandlerThread, NULL) < 0) { + /* + * Not much we can do on error here except log it. + */ + VIR_ERROR(_("Failed to create thread to handle daemon restart")); + } } static int daemonSetupSignals(virNetDaemonPtr dmn) -- 2.16.2

2 1

[libvirt] [PATCH] Update to latest gnulib
by Daniel P. Berrangé 12 Mar '18

12 Mar '18

GnuLib has now fixed the incompatibility with latest GLibC that was affecting builds on Fedora rawhide. We can thus update and drop our local workaround. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed to git since we don't review trivial gnulib updates. .gnulib | 2 +- bootstrap | 4 ++-- gnulib/local/lib/fflush.c.diff | 33 --------------------------------- gnulib/local/lib/fpurge.c.diff | 13 ------------- gnulib/local/lib/freading.c.diff | 13 ------------- gnulib/local/lib/fseeko.c.diff | 22 ---------------------- 6 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 gnulib/local/lib/fflush.c.diff delete mode 100644 gnulib/local/lib/fpurge.c.diff delete mode 100644 gnulib/local/lib/freading.c.diff delete mode 100644 gnulib/local/lib/fseeko.c.diff diff --git a/.gnulib b/.gnulib index 0404c9ae28..d6397dde2e 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 0404c9ae2845cbf93d71b295b67d6c8bd39382d8 +Subproject commit d6397dde2e127e246e3eeb5254a21f42cac783c8 diff --git a/bootstrap b/bootstrap index 25920e991c..92be11439a 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2017-09-19.08; # UTC +scriptversion=2018-03-07.03; # UTC # Bootstrap this package from checked-out sources. @@ -1020,7 +1020,7 @@ bootstrap_epilogue echo "$0: done. Now you can run './configure'." # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/gnulib/local/lib/fflush.c.diff b/gnulib/local/lib/fflush.c.diff deleted file mode 100644 index fa0e2431bd..0000000000 --- a/gnulib/local/lib/fflush.c.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/lib/fflush.c b/lib/fflush.c -index 983ade0ff..5f617305a 100644 ---- a/lib/fflush.c -+++ b/lib/fflush.c -@@ -32,8 +32,8 @@ - - #undef fflush - -- --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#define _IO_IN_BACKUP 0x100 -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ - static void -@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) - - #endif - --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */) - - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) - if (stream == NULL || ! freading (stream)) - return fflush (stream); - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - diff --git a/gnulib/local/lib/fpurge.c.diff b/gnulib/local/lib/fpurge.c.diff deleted file mode 100644 index 1fd87d8bfa..0000000000 --- a/gnulib/local/lib/fpurge.c.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/fpurge.c b/lib/fpurge.c -index b1d417c7a..75cf34ca2 100644 ---- a/lib/fpurge.c -+++ b/lib/fpurge.c -@@ -62,7 +62,7 @@ fpurge (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ diff --git a/gnulib/local/lib/freading.c.diff b/gnulib/local/lib/freading.c.diff deleted file mode 100644 index c51e34dd6a..0000000000 --- a/gnulib/local/lib/freading.c.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/freading.c b/lib/freading.c -index 73c28acdd..b1c397016 100644 ---- a/lib/freading.c -+++ b/lib/freading.c -@@ -31,7 +31,7 @@ freading (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); diff --git a/gnulib/local/lib/fseeko.c.diff b/gnulib/local/lib/fseeko.c.diff deleted file mode 100644 index b2c061fc97..0000000000 --- a/gnulib/local/lib/fseeko.c.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/fseeko.c b/lib/fseeko.c -index 0101ab55f..542241bb2 100644 ---- a/lib/fseeko.c -+++ b/lib/fseeko.c -@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- 2.14.3

1 0

[libvirt] [PATCH go-xml] fix type tag for rdp and destkop graphics devices
by Ryan Goodfellow 12 Mar '18

12 Mar '18

The current behavior is to generate a type="vnc" tag in the <graphics> element generated from either a DomainGrapicRDP or DomainGraphicDesktop. The correct tags should be type="rdp" and type="desktop" respectively. This commit emits the correct tags and adds a test for correct graphics device tagging. --- domain.go | 4 ++-- domain_test.go | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/domain.go b/domain.go index ea53dfc..1de4ade 100644 --- a/domain.go +++ b/domain.go @@ -4226,12 +4226,12 @@ func (a *DomainGraphic) MarshalXML(e *xml.Encoder, start xml.StartElement) error return e.EncodeElement(a.VNC, start) } else if a.RDP != nil { start.Attr = append(start.Attr, xml.Attr{ - xml.Name{Local: "type"}, "vnc", + xml.Name{Local: "type"}, "rdp", }) return e.EncodeElement(a.RDP, start) } else if a.Desktop != nil { start.Attr = append(start.Attr, xml.Attr{ - xml.Name{Local: "type"}, "vnc", + xml.Name{Local: "type"}, "desktop", }) return e.EncodeElement(a.Desktop, start) } else if a.Spice != nil { diff --git a/domain_test.go b/domain_test.go index 7c9d3a2..1715e01 100644 --- a/domain_test.go +++ b/domain_test.go @@ -3782,6 +3782,32 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Name: "demo", + Devices: &DomainDeviceList{ + Graphics: []DomainGraphic{ + DomainGraphic{SDL: &DomainGraphicSDL{}}, + DomainGraphic{VNC: &DomainGraphicVNC{}}, + DomainGraphic{RDP: &DomainGraphicRDP{}}, + DomainGraphic{Desktop: &DomainGraphicDesktop{}}, + DomainGraphic{Spice: &DomainGraphicSpice{}}, + }, + }, + }, + Expected: []string{ + `<domain>`, + ` <name>demo</name>`, + ` <devices>`, + ` <graphics type="sdl"></graphics>`, + ` <graphics type="vnc"></graphics>`, + ` <graphics type="rdp"></graphics>`, + ` <graphics type="desktop"></graphics>`, + ` <graphics type="spice"></graphics>`, + ` </devices>`, + `</domain>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.14.3

2 3

[libvirt] [PATCH] util, remote: Fixing the sending of stream when length is defined.
by Julio Faracco 12 Mar '18

12 Mar '18

When a length of a file is defined, the responsible thread to send stream is finishing inappropriately. It is happening because there is wrong conditional which compares an offset with the length and because of that the code throws ENOSPC error. To test it: virsh# vol-upload ... --length N Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/remote/remote_daemon_stream.c | 24 ++++++++++++------------ src/util/virfdstream.c | 5 +---- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c index 4dd3af9e0..998e82a83 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -549,21 +549,21 @@ daemonStreamHandleWriteData(virNetServerClientPtr client, } else if (ret == -2) { /* Blocking, so indicate we have more todo later */ return 1; - } else { - virNetMessageError rerr; + } else if (ret) { + virNetMessageError rerr; - memset(&rerr, 0, sizeof(rerr)); + memset(&rerr, 0, sizeof(rerr)); - VIR_INFO("Stream send failed"); - stream->closed = true; - virStreamEventRemoveCallback(stream->st); - virStreamAbort(stream->st); + VIR_INFO("Stream send failed"); + stream->closed = true; + virStreamEventRemoveCallback(stream->st); + virStreamAbort(stream->st); - return virNetServerProgramSendReplyError(stream->prog, - client, - msg, - &rerr, - &msg->header); + return virNetServerProgramSendReplyError(stream->prog, + client, + msg, + &rerr, + &msg->header); } return 0; diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index be40379a9..c3198c768 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -627,9 +627,6 @@ virFDStreamThread(void *opaque) if (got < 0) goto error; - if (got == 0) - break; - total += got; } @@ -783,7 +780,7 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes) virObjectLock(fdst); if (fdst->length) { - if (fdst->length == fdst->offset) { + if (fdst->offset > fdst->length) { virReportSystemError(ENOSPC, "%s", _("cannot write to stream")); virObjectUnlock(fdst); -- 2.14.1

3 3

[libvirt] [PATCH] libvirt:spec: Require gcc for build
by Michal Privoznik 12 Mar '18

12 Mar '18

According to latest discussion on fedora devel list [1] gcc will be removed from default buildroot and packages requiring it must have explicit build dependency, 1: https://lists.fedoraproject.org/archives/list/devel-announce@lists.fedorapr… Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8f46f58b5..5e05d706f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -298,6 +298,7 @@ BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: /usr/bin/pod2man %endif +BuildRequires: gcc BuildRequires: git %if 0%{?fedora} >= 27 || 0%{?rhel} > 7 BuildRequires: perl-interpreter -- 2.16.1

2 1

[libvirt] [PATCH 0/3] Update the virsh pool define/create for vHBA/NPIV
by John Ferlan 12 Mar '18

12 Mar '18

Looks like when adding support in commit 78be2e8b (and the 3 just before it), I neglected to update the virsh command allow command line usage of the fields. This series updates virsh in order to allow adding the fields (as ugly as they are) to make it easier to define/create the pool with the fields. John Ferlan (3): tools: Add the wwnn/wwpn to the man page for storage pool fields tools: Update the help description of the adapter-parent field tools: Add support for additional adapter parent options tools/virsh-pool.c | 29 ++++++++++++++++++++++++++--- tools/virsh.pod | 17 ++++++++++++----- 2 files changed, 38 insertions(+), 8 deletions(-) -- 2.13.6

2 4

[libvirt] [PATCH] qemu: Add qemu functions for storage source private data handling
by Peter Krempa 12 Mar '18

12 Mar '18

The qemu driver registered the helpers from util code, but it will be necessary to format also some qemu-specific data. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- This patch conflicts with Michal's persistent reservations series. I'll need the code in the place this patch places it later so I'm sending this to avoid having to move this again very soon. src/qemu/qemu_domain.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b55013de6a..9802dcdbc6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1951,6 +1951,28 @@ qemuDomainObjPrivateFree(void *data) } +static int +qemuStorageSourcePrivateDataParse(xmlXPathContextPtr ctxt, + virStorageSourcePtr src) +{ + if (virStorageSourcePrivateDataParseRelPath(ctxt, src) < 0) + return -1; + + return 0; +} + + +static int +qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src, + virBufferPtr buf) +{ + if (virStorageSourcePrivateDataFormatRelPath(src, buf) < 0) + return -1; + + return 0; +} + + static void qemuDomainObjPrivateXMLFormatVcpus(virBufferPtr buf, virDomainDefPtr def) @@ -2538,8 +2560,8 @@ virDomainXMLPrivateDataCallbacks virQEMUDriverPrivateDataCallbacks = { .chrSourceNew = qemuDomainChrSourcePrivateNew, .parse = qemuDomainObjPrivateXMLParse, .format = qemuDomainObjPrivateXMLFormat, - .storageParse = virStorageSourcePrivateDataParseRelPath, - .storageFormat = virStorageSourcePrivateDataFormatRelPath, + .storageParse = qemuStorageSourcePrivateDataParse, + .storageFormat = qemuStorageSourcePrivateDataFormat, }; -- 2.16.2

2 1