- Devel - libvirt List Archives

[libvirt PATCH 0/2] Run full unit tests on i686 too
by Daniel P. Berrangé 02 Nov '20

02 Nov '20

Daniel P. Berrangé (2): gitlab: run unit tests in i686 cross build scripts: trim "__attribute__((packed))" in RPC struct diff .gitlab-ci.yml | 1 + scripts/check-remote-protocol.py | 6 ++++++ 2 files changed, 7 insertions(+) -- 2.28.0

2 3

[PATCH] storagepoolxml2argvtest: Populate test entries for macOS
by Roman Bolshakov 31 Oct '20

31 Oct '20

One of the cases fails on macOS: 15) Storage Pool XML-2-argv pool-netfs-gluster ... In '/Users/roolebo/dev/libvirt/tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv': Offset 39 Expect [-o direct-io-mode=1 /mnt/gluster] Actual [/mnt/gluster -o direct-io-mode=1] glusterfs has not been tested on macOS but for now we can just make tests happy by providing them with the data they expect. Likely, there'll be updates to the argv files in the future. storagepoolxml2argvtest passes after the change. Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- tests/storagepoolxml2argvdata/pool-fs-darwin.argv | 1 + tests/storagepoolxml2argvdata/pool-netfs-auto-darwin.argv | 1 + tests/storagepoolxml2argvdata/pool-netfs-cifs-darwin.argv | 1 + tests/storagepoolxml2argvdata/pool-netfs-darwin.argv | 1 + tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv | 1 + .../storagepoolxml2argvdata/pool-netfs-protocol-ver-darwin.argv | 1 + tests/storagepoolxml2argvtest.c | 2 ++ 7 files changed, 8 insertions(+) create mode 100644 tests/storagepoolxml2argvdata/pool-fs-darwin.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-auto-darwin.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-cifs-darwin.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-darwin.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-darwin.argv diff --git a/tests/storagepoolxml2argvdata/pool-fs-darwin.argv b/tests/storagepoolxml2argvdata/pool-fs-darwin.argv new file mode 100644 index 0000000000..537ce4cee5 --- /dev/null +++ b/tests/storagepoolxml2argvdata/pool-fs-darwin.argv @@ -0,0 +1 @@ +mount -t ext3 /dev/sda6 /mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-auto-darwin.argv b/tests/storagepoolxml2argvdata/pool-netfs-auto-darwin.argv new file mode 100644 index 0000000000..888a0161b8 --- /dev/null +++ b/tests/storagepoolxml2argvdata/pool-netfs-auto-darwin.argv @@ -0,0 +1 @@ +mount localhost:/var/lib/libvirt/images /mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-cifs-darwin.argv b/tests/storagepoolxml2argvdata/pool-netfs-cifs-darwin.argv new file mode 100644 index 0000000000..2fef6f5782 --- /dev/null +++ b/tests/storagepoolxml2argvdata/pool-netfs-cifs-darwin.argv @@ -0,0 +1 @@ +mount -t cifs //example.com/samba_share /mnt/cifs -o guest diff --git a/tests/storagepoolxml2argvdata/pool-netfs-darwin.argv b/tests/storagepoolxml2argvdata/pool-netfs-darwin.argv new file mode 100644 index 0000000000..04127c5087 --- /dev/null +++ b/tests/storagepoolxml2argvdata/pool-netfs-darwin.argv @@ -0,0 +1 @@ +mount -t nfs localhost:/var/lib/libvirt/images /mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv b/tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv new file mode 100644 index 0000000000..97be9cbeb3 --- /dev/null +++ b/tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv @@ -0,0 +1 @@ +mount -t glusterfs example.com:/volume /mnt/gluster -o direct-io-mode=1 diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-darwin.argv b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-darwin.argv new file mode 100644 index 0000000000..f26656d5b8 --- /dev/null +++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-darwin.argv @@ -0,0 +1 @@ +mount -t nfs localhost:/var/lib/libvirt/images /mnt -o nfsvers=3 diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtest.c index 967d1f21a8..ecce3ab7d0 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -126,6 +126,8 @@ mymain(void) const char *platform = "-linux"; #elif defined(__FreeBSD__) const char *platform = "-freebsd"; +#elif defined(__APPLE__) + const char *platform = "-darwin"; #else const char *platform = ""; #endif -- 2.28.0

2 2

[PATCH] tests: Enable virpcimock on macOS
by Roman Bolshakov 31 Oct '20

31 Oct '20

In general, it has little sense to use Linux pci mock on macOS but virPCIDeviceAddressGetIOMMUGroupNum() is relying on the filesystem layout mocked by virpcimock. And all tests that rely on correct execution of virPCIDeviceAddressGetIOMMUGroupNum() fail. Additionally, missing initialization is added to close() to avoid invocation of real_close() before it's set up. The change fixes qemuhotplugtest, qemumemlocktest and qemuxml2xmltest. Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- tests/virpcimock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 064218d275..5cd688c825 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -18,7 +18,7 @@ #include <config.h> -#if defined(__linux__) || defined(__FreeBSD__) +#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) # include "virmock.h" # include <unistd.h> # include <fcntl.h> @@ -1123,6 +1123,8 @@ opendir(const char *path) int close(int fd) { + init_syms(); + if (remove_fd(fd) < 0) return -1; return real_close(fd); -- 2.28.0

2 2

[libvirt PATCH v6 1/2] news: mention vdpa support
by Jonathon Jongsma 31 Oct '20

31 Oct '20

Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- NEWS.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 2fef3f706c..384ee94480 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -43,6 +43,12 @@ v6.9.0 (unreleased) Implement virito-9p shared filesystem using the ``<filesystem/>`` element. + * qemu: Add support for vDPA network devices. + + VMs using the QEMU hypervisor can now specify vDPA network devices using + ``<interface type='vdpa'>``. Host vDPA devices are also now included in the + node device APIs. + * **Improvements** * **Bug fixes** -- 2.26.2

2 3

[PATCH] docs/system: Deprecate raspi2/raspi3 machine aliases
by Philippe Mathieu-Daudé 30 Oct '20

30 Oct '20

Since commit aa35ec2213b ("hw/arm/raspi: Use more specific machine names") the raspi2/raspi3 machines have been renamed as raspi2b/raspi3b. As more Raspberry Pi 2/3 models are emulated, in order to avoid confusion deprecate the raspi2/raspi3 machine aliases. Signed-off-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> --- docs/system/deprecated.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 905628f3a0c..f0c7aaeb2ff 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -355,6 +355,11 @@ This machine has been renamed ``fuloong2e``. These machine types are very old and likely can not be used for live migration from old QEMU versions anymore. A newer machine type should be used instead. +Raspberry Pi ``raspi2`` and ``raspi3`` machines (since 5.2) +''''''''''''''''''''''''''''''''''''' + +These machines have been respectively renamed ``raspi2b`` and ``raspi3b``. + Device options -------------- -- 2.26.2

3 5

Entering freeze for libvirt-6.9.0
by Jiri Denemark 30 Oct '20

30 Oct '20

I have just tagged v6.9.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://libvirt.org/sources/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

3 3

[libvirt PATCH] tests: fix stat mocking with Fedora rawhide
by Daniel P. Berrangé 30 Oct '20

30 Oct '20

