- Devel - libvirt List Archives

[libvirt] [PATCH v2] news: mention 'ramfb' mdev attribute
by Jonathon Jongsma 18 Nov '19

18 Nov '19

Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- v2: Made changes suggested by Andrea. I'll need somebody to push this for me ;) docs/news.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index c362bf3a15..240d288c37 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -53,6 +53,19 @@ which were introduced in QEMU 4.2.0. </description> </change> + <change> + <summary> + qemu: Support boot display for GPU mediated devices + </summary> + <description> + Until now, GPU mediated devices generally did not show any output + until the guest OS had initialized the vGPU. By specifying the + <code>ramfb</code> attribute, QEMU can be configured to use ramfb as + a boot display for the device: this allows for display of firmware + messages, boot loader menu, and other output before the guest OS has + initialized the vGPU. + </description> + </change> </section> <section title="Improvements"> </section> -- 2.21.0

3 2

[libvirt] [PATCH 0/2] Couple of virbpf related fixes
by Michal Privoznik 18 Nov '19

18 Nov '19

Both are trivial and fix a build issue on my 32bit machine so I've pushed them already. Michal Prívozník (2): vircgroupv2devices: Fix format string for size_t variable virbpf: Fix typecast to __aligned_u64 type src/util/virbpf.c | 32 ++++++++++++++++---------------- src/util/vircgroupv2devices.c | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) -- 2.23.0

1 2

[libvirt] [PATCH] virbpf: Check if syscall() is available
by Michal Privoznik 16 Nov '19

16 Nov '19

There are some OSes which don't have syscall() nor <sys/syscall.h>. We already check for the header file in configure phase, so we just need to add check for HAVE_SYS_SYSCALL_H to HAVE_DECL_BPF_PROG_QUERY. While I'm at it, some header files we are including are not needed, so their includes can be safely dropped. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker rule. src/util/virbpf.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/util/virbpf.c b/src/util/virbpf.c index cb5562540b..44f13fb485 100644 --- a/src/util/virbpf.c +++ b/src/util/virbpf.c @@ -17,22 +17,19 @@ */ #include <config.h> -#include <sys/syscall.h> - -#include "internal.h" - -#include "viralloc.h" -#include "virbpf.h" -#include "virerror.h" -#include "virfile.h" #include "virlog.h" -#include "virstring.h" +#include "virerror.h" +#include "virbpf.h" VIR_LOG_INIT("util.bpf"); #define VIR_FROM_THIS VIR_FROM_BPF -#if HAVE_DECL_BPF_PROG_QUERY +#if HAVE_SYS_SYSCALL_H && HAVE_DECL_BPF_PROG_QUERY +# include <sys/syscall.h> +# include <unistd.h> + + int virBPFCreateMap(unsigned int mapType, unsigned int keySize, @@ -294,7 +291,11 @@ virBPFDeleteElem(int mapfd, return syscall(SYS_bpf, BPF_MAP_DELETE_ELEM, &attr, sizeof(attr)); } -#else /* HAVE_DECL_BPF_PROG_QUERY */ + + +#else /* !HAVE_SYS_SYSCALL_H || !HAVE_DECL_BPF_PROG_QUERY */ + + int virBPFCreateMap(unsigned int mapType G_GNUC_UNUSED, unsigned int keySize G_GNUC_UNUSED, @@ -433,4 +434,4 @@ virBPFDeleteElem(int mapfd G_GNUC_UNUSED, _("BPF not supported with this kernel")); return -1; } -#endif /* HAVE_DECL_BPF_PROG_QUERY */ +#endif /* !HAVE_SYS_SYSCALL_H || !HAVE_DECL_BPF_PROG_QUERY */ -- 2.23.0

1 0

[libvirt] [PATCH v3 0/4] Fix up some issues from x and y resolution patches
by Jonathon Jongsma 15 Nov '19

15 Nov '19

This is the third version of this patch series after a review from Cole. The main changes to this version of the patch series are: - several patches have been pushed upstream (and therefore dropped from this series - The iteration over child nodes was moved up to the caller due to a suggestion from Cole (much better, thanks) - Because the parse functions are now only called when the appropriate XML element is present, the parse functions no longer need to return "successful" NULL for the case where the element is not specified in the XML. Therefore we do not need to change the function signatures and we can simply treat a NULL return value as an error. - the resolution validation is moved to virDomainVideoDefValidate(). Jonathon Jongsma (4): conf: iterate video model children in parent function conf: report errors when parsing video resolution conf: report errors when parsing video acceleration conf: validate video resolution src/conf/domain_conf.c | 75 ++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 35 deletions(-) -- 2.21.0

2 5

[libvirt] [PATCH 0/7] net/qemu: move vlan/bandwidth validation out of network driver
by Laine Stump 15 Nov '19

15 Nov '19

As usual, the first 6 patches are just torquing stuff around to make the last patch simple (except that patch 1 makes interface validation errors more useful). 2-5 are just converting a bunch of accessor functions to tak/return const pointers, since that's what's available in the places where I wanted to use them. This does actually fix a documented bug: https://bugzilla.redhat.com/1741121 (that one is about vlan tag validation. There may also be one about bandwidth, but I didn't see it right away, so I gave up, as is my custom). Laine Stump (7): qemu: add mac address to error messages in qemuDomainValidateActualNetDef conf: make virDomainNetGetActualVlan arg/return val const conf: make virDomainNetGetActualBandwidth arg/return value const conf: return a const from virDomainNetGetActualVirtPortProfile conf: change args/return values of remaining virDomainNetGetActual*() to const conf: add hypervisor agnostic, domain start-time, validation function for NetDef net/qemu: move vlan/bandwidth validation out of network driver src/conf/domain_conf.c | 78 ++++++++++++++++++++++++---- src/conf/domain_conf.h | 21 ++++---- src/conf/netdev_bandwidth_conf.c | 2 +- src/conf/netdev_bandwidth_conf.h | 2 +- src/conf/netdev_vport_profile_conf.c | 2 +- src/conf/netdev_vport_profile_conf.h | 2 +- src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 6 +-- src/libxl/libxl_domain.c | 4 ++ src/libxl/libxl_driver.c | 4 ++ src/libxl/xen_common.c | 4 +- src/lxc/lxc_driver.c | 8 ++- src/lxc/lxc_process.c | 16 +++--- src/network/bridge_driver.c | 37 ------------- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 35 ++++++++----- src/qemu/qemu_hotplug.c | 6 +-- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_process.c | 2 +- src/util/virhostdev.c | 8 +-- src/util/virnetdev.c | 4 +- src/util/virnetdev.h | 2 +- src/util/virnetdevbandwidth.c | 6 +-- src/util/virnetdevbandwidth.h | 4 +- src/util/virnetdevmacvlan.c | 20 +++---- src/util/virnetdevmacvlan.h | 10 ++-- src/util/virnetdevmidonet.c | 4 +- src/util/virnetdevmidonet.h | 4 +- src/util/virnetdevopenvswitch.c | 8 +-- src/util/virnetdevopenvswitch.h | 6 +-- src/util/virnetdevtap.c | 12 ++--- src/util/virnetdevtap.h | 12 ++--- src/util/virnetdevvportprofile.c | 12 ++--- src/util/virnetdevvportprofile.h | 12 ++--- tests/bhyvexml2argvmock.c | 4 +- 35 files changed, 206 insertions(+), 156 deletions(-) -- 2.21.0

3 10

[libvirt] [PATCH 0/2] [Bug 1760233] Better support for non-systemd distributions
by Miguel Ángel Arruga Vivas 15 Nov '19

15 Nov '19

Hi everybody, The following patches try to enhance the support for non-systemd configurations. The first patch just removes the references to the cgroups created by systemd, only leaving the reference to /machine cgroup, created by libvirtd for hosted virtual machines. The second one ensures the creation of that group when using cgroups-v2, as the error message provided in bug report[1] is raised by checking too early the existence of the file cgroup.controllers, before the actual creation of the control group. I tried to solve it at the highest abstraction level, by chaining properly the object construction. Happy hacking! Miguel [1] https://bugzilla.redhat.com/show_bug.cgi?id=1760233 Miguel Ángel Arruga Vivas (2): doc: cgroups: Remove unwanted references to systemd vircgroup: Ensure /machine group is associated with its parent docs/cgroups.html.in | 13 +++---------- src/util/vircgroup.c | 8 +++++--- 2 files changed, 8 insertions(+), 13 deletions(-) -- 2.23.0

2 3

[libvirt] [PATCH] Allow a zfs pool or dataset as source for zfs storage backend
by Gregor Kopka 15 Nov '19

15 Nov '19

Enables hosting a pool on an existing zfs pool without affecting other datasets there. Specify dataset instead of pool as source to use. Parent of dataset must exist for pool-build to succeed. Beware that pool-delete destroys the source dataset and all children. Solves: https://www.redhat.com/archives/libvirt-users/2017-April/msg00041.html Signed-off-by: Gregor Kopka <gregor(a)kopka.net> --- src/storage/storage_backend_zfs.c | 40 ++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index c3057fede6..950c5234e0 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -115,10 +115,10 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, if (count != 3) goto cleanup; - if (!(name_tokens = virStringSplit(tokens[0], "/", 2))) + if (!(name_tokens = virStringSplitCount(tokens[0], "/", 0, &count))) goto cleanup; - vol_name = name_tokens[1]; + vol_name = name_tokens[count-1]; if (vol == NULL) volume = virStorageVolDefFindByName(pool, vol_name); @@ -225,6 +225,7 @@ virStorageBackendZFSRefreshPool(virStoragePoolObjPtr pool G_GNUC_UNUSED) g_autoptr(virCommand) cmd = NULL; VIR_AUTOSTRINGLIST lines = NULL; VIR_AUTOSTRINGLIST tokens = NULL; + VIR_AUTOSTRINGLIST name_tokens = NULL; /** * $ zpool get -Hp health,size,free,allocated test @@ -236,10 +237,13 @@ virStorageBackendZFSRefreshPool(virStoragePoolObjPtr pool G_GNUC_UNUSED) * * Here we just provide a list of properties we want to see */ + if (!(name_tokens = virStringSplit(def->source.name, "/", 0))) + goto cleanup; + cmd = virCommandNewArgList(ZPOOL, "get", "-Hp", "health,size,free,allocated", - def->source.name, + name_tokens[0], NULL); virCommandSetOutputBuffer(cmd, &zpool_props); if (virCommandRun(cmd, NULL) < 0) @@ -384,20 +388,27 @@ virStorageBackendZFSBuildPool(virStoragePoolObjPtr pool, size_t i; g_autoptr(virCommand) cmd = NULL; int ret = -1; + char *tmp; virCheckFlags(0, -1); + tmp = strstr(def->source.name, "/"); + if (tmp) { + cmd = virCommandNewArgList(ZFS, "create", "-o", "mountpoint=none", + def->source.name, NULL); + } else { + if (def->source.ndevice == 0) { - if (def->source.ndevice == 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("missing source devices")); - return -1; - } + return -1; + } - cmd = virCommandNewArgList(ZPOOL, "create", + cmd = virCommandNewArgList(ZPOOL, "create", def->source.name, NULL); - for (i = 0; i < def->source.ndevice; i++) - virCommandAddArg(cmd, def->source.devices[i].path); + for (i = 0; i < def->source.ndevice; i++) + virCommandAddArg(cmd, def->source.devices[i].path); + } virObjectUnlock(pool); ret = virCommandRun(cmd, NULL); @@ -412,11 +423,18 @@ virStorageBackendZFSDeletePool(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); g_autoptr(virCommand) cmd = NULL; + char *tmp; virCheckFlags(0, -1); - cmd = virCommandNewArgList(ZPOOL, "destroy", + tmp = strstr(def->source.name, "/"); + if (tmp) { + cmd = virCommandNewArgList(ZFS, "destroy", "-r", + def->source.name, NULL); + } else { + cmd = virCommandNewArgList(ZPOOL, "destroy", def->source.name, NULL); + } return virCommandRun(cmd, NULL); } -- 2.22.0

2 1

[libvirt] [PATCH] news: mention 'ramfb' mdev attribute
by Jonathon Jongsma 15 Nov '19

15 Nov '19

Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- docs/news.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index c362bf3a15..046314ef78 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -53,6 +53,19 @@ which were introduced in QEMU 4.2.0. </description> </change> + <change> + <summary> + qemu: support boot display for GPU mediated devices + </summary> + <description> + Until now, GPU mediated devices generally did not show any output + until the guest OS had initialized the vgpu. By specifying the + <code>ramfb</code> attribute, qemu can be configured to use ramfb as + a boot display for the device. This allows for display of firmware + messages, boot loader menu, and other output before the guest OS has + initialized the vgpu. + </description> + </change> </section> <section title="Improvements"> </section> -- 2.21.0

2 1

[libvirt] [PATCH] spec: Remove build-time list of edk2 firmwares
by Jim Fehlig 15 Nov '19

15 Nov '19

Fedora now advertises supported firmwares via descriptor files. Since the upstream spec file assumes recent Fedora, remove the build-time list of firmwares, which can produce a warning after commit 75597f022a. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- libvirt.spec.in | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2374668722..a6219da604 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1131,34 +1131,6 @@ exit 1 %define arg_selinux_mount --with-selinux-mount="/sys/fs/selinux" -%if 0%{?fedora} - # Nightly edk2.git-ovmf-x64 - LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd" - # Nightly edk2.git-ovmf-ia32 - LOADERS="$LOADERS:/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd" - # Nightly edk2.git-aarch64 - LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw" - # Nightly edk2.git-arm - LOADERS="$LOADERS:/usr/share/edk2.git/arm/QEMU_EFI-pflash.raw:/usr/share/edk2.git/arm/vars-template-pflash.raw" - - # Fedora edk2-ovmf, x86_64 - LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd" - # Fedora edk2-ovmf, x86_64, with Secure Boot - LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2/ovmf/OVMF_VARS.secboot.fd" - # Fedora edk2-ovmf-ia32 - LOADERS="$LOADERS:/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd" - # Fedora edk2-ovmf-ia32, with Secure Boot. (NB: Unlike x86_64, for - # 'ia32', there is no secboot-variant "VARS" file (NVRAM template). - # So the NVRAM template for 'ovmf-ia32/OVMF_CODE.secboot.fd' is the - # same as the one for the non-secboot variant.) - LOADERS="$LOADERS:/usr/share/edk2/ovmf-ia32/OVMF_CODE.secboot.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd" - # Fedora edk2-aarch64 - LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw" - # Fedora edk2-arm - LOADERS="$LOADERS:/usr/share/edk2/arm/QEMU_EFI-pflash.raw:/usr/share/edk2/arm/vars-template-pflash.raw" - %define arg_loader_nvram --with-loader-nvram="$LOADERS" -%endif - # place macros above and build commands below this comment export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) @@ -1231,7 +1203,6 @@ cd %{_vpath_builddir} --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ --with-tls-priority=%{tls_priority} \ - %{?arg_loader_nvram} \ %{?enable_werror} \ --enable-expensive-tests \ --with-init-script=systemd \ -- 2.23.0

2 1

[libvirt] [PATCHv2] conf: remove NULL check from virDomainQemuMonitorEventNew
by Ján Tomko 15 Nov '19

15 Nov '19

The qemu_domain_monitor_event_msg struct in qemu_protocol.x defines event as a nonnull_string and qemuMonitorJSONIOProcessEvent also errors out on a non-NULL event. Drop the check completely. This essentially reverts commit d343e8203d248635f5e7a0d86dd077f74d49e3af Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/conf/domain_event.c | 12 ------------ src/conf/domain_event.h | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 900d8f745e..33fbf10406 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1934,24 +1934,12 @@ virDomainQemuMonitorEventNew(int id, 0, id, name, uuid, uuidstr))) return NULL; - /* event is mandatory, details are optional */ - if (!event) { - virReportError(VIR_ERR_INVALID_ARG, - _("unexpected event=NULL name=%s uuid=%s details=%s"), - name, uuidstr, NULLSTR(details)); - goto error; - } - ev->event = g_strdup(event); ev->seconds = seconds; ev->micros = micros; ev->details = g_strdup(details); return (virObjectEventPtr)ev; - - error: - virObjectUnref(ev); - return NULL; } diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 0a4bce3d04..d1cfb81d62 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -321,4 +321,4 @@ virDomainQemuMonitorEventNew(int id, long long seconds, unsigned int micros, const char *details) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -- 2.19.2

2 1

[libvirt] [PATCH 0/5] esx: implement virConnectListAllStoragePools
by Pino Toscano 15 Nov '19

15 Nov '19

Make the virConnectListAllStoragePools API work for esx storage pools by implementing the internal connectListAllStoragePools storage API. Pino Toscano (5): esx: split datastoreToStoragePoolPtr helper esx: split datastorePoolType helper esx: split targetToStoragePool helper esx: implement connectListAllStoragePools docs: document virConnectListAllStoragePools in esx docs/news.xml | 9 ++ src/esx/esx_storage_backend_iscsi.c | 104 +++++++++++++-- src/esx/esx_storage_backend_vmfs.c | 192 +++++++++++++++++++++++----- src/esx/esx_storage_driver.c | 68 ++++++++++ 4 files changed, 332 insertions(+), 41 deletions(-) -- 2.21.0

1 6

[libvirt] [PATCH] tests: Mock access to /dev/kvm
by Michal Privoznik 15 Nov '19

15 Nov '19

Some of our tests try to validate domain XMLs they are working with (not intentionally, simply because they call top level domain XML parse function). Anyway, this implies that we build domain capabilities also - see virQEMUDriverGetDomainCapabilities(). And since some domain XMLs are type of 'kvm' the control gets through virQEMUCapsFillDomainCaps() and virHostCPUGetKVMMaxVCPUs() to opening /dev/kvm which may be missing on the machine we're running 'make check'. Previously, we did not see this issue, because it was masked. If building domain capabilities failed for whatever reason, we ignored the failure. Only v5.9.0-207-gc69e6edea3 uncovered the problem (it changed reval from 0 to -1 if virQEMUDriverGetDomainCapabilities() fails). Since the referenced commit is correct, we need to mock access to /dev/kvm in our tests. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under broken build rule. tests/qemuhotplugtest.c | 1 + tests/qemumemlocktest.c | 4 +++- tests/qemusecuritytest.c | 3 ++- tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + tests/securityselinuxlabeltest.c | 4 +++- 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index a914a8a8b5..7d70113b6e 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -878,5 +878,6 @@ mymain(void) VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virpci"), + VIR_TEST_MOCK("domaincaps"), VIR_TEST_MOCK("virprocess"), VIR_TEST_MOCK("qemuhotplug")); diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 52cd9f9f26..ef3bfa0345 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -151,7 +151,9 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virpci")) +VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("virpci"), + VIR_TEST_MOCK("domaincaps")) #else diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 685ac4dca2..8c0a48bb65 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -217,4 +217,5 @@ mymain(void) return ret; } -VIR_TEST_MAIN(mymain) +VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("domaincaps")) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9bb186ed95..3d42cabdb8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3033,6 +3033,7 @@ mymain(void) VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("qemuxml2argv"), + VIR_TEST_MOCK("domaincaps"), VIR_TEST_MOCK("virrandom"), VIR_TEST_MOCK("qemucpu"), VIR_TEST_MOCK("virpci")) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 757e0a33e1..1dfa834f6b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1355,6 +1355,7 @@ mymain(void) VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virpci"), VIR_TEST_MOCK("virrandom"), + VIR_TEST_MOCK("domaincaps"), VIR_TEST_MOCK("virdeterministichash")) #else diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 741c39d4d1..cbc7018e27 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -371,4 +371,6 @@ mymain(void) return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") +VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("domaincaps"), + abs_builddir "/.libs/libsecurityselinuxhelper.so") -- 2.23.0

1 0

[libvirt] [PATCH] virsh: Fix typo in the man page
by Jiri Denemark 15 Nov '19

15 Nov '19

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index c261d403d8..2dce4493cb 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1827,7 +1827,7 @@ agent commands block forever waiting for a response. B<value> must be a positive value (wait for given amount of seconds) or one of the following values: - -2 - block forever waiting for a resuly, + -2 - block forever waiting for a result, -1 - reset timeout to the default value, 0 - do not wait at all, -- 2.24.0

1 0

[libvirt] [PATCH v3 0/9] Enable ramfb parameter for mediated devices
by Jonathon Jongsma 14 Nov '19

14 Nov '19

This is the third version of a patch series that adds support for a boot display for mediated vgpu devices using the 'ramfb' parameter. This version fixes a bunch of test failures that I had inadvertently introduced in the last series. It also splits the 4th patch up into several separate patches as suggested by Cole to make things more readable. Jonathon Jongsma (9): qemu: fix domain device validation qemu: use g_autoptr in qemuDomainDeviceDefValidate() qemu: Set capabilities properly for tests qemu: set domain capability for ramfb device qemu: set domain capability for video type "none" qemu: validate vhost-user video backend in qemu_domain.c qemu: move validation of video accel to qemu_domain.c qemu: use domain caps to validate video device model qemu: add 'ramfb' attribute for mediated devices docs/formatdomain.html.in | 8 ++ docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_capabilities.c | 17 +++- src/conf/domain_conf.c | 11 +++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_command.c | 17 +++- src/qemu/qemu_domain.c | 61 ++++++------- src/qemu/qemu_process.c | 61 ------------- .../qemu_1.7.0.x86_64.xml | 1 + .../qemu_2.12.0-virt.aarch64.xml | 1 + .../qemu_2.12.0.ppc64.xml | 1 + .../qemu_2.12.0.s390x.xml | 1 + .../qemu_2.12.0.x86_64.xml | 1 + .../qemu_2.6.0-virt.aarch64.xml | 1 + .../qemu_2.6.0.aarch64.xml | 1 + .../domaincapsschemadata/qemu_2.6.0.ppc64.xml | 1 + .../qemu_2.6.0.x86_64.xml | 1 + .../domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 + .../qemu_2.8.0-tcg.x86_64.xml | 1 + .../domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 + .../qemu_2.8.0.x86_64.xml | 1 + .../qemu_2.9.0-q35.x86_64.xml | 1 + .../qemu_2.9.0-tcg.x86_64.xml | 1 + .../qemu_2.9.0.x86_64.xml | 1 + .../domaincapsschemadata/qemu_3.0.0.s390x.xml | 2 + .../qemu_3.1.0.x86_64.xml | 2 + .../domaincapsschemadata/qemu_4.0.0.s390x.xml | 1 + .../qemu_4.0.0.x86_64.xml | 2 + .../qemu_4.1.0.x86_64.xml | 2 + .../qemu_4.2.0.aarch64.xml | 2 + .../domaincapsschemadata/qemu_4.2.0.ppc64.xml | 1 + .../qemu_4.2.0.x86_64.xml | 2 + tests/qemuhotplugtest.c | 3 + ...tdev-mdev-display-ramfb.x86_64-latest.args | 37 ++++++++ .../hostdev-mdev-display-ramfb.xml | 33 +++++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 89 +++++++++++-------- tests/securityselinuxlabeltest.c | 9 ++ 39 files changed, 254 insertions(+), 133 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml -- 2.21.0

2 11

[libvirt] [PATCH v3] Add API to change qemu agent response timeout
by Jonathon Jongsma 14 Nov '19

14 Nov '19