GLibC has a really complicated way of dealing with the 'stat' function historically, which means our mocks in turn have to look at four different possible functions to replace, stat, stat64, __xstat, __xstat64. In Fedora 33 and earlier: - libvirt.so links to __xstat64 - libc.so library exports stat, stat64, __xstat, __xstat64 - sys/stat.h header exposes stat and __xstat In Fedora 34 rawhide: - libvirt.so links to stat64 - libc.so library exports stat, stat64, __xstat, __xstat64 - sys/stat.h header exposes stat Historically we only looked at the exported symbols from libc.so to decide which to mock. In F34 though we must not consider __xstat / __xstat64 though because they only existance for binary compatibility. Newly built binaries won't reference them. Thus we must introduce a header file check into our logic for deciding which symbol to mock. We must ignore the __xstat / __xstat64 symbols if they don't appear in the sys/stat.h header, even if they appear in libc.so Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Validated with this pipeline: https://gitlab.com/berrange/libvirt/-/pipelines/209361200 meson.build | 28 ++++++++++++----- tests/virmockstathelpers.c | 62 ++++++++++++++++++++++---------------- 2 files changed, 56 insertions(+), 34 deletions(-) diff --git a/meson.build b/meson.build index c3ba34bbe0..365c16d167 100644 --- a/meson.build +++ b/meson.build @@ -636,10 +636,6 @@ libvirt_export_dynamic = cc.first_supported_link_argument([ # check availability of various common functions (non-fatal if missing) functions = [ - '__lxstat', - '__lxstat64', - '__xstat', - '__xstat64', 'elf_aux_info', 'fallocate', 'getauxval', @@ -653,8 +649,6 @@ functions = [ 'getuid', 'getutxid', 'if_indextoname', - 'lstat', - 'lstat64', 'mmap', 'newlocale', 'pipe2', @@ -666,12 +660,23 @@ functions = [ 'setgroups', 'setns', 'setrlimit', - 'stat', - 'stat64', 'symlink', 'sysctlbyname', ] +stat_functions = [ + '__lxstat', + '__lxstat64', + '__xstat', + '__xstat64', + 'lstat', + 'lstat64', + 'stat', + 'stat64', +] + +functions += stat_functions + foreach function : functions if cc.has_function(function) conf.set('WITH_@0@'.format(function.to_upper()), 1) @@ -679,6 +684,13 @@ foreach function : functions endforeach +foreach function : stat_functions + if cc.has_header_symbol('sys/stat.h', function) + conf.set('WITH_@0@_DECL'.format(function.to_upper()), 1) + endif +endforeach + + # various header checks headers = [ diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c index 5c9759551d..3bd2437ffe 100644 --- a/tests/virmockstathelpers.c +++ b/tests/virmockstathelpers.c @@ -67,39 +67,49 @@ * - If __xstat & __xstat64 exist, then stat & stat64 will not exist * as symbols in the library, so the latter should not be mocked. * + * - If __xstat exists in the library, but not the header than it + * it is just there for binary back compat and should not be + * mocked + * * The same all applies to lstat() */ +#if !defined(WITH___XSTAT_DECL) +# if defined(WITH_STAT) +# if !defined(WITH___XSTAT) && !defined(WITH_STAT64) || defined(__APPLE__) +# define MOCK_STAT +# endif +# endif +# if defined(WITH_STAT64) +# define MOCK_STAT64 +# endif +#else /* WITH___XSTAT_DECL */ +# if defined(WITH___XSTAT) && !defined(WITH___XSTAT64) +# define MOCK___XSTAT +# endif +# if defined(WITH___XSTAT64) +# define MOCK___XSTAT64 +# endif +#endif /* WITH___XSTAT_DECL */ -#if defined(WITH_STAT) -# if !defined(WITH___XSTAT) && !defined(WITH_STAT64) || defined(__APPLE__) -# define MOCK_STAT +#if !defined(WITH___LXSTAT_DECL) +# if defined(WITH_LSTAT) +# if !defined(WITH___LXSTAT) && !defined(WITH_LSTAT64) || defined(__APPLE__) +# define MOCK_LSTAT +# endif # endif -#endif -#if defined(WITH_STAT64) && !defined(WITH___XSTAT64) -# define MOCK_STAT64 -#endif -#if defined(WITH___XSTAT) && !defined(WITH___XSTAT64) -# define MOCK___XSTAT -#endif -#if defined(WITH___XSTAT64) -# define MOCK___XSTAT64 -#endif -#if defined(WITH_LSTAT) -# if !defined(WITH___LXSTAT) && !defined(WITH_LSTAT64) || defined(__APPLE__) -# define MOCK_LSTAT +# if defined(WITH_LSTAT64) +# define MOCK_LSTAT64 # endif -#endif -#if defined(WITH_LSTAT64) && !defined(WITH___LXSTAT64) -# define MOCK_LSTAT64 -#endif -#if defined(WITH___LXSTAT) && !defined(WITH___LXSTAT64) -# define MOCK___LXSTAT -#endif -#if defined(WITH___LXSTAT64) -# define MOCK___LXSTAT64 -#endif +#else /* WITH___LXSTAT_DECL */ +# if defined(WITH___LXSTAT) && !defined(WITH___LXSTAT64) +# define MOCK___LXSTAT +# endif +# if defined(WITH___LXSTAT64) +# define MOCK___LXSTAT64 +# endif +#endif /* WITH___LXSTAT_DECL */ #ifdef MOCK_STAT static int (*real_stat)(const char *path, struct stat *sb); -- 2.28.0

2 2

[PATCH] rpm: Fix handling of SOURCE_DATE_EPOCH
by Neal Gompa 29 Oct '20

29 Oct '20

Contemporary versions of Fedora automatically set SOURCE_DATE_EPOCH based on the changelog entry date stamp. In scenarios where it already is defined, we do not want to redefine it. Additionally, when building the libvirt package in an Open Build Service instance, the spec file is not present in %_specdir, but instead in %_sourcedir. Signed-off-by: Neal Gompa <ngompa13(a)gmail.com> --- libvirt.spec.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2a4324b974..eb0fba4b5a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1128,7 +1128,16 @@ exit 1 # place macros above and build commands below this comment -export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) +if [ -z "${SOURCE_DATE_EPOCH}" ]; then +# If SOURCE_DATE_EPOCH is not defined, set it based on spec file + if [ ! -f "%{_specdir}/%{name}.spec" ]; then + # OBS does not install the spec file into the specdir + SPECFILE_PATH="%{_sourcedir}/%{name}.spec" + else + SPECFILE_PATH="%{_specdir}/%{name}.spec" + fi + export SOURCE_DATE_EPOCH=$(stat --printf='%Y' ${SPECFILE_PATH}) +fi %meson \ -Drunstatedir=%{_rundir} \ -- 2.28.0

3 9

[libvirt PATCH 0/2] Fix disabling of libssh/libssh2 in RPM build
by Daniel P. Berrangé 29 Oct '20

29 Oct '20

RHEL builds disable libssh2, and build root lack libssh2-devel. The RPM build fails though because meson looks for libssh2 and has it set to "enabled", not "auto" or "disabled". Daniel P. Berrangé (2): rpm: remove with_bash_completion condition rpm: tell meson whether to use libssh or libssh2 explicitly libvirt.spec.in | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) -- 2.26.2

3 7

[PATCH 0/3] qemu: sync backing chain update in virDomainGetBlockJobInfo
by Nikolay Shirokovskiy 29 Oct '20

29 Oct '20

The issue is desciribed in detail in last patch. I've already tried to address it in [1]. It was not good at all. Actually it was waiting for event processing in worker thread but that processing blocked by qemuDomainGetBlockJobInfo itself holding the job. Now with help of the 1st patch the block job event offloaded to the worker thread can be processed in qemuDomainGetBlockJobInfo. [1] [PATCH 1/1] qemu: sync blockjob finishing in qemuDomainGetBlockJobInfo https://www.redhat.com/archives/libvir-list/2019-November/msg01366.html Nikolay Shirokovskiy (3): qemu: add option to process offloaded legacy blockjob event ealier qemu: update legacy block job sync after offloading changes qemu: sync backing chain update in virDomainGetBlockJobInfo src/qemu/qemu_driver.c | 26 ++++++++++++-------------- src/qemu/qemu_process.c | 28 +++++++++++++++++++--------- 2 files changed, 31 insertions(+), 23 deletions(-) -- 1.8.3.1