Some layered products such as oVirt have requested a way to avoid being blocked by guest agent commands when querying a loaded vm. For example, many guest agent commands are polled periodically to monitor changes, and rather than blocking the calling process, they'd prefer to simply time out when an agent query is taking too long. This patch adds a way for the user to specify a custom agent timeout that is applied to all agent commands. One special case to note here is the 'guest-sync' command. 'guest-sync' is issued internally prior to calling any other command. (For example, when libvirt wants to call 'guest-get-fsinfo', we first call 'guest-sync' and then call 'guest-get-fsinfo'). Previously, the 'guest-sync' command used a 5-second timeout (VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT), whereas the actual command that followed always blocked indefinitely (VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK). As part of this patch, if a custom timeout is specified that is shorter than 5 seconds, this new timeout is also used for 'guest-sync'. If there is no custom timeout or if the custom timeout is longer than 5 seconds, we will continue to use the 5-second timeout. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- Changes in v3: - Changed enum names per Daniel's suggestion - incorporated Michal's review and fixup patches - As discussed on the mailing list, this patch does not acquire any jobs, but simply uses mutex locking for data integrity - libvirt release versions updated - format and parse private agentTimeout data in status xml include/libvirt/libvirt-domain.h | 10 +++ include/libvirt/libvirt-qemu.h | 8 +-- src/driver-hypervisor.h | 6 ++ src/libvirt-domain.c | 49 +++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_agent.c | 70 ++++++++++--------- src/qemu/qemu_agent.h | 3 + src/qemu/qemu_domain.c | 6 ++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 47 +++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 18 ++++- src/remote_protocol-structs | 9 +++ .../blockjob-blockdev-in.xml | 1 + .../blockjob-mirror-in.xml | 1 + .../disk-secinfo-upgrade-out.xml | 1 + .../migration-in-params-in.xml | 1 + .../migration-out-nbd-out.xml | 1 + .../migration-out-nbd-tls-out.xml | 1 + .../migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 + tools/virsh-domain.c | 52 ++++++++++++++ 23 files changed, 257 insertions(+), 37 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 22277b0a84..a2f007568c 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4916,4 +4916,14 @@ int virDomainGetGuestInfo(virDomainPtr domain, int *nparams, unsigned int flags); +typedef enum { + VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK = -2, + VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_DEFAULT = -1, + VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_NOWAIT = 0, +} virDomainAgentResponseTimeoutValues; + +int virDomainAgentSetResponseTimeout(virDomainPtr domain, + int timeout, + unsigned int flags); + #endif /* LIBVIRT_DOMAIN_H */ diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index 891617443f..0cc2872821 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -43,10 +43,10 @@ virDomainPtr virDomainQemuAttach(virConnectPtr domain, unsigned int flags); typedef enum { - VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN = -2, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK = -2, - VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT = -1, - VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT = 0, + VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK, + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK, + VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_DEFAULT, + VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_NOWAIT, VIR_DOMAIN_QEMU_AGENT_COMMAND_SHUTDOWN = 60, } virDomainQemuAgentCommandTimeoutValues; diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index 015b2cd01c..4afd8f6ec5 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -1372,6 +1372,11 @@ typedef int int *nparams, unsigned int flags); +typedef int +(*virDrvDomainAgentSetResponseTimeout)(virDomainPtr domain, + int timeout, + unsigned int flags); + typedef struct _virHypervisorDriver virHypervisorDriver; typedef virHypervisorDriver *virHypervisorDriverPtr; @@ -1632,4 +1637,5 @@ struct _virHypervisorDriver { virDrvDomainCheckpointGetParent domainCheckpointGetParent; virDrvDomainCheckpointDelete domainCheckpointDelete; virDrvDomainGetGuestInfo domainGetGuestInfo; + virDrvDomainAgentSetResponseTimeout domainAgentSetResponseTimeout; }; diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index dcab179e6e..02622cb2ca 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12497,3 +12497,52 @@ int virDomainGetLaunchSecurityInfo(virDomainPtr domain, virDispatchError(domain->conn); return -1; } + + +/** + * virDomainAgentSetResponseTimeout: + * @domain: a domain object + * @timeout: timeout in seconds + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Set how long to wait for a response from guest agent commands. By default, + * agent commands block forever waiting for a response. + * + * @timeout must be a value from virDomainAgentCommandTimeoutValues or + * positive: + * + * VIR_DOMAIN_AGENT_COMMAND_TIMEOUT_BLOCK(-2): meaning to block forever + * waiting for a result. + * VIR_DOMAIN_AGENT_COMMAND_TIMEOUT_DEFAULT(-1): use default timeout value. + * VIR_DOMAIN_AGENT_COMMAND_TIMEOUT_NOWAIT(0): does not wait. + * positive value: wait for @timeout seconds + * + * Returns 0 on success, -1 on failure + */ +int +virDomainAgentSetResponseTimeout(virDomainPtr domain, + int timeout, + unsigned int flags) +{ + virConnectPtr conn; + + VIR_DOMAIN_DEBUG(domain, "timeout=%i, flags=0x%x", + timeout, flags); + + virResetLastError(); + + virCheckDomainReturn(domain, -1); + conn = domain->conn; + + if (conn->driver->domainAgentSetResponseTimeout) { + if (conn->driver->domainAgentSetResponseTimeout(domain, timeout, flags) < 0) + goto error; + return 0; + } + + virReportUnsupportedError(); + + error: + virDispatchError(conn); + return -1; +} diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index f88a77892f..c92f083758 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -862,4 +862,9 @@ LIBVIRT_5.8.0 { virConnectSetIdentity; } LIBVIRT_5.7.0; +LIBVIRT_5.10.0 { + global: + virDomainAgentSetResponseTimeout; +} LIBVIRT_5.8.0; + # .... define new API here using predicted next version number .... diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5a50f7f3be..7905a74f90 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -30,6 +30,7 @@ #include <sys/time.h> #include "qemu_agent.h" +#include "qemu_domain.h" #include "viralloc.h" #include "virlog.h" #include "virerror.h" @@ -127,6 +128,7 @@ struct _qemuAgent { * but fire up an event on qemu monitor instead. * Take that as indication of successful completion */ qemuAgentEvent await_event; + int timeout; }; static virClassPtr qemuAgentClass; @@ -695,6 +697,7 @@ qemuAgentOpen(virDomainObjPtr vm, if (!(mon = virObjectLockableNew(qemuAgentClass))) return NULL; + mon->timeout = QEMU_DOMAIN_PRIVATE(vm)->agentTimeout; mon->fd = -1; if (virCondInit(&mon->notify) < 0) { virReportSystemError(errno, "%s", @@ -907,6 +910,12 @@ qemuAgentGuestSync(qemuAgentPtr mon) int send_ret; unsigned long long id; qemuAgentMessage sync_msg; + int timeout = VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT; + + /* if user specified a custom agent timeout that is lower than the + * default timeout, use the shorter timeout instead */ + if ((mon->timeout >= 0) && (mon->timeout < timeout)) + timeout = mon->timeout; memset(&sync_msg, 0, sizeof(sync_msg)); /* set only on first sync */ @@ -925,8 +934,7 @@ qemuAgentGuestSync(qemuAgentPtr mon) VIR_DEBUG("Sending guest-sync command with ID: %llu", id); - send_ret = qemuAgentSend(mon, &sync_msg, - VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT); + send_ret = qemuAgentSend(mon, &sync_msg, timeout); VIR_DEBUG("qemuAgentSend returned: %d", send_ret); @@ -1301,8 +1309,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon, const char **mountpoints, if (!cmd) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { @@ -1339,8 +1346,7 @@ int qemuAgentFSThaw(qemuAgentPtr mon) if (!cmd) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { @@ -1377,8 +1383,7 @@ qemuAgentSuspend(qemuAgentPtr mon, return -1; mon->await_event = QEMU_AGENT_EVENT_SUSPEND; - ret = qemuAgentCommand(mon, cmd, &reply, false, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); + ret = qemuAgentCommand(mon, cmd, &reply, false, mon->timeout); virJSONValueFree(cmd); virJSONValueFree(reply); @@ -1434,8 +1439,7 @@ qemuAgentFSTrim(qemuAgentPtr mon, if (!cmd) return ret; - ret = qemuAgentCommand(mon, cmd, &reply, false, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); + ret = qemuAgentCommand(mon, cmd, &reply, false, mon->timeout); virJSONValueFree(cmd); virJSONValueFree(reply); @@ -1456,8 +1460,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-vcpus", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (!(data = virJSONValueObjectGetArray(reply, "return"))) { @@ -1572,8 +1575,7 @@ qemuAgentSetVCPUsCommand(qemuAgentPtr mon, NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; /* All negative values are invalid. Return of 0 is bogus since we wouldn't @@ -1728,8 +1730,7 @@ qemuAgentGetHostname(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) ret = -2; goto cleanup; @@ -1773,8 +1774,7 @@ qemuAgentGetTime(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (virJSONValueObjectGetNumberUlong(reply, "return", &json_time) < 0) { @@ -1839,8 +1839,7 @@ qemuAgentSetTime(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; ret = 0; @@ -2043,8 +2042,7 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) ret = -2; goto cleanup; @@ -2333,8 +2331,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (!(ret_array = virJSONValueObjectGet(reply, "return"))) { @@ -2511,8 +2508,7 @@ qemuAgentSetUserPassword(qemuAgentPtr mon, NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; ret = 0; @@ -2543,8 +2539,7 @@ qemuAgentGetUsers(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-users", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) return -2; return -1; @@ -2633,8 +2628,7 @@ qemuAgentGetOSInfo(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-osinfo", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) return -2; return -1; @@ -2689,8 +2683,7 @@ qemuAgentGetTimezone(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-timezone", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) return -2; return -1; @@ -2719,3 +2712,16 @@ qemuAgentGetTimezone(qemuAgentPtr mon, return 0; } + +/* qemuAgentSetResponseTimeout: + * mon: agent monitor + * timeout: number of seconds to wait for agent response + * + * The agent object must be locked prior to calling this function. + */ +void +qemuAgentSetResponseTimeout(qemuAgentPtr mon, + int timeout) +{ + mon->timeout = timeout; +} diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 78e648992a..85e436cf68 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -140,3 +140,6 @@ int qemuAgentGetTimezone(qemuAgentPtr mon, virTypedParameterPtr *params, int *nparams, int *maxparams); + +void qemuAgentSetResponseTimeout(qemuAgentPtr mon, + int timeout); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 54dde34f15..86358341d5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2093,6 +2093,8 @@ qemuDomainObjPrivateAlloc(void *opaque) if (!(priv->dbusVMStates = virHashCreate(5, dbusVMStateHashFree))) goto error; + /* agent commands block by default, user can choose different behavior */ + priv->agentTimeout = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK; priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX; priv->driver = opaque; @@ -2875,6 +2877,8 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, if (qemuDomainObjPrivateXMLFormatSlirp(buf, vm) < 0) return -1; + virBufferAsprintf(buf, "<agentTimeout>%i</agentTimeout>\n", priv->agentTimeout); + return 0; } @@ -3672,6 +3676,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, priv->memPrealloc = virXPathBoolean("boolean(./memPrealloc)", ctxt) == 1; + virXPathInt("string(./agentTimeout)", ctxt, &priv->agentTimeout); + return 0; error: diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index ab00b25789..98a9540275 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -293,6 +293,7 @@ struct _qemuDomainObjPrivate { virDomainChrSourceDefPtr monConfig; bool monError; unsigned long long monStart; + int agentTimeout; qemuAgentPtr agent; bool agentError; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c969a3d463..77a26ccf2e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -22666,6 +22666,52 @@ qemuDomainGetGuestInfo(virDomainPtr dom, return ret; } + +static int +qemuDomainAgentSetResponseTimeout(virDomainPtr dom, + int timeout, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (timeout < VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN) { + virReportError(VIR_ERR_INVALID_ARG, + _("guest agent timeout '%d' is " + "less than the minimum '%d'"), + timeout, VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN); + return -1; + } + + if (!(vm = qemuDomainObjFromDomain(dom))) + return -1; + + if (virDomainAgentSetResponseTimeoutEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + /* If domain has an agent, change its timeout. Otherwise just save the + * request so that we can set the timeout when the agent appears */ + if (qemuDomainAgentAvailable(vm, false)) { + /* We don't need to acquire a job since we're not interacting with the + * agent or the qemu monitor. We're only setting a struct member, so + * just acquire the mutex lock. Worst case, any in-process agent + * commands will use the newly-set agent timeout. */ + virObjectLock(QEMU_DOMAIN_PRIVATE(vm)->agent); + qemuAgentSetResponseTimeout(QEMU_DOMAIN_PRIVATE(vm)->agent, timeout); + virObjectUnlock(QEMU_DOMAIN_PRIVATE(vm)->agent); + } + + QEMU_DOMAIN_PRIVATE(vm)->agentTimeout = timeout; + ret = 0; + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static virHypervisorDriver qemuHypervisorDriver = { .name = QEMU_DRIVER_NAME, .connectURIProbe = qemuConnectURIProbe, @@ -22902,6 +22948,7 @@ static virHypervisorDriver qemuHypervisorDriver = { .domainCheckpointGetParent = qemuDomainCheckpointGetParent, /* 5.6.0 */ .domainCheckpointDelete = qemuDomainCheckpointDelete, /* 5.6.0 */ .domainGetGuestInfo = qemuDomainGetGuestInfo, /* 5.7.0 */ + .domainAgentSetResponseTimeout = qemuDomainAgentSetResponseTimeout, /* 5.10.0 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 503f49a902..a1384fc655 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8701,6 +8701,7 @@ static virHypervisorDriver hypervisor_driver = { .domainCheckpointGetParent = remoteDomainCheckpointGetParent, /* 5.6.0 */ .domainCheckpointDelete = remoteDomainCheckpointDelete, /* 5.6.0 */ .domainGetGuestInfo = remoteDomainGetGuestInfo, /* 5.7.0 */ + .domainAgentSetResponseTimeout = remoteDomainAgentSetResponseTimeout, /* 5.10.0 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index f4e3392212..23e42d17b1 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3744,6 +3744,16 @@ struct remote_connect_set_identity_args { unsigned int flags; }; +struct remote_domain_agent_set_response_timeout_args { + remote_nonnull_domain dom; + int timeout; + unsigned int flags; +}; + +struct remote_domain_agent_set_response_timeout_ret { + int result; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -6617,5 +6627,11 @@ enum remote_procedure { * @generate: client * @acl: connect:write */ - REMOTE_PROC_CONNECT_SET_IDENTITY = 419 + REMOTE_PROC_CONNECT_SET_IDENTITY = 419, + + /** + * @generate: both + * @acl: domain:write + */ + REMOTE_PROC_DOMAIN_AGENT_SET_RESPONSE_TIMEOUT = 420 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 51606e7473..9ad7a857e0 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -3114,6 +3114,14 @@ struct remote_connect_set_identity_args { } params; u_int flags; }; +struct remote_domain_agent_set_response_timeout_args { + remote_nonnull_domain dom; + int timeout; + u_int flags; +}; +struct remote_domain_agent_set_response_timeout_ret { + int result; +}; enum remote_procedure { REMOTE_PROC_CONNECT_OPEN = 1, REMOTE_PROC_CONNECT_CLOSE = 2, @@ -3534,4 +3542,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_CHECKPOINT_DELETE = 417, REMOTE_PROC_DOMAIN_GET_GUEST_INFO = 418, REMOTE_PROC_CONNECT_SET_IDENTITY = 419, + REMOTE_PROC_DOMAIN_AGENT_SET_RESPONSE_TIMEOUT = 420, }; diff --git a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml index e9031b7087..4f6930001e 100644 --- a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml @@ -338,6 +338,7 @@ </chains> </blockjob> </blockjobs> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='4'> <name>copy</name> <uuid>0439a4a8-db56-4933-9183-d8681d7b0746</uuid> diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml index 0fba3b69e7..abd9f62965 100644 --- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml @@ -23,6 +23,7 @@ <channelTargetDir path='/tmp/channel'/> <allowReboot value='yes'/> <blockjobs active='yes'/> + <agentTimeout>-2</agentTimeout> <domain type='qemu' id='1'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> diff --git a/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml b/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml index 3d5e8f1438..5d3287606f 100644 --- a/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml +++ b/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml @@ -258,6 +258,7 @@ <chardevStdioLogd/> <allowReboot value='yes'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='1'> <name>upstream</name> <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid> diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests/qemustatusxml2xmldata/migration-in-params-in.xml index 80cc4b4666..fdc2d39173 100644 --- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml @@ -257,6 +257,7 @@ <chardevStdioLogd/> <allowReboot value='yes'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='1'> <name>nest</name> <uuid>994cee0d-2a70-4937-9693-0431e39d20f7</uuid> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml index 455c30be85..304fb1b77f 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml @@ -260,6 +260,7 @@ <chardevStdioLogd/> <allowReboot value='yes'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='4'> <name>upstream</name> <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml index 409e97a918..d69796e029 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml @@ -289,6 +289,7 @@ <chardevStdioLogd/> <allowReboot value='yes'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='3'> <name>upstream</name> <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid> diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/tests/qemustatusxml2xmldata/migration-out-params-in.xml index 4a660281d2..1956eac120 100644 --- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml @@ -271,6 +271,7 @@ <chardevStdioLogd/> <allowReboot value='yes'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='7'> <name>nest</name> <uuid>994cee0d-2a70-4937-9693-0431e39d20f7</uuid> diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml index 2125b899f4..8a2718293f 100644 --- a/tests/qemustatusxml2xmldata/modern-in.xml +++ b/tests/qemustatusxml2xmldata/modern-in.xml @@ -261,6 +261,7 @@ <allowReboot value='yes'/> <nodename index='123'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='1'> <name>upstream</name> <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid> diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml index b8ec650714..11ec74ecf8 100644 --- a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml +++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml @@ -309,6 +309,7 @@ <channelTargetDir path='/tmp/channel'/> <allowReboot value='yes'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0feb21ef17..def4107d27 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9832,6 +9832,52 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) return ret; } +/* + * "guest-agent-timeout" command + */ +static const vshCmdInfo info_guest_agent_timeout[] = { + {.name = "help", + .data = N_("Set the guest agent timeout") + }, + {.name = "desc", + .data = N_("Set the number of seconds to wait for a response from the guest agent.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_guest_agent_timeout[] = { + VIRSH_COMMON_OPT_DOMAIN_FULL(0), + {.name = "timeout", + .type = VSH_OT_INT, + .flags = VSH_OFLAG_REQ_OPT, + .help = N_("timeout seconds.") + }, + {.name = NULL} +}; + +static bool +cmdGuestAgentTimeout(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + int timeout; + const unsigned int flags = 0; + bool ret = false; + + dom = virshCommandOptDomain(ctl, cmd, NULL); + if (dom == NULL) + goto cleanup; + + if (vshCommandOptInt(ctl, cmd, "timeout", &timeout) < 0) + goto cleanup; + + if (virDomainAgentSetResponseTimeout(dom, timeout, flags) < 0) + goto cleanup; + + ret = true; + cleanup: + virshDomainFree(dom); + return ret; +} /* * "lxc-enter-namespace" namespace @@ -14492,6 +14538,12 @@ const vshCmdDef domManagementCmds[] = { .info = info_qemu_agent_command, .flags = 0 }, + {.name = "guest-agent-timeout", + .handler = cmdGuestAgentTimeout, + .opts = opts_guest_agent_timeout, + .info = info_guest_agent_timeout, + .flags = 0 + }, {.name = "reboot", .handler = cmdReboot, .opts = opts_reboot, -- 2.21.0

2 1

[libvirt] [PATCH 0/3] Prefer g_mkstemp_full and g_mkdtemp (glib chronicles)
by Ján Tomko 14 Nov '19

14 Nov '19

Remove the dependency on three more gnulib modules: mkdtemp mkostemp mkostemps Note: this series is not affiliated with the kill-a-gnulib-module-a-day initiative Ján Tomko (3): Use g_mkstemp_full instead of mkostemp(s) Use g_mkdtemp instead of mkdtemp syntax-check: prefer g_mkstemp_full and g_mkdtemp build-aux/syntax-check.mk | 13 ++++++++++--- src/qemu/qemu_driver.c | 8 ++++---- src/qemu/qemu_process.c | 2 +- src/storage/storage_driver.c | 2 +- src/storage/storage_util.c | 2 +- src/util/virlog.c | 8 +------- src/vbox/vbox_common.c | 4 ++-- tests/fdstreamtest.c | 2 +- tests/qemuhotplugtest.c | 2 +- tests/qemumemlocktest.c | 2 +- tests/qemumonitortestutils.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 2 +- tests/scsihosttest.c | 2 +- tests/testutilsqemu.c | 4 ++-- tests/vircgrouptest.c | 2 +- tests/virfiletest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/virnetsockettest.c | 4 ++-- tests/virpcitest.c | 2 +- tests/virscsitest.c | 2 +- tools/vsh.c | 4 ++-- 22 files changed, 38 insertions(+), 37 deletions(-) -- 2.21.0

2 7

[libvirt] [PATCH v2 0/4] replace snprintf by g_snprintf (kill-a-gnulib-module-a-day initiative)
by Pavel Hrdina 14 Nov '19

14 Nov '19

3 8

[libvirt] [PATCH 00/12] Use GRegex instead of regcomp (glib chronicles)
by Ján Tomko 14 Nov '19

14 Nov '19

This removes the need to use gnulib's regex module. Ján Tomko (12): libxl: do not use G_REGEX_EXTENDED remove unused regex.h includes libxl: use GRegex in libxlGetAutoballoonConf libxl: use g_autofree in xenParseSxprVifRate libxl: use GRegex in xenParseSxprVifRate libxl: remove 'ret' from xenParseSxprVifRate storage: use GRegex virStorageBackendLogicalParseVolExtents util: use GRegex in virCommandRunRegex util: use GRegex for virLogRegex util: use GRegex in virStringSearch util: use GRegex in virStringMatch tests: use GRegex in vboxsnapshotxmltest src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_conf.c | 20 ++++------ src/libxl/libxl_driver.c | 1 - src/libxl/xen_common.c | 33 ++++++----------- src/storage/storage_backend_logical.c | 49 +++++++------------------ src/storage/storage_util.c | 1 - src/util/vircommand.c | 37 +++++++------------ src/util/viriscsi.c | 2 - src/util/virlog.c | 15 +++----- src/util/virnetdevtap.c | 1 - src/util/virstring.c | 53 +++++++++++---------------- tests/testutils.c | 1 - tests/vboxsnapshotxmltest.c | 20 ++++------ 13 files changed, 80 insertions(+), 155 deletions(-) -- 2.21.0

2 26

[libvirt] [tck PATCH 0/3] A couple of fixes for daemon hooks tests assuming system V only
by Erik Skultety 14 Nov '19

14 Nov '19

Erik Skultety (3): hooks: Add systemd detection hooks: Refresh the service status after performing an action hooks: Use internal variable holding the state of the libvirtd service lib/Sys/Virt/TCK/Hooks.pm | 26 +++++++++++++++++++++++--- scripts/hooks/051-daemon-hook.t | 8 ++++---- 2 files changed, 27 insertions(+), 7 deletions(-) -- 2.23.0

2 6

[libvirt] [PATCH v2 0/2] a few cleanups in qemu_hotplug.c
by Daniel Henrique Barboza 14 Nov '19

14 Nov '19

There is not much to do regarding cleanup and g_auto* in this file. Here's a couple of simple fixes I've found. changes from v1: - added a new patch to remove unused cleanup labels v1: https://www.redhat.com/archives/libvir-list/2019-September/msg01463.html Daniel Henrique Barboza (2): qemu_hotplug.c: use g_autoptr() with virConnectPtr qemu_process: remove unused cleanup labels src/qemu/qemu_hotplug.c | 72 +++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 43 deletions(-) -- 2.21.0

2 3

[libvirt] [PATCH v3 0/6] Fix virConnectRegisterCloseCallback and get rid of global variables
by Marc Hartmayer 14 Nov '19

14 Nov '19

After discussions with Peter and Pavel at the KVM forum, I am now sending a v3 of this series after more than a year... sorry for that long delay! The second patch of this patch series fixes the behavior of virConnectRegisterCloseCallback. The subsequent patches remove the need to have the global variables 'qemuProgram' and 'remoteProgram' in libvirtd.[ch]. They only work in combination with the fixed behavior of virConnectRegisterCloseCallback. Changelog: + v2->v3: - Rebased to current master - Added Johns r-b to the first patch, all other r-b's I have dropped as there were to many changes in the meantime - Removed accepted patches - Dropped patches 8 and 9 + v1->v2: - Removed accepted patches - Removed NACKed patches - Added r-b to patch 5 - Worked in comments - Rebased - Added patches 7-9 Marc Hartmayer (6): rpc: use the return value of virObjectRef directly virConnectRegisterCloseCallback: Cleanup 'opaque' if there is no connectRegisterCloseCallback remote: Save reference to program in daemonClientEventCallback remote: Use domainClientEventCallbacks for remoteReplayConnectionClosedEvent rpc: Introduce virNetServerGetProgramLocked helper function remote/rpc: Use virNetServerGetProgram() to determine the program src/libvirt-host.c | 12 +- src/libvirt_remote.syms | 1 + src/remote/remote_daemon.c | 4 +- src/remote/remote_daemon.h | 2 - src/remote/remote_daemon_dispatch.c | 227 +++++++++++++++++++--------- src/rpc/gendispatch.pl | 6 + src/rpc/virnetserver.c | 53 +++++-- src/rpc/virnetserver.h | 2 + 8 files changed, 217 insertions(+), 90 deletions(-) -- 2.21.0

2 16

[libvirt] [PATCH] virhostuptime: Wrap virHostGetBootTimeProcfs() call in an ifdef
by Michal Privoznik 14 Nov '19

14 Nov '19

The virHostGetBootTimeProcfs() function is defined only for Linux and therefore it's only call should also be done if we're on Linux. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/util/virhostuptime.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virhostuptime.c b/src/util/virhostuptime.c index 056b5c591a..8c49c3d40e 100644 --- a/src/util/virhostuptime.c +++ b/src/util/virhostuptime.c @@ -99,8 +99,10 @@ virHostGetBootTimeOnceInit(void) endutxent(); # endif /* HAVE_GETUTXID */ +# ifdef __linux__ if (bootTimeErrno != 0 || bootTime == 0) bootTimeErrno = -virHostGetBootTimeProcfs(&bootTime); +# endif /* __linux__ */ } #else /* !defined(HAVE_GETUTXID) && !defined(__linux__) */ -- 2.23.0

1 0

[libvirt] [PATCH] qemu: Warn verbosely if using old loader:nvram pairs
by Michal Privoznik 14 Nov '19

14 Nov '19

There are two ways for specifying loader:nvram pairs: 1) --with-loader-nvram configure option 2) nvram variable in qemu.conf Since we have FW descriptors, using this old style is discouraged, but not as strong as one would expect. Produce more warnings: 1) produce a warning if somebody tries the configure option 2) produce a warning if somebody sets nvram variable and at least on FW descriptor was found The reason for producing warning in case 1) is that package maintainers, who set the configure option in the first place should start moving towards FW descriptors and abandon the configure option. After all, the warning is printed into config output only in this case. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1763477 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- m4/virt-loader-nvram.m4 | 10 +++++++++- src/qemu/qemu.conf | 3 +++ src/qemu/qemu_conf.c | 19 +++++++++++++++++-- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/m4/virt-loader-nvram.m4 b/m4/virt-loader-nvram.m4 index d7e0c8ca18..ed2ae0cf27 100644 --- a/m4/virt-loader-nvram.m4 +++ b/m4/virt-loader-nvram.m4 @@ -30,6 +30,8 @@ AC_DEFUN([LIBVIRT_CHECK_LOADER_NVRAM], [ l=$(echo $with_loader_nvram | tr ':' '\n' | wc -l) if test $(expr $l % 2) -ne 0 ; then AC_MSG_ERROR([Malformed --with-loader-nvram argument]) + elif test $l -gt 0 ; then + AC_MSG_WARN([Note that --with-loader-nvram is obsolete and will be removed soon]) fi AC_DEFINE_UNQUOTED([DEFAULT_LOADER_NVRAM], ["$with_loader_nvram"], [List of loader:nvram pairs]) @@ -37,5 +39,11 @@ AC_DEFUN([LIBVIRT_CHECK_LOADER_NVRAM], [ ]) AC_DEFUN([LIBVIRT_RESULT_LOADER_NVRAM], [ - LIBVIRT_RESULT([Loader/NVRAM], [$with_loader_nvram]) + if test "x$with_loader_nvram" != "xno" && \ + test "x$with_loader_nvram" != "x" ; then + LIBVIRT_RESULT([Loader/NVRAM], [$with_loader_nvram], + [!!! Using this configure option is strongly discouraged !!!]) + else + LIBVIRT_RESULT([Loader/NVRAM], [$with_loader_nvram]) + fi ]) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index b3a3428e4c..7a056b037e 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -761,6 +761,9 @@ # source tree. These metadata files are distributed alongside any # firmware images intended for use with QEMU. # +# NOTE: if ANY firmware metadata files are detected, this setting +# will be COMPLETELY IGNORED. +# # ------------------------------------------ # # When a domain is configured to use UEFI instead of standard diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fae697a2ef..293f2635cc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -32,6 +32,7 @@ #include "qemu_conf.h" #include "qemu_capabilities.h" #include "qemu_domain.h" +#include "qemu_firmware.h" #include "qemu_security.h" #include "viruuid.h" #include "virbuffer.h" @@ -799,7 +800,8 @@ virQEMUDriverConfigLoadLogEntry(virQEMUDriverConfigPtr cfg, static int virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfigPtr cfg, - virConfPtr conf) + virConfPtr conf, + bool privileged) { VIR_AUTOSTRINGLIST nvram = NULL; size_t i; @@ -807,8 +809,21 @@ virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfigPtr cfg, if (virConfGetValueStringList(conf, "nvram", false, &nvram) < 0) return -1; if (nvram) { + VIR_AUTOSTRINGLIST fwList = NULL; + virFirmwareFreeList(cfg->firmwares, cfg->nfirmwares); + if (qemuFirmwareFetchConfigs(&fwList, privileged) < 0) + return -1; + + if (fwList) { + VIR_WARN("Obsolete nvram variable is set while firmware metadata " + "files found. Note that the nvram config file variable is " + "going to be ignored."); + cfg->nfirmwares = 0; + return 0; + } + cfg->nfirmwares = virStringListLength((const char *const *)nvram); if (nvram[0] && VIR_ALLOC_N(cfg->firmwares, cfg->nfirmwares) < 0) return -1; @@ -1041,7 +1056,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virQEMUDriverConfigLoadLogEntry(cfg, conf) < 0) return -1; - if (virQEMUDriverConfigLoadNVRAMEntry(cfg, conf) < 0) + if (virQEMUDriverConfigLoadNVRAMEntry(cfg, conf, privileged) < 0) return -1; if (virQEMUDriverConfigLoadGlusterDebugEntry(cfg, conf) < 0) -- 2.23.0

3 7

[libvirt] [PATCH] docs: mention lifted vCPUs restriction for esx
by Pino Toscano 14 Nov '19

14 Nov '19

It was lifted with c92b6023e8eb670e01571e299a85e9da9bd4844c. Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- docs/drvesx.html.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 901d65958a..ac7bc645d1 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -337,7 +337,9 @@ error: invalid argument in libvirt was built without the 'esx' driver Memory size has to be a multiple of 4096 </li> <li> - Number of virtual CPU has to be 1 or a multiple of 2 + Number of virtual CPU has to be 1 or a multiple of 2. + <span class="since">Since 4.10.0</span> any number of vCPUs is + supported. </li> <li> Valid MAC address prefixes are <code>00:0c:29</code> and -- 2.21.0

2 1

[libvirt] [PATCH 0/5] PATCH 0/8] Remove use of 'strsep' gnulib module (kill-a-gnulib-module-a-day initiative)
by Peter Krempa 14 Nov '19

14 Nov '19

Peter Krempa (5): rpc: use virStringSplit instead of strsep util: file: Use g_autofree in virFindFileInPath util: file: Simplify logic of shortuct cases in virFindFileInPath util: file: Replace use of 'strsep' with virStringSplit gnulib: Remove use of 'strsep' module bootstrap.conf | 1 - src/rpc/virnetsocket.c | 28 ++++++++++++---------------- src/util/virfile.c | 38 ++++++++++++++++---------------------- 3 files changed, 28 insertions(+), 39 deletions(-) -- 2.23.0

3 18

[libvirt] [PATCH] libxl: Fix lock manager lock ordering
by Jim Fehlig 14 Nov '19

14 Nov '19

The ordering of lock manager locks in the libxl driver has a flaw that was uncovered by a migration error path. In the perform phase of migration, the source host calls virDomainLockProcessPause to release the lock before sending the VM to the destination host. If the send fails an attempt is made to reacquire the lock with virDomainLockProcessResume, but that too can fail if the destination host has not finished cleaning up the failed VM and releasing the lock it acquired when starting to receive the VM. This change delays calling virDomainLockProcessResume in libxlDomainStart until the VM is successfully created, but before it is unpaused. A similar approach is used by the qemu driver, avoiding the need to release the lock if VM creation fails. In the migration perform phase, releasing the lock with virDomainLockProcessPause is delayed until the VM is successfully sent to the destination, which avoids reacquiring the lock if the send fails. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 14 +++++++------- src/libxl/libxl_migration.c | 14 +++++--------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 4073bf8d46..a830a19b99 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1364,13 +1364,6 @@ libxlDomainStart(libxlDriverPrivatePtr driver, NULL) < 0) goto cleanup; - if (virDomainLockProcessResume(driver->lockManager, - "xen:///system", - vm, - priv->lockState) < 0) - goto cleanup; - VIR_FREE(priv->lockState); - if (libxlNetworkPrepareDevices(vm->def) < 0) goto cleanup_dom; @@ -1453,6 +1446,13 @@ libxlDomainStart(libxlDriverPrivatePtr driver, libxlLoggerOpenFile(cfg->logger, domid, vm->def->name, config_json); + if (virDomainLockProcessResume(driver->lockManager, + "xen:///system", + vm, + priv->lockState) < 0) + goto destroy_dom; + VIR_FREE(priv->lockState); + /* Always enable domain death events */ if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) goto destroy_dom; diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index a1021d499b..8e64dc5d04 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -1253,20 +1253,16 @@ libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver, sockfd = virNetSocketDupFD(sock, true); virObjectUnref(sock); - if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) - VIR_WARN("Unable to release lease on %s", vm->def->name); - VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); - /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); ret = libxlDoMigrateSrcSend(driver, vm, flags, sockfd); virObjectLock(vm); - if (ret < 0) { - virDomainLockProcessResume(driver->lockManager, - "xen:///system", - vm, - priv->lockState); + if (ret == 0) { + if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) + VIR_WARN("Unable to release lease on %s", vm->def->name); + VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + } else { /* * Confirm phase will not be executed if perform fails. End the * job started in begin phase. -- 2.23.0

2 2

[libvirt] [PATCH v2 0/3] use virStringParseYesNo helper
by Mao Zhongyi 14 Nov '19

14 Nov '19

A function virStringParseYesNo was added to convert string 'yes' to true and 'no' to false, so use this helper to replace 'STREQ(.*, \"yes\")' and 'STREQ(.*, \"no\")' as it allows us to drop several repetitive if-then-else string->bool conversion blocks. v2->v1 p1: - ignore the return value of virStringParseYesNo. - update the commit message. [Michal Privoznik] p2: - add the Acked-by tag. p3: - pass return value of helper to rc directly. [Michal Privoznik] Mao Zhongyi (3): conf/domain_conf: use virStringParseYesNo helper conf/network_conf: use virStringParseYesNo helper qemu/qemu_migration_params: use virStringParseYesNo helper src/conf/domain_conf.c | 35 ++++++++++++-------------------- src/conf/network_conf.c | 4 +--- src/qemu/qemu_migration_params.c | 7 +------ 3 files changed, 15 insertions(+), 31 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH v2 0/5] Fix up some issues from x and y resolution patches
by Jonathon Jongsma 14 Nov '19

14 Nov '19

This is a follow-up series responding to some comments from Jan Tomko. Most importantly, the fact that the errors are not propagated up to the caller, they're only logged. To fix this, the function signatures were changed to return a error status. The patch series was also re-ordered slightly to improve readability (I hope). Jonathon Jongsma (5): qemu: fix documentation for video resolution conf: remove unnecessary NULL checks conf: use glib allocation when parsing video props conf: report errors when parsing video resolution conf: report errors when parsing video acceleration docs/formatdomain.html.in | 12 +++-- src/conf/domain_conf.c | 108 ++++++++++++++++++++++---------------- 2 files changed, 71 insertions(+), 49 deletions(-) -- 2.21.0

2 9

[libvirt] [PATCH 0/8] Remove use of 'areadlink' gnulib module (kill-a-gnulib-module-a-day initiative)
by Peter Krempa 14 Nov '19

14 Nov '19

This removes use of 'areadlink' by using 'g_file_read_link' and fixes a few insane uses. Note that I'll post the actual module deletion from bootstrap.conf separately as touching that file results in lengthy rebuilds. Peter Krempa (8): qemu: domain: Use g_file_read_link instead of virFileReadLink util: file: Remove virFileReadLink qemu: tpm: Use g_autofree in qemuTPMEmulatorGetPid qemu: tpm: Sanitize error values in qemuTPMEmulatorGetPid qemu: gpu: Sanitize error values in qemuVhostUserGPUGetPid util: pidfile: Sanitize return values of virPidFileReadIfAlive util: pidfile: Sanitize return values of virPidFileReadPathIfAlive util: pidfile: Replace 'areadlink' by 'g_file_read_link' src/libvirt_private.syms | 1 - src/qemu/qemu_domain.c | 18 +++++----- src/qemu/qemu_tpm.c | 16 ++++----- src/qemu/qemu_vhost_user_gpu.c | 12 ++++--- src/util/virfile.c | 13 ------- src/util/virfile.h | 3 -- src/util/virpidfile.c | 64 +++++++++++++++++----------------- 7 files changed, 56 insertions(+), 71 deletions(-) -- 2.23.0

2 10

[libvirt] [PATCH 0/2] qemu: block: Fix two bugs related to usage of blockdev (blockdev-add saga)
by Peter Krempa 14 Nov '19

14 Nov '19

Peter Krempa (2): qemu: blockjob: Transfer 'readonly' state of images after active layer block commit qemu: snapshot: Fix inactive external snapshots when backing chain is present src/qemu/qemu_blockjob.c | 2 ++ src/qemu/qemu_driver.c | 25 +++++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) -- 2.23.0

2 3

[libvirt] [PATCH Rust 0/4] Map more functions in stream module
by Zixing Liu 14 Nov '19

14 Nov '19

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

2 7

[libvirt] [RFC] default video device type
by Pavel Mores 14 Nov '19

14 Nov '19

Hi, I'm looking into fixing https://bugzilla.redhat.com/show_bug.cgi?id=1668141 (as a short summary, if a graphics device is added to XML that has no video device, libvirt automatically adds a video device which is always of type 'cirrus' - even if the underlying qemu doesn't support cirrus). I'm able to affect the behaviour in question by using qemu capabilities in qemuDomainDeviceVideoDefPostParse(), see proof-of-concept change in [1]. I have a couple of questions though: 1) is this a proper place and approach to fix the bug? 2) what would be the full specification of expected behaviour? The bug report only states that the video type shouldn't be cirrus but doesn't say what it should be. [2] gives some information about the order of preference of video device types but I was wondering if there are any opinions about this on this list? Cheers, pvl [1] diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b4175a846e..0de491b79f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7821,7 +7821,8 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net, static int qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, - const virDomainDef *def) + const virDomainDef *def, + virQEMUCapsPtr qemuCaps) { if (video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { if (ARCH_IS_PPC64(def->os.arch)) @@ -7830,8 +7831,16 @@ qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, qemuDomainIsRISCVVirt(def) || ARCH_IS_S390(def->os.arch)) video->type = VIR_DOMAIN_VIDEO_TYPE_VIRTIO; - else - video->type = VIR_DOMAIN_VIDEO_TYPE_CIRRUS; + else { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE) + && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL)) { + video->type = VIR_DOMAIN_VIDEO_TYPE_QXL; + video->vgamem = QEMU_QXL_VGAMEM_DEFAULT; + } else { + video->type = VIR_DOMAIN_VIDEO_TYPE_VGA; + } + } } if (video->type == VIR_DOMAIN_VIDEO_TYPE_QXL && @@ -7926,7 +7935,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, break; case VIR_DOMAIN_DEVICE_VIDEO: - ret = qemuDomainDeviceVideoDefPostParse(dev->data.video, def); + ret = qemuDomainDeviceVideoDefPostParse(dev->data.video, def, qemuCaps); break; case VIR_DOMAIN_DEVICE_PANIC: [2] https://www.kraxel.org/blog/2019/09/display-devices-in-qemu/

3 3

[libvirt] [PATCH] virhostuptime: Add linux stub for musl
by Michal Privoznik 14 Nov '19

14 Nov '19

When we want to know the boot timestamp of the host, we can call virHostGetBootTime(). Under the hood, it uses getutxid() which is defined by POSIX and properly check for in configure. However, musl took a path where it declares the function but instead of providing any useful implementation it returns NULL meaning "no record found". If that's the case, use our second best option - /proc/uptime and a bit of maths. https://bugzilla.redhat.com/show_bug.cgi?id=1760885 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virhostuptime.c | 64 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/src/util/virhostuptime.c b/src/util/virhostuptime.c index 62b781acd5..3189074d3d 100644 --- a/src/util/virhostuptime.c +++ b/src/util/virhostuptime.c @@ -25,16 +25,68 @@ #endif #include "virhostuptime.h" +#include "viralloc.h" +#include "virfile.h" +#include "virlog.h" +#include "virstring.h" +#include "virtime.h" #include "virthread.h" +#define VIR_FROM_THIS VIR_FROM_NONE + +VIR_LOG_INIT("util.virhostuptime"); + static unsigned long long bootTime; static int bootTimeErrno; static virOnceControl virHostGetBootTimeOnce = VIR_ONCE_CONTROL_INITIALIZER; -#ifdef HAVE_GETUTXID +#if defined(__linux__) +# define UPTIME_FILE "/proc/uptime" +static int +virHostGetBootTimeProcfs(unsigned long long *btime) +{ + unsigned long long now; + double up; + g_autofree char *buf = NULL; + char *tmp; + + if (virTimeMillisNow(&now) < 0) + return -errno; + + /* 1KiB limit is more than enough. */ + if (virFileReadAll(UPTIME_FILE, 1024, &buf) < 0) + return -errno; + + /* buf contains two doubles now: + * $uptime $idle_time + * We're interested only in the first one */ + if (!(tmp = strchr(buf, ' '))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("uptime file has unexpected format '%s'"), + buf); + return -EINVAL; + } + + *tmp = '\0'; + + if (virStrToDouble(buf, NULL, &up) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to parse sched info value '%s'"), + buf); + return -EINVAL; + } + + *btime = now / 1000 - up + 0.5; + + return 0; +} +#endif /* defined(__linux__) */ + +#if defined(HAVE_GETUTXID) || defined(__linux__) static void virHostGetBootTimeOnceInit(void) { +# ifdef HAVE_GETUTXID struct utmpx id = {.ut_type = BOOT_TIME}; struct utmpx *res = NULL; @@ -45,16 +97,22 @@ virHostGetBootTimeOnceInit(void) } endutxent(); +# endif /* HAVE_GETUTXID */ + + if (bootTimeErrno == ENODATA || + (bootTime == 0 && bootTimeErrno == 0)) { + bootTimeErrno = -virHostGetBootTimeProcfs(&bootTime); + } } -#else /* !HAVE_GETUTXID */ +#else /* !defined(HAVE_GETUTXID) && !defined(__linux__) */ static void virHostGetBootTimeOnceInit(void) { bootTimeErrno = ENOSYS; } -#endif /* HAVE_GETUTXID */ +#endif /* !defined(HAVE_GETUTXID) && !defined(__linux__) */ /** * virHostGetBootTime: -- 2.21.0

2 1

[libvirt] [PATCH v2 0/2] qemu: fix type of default video device
by Pavel Mores 13 Nov '19

13 Nov '19

This new version mostly integrates Cole's comments about the first version. Pavel Mores (2): qemu: fix type of default video device qemu: add tests of the default video type selection algorithm src/qemu/qemu_domain.c | 39 +++++++++++------ .../default-video-type-aarch64.xml | 16 +++++++ .../default-video-type-ppc64.xml | 16 +++++++ .../default-video-type-riscv64.xml | 16 +++++++ .../default-video-type-s390x.xml | 16 +++++++ .../default-video-type-x86_64-caps-test-0.xml | 17 ++++++++ .../default-video-type-x86_64-caps-test-1.xml | 17 ++++++++ tests/qemuxml2argvtest.c | 1 + ...ault-video-type-aarch64.aarch64-latest.xml | 42 +++++++++++++++++++ .../default-video-type-ppc64.ppc64-latest.xml | 31 ++++++++++++++ ...ault-video-type-riscv64.riscv64-latest.xml | 39 +++++++++++++++++ .../default-video-type-s390x.s390x-latest.xml | 32 ++++++++++++++ .../default-video-type-x86_64-caps-test-0.xml | 31 ++++++++++++++ .../default-video-type-x86_64-caps-test-1.xml | 31 ++++++++++++++ tests/qemuxml2xmltest.c | 10 ++++- 15 files changed, 341 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/default-video-type-aarch64.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-ppc64.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-riscv64.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-s390x.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-aarch64.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-ppc64.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-riscv64.riscv64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-s390x.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-1.xml -- 2.21.0

2 4

[libvirt] [PATCH v3 0/3] unplug timeout changes for PPC64
by Daniel Henrique Barboza 13 Nov '19

13 Nov '19

changes in v3: - redesigned patch 1 based on Cole Robinson feedback v2: https://www.redhat.com/archives/libvir-list/2019-September/msg00447.html v1: https://www.redhat.com/archives/libvir-list/2019-August/msg00698.html Daniel Henrique Barboza (3): qemu_hotplug.c: adding qemuDomainGetUnplugTimeout qemu: Remove qemu_hotplugpriv.h and qemuDomainRemoveDeviceWaitTime qemu_hotplug.c: user-friendlier setvcpus timeout error message src/qemu/Makefile.inc.am | 1 - src/qemu/qemu_hotplug.c | 28 ++++++++++++++----- src/qemu/qemu_hotplug.h | 2 ++ tests/Makefile.am | 13 ++++++++- .../qemuhotplugmock.c | 27 +++++++++--------- tests/qemuhotplugtest.c | 7 ++--- 6 files changed, 51 insertions(+), 27 deletions(-) rename src/qemu/qemu_hotplugpriv.h => tests/qemuhotplugmock.c (61%) -- 2.21.0

2 4

[libvirt] [PATCH 0/2] Eliminate two more gnulib modules (glib chronicles)
by Ján Tomko 13 Nov '19

13 Nov '19

Remove the need to use: byteswap vsnprintf by using the GLib counterparts Ján Tomko (2): util: use g_vsnprintf qemu: use GUINT32_SWAP_LE_BE src/qemu/qemu_driver.c | 10 +++++----- src/util/virerror.c | 4 ++-- src/util/virtypedparam.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) -- 2.21.0

3 8

[libvirt] [PATCH 0/2] replace snprintf by g_snprintf (kill-a-gnulib-module-a-day initiative)
by Pavel Hrdina 13 Nov '19

13 Nov '19

2 4

[libvirt] [PATCH 0/6] docs: some refactoring and new docs about RPM deployment
by Daniel P. Berrangé 13 Nov '19

13 Nov '19

This refactors existing docs related to the remote driver/daemon and URIs. It then also adds a kbase page about RPM package options. This introduces the use of RST for docs as a replacement for HTML. The intent is that all new docs should use RST from this point. Existing HTML docs are candidates for conversion to RST by anyone interested. Daniel P. Berrangé (6): docs: split TLS certificate setup into its own file docs: move docs about remote driver URIs into URI docs build: introduce rst2html as a mandatory build tool docs: adapt filling of <head> section for rst2html output docs: add a kbase page about RPM packaging options docs: add page describing the libvirt daemons .gitignore | 1 + docs/Makefile.am | 21 +- docs/daemons.rst | 209 +++++++++++ docs/docs.html.in | 6 + docs/kbase.html.in | 4 + docs/kbase/rpm-deployment.rst | 410 ++++++++++++++++++++ docs/page.xsl | 4 +- docs/remote.html.in | 684 +--------------------------------- docs/tlscerts.html.in | 413 ++++++++++++++++++++ docs/uri.html.in | 263 +++++++++++-- libvirt.spec.in | 2 + m4/virt-external-programs.m4 | 5 + mingw-libvirt.spec.in | 1 + 13 files changed, 1309 insertions(+), 714 deletions(-) create mode 100644 docs/daemons.rst create mode 100644 docs/kbase/rpm-deployment.rst create mode 100644 docs/tlscerts.html.in -- 2.23.0