2 8

question regarding systemd ordering of libvirt services
by Jim Fehlig 29 Oct '20

29 Oct '20

Hi All, I'm not sure if the following problem is in systemd or libvirt. When restarting services and sockets *and* libvirt-guests.service is running, the latter will sometimes hang when trying to connect to libvirtd. Even though libvirt-guests has 'Wants=libvirtd.service' and 'After=libvirtd.service', we can see via journalctl that it is not shutdown before libvirtd when executing something like systemctl try-restart libvirtd.service libvirtd.socket libvirtd-ro.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virt-guest-shutdown.target Oct 28 15:53:31 systemd[1]: Stopping Virtualization daemon... Oct 28 15:53:31 systemd[1]: libvirtd.service: Succeeded. Oct 28 15:53:31 systemd[1]: Stopped Virtualization daemon. Oct 28 15:53:31 systemd[1]: libvirtd-admin.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Libvirt admin socket. Oct 28 15:53:31 systemd[1]: Stopping Libvirt admin socket. Oct 28 15:53:31 systemd[1]: libvirtd-ro.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Libvirt local read-only socket. Oct 28 15:53:31 systemd[1]: Stopping Libvirt local read-only socket. Oct 28 15:53:31 systemd[1]: libvirtd.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Libvirt local socket. Oct 28 15:53:31 systemd[1]: Stopping Libvirt local socket. Oct 28 15:53:31 systemd[1]: Listening on Libvirt local socket. Oct 28 15:53:31 systemd[1]: Listening on Libvirt admin socket. Oct 28 15:53:31 systemd[1]: Listening on Libvirt local read-only socket. Oct 28 15:53:31 systemd[1]: virtlockd.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Virtual machine lock manager socket. Oct 28 15:53:31 systemd[1]: Stopping Virtual machine lock manager socket. Oct 28 15:53:31 systemd[1]: Listening on Virtual machine lock manager socket. Oct 28 15:53:31 systemd[1]: virtlogd.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Virtual machine log manager socket. Oct 28 15:53:31 systemd[1]: Stopping Virtual machine log manager socket. Oct 28 15:53:31 systemd[1]: Listening on Virtual machine log manager socket. Oct 28 15:53:31 systemd[1]: Stopping Suspend/Resume Running libvirt Guests... In this case, the try-restart command hung and libvirt-guests was stuck trying to connect to libvirtd. In the following case, the try-restart worked since libvirtd was started again before libvirt-guests was stopped! Oct 28 15:19:02 systemd[1]: Stopping Virtualization daemon... Oct 28 15:19:02 systemd[1]: Stopped Virtualization daemon. Oct 28 15:19:02 systemd[1]: Closed Libvirt admin socket. Oct 28 15:19:02 systemd[1]: Stopping Libvirt admin socket. Oct 28 15:19:02 systemd[1]: Closed Virtual machine lock manager socket. Oct 28 15:19:02 systemd[1]: Stopping Virtual machine lock manager socket. Oct 28 15:19:02 systemd[1]: Listening on Virtual machine lock manager socket. Oct 28 15:19:02 systemd[1]: Closed Libvirt local read-only socket. Oct 28 15:19:02 systemd[1]: Stopping Libvirt local read-only socket. Oct 28 15:19:02 systemd[1]: Closed Libvirt local socket. Oct 28 15:19:02 systemd[1]: Stopping Libvirt local socket. Oct 28 15:19:02 systemd[1]: Listening on Libvirt local socket. Oct 28 15:19:02 systemd[1]: Listening on Libvirt admin socket. Oct 28 15:19:02 systemd[1]: Listening on Libvirt local read-only socket. Oct 28 15:19:02 systemd[1]: Closed Virtual machine log manager socket. Oct 28 15:19:02 systemd[1]: Stopping Virtual machine log manager socket. Oct 28 15:19:02 systemd[1]: Listening on Virtual machine log manager socket. Oct 28 15:19:02 systemd[1]: Starting Virtualization daemon... Oct 28 15:19:02 systemd[1]: Stopping Suspend/Resume Running libvirt Guests... Oct 28 15:19:02 systemd[1]: Started Virtualization daemon. Oct 28 15:19:02 libvirt-guests.sh[4912]: Running guests on default URI: no running guests. Oct 28 15:19:02 systemd[1]: Stopped Suspend/Resume Running libvirt Guests. Oct 28 15:19:02 systemd[1]: Stopped target Libvirt guests shutdown. Oct 28 15:19:02 systemd[1]: Stopping Libvirt guests shutdown. Oct 28 15:19:02 systemd[1]: Reached target Libvirt guests shutdown. Oct 28 15:19:02 systemd[1]: Starting Suspend/Resume Running libvirt Guests... Oct 28 15:19:02 systemd[1]: Started Suspend/Resume Running libvirt Guests. Adding 'Requires=libvirtd.service' to virt-guest-shutdown.target results in something more reasonable Oct 28 15:40:00 systemd[1]: Stopping Suspend/Resume Running libvirt Guests... Oct 28 15:40:00 libvirt-guests.sh[5245]: Running guests on default URI: no running guests. Oct 28 15:40:00 systemd[1]: Stopped Suspend/Resume Running libvirt Guests. Oct 28 15:40:00 systemd[1]: Stopped target Libvirt guests shutdown. Oct 28 15:40:00 systemd[1]: Stopping Libvirt guests shutdown. Oct 28 15:40:00 systemd[1]: Stopping Virtualization daemon... Oct 28 15:40:00 systemd[1]: Stopped Virtualization daemon. Oct 28 15:40:00 systemd[1]: Closed Virtual machine log manager socket. Oct 28 15:40:00 systemd[1]: Stopping Virtual machine log manager socket. Oct 28 15:40:00 systemd[1]: Listening on Virtual machine log manager socket. Oct 28 15:40:00 systemd[1]: Closed Libvirt admin socket. Oct 28 15:40:00 systemd[1]: Stopping Libvirt admin socket. Oct 28 15:40:00 systemd[1]: Closed Libvirt local read-only socket. Oct 28 15:40:00 systemd[1]: Stopping Libvirt local read-only socket. Oct 28 15:40:00 systemd[1]: Closed Libvirt local socket. Oct 28 15:40:00 systemd[1]: Stopping Libvirt local socket. Oct 28 15:40:00 systemd[1]: Listening on Libvirt local socket. Oct 28 15:40:00 systemd[1]: Listening on Libvirt admin socket. Oct 28 15:40:00 systemd[1]: Listening on Libvirt local read-only socket. Oct 28 15:40:00 systemd[1]: Closed Virtual machine lock manager socket. Oct 28 15:40:00 systemd[1]: Stopping Virtual machine lock manager socket. Oct 28 15:40:00 systemd[1]: Listening on Virtual machine lock manager socket. Oct 28 15:40:00 systemd[1]: Starting Virtualization daemon... Oct 28 15:40:00 systemd[1]: Started Virtualization daemon. Oct 28 15:40:00 systemd[1]: Reached target Libvirt guests shutdown. Oct 28 15:40:00 systemd[1]: Starting Suspend/Resume Running libvirt Guests... Oct 28 15:40:00 systemd[1]: Started Suspend/Resume Running libvirt Guests. I found that 'Wants=libvirtd.service' in virt-guest-shutdown.target was not strong enough. Should virt-guest-shutdown.target 'Requires=libvirtd.service', or do I need to look closer at systemd (systemd-246)? Regards, Jim