4 16

[libvirt] [PATCH 0/9] Remove remaining usage of VIR_STR(N)DUP (glib chronicles)
by Ján Tomko 13 Nov '19

13 Nov '19

Almost. Patch 8/9 depends on Jirka removing VIR_STRNDUP in [PATCH v3 04/52] conf: Drop nameLen parameter from virDomainCapsCPUModelsAdd https://www.redhat.com/archives/libvir-list/2019-November/msg00068.html Ján Tomko (9): Remove VIR_STRDUP usage that snuck in Remove VIR_STRNDUP usage that passes -1 Remove VIR_STRNDUP usage that subtracts from a non-NULL pointer Remove VIR_STRNDUP usage with checked pointers Remove VIR_STRNDUP usage with subtraction Remove the rest of VIR_STRNDUP tests: delete tests for VIR_STR(N)DUP util: remove VIR_STRDUP and VIR_STRNDUP docs: hacking: document removal of VIR_STR(N)DUP docs/hacking.html.in | 10 +- src/bhyve/bhyve_parse_command.c | 44 +++-- src/conf/nwfilter_conf.c | 4 +- src/conf/nwfilter_params.c | 6 +- src/interface/interface_backend_udev.c | 8 +- src/libvirt_private.syms | 2 - src/libxl/xen_common.c | 44 +++-- src/libxl/xen_xl.c | 6 +- src/libxl/xen_xm.c | 9 +- src/lxc/lxc_driver.c | 3 +- src/qemu/qemu_domain.c | 9 +- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_monitor_json.c | 11 +- src/remote/remote_driver.c | 6 +- src/rpc/virnetlibsshsession.c | 7 +- src/storage/storage_backend_logical.c | 7 +- src/util/vircgroupv1.c | 5 +- src/util/vircommand.c | 5 +- src/util/virconf.c | 24 +-- src/util/viriscsi.c | 3 +- src/util/virjson.c | 11 +- src/util/virkeyfile.c | 9 +- src/util/virsocketaddr.c | 5 +- src/util/virstoragefile.c | 6 +- src/util/virstring.c | 56 +----- src/util/virstring.h | 69 ------- src/util/virsysinfo.c | 244 ++++++++++++------------- src/vmware/vmware_conf.c | 6 +- tests/virstringtest.c | 136 -------------- tools/vsh.c | 5 +- 30 files changed, 218 insertions(+), 545 deletions(-) -- 2.21.0

2 18

[libvirt] [rust PATCH] api_tests.py: Fix all issues reported by flake8
by Andrea Bolognani 13 Nov '19

13 Nov '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tools/api_tests.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/api_tests.py b/tools/api_tests.py index 9e66c92..7f0e3cb 100644 --- a/tools/api_tests.py +++ b/tools/api_tests.py @@ -6,36 +6,39 @@ import xml.etree.ElementTree import sys -LIBVIRT_API_FILE="/usr/share/libvirt/api/libvirt-api.xml" +LIBVIRT_API_FILE = "/usr/share/libvirt/api/libvirt-api.xml" MY_PATH = os.path.dirname(os.path.realpath(__file__)) SRC_PATH = MY_PATH + "/../src" + def get_api_symbols(doc): funcs = doc.iter('function') macros = doc.iter('macro') enums = doc.iter('enum') return funcs, macros, enums + def get_sources(): return glob.glob(SRC_PATH + "/*.rs") + def match(el, content): return content.find(el) >= 0 + def main(): filter_by = "" if len(sys.argv) > 1: filter_by = sys.argv[1] - + doc = xml.etree.ElementTree.parse(LIBVIRT_API_FILE).getroot() implemented = set([]) missing = set([]) for el in doc.iter('function'): - - if el.get('name').startswith(filter_by): # What i'm looking for? - + if el.get('name').startswith(filter_by): # What I'm looking for + status = False for source in get_sources(): f = open(source) @@ -51,13 +54,10 @@ def main(): print("missing:") for x in missing: print(x.attrib) - #print "implemented:" - #for x in implemented: - # print x.attrib - + # print "implemented:" + # for x in implemented: + # print x.attrib + if __name__ == '__main__': main() - - - -- 2.23.0

2 1

[libvirt] [rust PATCH] gitpublish: Fix subject prefix
by Andrea Bolognani 13 Nov '19

13 Nov '19

All libvirt-related projects, including language bindings, follow a certain convention for subject prefix, and there's no reason libvirt-rust should be any different. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitpublish | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitpublish b/.gitpublish index b42ee56..35191be 100644 --- a/.gitpublish +++ b/.gitpublish @@ -2,4 +2,4 @@ base = master to = libvir-list(a)redhat.com cc = sahid.ferdjaoui(a)canonical.com -prefix = PATCH Rust +prefix = rust PATCH diff --git a/README.md b/README.md index 93cd461..76acef5 100644 --- a/README.md +++ b/README.md @@ -78,14 +78,14 @@ send a single patch ``` git send-email --to libvir-list(a)redhat.com --cc sahid.ferdjaoui(a)canonical.com \ - --subject-prefix "PATCH Rust" --smtp-server=$HOSTNAME -1 + --subject-prefix "rust PATCH" --smtp-server=$HOSTNAME -1 ``` Or to send all patches on the current branch, against master ``` git send-email --to libvir-list(a)redhat.com --cc sahid.ferdjaoui(a)canonical.com \ - --subject-prefix "PATCH Rust" --smtp-server=$HOSTNAME --no-chain-reply-to \ + --subject-prefix "rust PATCH" --smtp-server=$HOSTNAME --no-chain-reply-to \ --cover-letter --annotate master.. ``` -- 2.23.0

2 1

[libvirt] [PATCH Rust v2] api_tests.py: update to use Python 3
by Zixing Liu 13 Nov '19

13 Nov '19

Signed-off-by: Zixing Liu <liushuyu(a)aosc.io> --- tools/api_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/api_tests.py b/tools/api_tests.py index b26ec34..9e66c92 100644 --- a/tools/api_tests.py +++ b/tools/api_tests.py @@ -47,10 +47,10 @@ def main(): else: missing.add(el) - print "missing: %s, implemented: %s" % (len(missing), len(implemented)) - print "missing:" + print("missing: %s, implemented: %s" % (len(missing), len(implemented))) + print("missing:") for x in missing: - print x.attrib + print(x.attrib) #print "implemented:" #for x in implemented: # print x.attrib -- 2.24.0

2 1

[libvirt] [PATCH] locking: fix build with older sanlock
by Ján Tomko 13 Nov '19

13 Nov '19

../../src/locking/lock_driver_sanlock.c:106:17: error: incompatible pointer types assigning to 'char **' from 'char *' [-Werror,-Wincompatible-pointer-types] message = g_strdup_printf(_("sanlock error %d"), err); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: b1d58418aa5051c7aafa4519b332007e7c73c261 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as a build breaker fix. diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 87ba0fbfbb..c8936c301c 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -103,7 +103,7 @@ virLockManagerSanlockError(int err, #if HAVE_SANLOCK_STRERROR *message = g_strdup(sanlock_strerror(err)); #else - message = g_strdup_printf(_("sanlock error %d"), err); + *message = g_strdup_printf(_("sanlock error %d"), err); #endif return true; } else { -- 2.21.0

1 0

[libvirt] [PATCH 0/3] Update rebootTimeout range to 0..0xffff
by Han Han 13 Nov '19

13 Nov '19

Since qemu v4.0.0(commit ee5d0f89de3), reboot-timeout valid range was set 0~0xffff. Update libvirt codes, docs, tests for that change. I am not sure if po files should be updated. If so, please point it out. Han Han (3): conf: Set rebootTimeout valid range to 0..0xffff tests: Remove test reboot-timeout-disabled docs: Update docs on rebootTimeout valid value range docs/formatdomain.html.in | 5 ++-- src/conf/domain_conf.c | 6 ++-- .../reboot-timeout-disabled.args | 28 ------------------- .../reboot-timeout-disabled.xml | 24 ---------------- .../reboot-timeout-disabled.xml | 26 ----------------- 5 files changed, 6 insertions(+), 83 deletions(-) delete mode 100644 tests/qemuxml2argvdata/reboot-timeout-disabled.args delete mode 100644 tests/qemuxml2argvdata/reboot-timeout-disabled.xml delete mode 100644 tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml -- 2.20.1

3 11

[libvirt] [PATCH Rust v2] api_tests.py: update to use Python 3
by liushuyu 12 Nov '19

12 Nov '19

From: Zixing Liu <liushuyu011(a)gmail.com> Signed-off-by: Zixing Liu <liushuyu011(a)gmail.com> --- tools/api_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/api_tests.py b/tools/api_tests.py index b26ec34..9e66c92 100644 --- a/tools/api_tests.py +++ b/tools/api_tests.py @@ -47,10 +47,10 @@ def main(): else: missing.add(el) - print "missing: %s, implemented: %s" % (len(missing), len(implemented)) - print "missing:" + print("missing: %s, implemented: %s" % (len(missing), len(implemented))) + print("missing:") for x in missing: - print x.attrib + print(x.attrib) #print "implemented:" #for x in implemented: # print x.attrib -- 2.24.0

1 0

[libvirt] [PATCH Rust] api_tests.py: update to use Python 3
by liushuyu 12 Nov '19

12 Nov '19

From: liushuyu <liushuyu011(a)gmail.com> --- tools/api_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/api_tests.py b/tools/api_tests.py index b26ec34..9e66c92 100644 --- a/tools/api_tests.py +++ b/tools/api_tests.py @@ -47,10 +47,10 @@ def main(): else: missing.add(el) - print "missing: %s, implemented: %s" % (len(missing), len(implemented)) - print "missing:" + print("missing: %s, implemented: %s" % (len(missing), len(implemented))) + print("missing:") for x in missing: - print x.attrib + print(x.attrib) #print "implemented:" #for x in implemented: # print x.attrib -- 2.23.0

3 3

[libvirt] [PATCH] qemu: hotplug: ensure address generation for vfio-ccw
by Bjoern Walk 12 Nov '19

12 Nov '19

When attaching a mediated host device of model vfio-ccw without specifying a guest-address, none is generated by libvirt. Let's fix this and make sure to generate a device address during live-hotplug. Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com> --- src/qemu/qemu_hotplug.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fd4bafef..7b775159 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2790,6 +2790,8 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr driver, { int ret = -1; g_autofree char *devstr = NULL; + char *devName = NULL; + bool releaseaddr = false; bool added = false; bool teardowncgroup = false; bool teardownlabel = false; @@ -2805,6 +2807,10 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr driver, return -1; break; case VIR_MDEV_MODEL_TYPE_VFIO_CCW: + devName = hostdev->source.subsys.u.mdev.uuidstr; + if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, devName) < 0) + return -1; + break; case VIR_MDEV_MODEL_TYPE_LAST: break; } -- 2.21.0

3 7

[libvirt] NOTE: building libvirt requires srcdir != builddir now
by Daniel P. Berrangé 12 Nov '19

12 Nov '19

A quick heads up to people who are pulling latest libvirt this morning. Late on friday we pushed the series from Pavel which mandates that libvirt does a VPATH build. ie you can't build directly in the source tree, you must have a separate build directory. IOW, instead of doing ./autogen.sh make You must change to mkdir build cd build ../autogen.sh make "build" can be any directory you like, and doesn't have to be a subdir of the src checkout. Most built files now live outside the srcdir - we only have autotools related artifacts in srcdir now, and so the gitignore file is much simpler. 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 :|

2 1

[libvirt] [PATCH v1 00/21] remove 'cleanup: return' labels
by Daniel Henrique Barboza 12 Nov '19

12 Nov '19

Hi, This series is focused on removing most of the unused 'cleanup' labels that we have in the code so far (as of master commit 2cff65e4c6). I say 'most' because there's a handful of instances left that are being used by macros and other machinery that I judged it wasn't worth to deal with in the scope of this work. The motivations for this change are (1) less code to deal with and (2) a bit more clarity, since the presence of a 'cleanup' label should indicate a cleanup procedure (virObjectUnref and so on). The vast majority of the cases being handled here are variations of the following pattern: ----- (function header) int ret = -1; ( nothing is done with 'ret' in the function body, 'cleanup' calls are made on error conditions) ret = 0; cleanup: return ret; (end of function) ----- This pattern can be replaced by removing 'cleanup:' and 'ret', replacing it with 'return -1' on error conditions and 'return 0' on success. Other patterns were handled as well, but this is the most frequent one. I made an effort to *not* change or refactor the function logic in the attempt of removing labels. Patches were split by directory. If only one file in a dir got changed, the file is mentioned in the commit instead. There were not preparatory patches for these changes because they are intended to be somewhat simple. The one exception is patch 09. I chose to handle that case in a separated patch to not clutter the review of patch 10, but I expect it to be merged with the 'qemu' patch once it is reviewed. All these changes are available in [1]. [1] https://github.com/danielhb/libvirt/tree/clean_trivial_labels Daniel Henrique Barboza (21): conf: remove unneeded cleanup labels storage: remove unneeded cleanup labels nwfilter: remove unneeded cleanup labels remote: remove unneeded cleanup labels lxc: remove unneeded cleanup labels node_device: remove unneeded cleanup labels secret_driver.c: remove unneeded cleanup label openvz_conf.c: remove unneeded cleanup label qemu_monitor_json.c: remove unneeded cleanup label qemu: remove unneeded cleanup labels rpc: remove unneeded cleanup labels vz_sdk.c: remove unneeded cleanup label vbox: remove unneeded cleanup labels util: remove unneeded cleanup labels libvirt.c: remove unneeded cleanup label libxl_driver.c: remove unneeded cleanup label bridge_driver.c: remove unneeded cleanup labels suspend.c: remove unneeded cleanup label tools: remove unneeded cleanup labels tests: remove unneeded cleanup labels bhyve_device.c: remove unneeded cleanup labels examples/c/domain/suspend.c | 9 +- src/bhyve/bhyve_device.c | 18 +- src/conf/domain_addr.c | 23 +- src/conf/domain_capabilities.c | 21 +- src/conf/domain_conf.c | 334 ++++++++-------------- src/conf/netdev_bandwidth_conf.c | 17 +- src/conf/network_conf.c | 25 +- src/conf/node_device_conf.c | 28 +- src/conf/numa_conf.c | 25 +- src/conf/nwfilter_conf.c | 4 +- src/conf/storage_conf.c | 7 +- src/conf/virnetworkobj.c | 14 +- src/conf/virsecretobj.c | 5 +- src/libvirt.c | 7 +- src/libxl/libxl_driver.c | 16 +- src/lxc/lxc_cgroup.c | 70 ++--- src/lxc/lxc_container.c | 17 +- src/lxc/lxc_controller.c | 44 ++- src/lxc/lxc_driver.c | 39 +-- src/lxc/lxc_process.c | 34 +-- src/network/bridge_driver.c | 172 +++++------ src/node_device/node_device_driver.c | 11 +- src/node_device/node_device_udev.c | 8 +- src/nwfilter/nwfilter_ebiptables_driver.c | 132 ++++----- src/openvz/openvz_conf.c | 3 +- src/qemu/qemu_cgroup.c | 15 +- src/qemu/qemu_domain.c | 92 +++--- src/qemu/qemu_domain_address.c | 31 +- src/qemu/qemu_driver.c | 140 ++++----- src/qemu/qemu_hotplug.c | 45 ++- src/qemu/qemu_interface.c | 26 +- src/qemu/qemu_migration.c | 38 +-- src/qemu/qemu_monitor_json.c | 15 +- src/qemu/qemu_process.c | 77 ++--- src/qemu/qemu_tpm.c | 20 +- src/remote/remote_daemon.c | 38 ++- src/remote/remote_driver.c | 15 +- src/rpc/virnetserver.c | 15 +- src/rpc/virnetserverprogram.c | 13 +- src/rpc/virnetsocket.c | 9 +- src/rpc/virnettlscontext.c | 20 +- src/secret/secret_driver.c | 11 +- src/storage/storage_backend_fs.c | 13 +- src/storage/storage_backend_rbd.c | 58 ++-- src/storage/storage_backend_zfs.c | 21 +- src/storage/storage_driver.c | 38 +-- src/storage/storage_util.c | 18 +- src/util/vircgroupv1.c | 18 +- src/util/vircommand.c | 11 +- src/util/virdbus.c | 30 +- src/util/virfile.c | 19 +- src/util/virhash.c | 6 +- src/util/virhostcpu.c | 20 +- src/util/virhostdev.c | 7 +- src/util/virhostmem.c | 55 ++-- src/util/virjson.c | 30 +- src/util/virmacmap.c | 10 +- src/util/virnetdevbridge.c | 21 +- src/util/virnuma.c | 27 +- src/util/virpci.c | 7 +- src/util/virprocess.c | 19 +- src/util/virresctrl.c | 7 +- src/util/virstoragefile.c | 46 +-- src/util/virutil.c | 19 +- src/vbox/vbox_common.c | 12 +- src/vbox/vbox_snapshot_conf.c | 75 ++--- src/vz/vz_sdk.c | 8 +- tests/commandtest.c | 17 +- tests/domainconftest.c | 5 +- tests/networkxml2firewalltest.c | 13 +- tests/nsstest.c | 27 +- tests/nwfilterebiptablestest.c | 4 +- tests/nwfilterxml2firewalltest.c | 16 +- tests/qemuhotplugtest.c | 19 +- tests/qemuxml2argvtest.c | 11 +- tests/storagebackendsheepdogtest.c | 5 +- tests/virauthconfigtest.c | 11 +- tests/vircgroupmock.c | 11 +- tests/virendiantest.c | 58 ++-- tests/virkeycodetest.c | 14 +- tests/virmacmaptest.c | 5 +- tests/virnetdevtest.c | 11 +- tests/virpcimock.c | 31 +- tests/virpcitest.c | 3 +- tests/virpolkittest.c | 65 ++--- tests/virstringtest.c | 18 +- tools/virsh-completer-network.c | 8 +- tools/virsh-domain.c | 41 +-- tools/vsh.c | 14 +- 89 files changed, 983 insertions(+), 1722 deletions(-) -- 2.21.0

2 44

[libvirt] [PATCH 0/7] util: buffer: Simplify child buffer init
by Peter Krempa 12 Nov '19

12 Nov '19

This applies on top of https://www.redhat.com/archives/libvir-list/2019-November/msg00397.html Peter Krempa (7): util: buffer: Add init macro for automatically setting child XML indent qemu: domain: Convert child buffers to use VIR_BUFFER_INIT_CHILD util: sysinfo: Convert child buffers to use VIR_BUFFER_INIT_CHILD conf: caps: sysinfo: Convert child buffers to use VIR_BUFFER_INIT_CHILD conf: cpu: Convert child buffers to use VIR_BUFFER_INIT_CHILD conf: domain: Convert child buffers to use VIR_BUFFER_INIT_CHILD util: buffer: remove virBufferSetChildIndent src/conf/capabilities.c | 13 ++---- src/conf/cpu_conf.c | 3 +- src/conf/domain_conf.c | 101 +++++++++++----------------------------- src/qemu/qemu_domain.c | 35 ++++---------- src/util/virbuffer.h | 18 +++---- src/util/virsysinfo.c | 4 +- 6 files changed, 52 insertions(+), 122 deletions(-) -- 2.23.0

2 8

[libvirt] [PATCH 0/3] capabilities: Sanitize handling of 'features'
by Peter Krempa 12 Nov '19

12 Nov '19

Peter Krempa (3): schema: capabilities: Add 'hap' feature flag conf: Refactor storage of guest capabilities conf: capabilities: Refactor API for setting guest capability features docs/schemas/capability.rng | 6 + src/conf/capabilities.c | 149 +++++++++++++-------- src/conf/capabilities.h | 35 +++-- src/libvirt_private.syms | 1 + src/libxl/libxl_capabilities.c | 46 ++----- src/qemu/qemu_capabilities.c | 34 ++--- src/test/test_driver.c | 6 +- tests/qemucaps2xmloutdata/caps.aarch64.xml | 2 +- tests/qemucaps2xmloutdata/caps.x86_64.xml | 4 +- tests/testutilsqemu.c | 6 +- 10 files changed, 156 insertions(+), 133 deletions(-) -- 2.23.0

2 5

[libvirt] [PATCH v2] Add API to change qemu agent response timeout
by Jonathon Jongsma 12 Nov '19

12 Nov '19

Some layered products such as oVirt have requested a way to avoid being blocked by guest agent commands when querying a loaded vm. For example, many guest agent commands are polled periodically to monitor changes, and rather than blocking the calling process, they'd prefer to simply time out when an agent query is taking too long. This patch adds a way for the user to specify a custom agent timeout that is applied to all agent commands. One special case to note here is the 'guest-sync' command. 'guest-sync' is issued internally prior to calling any other command. (For example, when libvirt wants to call 'guest-get-fsinfo', we first call 'guest-sync' and then call 'guest-get-fsinfo'). Previously, the 'guest-sync' command used a 5-second timeout (VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT), whereas the actual command that followed always blocked indefinitely (VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK). As part of this patch, if a custom timeout is specified that is shorter than 5 seconds, this new timeout is also used for 'guest-sync'. If there is no custom timeout or if the custom timeout is longer than 5 seconds, we will continue to use the 5-second timeout. See https://bugzilla.redhat.com/show_bug.cgi?id=1705426 for additional details. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- I've addressed most of the previous review comments from Peter, Daniel, and Michal but I'm unsure yet whether there's concensus on this feature. Here's a v2 for your consideration. I admit that the proposed API is not perfect. It would probably be more elegant if each agent command instead had its own 'timeout' argument so that the caller could specify the timeout for each invocation. But that is not the case, and introducing duplicate API for each agent command (with an additional timeout argument) would clutter the public API. In addition, we still have the issue Michal mentioned elsewhere in the thread where some commands like shutdown may or may not use the agent, so a timeout argument could be confusing. So: is this a viable approach, or should I rethink it? Changes in v2: - Make this an official public API rather than putting it in libvirt-qemu. - Don't use the qemuDomainObjEnterAgent()/ExitAgent() API, which expects you to acquire an agent job. Instead, introduce qemuDomainObjSetAgentResponseTimeout() which simply locks the agent while setting the variable. - rename the function slightly for better descriptiveness: virDomainQemuAgentSetTimeout() -> virDomainAgentSetResponseTimeout() - added 'flags' argument for future-proofing. include/libvirt/libvirt-domain.h | 9 ++++ include/libvirt/libvirt-qemu.h | 8 +-- src/driver-hypervisor.h | 6 +++ src/libvirt-domain.c | 45 +++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_agent.c | 84 ++++++++++++++++++++------------ src/qemu/qemu_agent.h | 4 ++ src/qemu/qemu_domain.c | 15 ++++++ src/qemu/qemu_domain.h | 5 ++ src/qemu/qemu_driver.c | 22 +++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 18 ++++++- src/remote_protocol-structs | 9 ++++ 13 files changed, 190 insertions(+), 37 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 22277b0a84..83f6c1b835 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4916,4 +4916,13 @@ int virDomainGetGuestInfo(virDomainPtr domain, int *nparams, unsigned int flags); +typedef enum { + VIR_DOMAIN_AGENT_COMMAND_BLOCK = -2, + VIR_DOMAIN_AGENT_COMMAND_DEFAULT = -1, + VIR_DOMAIN_AGENT_COMMAND_NOWAIT = 0, +} virDomainAgentCommandTimeoutValues; +int virDomainAgentSetResponseTimeout(virDomainPtr domain, + int timeout, + unsigned int flags); + #endif /* LIBVIRT_DOMAIN_H */ diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index 891617443f..4a541167ad 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -43,10 +43,10 @@ virDomainPtr virDomainQemuAttach(virConnectPtr domain, unsigned int flags); typedef enum { - VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN = -2, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK = -2, - VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT = -1, - VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT = 0, + VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN = VIR_DOMAIN_AGENT_COMMAND_BLOCK, + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK = VIR_DOMAIN_AGENT_COMMAND_BLOCK, + VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT = VIR_DOMAIN_AGENT_COMMAND_DEFAULT, + VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT = VIR_DOMAIN_AGENT_COMMAND_NOWAIT, VIR_DOMAIN_QEMU_AGENT_COMMAND_SHUTDOWN = 60, } virDomainQemuAgentCommandTimeoutValues; diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index 015b2cd01c..4afd8f6ec5 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -1372,6 +1372,11 @@ typedef int int *nparams, unsigned int flags); +typedef int +(*virDrvDomainAgentSetResponseTimeout)(virDomainPtr domain, + int timeout, + unsigned int flags); + typedef struct _virHypervisorDriver virHypervisorDriver; typedef virHypervisorDriver *virHypervisorDriverPtr; @@ -1632,4 +1637,5 @@ struct _virHypervisorDriver { virDrvDomainCheckpointGetParent domainCheckpointGetParent; virDrvDomainCheckpointDelete domainCheckpointDelete; virDrvDomainGetGuestInfo domainGetGuestInfo; + virDrvDomainAgentSetResponseTimeout domainAgentSetResponseTimeout; }; diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index dcab179e6e..b4e1b18164 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12497,3 +12497,48 @@ int virDomainGetLaunchSecurityInfo(virDomainPtr domain, virDispatchError(domain->conn); return -1; } + +/** + * virDomainAgentSetResponseTimeout: + * @domain: a domain object + * @timeout: timeout in seconds + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Set how long to wait for a response from qemu agent commands. By default, + * agent commands block forever waiting for a response. + * + * @timeout must be -2, -1, 0 or positive. + * VIR_DOMAIN_AGENT_COMMAND_BLOCK(-2): meaning to block forever waiting for a + * result. + * VIR_DOMAIN_AGENT_COMMAND_DEFAULT(-1): use default timeout value. + * VIR_DOMAIN_AGENT_COMMAND_NOWAIT(0): does not wait. + * positive value: wait for @timeout seconds + * + * Returns 0 on success, -1 on failure + */ +int +virDomainAgentSetResponseTimeout(virDomainPtr domain, + int timeout, + unsigned int flags) +{ + virConnectPtr conn; + VIR_DOMAIN_DEBUG(domain, "timeout=%i, flags=0x%x", + timeout, flags); + + virResetLastError(); + + virCheckDomainReturn(domain, -1); + conn = domain->conn; + + if (conn->driver->domainAgentSetResponseTimeout) { + if (conn->driver->domainAgentSetResponseTimeout(domain, timeout, flags) < 0) + goto error; + return 0; + } + + virReportUnsupportedError(); + + error: + virDispatchError(conn); + return -1; +} diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 40655fbbf5..74d5e0b4b9 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -859,6 +859,7 @@ LIBVIRT_5.7.0 { LIBVIRT_5.8.0 { virConnectSetIdentity; + virDomainAgentSetResponseTimeout; } LIBVIRT_5.7.0; # .... define new API here using predicted next version number .... diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 4b914e6d3b..c2f9a025ba 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -127,6 +127,7 @@ struct _qemuAgent { * but fire up an event on qemu monitor instead. * Take that as indication of successful completion */ qemuAgentEvent await_event; + int timeout; }; static virClassPtr qemuAgentClass; @@ -695,6 +696,8 @@ qemuAgentOpen(virDomainObjPtr vm, if (!(mon = virObjectLockableNew(qemuAgentClass))) return NULL; + /* agent commands block by default, user can choose different behavior */ + mon->timeout = VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK; mon->fd = -1; if (virCondInit(&mon->notify) < 0) { virReportSystemError(errno, "%s", @@ -907,6 +910,12 @@ qemuAgentGuestSync(qemuAgentPtr mon) int send_ret; unsigned long long id; qemuAgentMessage sync_msg; + int timeout = VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT; + + /* if user specified a custom agent timeout that is lower than the + * default timeout, use the shorter timeout instead */ + if ((mon->timeout >= 0) && (mon->timeout < timeout)) + timeout = mon->timeout; memset(&sync_msg, 0, sizeof(sync_msg)); /* set only on first sync */ @@ -927,8 +936,7 @@ qemuAgentGuestSync(qemuAgentPtr mon) VIR_DEBUG("Sending guest-sync command with ID: %llu", id); - send_ret = qemuAgentSend(mon, &sync_msg, - VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT); + send_ret = qemuAgentSend(mon, &sync_msg, timeout); VIR_DEBUG("qemuAgentSend returned: %d", send_ret); @@ -1304,8 +1312,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon, const char **mountpoints, if (!cmd) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { @@ -1342,8 +1349,7 @@ int qemuAgentFSThaw(qemuAgentPtr mon) if (!cmd) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { @@ -1380,8 +1386,7 @@ qemuAgentSuspend(qemuAgentPtr mon, return -1; mon->await_event = QEMU_AGENT_EVENT_SUSPEND; - ret = qemuAgentCommand(mon, cmd, &reply, false, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); + ret = qemuAgentCommand(mon, cmd, &reply, false, mon->timeout); virJSONValueFree(cmd); virJSONValueFree(reply); @@ -1437,8 +1442,7 @@ qemuAgentFSTrim(qemuAgentPtr mon, if (!cmd) return ret; - ret = qemuAgentCommand(mon, cmd, &reply, false, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); + ret = qemuAgentCommand(mon, cmd, &reply, false, mon->timeout); virJSONValueFree(cmd); virJSONValueFree(reply); @@ -1459,8 +1463,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-vcpus", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (!(data = virJSONValueObjectGetArray(reply, "return"))) { @@ -1575,8 +1578,7 @@ qemuAgentSetVCPUsCommand(qemuAgentPtr mon, NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; /* All negative values are invalid. Return of 0 is bogus since we wouldn't @@ -1731,8 +1733,7 @@ qemuAgentGetHostname(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) ret = -2; goto cleanup; @@ -1776,8 +1777,7 @@ qemuAgentGetTime(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (virJSONValueObjectGetNumberUlong(reply, "return", &json_time) < 0) { @@ -1842,8 +1842,7 @@ qemuAgentSetTime(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; ret = 0; @@ -2046,8 +2045,7 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) ret = -2; goto cleanup; @@ -2336,8 +2334,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (!(ret_array = virJSONValueObjectGet(reply, "return"))) { @@ -2514,8 +2511,7 @@ qemuAgentSetUserPassword(qemuAgentPtr mon, NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; ret = 0; @@ -2546,8 +2542,7 @@ qemuAgentGetUsers(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-users", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) return -2; return -1; @@ -2636,8 +2631,7 @@ qemuAgentGetOSInfo(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-osinfo", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) return -2; return -1; @@ -2692,8 +2686,7 @@ qemuAgentGetTimezone(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-timezone", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) return -2; return -1; @@ -2722,3 +2715,30 @@ qemuAgentGetTimezone(qemuAgentPtr mon, return 0; } + +/* qemuAgentSetResponseTimeout: + * mon: agent monitor + * timeout: number of seconds to wait for agent response + * flags: currently unused. Must pass 0 + * + * the agent object must be locked prior to calling this function + * + * Returns: 0 on success + * -1 otherwise + */ +int +qemuAgentSetResponseTimeout(qemuAgentPtr mon, + int timeout, + unsigned int flags G_GNUC_UNUSED) +{ + if (timeout < VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN) { + virReportError(VIR_ERR_INVALID_ARG, + _("guest agent timeout '%d' is " + "less than the minimum '%d'"), + timeout, VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN); + return -1; + } + + mon->timeout = timeout; + return 0; +} diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 78e648992a..88ead4762a 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -140,3 +140,7 @@ int qemuAgentGetTimezone(qemuAgentPtr mon, virTypedParameterPtr *params, int *nparams, int *maxparams); + +int qemuAgentSetResponseTimeout(qemuAgentPtr mon, + int timeout, + unsigned int flags); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 667cc89072..40d0401e79 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -15564,3 +15564,18 @@ qemuDomainSupportsCheckpointsBlockjobs(virDomainObjPtr vm) return 0; } + +int qemuDomainObjSetAgentResponseTimeout(virDomainObjPtr vm, + int timeout, + unsigned int flags) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + qemuAgentPtr agent = priv->agent; + int ret; + + virObjectLock(agent); + ret = qemuAgentSetResponseTimeout(agent, timeout, flags); + virObjectUnlock(agent); + + return ret; +} diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b23912ee98..34af55ef45 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -1225,3 +1225,8 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net, int qemuDomainSupportsCheckpointsBlockjobs(virDomainObjPtr vm) G_GNUC_WARN_UNUSED_RESULT; + +int +qemuDomainObjSetAgentResponseTimeout(virDomainObjPtr vm, + int seconds, + unsigned int flags); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d17c18705b..68f7b65d81 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -22654,6 +22654,27 @@ qemuDomainGetGuestInfo(virDomainPtr dom, return ret; } +static int +qemuDomainAgentSetResponseTimeout(virDomainPtr dom, + int timeout, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + if (!(vm = qemuDomainObjFromDomain(dom))) + goto cleanup; + + if (virDomainAgentSetResponseTimeoutEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + ret = qemuDomainObjSetAgentResponseTimeout(vm, timeout, flags); + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + static virHypervisorDriver qemuHypervisorDriver = { .name = QEMU_DRIVER_NAME, .connectURIProbe = qemuConnectURIProbe, @@ -22890,6 +22911,7 @@ static virHypervisorDriver qemuHypervisorDriver = { .domainCheckpointGetParent = qemuDomainCheckpointGetParent, /* 5.6.0 */ .domainCheckpointDelete = qemuDomainCheckpointDelete, /* 5.6.0 */ .domainGetGuestInfo = qemuDomainGetGuestInfo, /* 5.7.0 */ + .domainAgentSetResponseTimeout = qemuDomainAgentSetResponseTimeout, /* 5.8.0 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 83477243fc..77edf0b4c4 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8710,6 +8710,7 @@ static virHypervisorDriver hypervisor_driver = { .domainCheckpointGetParent = remoteDomainCheckpointGetParent, /* 5.6.0 */ .domainCheckpointDelete = remoteDomainCheckpointDelete, /* 5.6.0 */ .domainGetGuestInfo = remoteDomainGetGuestInfo, /* 5.7.0 */ + .domainAgentSetResponseTimeout = remoteDomainAgentSetResponseTimeout, /* 5.8.0 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index f4e3392212..23e42d17b1 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3744,6 +3744,16 @@ struct remote_connect_set_identity_args { unsigned int flags; }; +struct remote_domain_agent_set_response_timeout_args { + remote_nonnull_domain dom; + int timeout; + unsigned int flags; +}; + +struct remote_domain_agent_set_response_timeout_ret { + int result; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -6617,5 +6627,11 @@ enum remote_procedure { * @generate: client * @acl: connect:write */ - REMOTE_PROC_CONNECT_SET_IDENTITY = 419 + REMOTE_PROC_CONNECT_SET_IDENTITY = 419, + + /** + * @generate: both + * @acl: domain:write + */ + REMOTE_PROC_DOMAIN_AGENT_SET_RESPONSE_TIMEOUT = 420 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 51606e7473..9ad7a857e0 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -3114,6 +3114,14 @@ struct remote_connect_set_identity_args { } params; u_int flags; }; +struct remote_domain_agent_set_response_timeout_args { + remote_nonnull_domain dom; + int timeout; + u_int flags; +}; +struct remote_domain_agent_set_response_timeout_ret { + int result; +}; enum remote_procedure { REMOTE_PROC_CONNECT_OPEN = 1, REMOTE_PROC_CONNECT_CLOSE = 2, @@ -3534,4 +3542,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_CHECKPOINT_DELETE = 417, REMOTE_PROC_DOMAIN_GET_GUEST_INFO = 418, REMOTE_PROC_CONNECT_SET_IDENTITY = 419, + REMOTE_PROC_DOMAIN_AGENT_SET_RESPONSE_TIMEOUT = 420, }; -- 2.21.0

3 5

[libvirt] [PATCH] docs: hacking: add missing code element
by Ján Tomko 12 Nov '19

12 Nov '19

Wrap the 'g_renew()' call for VIR_SHRINK_N in <code>. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. docs/hacking.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 5d13e4f71d..06deab9e90 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -1056,7 +1056,7 @@ BAD: <td>the newly added memory is not zeroed</td></tr> <tr><td><code>VIR_EXPAND_N</code></td><td><code>g_renew(var_t, ptr, n)</code></td> <td>zero the new memory manually or use an array type</td></tr> - <tr><td><code>VIR_SHRINK_N</code></td><td>g_renew(var_t, ptr, n)</td> + <tr><td><code>VIR_SHRINK_N</code></td><td><code>g_renew(var_t, ptr, n)</code></td> <td></td></tr> <tr><td><code>VIR_APPEND_ELEMENT</code></td><td><code>g_array_append_val</code></td> <td><code>g_ptr_array_add</code> or <code>g_byte_array_append</code></td></tr> -- 2.21.0

1 0

Re: [libvirt] [PATCH 00/75] Drop virAsprintf() in favor of g_strdup_printf()
by Michal Privoznik 12 Nov '19

12 Nov '19

On 11/11/19 12:00 AM, Daniel Henrique Barboza wrote: > Hey, > > On 10/22/19 10:57 AM, Michal Privoznik wrote: >> You can find these also on my github: >> >> https://github.com/zippy2/libvirt/tree/virasprintf_void >> >> Good luck. > > > What's the status on this? I am waiting this big boy to land upstream so > I can rebase and re-sent some stuff. > Sorry for the delay. We've been to KVM Forum and then I had to go through backlog. Anyway, this is not pushed. Thanks for all reviews. Michal

1 0

[libvirt] [PATCH] qemu: driver: Remove unused 'driver' from qemuDomainSnapshotFSFreeze/Thaw
by Peter Krempa 12 Nov '19

12 Nov '19

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45363b0d6d..982a7d61cf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14496,8 +14496,7 @@ qemuDomainMigrateStartPostCopy(virDomainPtr dom, * is sent but failed, and number of frozen filesystems on success. If -2 is * returned, FSThaw should be called revert the quiesced status. */ static int -qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver G_GNUC_UNUSED, - virDomainObjPtr vm, +qemuDomainSnapshotFSFreeze(virDomainObjPtr vm, const char **mountpoints, unsigned int nmountpoints) { @@ -14516,8 +14515,7 @@ qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver G_GNUC_UNUSED, /* Return -1 on error, otherwise number of thawed filesystems. */ static int -qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver G_GNUC_UNUSED, - virDomainObjPtr vm, +qemuDomainSnapshotFSThaw(virDomainObjPtr vm, bool report) { qemuAgentPtr agent; @@ -15617,7 +15615,7 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr driver, goto cleanup; } - freeze = qemuDomainSnapshotFSFreeze(driver, vm, NULL, 0); + freeze = qemuDomainSnapshotFSFreeze(vm, NULL, 0); qemuDomainObjEndAgentJob(vm); if (freeze < 0) { @@ -15746,7 +15744,7 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr driver, if (thaw != 0 && qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) >= 0 && virDomainObjIsActive(vm)) { - if (qemuDomainSnapshotFSThaw(driver, vm, ret == 0 && thaw > 0) < 0) { + if (qemuDomainSnapshotFSThaw(vm, ret == 0 && thaw > 0) < 0) { /* helper reported the error, if it was needed */ if (thaw > 0) ret = -1; @@ -20297,7 +20295,7 @@ qemuDomainFSFreeze(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - ret = qemuDomainSnapshotFSFreeze(driver, vm, mountpoints, nmountpoints); + ret = qemuDomainSnapshotFSFreeze(vm, mountpoints, nmountpoints); endjob: qemuDomainObjEndAgentJob(vm); @@ -20338,7 +20336,7 @@ qemuDomainFSThaw(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - ret = qemuDomainSnapshotFSThaw(driver, vm, true); + ret = qemuDomainSnapshotFSThaw(vm, true); endjob: qemuDomainObjEndAgentJob(vm); -- 2.23.0

2 1

[libvirt] [PATCH] src: Wrap long lines in Makefiles
by Michal Privoznik 12 Nov '19

12 Nov '19

In my previous commit of v5.9.0-83-g4ae7181376 I've fixed check-aclrules but whilst doing so, I forgot to wrap long lines that I've added. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/interface/Makefile.inc.am | 3 ++- src/network/Makefile.inc.am | 4 +++- src/nwfilter/Makefile.inc.am | 4 +++- src/secret/Makefile.inc.am | 4 +++- src/storage/Makefile.inc.am | 4 +++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 7353bc4c82..34acdb7566 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -9,7 +9,8 @@ INTERFACE_DRIVER_NETCF_SOURCES = interface/interface_backend_netcf.c INTERFACE_DRIVER_UDEV_SOURCES = interface/interface_backend_udev.c DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) -STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) +STATEFUL_DRIVER_SOURCE_FILES += \ + $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) EXTRA_DIST += \ $(INTERFACE_DRIVER_SOURCES) \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 354c130f35..1cef1c7bce 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -17,7 +17,9 @@ NETWORK_LEASES_HELPER_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) -STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) +STATEFUL_DRIVER_SOURCE_FILES += \ + $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) + EXTRA_DIST += \ $(NETWORK_DRIVER_SOURCES) \ $(NETWORK_DRIVER_PLATFORM_INC) \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 7b57df3813..b51c8a5cda 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -19,7 +19,9 @@ NWFILTER_DRIVER_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) -STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) +STATEFUL_DRIVER_SOURCE_FILES += \ + $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) + EXTRA_DIST += $(NWFILTER_DRIVER_SOURCES) if WITH_NWFILTER diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 1ecea1ed4a..959d21099d 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -12,7 +12,9 @@ SECRET_UTIL_SOURCES = \ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) -STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) +STATEFUL_DRIVER_SOURCE_FILES += \ + $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) + EXTRA_DIST += \ $(SECRET_DRIVER_SOURCES) \ $(SECRET_UTIL_SOURCES) \ diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 588df60652..3d453029a7 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -89,7 +89,9 @@ STORAGE_HELPER_DISK_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) -STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) +STATEFUL_DRIVER_SOURCE_FILES += \ + $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) + EXTRA_DIST += \ $(STORAGE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_FS_SOURCES) \ -- 2.23.0

1 0

[libvirt] [PATCH] spec: fix vpath build on RHEL 7
by Pavel Hrdina 12 Nov '19

12 Nov '19

Macro _vpath_builddir is not defined so we have to define it ourselves. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- libvirt.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index eb8b2df055..2374668722 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -36,6 +36,11 @@ %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x %endif +# On RHEL 7 and older macro _vpath_builddir is not defined. +%if 0%{?rhel} <= 7 + %define _vpath_builddir %{_target_platform} +%endif + %ifarch %{qemu_kvm_arches} %define with_qemu_kvm %{with_qemu} %else -- 2.23.0

2 1

[libvirt] [PATCH 00/10] conf/caps: Modernize and clean up handling of domain caps
by Peter Krempa 12 Nov '19

12 Nov '19

Peter Krempa (10): qemu: caps: Rework memory allocation in virQEMUCapsFillDomainFeatureSEVCaps qemu: caps: Make capability filler functions void conf: domaincaps: Fix broken attempt at being const-correct conf: storagecaps: Fix broken attempt at being const-correct conf: Rename virDomainCapsFeature to virDomainProcessCapsFeature conf: caps: Automaticaly free 'cpus_str' conf: domain: Split up formatting of <memtune> and <memoryBacking> conf: turn virDomainMemtuneFormat void conf: caps: Modernize virCapabilitiesFormatCaches conf: capabilities: Modernize virCapabilitiesFormatMemoryBandwidth src/conf/capabilities.c | 36 +++++---------- src/conf/domain_capabilities.c | 32 ++++++------- src/conf/domain_capabilities.h | 4 +- src/conf/domain_conf.c | 30 ++++++------ src/conf/domain_conf.h | 82 ++++++++++++++++----------------- src/conf/storage_capabilities.c | 4 +- src/conf/storage_capabilities.h | 2 +- src/libvirt_private.syms | 2 +- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_container.c | 20 ++++---- src/lxc/lxc_native.c | 4 +- src/qemu/qemu_capabilities.c | 81 +++++++++++--------------------- 12 files changed, 132 insertions(+), 167 deletions(-) -- 2.23.0

3 17

[libvirt] [PATCH 0/6] qemu: Fix "Property '.pconfig' not found" error
by Jiri Denemark 12 Nov '19

12 Nov '19