1 0

[PATCH] Revert "spec: Simplify setting features off by default"
by Neal Gompa 29 Oct '20

29 Oct '20

As it turns out, the rather complicated structure that is currently used for enabling or disabling features in the libvirt build does not cleanly map well to RPM's bcond feature. Consequently, we need these back in order to support trivially activating these features through extra macros as build inputs. This reverts commit 31d687a3218c9072d7050dd608e013e063ca180f. Signed-off-by: Neal Gompa <ngompa13(a)gmail.com> --- libvirt.spec.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2a4324b974..84515cc7de 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -98,14 +98,14 @@ %define with_numactl 0%{!?_without_numactl:1} # A few optional bits off by default, we enable later -%define with_fuse 0 -%define with_sanlock 0 -%define with_numad 0 -%define with_firewalld_zone 0 -%define with_libssh2 0 -%define with_wireshark 0 -%define with_libssh 0 -%define with_dmidecode 0 +%define with_fuse 0%{!?_without_fuse:0} +%define with_sanlock 0%{!?_without_sanlock:0} +%define with_numad 0%{!?_without_numad:0} +%define with_firewalld_zone 0%{!?_without_firewalld:0} +%define with_libssh2 0%{!?_without_libssh2:0} +%define with_wireshark 0%{!?_without_wireshark:0} +%define with_libssh 0%{!?_without_libssh:0} +%define with_dmidecode 0%{!?_without_dmidecode:0} # Finally set the OS / architecture specific special cases -- 2.28.0

3 5

[PATCH 00/12] use g_autoptr for all DIR*
by Laine Stump 29 Oct '20

29 Oct '20

I don't even remember why I started looking at this. I think that again I was considering changing some function, and making the DIR* in that function autoclose was a prerequisite for a reasonably clean addition to the function. I eventually gave up on the other plan (probably because it was a bad idea), but decided that the DIR*'s really did need to autoclose. In the end, all uses of DIR* could be easily converted to use g_autoptr. Laine Stump (12): consistently use VIR_DIR_CLOSE() instead of virDirClose() tools: reduce scope of a DIR* in virHostValidateIOMMU() storage: remove extraneous call to VIR_DIR_CLOSE() util: reduce scope of a DIR * in virCgroupV1SetOwner() util: manually set dirp to NULL after closing in virCapabilitiesInitCache() util: change virDirClose to take a DIR* instead of DIR**. util: declare g_autoptr cleanup function to auto-close DIR* change DIR* int g_autoptr(DIR) where appropriate conf: convert final DIR* to g_autoptr util: remove unused VIR_DIR_CLOSE() macro util: refactor function to simplify and remove label remove unnecessary cleanup labels and unused return variables src/bhyve/bhyve_capabilities.c | 3 +- src/conf/capabilities.c | 5 +- src/conf/virdomainobjlist.c | 3 +- src/conf/virnetworkobj.c | 44 +++++--------- src/conf/virnwfilterbindingobjlist.c | 3 +- src/conf/virnwfilterobj.c | 3 +- src/conf/virsecretobj.c | 3 +- src/conf/virstorageobj.c | 6 +- src/openvz/openvz_conf.c | 3 +- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_interop_config.c | 14 ++--- src/security/security_selinux.c | 8 +-- src/storage/storage_backend_iscsi.c | 3 +- src/storage/storage_util.c | 69 ++++++++------------- src/util/vircgroup.c | 23 +++---- src/util/vircgroupv1.c | 5 +- src/util/vircommand.c | 12 ++-- src/util/virdevmapper.c | 9 +-- src/util/virfile.c | 65 ++++++++------------ src/util/virfile.h | 4 +- src/util/virhook.c | 8 +-- src/util/virhostcpu.c | 6 +- src/util/virnetdev.c | 13 ++-- src/util/virnuma.c | 24 +++----- src/util/virpci.c | 91 +++++++++++----------------- src/util/virprocess.c | 3 +- src/util/virresctrl.c | 30 ++++----- src/util/virscsi.c | 32 ++++------ src/util/virscsihost.c | 3 +- src/util/virusb.c | 3 +- src/util/virutil.c | 26 +++----- src/util/virvhba.c | 20 +++--- tests/testutilsqemu.c | 35 ++++------- tests/virschematest.c | 3 +- tools/virt-host-validate-common.c | 4 +- 35 files changed, 206 insertions(+), 386 deletions(-) -- 2.26.2

2 15

[PATCH] node_device: fix leak of DIR*
by Laine Stump 28 Oct '20

28 Oct '20

Commit 53aec799fa31 introduced the function udevGetVDPACharDev(), which scans a directory using virDirOpenIfExists() and virDirRead(). It unfortunately forgets to close the DIR* when it is finished with it. This patch fixes that omission. Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/node_device/node_device_udev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index b1b8427c05..ec0bf9192b 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1162,6 +1162,7 @@ udevGetVDPACharDev(const char *sysfs_path, virReportError(VIR_ERR_INTERNAL_ERROR, _("vDPA chardev path '%s' does not exist"), chardev); + VIR_DIR_CLOSE(dir); return -1; } VIR_DEBUG("vDPA chardev is at '%s'", chardev); @@ -1171,6 +1172,8 @@ udevGetVDPACharDev(const char *sysfs_path, } } + VIR_DIR_CLOSE(dir); + if (direrr < 0) return -1; -- 2.26.2

3 2

[libvirt PATCH v2] libvirt-guests: Sync time for autostarted guests
by Tim Wiederhake 28 Oct '20

28 Oct '20

From: Orion Poplawski <orion(a)nwra.com> Setting SYNC_TIME=1 does not work on autostarted guests. See https://bugzilla.redhat.com/show_bug.cgi?id=1555398. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- tools/libvirt-guests.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index d69df908d2..87f96af14d 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -206,9 +206,9 @@ start() { retval run_virsh "$uri" start $bypass "$name" \ >/dev/null && \ gettext "done"; echo - if "$sync_time"; then - run_virsh "$uri" domtime --sync "$name" >/dev/null - fi + fi + if "$sync_time"; then + run_virsh "$uri" domtime --sync "$name" >/dev/null fi fi done -- 2.26.2

2 1

migration/dirtyrate: Introduce APIs for getting domain memory dirty rate
by Hao Wang 28 Oct '20

28 Oct '20

V2 -> V3: reorganize patchset to fix compile warning V1 -> V2: replace QEMU_JOB_ASYNC with QEMU_JOB_QUERY Sometimes domain's memory dirty rate is expected by user in order to decide whether it's proper to be migrated out or not. We have already completed the QEMU part of the capability: https://patchew.org/QEMU/1600237327-33618-1-git-send-email-zhengchuan@huawe… And this serial of patches introduce the corresponding LIBVIRT part -- DomainGetDirtyRateInfo API and corresponding virsh api -- "getdirtyrate". instructions: bash# virsh getdirtyrate --help NAME getdirtyrate - Get a vm's memory dirty rate SYNOPSIS getdirtyrate <domain> [--seconds <number>] [--calculate] [--query] DESCRIPTION Get memory dirty rate of a domain in order to decide whether it's proper to be migrated out or not. OPTIONS [--domain] <string> domain name, id or uuid --seconds <number> calculate memory dirty rate within specified seconds, a valid range of values is [1, 60], and would default to 1s. --calculate calculate dirty rate only, can be used together with --query, either or both is expected, otherwise would default to both. --query query dirty rate only, can be used together with --calculate, either or both is expected, otherwise would default to both. example: bash# virsh getdirtyrate --calculate --query --domain vm0 --seconds 1 status: measured startTime: 820148 calcTime: 1 s dirtyRate: 6 MB/s Hao Wang (7): migration/dirtyrate: Introduce virDomainDirtyRateInfo structure migration/dirtyrate: set up framwork of domainGetDirtyRateInfo API migration/dirtyrate: Implement qemuDomainGetDirtyRateInfo migration/dirtyrate: Implement qemuDomainCalculateDirtyRate migration/dirtyrate: Implement qemuDomainCalculateDirtyRate migration/dirtyrate: Implement qemuMonitorJSONExtractDirtyRateInfo migration/dirtyrate: Introduce getdirtyrate virsh api include/libvirt/libvirt-domain.h | 56 ++++++++++++++++ src/driver-hypervisor.h | 7 ++ src/libvirt-domain.c | 46 +++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 67 ++++++++++++++++++ src/qemu/qemu_migration.c | 59 ++++++++++++++++ src/qemu/qemu_migration.h | 10 +++ src/qemu/qemu_monitor.c | 24 +++++++ src/qemu/qemu_monitor.h | 8 +++ src/qemu/qemu_monitor_json.c | 97 ++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 8 +++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 21 +++++- tools/virsh-domain.c | 112 +++++++++++++++++++++++++++++++ 14 files changed, 520 insertions(+), 1 deletion(-) -- 2.23.0

2 9

[PULL 06/12] nbd: Update qapi to support exporting multiple bitmaps
by Eric Blake 28 Oct '20

28 Oct '20

Since 'block-export-add' is new to 5.2, we can still tweak the interface; there, allowing 'bitmaps':['str'] is nicer than 'bitmap':'str'. This wires up the qapi and qemu-nbd changes to permit passing multiple bitmaps as distinct metadata contexts that the NBD client may request, but the actual support for more than one will require a further patch to the server. Note that there are no changes made to the existing deprecated 'nbd-server-add' command; this required splitting the QAPI type BlockExportOptionsNbd, which fortunately does not affect QMP introspection. Signed-off-by: Eric Blake <eblake(a)redhat.com> Message-Id: <20201027050556.269064-5-eblake(a)redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com> Reviewed-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/system/deprecated.rst | 3 ++- qapi/block-export.json | 41 +++++++++++++++++++++++++++----------- blockdev-nbd.c | 6 +++++- nbd/server.c | 19 ++++++++++++------ qemu-nbd.c | 18 ++++++++--------- 5 files changed, 58 insertions(+), 29 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 0ebce37a1919..32a0e620dbb9 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -257,7 +257,8 @@ the 'wait' field, which is only applicable to sockets in server mode '''''''''''''''''''''''''''''''''''''''''''''''''''''''' Use the more generic commands ``block-export-add`` and ``block-export-del`` -instead. +instead. As part of this deprecation, where ``nbd-server-add`` used a +single ``bitmap``, the new ``block-export-add`` uses a list of ``bitmaps``. Human Monitor Protocol (HMP) commands ------------------------------------- diff --git a/qapi/block-export.json b/qapi/block-export.json index 480c497690b0..c4125f4d2104 100644 --- a/qapi/block-export.json +++ b/qapi/block-export.json @@ -63,10 +63,10 @@ '*max-connections': 'uint32' } } ## -# @BlockExportOptionsNbd: +# @BlockExportOptionsNbdBase: # -# An NBD block export (options shared between nbd-server-add and the NBD branch -# of block-export-add). +# An NBD block export (common options shared between nbd-server-add and +# the NBD branch of block-export-add). # # @name: Export name. If unspecified, the @device parameter is used as the # export name. (Since 2.12) @@ -74,15 +74,27 @@ # @description: Free-form description of the export, up to 4096 bytes. # (Since 5.0) # -# @bitmap: Also export the dirty bitmap reachable from @device, so the -# NBD client can use NBD_OPT_SET_META_CONTEXT with -# "qemu:dirty-bitmap:NAME" to inspect the bitmap. (since 4.0) -# # Since: 5.0 ## +{ 'struct': 'BlockExportOptionsNbdBase', + 'data': { '*name': 'str', '*description': 'str' } } + +## +# @BlockExportOptionsNbd: +# +# An NBD block export (distinct options used in the NBD branch of +# block-export-add). +# +# @bitmaps: Also export each of the named dirty bitmaps reachable from +# @device, so the NBD client can use NBD_OPT_SET_META_CONTEXT with +# the metadata context name "qemu:dirty-bitmap:BITMAP" to inspect +# each bitmap. +# +# Since: 5.2 +## { 'struct': 'BlockExportOptionsNbd', - 'data': { '*name': 'str', '*description': 'str', - '*bitmap': 'str' } } + 'base': 'BlockExportOptionsNbdBase', + 'data': { '*bitmaps': ['str'] } } ## # @BlockExportOptionsVhostUserBlk: @@ -106,19 +118,24 @@ ## # @NbdServerAddOptions: # -# An NBD block export. +# An NBD block export, per legacy nbd-server-add command. # # @device: The device name or node name of the node to be exported # # @writable: Whether clients should be able to write to the device via the # NBD connection (default false). # +# @bitmap: Also export a single dirty bitmap reachable from @device, so the +# NBD client can use NBD_OPT_SET_META_CONTEXT with the metadata +# context name "qemu:dirty-bitmap:BITMAP" to inspect the bitmap +# (since 4.0). +# # Since: 5.0 ## { 'struct': 'NbdServerAddOptions', - 'base': 'BlockExportOptionsNbd', + 'base': 'BlockExportOptionsNbdBase', 'data': { 'device': 'str', - '*writable': 'bool' } } + '*writable': 'bool', '*bitmap': 'str' } } ## # @nbd-server-add: diff --git a/blockdev-nbd.c b/blockdev-nbd.c index cee9134b12eb..d8443d235b73 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -209,8 +209,12 @@ void qmp_nbd_server_add(NbdServerAddOptions *arg, Error **errp) .has_writable = arg->has_writable, .writable = arg->writable, }; - QAPI_CLONE_MEMBERS(BlockExportOptionsNbd, &export_opts->u.nbd, + QAPI_CLONE_MEMBERS(BlockExportOptionsNbdBase, &export_opts->u.nbd, qapi_NbdServerAddOptions_base(arg)); + if (arg->has_bitmap) { + export_opts->u.nbd.has_bitmaps = true; + QAPI_LIST_PREPEND(export_opts->u.nbd.bitmaps, g_strdup(arg->bitmap)); + } /* * nbd-server-add doesn't complain when a read-only device should be diff --git a/nbd/server.c b/nbd/server.c index 08b621f70a3a..8d01662b4511 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1474,6 +1474,7 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, uint64_t perm, shared_perm; bool readonly = !exp_args->writable; bool shared = !exp_args->writable; + strList *bitmaps; int ret; assert(exp_args->type == BLOCK_EXPORT_TYPE_NBD); @@ -1533,12 +1534,18 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, } exp->size = QEMU_ALIGN_DOWN(size, BDRV_SECTOR_SIZE); - if (arg->bitmap) { + /* XXX Allow more than one bitmap */ + if (arg->bitmaps && arg->bitmaps->next) { + error_setg(errp, "multiple bitmaps per export not supported yet"); + return -EOPNOTSUPP; + } + for (bitmaps = arg->bitmaps; bitmaps; bitmaps = bitmaps->next) { + const char *bitmap = bitmaps->value; BlockDriverState *bs = blk_bs(blk); BdrvDirtyBitmap *bm = NULL; while (bs) { - bm = bdrv_find_dirty_bitmap(bs, arg->bitmap); + bm = bdrv_find_dirty_bitmap(bs, bitmap); if (bm != NULL) { break; } @@ -1548,7 +1555,7 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, if (bm == NULL) { ret = -ENOENT; - error_setg(errp, "Bitmap '%s' is not found", arg->bitmap); + error_setg(errp, "Bitmap '%s' is not found", bitmap); goto fail; } @@ -1562,15 +1569,15 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, ret = -EINVAL; error_setg(errp, "Enabled bitmap '%s' incompatible with readonly export", - arg->bitmap); + bitmap); goto fail; } bdrv_dirty_bitmap_set_busy(bm, true); exp->export_bitmap = bm; - assert(strlen(arg->bitmap) <= BDRV_BITMAP_MAX_NAME_SIZE); + assert(strlen(bitmap) <= BDRV_BITMAP_MAX_NAME_SIZE); exp->export_bitmap_context = g_strdup_printf("qemu:dirty-bitmap:%s", - arg->bitmap); + bitmap); assert(strlen(exp->export_bitmap_context) < NBD_MAX_STRING_SIZE); } diff --git a/qemu-nbd.c b/qemu-nbd.c index a0701cdf369d..74e73a74657b 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -574,7 +574,7 @@ int main(int argc, char **argv) QDict *options = NULL; const char *export_name = NULL; /* defaults to "" later for server mode */ const char *export_description = NULL; - const char *bitmap = NULL; + strList *bitmaps = NULL; const char *tlscredsid = NULL; bool imageOpts = false; bool writethrough = true; @@ -690,7 +690,7 @@ int main(int argc, char **argv) flags &= ~BDRV_O_RDWR; break; case 'B': - bitmap = optarg; + QAPI_LIST_PREPEND(bitmaps, g_strdup(optarg)); break; case 'k': sockpath = optarg; @@ -786,7 +786,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } if (export_name || export_description || dev_offset || - device || disconnect || fmt || sn_id_or_name || bitmap || + device || disconnect || fmt || sn_id_or_name || bitmaps || seen_aio || seen_discard || seen_cache) { error_report("List mode is incompatible with per-device settings"); exit(EXIT_FAILURE); @@ -1067,12 +1067,12 @@ int main(int argc, char **argv) .has_writable = true, .writable = !readonly, .u.nbd = { - .has_name = true, - .name = g_strdup(export_name), - .has_description = !!export_description, - .description = g_strdup(export_description), - .has_bitmap = !!bitmap, - .bitmap = g_strdup(bitmap), + .has_name = true, + .name = g_strdup(export_name), + .has_description = !!export_description, + .description = g_strdup(export_description), + .has_bitmaps = !!bitmaps, + .bitmaps = bitmaps, }, }; blk_exp_add(export_opts, &error_fatal); -- 2.29.0