The pconfig feature was enabled in QEMU by accident in 3.1.0. All other newer versions do not support it and it was removed from the Icelake-Server CPU model in QEMU. We don't normally change our CPU models even when QEMU does so to avoid breaking migrations between different versions of libvirt. But we can safely do so in this specific case. QEMU never supported enabling pconfig so any domain which was able to start has pconfig disabled. With a small compatibility hack which explicitly disables pconfig when CPU model equals Icelake-Server in migratable domain definition, only one migration scenario stays broken (and there's nothing we can do about it): from any host to a host with libvirt < 5.10.0 and QEMU > 3.1.0. https://bugzilla.redhat.com/show_bug.cgi?id=1749672 Jiri Denemark (6): cpu_conf: Pass policy to CPU feature filtering callbacks qemuxml2*test: Add tests for Icelake-Server,-pconfig qemu: Drop disabled CPU features unknown to QEMU cpu_map: Drop comments about ospke cputest: Add data for Ice Lake Server CPU cpu_map: Drop pconfig from Icelake-Server CPU model src/conf/cpu_conf.c | 6 +- src/conf/cpu_conf.h | 1 + src/cpu/cpu_x86.c | 13 +- src/cpu/cpu_x86.h | 2 + src/cpu_map/x86_Cascadelake-Server.xml | 2 - src/cpu_map/x86_Icelake-Client.xml | 2 - src/cpu_map/x86_Icelake-Server.xml | 3 - src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 23 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_migration_cookie.c | 3 + src/qemu/qemu_process.c | 32 + tests/cputest.c | 1 + .../x86_64-cpuid-Ice-Lake-Server-disabled.xml | 7 + .../x86_64-cpuid-Ice-Lake-Server-enabled.xml | 10 + .../x86_64-cpuid-Ice-Lake-Server-guest.xml | 35 + .../x86_64-cpuid-Ice-Lake-Server-host.xml | 36 + .../x86_64-cpuid-Ice-Lake-Server-json.xml | 16 + .../x86_64-cpuid-Ice-Lake-Server.json | 1142 +++++++++++++++++ .../x86_64-cpuid-Ice-Lake-Server.sig | 4 + .../x86_64-cpuid-Ice-Lake-Server.xml | 65 + ...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 34 + ...-Icelake-Server-pconfig.x86_64-latest.args | 34 + .../cpu-Icelake-Server-pconfig.xml | 22 + tests/qemuxml2argvtest.c | 3 + ...pu-Icelake-Server-pconfig.x86_64-3.1.0.xml | 31 + ...u-Icelake-Server-pconfig.x86_64-latest.xml | 31 + tests/qemuxml2xmltest.c | 3 + 29 files changed, 1555 insertions(+), 11 deletions(-) create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.json create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.xml create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml create mode 100644 tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml create mode 100644 tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml -- 2.24.0

2 8

[libvirt] [PATCH 0/2] First round of out-of-tree build fixes
by Michal Privoznik 12 Nov '19

12 Nov '19

Some low hanging fruit here. There are more serious issues that I yet have to figure out: 1) docs/ is broken. Just open any site from your build directory. Our main.js lives in the source dir but we are trying to load it relative to build dir 2) Generation of acl.html is broken - it assumes aclperms.htmlinc file lives under $srcdir which is not true anymore => page that's generated is useless 3) I've tried to update Gentoo live ebuild, but it failed to compile: Making all in src make[2]: Entering directory '/var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999_build/src' ... /usr/bin/perl /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/genpolkit.pl < /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/viraccessperm.h > access/org.libvirt.api.policy || rm -f access/org.libvirt.api.policy /usr/bin/perl -w /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/rpc/gendispatch.pl --mode=aclheader \ remote REMOTE /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/remote/remote_protocol.x \ > access/viraccessapicheck.h /bin/sh: access/org.libvirt.api.policy: No such file or directory The libvirt-9999_build/src/access dir doesn't exist (I'm surprised it wasn't created automatically by autotools since src/ was). I'll have to investigate further. Michal Prívozník (2): src: Make check-aclrules work again make check-driverimpls work again src/Makefile.am | 7 ++----- src/bhyve/Makefile.inc.am | 4 ++-- src/esx/Makefile.inc.am | 2 +- src/hyperv/Makefile.inc.am | 2 +- src/interface/Makefile.inc.am | 4 ++-- src/libxl/Makefile.inc.am | 4 ++-- src/lxc/Makefile.inc.am | 4 ++-- src/network/Makefile.inc.am | 4 ++-- src/node_device/Makefile.inc.am | 8 ++++---- src/nwfilter/Makefile.inc.am | 4 ++-- src/openvz/Makefile.inc.am | 2 +- src/phyp/Makefile.inc.am | 2 +- src/qemu/Makefile.inc.am | 4 ++-- src/remote/Makefile.inc.am | 2 +- src/secret/Makefile.inc.am | 4 ++-- src/storage/Makefile.inc.am | 4 ++-- src/test/Makefile.inc.am | 2 +- src/vbox/Makefile.inc.am | 4 ++-- src/vmware/Makefile.inc.am | 2 +- src/vz/Makefile.inc.am | 4 ++-- 20 files changed, 35 insertions(+), 38 deletions(-) -- 2.23.0

2 7

[libvirt] [PATCH] storage: Don't get src in each loop since src is not changed
by 李义 12 Nov '19

12 Nov '19

The src of pool is not changed in each loop, so don't VIR_FREE(src) and get when next iteration. Signed-off-by: Yi Li <yili(a)winhong.com> --- src/storage/storage_backend_fs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 02b8248..27c1098 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -258,10 +258,10 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) goto cleanup; } - while ((getmntent_r(mtab, &ent, buf, sizeof(buf))) != NULL) { - if (!(src = virStorageBackendFileSystemGetPoolSource(pool))) - goto cleanup; + if ((src = virStorageBackendFileSystemGetPoolSource(pool)) == NULL) + goto cleanup; + while ((getmntent_r(mtab, &ent, buf, sizeof(buf))) != NULL) { /* compare both mount destinations and sources to be sure the mounted * FS pool is really the one we're looking for */ @@ -273,8 +273,6 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) ret = 1; goto cleanup; } - - VIR_FREE(src); } ret = 0; -- 2.7.5

2 1

[libvirt] [PATCH 0/4] consolidate cgroup code that is duplicated between
by Mao Zhongyi 12 Nov '19

12 Nov '19

Both QEMU and LXC drivers have some duplicate code when dealing with cgroups, this serials mainly consolidate the same chunk of src/qemu/qemu_cgroup.c and src/lxc/lxc_cgroup.c into src/util/cgroup.c. Mao Zhongyi (4): lxc: remove duplicate header files qemu: remove duplicate header files util: consolidate QEMU and LXC block io related duplicate code util: consolidate QEMU and LXC memory related duplicate code src/libvirt_private.syms | 2 + src/lxc/lxc_cgroup.c | 85 +------------------------------------ src/qemu/qemu_cgroup.c | 62 +-------------------------- src/util/vircgroup.c | 91 ++++++++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 4 ++ 5 files changed, 101 insertions(+), 143 deletions(-) -- 2.17.1

2 7

[libvirt] [dbus PATCH] meson: fix construction of data directories
by Pavel Hrdina 12 Nov '19

12 Nov '19

We need to use prefix for all directories and there is no need to check if the user provided path starts with '/' as that is done automatically by the join_paths() function or '/' operator. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- meson.build | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/meson.build b/meson.build index 472e4e2..b293b8c 100644 --- a/meson.build +++ b/meson.build @@ -9,12 +9,30 @@ project( ], ) +prefix = get_option('prefix') +datadir = prefix / get_option('datadir') +sbindir = prefix / get_option('sbindir') + +opt_dirs = [ + 'dbus_interfaces', + 'dbus_services', + 'dbus_system_services', + 'dbus_system_policies', + 'polkit_rules', +] + +foreach opt_dir : opt_dirs + value = get_option(opt_dir) + varname = '@0@_dir'.format(opt_dir) + set_variable(varname, datadir / value) +endforeach + conf = configuration_data() conf.set('MESON_VERSION', '0.49.0') conf.set('PACKAGE', meson.project_name()) conf.set('VERSION', meson.project_version()) conf.set('build_root', meson.build_root()) -conf.set('sbindir', get_option('sbindir')) +conf.set('sbindir', sbindir) conf.set('source_root', meson.source_root()) @@ -40,24 +58,6 @@ git = run_command('test', '-d', '.git').returncode() == 0 conf.set('SYSTEM_USER', get_option('system_user')) -opt_dirs = [ - 'dbus_interfaces', - 'dbus_services', - 'dbus_system_services', - 'dbus_system_policies', - 'polkit_rules', -] - -foreach opt_dir : opt_dirs - value = get_option(opt_dir) - varname = '@0@_dir'.format(opt_dir) - if opt_dir.startswith('/') - set_variable(varname, value) - else - set_variable(varname, join_paths(get_option('datadir'), value)) - endif -endforeach - # Compile flags -- 2.21.0

2 1

[libvirt] [PATCH] qemu: snapshot: split out preparation of a snapshot with blockdev
by Peter Krempa 11 Nov '19

11 Nov '19

Separate the blockdev code since it makes the original function lenghty. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 96 ++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 40 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index abfb540d80..45363b0d6d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15228,6 +15228,58 @@ qemuDomainSnapshotDiskCleanup(qemuDomainSnapshotDiskDataPtr data, } +static int +qemuDomainSnapshotDiskPrepareOneBlockdev(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainSnapshotDiskDataPtr dd, + virQEMUDriverConfigPtr cfg, + bool reuse, + virHashTablePtr blockNamedNodeData, + qemuDomainAsyncJob asyncJob) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + g_autoptr(virStorageSource) terminator = NULL; + int rc; + + /* create a terminator for the snapshot disks so that qemu does not try + * to open them at first */ + if (!(terminator = virStorageSourceNew())) + return -1; + + if (qemuDomainPrepareStorageSourceBlockdev(dd->disk, dd->src, + priv, cfg) < 0) + return -1; + + if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->src, + terminator, + priv->qemuCaps))) + return -1; + + if (reuse) { + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + return -1; + + rc = qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm), + dd->crdata->srcdata[0]); + + if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + return -1; + } else { + if (qemuBlockStorageSourceCreateDetectSize(blockNamedNodeData, + dd->src, dd->disk->src) < 0) + return -1; + + if (qemuBlockStorageSourceCreate(vm, dd->src, dd->disk->src, + NULL, dd->crdata->srcdata[0], + asyncJob) < 0) + return -1; + } + + dd->blockdevadded = true; + return 0; +} + + static int qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -15240,12 +15292,9 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver, bool blockdev, qemuDomainAsyncJob asyncJob) { - qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDiskDefPtr persistdisk; - g_autoptr(virStorageSource) terminator = NULL; bool supportsCreate; bool supportsBacking; - int rc; dd->disk = disk; @@ -15314,43 +15363,10 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver, dd->prepared = true; - if (blockdev) { - /* create a terminator for the snapshot disks so that qemu does not try - * to open them at first */ - if (!(terminator = virStorageSourceNew())) - return -1; - - if (qemuDomainPrepareStorageSourceBlockdev(dd->disk, dd->src, - priv, cfg) < 0) - return -1; - - if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->src, - terminator, - priv->qemuCaps))) - return -1; - - if (reuse) { - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) - return -1; - - rc = qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm), - dd->crdata->srcdata[0]); - - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) - return -1; - } else { - if (qemuBlockStorageSourceCreateDetectSize(blockNamedNodeData, - dd->src, dd->disk->src) < 0) - return -1; - - if (qemuBlockStorageSourceCreate(vm, dd->src, dd->disk->src, - NULL, dd->crdata->srcdata[0], - asyncJob) < 0) - return -1; - } - - dd->blockdevadded = true; - } + if (blockdev && + qemuDomainSnapshotDiskPrepareOneBlockdev(driver, vm, dd, cfg, reuse, + blockNamedNodeData, asyncJob) < 0) + return -1; return 0; } -- 2.23.0

2 1

[libvirt] [PATCH] qemu: command: Use XML based disk bus convertor in error message
by Peter Krempa 11 Nov '19

11 Nov '19

The qemu driver has an internal implementation for converting disk bus to string for use with qemu. This should not be used in error messages though as we want to report the string based on the XML value. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f37aecda37..3806cbbaf9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1303,7 +1303,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk device='lun' is not supported for bus='%s'"), - virDomainDiskQEMUBusTypeToString(disk->bus)); + virDomainDiskBusTypeToString(disk->bus)); return -1; } -- 2.23.0

2 1

[libvirt] [PATCH] util: pci: Remove always-false condition
by Peter Krempa 11 Nov '19

11 Nov '19