1 0

[PATCH] re-add cscope db files to .gitignore
by Laine Stump 28 Oct '20

28 Oct '20

Commit f7114e61db removed these lines as being "old and obsolete". cscope may be old, but it is still very much useful and used (i.e. *not* obsolete), and having the files show up as "Untracked files:" every time git status is run is annoying. Signed-off-by: Laine Stump <laine(a)redhat.com> --- I'm not sure why I didn't notice this omission until now, but a couple weeks ago it resulted in my accidentally committing my cscope.out and cscope.files to git (fortunately I noticed it before I posted the patch!) It could be argued (as abologna did on IRC) that users should just add these to their private user-global .gitignore, but if that's the case, then the vim and emacs-related files should also be removed from libvirt's .gitignore (also suggested by abologna :-)). However if you do that, then any time you checkout libvirt on some random new machine where you haven't imported your personal home directory template will end up showing these by-product files. Also, somebody newly entering the project will potentially have the files showing up and bothering them. Anyway, I'm not necessarily advocating for re-adding the cscope files, but sending a patch seemed to be like the most useful way of discussing it. .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 6d44a50061..feb2bcb017 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,12 @@ .#* *~ +# cscope related ignores +cscope.files +cscope.in.out +cscope.out +cscope.po.out + # git related ignores *.rej *.orig -- 2.26.2

2 1

[PATCH] cpu_ppc64: compare CPU function is ignoring return value
by Julio Faracco 27 Oct '20

27 Oct '20

Function to compare CPU on 64-bit PowerPC is ignoring the flag to avoid failure in case of CPUs (host and guest) are incompatible. Basically, the function is returning -1 even if it is set to continue. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/cpu/cpu_ppc64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 2fedcd25da..23ea5a6a3e 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -517,7 +517,7 @@ virCPUppc64Compare(virCPUDefPtr host, virCPUDefPtr cpu, bool failIncompatible) { - virCPUCompareResult ret; + virCPUCompareResult ret = -1; g_autofree char *message = NULL; if (!host || !host->model) { @@ -528,7 +528,7 @@ virCPUppc64Compare(virCPUDefPtr host, VIR_WARN("unknown host CPU"); ret = VIR_CPU_COMPARE_INCOMPATIBLE; } - return -1; + return ret; } ret = ppc64Compute(host, cpu, NULL, &message); -- 2.25.1

2 2

[PATCH] util: Avoid double free in virProcessSetAffinity
by Martin Kletzander 27 Oct '20

27 Oct '20

The cpu mask was free()'d immediately on any error and at the end of the function, where it was expected that it would either error out and return or goto another allocation if the code was to fail. However since commit 9514e24984ee the error path did not return in one new case which caused double-free in such situation. In order to make the code more straightforward just free the mask after it's been used even before checking the return code of the call. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1819801 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virprocess.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 9366f0630c42..37413796b3f6 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -447,6 +447,7 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map, bool quiet) int numcpus = 1024; size_t masklen; cpu_set_t *mask; + int rv = -1; VIR_DEBUG("Set process affinity on %lld", (long long)pid); @@ -472,8 +473,10 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map, bool quiet) CPU_SET_S(i, masklen, mask); } - if (sched_setaffinity(pid, masklen, mask) < 0) { - CPU_FREE(mask); + rv = sched_setaffinity(pid, masklen, mask); + CPU_FREE(mask); + + if (rv < 0) { if (errno == EINVAL && numcpus < (1024 << 8)) { /* 262144 cpus ought to be enough for anyone */ numcpus = numcpus << 2; @@ -488,7 +491,6 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map, bool quiet) return -1; } } - CPU_FREE(mask); return 0; } -- 2.28.0

2 1

[PATCH 00/13] Replace virHashTable by GHashTable (for 6.10)
by Peter Krempa 27 Oct '20

27 Oct '20

Our hash table API was surprisingly close to glibs. Peter Krempa (13): virhashtest: testHashGetItems: Remove test case for sorting by value util: hash: Rewrite sorting of elements in virHashGetItems util: virhash: Standardize on 'opaque' for opaque data util: hash: Introduce virHashForEachSorted Use virHashForEachSorted in tested code tests: remove virdeterministichashmock.so util: hash: Add delete-safe hash iterator util: hash: Use virHashForEachSafe in places which might delete the element util: hash: Don't use 'const' with virHashTablePtr util: hash: Reimplement virHashTable using GHashTable util: hash: Retire 'virHashTable' in favor of 'GHashTable' util: hash: Add deprecation notices for functions which have g_hash_table replacements tests: Remove 'virhashtest' src/conf/backup_conf.c | 2 +- src/conf/domain_addr.h | 2 +- src/conf/domain_conf.c | 12 +- src/conf/domain_conf.h | 2 +- src/conf/nwfilter_conf.h | 2 +- src/conf/nwfilter_ipaddrmap.c | 2 +- src/conf/nwfilter_params.c | 34 +- src/conf/nwfilter_params.h | 18 +- src/conf/snapshot_conf.c | 2 +- src/conf/virchrdev.c | 4 +- src/conf/virdomainmomentobjlist.c | 4 +- src/conf/virdomainobjlist.c | 6 +- src/conf/virinterfaceobj.c | 2 +- src/conf/virnetworkobj.c | 8 +- src/conf/virnodedeviceobj.c | 2 +- src/conf/virnwfilterbindingdef.h | 2 +- src/conf/virnwfilterbindingobjlist.c | 4 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 14 +- src/hyperv/hyperv_driver.c | 4 +- src/hyperv/hyperv_wmi.c | 18 +- src/hyperv/hyperv_wmi.h | 12 +- src/hypervisor/virclosecallbacks.c | 2 +- src/libvirt_private.syms | 6 +- src/libxl/libxl_logger.c | 2 +- src/locking/lock_daemon.c | 4 +- src/nwfilter/nwfilter_dhcpsnoop.c | 6 +- src/nwfilter/nwfilter_ebiptables_driver.c | 19 +- src/nwfilter/nwfilter_gentech_driver.c | 36 +- src/nwfilter/nwfilter_gentech_driver.h | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 4 +- src/nwfilter/nwfilter_tech_driver.h | 2 +- src/qemu/qemu_agent.c | 4 +- src/qemu/qemu_backup.c | 14 +- src/qemu/qemu_backup.h | 2 +- src/qemu/qemu_block.c | 42 +- src/qemu/qemu_block.h | 18 +- src/qemu/qemu_blockjob.c | 6 +- src/qemu/qemu_capabilities.c | 8 +- src/qemu/qemu_checkpoint.c | 6 +- src/qemu/qemu_checkpoint.h | 2 +- src/qemu/qemu_conf.c | 4 +- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_domain.c | 8 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 24 +- src/qemu/qemu_interop_config.c | 13 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_monitor.c | 28 +- src/qemu/qemu_monitor.h | 20 +- src/qemu/qemu_monitor_json.c | 50 +- src/qemu/qemu_monitor_json.h | 22 +- src/qemu/qemu_process.c | 18 +- src/qemu/qemu_qapi.c | 14 +- src/qemu/qemu_qapi.h | 6 +- src/qemu/qemu_snapshot.c | 16 +- src/rpc/virnetdaemon.c | 13 +- src/security/security_selinux.c | 2 +- src/util/meson.build | 1 - src/util/virfilecache.c | 2 +- src/util/virhash.c | 569 +++++++----------- src/util/virhash.h | 57 +- src/util/virhashcode.c | 125 ---- src/util/virhashcode.h | 33 - src/util/viriptables.c | 4 +- src/util/virlockspace.c | 4 +- src/util/virmacmap.c | 4 +- src/util/virstoragefile.c | 8 +- src/util/virsystemd.c | 2 +- tests/meson.build | 2 - tests/nwfilterxml2firewalltest.c | 24 +- tests/qemublocktest.c | 26 +- tests/qemuhotplugtest.c | 6 +- tests/qemumigparamstest.c | 4 +- tests/qemumonitorjsontest.c | 30 +- tests/qemumonitortestutils.c | 6 +- tests/qemumonitortestutils.h | 4 +- tests/qemusecuritymock.c | 4 +- .../blockjob-blockdev-in.xml | 116 ++-- tests/qemuxml2argvtest.c | 4 +- tests/qemuxml2xmltest.c | 5 +- tests/testutilsqemu.c | 6 +- tests/testutilsqemu.h | 4 +- tests/testutilsqemuschema.c | 10 +- tests/testutilsqemuschema.h | 8 +- tests/virdeterministichashmock.c | 36 -- tests/virhashdata.h | 284 --------- tests/virhashtest.c | 564 ----------------- tests/virmacmaptest.c | 2 +- 90 files changed, 680 insertions(+), 1863 deletions(-) delete mode 100644 src/util/virhashcode.c delete mode 100644 src/util/virhashcode.h delete mode 100644 tests/virdeterministichashmock.c delete mode 100644 tests/virhashdata.h delete mode 100644 tests/virhashtest.c -- 2.26.2

4 21

[PATCH] news: Mention nodedev support for CSS on S390
by Boris Fiuczynski 27 Oct '20

27 Oct '20

Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- NEWS.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 5bd8ed1c91..2fef3f706c 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -13,6 +13,12 @@ v6.9.0 (unreleased) * **New features** + * nodedev: Add support for channel subsystem (CSS) devices on S390 + + A CSS device is represented as a parent device of a CCW device. + This support allows to create vfio-ccw mediated devices with + ``virNodeDeviceCreateXML()``. + * qemu: Implement memory failure event New event is implemented that is emitted whenever a guest encounters a -- 2.25.1

3 2

[PATCH v6 04/11] nbd: Update qapi to support exporting multiple bitmaps
by Eric Blake 27 Oct '20

27 Oct '20