Commit d19c21429fd modified the condition so that it checks whether the value is more than 0xFFFFFFFF. Since addr->domain is an unsigned int, it will never be more than that. Remove the whole check src/util/virpci.c:1291:22: error: result of comparison 'unsigned int' > 4294967295 is always false [-Werror,-Wtautological-type-limit-compare] if (addr->domain > 0xFFFFFFFF) { ~~~~~~~~~~~~ ^ ~~~~~~~~~~ Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- This was caught by new clang: $ clang -v clang version 9.0.0 (Fedora 9.0.0-1.fc31) This "fix" is the naive approach which assumes the original patch was correct. src/util/virpci.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index f9e39e79d8..cd560d683b 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1288,14 +1288,6 @@ bool virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, bool report) { - if (addr->domain > 0xFFFFFFFF) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address domain='0x%x', " - "must be <= 0xFFFF"), - addr->domain); - return false; - } if (addr->bus > 0xFF) { if (report) virReportError(VIR_ERR_XML_ERROR, -- 2.23.0

1 1

[libvirt] [PATCH 0/2] Couple of fixes for exported stuff
by Peter Krempa 11 Nov '19

11 Nov '19

Peter Krempa (2): datatypes: Fix comment for the _virNetwork struct syms: Add 'global:' keyword to LIBVIRT_5.8 section src/datatypes.h | 2 +- src/libvirt_public.syms | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.23.0

2 4

[libvirt] [PATCH 0/8] Coverity related patches
by John Ferlan 11 Nov '19

11 Nov '19

Some related to "new-ish" changes that have caused Coverity to discover new issues and some from older changes from a pile of 50 or so that are not essentially "false positives". John Ferlan (8): vbox: Fix possible NULL deref conf: Remove ATTRIBUTE_NONNULL for virDomainQemuMonitorEventNew tests: Fix memory leak in mymain lxc: Remove unnecessary comment tests: Remove _NULLABLE in virNetDevExists mock qemu: Fix possible NULL deref in qemuDomainSaveImageStartVM tests: Add return value check in checkUserInfo tests: Fix logic to not have possible NULL deref src/conf/domain_event.c | 6 +++++- src/conf/domain_event.h | 2 +- src/lxc/lxc_container.c | 5 ----- src/qemu/qemu_driver.c | 2 +- src/vbox/vbox_common.c | 4 ++-- tests/qemuagenttest.c | 4 +++- tests/qemuhotplugtest.c | 3 +-- tests/qemuxml2argvmock.c | 2 +- tests/virbitmaptest.c | 6 ++++-- 9 files changed, 18 insertions(+), 16 deletions(-) -- 2.20.1

3 10

[libvirt] [PATCH] util: Fix segmentation fault when seclabel fails to allocate memory
by jcfaracco＠gmail.com 11 Nov '19

11 Nov '19

From: Julio Faracco <jcfaracco(a)gmail.com> In function virSecurityDeviceLabelDefNew(), when libvirt fails to allocate seclabel structure it returns a failure. This case is setting seclabel as a NULL pointer and accessing its attribute below. This commit fixes this wrong logic. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virseclabel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virseclabel.c b/src/util/virseclabel.c index a2b5ebf6b7..2141d84210 100644 --- a/src/util/virseclabel.c +++ b/src/util/virseclabel.c @@ -77,7 +77,7 @@ virSecurityDeviceLabelDefNew(const char *model) if (VIR_ALLOC(seclabel) < 0) { virSecurityDeviceLabelDefFree(seclabel); - seclabel = NULL; + return NULL; } seclabel->model = g_strdup(model); -- 2.20.1

2 1

[libvirt] [dockerfiles PATCH 0/3] Refresh after recent changes
by Andrea Bolognani 11 Nov '19

11 Nov '19

Pushed under the Dockerfiles refresh rules. As usual, patches as sent to the list don't apply and are to be considered informational only. Andrea Bolognani (3): Drop Fedora 29 Add Fedora 31 Refresh afted adding python3-docutils for libvirt buildenv-libosinfo-fedora-29.zip | Bin 544 -> 0 bytes buildenv-libosinfo-fedora-31.zip | Bin 0 -> 544 bytes buildenv-libvirt-centos-7.zip | Bin 759 -> 765 bytes buildenv-libvirt-debian-10-cross-aarch64.zip | Bin 1010 -> 1016 bytes buildenv-libvirt-debian-10-cross-armv6l.zip | Bin 1003 -> 1009 bytes buildenv-libvirt-debian-10-cross-armv7l.zip | Bin 1008 -> 1013 bytes buildenv-libvirt-debian-10-cross-i686.zip | Bin 1001 -> 1008 bytes buildenv-libvirt-debian-10-cross-mips.zip | Bin 997 -> 1003 bytes buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 1011 -> 1017 bytes buildenv-libvirt-debian-10-cross-mipsel.zip | Bin 1001 -> 1007 bytes buildenv-libvirt-debian-10-cross-ppc64le.zip | Bin 1012 -> 1019 bytes buildenv-libvirt-debian-10-cross-s390x.zip | Bin 1000 -> 1006 bytes buildenv-libvirt-debian-10.zip | Bin 898 -> 904 bytes buildenv-libvirt-debian-9-cross-aarch64.zip | Bin 1042 -> 1048 bytes buildenv-libvirt-debian-9-cross-armv6l.zip | Bin 1033 -> 1039 bytes buildenv-libvirt-debian-9-cross-armv7l.zip | Bin 1039 -> 1045 bytes buildenv-libvirt-debian-9-cross-mips.zip | Bin 1033 -> 1039 bytes buildenv-libvirt-debian-9-cross-mips64el.zip | Bin 1041 -> 1051 bytes buildenv-libvirt-debian-9-cross-mipsel.zip | Bin 1036 -> 1043 bytes buildenv-libvirt-debian-9-cross-ppc64le.zip | Bin 1045 -> 1053 bytes buildenv-libvirt-debian-9-cross-s390x.zip | Bin 1034 -> 1040 bytes buildenv-libvirt-debian-9.zip | Bin 927 -> 934 bytes buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 1010 -> 1015 bytes buildenv-libvirt-debian-sid-cross-armv6l.zip | Bin 1003 -> 1009 bytes buildenv-libvirt-debian-sid-cross-armv7l.zip | Bin 1008 -> 1013 bytes buildenv-libvirt-debian-sid-cross-i686.zip | Bin 1001 -> 1008 bytes buildenv-libvirt-debian-sid-cross-mips.zip | Bin 1000 -> 1006 bytes ...denv-libvirt-debian-sid-cross-mips64el.zip | Bin 1014 -> 1017 bytes buildenv-libvirt-debian-sid-cross-mipsel.zip | Bin 1005 -> 1011 bytes buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 1012 -> 1018 bytes buildenv-libvirt-debian-sid-cross-s390x.zip | Bin 1000 -> 1006 bytes buildenv-libvirt-debian-sid.zip | Bin 898 -> 904 bytes buildenv-libvirt-fedora-29.zip | Bin 768 -> 0 bytes buildenv-libvirt-fedora-30.zip | Bin 891 -> 897 bytes buildenv-libvirt-fedora-31.zip | Bin 0 -> 776 bytes buildenv-libvirt-fedora-rawhide.zip | Bin 788 -> 796 bytes buildenv-libvirt-ubuntu-16.zip | Bin 933 -> 939 bytes buildenv-libvirt-ubuntu-18.zip | Bin 935 -> 941 bytes 38 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 buildenv-libosinfo-fedora-29.zip create mode 100644 buildenv-libosinfo-fedora-31.zip delete mode 100644 buildenv-libvirt-fedora-29.zip create mode 100644 buildenv-libvirt-fedora-31.zip -- 2.21.0

1 3

[libvirt] [PATCH] spec: fix rpm build with VPATH
by Pavel Hrdina 11 Nov '19

11 Nov '19

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 723ced3535..eb8b2df055 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1532,7 +1532,7 @@ exit 0 %files docs %doc AUTHORS ChangeLog NEWS README README.md -%doc libvirt-docs/* +%doc %{_vpath_builddir}/libvirt-docs/* %files daemon @@ -1892,7 +1892,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh -%files libs -f %{name}.lang +%files libs -f %{_vpath_builddir}/%{name}.lang %license COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf -- 2.23.0

2 1

[libvirt] [PATCH] src: lxc: Fix typo in a Makefile variable
by Michal Privoznik 11 Nov '19

11 Nov '19

In commit 0985a9597bb0348d46c0d18dc548a676bf0ad8e2 we stopped distributing generated source file. This is done by prepending binary_SOURCES variable with "nodist_". However, there is a typo - the prefix is "nodst_" instead of "nodist_". Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/lxc/Makefile.inc.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index d3a7cbf93b..6aaec09fb4 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -127,7 +127,7 @@ augeastest_DATA += lxc/test_virtlxcd.aug CLEANFILES += lxc/virtlxcd.aug virtlxcd_SOURCES = $(REMOTE_DAEMON_SOURCES) -nodst_virtlxcd_SOURCES = $(REMOTE_DAEMON_GENERATED) +nodist_virtlxcd_SOURCES = $(REMOTE_DAEMON_GENERATED) virtlxcd_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtlxcd\"" \ -- 2.23.0

1 0

[libvirt] [PATCH 0/5] Update news for versions from 5.7 to 5.8
by Han Han 11 Nov '19

11 Nov '19

Han Han (5): news: Support for kvm dedicated performance hint in 5.7 news: Support unmanaged macvtap devices in 5.8 news: Support to run SLIRP networking in a separate process in 5.8 news: Support vhost-user-gpu in 5.8 news: Introduce virConnectSetIdentity API in 5.8 docs/news.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) -- 2.24.0.rc1

4 10

[libvirt] [PATCH] src: add missing include access path for bhyve and vz drivers
by Pavel Hrdina 08 Nov '19

08 Nov '19

Commit <b98f90cf913965243c6e2c49a52aa170a48093ef> forgot to update bhyve and vz Makefile files as well. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. src/bhyve/Makefile.inc.am | 1 + src/vz/Makefile.inc.am | 1 + 2 files changed, 2 insertions(+) diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index de9fbe9239..1fc100d5ab 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -42,6 +42,7 @@ libvirt_driver_bhyve_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) libvirt_driver_bhyve_impl_la_CFLAGS = \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index 1757c8ba10..acada11148 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -29,6 +29,7 @@ libvirt_driver_vz_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) libvirt_driver_vz_impl_la_CFLAGS = \ -I$(srcdir)/conf \ -I$(srcdir)/access \ + -I$(builddir)/access \ $(AM_CFLAGS) \ $(PARALLELS_SDK_CFLAGS) \ $(LIBNL_CFLAGS) \ -- 2.23.0

1 0

[libvirt] [jenkins-ci PATCH v2] Add python3-docutils package for libvirt
by Daniel P. Berrangé 08 Nov '19

08 Nov '19

This is needed to acquire the rst2html command line tool Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 5 +++++ guests/vars/projects/libvirt.yml | 1 + 2 files changed, 6 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index ba0f1cf..81d0916 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -795,6 +795,11 @@ mappings: default: polkit deb: policykit-1 + python3-docutils: + default: python3-docutils + CentOS7: python36-docutils + FreeBSD: py36-docutils + python2: default: python Fedora: python2 diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml index 8fcb286..780a5aa 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -46,6 +46,7 @@ packages: - openwsman - parted - polkit + - python3-docutils - qemu-img - radvd - readline -- 2.23.0

2 2

[libvirt] [PATCH 0/2] qemu: Check for job being set when getting iothread stats
by Michal Privoznik 08 Nov '19

08 Nov '19

I've been playing with domstats and encountered a crasher. Here's the fix. Michal Prívozník (2): qemu: Warn on possibly incorrect usage of EnterMonitor* qemu: Check for job being set when getting iothread stats src/qemu/qemu_domain.c | 5 +++++ src/qemu/qemu_driver.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) -- 2.23.0

2 7

[libvirt] [jenkins-ci PATCH 0/5] Add Fedora 31, drop Fedora 29
by Andrea Bolognani 08 Nov '19

08 Nov '19

You know the drill :) Andrea Bolognani (5): guests: Explicitly enable ssh root login in kickstart guests: Add Fedora 31 Start building on Fedora 31 Stop building on Fedora 29 guests: Drop Fedora 29 guests/configs/kickstart.cfg | 12 +++ guests/configs/preseed.cfg | 12 ++- guests/host_vars/libvirt-fedora-29/docker.yml | 2 - guests/host_vars/libvirt-fedora-31/docker.yml | 2 + .../install.yml | 2 +- .../main.yml | 2 +- guests/inventory | 2 +- guests/playbooks/build/jobs/defaults.yml | 4 +- guests/playbooks/build/projects/libosinfo.yml | 2 +- .../playbooks/build/projects/libvirt-dbus.yml | 3 +- .../build/projects/libvirt-go-xml.yml | 2 +- .../playbooks/build/projects/libvirt-go.yml | 2 +- .../build/projects/libvirt-sandbox.yml | 4 +- .../playbooks/build/projects/libvirt-tck.yml | 4 +- guests/playbooks/build/projects/libvirt.yml | 2 +- .../build/projects/osinfo-db-tools.yml | 2 +- .../playbooks/build/projects/virt-manager.yml | 6 +- .../playbooks/build/projects/virt-viewer.yml | 2 +- guests/vars/vault.yml | 82 +++++++++---------- jenkins/jobs/defaults.yaml | 4 +- jenkins/projects/libosinfo.yaml | 2 +- jenkins/projects/libvirt-dbus.yaml | 4 +- jenkins/projects/libvirt-go-xml.yaml | 2 +- jenkins/projects/libvirt-go.yaml | 2 +- jenkins/projects/libvirt-sandbox.yaml | 4 +- jenkins/projects/libvirt-tck.yaml | 4 +- jenkins/projects/libvirt.yaml | 2 +- jenkins/projects/osinfo-db-tools.yaml | 2 +- jenkins/projects/virt-manager.yaml | 6 +- jenkins/projects/virt-viewer.yaml | 2 +- 30 files changed, 100 insertions(+), 83 deletions(-) delete mode 100644 guests/host_vars/libvirt-fedora-29/docker.yml create mode 100644 guests/host_vars/libvirt-fedora-31/docker.yml rename guests/host_vars/{libvirt-fedora-29 => libvirt-fedora-31}/install.yml (66%) rename guests/host_vars/{libvirt-fedora-29 => libvirt-fedora-31}/main.yml (95%) -- 2.21.0

3 11

[libvirt] [PATCH v2 0/2] Deprecate implicit filters
by Vladimir Sementsov-Ogievskiy 08 Nov '19

08 Nov '19

v2: Don't deprecate drive-backup, it is unrelated thing and will be resent in separate. Don't deprecate drive-mirror. Instead add filter-node-name to drive-mirror to behave like blockdev-mirror Fix all broken iotests. Vladimir Sementsov-Ogievskiy (2): qapi: add filter-node-name option to drive-mirror qapi: deprecate implicit filters qemu-deprecated.texi | 6 ++++++ qapi/block-core.json | 14 ++++++++++++-- include/block/block_int.h | 10 +++++++++- blockdev.c | 12 +++++++++++- tests/qemu-iotests/094 | 1 + tests/qemu-iotests/095 | 6 ++++-- tests/qemu-iotests/109 | 1 + tests/qemu-iotests/127 | 1 + tests/qemu-iotests/141 | 5 ++++- tests/qemu-iotests/144 | 3 ++- tests/qemu-iotests/156 | 1 + tests/qemu-iotests/161 | 7 +++++++ tests/qemu-iotests/161.out | 1 + tests/qemu-iotests/185 | 3 +++ tests/qemu-iotests/191 | 2 ++ tests/qemu-iotests/229 | 1 + tests/qemu-iotests/247 | 8 +++++--- tests/qemu-iotests/249 | 5 +++-- tests/qemu-iotests/249.out | 2 +- 19 files changed, 75 insertions(+), 14 deletions(-) -- 2.21.0

4 9

[libvirt] s390: change default cpu model to host-model?
by Christian Borntraeger 08 Nov '19

08 Nov '19

On the KVM forum I have discussed the default cpu model mode on s390. Right now if the xml does not specify anything, libvirt defaults to not specifying anything on the qemu command line (no -cpu statement) which is the equivalent of -cpu host for s390 which is equivalent to host-passthrough. While this enables all features it does not provide any migration safety by default. So in fact we are kind of "broken" right now when it comes to safery. So we discussed that it would make sense that an empty xml should actually be defaulted to host-model, which results in - as of today - the same guest features but in a migration safe way. There is another change planned right now to actually make the cpu model present in an xml if none was specified. So we could actually do this change before, together or after te other. Jiri and I think it probably makes most sense to have both changes at the same time (in terms of libvirt version). Does anyone see an issue with changing the default model mode to "host-model" if the xml does not specify anything else? Christian

3 10

[libvirt] [PATCH v2 00/39] Introduce NVMe support
by Michal Privoznik 08 Nov '19

08 Nov '19

v2 of: https://www.redhat.com/archives/libvir-list/2019-July/msg00675.html As usual, you can find my patches on my github: https://github.com/zippy2/libvirt/tree/nvme_v3 https://travis-ci.org/zippy2/libvirt/builds/590033775 (Yeah, my branch is really called _v3 because reasons) diff to v1: - A lot. Hopefully all Peter's comments are worked in Michal Prívozník (39): virhostdev: Fix const correctness of virHostdevIs{PCINet,SCSI,Mdev}Device() virhostdev: Introduce and use virHostdevIsVFIODevice conf: Introduce virDomainDefHasMdevHostdev qemu_hostdev: Introduce qemuHostdevNeedsVFIO() qemu: Introduce qemuDomainNeedsVFIO qemu_cgroup: Teardown Cgroup for more host device types qemu: Explicitly add/remove /dev/vfio/vfio to/from NS/CGroups qemu_domain: Drop few useless checks in qemuDomainGetHostdevPath qemuDomainGetHostdevPath: Drop @freeTmpPath qemuDomainGetHostdevPath: Use more VIR_AUTOFREE/VIR_AUTOPTR qemuDomainGetHostdevPath: Don't include /dev/vfio/vfio in returned paths qemu: Drop some 'cleanup' labels virpci: Introduce and use virPCIDeviceAddressGetIOMMUGroupDev virHostdevPreparePCIDevices: Separate out function body virHostdevReAttachPCIDevices: Separate out function body virpci: Introduce virPCIDeviceAddressCopy qemuMigrationSrcIsSafe: Rework slightly schemas: Introduce disk type NVMe conf: Format and parse NVMe type disk virstoragefile: Introduce virStorageSourceChainHasNVMe domain_conf: Introduce virDomainDefHasNVMeDisk util: Introduce virNVMeDevice module virhostdev: Include virNVMeDevice module virpcimock: Introduce NVMe driver and devices virhostdevtest: Test virNVMeDevice assignment qemu: prepare NVMe devices too qemu: Take NVMe disks into account when calculating memlock limit qemu: Create NVMe disk in domain namespace qemu: Mark NVMe disks as 'need VFIO' qemu: Allow NVMe disk in CGroups security_selinux: Simplify virSecuritySELinuxSetImageLabelInternal virSecuritySELinuxRestoreImageLabelInt: Don't skip non-local storage qemu_capabilities: Introduce QEMU_CAPS_DRIVE_NVME qemu: Generate command line of NVMe disks qemu_monitor_text: Catch IOMMU/VFIO related errors in qemuMonitorTextAddDrive qemu: Don't leak storage perms on failure in qemuDomainAttachDiskGeneric qemu: Allow forcing VFIO when computing memlock limit qemu_hotplug: Prepare NVMe disks on hotplug virsh: Introduce nvme disk to domblklist docs/formatdomain.html.in | 57 ++- docs/schemas/domaincommon.rng | 32 ++ src/conf/domain_conf.c | 129 ++++- src/conf/domain_conf.h | 6 + src/libvirt_private.syms | 30 ++ src/libxl/xen_xl.c | 1 + src/qemu/qemu_block.c | 25 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_cgroup.c | 216 ++++++--- src/qemu/qemu_command.c | 6 +- src/qemu/qemu_domain.c | 409 +++++++++------- src/qemu/qemu_domain.h | 17 +- src/qemu/qemu_driver.c | 4 + src/qemu/qemu_hostdev.c | 80 ++- src/qemu/qemu_hostdev.h | 18 + src/qemu/qemu_hotplug.c | 39 +- src/qemu/qemu_migration.c | 30 +- src/qemu/qemu_monitor_text.c | 7 + src/qemu/qemu_process.c | 7 + src/security/security_apparmor.c | 33 +- src/security/security_dac.c | 30 ++ src/security/security_selinux.c | 82 ++-- src/util/Makefile.inc.am | 2 + src/util/virhostdev.c | 455 ++++++++++++++++-- src/util/virhostdev.h | 44 +- src/util/virnvme.c | 454 +++++++++++++++++ src/util/virnvme.h | 95 ++++ src/util/virpci.c | 29 ++ src/util/virpci.h | 5 + src/util/virstoragefile.c | 73 +++ src/util/virstoragefile.h | 19 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + tests/qemumemlocktest.c | 2 +- .../disk-nvme.x86_64-latest.args | 53 ++ tests/qemuxml2argvdata/disk-nvme.xml | 63 +++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/disk-nvme.xml | 1 + tests/qemuxml2xmltest.c | 1 + tests/virhostdevtest.c | 97 ++++ tests/virpcimock.c | 3 + tests/virpcitestdata/0000-01-00.0.config | Bin 0 -> 4096 bytes tests/virpcitestdata/0000-02-00.0.config | Bin 0 -> 4096 bytes tools/virsh-domain-monitor.c | 31 +- 61 files changed, 2330 insertions(+), 381 deletions(-) create mode 100644 src/util/virnvme.c create mode 100644 src/util/virnvme.h create mode 100644 tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-nvme.xml create mode 120000 tests/qemuxml2xmloutdata/disk-nvme.xml create mode 100644 tests/virpcitestdata/0000-01-00.0.config create mode 100644 tests/virpcitestdata/0000-02-00.0.config -- 2.21.0

2 50

[libvirt] [jenkins-ci PATCH] Add python-docutils package for libvirt
by Daniel P. Berrangé 08 Nov '19

08 Nov '19

This is needed to acquire the rst2html command line tool Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 5 +++++ guests/vars/projects/libvirt.yml | 1 + 2 files changed, 6 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index ba0f1cf..a6df789 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -795,6 +795,11 @@ mappings: default: polkit deb: policykit-1 + python-docutils: + default: python3-docutils + CentOS7: python2-docutils + FreeBSD: py36-docutils + python2: default: python Fedora: python2 diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml index 8fcb286..38a979a 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -46,6 +46,7 @@ packages: - openwsman - parted - polkit + - python-docutils - qemu-img - radvd - readline -- 2.23.0

2 1

[libvirt] [PATCH v3 00/20] cleanup current build system
by Pavel Hrdina 08 Nov '19

08 Nov '19

As preparation to switch to Meson there are some things that needs be cleaned up to make the conversion easier. The important thing in Meson is that there is a strict separation between source and build directory and the distributed tarball by default contains only files tracked by git with a possibility to write a script which would add some other sources into the tarball. Regardless of the adoption of Meson these patches improve our current build system to fully support VPATH builds. Changes in v2: - some patches from v1 are pushed now - added a patch to mandate build dir != src dir - added a patch to cleanup .gitignore - added patches to fix sc_po_check - improved some patches from v1 Changes in v3: - python-zanata-client is the tool our Makefile uses Daniel P. Berrangé (1): build: mandate use of a build dir != src dir Pavel Hrdina (19): .gitignore: cleanup old and obsolete ignores syntax-check.mk: fix sc_po_check rule syntax-check.mk: cleanup sc_po_check dependencies syntax-check.mk: cleanup generated_files list for sc_po_check po: generate files into build directory po: rewrite the way how we generate files po: README.md: add a note about which Zanata client is required remote: unify rpc server dispatch generated files src: generate source files into build directory src: access: generate source files into build directory src: admin: generate source files into build directory src: esx: generate source files into build directory src: hyperv: generate source files into build directory src: locking: generate source files into build directory src: logging: generate source files into build directory src: lxc: generate source files into build directory src: remote: generate source files into build directory src: stop distributing generated source files tools: stop distributing generated source files .gitignore | 276 ++------------------- build-aux/syntax-check.mk | 47 ++-- configure.ac | 6 + libvirt.spec.in | 10 +- po/Makefile.am | 47 ++-- po/POTFILES | 320 ------------------------- po/POTFILES.in | 357 ++++++++++++++++++++++++++++ po/README.md | 3 + src/Makefile.am | 13 +- src/access/Makefile.inc.am | 17 +- src/admin/Makefile.inc.am | 24 +- src/bhyve/Makefile.inc.am | 1 + src/esx/Makefile.inc.am | 9 +- src/esx/esx_vi_generator.py | 11 +- src/hyperv/Makefile.inc.am | 9 +- src/hyperv/hyperv_wmi_generator.py | 11 +- src/interface/Makefile.inc.am | 2 + src/libxl/Makefile.inc.am | 2 + src/locking/Makefile.inc.am | 16 +- src/logging/Makefile.inc.am | 18 +- src/lxc/Makefile.inc.am | 36 ++- src/network/Makefile.inc.am | 2 + src/node_device/Makefile.inc.am | 2 + src/nwfilter/Makefile.inc.am | 2 + src/qemu/Makefile.inc.am | 2 + src/remote/Makefile.inc.am | 45 ++-- src/remote/remote_daemon_dispatch.c | 4 +- src/rpc/Makefile.inc.am | 8 +- src/secret/Makefile.inc.am | 2 + src/storage/Makefile.inc.am | 2 + src/util/Makefile.inc.am | 6 +- src/vbox/Makefile.inc.am | 1 + src/vz/Makefile.inc.am | 1 + tests/Makefile.am | 4 + tools/Makefile.am | 1 - 35 files changed, 607 insertions(+), 710 deletions(-) delete mode 100644 po/POTFILES create mode 100644 po/POTFILES.in -- 2.21.0

3 43

[libvirt] [PATCH v6] util: Set SIGPIPE to a no-op handler in virFork
by Wang Yechao 08 Nov '19

08 Nov '19

Libvirtd has set SIGPIPE to ignored, and virFork resets all signal handlers to the defaults. But child process may write logs to stderr/stdout, that may generate SIGPIPE if journald has stopped. So set SIGPIPE to a dummy no-op handler before unmask signals in virFork(), and the handler will get reset to SIG_DFL when execve() runs. Now we can delete sigaction() call entirely in virExec(). Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- v3 patch: https://www.redhat.com/archives/libvir-list/2019-October/msg00934.html Changes in v4: - don't block SIGPIPE, ignore it when invoke VIR_FORCE_CLOSE and virCommandMassClose Changes in v5: - chang from SIG_IGN to a no-op handler in child process Changes in v6: - add a comment and delete sigaction() call entirely in virExec --- src/util/vircommand.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 93b3dd2..8b10253 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -217,6 +217,8 @@ virCommandFDSet(virCommandPtr cmd, #ifndef WIN32 +static void virDummyHandler(int sig G_GNUC_UNUSED) {} + /** * virFork: * @@ -312,6 +314,14 @@ virFork(void) ignore_value(sigaction(i, &sig_action, NULL)); } + /* Code that runs between fork & execve might trigger + * SIG_PIPE, so we must explicitly set that to a no-op + * handler. This handler will get reset to SIG_DFL when + * execve() runs + */ + sig_action.sa_handler = virDummyHandler; + ignore_value(sigaction(SIGPIPE, &sig_action, NULL)); + /* Unmask all signals in child, since we've no idea what the * caller's done with their signal mask and don't want to * propagate that to children */ @@ -550,7 +560,6 @@ virExec(virCommandPtr cmd) g_autofree char *binarystr = NULL; const char *binary = NULL; int ret; - struct sigaction waxon, waxoff; g_autofree gid_t *groups = NULL; int ngroups; @@ -718,21 +727,6 @@ virExec(virCommandPtr cmd) } } - /* virFork reset all signal handlers to the defaults. - * This is good for the child process, but our hook - * risks running something that generates SIGPIPE, - * so we need to temporarily block that again - */ - memset(&waxoff, 0, sizeof(waxoff)); - waxoff.sa_handler = SIG_IGN; - sigemptyset(&waxoff.sa_mask); - memset(&waxon, 0, sizeof(waxon)); - if (sigaction(SIGPIPE, &waxoff, &waxon) < 0) { - virReportSystemError(errno, "%s", - _("Could not disable SIGPIPE")); - goto fork_error; - } - if (virProcessSetMaxMemLock(0, cmd->maxMemLock) < 0) goto fork_error; if (virProcessSetMaxProcesses(0, cmd->maxProcesses) < 0) @@ -783,12 +777,6 @@ virExec(virCommandPtr cmd) if (virCommandHandshakeChild(cmd) < 0) goto fork_error; - if (sigaction(SIGPIPE, &waxon, NULL) < 0) { - virReportSystemError(errno, "%s", - _("Could not re-enable SIGPIPE")); - goto fork_error; - } - /* Close logging again to ensure no FDs leak to child */ virLogReset(); -- 1.8.3.1

2 1

[libvirt] [PATCH v5] util: Set SIGPIPE to a no-op handler in virFork
by Wang Yechao 08 Nov '19

08 Nov '19

Libvirtd has set SIGPIPE to ignored, and virFork resets all signal handlers to the defaults. But child process may write logs to stderr/stdout, that may generate SIGPIPE if journald has stopped. So set SIGPIPE to a dummy no-op handler before unmask signals in virFork. And there is no need to set SIGPIPE ignored before running hooks in virExec. At last, set SIGPIPE to defaults before execve. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- v3 patch: https://www.redhat.com/archives/libvir-list/2019-October/msg00934.html Changes in v4: - don't block SIGPIPE, ignore it when invoke VIR_FORCE_CLOSE and virCommandMassClose Changes in v5: - chang from SIG_IGN to a no-op handler in child process --- src/util/vircommand.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 93b3dd2..c13739c 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -217,6 +217,8 @@ virCommandFDSet(virCommandPtr cmd, #ifndef WIN32 +static void virDummyHandler(int sig G_GNUC_UNUSED) {} + /** * virFork: * @@ -312,6 +314,9 @@ virFork(void) ignore_value(sigaction(i, &sig_action, NULL)); } + sig_action.sa_handler = virDummyHandler; + ignore_value(sigaction(SIGPIPE, &sig_action, NULL)); + /* Unmask all signals in child, since we've no idea what the * caller's done with their signal mask and don't want to * propagate that to children */ @@ -550,7 +555,7 @@ virExec(virCommandPtr cmd) g_autofree char *binarystr = NULL; const char *binary = NULL; int ret; - struct sigaction waxon, waxoff; + struct sigaction sig_action; g_autofree gid_t *groups = NULL; int ngroups; @@ -718,21 +723,6 @@ virExec(virCommandPtr cmd) } } - /* virFork reset all signal handlers to the defaults. - * This is good for the child process, but our hook - * risks running something that generates SIGPIPE, - * so we need to temporarily block that again - */ - memset(&waxoff, 0, sizeof(waxoff)); - waxoff.sa_handler = SIG_IGN; - sigemptyset(&waxoff.sa_mask); - memset(&waxon, 0, sizeof(waxon)); - if (sigaction(SIGPIPE, &waxoff, &waxon) < 0) { - virReportSystemError(errno, "%s", - _("Could not disable SIGPIPE")); - goto fork_error; - } - if (virProcessSetMaxMemLock(0, cmd->maxMemLock) < 0) goto fork_error; if (virProcessSetMaxProcesses(0, cmd->maxProcesses) < 0) @@ -783,7 +773,10 @@ virExec(virCommandPtr cmd) if (virCommandHandshakeChild(cmd) < 0) goto fork_error; - if (sigaction(SIGPIPE, &waxon, NULL) < 0) { + memset(&sig_action, 0, sizeof(sig_action)); + sig_action.sa_handler = SIG_DFL; + sigemptyset(&sig_action.sa_mask); + if (sigaction(SIGPIPE, &sig_action, NULL) < 0) { virReportSystemError(errno, "%s", _("Could not re-enable SIGPIPE")); goto fork_error; -- 1.8.3.1

3 3

[libvirt] [PATCH] cpu_map: Ship arm_features.xml
by Andrea Bolognani 07 Nov '19

07 Nov '19

The file was introduced in be03587a3446, but it was not added to $(cpumap_DATA) at the time and so it didn't show up in the distribution archive. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the build breaker rule. src/cpu_map/Makefile.inc.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am index ce8a311e22..7eb86c8fc7 100644 --- a/src/cpu_map/Makefile.inc.am +++ b/src/cpu_map/Makefile.inc.am @@ -2,6 +2,7 @@ cpumapdir = $(pkgdatadir)/cpu_map cpumap_DATA = \ + cpu_map/arm_features.xml \ cpu_map/index.xml \ cpu_map/ppc64_vendors.xml \ cpu_map/ppc64_POWER7.xml \ -- 2.21.0

1 0

[libvirt] [PATCH 00/11] qemu: Add support for ARM CPU features
by Andrea Bolognani 07 Nov '19

07 Nov '19

Starting with QEMU 4.2.0, ARM guests support CPU features similarly to what's been the case on x86 since forever; notably, it's now possible to enable SVE (Scalable Vector Extension). Some of the patches in the series (notably 1/11) are snipped; the unabridged version can be obtained with $ git fetch https://gitlab.com/abologna/libvirt.git sve Andrea Bolognani (11): tests: Update capabilities for QEMU 4.2.0 on aarch64 qemu: Rename virQEMUCapsObjectPropsMaxX86CPU qemu: Introduce QEMU_CAPS_ARM_MAX_CPU qemu: Query max-arm-cpu properties qemu: Update query-cpu-model-expansion check qemu: Perform full expansion on ARM cpu_map: Introduce ARM CPU features cpu: Validate ARM CPU features qemu: Validate ARM CPU features tests: Introduce tests for ARM CPU features news: Update for ARM CPU features docs/news.xml | 9 + src/cpu/cpu_arm.c | 157 + src/cpu_map/arm_features.xml | 22 + src/cpu_map/index.xml | 4 + src/qemu/qemu_capabilities.c | 20 +- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 3 +- src/qemu/qemu_domain.c | 37 + .../qemu_4.2.0-virt.aarch64.xml | 2 +- tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 2 +- .../caps_2.12.0.aarch64.replies | 159 +- .../caps_2.12.0.aarch64.xml | 1 + .../caps_4.0.0.aarch64.replies | 159 +- .../caps_4.0.0.aarch64.xml | 1 + .../caps_4.2.0.aarch64.replies | 3755 ++++++++++------- .../caps_4.2.0.aarch64.xml | 52 +- .../aarch64-features-sve-disabled.xml | 18 + .../aarch64-features-sve.aarch64-latest.args | 32 + .../qemuxml2argvdata/aarch64-features-sve.xml | 20 + .../aarch64-features-wrong.xml | 17 + tests/qemuxml2argvtest.c | 9 + .../aarch64-features-sve.aarch64-latest.xml | 31 + tests/qemuxml2xmltest.c | 3 + 23 files changed, 3029 insertions(+), 1487 deletions(-) create mode 100644 src/cpu_map/arm_features.xml create mode 100644 tests/qemuxml2argvdata/aarch64-features-sve-disabled.xml create mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.xml create mode 100644 tests/qemuxml2argvdata/aarch64-features-wrong.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-features-sve.aarch64-latest.xml -- 2.21.0

2 12

[libvirt] [PATCHv2 0/2] util: set bridge device MAC address explicitly
by Laine Stump 07 Nov '19

07 Nov '19

From: Laine Stump <laine(a)redhat.com> I just sent a single patch for this, then realized there was a small prerequisite patch also needed. So 1/2 is the prerequisite patch, and 2/2 is identical to the single patch I sent previously. Laine Stump (2): util: allow sending mac addr to virNetNewLink without ifindex util: set bridge device MAC address explicitly during virNetDevBridgeCreate src/network/bridge_driver.c | 2 +- src/util/virnetdevbridge.c | 43 ++++++++++++++++++++++++++++++------- src/util/virnetdevbridge.h | 2 +- src/util/virnetlink.c | 9 ++++++-- 4 files changed, 44 insertions(+), 12 deletions(-) -- 2.23.0

3 6

[libvirt] [PATCH RFC 00/11] qemu: Introduce support for ARM CPU features
by Andrea Bolognani 07 Nov '19

07 Nov '19

This series is RFC because the corresponding QEMU patches[1] have not been merged yet, and since QEMU is currently in the middle of the 4.1.0 freeze we can't really expect to merge them until 5.7.0 anyway. With that in mind, a few patches are somewhat independent of the rest and could, after some minor tweaking, could go in even right now: 1/11 is really a no brainer, and 3/11 - 5/11 are also fairly reasonable candidates for that treatment. [1] https://lists.nongnu.org/archive/html/qemu-devel/2019-06/msg04945.html Andrea Bolognani (11): tests: Update replies for QEMU 2.12.0 on aarch64 tests: Add replies for QEMU 4.1.0 on aarch64 qemu: Rename virQEMUCapsObjectPropsMaxX86CPU qemu: Introduce QEMU_CAPS_ARM_MAX_CPU qemu: Query max-arm-cpu properties qemu: Update query-cpu-model-expansion check qemu: Perform full expansion on ARM cpu_map: Introduce ARM CPU features cpu: Validate ARM CPU features tests: Introduce tests for ARM CPU features news: Update for ARM CPU features docs/news.xml | 9 + src/cpu/cpu_arm.c | 171 ++ src/cpu_map/arm_features.xml | 21 + src/cpu_map/index.xml | 4 + src/qemu/qemu_capabilities.c | 18 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 +- .../caps_2.12.0.aarch64.replies | 324 ++- .../caps_2.12.0.aarch64.xml | 5 +- .../caps_4.0.0.aarch64.replies | 159 +- .../caps_4.0.0.aarch64.xml | 1 + ...h64.replies => caps_4.1.0.aarch64.replies} | 2205 ++++++++++------- ...0.0.aarch64.xml => caps_4.1.0.aarch64.xml} | 53 +- .../aarch64-features-sve.aarch64-latest.args | 32 + .../qemuxml2argvdata/aarch64-features-sve.xml | 20 + .../aarch64-features-wrong.xml | 17 + tests/qemuxml2argvtest.c | 7 + 17 files changed, 2085 insertions(+), 965 deletions(-) create mode 100644 src/cpu_map/arm_features.xml copy tests/qemucapabilitiesdata/{caps_4.0.0.aarch64.replies => caps_4.1.0.aarch64.replies} (96%) copy tests/qemucapabilitiesdata/{caps_4.0.0.aarch64.xml => caps_4.1.0.aarch64.xml} (80%) create mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.xml create mode 100644 tests/qemuxml2argvdata/aarch64-features-wrong.xml -- 2.21.0

2 15

[libvirt] Availability of libvirt 5.9.0
by Daniel Veillard 06 Nov '19

06 Nov '19

With a bit of delay I finally made the release today, it's available as signed tarball and source rpms from the usual place: https://libvirt.org/sources/ I also pushed a python release which is virtually identical to 5.8.0 one but you can find it at https://libvirt.org/sources/python/ You can start to see in this release some of the long term changes which were raised last month: Packaging changes - Start linking against GLib and using its features Up until now, libvirt has been dealing with platform portability and the lack of certain features in libc by using gnulib and implementing its own functions and data structures respectively; going forward, it will prefer the facilities offered by GLib instead. - Stop distributing generated documentation Most downstreams already patch the libvirt source to some extent, so this change will probably not affect them. - Rewrite several Perl scripts in Python Phasing out Perl usage is part of the project strategy. New features - qemu: Introduce a new video model of type 'ramfb' Introduce a new video model type to the domain XML that supports the ramfb standalone device in qemu. - qemu: Implement the ccf-assist pSeries feature Users can now decide whether ccf-assist (Count Cache Flush Assist) support should be available to pSeries guests. - Xen: Support specifying ACPI firmware path The libxl driver now supports specifying an ACPI firmware path using the acpi element. - qemu: Support specifying resolution for video devices Removed features - logging: Drop support for including stack traces This feature was intended to aid debugging, but in practice it resulted in logs that were too verbose to be useful and also resulted in a significant performance penalty. Improvements - qemu: Implement CPU comparison/baseline on s390x This functionality has been historically limited to x86_64, but it's now available on s390x too. Bug fixes - lib: autostart objects exactly once If libvirtd or any of the sub-daemons is started with socket activation then objects might be autostarted more than once. For instance, if a domain under qemu:///session URI is mark as autostarted and the session daemon is started then the domain is started with it. If user shuts the domain down and the session daemon is started again, the user's wish to keep the domain shut off is ignored and the domain is autostarted again. This is now fixed. - qemu: Properly advertise bochs-display availability Support for bochs-display was introduced in libvirt 5.6.0, but until now the model was not listed in the domain capabilities. - security: Don't remember labels for TPM devices Due to the way they're implemented in the kernel, trying to remember labels for TPM devices makes it impossible to use them. - security: Properly rollback after failure in a stacked driver When multiple security drivers are involved, failure in one of them would result in only the corresponding changes being rolled back, leaving the ones performed by drivers that had been activated earlier in place. All changes are rolled back now. - Fix build with musl libc - Improve compatibility with non-bash shells thanks everybody who helped with this release, next in a month ! Enjoy :-) 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] maint: Post-release version bump to 5.10.0
by Andrea Bolognani 06 Nov '19

06 Nov '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. configure.ac | 2 +- docs/news.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8b53b6ada9..233fbeaaf3 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], [5.9.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] +AC_INIT([libvirt], [5.10.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 d770e88eb0..4dd8dd6dcc 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -42,6 +42,14 @@ --> <libvirt> + <release version="v5.10.0" date="unreleased"> + <section title="New features"> + </section> + <section title="Improvements"> + </section> + <section title="Bug fixes"> + </section> + </release> <release version="v5.9.0" date="2019-11-05"> <section title="Packaging changes"> <change> -- 2.21.0

1 0

Re: [libvirt] [PATCH v3 REBASE 2 00/12] hostdev: handle usb detach/attach on node
by Dave Allan 05 Nov '19

05 Nov '19

[ bah, cc'ing the list this time ] On Tue, Nov 05, 2019 at 03:21:04PM -0500, Dave Allan wrote: >On Fri, Nov 01, 2019 at 07:48:46AM +0000, Nikolay Shirokovskiy wrote: >> >> >>On 31.10.2019 19:50, Dave Allan wrote: >>>On Thu, Oct 31, 2019 at 10:40:42AM +0000, Nikolay Shirokovskiy wrote: >>>> >>>> >>>>On 30.10.2019 23:21, Dave Allan wrote: >>>>>On Tue, Oct 29, 2019 at 11:17:51AM +0300, Nikolay Shirokovskiy wrote: >>>>>>Diff to v2[1] version: >>>>>>- add 'replug' attribute for hostdev element to allow replug semantics >>>>>>- avoid accuiring domain lock in event loop thread on udev events as >>>>>> suggested by Peter >>>>>>- nit picks after review by Daniel Henrique Barboza >>>>>> >>>>>>* is used to mark patches that were 'Reviewed-by' by Daniel (sometimes >>>>>> with very minor changes to take into account new replug flag). >>>>> >>>>>I did some basic testing today, and I'm seeing the device appear and disappear in the guest, which is great and much nicer than my ugly udev rule hack. I did find what I think is a bug though: if the USB device is plugged in at domain start, unplugging it while the domain is running does not cause it to disappear, and subsqeuently replugging it into the host causes a second instance of the device to appear in the guest. >>>> >>>>Hi. >>>> >>>>Hmm. Looks like you're using startupPolicy=optional otherwise it is not >>>>possible to start domain without a device. But in this case the whole replug thing >>>>is disabled and further I don't understand how the second instance of the device can appear. >>>> >>>>If device is present at domain start then replug is in play. And I cannot reproduce the bug. >>> >>>I am using startupPolicy optional, and I'm seeing the device attached and detached 100% of the time. I can start the domain with or without the device attached to the host, plug and unplug it and it appears and disappears from the guest, which is exactly the behavior I want. My domain XML is attached. >> >>Hi, >> >>did you actually see your device in guest or just some usb device? Because if domain is started without a device present on host then >>libvirt inserts dummy device which is unusable actually. And this dummy device is kept until the end even if you plug device on node. > >Sorry to be slow responding, I wanted to confirm that I could talk to the device in the guest. Today I wasn't able to reproduce the duplicate device in the guest. Eerything worked as I would expect: if the device wasn't plugged into the host, it wasn't shown by lsusb in the guest. Plugging in the device to the host caused it to appear in the guest. If the device was shown by lsusb in the guest I was able to talk to it. > >>Nikolay >> >>> >>>I tested a few more times just now, and I saw the duplicate device appear in the guest the first time I tried, but I have not been able to reproduce it again after that. >>> >>>>Can you clarify on you use case? >>> >>>My usecase is that I'm flashing the USB device with a program running in the VM. I keep the VM running, and when I need to reflash, I connect the device, so having the startupPolicy optional is useful. >>> >>>>Nikolay >>>> >>>>> >>>>>>Can be applied on: >>>>>> >>>>>>commit bf0e7bdeeb790bc6ba5732623be0d9ff26a5961a >>>>>>Author: Peter Krempa <pkrempa(a)redhat.com> >>>>>>Date: Thu Oct 24 15:50:50 2019 +0200 >>>>>> >>>>>> util: xml: Make virXMLFormatElement void >>>>>>[1] https://www.redhat.com/archives/libvir-list/2019-September/msg00321.html >>>>>> >>>>>>Nikolay Shirokovskiy (12): >>>>>> conf: add replug option for usb hostdev >>>>>> qemu: track hostdev delete intention >>>>>> *qemu: support host usb device unplug >>>>>> *qemu: support usb hostdev plugging back >>>>>> qemu: handle host usb device add/del udev events >>>>>> *qemu: handle libvirtd restart after host usb device unplug >>>>>> *qemu: handle race on device deletion and usb host device plugging >>>>>> qemu: hotplug: update device list on device deleted event >>>>>> *qemu: handle host usb device plug/unplug when libvirtd is down >>>>>> *qemu: don't mess with non mandatory hostdevs on reattaching >>>>>> qemu: handle detaching of unplugged hostdev >>>>>> *conf: parse hostdev missing flag >>>>>> >>>>>>docs/formatdomain.html.in | 10 +- >>>>>>docs/schemas/domaincommon.rng | 5 + >>>>>>src/conf/domain_conf.c | 62 +++ >>>>>>src/conf/domain_conf.h | 17 + >>>>>>src/qemu/Makefile.inc.am | 2 + >>>>>>src/qemu/qemu_conf.h | 3 + >>>>>>src/qemu/qemu_domain.c | 2 + >>>>>>src/qemu/qemu_domain.h | 2 + >>>>>>src/qemu/qemu_driver.c | 404 +++++++++++++++++- >>>>>>src/qemu/qemu_hotplug.c | 104 ++++- >>>>>>src/qemu/qemu_hotplug.h | 3 +- >>>>>>src/qemu/qemu_process.c | 60 +++ >>>>>>src/util/virhostdev.c | 2 + >>>>>>tests/qemuhotplugtest.c | 2 +- >>>>>>tests/qemuxml2argvdata/hostdev-usb-replug.xml | 36 ++ >>>>>>.../qemuxml2xmloutdata/hostdev-usb-replug.xml | 40 ++ >>>>>>tests/qemuxml2xmltest.c | 1 + >>>>>>17 files changed, 733 insertions(+), 22 deletions(-) >>>>>>create mode 100644 tests/qemuxml2argvdata/hostdev-usb-replug.xml >>>>>>create mode 100644 tests/qemuxml2xmloutdata/hostdev-usb-replug.xml >>>>>> >>>>>>-- >>>>>>2.23.0 >>>>>> >>>>>>-- >>>>>>libvir-list mailing list >>>>>>libvir-list(a)redhat.com >>>>>>https://www.redhat.com/mailman/listinfo/libvir-list >>>>>> >>>>>> >>

1 0

[libvirt] [PATCH v3 REBASE 2 00/12] hostdev: handle usb detach/attach on node
by Nikolay Shirokovskiy 05 Nov '19

05 Nov '19

Diff to v2[1] version: - add 'replug' attribute for hostdev element to allow replug semantics - avoid accuiring domain lock in event loop thread on udev events as suggested by Peter - nit picks after review by Daniel Henrique Barboza * is used to mark patches that were 'Reviewed-by' by Daniel (sometimes with very minor changes to take into account new replug flag). Can be applied on: commit bf0e7bdeeb790bc6ba5732623be0d9ff26a5961a Author: Peter Krempa <pkrempa(a)redhat.com> Date: Thu Oct 24 15:50:50 2019 +0200 util: xml: Make virXMLFormatElement void [1] https://www.redhat.com/archives/libvir-list/2019-September/msg00321.html Nikolay Shirokovskiy (12): conf: add replug option for usb hostdev qemu: track hostdev delete intention *qemu: support host usb device unplug *qemu: support usb hostdev plugging back qemu: handle host usb device add/del udev events *qemu: handle libvirtd restart after host usb device unplug *qemu: handle race on device deletion and usb host device plugging qemu: hotplug: update device list on device deleted event *qemu: handle host usb device plug/unplug when libvirtd is down *qemu: don't mess with non mandatory hostdevs on reattaching qemu: handle detaching of unplugged hostdev *conf: parse hostdev missing flag docs/formatdomain.html.in | 10 +- docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 62 +++ src/conf/domain_conf.h | 17 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_conf.h | 3 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 404 +++++++++++++++++- src/qemu/qemu_hotplug.c | 104 ++++- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_process.c | 60 +++ src/util/virhostdev.c | 2 + tests/qemuhotplugtest.c | 2 +- tests/qemuxml2argvdata/hostdev-usb-replug.xml | 36 ++ .../qemuxml2xmloutdata/hostdev-usb-replug.xml | 40 ++ tests/qemuxml2xmltest.c | 1 + 17 files changed, 733 insertions(+), 22 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-usb-replug.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-usb-replug.xml -- 2.23.0

4 17

[libvirt] [PATCH 0/9] support use of precreated tap devices from unprivileged libvirtd
by Laine Stump 05 Nov '19

05 Nov '19

This resolves https://bugzilla.redhat.com/1723367 It has become more popular to run libvirtd in an unprivileged environment (e.g. inside a container), but until now the only possible types of network connection for a qemu started by an unprivileged libvirtd were: 1) a usermode slirp connection 2) a tap device connection to a bridge handled by running qemu-bridge-helper (a suid-root utility distributed with qemu) 3) a host network card assigned to the guest using VFIO (this requires special setup by a privileged process though) This patch series remedies that by making it possible for libvirtd to use a tap device that has been pre-created (*and* properly setup) by some other process beforehand. In order to use this, you must have a standard tap, or macvtap device that has been set to be owned by the uid that will be running libvirtd, has its MAC address already set, and has been set online (IFF_UP). For example, here are the commands to create a standard tap device named "mytap0", attach it to the host bridge device "br0" and prepare it for use by a libvirtd that is running as user "laine": ip tuntap add mode tap user laine group laine name mytap0 ip link set mytap0 up ip link set mytap0 master br0 (You may want to set a specific MAC address for the tap device, but as long as it *doesn't* match the MAC address used by the guest emulated device, it really doesn't matter) You can now add the following <interface> to a domain definition: <interface type='ethernet'> <model type='virtio'/> <mac address='52:54:00:11:11:11'/> <target dev='mytap0' managed='no'/> </interface> and start up the guest. A similar set of commands to create a macvtap device named "mymacvtap0" with MAC addres 52:54:00:11:11:11 connected to the host device "en2" would be something like this: ip link add link en2 name mymacvtap0 address 52:54:00:11:11:11 \ type macvtap mode bridge ip link set mymacvtap0 up The XML would be identical, except the name of the device <interface type='ethernet'> <model type='virtio'/> <mac address='52:54:00:11:11:11'/> <target dev='mymacvtap0' managed='no'/> </interface> (Note that in the case of macvtap, the precreated device must *match* the MAC address of the emulated guest device). If libvirtd is given a precreated device, that device will *not* be explicitly deleted when qemu is finished with it - the caller must take care of that. Laine Stump (9): util: new function virNetDevMacVLanIsMacvtap() util: make a couple virNetDevMacVlan*() functions public qemu: reorganize qemuInterfaceEthernetConnect() conf: use virXMLFormatElement for interface <target> conf: new "managed" attribute for target dev of <interface type='ethernet'> qemu: support unmanaged target tap dev for <interface type='ethernet'> qemu: support unmanaged macvtap devices with <interface type='ethernet'> qemu: explicitly delete standard tap devices only on platforms that require it docs: update news file docs/formatdomain.html.in | 48 +++++++--- docs/news.xml | 13 +++ docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_conf.c | 55 +++++++++--- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 3 + src/qemu/qemu_interface.c | 89 ++++++++++++------- src/qemu/qemu_process.c | 6 +- src/util/virnetdev.h | 2 +- src/util/virnetdevmacvlan.c | 35 ++++++-- src/util/virnetdevmacvlan.h | 12 +++ .../net-eth-unmanaged-tap.args | 32 +++++++ .../net-eth-unmanaged-tap.xml | 35 ++++++++ tests/qemuxml2argvmock.c | 16 +++- tests/qemuxml2argvtest.c | 1 + .../net-eth-unmanaged-tap.xml | 40 +++++++++ tests/qemuxml2xmltest.c | 1 + 17 files changed, 329 insertions(+), 65 deletions(-) create mode 100644 tests/qemuxml2argvdata/net-eth-unmanaged-tap.args create mode 100644 tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml create mode 100644 tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml -- 2.21.0

4 22

[libvirt] [PATCH v2 0/2] gitdm: Update configuration
by Andrea Bolognani 05 Nov '19

05 Nov '19

Changes from [v1]: * added a few more addresses. [v1] https://www.redhat.com/archives/libvir-list/2019-October/msg01095.html Andrea Bolognani (2): gitdm: Fix sorting gitdm: Add missing entries docs/gitdm/companies/others | 4 +++- docs/gitdm/groups/opensource | 1 + docs/gitdm/groups/unaffiliated | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) -- 2.21.0

2 4

[libvirt] [PATCH v2 0/2] news: Update for 5.9.0 release
by Andrea Bolognani 04 Nov '19

04 Nov '19

You know the drill. Andrea Bolognani (2): news: Document more possible sections news: Update for 5.9.0 release docs/news.xml | 103 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 2 deletions(-) -- 2.21.0

2 4

[libvirt] [PATCH] docs: Fix attribute names in filesystem/driver example
by Jim Fehlig 04 Nov '19

04 Nov '19

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7619c88514..84257c1bb4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3847,7 +3847,7 @@ <readonly/> </filesystem> <filesystem type='file' accessmode='passthrough'> - <driver name='loop' type='raw'/> + <driver type='loop' format='raw'/> <driver type='path' wrpolicy='immediate'/> <source file='/export/to/guest.img'/> <target dir='/import/from/host'/> -- 2.23.0

2 2

[libvirt] [PATCH Rust] api_tests.py: update to use Python 3
by liushuyu＠aosc.io 01 Nov '19

01 Nov '19

From: liushuyu <liushuyu011(a)gmail.com> --- tools/api_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/api_tests.py b/tools/api_tests.py index b26ec34..9e66c92 100644 --- a/tools/api_tests.py +++ b/tools/api_tests.py @@ -47,10 +47,10 @@ def main(): else: missing.add(el) - print "missing: %s, implemented: %s" % (len(missing), len(implemented)) - print "missing:" + print("missing: %s, implemented: %s" % (len(missing), len(implemented))) + print("missing:") for x in missing: - print x.attrib + print(x.attrib) #print "implemented:" #for x in implemented: # print x.attrib -- 2.23.0

1 0

[libvirt] [PATCH Rust] api_tests.py: update to use Python 3
by liushuyu＠aosc.io 01 Nov '19

01 Nov '19

From: liushuyu <liushuyu011(a)gmail.com> --- tools/api_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/api_tests.py b/tools/api_tests.py index b26ec34..9e66c92 100644 --- a/tools/api_tests.py +++ b/tools/api_tests.py @@ -47,10 +47,10 @@ def main(): else: missing.add(el) - print "missing: %s, implemented: %s" % (len(missing), len(implemented)) - print "missing:" + print("missing: %s, implemented: %s" % (len(missing), len(implemented))) + print("missing:") for x in missing: - print x.attrib + print(x.attrib) #print "implemented:" #for x in implemented: # print x.attrib -- 2.23.0

1 0

[libvirt] Entering freeze for libvirt 5.9.0
by Daniel Veillard 01 Nov '19

01 Nov '19

We are getting close to the end of the month, a lot of developers are at KVM Forum in Lyon, so starting the release process now looks a good idea. I have tagged the RC1 in git and pushed signed tarball and source rpm to the usual place: https://libvirt.org/sources/ Seems to work in my limited testing, the Ci is almost all green https://ci.centos.org/view/libvirt/ so things looks good in my perspective. Please give it a try, I will try to push RC2 on Wednesday, and based on feedback roll the release on Friday or during the week-end, thanks in advance, 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/

3 6

[libvirt] [PULL 0/9] Ide patches
by John Snow 01 Nov '19

01 Nov '19

The following changes since commit 68d8ef4ec540682c3538d4963e836e43a211dd17: Merge remote-tracking branch 'remotes/stsquad/tags/pull-tcg-plugins-281019-4' into staging (2019-10-30 14:10:32 +0000) are available in the Git repository at: https://github.com/jnsnow/qemu.git tags/ide-pull-request for you to fetch changes up to c35564caf20e8d3431786dddf0fa513daa7d7f3c: hd-geo-test: Add tests for lchs override (2019-10-31 06:11:34 -0400) ---------------------------------------------------------------- Pull request ---------------------------------------------------------------- John Snow (1): IDE: deprecate ide-drive Sam Eiderman (8): block: Refactor macros - fix tabbing block: Support providing LCHS from user bootdevice: Add interface to gather LCHS scsi: Propagate unrealize() callback to scsi-hd bootdevice: Gather LCHS from all relevant devices bootdevice: Refactor get_boot_devices_list bootdevice: FW_CFG interface for LCHS values hd-geo-test: Add tests for lchs override qemu-deprecated.texi | 5 + include/hw/block/block.h | 22 +- include/hw/scsi/scsi.h | 1 + include/sysemu/sysemu.h | 4 + bootdevice.c | 147 +++++++-- hw/block/virtio-blk.c | 6 + hw/ide/qdev.c | 10 +- hw/nvram/fw_cfg.c | 14 +- hw/scsi/scsi-bus.c | 16 + hw/scsi/scsi-disk.c | 12 + tests/hd-geo-test.c | 551 ++++++++++++++++++++++++++++++++++ tests/Makefile.include | 2 +- tests/qemu-iotests/051.pc.out | 6 +- 13 files changed, 753 insertions(+), 43 deletions(-) -- 2.21.0

6 16