Since 'block-export-add' is new to 5.2, we can still tweak the interface; there, allowing 'bitmaps':['str'] is nicer than 'bitmap':'str'. This wires up the qapi and qemu-nbd changes to permit passing multiple bitmaps as distinct metadata contexts that the NBD client may request, but the actual support for more than one will require a further patch to the server. Note that there are no changes made to the existing deprecated 'nbd-server-add' command; this required splitting the QAPI type BlockExportOptionsNbd, which fortunately does not affect QMP introspection. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- docs/system/deprecated.rst | 3 ++- qapi/block-export.json | 41 +++++++++++++++++++++++++++----------- blockdev-nbd.c | 6 +++++- nbd/server.c | 19 ++++++++++++------ qemu-nbd.c | 18 ++++++++--------- 5 files changed, 58 insertions(+), 29 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 0ebce37a1919..32a0e620dbb9 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -257,7 +257,8 @@ the 'wait' field, which is only applicable to sockets in server mode '''''''''''''''''''''''''''''''''''''''''''''''''''''''' Use the more generic commands ``block-export-add`` and ``block-export-del`` -instead. +instead. As part of this deprecation, where ``nbd-server-add`` used a +single ``bitmap``, the new ``block-export-add`` uses a list of ``bitmaps``. Human Monitor Protocol (HMP) commands ------------------------------------- diff --git a/qapi/block-export.json b/qapi/block-export.json index 480c497690b0..c4125f4d2104 100644 --- a/qapi/block-export.json +++ b/qapi/block-export.json @@ -63,10 +63,10 @@ '*max-connections': 'uint32' } } ## -# @BlockExportOptionsNbd: +# @BlockExportOptionsNbdBase: # -# An NBD block export (options shared between nbd-server-add and the NBD branch -# of block-export-add). +# An NBD block export (common options shared between nbd-server-add and +# the NBD branch of block-export-add). # # @name: Export name. If unspecified, the @device parameter is used as the # export name. (Since 2.12) @@ -74,15 +74,27 @@ # @description: Free-form description of the export, up to 4096 bytes. # (Since 5.0) # -# @bitmap: Also export the dirty bitmap reachable from @device, so the -# NBD client can use NBD_OPT_SET_META_CONTEXT with -# "qemu:dirty-bitmap:NAME" to inspect the bitmap. (since 4.0) -# # Since: 5.0 ## +{ 'struct': 'BlockExportOptionsNbdBase', + 'data': { '*name': 'str', '*description': 'str' } } + +## +# @BlockExportOptionsNbd: +# +# An NBD block export (distinct options used in the NBD branch of +# block-export-add). +# +# @bitmaps: Also export each of the named dirty bitmaps reachable from +# @device, so the NBD client can use NBD_OPT_SET_META_CONTEXT with +# the metadata context name "qemu:dirty-bitmap:BITMAP" to inspect +# each bitmap. +# +# Since: 5.2 +## { 'struct': 'BlockExportOptionsNbd', - 'data': { '*name': 'str', '*description': 'str', - '*bitmap': 'str' } } + 'base': 'BlockExportOptionsNbdBase', + 'data': { '*bitmaps': ['str'] } } ## # @BlockExportOptionsVhostUserBlk: @@ -106,19 +118,24 @@ ## # @NbdServerAddOptions: # -# An NBD block export. +# An NBD block export, per legacy nbd-server-add command. # # @device: The device name or node name of the node to be exported # # @writable: Whether clients should be able to write to the device via the # NBD connection (default false). # +# @bitmap: Also export a single dirty bitmap reachable from @device, so the +# NBD client can use NBD_OPT_SET_META_CONTEXT with the metadata +# context name "qemu:dirty-bitmap:BITMAP" to inspect the bitmap +# (since 4.0). +# # Since: 5.0 ## { 'struct': 'NbdServerAddOptions', - 'base': 'BlockExportOptionsNbd', + 'base': 'BlockExportOptionsNbdBase', 'data': { 'device': 'str', - '*writable': 'bool' } } + '*writable': 'bool', '*bitmap': 'str' } } ## # @nbd-server-add: diff --git a/blockdev-nbd.c b/blockdev-nbd.c index cee9134b12eb..d1d41f635564 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -209,8 +209,12 @@ void qmp_nbd_server_add(NbdServerAddOptions *arg, Error **errp) .has_writable = arg->has_writable, .writable = arg->writable, }; - QAPI_CLONE_MEMBERS(BlockExportOptionsNbd, &export_opts->u.nbd, + QAPI_CLONE_MEMBERS(BlockExportOptionsNbdBase, &export_opts->u.nbd, qapi_NbdServerAddOptions_base(arg)); + if (arg->has_bitmap) { + export_opts->u.nbd.has_bitmaps = true; + QAPI_LIST_ADD(export_opts->u.nbd.bitmaps, g_strdup(arg->bitmap)); + } /* * nbd-server-add doesn't complain when a read-only device should be diff --git a/nbd/server.c b/nbd/server.c index 08b621f70a3a..8d01662b4511 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1474,6 +1474,7 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, uint64_t perm, shared_perm; bool readonly = !exp_args->writable; bool shared = !exp_args->writable; + strList *bitmaps; int ret; assert(exp_args->type == BLOCK_EXPORT_TYPE_NBD); @@ -1533,12 +1534,18 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, } exp->size = QEMU_ALIGN_DOWN(size, BDRV_SECTOR_SIZE); - if (arg->bitmap) { + /* XXX Allow more than one bitmap */ + if (arg->bitmaps && arg->bitmaps->next) { + error_setg(errp, "multiple bitmaps per export not supported yet"); + return -EOPNOTSUPP; + } + for (bitmaps = arg->bitmaps; bitmaps; bitmaps = bitmaps->next) { + const char *bitmap = bitmaps->value; BlockDriverState *bs = blk_bs(blk); BdrvDirtyBitmap *bm = NULL; while (bs) { - bm = bdrv_find_dirty_bitmap(bs, arg->bitmap); + bm = bdrv_find_dirty_bitmap(bs, bitmap); if (bm != NULL) { break; } @@ -1548,7 +1555,7 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, if (bm == NULL) { ret = -ENOENT; - error_setg(errp, "Bitmap '%s' is not found", arg->bitmap); + error_setg(errp, "Bitmap '%s' is not found", bitmap); goto fail; } @@ -1562,15 +1569,15 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, ret = -EINVAL; error_setg(errp, "Enabled bitmap '%s' incompatible with readonly export", - arg->bitmap); + bitmap); goto fail; } bdrv_dirty_bitmap_set_busy(bm, true); exp->export_bitmap = bm; - assert(strlen(arg->bitmap) <= BDRV_BITMAP_MAX_NAME_SIZE); + assert(strlen(bitmap) <= BDRV_BITMAP_MAX_NAME_SIZE); exp->export_bitmap_context = g_strdup_printf("qemu:dirty-bitmap:%s", - arg->bitmap); + bitmap); assert(strlen(exp->export_bitmap_context) < NBD_MAX_STRING_SIZE); } diff --git a/qemu-nbd.c b/qemu-nbd.c index a0701cdf369d..4b7825c44093 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -574,7 +574,7 @@ int main(int argc, char **argv) QDict *options = NULL; const char *export_name = NULL; /* defaults to "" later for server mode */ const char *export_description = NULL; - const char *bitmap = NULL; + strList *bitmaps = NULL; const char *tlscredsid = NULL; bool imageOpts = false; bool writethrough = true; @@ -690,7 +690,7 @@ int main(int argc, char **argv) flags &= ~BDRV_O_RDWR; break; case 'B': - bitmap = optarg; + QAPI_LIST_ADD(bitmaps, g_strdup(optarg)); break; case 'k': sockpath = optarg; @@ -786,7 +786,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } if (export_name || export_description || dev_offset || - device || disconnect || fmt || sn_id_or_name || bitmap || + device || disconnect || fmt || sn_id_or_name || bitmaps || seen_aio || seen_discard || seen_cache) { error_report("List mode is incompatible with per-device settings"); exit(EXIT_FAILURE); @@ -1067,12 +1067,12 @@ int main(int argc, char **argv) .has_writable = true, .writable = !readonly, .u.nbd = { - .has_name = true, - .name = g_strdup(export_name), - .has_description = !!export_description, - .description = g_strdup(export_description), - .has_bitmap = !!bitmap, - .bitmap = g_strdup(bitmap), + .has_name = true, + .name = g_strdup(export_name), + .has_description = !!export_description, + .description = g_strdup(export_description), + .has_bitmaps = !!bitmaps, + .bitmaps = bitmaps, }, }; blk_exp_add(export_opts, &error_fatal); -- 2.29.0

3 2

[libvirt PATCH 0/2] rpc: Fix virt-ssh-helper detection
by Andrea Bolognani 27 Oct '20

27 Oct '20

See patch 1 for details. Andrea Bolognani (2): rpc: Fix virt-ssh-helper detection news: Mention virt-ssh-helper detection fix NEWS.rst | 6 ++++++ src/rpc/virnetclient.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) -- 2.26.2

3 5

[PATCH v6 0/4] qemu: Support rbd namespace in rbd source name
by Han Han 27 Oct '20

27 Oct '20

Diffence from v5: - conf: implement virStringSplit() to parse the src->path - tests: Add the cases of path 'pool//image' to disk-network-rbd-namespace test - temporarily removed the patch of news - tweak of version in docs - rebase to the latest main branch v5: https://www.redhat.com/archives/libvir-list/2020-September/msg00081.html git repo: https://gitlab.com/hhan2/libvirt/-/commits/rbd-namespace-v6 Han Han (4): qemu_capabilities: Add QEMU_CAPS_RBD_NAMESPACE util: Add member ns to the storage source struct conf: Support to parse rbd namespace from source name qemu: Implement rbd namespace to the source name attribute docs/formatdomain.rst | 16 ++++++ src/conf/domain_conf.c | 47 ++++++++++++++++-- src/qemu/qemu_block.c | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 8 +++ src/util/virstoragefile.c | 2 + src/util/virstoragefile.h | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + ...k-network-rbd-namespace.x86_64-latest.args | 48 ++++++++++++++++++ .../disk-network-rbd-namespace.xml | 40 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + ...sk-network-rbd-namespace.x86_64-latest.xml | 49 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 19 files changed, 219 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-namespace.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-namespace.xml create mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-namespace.x86_64-latest.xml -- 2.26.2

1 5