- Devel - libvirt List Archives

[libvirt PATCH] ci: maximize cirrus CI ram/cpu allocation
by Daniel P. Berrangé 21 Jul '21

21 Jul '21

For macOS you always get the maximum configuration by default (12 CPUs, 24 GB RAM), but for FreeBSD you get 2 CPUs, 4 GBs by default. This change increases the allocation to 8 CPUs, 8 GBs for FreeBSD. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- In theory this could make builds quicker. In practice I've not been able to measure a difference due to large variance between runs. .gitlab-ci.yml | 8 ++++++++ ci/cirrus/build.yml | 2 ++ 2 files changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3cb6ff5e6b..24588628f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -114,6 +114,8 @@ stages: -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g" -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g" -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g" + -e "s|[@]CIRRUS_VM_CPUS@|$CIRRUS_VM_CPUS|g" + -e "s|[@]CIRRUS_VM_RAM@|$CIRRUS_VM_RAM|g" -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g" -e "s|[@]UPGRADE_COMMAND@|$UPGRADE_COMMAND|g" -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g" @@ -423,6 +425,8 @@ x64-freebsd-12-build: CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_IMAGE_NAME: freebsd-12-2 + CIRRUS_VM_CPUS: 8 + CIRRUS_VM_RAM: 8G UPDATE_COMMAND: pkg update UPGRADE_COMMAND: pkg upgrade -y INSTALL_COMMAND: pkg install -y @@ -434,6 +438,8 @@ x64-freebsd-13-build: CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_IMAGE_NAME: freebsd-13-0 + CIRRUS_VM_CPUS: 8 + CIRRUS_VM_RAM: 8G UPDATE_COMMAND: pkg update UPGRADE_COMMAND: pkg upgrade -y INSTALL_COMMAND: pkg install -y @@ -445,6 +451,8 @@ x64-macos-11-build: CIRRUS_VM_INSTANCE_TYPE: osx_instance CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_IMAGE_NAME: big-sur-base + CIRRUS_VM_CPUS: 12 + CIRRUS_VM_RAM: 24G UPDATE_COMMAND: brew update UPGRADE_COMMAND: brew upgrade INSTALL_COMMAND: brew install diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index 867d5f297b..e9ad427765 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -1,5 +1,7 @@ @CIRRUS_VM_INSTANCE_TYPE@: @CIRRUS_VM_IMAGE_SELECTOR@: @CIRRUS_VM_IMAGE_NAME@ + cpu: @CIRRUS_VM_CPUS@ + memory: @CIRRUS_VM_RAM@ env: CI_REPOSITORY_URL: "@CI_REPOSITORY_URL@" -- 2.31.1

3 6

[libvirt PATCH 00/10] virHashNew refactorings - part VI
by Tim Wiederhake 21 Jul '21

21 Jul '21

"virHashNew" cannot return NULL, yet we check for NULL in various places. See https://listman.redhat.com/archives/libvir-list/2021-July/msg00074.html. Tim Wiederhake (10): qemuStateInitialize: `virHashNew` cannot return NULL qemuMonitorGetPRManagerInfo: `virHashNew` cannot return NULL qemuMonitorGetPRManagerInfo: Use automatic memory management qemuMonitorGetPRManagerInfo: Remove superfluous `goto`s qemuMonitorJSONGetAllBlockJobInfo: `virHashNew` cannot return NULL qemuMonitorJSONGetAllBlockJobInfo: Use automatic memory management qemuMonitorJSONGetAllBlockJobInfo: Remove superfluous `goto`s testQemuGetLatestCaps: `virHashNew` cannot return NULL testQemuGetLatestCaps: Use automatic memory management testQemuGetLatestCaps: Remove superfluous `goto`s src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_monitor.c | 13 +++---------- src/qemu/qemu_monitor_json.c | 26 ++++++++------------------ tests/testutilsqemu.c | 13 +++---------- 4 files changed, 15 insertions(+), 40 deletions(-) -- 2.31.1

2 13

[PATCH v5 00/11] Support for launchSecurity type s390-pv
by Boris Fiuczynski 21 Jul '21

21 Jul '21

This patch series introduces the launch security type s390-pv. Specifying s390-pv as launch security type in an s390 domain prepares for running the guest in protected virtualization secure mode, also known as IBM Secure Execution. diff to v4: - changed rng to do the verification for every launchSecurity type - removed previously added XML fail tests - added domain capability documentation diff to v3: - rebased to current master - moved virDomainSEVDef into a union - improved XML formating for launchSecurity - use a shared id on the qemu cmd line for confidential-guest-support - added check for s390-pv host support into XML validation - changed from ignoring to failing if launchSecuroty child elements are provided for s390-pv - reduced test to a single failing test - add availability of s390-pv in domain capabilities diff to v2: - broke up previous patch one into three patches diff to v1: - rebased to current master - added verification check for confidential-guest-support capability Boris Fiuczynski (11): schemas: Refactor launch security conf: Rework SEV XML parse and format methods qemu: Make KVMSupportsSecureGuest capability available conf: Refactor launch security to allow more types qemu: Add s390-pv-guest capability conf: Add s390-pv as launch security type docs: Add s390-pv documentation conf: Add availability of s390-pv in domain capabilities docs: Add s390-pv in domain capabilities documentation qemu: Use common id lsec0 for launchSecurity qemu: Fix error code for SEV launchSecurity unsupported docs/formatdomain.rst | 7 + docs/formatdomaincaps.html.in | 10 ++ docs/kbase/s390_protected_virt.rst | 55 ++++++-- docs/schemas/domaincaps.rng | 9 ++ docs/schemas/domaincommon.rng | 79 ++++++----- src/conf/domain_capabilities.c | 1 + src/conf/domain_capabilities.h | 1 + src/conf/domain_conf.c | 130 ++++++++++++------ src/conf/domain_conf.h | 17 ++- src/conf/virconftypes.h | 2 + src/qemu/qemu_capabilities.c | 24 ++++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 75 ++++++++-- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_firmware.c | 33 +++-- src/qemu/qemu_namespace.c | 21 ++- src/qemu/qemu_process.c | 35 ++++- src/qemu/qemu_validate.c | 32 ++++- src/security/security_dac.c | 6 +- tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsmock.c | 17 +++ .../launch-security-s390-pv.xml | 18 +++ tests/genericxml2xmltest.c | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../launch-security-s390-pv.s390x-latest.args | 35 +++++ .../launch-security-s390-pv.xml | 30 ++++ ...v-missing-platform-info.x86_64-2.12.0.args | 4 +- .../launch-security-sev.x86_64-2.12.0.args | 4 +- .../launch-security-sev.x86_64-6.0.0.args | 4 +- tests/qemuxml2argvmock.c | 16 +++ tests/qemuxml2argvtest.c | 2 + 38 files changed, 552 insertions(+), 135 deletions(-) create mode 100644 tests/genericxml2xmlindata/launch-security-s390-pv.xml create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv.xml -- 2.31.1

2 17

[PATCH] qemu_migration: Unregister close callback only if connection still exists
by Michal Privoznik 21 Jul '21

21 Jul '21

When doing a peer-to-peer migration it may happen that the connection to the destination disappears. If that happens, there's no point in trying to unregister the close callback because the connection is closed already. It results only in polluting logs with this message: error : virNetSocketReadWire:1814 : End of file while reading data: : Input/output error and the reason for that is unregistering a connection callback results in RPC (among other things). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1918211 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_migration.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a4f44b465d..4d651aeb1a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5214,9 +5214,11 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *driver, cleanup: virErrorPreserveLast(&orig_err); - qemuDomainObjEnterRemote(vm); - virConnectUnregisterCloseCallback(dconn, qemuMigrationSrcConnectionClosed); - ignore_value(qemuDomainObjExitRemote(vm, false)); + if (dconn && virConnectIsAlive(dconn) == 1) { + qemuDomainObjEnterRemote(vm); + virConnectUnregisterCloseCallback(dconn, qemuMigrationSrcConnectionClosed); + ignore_value(qemuDomainObjExitRemote(vm, false)); + } virErrorRestore(&orig_err); return ret; } -- 2.31.1

2 1

[libvirt PATCH] virIdentityEnsureSystemToken: Fix error message
by Tim Wiederhake 20 Jul '21

20 Jul '21

This appears to be a copy-paste mistake from the check directly above. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/util/viridentity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/viridentity.c b/src/util/viridentity.c index eb77f69e2e..c18326c8cb 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -284,7 +284,7 @@ virIdentityEnsureSystemToken(void) } else { if (virFileReadLimFD(fd, TOKEN_STRLEN, &token) < 0) { virReportSystemError(errno, - _("Failed to write system token '%s'"), + _("Failed to read system token '%s'"), tokenfile); return NULL; } -- 2.31.1

3 2

[PATCH v2 0/2] Add support for 'id' attribute for 'cachetune'
by Kristina Hanicova 20 Jul '21

20 Jul '21

This is v2 of: https://listman.redhat.com/archives/libvir-list/2021-July/msg00441.html Changes since v1 (suggested by Michal): * slight change of documentation * improved commit message Kristina Hanicova (2): docs: Allow 'id' attribute for 'cachetune' element genericxml2xmltest: Modify cachetune test to include id docs/formatdomain.rst | 1 + docs/schemas/domaincommon.rng | 5 ++++ tests/genericxml2xmlindata/cachetune.xml | 8 +++--- tests/genericxml2xmloutdata/cachetune.xml | 34 ----------------------- tests/genericxml2xmltest.c | 2 +- 5 files changed, 11 insertions(+), 39 deletions(-) delete mode 100644 tests/genericxml2xmloutdata/cachetune.xml -- 2.31.1

2 3

[libvirt PATCH] docs: add kbase article on how to configure core dumps for QEMU
by Daniel P. Berrangé 20 Jul '21

20 Jul '21

Enabling core dumps is a reasonably straightforward task, but is not documented clearly. This page provides as easy link to point users to when they need to debug QEMU. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/kbase/index.rst | 4 ++ docs/kbase/meson.build | 1 + docs/kbase/qemu-core-dump.rst | 132 ++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 docs/kbase/qemu-core-dump.rst diff --git a/docs/kbase/index.rst b/docs/kbase/index.rst index 91083ee49d..372042886d 100644 --- a/docs/kbase/index.rst +++ b/docs/kbase/index.rst @@ -67,3 +67,7 @@ Internals / Debugging `VM migration internals <migrationinternals.html>`__ VM migration implementation details, complementing the info in `migration <../migration.html>`__ + +`Capturing core dumps for QEMU <qemu-core-dump.html>`__ + How to configure libvirt to enable capture of core dumps from + QEMU virtual machines diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build index 7631b47018..6d17a83d1d 100644 --- a/docs/kbase/meson.build +++ b/docs/kbase/meson.build @@ -12,6 +12,7 @@ docs_kbase_files = [ 'locking-sanlock', 'merging_disk_image_chains', 'migrationinternals', + 'qemu-core-dump', 'qemu-passthrough-security', 'rpm-deployment', 's390_protected_virt', diff --git a/docs/kbase/qemu-core-dump.rst b/docs/kbase/qemu-core-dump.rst new file mode 100644 index 0000000000..d27f81c4d6 --- /dev/null +++ b/docs/kbase/qemu-core-dump.rst @@ -0,0 +1,132 @@ +============================= +Capturing core dumps for QEMU +============================= + +The default behaviour for a QEMU virtual machine launched by libvirt is to +have core dumps disabled. There can be times, however, when it is beneficial +to collect a core dump to enable debugging. + +QEMU driver configuration +========================= + +There is a global setting in the QEMU driver configuration file that controls +whether core dumps are permitted, and their maximum size. Enabling core dumps +is simply a matter of setting the maximum size to a non-zero value by editting +the ``/etc/libvirt/qemu.conf`` file: + +:: + + max_core = "unlimited" + +For an adhoc debugging session, setting the core dump size to "unlimited" is +viable, on the assumption that the core dumps will be disabled again once the +requisite information is collected. If the intention is to leave core dumps +permanently enabled, more careful consideration of limits is required + +Note that by default, a core dump will **NOT** include the the guest RAM +region, so will only include memory regions used by QEMU for emulation and +backend purposes. This is expected to be sufficient for the vast majority +of debugging needs. + +When there is a need to examine guest RAM though, a further setting is +available + +:: + + dump_guest_core = 1 + +This will of course result in core dumps that are as large as the biggest +virtual machine on the host - potentially 10's or even 100's of GB in size. +To allow more fine grained control it is possible to toggle this on a per +VM basis in the XML configuration. + +After changing either of the settings in ``/etc/libvirt/qemu.conf`` the daemon +hosting the QEMU driver must be restarted. For deployments using the monolithic +daemons, this means ``libvirtd``, while for those using modular daemons this +means ``virtqemud`` + +:: + + systemctl restart libvirtd (for a monolithic deployment) + systemctl restart virtqemud (for a modular deployment) + +While libvirt attempts to make it possible to restart the daemons without +negatively impacting running guests, there are some management operations +that may get interrupted. In particular long running jobs like live +migration or block device copy jobs may abort. It is thus wise to check +that the host is mostly idle before restarting the daemons. + +Guest core dump configuration +============================= + +The ``dump_guest_core`` setting mentioned above will allow guest RAM to be +included in core dumps for all virtual machines on the host. This may not +be desirable, so it is also possible to control this on a per-virtual +machine basis in the XML configuration: + +:: + + <memory dumpCore="on">...</memory> + +Note, it is still neccessary to at least set ``max_core`` to a non-zero +value in the global configuration file. + +Some management applications may not offer the ability to customimze the +XML configuration for a guest. In such situations, using the global +``dump_guest_core`` setting is the only option. + +Host OS core dump storage +========================= + +The Linux kernel default behaviour is to write core dumps to a file in the +current working directory of the process. This will not work with QEMU +processes launched by libvirt, because their working directory is ``/`` +which will not be writable. + +Most modern OS distros, however, now include systemd which configures a +custom core dump handler out of the box. When this is in effect, core dumps +from QEMU can be seen using the ``coredumpctl`` commands + +:: + + $ coredumpctl list -r + TIME PID UID GID SIG COREFILE EXE SIZE + Tue 2021-07-20 12:12:52 BST 2649303 107 107 SIGABRT present /usr/bin/qemu-system-x86_64 1.8M + ...snip... + + $ coredumpctl info 2649303 + PID: 2649303 (qemu-system-x86) + UID: 107 (qemu) + GID: 107 (qemu) + Signal: 6 (ABRT) + Timestamp: Tue 2021-07-20 12:12:52 BST (48min ago) + Command Line: /usr/bin/qemu-system-x86_64 -name guest=f30,debug-threads=on ..snip... -msg timestamp=on + Executable: /usr/bin/qemu-system-x86_64 + Control Group: /machine.slice/machine-qemu\x2d1\x2df30.scope/libvirt/emulator + Unit: machine-qemu\x2d1\x2df30.scope + Slice: machine.slice + Boot ID: 6b9015d0c05f4e7fbfe4197a2c7824a2 + Machine ID: c78c8286d6d74b22ac0dd275975f9ced + Hostname: localhost.localdomain + Storage: /var/lib/systemd/coredump/core.qemu-system-x86.107.6b9015d0c05f4e7fbfe4197a2c7824a2.2649303.1626779572000000.zst (present) + Disk Size: 1.8M + Message: Process 2649303 (qemu-system-x86) of user 107 dumped core. + + Stack trace of thread 2649303: + #0 0x00007ff3c32436be n/a (libc.so.6 + 0xf56be) + #1 0x000055a949c0ed05 qemu_poll_ns (qemu-system-x86_64 + 0x7b0d05) + #2 0x000055a949c0e476 main_loop_wait (qemu-system-x86_64 + 0x7b0476) + #3 0x000055a949a36d27 qemu_main_loop (qemu-system-x86_64 + 0x5d8d27) + #4 0x000055a94979e4d2 main (qemu-system-x86_64 + 0x3404d2) + #5 0x00007ff3c3175b75 n/a (libc.so.6 + 0x27b75) + #6 0x000055a9497a1f5e _start (qemu-system-x86_64 + 0x343f5e) + + Stack trace of thread 2649368: + #0 0x00007ff3c32435bf n/a (libc.so.6 + 0xf55bf) + #1 0x00007ff3c3af547c g_main_context_iterate.constprop.0 (libglib-2.0.so.0 + 0xa947c) + #2 0x00007ff3c3aa0a93 g_main_loop_run (libglib-2.0.so.0 + 0x54a93) + #3 0x00007ff3c17a727a red_worker_main.lto_priv.0 (libspice-server.so.1 + 0x5227a) + #4 0x00007ff3c3326299 start_thread (libpthread.so.0 + 0x9299) + #5 0x00007ff3c324e353 n/a (libc.so.6 + 0x100353) + + ...snip... -- 2.31.1

2 1

Plans for the next release
by Jiri Denemark 20 Jul '21

20 Jul '21

We are getting close to the next release of libvirt. To aim for the release on Aug 02 I suggest entering the freeze on Tuesday Jul 27 and tagging RC2 on Thursday Jul 29. I'll be on PTO next week and thus I won't be able to make the RC releases, Pavel Hrdina volunteered to make them while I'm away. This means RC1 and RC2 releases won't be signed by my PGP key, but it shouldn't be a big deal as the final release is what matters and I will be back in time to handle it myself. Thanks Pavel for backing me up. Jirka

1 0

[PATCH v3 0/2] domstats:add haltpolling time statistic interface
by Yang Fei 20 Jul '21

20 Jul '21

This series add the ability to statistic the halt polling time when VM execute HLT(arm is WFI). v1: https://listman.redhat.com/archives/libvir-list/2021-July/msg00029.html v2: https://listman.redhat.com/archives/libvir-list/2021-July/msg00339.html changes from v1: - Move virGetCgroupValueRaw to utils.c and rename it virGetValueRaw. So that we can call it to obtain halt polling time. - Helper function virGetCpuHaltPollTime and virGetDebugFsKvmValue are added in a separate patch - Use STRPREFIX to match the path prefix. - Fix the logic that domstats will break when platform is non-linux, debugfs isn't mounted and so on. change from v2: - Drop patch 1, use virFileReadValueUllong() to get halt polling data. - Delete unnecessary error report in logs. - Remove the qemuDomainGetStatsCpuHaltPollTime function conditionally compiled on linux. - Document the new parameters in src/libvirt-domain.c. Yang Fei (2): util: Add virGetCpuHaltPollTime qemu: Introduce qemuDomainGetStatsCpuHaltPollTime src/libvirt-domain.c | 7 +++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 20 +++++++++++++++++++ src/util/virutil.c | 43 ++++++++++++++++++++++++++++++++++++++++ src/util/virutil.h | 4 ++++ 5 files changed, 75 insertions(+) -- 2.23.0

3 9

[PATCH] meson: disable bogus warnings from sanitizers on Fedora
by Daniel P. Berrangé 20 Jul '21

20 Jul '21

When building with sanitizers on Fedora we get a wierd error message In file included from /usr/include/string.h:519, from ../src/internal.h:28, from ../src/util/virsocket.h:21, from ../src/util/virsocketaddr.h:21, from ../src/util/virnetdevip.h:21, from ../src/util/virnetdevip.c:21: In function ‘memcpy’, inlined from ‘virNetDevGetifaddrsAddress’ at ../src/util/virnetdevip.c:702:13, inlined from ‘virNetDevIPAddrGet’ at ../src/util/virnetdevip.c:754:16: /usr/include/bits/string_fortified.h:29:10: error: ‘__builtin_memcpy’ offset [2, 27] from the object at ‘addr’ is out of the bounds of referenced subobject ‘ss_family’ with type ‘short unsigned int’ at offset 0 [-Werror=array-bounds] 29 | return __builtin___memcpy_chk (__dest, __src, __len, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 30 | __glibc_objsize0 (__dest)); | ~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /usr/include/bits/socket.h:175, from /usr/include/sys/socket.h:33, from ../src/util/virsocket.h:66, from ../src/util/virsocketaddr.h:21, from ../src/util/virnetdevip.h:21, from ../src/util/virnetdevip.c:21: ../src/util/virnetdevip.c: In function ‘virNetDevIPAddrGet’: /usr/include/bits/socket.h:193:5: note: subobject ‘ss_family’ declared here 193 | __SOCKADDR_COMMON (ss_); /* Address family, etc. */ | ^~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors The code is correct, and this only happens when building at -O2. The docs for -Warray-bounds say that a value of "2" is known to be liable to generate false positives. Rather than downgrade the check everywhere, we do it selectively for sanitizers. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ca4291e37a..d4c142eebb 100644 --- a/meson.build +++ b/meson.build @@ -227,6 +227,11 @@ alloc_max = run_command( # sanitizer instrumentation may enlarge stack frames stack_frame_size = get_option('b_sanitize') == 'none' ? 4096 : 8192 +# array_bounds=2 check triggers false positive on some GCC +# versions when using sanitizers. Seen on Fedora 34 with +# GCC 11.1.1 +array_bounds = get_option('b_sanitize') == 'none' ? 2 : 1 + cc_flags += [ '-fasynchronous-unwind-tables', '-fexceptions', @@ -238,7 +243,7 @@ cc_flags += [ '-Waggressive-loop-optimizations', '-Walloc-size-larger-than=@0@'.format(alloc_max.stdout().strip()), '-Walloca', - '-Warray-bounds=2', + '-Warray-bounds=@0@'.format(array_bounds), '-Wattribute-alias=2', '-Wattribute-warning', '-Wattributes', -- 2.31.1

2 1

[PATCH v1] virtqemud: remove sysconfig file
by Olaf Hering 19 Jul '21

19 Jul '21

sysconfig files are owned by the admin of the host. He has the liberty to put anything he wants into these files. This makes it difficult to provide different defaults. Remove the sysconfig file and place the current desired default into the service file. Local customizations can now go either into /etc/sysconfig/virtqemud or /etc/systemd/system/virtqemud.service.d/my-knobs.conf Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- Untested, just to demonstrate how it could be done for every sysconfig file. libvirt.spec.in | 1 - src/qemu/meson.build | 5 ----- src/qemu/virtqemud.service.in | 1 + src/qemu/virtqemud.sysconf | 12 ------------ 4 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 src/qemu/virtqemud.sysconf diff --git a/libvirt.spec.in b/libvirt.spec.in index cb48dd0be0..2cc3e61e3c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1689,7 +1689,6 @@ exit 0 %if %{with_qemu} %files daemon-driver-qemu -%config(noreplace) %{_sysconfdir}/sysconfig/virtqemud %config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf %{_datadir}/augeas/lenses/virtqemud.aug %{_datadir}/augeas/lenses/tests/test_virtqemud.aug diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 3898d23877..6b4dd58309 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -165,11 +165,6 @@ if conf.has('WITH_QEMU') 'in_file': files('virtqemud.init.in'), } - sysconf_files += { - 'name': 'virtqemud', - 'file': files('virtqemud.sysconf'), - } - virt_install_dirs += [ localstatedir / 'lib' / 'libvirt' / 'qemu', runstatedir / 'libvirt' / 'qemu', diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in index 8abc9d3a7f..a5cb145668 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in @@ -18,6 +18,7 @@ Documentation=https://libvirt.org [Service] Type=notify +Environment=VIRTQEMUD_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/qemu/virtqemud.sysconf b/src/qemu/virtqemud.sysconf deleted file mode 100644 index 87b626e3ed..0000000000 --- a/src/qemu/virtqemud.sysconf +++ /dev/null @@ -1,12 +0,0 @@ -# Customizations for the virtqemud.service systemd unit - -VIRTQEMUD_ARGS="--timeout 120" - -# Override the QEMU/SDL default audio driver probing when -# starting virtual machines using SDL graphics -# -# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio -# is enabled in /etc/libvirt/qemu.conf -#QEMU_AUDIO_DRV=sdl -# -#SDL_AUDIODRIVER=pulse

4 10

[libvirt PATCH] qemu: Signal domain condition in qemuProcessStop a bit later
by Jiri Denemark 19 Jul '21

19 Jul '21

Signaling the condition before vm->def->id is reset to -1 is dangerous: in case a waiting thread wakes up, it does not see anything interesting (the domain is still marked as running) and just enters virDomainObjWait where it waits forever because the condition will never be signalled again. Originally it was impossible to get into such situation because the vm object was locked all the time between signaling the condition and resetting vm->def->id, but after commit 860a999802 released in 6.8.0, qemuDomainObjStopWorker called in qemuProcessStop between virDomainObjBroadcast and setting vm->def->id to -1 unlocks the vm object giving other threads a chance to wake up and possibly hang. In real world, this can be easily reproduced by killing, destroying, or just shutting down (from the guest OS) a domain while it is being migrated somewhere else. The migration job would never finish. We can't fix this by reseting vm->def->id earlier because other functions (such as qemuProcessKill) do nothing when the domain is already marked as inactive. So let's make sure we delay signaling the domain condition to the point when a woken up thread can detect the domain is not active anymore. https://bugzilla.redhat.com/show_bug.cgi?id=1949869 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_process.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c972c90801..914f936e45 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7852,9 +7852,6 @@ void qemuProcessStop(virQEMUDriver *driver, if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) driver->inhibitCallback(false, driver->inhibitOpaque); - /* Wake up anything waiting on domain condition */ - virDomainObjBroadcast(vm); - if ((timestamp = virTimeStringNow()) != NULL) { qemuDomainLogAppendMessage(driver, vm, "%s: shutting down, reason=%s\n", timestamp, @@ -7925,6 +7922,9 @@ void qemuProcessStop(virQEMUDriver *driver, vm->def->id = -1; + /* Wake up anything waiting on domain condition */ + virDomainObjBroadcast(vm); + virFileDeleteTree(priv->libDir); virFileDeleteTree(priv->channelTargetDir); -- 2.32.0

2 2

[PATCH 13/13] docs/deprecated: deprecate passing plugin args through `arg=`
by Mahmoud Mandour 19 Jul '21

19 Jul '21

Signed-off-by: Mahmoud Mandour <ma.mandourr(a)gmail.com> --- docs/system/deprecated.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index e2e0090878..aaf0ee5777 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -126,6 +126,12 @@ other options have been processed. This will either have no effect (if if they were not given. The property is therefore useless and should not be specified. +Plugin argument passing through ``arg=<string>`` (since 6.1) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Passing arguments through ``arg=`` is redundant is makes the command-line less +readable, especially when the argument itself consist of a name and a value, +e.g. ``arg="arg_name=arg_value"``. Therefore, the usage of ``arg`` is redundant. QEMU Machine Protocol (QMP) commands ------------------------------------ -- 2.25.1

2 1

[PATCH 0/5] virsh: avoid local enum helpers with 'vir' prefix
by Peter Krempa 19 Jul '21

19 Jul '21

Follow up to: https://listman.redhat.com/archives/libvir-list/2021-July/msg00281.html Peter Krempa (5): virsh-host: Avoid 'vir' prefix for locally declared VIR_ENUM* helpers virsh-domain: Avoid 'vir' prefix for locally declared VIR_ENUM* helpers virsh-network: Avoid 'vir' prefix for locally declared VIR_ENUM* helpers virsh-volume: Avoid 'vir' prefix for locally declared VIR_ENUM* helpers syntax-check: Prohibit 'vir' prefix for enum implementations in virsh build-aux/syntax-check.mk | 7 +++++++ tools/virsh-completer-domain.c | 8 ++++---- tools/virsh-completer-host.c | 2 +- tools/virsh-domain.c | 18 +++++++++--------- tools/virsh-domain.h | 8 ++++---- tools/virsh-host.c | 4 ++-- tools/virsh-host.h | 2 +- tools/virsh-network.c | 12 ++++++------ tools/virsh-volume.c | 6 +++--- 9 files changed, 37 insertions(+), 30 deletions(-) -- 2.31.1

2 6

[libvirt PATCH v2 0/2] Remove macros "VIR_INSERT_ELEMENT_COPY" and "VIR_INSERT_ELEMENT_COPY_INPLACE"
by Tim Wiederhake 19 Jul '21

19 Jul '21

See https://listman.redhat.com/archives/libvir-list/2021-July/msg00163.html Changes since V1: * Fixed a mistake in the copy-out of virQEMUCapsGetMachineTypesCaps, where the array was allocated with the un-adjusted size. Tim Wiederhake (2): virQEMUCapsGetMachineTypesCaps: Use GPtrArray viralloc: Delete VIR_INSERT_ELEMENT_COPY and VIR_INSERT_ELEMENT_COPY_INPLACE src/qemu/qemu_capabilities.c | 37 ++++++++++++++++++------------------ src/util/viralloc.h | 22 ++++----------------- 2 files changed, 22 insertions(+), 37 deletions(-) -- 2.31.1

2 3

[PATCH 0/2] Add support for 'id' attribute for 'cachetune' element
by Kristina Hanicova 19 Jul '21

19 Jul '21

Kristina Hanicova (2): docs: Allow 'id' attribute for 'cachetune' element tests: Modify to test output value of <cachetune id='' docs/formatdomain.rst | 2 +- docs/schemas/domaincommon.rng | 5 ++++ tests/genericxml2xmlindata/cachetune.xml | 8 +++--- tests/genericxml2xmloutdata/cachetune.xml | 34 ----------------------- tests/genericxml2xmltest.c | 2 +- 5 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 tests/genericxml2xmloutdata/cachetune.xml -- 2.31.1

2 4

[PATCH] test_driver: Implement virDomainGetControlInfo and add test
by Luke Yue 19 Jul '21

19 Jul '21

As test driver won't have real background job running, in order to get all possible states, the time is used here to decide which state to be returned. The default time will get `ok` as return value. Note that using `virsh domtime fc4 200` won't take effect for the test driver, to get other states, you have to enter virsh interactive terminal and set time. Signed-off-by: Luke Yue <lukedyue(a)gmail.com> --- src/test/test_driver.c | 63 ++++++++++++++++++++++++++++++++++++++++++ tests/virshtest.c | 11 ++++++++ 2 files changed, 74 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ef0ddab54d..892dc978f2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2080,6 +2080,68 @@ testDomainGetState(virDomainPtr domain, return 0; } +static int +testDomainGetControlInfo(virDomainPtr dom, + virDomainControlInfoPtr info, + unsigned int flags) +{ + virDomainObj *vm; + testDomainObjPrivate *priv; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + priv = vm->privateData; + + memset(info, 0, sizeof(*info)); + + if (priv->seconds > 0 && priv->seconds < 10000) { + info->state = VIR_DOMAIN_CONTROL_JOB; + info->stateTime = priv->seconds; + } else if (priv->seconds < 30000 && priv->seconds >= 10000) { + info->state = VIR_DOMAIN_CONTROL_OCCUPIED; + info->stateTime = priv->seconds - 10000; + } else if (priv->seconds < 60000 && priv->seconds >= 30000) { + info->state = VIR_DOMAIN_CONTROL_ERROR; + switch (priv->seconds % 4) { + case 0: + info->details = VIR_DOMAIN_CONTROL_ERROR_REASON_NONE; + break; + + case 1: + info->details = VIR_DOMAIN_CONTROL_ERROR_REASON_UNKNOWN; + break; + + case 2: + info->details = VIR_DOMAIN_CONTROL_ERROR_REASON_MONITOR; + break; + + case 3: + info->details = VIR_DOMAIN_CONTROL_ERROR_REASON_INTERNAL; + break; + + default: + info->details = VIR_DOMAIN_CONTROL_ERROR_REASON_NONE; + break; + } + info->stateTime = priv->seconds - 30000; + } else { + info->state = VIR_DOMAIN_CONTROL_OK; + } + + ret = 0; + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + static int testDomainGetTime(virDomainPtr dom, long long *seconds, @@ -9335,6 +9397,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainGetHostname = testDomainGetHostname, /* 5.5.0 */ .domainGetInfo = testDomainGetInfo, /* 0.1.1 */ .domainGetState = testDomainGetState, /* 0.9.2 */ + .domainGetControlInfo = testDomainGetControlInfo, /* 7.6.0 */ .domainGetTime = testDomainGetTime, /* 5.4.0 */ .domainSetTime = testDomainSetTime, /* 5.7.0 */ .domainSave = testDomainSave, /* 0.3.2 */ diff --git a/tests/virshtest.c b/tests/virshtest.c index c1974c46cb..fe0c420958 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -250,6 +250,13 @@ static int testCompareDomstateByName(const void *data G_GNUC_UNUSED) return testCompareOutputLit(exp, NULL, argv); } +static int testCompareDomControlInfoByName(const void *data G_GNUC_UNUSED) +{ + const char *const argv[] = { VIRSH_CUSTOM, "domcontrol", "fc4", NULL }; + const char *exp = "ok\n\n"; + return testCompareOutputLit(exp, NULL, argv); +} + struct testInfo { const char *const *argv; const char *result; @@ -334,6 +341,10 @@ mymain(void) testCompareDomstateByName, NULL) != 0) ret = -1; + if (virTestRun("virsh domcontrol (by name)", + testCompareDomControlInfoByName, NULL) != 0) + ret = -1; + /* It's a bit awkward listing result before argument, but that's a * limitation of C99 vararg macros. */ # define DO_TEST(i, result, ...) \ -- 2.32.0

2 1

[libvirt PATCH 1/2] nodedev: fix parent device of inactive mdevs
by Jonathon Jongsma 19 Jul '21

19 Jul '21

Inactive mdevs were simply formatting their parent name as the value received from mdevctl rather than looking up the libvirt nodedev name of the parent device. This resulted in a parent value of e.g. '0000:5b:00.0' instead of 'pci_0000_5b_00_0'. This prevented defining a new mdev device from the output of nodedev-dumpxml. Unfortunately, it's not simple to fix this comprehensively due to the fact that mdevctl supports defining (inactive) mdevs for parent devices that do not actually exist on the host (yet). So for those persistent mdev definitions that do not have a valid parent in the device list, the parent device will be set to the root "computer" device. Unfortunately, because the value of the 'parent' field now depends on the configuration of the host, the mdevctl parsing test will output 'computer' for all test devices. Fixing this would require a more extensive mock test environment. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1979761 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> fixup --- src/node_device/node_device_driver.c | 20 ++++++++++++++++++- .../mdevctl-list-multiple.out.xml | 8 ++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index b4dd57e5f4..26b0c2f032 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1051,6 +1051,7 @@ nodeDeviceParseMdevctlChildDevice(const char *parent, virJSONValue *props; virJSONValue *attrs; g_autoptr(virNodeDeviceDef) child = g_new0(virNodeDeviceDef, 1); + g_autofree char *parent_sysfs_path = NULL; /* the child object should have a single key equal to its uuid. * The value is an object describing the properties of the mdev */ @@ -1060,7 +1061,24 @@ nodeDeviceParseMdevctlChildDevice(const char *parent, uuid = virJSONValueObjectGetKey(json, 0); props = virJSONValueObjectGetValue(json, 0); - child->parent = g_strdup(parent); + /* Look up id of parent device. mdevctl supports defining mdevs for parent + * devices that are not present on the system (to support starting mdevs on + * hotplug, etc) so the parent may not actually exist. */ + parent_sysfs_path = g_strdup_printf("/sys/class/mdev_bus/%s", parent); + if (virFileExists(parent_sysfs_path)) { + g_autofree char *canon_syspath = realpath(parent_sysfs_path, NULL); + virNodeDeviceObj *parentobj = NULL; + if ((parentobj = virNodeDeviceObjListFindBySysfsPath(driver->devs, + canon_syspath))) { + virNodeDeviceDef *parentdef = virNodeDeviceObjGetDef(parentobj); + child->parent = g_strdup(parentdef->name); + virNodeDeviceObjEndAPI(&parentobj); + + child->parent_sysfs_path = g_steal_pointer(&canon_syspath); + } + } + if (!child->parent) + child->parent = g_strdup("computer"); child->caps = g_new0(virNodeDevCapsDef, 1); child->caps->data.type = VIR_NODE_DEV_CAP_MDEV; diff --git a/tests/nodedevmdevctldata/mdevctl-list-multiple.out.xml b/tests/nodedevmdevctldata/mdevctl-list-multiple.out.xml index cf7e966256..eead6f2a40 100644 --- a/tests/nodedevmdevctldata/mdevctl-list-multiple.out.xml +++ b/tests/nodedevmdevctldata/mdevctl-list-multiple.out.xml @@ -1,6 +1,6 @@ <device> <name>mdev_200f228a_c80a_4d50_bfb7_f5a0e4e34045</name> - <parent>0000:00:02.0</parent> + <parent>computer</parent> <capability type='mdev'> <type id='i915-GVTg_V5_4'/> <uuid>200f228a-c80a-4d50-bfb7-f5a0e4e34045</uuid> @@ -9,7 +9,7 @@ </device> <device> <name>mdev_de807ffc_1923_4d5f_b6c9_b20ecebc6d4b</name> - <parent>0000:00:02.0</parent> + <parent>computer</parent> <capability type='mdev'> <type id='i915-GVTg_V5_4'/> <uuid>de807ffc-1923-4d5f-b6c9-b20ecebc6d4b</uuid> @@ -18,7 +18,7 @@ </device> <device> <name>mdev_435722ea_5f43_468a_874f_da34f1217f13</name> - <parent>0000:00:02.0</parent> + <parent>computer</parent> <capability type='mdev'> <type id='i915-GVTg_V5_8'/> <uuid>435722ea-5f43-468a-874f-da34f1217f13</uuid> @@ -28,7 +28,7 @@ </device> <device> <name>mdev_783e6dbb_ea0e_411f_94e2_717eaad438bf</name> - <parent>matrix</parent> + <parent>computer</parent> <capability type='mdev'> <type id='vfio_ap-passthrough'/> <uuid>783e6dbb-ea0e-411f-94e2-717eaad438bf</uuid> -- 2.31.1

4 10

Question about skipping virDomainDiskDefAssignAddress
by Motohiro Kawahito 19 Jul '21

19 Jul '21

Hi, is there any existing way for skipping virDomainDiskDefAssignAddress for disk configuration? I want to send the following XML to libvirt, but I got the error "virDomainDiskDefAssignAddress:7642 : XML error: Unknown disk name '0A80' and no address specified". <disk type='file'> <source file='/volumes_qcow2/DMRES1.qcow2'/> <target dev='0A80' /> </disk> According to the source code, target device must be one of {"fd", "hd", "vd", "sd", "xvd", "ubd"} + alphabet (+ number). Our guest OS is not Linux, so I'd like to skip this limitation. Actually, I want to specify 4-digits hexadecimal number in target device. Is there any hypervisor driver for Windows? I guess that it also has the same problem. Motohiro Kawahito, Commercial Systems, IBM Research - Tokyo 19-21 Nihonbashi, Hakozaki-cho Chuo-ku, Tokyo 103-8510, Japan

3 9

How do we specify disk device names for non-Linux VMs in XML?
by Motohiro Kawahito 19 Jul '21

19 Jul '21

The XML parser (or verifier) in libvirt seems to support only Linux device names for a disk, such as hda, sda and vda. Can anyone let us know how libvirt supports disk device names for non-Linux VMs? We are developing a new hypervisor driver for a non-Linux VM, which uses a different device naming convention from Linux, something like 0A80. 0A81, 0A82. Thank you so much. Motohiro Kawahito, Commercial Systems, IBM Research - Tokyo 19-21 Nihonbashi, Hakozaki-cho Chuo-ku, Tokyo 103-8510, Japan

2 1

[PATCH] qemu: migration: Use correct flag when preparing block dirty bitmaps
by Jim Fehlig 19 Jul '21

19 Jul '21

qemuMigrationSrcRunPrepareBlockDirtyBitmaps receives the flags parameter from qemuMigrationSrcRun, where flags are based on the main API enum values. Similar to commit f58349c9c6, use the main API enum instead of internal driver enum when checking flags in qemuMigrationSrcRunPrepareBlockDirtyBitmaps. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Noticed by visiual inspection while investigating a bug report similar to https://bugzilla.redhat.com/show_bug.cgi?id=1978526 src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2ec7b7c48b..ba8c0bd2d0 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3972,7 +3972,7 @@ qemuMigrationSrcRunPrepareBlockDirtyBitmaps(virDomainObj *vm, * directly, otherwise we must create merged bitmaps from the whole * chain */ - if (!(flags & QEMU_MONITOR_MIGRATE_NON_SHARED_INC) && + if (!(flags & VIR_MIGRATE_NON_SHARED_INC) && qemuMigrationSrcRunPrepareBlockDirtyBitmapsMerge(vm, mig) < 0) return -1; -- 2.31.1

2 1

[PATCH] qemu: Fix error returned value in qemuGetProcessInfo when fscanf execute failed
by Yi Wang 16 Jul '21

16 Jul '21

From: Long YunJian <long.yunjian(a)zte.com.cn> If fscanf execute failed, qemuGetProcessInfo shuld return -1, but it return 0 at the end. Zero means success for the caller, so we shuld return -1 in the case of failure. Signed-off-by: Long YunJian <long.yunjian(a)zte.com.cn> Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/qemu/qemu_driver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index df44c3fbd0..4c3785fa36 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1442,11 +1442,13 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, return -1; pidinfo = fopen(proc, "r"); + if (!pidinfo) { + return -1; + } /* See 'man proc' for information about what all these fields are. We're * only interested in a very few of them */ - if (!pidinfo || - fscanf(pidinfo, + if (fscanf(pidinfo, /* pid -> stime */ "%*d (%*[^)]) %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu" /* cutime -> endcode */ @@ -1455,6 +1457,8 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, "%*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %d", &usertime, &systime, &rss, &cpu) != 4) { VIR_WARN("cannot parse process status data"); + VIR_FORCE_FCLOSE(pidinfo); + return -1; } /* We got jiffies -- 2.18.1

3 2

[PATCH 9/9] docs/deprecated: deprecate passing plugin args through `arg=`
by Mahmoud Mandour 16 Jul '21

16 Jul '21

Signed-off-by: Mahmoud Mandour <ma.mandourr(a)gmail.com> --- docs/system/deprecated.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index e2e0090878..aaf0ee5777 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -126,6 +126,12 @@ other options have been processed. This will either have no effect (if if they were not given. The property is therefore useless and should not be specified. +Plugin argument passing through ``arg=<string>`` (since 6.1) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Passing arguments through ``arg=`` is redundant is makes the command-line less +readable, especially when the argument itself consist of a name and a value, +e.g. ``arg="arg_name=arg_value"``. Therefore, the usage of ``arg`` is redundant. QEMU Machine Protocol (QMP) commands ------------------------------------ -- 2.25.1

1 0

[PATCH v2 0/3] domstats:add haltpolling time statistic interface
by Yang Fei 15 Jul '21

15 Jul '21

This series add the ability to statistic the halt polling time when VM execute HLT(arm is WFI). v1: https://listman.redhat.com/archives/libvir-list/2021-July/msg00029.html changes from v1: - Move virGetCgroupValueRaw to utils.c and rename it virGetValueRaw. So that we can call it to obtain halt polling time. - Helper function virGetCpuHaltPollTime and virGetDebugFsKvmValue are added in a separate patch - Use STRPREFIX to match the path prefix. - Fix the logic that domstats will break when platform is non-linux, debugfs isn't mounted and so on. Yang Fei (3): util: Move virGetCgroupValueRaw to vircgroup.c and rename it virGetValueRaw util: Add virGetCpuHaltPollTime and virGetDebugFsKvmValue qemu: Introduce qemuDomainGetStatsCpuHaltPollTime src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 28 +++++++++++ src/util/vircgroup.c | 29 +---------- src/util/vircgrouppriv.h | 3 -- src/util/vircgroupv1.c | 5 +- src/util/vircgroupv2.c | 5 +- src/util/virutil.c | 101 +++++++++++++++++++++++++++++++++++++++ src/util/virutil.h | 12 +++++ 8 files changed, 151 insertions(+), 34 deletions(-) -- 2.23.0

2 9

[libvirt PATCH 0/2] Tiny misc clean-ups
by Martin Kletzander 15 Jul '21

15 Jul '21

Some whitespaces were wrong and one debug message was confusing to newcomers. Martin Kletzander (2): util: Make one debug message nicer whitespace clean-ups docs/schemas/capability.rng | 10 +++++----- src/conf/capabilities.c | 2 +- src/util/virresctrl.c | 4 ++-- .../vircaps-x86_64-resctrl-fake-feature.xml | 4 ++-- tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) -- 2.32.0

3 4

[PATCH v2] nodedev: fix internal error when no defined mdevs exist
by Boris Fiuczynski 15 Jul '21

15 Jul '21

Commit e9b534905f4 introduced an error when parsing an empty list returned from mdevctl. This occurs e.g. if nodedev-undefine is used to undefine the last defined mdev which cuases the following error messages libvirtd[33143]: internal error: Unexpected format for mdevctl response libvirtd[33143]: internal error: failed to query mdevs from mdevctl: libvirtd[33143]: mdevctl failed to updated mediated devices Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- src/node_device/node_device_driver.c | 5 +++++ tests/nodedevmdevctldata/mdevctl-list-empty.json | 1 + tests/nodedevmdevctldata/mdevctl-list-empty.out.xml | 0 tests/nodedevmdevctltest.c | 1 + 4 files changed, 7 insertions(+) create mode 100644 tests/nodedevmdevctldata/mdevctl-list-empty.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-empty.out.xml diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index b4dd57e5f4..b16b05f9b2 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1120,6 +1120,11 @@ nodeDeviceParseMdevctlJSON(const char *jsonstring, goto error; } + if (virJSONValueArraySize(json_devicelist) == 0) { + *devs = outdevs; + return 0; + } + /* mdevctl list --dumpjson produces an output that is an array that * contains only a single object which contains a property for each parent * device */ diff --git a/tests/nodedevmdevctldata/mdevctl-list-empty.json b/tests/nodedevmdevctldata/mdevctl-list-empty.json new file mode 100644 index 0000000000..fe51488c70 --- /dev/null +++ b/tests/nodedevmdevctldata/mdevctl-list-empty.json @@ -0,0 +1 @@ +[] diff --git a/tests/nodedevmdevctldata/mdevctl-list-empty.out.xml b/tests/nodedevmdevctldata/mdevctl-list-empty.out.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c index 8ba1d2da70..e246de4d87 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -360,6 +360,7 @@ mymain(void) DO_TEST_LIST_DEFINED(); + DO_TEST_PARSE_JSON("mdevctl-list-empty"); DO_TEST_PARSE_JSON("mdevctl-list-multiple"); DO_TEST_DEFINE("mdev_d069d019_36ea_4111_8f0a_8c9a70e21366"); -- 2.31.1

3 3

[PATCH 0/2] domcaps: Add support for 'memoryBacking' element
by Kristina Hanicova 15 Jul '21

15 Jul '21

virt-manager needs to know if memfd memory source type is supported in order to use virtiofs. Regarding: https://listman.redhat.com/archives/virt-tools-list/2021-July/msg00000.html Kristina Hanicova (2): conf: domcaps: Report <memoryBacking> qemu: capabilities: fill in domcaps <memoryBacking> docs/formatdomaincaps.html.in | 28 +++++++++++++++++++ docs/schemas/domaincaps.rng | 10 +++++++ src/conf/domain_capabilities.c | 14 ++++++++++ src/conf/domain_capabilities.h | 8 ++++++ src/qemu/qemu_capabilities.c | 22 +++++++++++++++ src/qemu/qemu_capabilities.h | 3 ++ .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 6 ++++ .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 6 ++++ tests/domaincapsdata/qemu_2.11.0.s390x.xml | 6 ++++ tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 6 ++++ .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 7 +++++ .../qemu_2.12.0-virt.aarch64.xml | 7 +++++ tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 7 +++++ tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 7 +++++ tests/domaincapsdata/qemu_2.12.0.s390x.xml | 7 +++++ tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 7 +++++ tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 7 +++++ tests/domaincapsdata/qemu_3.0.0.s390x.xml | 7 +++++ tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 7 +++++ tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 7 +++++ tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 7 +++++ .../qemu_4.0.0-virt.aarch64.xml | 7 +++++ tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 7 +++++ tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 7 +++++ tests/domaincapsdata/qemu_4.0.0.s390x.xml | 7 +++++ tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 7 +++++ tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 7 +++++ .../qemu_4.2.0-virt.aarch64.xml | 7 +++++ tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 7 +++++ tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 7 +++++ tests/domaincapsdata/qemu_4.2.0.s390x.xml | 7 +++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 7 +++++ .../qemu_5.0.0-virt.aarch64.xml | 7 +++++ tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 7 +++++ tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 7 +++++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 7 +++++ tests/domaincapsdata/qemu_5.1.0.sparc.xml | 7 +++++ tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 7 +++++ .../qemu_5.2.0-virt.aarch64.xml | 7 +++++ tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 7 +++++ tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 7 +++++ tests/domaincapsdata/qemu_5.2.0.s390x.xml | 7 +++++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 7 +++++ tests/domaincapsdata/qemu_6.0.0.s390x.xml | 7 +++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 7 +++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 7 +++++ 67 files changed, 508 insertions(+) -- 2.31.1

2 3

[PATCH] ci: refresh cirrus variables for FreeBSD python rename
by Daniel P. Berrangé 15 Jul '21

15 Jul '21

All the python packages got renamed from py37- to py38- Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- ci/cirrus/freebsd-12.vars | 4 ++-- ci/cirrus/freebsd-13.vars | 4 ++-- ci/cirrus/freebsd-current.vars | 4 ++-- ci/cirrus/macos-11.vars | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 40a19b5773..914ad417b9 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -2,7 +2,7 @@ # # $ lcitool variables freebsd-12 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b3072948034… PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' @@ -10,4 +10,4 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' PIP3='/usr/local/bin/pip-3.7' -PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' +PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index f0270c70a4..58c18a2f36 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -2,7 +2,7 @@ # # $ lcitool variables freebsd-13 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b3072948034… PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' @@ -10,4 +10,4 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' PIP3='/usr/local/bin/pip-3.7' -PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' +PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index e4de22b302..1a5ac52cf9 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -2,7 +2,7 @@ # # $ lcitool variables freebsd-current libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b3072948034… PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' @@ -10,4 +10,4 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' PIP3='/usr/local/bin/pip-3.7' -PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' +PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index a723cdf927..73402bab8f 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -2,7 +2,7 @@ # # $ lcitool variables macos-11 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b3072948034… PACKAGING_COMMAND='brew' CCACHE='/usr/local/bin/ccache' -- 2.31.1

3 2

[PATCH v2 0/3] Do not erase duplicate devices from namespace
by Kristina Hanicova 15 Jul '21

15 Jul '21

This is v2 of: https://listman.redhat.com/archives/libvir-list/2021-July/msg00129.html Changes since v1 (suggested by Michal and Jano): * change of int variable to one-word bool * isolate changes outside of qemu to separate patch * rewritten assignment of return value * slight change of documentation * extension of use to all devices, not just input * @created variable is set in one core function instead of setting it in each device function separately Kristina Hanicova (3): qemu: Check for existing file in namespace virprocess: Return retval of the child on success, not 0 qemu: Do not erase duplicate devices from namespace if error occurs src/qemu/qemu_domain.c | 4 +-- src/qemu/qemu_hotplug.c | 27 +++++---------- src/qemu/qemu_namespace.c | 71 +++++++++++++++++++++++++-------------- src/qemu/qemu_namespace.h | 18 ++++++---- src/qemu/qemu_process.c | 2 +- src/util/virprocess.c | 12 ++++--- 6 files changed, 75 insertions(+), 59 deletions(-) -- 2.31.1

2 6

[libvirt][PATCH v5 0/6] Support query and use SGX
by Haibin Huang 15 Jul '21

15 Jul '21

This patch series provides support for enabling Intel's Software Guard Extensions (SGX) feature in guest VM. Giving the SGX support in QEMU is still pending for reviewing, this patch series is not submmited for code review, but only describe the SGX enabling solution design that contains changes to virConnectGetDomainCapabilities API response and domain definition. All comments/suggestions would be highly appreciated. Intel Software Guard Extensions (Intel® SGX) is a set of instructions that increases the security of application code and data, giving them more protection from disclosure or modification. Developers can partition sensitive information into enclaves, which are areas of execution in memory with more security protection. The typical flow looks below at very high level: 1. Calls virConnectGetDomainCapabilities API to domain capabilities that includes the following SGX information. <feature> ... <sgx supported='yes'> <epc_size unit=’KiB’>N</epc_size> </sgx> </feature> 2. User requests to start a guest calling virCreateXML() with SGX requirement. It should contain <launchSecurity type='sgx'> <epc_size unit='KiB'>N</epc_size> </launchSecurity> Haibin Huang (4): Support to query SGX capability Add guest use sgx document Add create guest unit test Add get qemu and domain capabilities unit test Lin Yang (2): conf: Introduce SGX related element into domain xml qemu: Add command-line to generate SGX EPC memory backend docs/formatdomain.rst | 28 +- docs/schemas/domaincaps.rng | 20 + docs/schemas/domaincommon.rng | 62 +- src/conf/domain_capabilities.c | 29 + src/conf/domain_capabilities.h | 13 + src/conf/domain_conf.c | 128 +- src/conf/domain_conf.h | 10 + src/conf/virconftypes.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 139 + src/qemu/qemu_capabilities.h | 6 + src/qemu/qemu_command.c | 23 + src/qemu/qemu_monitor.c | 10 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 87 + src/qemu/qemu_monitor_json.h | 3 + tests/domaincapsdata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsdata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsdata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsdata/empty.xml | 1 + tests/domaincapsdata/libxl-xenfv.xml | 1 + tests/domaincapsdata/libxl-xenpv.xml | 1 + .../domaincapsdata/qemu_1.5.3-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_1.5.3-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_1.5.3.x86_64.xml | 1 + .../domaincapsdata/qemu_1.6.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_1.6.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_1.6.0.x86_64.xml | 1 + .../domaincapsdata/qemu_1.7.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_1.7.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_1.7.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.1.1-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.1.1-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.1.1.x86_64.xml | 1 + .../domaincapsdata/qemu_2.10.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.10.0-tcg.x86_64.xml | 1 + .../qemu_2.10.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.10.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 1 + .../qemu_2.12.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-tcg.x86_64.xml | 1 + .../qemu_2.6.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.7.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.8.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.8.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 1 + .../qemu_4.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 210 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 204 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 210 + .../launch-security-sgx.xml | 20 + tests/genericxml2xmltest.c | 1 + .../caps_5.2.0.x86_64.replies | 29694 ++++++++++++++++ .../caps_5.2.0.x86_64.xml | 3194 ++ .../launch-security-sgx.x86_64-5.1.0.args | 40 + .../qemuxml2argvdata/launch-security-sgx.xml | 34 + tests/qemuxml2argvtest.c | 1 + 122 files changed, 34214 insertions(+), 55 deletions(-) create mode 100644 tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_5.2.0.x86_64.xml create mode 100644 tests/genericxml2xmlindata/launch-security-sgx.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml create mode 100644 tests/qemuxml2argvdata/launch-security-sgx.x86_64-5.1.0.args create mode 100644 tests/qemuxml2argvdata/launch-security-sgx.xml -- 2.17.1

1 6

[PATCH v2 0/9] ch: Add Console support
by William Douglas 15 Jul '21

15 Jul '21

This series enables console support in the cloud-hypervisor driver. Cloud-hypervisor only supports a single console or serial device at a time, hence the checks to ensure the domain configuration is only passing one or the other. Changes since v1: * Added missing patch to add the virChrdev device * Added handling for multiple curl WRITEFUNCTION call backs * Added missing free for data.content * Removed redundant console configuration check * Improved handling of pty JSON data to make use of g_autoptr * Squashed two patches William Douglas (9): ch_domain: Add virChrdevs for console support ch_monitor: Make unused function static ch_monitor: Update virCHMonitorGet to handle accept a response ch_monitor: Use virCHMonitorGet to access cloud-hypervisor API ch_monitor: Add pty json builder function ch_process: Handle enabled console devices ch_process: Update the domain with console path information ch_domain: Allow controller and chr devices ch_driver: Add handler for console API src/ch/ch_domain.c | 11 ++++- src/ch/ch_domain.h | 3 ++ src/ch/ch_driver.c | 78 +++++++++++++++++++++++++++++ src/ch/ch_monitor.c | 118 ++++++++++++++++++++++++++++++++++++++++++-- src/ch/ch_monitor.h | 3 ++ src/ch/ch_process.c | 67 +++++++++++++++++++++++++ 6 files changed, 274 insertions(+), 6 deletions(-) -- 2.31.1

1 9

[libvirt PATCH v2 0/1] Prevent expanding worker pool by zero
by Tim Wiederhake 14 Jul '21

14 Jul '21

V1: https://listman.redhat.com/archives/libvir-list/2021-July/msg00217.html Changes since V1: * Fix this not in virThreadPoolExpand, but in virThreadPoolNewFull. * Expanded the commit message. Tim Wiederhake (1): virThreadPoolNewFull: Prevent expanding worker pool by zero src/util/virthreadpool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.31.1

2 2

[PATCH v1] apparmor: Allow /usr/libexec for private xen-tools binaries
by Olaf Hering 14 Jul '21

14 Jul '21

This is a followup for commit e906c4d02bdcddf141b4d124afd68c8ee10134fe ("apparmor: Allow /usr/libexec for libxl-save-helper and pygrub"): In recent rpm versions --libexecdir changed from /usr/lib64 to /usr/libexec. A plain rpmbuild %configure in xen.git will install all files, including the private copies of qemu, into /usr/libexec/xen/bin. Expand the existing pattern to cover also this libexecdir variant. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- src/security/apparmor/usr.sbin.libvirtd.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/apparmor/usr.sbin.libvirtd.in b/src/security/apparmor/usr.sbin.libvirtd.in index 928782b709..f2ab6ff2aa 100644 --- a/src/security/apparmor/usr.sbin.libvirtd.in +++ b/src/security/apparmor/usr.sbin.libvirtd.in @@ -88,7 +88,7 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) { @sbindir@/* PUx, /{usr/,}lib/udev/scsi_id PUx, /usr/{lib,lib64}/xen-common/bin/xen-toolstack PUx, - /usr/{lib,lib64}/xen/bin/* Ux, + /usr/{lib,lib64,libexec}/xen/bin/* Ux, /usr/{lib,libexec}/xen-*/bin/libxl-save-helper PUx, /usr/{lib,libexec}/xen-*/bin/pygrub PUx, /usr/{lib,lib64,lib/qemu,libexec}/vhost-user-gpu PUx,

3 2

[PATCH 0/2] virDir* related cleanups
by Michal Privoznik 14 Jul '21

14 Jul '21

*** BLURB HERE *** Michal Prívozník (2): syntax-check: s/VIR_DIR_CLOSE/g_autoptr(DIR)/ virfile: Update example use of virDirRead() build-aux/syntax-check.mk | 2 +- src/util/virfile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.31.1

2 3

[libvirt PATCH 00/10] virHashNew refactorings - part IV
by Tim Wiederhake 14 Jul '21

14 Jul '21

"virHashNew" cannot return NULL, yet we check for NULL in various places. See https://listman.redhat.com/archives/libvir-list/2021-July/msg00074.html. Tim Wiederhake (10): conf: Add AUTOPTR_CLEANUP_FUNC for virNWFilterBindingDef virNWFilterBindingDefCopy: `virHashNew` cannot return NULL virNWFilterBindingDefCopy: Use automatic memory management virNWFilterBindingDefCopy: Remove superfluous `goto`s virNWFilterBindingDefForNet: `virHashNew` cannot return NULL virNWFilterBindingDefForNet: Use automatic memory management virNWFilterBindingDefForNet: Remove superfluous `goto`s virNWFilterBindingObjListNew: `virHashNew` cannot return NULL virNWFilterBuildAll: `virHashNew` cannot return NULL virNWFilterDHCPSnoopInit: `virHashNew` cannot return NULL src/conf/domain_nwfilter.c | 15 ++++----------- src/conf/virnwfilterbindingdef.c | 15 ++++----------- src/conf/virnwfilterbindingdef.h | 2 ++ src/conf/virnwfilterbindingobjlist.c | 5 +---- src/nwfilter/nwfilter_dhcpsnoop.c | 17 ----------------- src/nwfilter/nwfilter_gentech_driver.c | 3 +-- 6 files changed, 12 insertions(+), 45 deletions(-) -- 2.31.1

2 11

[PATCH V3 0/2] Apparmor: Add profiles for hypervisor daemons
by Jim Fehlig 14 Jul '21

14 Jul '21

V2: https://listman.redhat.com/archives/libvir-list/2021-June/msg00676.html V1: https://listman.redhat.com/archives/libvir-list/2021-June/msg00456.html Changes since V2: Patches 3 and 4 ACKed and pushed since they are bug fixes independent of modular vs monolithic daemons. The qemu_bridge_helper subprofile in patch 1 was adjusted for communication with virtqemud instead of libvirtd. After snooping through git history, I found a few capabilities explicitly added for xen that have been added back to the virtxend profile. Note: The profile for virtlxcd will have to wait until the following issue is fixed https://gitlab.com/libvirt/libvirt/-/issues/181 Jim Fehlig (2): Apparmor: Add profile for virtqemud Apparmor: Add profile for virtxend src/security/apparmor/libvirt-qemu | 3 + src/security/apparmor/meson.build | 2 + src/security/apparmor/usr.sbin.virtqemud.in | 134 ++++++++++++++++++++ src/security/apparmor/usr.sbin.virtxend.in | 55 ++++++++ 4 files changed, 194 insertions(+) create mode 100644 src/security/apparmor/usr.sbin.virtqemud.in create mode 100644 src/security/apparmor/usr.sbin.virtxend.in -- 2.31.1

4 7

[libvirt PATCH v2 00/10] virHashNew refactorings - part II
by Tim Wiederhake 14 Jul '21

14 Jul '21

"virHashNew" cannot return NULL, yet we check for NULL in various places. V1: https://listman.redhat.com/archives/libvir-list/2021-July/msg00188.html Changes since V1: * Moved the inversion of the `if` condition in patch #9 to patch #8 * Only patches #8 and #9 are missing review Tim Wiederhake (10): virNWFilterCreateVarsFrom: `virHashNew` cannot return NULL virNWFilterCreateVarsFrom: Use automatic memory management virNWFilterCreateVarsFrom: Remove superfluous `goto`s virNWFilterRuleDefToRuleInst: `virHashNew` cannot return NULL iptablesPrivateChainCreate: `virHashNew` cannot return NULL iptablesPrivateChainCreate: Use automatic memory management iptablesPrivateChainCreate: Remove superfluous `goto`s qemuMonitorGetMemoryDeviceInfo: Assign hash table only on success qemuMonitorGetMemoryDeviceInfo: Use automatic memory management qemuMonitorGetMemoryDeviceInfo: `virHashNew` cannot return NULL src/qemu/qemu_monitor.c | 10 +++------- src/util/viriptables.c | 20 +++++--------------- tests/nwfilterxml2firewalltest.c | 18 ++++++------------ 3 files changed, 14 insertions(+), 34 deletions(-) -- 2.31.1

2 12

[PATCH] virt-aa-helper: Allow swtpm to fsync on dir
by Stefan Berger 14 Jul '21

14 Jul '21

Allow swtpm (0.7.0 or later) to fsync on the directory where it writes its state files into so that "the entry in the directory containing the file has also reached disk" (fsync(2)). Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/security/virt-aa-helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 52cfebf6e0..e21557c810 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1250,8 +1250,11 @@ get_files(vahControl * ctl) " \"%s/libvirt/qemu/swtpm/%s-swtpm.sock\" rw,\n", RUNSTATEDIR, shortName); /* Paths for swtpm to use: give it access to its state - * directory, log, and PID files. + * directory (state files and fsync on dir), log, and PID files. */ + virBufferAsprintf(&buf, + " \"%s/lib/libvirt/swtpm/%s/%s/\" r,\n", + LOCALSTATEDIR, uuidstr, tpmpath); virBufferAsprintf(&buf, " \"%s/lib/libvirt/swtpm/%s/%s/**\" rwk,\n", LOCALSTATEDIR, uuidstr, tpmpath); -- 2.31.1

4 4

[libvirt PATCH] AUTHORS: Add myself to the list of commiters
by Tim Wiederhake 14 Jul '21

14 Jul '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- AUTHORS.rst.in | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst.in b/AUTHORS.rst.in index a580359c0e..e8a560b780 100644 --- a/AUTHORS.rst.in +++ b/AUTHORS.rst.in @@ -31,6 +31,7 @@ The primary maintainers and people with commit access rights: * Pino Toscano <ptoscano(a)redhat.com> * Richard W.M. Jones <rjones(a)redhat.com> * Roman Bogorodskiy <bogorodskiy(a)gmail.com> +* Tim Wiederhake <twiederh(a)redhat.com> Previous maintainers: -- 2.31.1

3 2

[PATCH 0/2] conf: network: dns: Allow addition of multiple addresses with same hosname
by Peter Krempa 14 Jul '21

14 Jul '21

See patch 2/2 Peter Krempa (2): networkxml2xmltest: Add example of multiple addresses having the same hostname network: Allow adding DNS entries sharing hostname for multiple addreses src/conf/network_conf.c | 13 +++++++++---- tests/networkxml2xmlin/nat-network-dns-hosts.xml | 11 +++++++++++ tests/networkxml2xmlout/nat-network-dns-hosts.xml | 11 +++++++++++ .../nat-network-dns-more-hosts.xml | 11 +++++++++++ .../nat-network-no-hosts.xml | 14 +++++++++++++- 5 files changed, 55 insertions(+), 5 deletions(-) -- 2.31.1

2 3

[PATCH] Use postfix increment
by Michal Privoznik 14 Jul '21

14 Jul '21

We document that our coding style is to use postfix increment in for() loops rather than prefix. This change was generated by the following sed script: for i in $(git grep -l "for (.*; ++.*)"); do \ sed -i 's/$for (.*; $++$.*$)/\1\2++)/' $i; \ done Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/c/misc/openauth.c | 2 +- src/conf/node_device_conf.c | 2 +- src/cpu/cpu.c | 2 +- src/esx/esx_driver.c | 8 +-- src/esx/esx_network_driver.c | 8 +-- src/esx/esx_storage_backend_iscsi.c | 4 +- src/esx/esx_storage_backend_vmfs.c | 4 +- src/esx/esx_storage_driver.c | 12 ++--- src/esx/esx_vi.c | 14 ++--- src/hyperv/hyperv_driver.c | 4 +- src/hyperv/hyperv_network_driver.c | 2 +- src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_driver.c | 10 ++-- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_migration_params.c | 2 +- src/qemu/qemu_process.c | 6 +-- src/remote/remote_daemon_dispatch.c | 6 +-- src/remote/remote_driver.c | 14 ++--- src/rpc/gendispatch.pl | 2 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetlibsshsession.c | 6 +-- .../storage_source_backingstore.c | 4 +- src/test/test_driver.c | 4 +- src/util/vircommand.c | 2 +- src/util/virtypedparam.c | 4 +- src/util/viruri.c | 2 +- src/vbox/vbox_XPCOMCGlue.c | 6 +-- src/vbox/vbox_common.c | 22 ++++---- src/vbox/vbox_storage.c | 6 +-- src/vmware/vmware_conf.c | 2 +- src/vmx/vmx.c | 54 +++++++++---------- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 28 +++++----- tests/esxutilstest.c | 8 +-- tests/openvzutilstest.c | 2 +- tests/testutilsqemu.c | 2 +- tests/utiltest.c | 14 ++--- tests/virtypedparamtest.c | 2 +- 39 files changed, 141 insertions(+), 141 deletions(-) diff --git a/examples/c/misc/openauth.c b/examples/c/misc/openauth.c index 4c9dd34be3..98eb4c3bd4 100644 --- a/examples/c/misc/openauth.c +++ b/examples/c/misc/openauth.c @@ -166,7 +166,7 @@ authCallback(virConnectCredentialPtr cred, unsigned int ncred, void *cbdata) * For example the ESX driver passes the hostname of the ESX or vCenter * server as challenge. This allows a auth callback to return the * proper credentials. */ - for (i = 0; i < ncred; ++i) { + for (i = 0; i < ncred; i++) { switch (cred[i].type) { case VIR_CRED_AUTHNAME: cred[i].result = strdup(authData->username); diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 332b12f997..346535695a 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1236,7 +1236,7 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt, if ((n = virXPathNodeSet("./capability", ctxt, &nodes)) < 0) return -1; - for (i = 0; i < n; ++i) { + for (i = 0; i < n; i++) { g_autofree char *type = NULL; type = virXMLPropString(nodes[i], "type"); diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index b4965f3ee0..7d280a608e 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -704,7 +704,7 @@ int virCPUCheckForbiddenFeatures(virCPUDef *guest, const virCPUDef *host) { size_t i; - for (i = 0; i < guest->nfeatures; ++i) { + for (i = 0; i < guest->nfeatures; i++) { virCPUFeatureDef *feature; if (guest->features[i].policy != VIR_CPU_FEATURE_FORBID) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 75eee49775..75ce796f17 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2773,7 +2773,7 @@ esxConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxname cleanup: if (! success) { - for (i = 0; i < count; ++i) + for (i = 0; i < count; i++) VIR_FREE(names[i]); count = -1; @@ -2977,7 +2977,7 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) goto cleanup; } - for (i = 0; i < def->ndisks; ++i) { + for (i = 0; i < def->ndisks; i++) { if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK && virDomainDiskGetType(def->disks[i]) == VIR_STORAGE_TYPE_FILE) { disk = def->disks[i]; @@ -3524,7 +3524,7 @@ esxDomainSetSchedulerParametersFlags(virDomainPtr domain, goto cleanup; } - for (i = 0; i < nparams; ++i) { + for (i = 0; i < nparams; i++) { if (STREQ(params[i].field, VIR_DOMAIN_SCHEDULER_RESERVATION)) { if (esxVI_Long_Alloc(&spec->cpuAllocation->reservation) < 0) goto cleanup; @@ -4635,7 +4635,7 @@ esxDomainSetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params, goto cleanup; } - for (i = 0; i < nparams; ++i) { + for (i = 0; i < nparams; i++) { if (STREQ(params[i].field, VIR_DOMAIN_MEMORY_MIN_GUARANTEE)) { if (esxVI_Long_Alloc(&spec->memoryAllocation->reservation) < 0) goto cleanup; diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 0a0a3dda89..517e3391cf 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -351,7 +351,7 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) if (esxVI_LookupHostPortGroupList(priv->primary, &hostPortGroupList) < 0) goto cleanup; - for (i = 0; i < def->nPortGroups; ++i) { + for (i = 0; i < def->nPortGroups; i++) { for (hostPortGroup = hostPortGroupList; hostPortGroup; hostPortGroup = hostPortGroup->_next) { if (STREQ(def->portGroups[i].name, hostPortGroup->spec->name)) { @@ -383,7 +383,7 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) if (esxVI_LookupPhysicalNicList(priv->primary, &physicalNicList) < 0) goto cleanup; - for (i = 0; i < def->forward.nifs; ++i) { + for (i = 0; i < def->forward.nifs; i++) { bool found = false; if (def->forward.ifs[i].type != @@ -439,7 +439,7 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) } /* Create HostPortGroup(s) */ - for (i = 0; i < def->nPortGroups; ++i) { + for (i = 0; i < def->nPortGroups; i++) { esxVI_HostPortGroupSpec_Free(&hostPortGroupSpec); if (esxVI_HostPortGroupSpec_Alloc(&hostPortGroupSpec) < 0 || @@ -912,7 +912,7 @@ esxConnectListAllNetworks(virConnectPtr conn, cleanup: if (ret < 0) { if (nets && *nets) { - for (i = 0; i < count; ++i) + for (i = 0; i < count; i++) g_free((*nets)[i]); g_clear_pointer(nets, g_free); } diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index d89b5a4ba8..49c0847ade 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -136,7 +136,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, cleanup: if (! success) { - for (i = 0; i < count; ++i) + for (i = 0; i < count; i++) VIR_FREE(names[i]); } @@ -425,7 +425,7 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, cleanup: if (! success) { - for (i = 0; i < count; ++i) + for (i = 0; i < count; i++) VIR_FREE(names[i]); count = -1; diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index cb2be59a33..011b4c5ebb 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -197,7 +197,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, cleanup: if (! success) { - for (i = 0; i < count; ++i) + for (i = 0; i < count; i++) VIR_FREE(names[i]); count = -1; @@ -651,7 +651,7 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, cleanup: if (! success) { - for (i = 0; i < count; ++i) + for (i = 0; i < count; i++) VIR_FREE(names[i]); count = -1; diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 056b340a08..c6a93cd505 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -63,7 +63,7 @@ esxConnectNumOfStoragePools(virConnectPtr conn) if (esxVI_EnsureSession(priv->primary) < 0) return -1; - for (i = 0; i < LAST_BACKEND; ++i) { + for (i = 0; i < LAST_BACKEND; i++) { tmp = backends[i]->connectNumOfStoragePools(conn); if (tmp < 0) @@ -92,7 +92,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, int maxnames) if (esxVI_EnsureSession(priv->primary) < 0) return -1; - for (i = 0; i < LAST_BACKEND; ++i) { + for (i = 0; i < LAST_BACKEND; i++) { tmp = backends[i]->connectListStoragePools(conn, &names[count], maxnames - count); if (tmp < 0) @@ -105,7 +105,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, int maxnames) cleanup: if (! success) { - for (i = 0; i < count; ++i) + for (i = 0; i < count; i++) VIR_FREE(names[i]); count = -1; @@ -148,7 +148,7 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - for (i = 0; i < LAST_BACKEND; ++i) { + for (i = 0; i < LAST_BACKEND; i++) { pool = backends[i]->storagePoolLookupByName(conn, name); if (pool) @@ -175,7 +175,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) return NULL; /* invoke backend drive method to search all known pools */ - for (i = 0; i < LAST_BACKEND; ++i) { + for (i = 0; i < LAST_BACKEND; i++) { pool = backends[i]->storagePoolLookupByUUID(conn, uuid); if (pool) @@ -369,7 +369,7 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key) if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - for (i = 0; i < LAST_BACKEND; ++i) { + for (i = 0; i < LAST_BACKEND; i++) { volume = backends[i]->storageVolLookupByKey(conn, key); if (volume) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index ebc6d9eb69..d01ef327a4 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -526,7 +526,7 @@ ESX_VI__TEMPLATE__FREE(SharedCURL, if (item->handle) curl_share_cleanup(item->handle); - for (i = 0; i < G_N_ELEMENTS(item->locks); ++i) + for (i = 0; i < G_N_ELEMENTS(item->locks); i++) virMutexDestroy(&item->locks[i]); }) @@ -566,7 +566,7 @@ esxVI_SharedCURL_Add(esxVI_SharedCURL *shared, esxVI_CURL *curl) curl_share_setopt(shared->handle, CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS); - for (i = 0; i < G_N_ELEMENTS(shared->locks); ++i) { + for (i = 0; i < G_N_ELEMENTS(shared->locks); i++) { if (virMutexInit(&shared->locks[i]) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not initialize a CURL (share) mutex")); @@ -1434,7 +1434,7 @@ esxVI_Enumeration_CastFromAnyType(const esxVI_Enumeration *enumeration, return -1; } - for (i = 0; enumeration->values[i].name; ++i) { + for (i = 0; enumeration->values[i].name; i++) { if (STREQ(anyType->value, enumeration->values[i].name)) { *value = enumeration->values[i].value; return 0; @@ -1464,7 +1464,7 @@ esxVI_Enumeration_Serialize(const esxVI_Enumeration *enumeration, return 0; } - for (i = 0; enumeration->values[i].name; ++i) { + for (i = 0; enumeration->values[i].name; i++) { if (value == enumeration->values[i].value) { name = enumeration->values[i].name; break; @@ -1504,7 +1504,7 @@ esxVI_Enumeration_Deserialize(const esxVI_Enumeration *enumeration, if (esxVI_String_DeserializeValue(node, &name) < 0) return -1; - for (i = 0; enumeration->values[i].name; ++i) { + for (i = 0; enumeration->values[i].name; i++) { if (STREQ(name, enumeration->values[i].name)) { *value = enumeration->values[i].value; result = 0; @@ -2576,7 +2576,7 @@ esxVI_GetSnapshotTreeNames(esxVI_VirtualMachineSnapshotTree *snapshotTreeList, return count; failure: - for (i = 0; i < count; ++i) + for (i = 0; i < count; i++) VIR_FREE(names[i]); return -1; @@ -4365,7 +4365,7 @@ esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, parsedHostCpuIdInfo->level = hostCpuIdInfo->level->value; - for (r = 0; r < 4; ++r) { + for (r = 0; r < 4; r++) { if (strlen(input[r]) != expectedLength) { virReportError(VIR_ERR_INTERNAL_ERROR, _("HostCpuIdInfo register '%s' has an unexpected length"), diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index ff20d5548b..1735cd2ca9 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -2844,7 +2844,7 @@ hypervConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxn cleanup: if (!success) { - for (i = 0; i < count; ++i) + for (i = 0; i < count; i++) VIR_FREE(names[i]); count = -1; @@ -3560,7 +3560,7 @@ hypervConnectListAllDomains(virConnectPtr conn, cleanup: if (doms) { - for (i = 0; i < count; ++i) + for (i = 0; i < count; i++) virObjectUnref(doms[i]); VIR_FREE(doms); diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c index 93ef01c9aa..2600c14156 100644 --- a/src/hyperv/hyperv_network_driver.c +++ b/src/hyperv/hyperv_network_driver.c @@ -145,7 +145,7 @@ hypervConnectListAllNetworks(virConnectPtr conn, cleanup: if (ret < 0 && nets && *nets) { - for (i = 0; i < count; ++i) + for (i = 0; i < count; i++) VIR_FREE((*nets)[i]); VIR_FREE(*nets); } diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index b4bd1d7e62..4d92454c43 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -504,7 +504,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps) } } - for (i = 0; i < nr_guest_archs; ++i) { + for (i = 0; i < nr_guest_archs; i++) { virCapsGuest *guest; char const *const xen_machines[] = { guest_archs[i].hvm ? "xenfv" : diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 0c3c53c1d1..846fc60c98 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2280,7 +2280,7 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, maplen = VIR_CPU_MAPLEN(nvcpus); bitmask = g_new0(uint8_t, maplen); - for (i = 0; i < nvcpus; ++i) { + for (i = 0; i < nvcpus; i++) { pos = i / 8; bitmask[pos] |= 1 << (i % 8); } @@ -2573,7 +2573,7 @@ libxlDomainGetVcpus(virDomainPtr dom, virVcpuInfoPtr info, int maxinfo, if (cpumaps && maplen > 0) memset(cpumaps, 0, maplen * maxinfo); - for (i = 0; i < maxcpu && i < maxinfo; ++i) { + for (i = 0; i < maxcpu && i < maxinfo; i++) { info[i].number = vcpuinfo[i].vcpuid; info[i].cpu = vcpuinfo[i].cpu; info[i].cpuTime = vcpuinfo[i].vcpu_time; @@ -4714,7 +4714,7 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, goto endjob; } - for (i = 0; i < nparams; ++i) { + for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_WEIGHT)) @@ -5098,7 +5098,7 @@ libxlDomainGetPerCPUStats(libxlDriverPrivate *driver, goto cleanup; } - for (i = start_cpu; i < maxcpu && i < ncpus; ++i) { + for (i = start_cpu; i < maxcpu && i < ncpus; i++) { if (virTypedParameterAssign(&params[(i-start_cpu)], VIR_DOMAIN_CPU_STATS_CPUTIME, VIR_TYPED_PARAM_ULLONG, @@ -5509,7 +5509,7 @@ libxlDomainBlockStatsGather(virDomainObj *vm, } else { size_t i; - for (i = 0; i < vm->def->ndisks; ++i) { + for (i = 0; i < vm->def->ndisks; i++) { if (libxlDomainBlockStatsGatherSingle(vm, vm->def->disks[i]->dst, stats) < 0) return ret; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6af1faa3cd..c61ab87cb2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10127,7 +10127,7 @@ qemuBuildCommandLineValidate(virQEMUDriver *driver, } } - for (i = 0; i < def->ngraphics; ++i) { + for (i = 0; i < def->ngraphics; i++) { switch (def->graphics[i]->type) { case VIR_DOMAIN_GRAPHICS_TYPE_SDL: ++sdl; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 89e03fdf72..f2e25edc02 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4112,10 +4112,10 @@ qemuDomainRecheckInternalPaths(virDomainDef *def, size_t i = 0; size_t j = 0; - for (i = 0; i < def->ngraphics; ++i) { + for (i = 0; i < def->ngraphics; i++) { virDomainGraphicsDef *graphics = def->graphics[i]; - for (j = 0; j < graphics->nListens; ++j) { + for (j = 0; j < graphics->nListens; j++) { virDomainGraphicsListenDef *glisten = &graphics->listens[j]; /* This will happen only if we parse XML from old libvirts where diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index 018e62cf6e..3df055789a 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -634,7 +634,7 @@ qemuMigrationParamsDump(qemuMigrationParams *migParams, *flags |= VIR_MIGRATE_COMPRESSED; } - for (i = 0; i < QEMU_MIGRATION_COMPRESS_LAST; ++i) { + for (i = 0; i < QEMU_MIGRATION_COMPRESS_LAST; i++) { if ((migParams->compMethods & (1ULL << i)) && virTypedParamsAddString(params, nparams, maxparams, VIR_MIGRATE_PARAM_COMPRESSION, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7487e12640..f3b38e0cbc 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3052,7 +3052,7 @@ qemuProcessInitPasswords(virQEMUDriver *driver, g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); size_t i; - for (i = 0; i < vm->def->ngraphics; ++i) { + for (i = 0; i < vm->def->ngraphics; i++) { virDomainGraphicsDef *graphics = vm->def->graphics[i]; if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { ret = qemuDomainChangeGraphicsPasswords(driver, vm, @@ -5098,7 +5098,7 @@ qemuProcessSetupGraphics(virQEMUDriver *driver, } } - for (i = 0; i < vm->def->ngraphics; ++i) { + for (i = 0; i < vm->def->ngraphics; i++) { graphics = vm->def->graphics[i]; if (qemuProcessGraphicsAllocatePorts(driver, graphics, allocate) < 0) @@ -8062,7 +8062,7 @@ void qemuProcessStop(virQEMUDriver *driver, /* Remove VNC and Spice ports from port reservation bitmap, but only if they were reserved by the driver (autoport=yes) */ - for (i = 0; i < vm->def->ngraphics; ++i) { + for (i = 0; i < vm->def->ngraphics; i++) { virDomainGraphicsDef *graphics = vm->def->graphics[i]; if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { if (graphics->data.vnc.autoport) { diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 65aa20f7d1..10f0fd9be8 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2799,7 +2799,7 @@ remoteDispatchDomainGetVcpus(virNetServer *server G_GNUC_UNUSED, ret->info.info_len = info_len; ret->info.info_val = g_new0(remote_vcpu_info, info_len); - for (i = 0; i < info_len; ++i) { + for (i = 0; i < info_len; i++) { ret->info.info_val[i].number = info[i].number; ret->info.info_val[i].state = info[i].state; ret->info.info_val[i].cpu_time = info[i].cpuTime; @@ -3217,7 +3217,7 @@ remoteDispatchNodeGetCPUStats(virNetServer *server G_GNUC_UNUSED, ret->params.params_len = nparams; ret->params.params_val = g_new0(remote_node_get_cpu_stats, nparams); - for (i = 0; i < nparams; ++i) { + for (i = 0; i < nparams; i++) { /* remoteDispatchClientRequest will free this: */ ret->params.params_val[i].field = g_strdup(params[i].field); @@ -3284,7 +3284,7 @@ remoteDispatchNodeGetMemoryStats(virNetServer *server G_GNUC_UNUSED, ret->params.params_len = nparams; ret->params.params_val = g_new0(remote_node_get_memory_stats, nparams); - for (i = 0; i < nparams; ++i) { + for (i = 0; i < nparams; i++) { /* remoteDispatchClientRequest will free this: */ ret->params.params_val[i].field = g_strdup(params[i].field); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index c03c68ec30..91f54212ab 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1487,7 +1487,7 @@ remoteNodeGetCPUStats(virConnectPtr conn, *nparams = ret.params.params_len; /* Deserialise the result. */ - for (i = 0; i < *nparams; ++i) { + for (i = 0; i < *nparams; i++) { if (virStrcpyStatic(params[i].field, ret.params.params_val[i].field) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Stats %s too big for destination"), @@ -1551,7 +1551,7 @@ remoteNodeGetMemoryStats(virConnectPtr conn, *nparams = ret.params.params_len; /* Deserialise the result. */ - for (i = 0; i < *nparams; ++i) { + for (i = 0; i < *nparams; i++) { if (virStrcpyStatic(params[i].field, ret.params.params_val[i].field) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Stats %s too big for destination"), @@ -1644,7 +1644,7 @@ remoteConnectListDomains(virConnectPtr conn, int *ids, int maxids) goto cleanup; } - for (i = 0; i < ret.ids.ids_len; ++i) + for (i = 0; i < ret.ids.ids_len; i++) ids[i] = ret.ids.ids_val[i]; rv = ret.ids.ids_len; @@ -2032,7 +2032,7 @@ remoteDomainGetVcpuPinInfo(virDomainPtr domain, memset(cpumaps, 0, ncpumaps * maplen); - for (i = 0; i < ret.cpumaps.cpumaps_len; ++i) + for (i = 0; i < ret.cpumaps.cpumaps_len; i++) cpumaps[i] = ret.cpumaps.cpumaps_val[i]; rv = ret.num; @@ -2128,7 +2128,7 @@ remoteDomainGetEmulatorPinInfo(virDomainPtr domain, memset(cpumaps, 0, maplen); - for (i = 0; i < ret.cpumaps.cpumaps_len; ++i) + for (i = 0; i < ret.cpumaps.cpumaps_len; i++) cpumaps[i] = ret.cpumaps.cpumaps_val[i]; rv = ret.ret; @@ -2197,14 +2197,14 @@ remoteDomainGetVcpus(virDomainPtr domain, memset(info, 0, sizeof(virVcpuInfo) * maxinfo); memset(cpumaps, 0, maxinfo * maplen); - for (i = 0; i < ret.info.info_len; ++i) { + for (i = 0; i < ret.info.info_len; i++) { info[i].number = ret.info.info_val[i].number; info[i].state = ret.info.info_val[i].state; info[i].cpuTime = ret.info.info_val[i].cpu_time; info[i].cpu = ret.info.info_val[i].cpu; } - for (i = 0; i < ret.cpumaps.cpumaps_len; ++i) + for (i = 0; i < ret.cpumaps.cpumaps_len; i++) cpumaps[i] = ret.cpumaps.cpumaps_val[i]; rv = ret.info.info_len; diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 9f5bf0e316..27203615ff 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -1940,7 +1940,7 @@ elsif ($mode eq "client") { print " * the documentation). However xdr_free will free up both the\n"; print " * names and the list of pointers, so we have to g_strdup the\n"; print " * names here. */\n"; - print " for (i = 0; i < ret.$single_ret_list_name.${single_ret_list_name}_len; ++i) {\n"; + print " for (i = 0; i < ret.$single_ret_list_name.${single_ret_list_name}_len; i++) {\n"; print " ${single_ret_list_name}[i] = \n"; print " g_strdup(ret.$single_ret_list_name.${single_ret_list_name}_val[i]);\n"; print " }\n"; diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index ffe2f343f9..eb0cd0f9c8 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -355,7 +355,7 @@ virNetClientFindDefaultSshKey(const char *homedir, char **retPath) const char *keys[] = { "identity", "id_dsa", "id_ecdsa", "id_ed25519", "id_rsa" }; - for (i = 0; i < G_N_ELEMENTS(keys); ++i) { + for (i = 0; i < G_N_ELEMENTS(keys); i++) { int ret = virNetClientCheckKeyExists(homedir, keys[i], retPath); if (ret != 0) return ret; diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 22d54c99be..19a83d04fe 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -232,7 +232,7 @@ virCredTypeForPrompt(virConnectAuthPtr cred, char echo) { size_t i; - for (i = 0; i < cred->ncredtype; ++i) { + for (i = 0; i < cred->ncredtype; i++) { int type = cred->credtype[i]; if (echo) { if (type == VIR_CRED_ECHOPROMPT) @@ -669,7 +669,7 @@ virNetLibsshAuthenticateKeyboardInteractive(virNetLibsshSession *sess, if (virBufferUse(&buff) > 0) virBufferAddChar(&buff, '\n'); - for (iprompt = 0; iprompt < nprompts; ++iprompt) { + for (iprompt = 0; iprompt < nprompts; iprompt++) { virConnectCredential retr_passphrase; const char *promptStr; int promptStrLen; @@ -900,7 +900,7 @@ virNetLibsshValidateConfig(virNetLibsshSession *sess) size_t i; bool has_auths = false; - for (i = 0; i < sess->nauths; ++i) { + for (i = 0; i < sess->nauths; i++) { if (sess->auths[i]) { has_auths = true; break; diff --git a/src/storage_file/storage_source_backingstore.c b/src/storage_file/storage_source_backingstore.c index e48ae725ab..80cb3ffb05 100644 --- a/src/storage_file/storage_source_backingstore.c +++ b/src/storage_file/storage_source_backingstore.c @@ -220,7 +220,7 @@ virStorageSourceParseRBDColonString(const char *rbdstr, p = options; while (*p) { /* find : delimiter or end of string */ - for (e = p; *e && *e != ':'; ++e) { + for (e = p; *e && *e != ':'; e++) { if (*e == '\\') { e++; if (*e == '\0') @@ -258,7 +258,7 @@ virStorageSourceParseRBDColonString(const char *rbdstr, h = p + strlen("mon_host="); while (h < e) { - for (sep = h; sep < e; ++sep) { + for (sep = h; sep < e; sep++) { if (*sep == '\\' && (sep[1] == ',' || sep[1] == ';' || sep[1] == ' ')) { diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ef0ddab54d..e194e17c1c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -658,7 +658,7 @@ testDomainGenerateIfname(virDomainDef *domdef) int maxif = 1024; int ifctr; - for (ifctr = 0; ifctr < maxif; ++ifctr) { + for (ifctr = 0; ifctr < maxif; ifctr++) { virDomainNetDef *net = NULL; char *ifname; @@ -1383,7 +1383,7 @@ testConnectAuthenticate(virConnectPtr conn, goto cleanup; /* Does the username exist? */ - for (i = 0; i < privconn->numAuths; ++i) { + for (i = 0; i < privconn->numAuths; i++) { if (STREQ(privconn->auths[i].username, username)) goto found_user; } diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 8e372c3152..af3c5745a9 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -1346,7 +1346,7 @@ virCommandAddEnv(virCommand *cmd, /* Search for the name in the existing environment. */ namelen = strcspn(env, "="); - for (i = 0; i < cmd->nenv; ++i) { + for (i = 0; i < cmd->nenv; i++) { /* + 1 because we want to match the '=' character too. */ if (STREQLEN(cmd->env[i], env, namelen + 1)) { VIR_FREE(cmd->env[i]); diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index aa6a871049..557c3ef693 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -550,7 +550,7 @@ virTypedParamsDeserialize(struct _virTypedParameterRemote *remote_params, *nparams = remote_params_len; /* Deserialize the result. */ - for (i = 0; i < remote_params_len; ++i) { + for (i = 0; i < remote_params_len; i++) { virTypedParameterPtr param = *params + i; struct _virTypedParameterRemote *remote_param = remote_params + i; @@ -657,7 +657,7 @@ virTypedParamsSerialize(virTypedParameterPtr params, params_val = g_new0(struct _virTypedParameterRemote, nparams); - for (i = 0, j = 0; i < nparams; ++i) { + for (i = 0, j = 0; i < nparams; i++) { virTypedParameterPtr param = params + i; struct _virTypedParameterRemote *val = params_val + j; /* NOTE: Following snippet is relevant to server only, because diff --git a/src/util/viruri.c b/src/util/viruri.c index 252e4f598e..a2895259e2 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -246,7 +246,7 @@ char *virURIFormatParams(virURI *uri) size_t i; bool amp = false; - for (i = 0; i < uri->paramsCount; ++i) { + for (i = 0; i < uri->paramsCount; i++) { if (!uri->params[i].ignore) { if (amp) virBufferAddChar(&buf, '&'); virBufferStrcat(&buf, uri->params[i].name, "=", NULL); diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 2936ff0edb..8bd1d1f84a 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -203,7 +203,7 @@ VBoxCGlueInit(unsigned int *version) } /* Try the known locations. */ - for (i = 0; i < G_N_ELEMENTS(knownDirs); ++i) { + for (i = 0; i < G_N_ELEMENTS(knownDirs); i++) { if (tryLoadOne(knownDirs[i], true, true, version) >= 0) return 0; } @@ -303,7 +303,7 @@ vboxArrayRelease(vboxArray *array) if (array->items == NULL) return; - for (i = 0; i < array->count; ++i) { + for (i = 0; i < array->count; i++) { supports = array->items[i]; if (supports != NULL) @@ -328,7 +328,7 @@ vboxArrayUnalloc(vboxArray *array) if (array->items == NULL) return; - for (i = 0; i < array->count; ++i) { + for (i = 0; i < array->count; i++) { item = array->items[i]; if (item != NULL) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 1ca521321c..05ace3a94d 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -720,7 +720,7 @@ static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids) } ret = 0; - for (i = 0, j = 0; (i < machines.count) && (j < nids); ++i) { + for (i = 0, j = 0; (i < machines.count) && (j < nids); i++) { IMachine *machine = machines.items[i]; if (machine) { @@ -761,7 +761,7 @@ static int vboxConnectNumOfDomains(virConnectPtr conn) } ret = 0; - for (i = 0; i < machines.count; ++i) { + for (i = 0; i < machines.count; i++) { IMachine *machine = machines.items[i]; if (machine) { @@ -880,7 +880,7 @@ virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, return NULL; } - for (i = 0; i < machines.count; ++i) { + for (i = 0; i < machines.count; i++) { IMachine *machine = machines.items[i]; PRBool isAccessible = PR_FALSE; @@ -952,7 +952,7 @@ vboxDomainLookupByName(virConnectPtr conn, const char *name) return NULL; } - for (i = 0; i < machines.count; ++i) { + for (i = 0; i < machines.count; i++) { IMachine *machine = machines.items[i]; PRBool isAccessible = PR_FALSE; @@ -2245,7 +2245,7 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) return -1; } - for (i = 0; i < machines.count; ++i) { + for (i = 0; i < machines.count; i++) { IMachine *machine = machines.items[i]; PRBool isAccessible = PR_FALSE; @@ -2346,7 +2346,7 @@ static int vboxDomainIsActive(virDomainPtr dom) return ret; } - for (i = 0; i < machines.count; ++i) { + for (i = 0; i < machines.count; i++) { IMachine *machine = machines.items[i]; PRBool isAccessible = PR_FALSE; @@ -2790,7 +2790,7 @@ static int vboxDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) } info->nrVirtCpu = 0; - for (i = 0; i < machines.count; ++i) { + for (i = 0; i < machines.count; i++) { IMachine *machine = machines.items[i]; PRBool isAccessible = PR_FALSE; @@ -4214,7 +4214,7 @@ static int vboxConnectNumOfDefinedDomains(virConnectPtr conn) } ret = 0; - for (i = 0; i < machines.count; ++i) { + for (i = 0; i < machines.count; i++) { PRBool isAccessible = PR_FALSE; IMachine *machine = machines.items[i]; @@ -5822,9 +5822,9 @@ vboxSnapshotGetReadWriteDisks(virDomainSnapshotDef *def, _("cannot get snapshot ids")); goto cleanup; } - for (j = 0; j < children.count; ++j) { + for (j = 0; j < children.count; j++) { IMedium *child = children.items[j]; - for (k = 0; k < snapshotIids.count; ++k) { + for (k = 0; k < snapshotIids.count; k++) { PRUnichar *diskSnapId = snapshotIids.items[k]; char *diskSnapIdStr = NULL; VBOX_UTF16_TO_UTF8(diskSnapId, &diskSnapIdStr); @@ -7660,7 +7660,7 @@ vboxDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) return ret; } - for (i = 0; i < machines.count; ++i) { + for (i = 0; i < machines.count; i++) { IMachine *machine = machines.items[i]; PRBool isAccessible = PR_FALSE; diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index 10eb35c654..0790e0a741 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -105,7 +105,7 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool) return -1; } - for (i = 0; i < hardDisks.count; ++i) { + for (i = 0; i < hardDisks.count; i++) { IMedium *hardDisk = hardDisks.items[i]; PRUint32 hddstate; @@ -143,7 +143,7 @@ vboxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, int nname return -1; } - for (i = 0; i < hardDisks.count && numActive < nnames; ++i) { + for (i = 0; i < hardDisks.count && numActive < nnames; i++) { IMedium *hardDisk = hardDisks.items[i]; PRUint32 hddstate; char *nameUtf8 = NULL; @@ -195,7 +195,7 @@ vboxStorageVolLookupByName(virStoragePoolPtr pool, const char *name) if (NS_FAILED(rc)) return ret; - for (i = 0; i < hardDisks.count; ++i) { + for (i = 0; i < hardDisks.count; i++) { IMedium *hardDisk = hardDisks.items[i]; PRUint32 hddstate; char *nameUtf8 = NULL; diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index af4461f2cb..b482c401ff 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -386,7 +386,7 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath) goto cleanup; } - for (i = 0; i < vmdef->ndisks; ++i) { + for (i = 0; i < vmdef->ndisks; i++) { if (vmdef->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK && virDomainDiskGetType(vmdef->disks[i]) == VIR_STORAGE_TYPE_FILE) { disk = vmdef->disks[i]; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 1cd5a82227..1ede422239 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1164,7 +1164,7 @@ virVMXHandleLegacySCSIDiskDriverName(virDomainDef *def, copy = g_strdup(driver); tmp = copy; - for (; *tmp != '\0'; ++tmp) + for (; *tmp != '\0'; tmp++) *tmp = g_ascii_tolower(*tmp); model = virDomainControllerModelSCSITypeFromString(copy); @@ -1176,7 +1176,7 @@ virVMXHandleLegacySCSIDiskDriverName(virDomainDef *def, return -1; } - for (i = 0; i < def->ncontrollers; ++i) { + for (i = 0; i < def->ncontrollers; i++) { if (def->controllers[i]->idx == disk->info.addr.drive.controller) { controller = def->controllers[i]; break; @@ -1220,7 +1220,7 @@ virVMXGatherSCSIControllers(virVMXContext *ctx, virDomainDef *def, autodetectedModels = g_new0(int, def->ndisks); - for (i = 0; i < def->ncontrollers; ++i) { + for (i = 0; i < def->ncontrollers; i++) { controller = def->controllers[i]; if (controller->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { @@ -1230,7 +1230,7 @@ virVMXGatherSCSIControllers(virVMXContext *ctx, virDomainDef *def, controllerHasDisksAttached = false; - for (k = 0; k < def->ndisks; ++k) { + for (k = 0; k < def->ndisks; k++) { disk = def->disks[k]; if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && @@ -1251,7 +1251,7 @@ virVMXGatherSCSIControllers(virVMXContext *ctx, virDomainDef *def, /* try to autodetect the SCSI controller model by collecting * SCSI controller model of all disks attached to this controller */ - for (k = 0; k < def->ndisks; ++k) { + for (k = 0; k < def->ndisks; k++) { disk = def->disks[k]; if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && @@ -1268,7 +1268,7 @@ virVMXGatherSCSIControllers(virVMXContext *ctx, virDomainDef *def, /* autodetection fails when the disks attached to one controller * have inconsistent SCSI controller models */ - for (k = 0; k < count; ++k) { + for (k = 0; k < count; k++) { if (autodetectedModels[k] != autodetectedModels[0]) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Disks on SCSI controller %d have inconsistent " @@ -1690,7 +1690,7 @@ virVMXParseConfig(virVMXContext *ctx, def->ndisks = 0; /* def:disks (scsi) */ - for (controller = 0; controller < 4; ++controller) { + for (controller = 0; controller < 4; controller++) { if (virVMXParseSCSIController(conf, controller, &present, &scsi_virtualDev[controller]) < 0) { goto cleanup; @@ -1699,7 +1699,7 @@ virVMXParseConfig(virVMXContext *ctx, if (! present) continue; - for (unit = 0; unit < 16; ++unit) { + for (unit = 0; unit < 16; unit++) { if (unit == 7) { /* * SCSI unit 7 is assigned to the SCSI controller and cannot be @@ -1744,7 +1744,7 @@ virVMXParseConfig(virVMXContext *ctx, } /* def:disks (sata) */ - for (controller = 0; controller < 4; ++controller) { + for (controller = 0; controller < 4; controller++) { if (virVMXParseSATAController(conf, controller, &present) < 0) { goto cleanup; } @@ -1752,7 +1752,7 @@ virVMXParseConfig(virVMXContext *ctx, if (! present) continue; - for (unit = 0; unit < 30; ++unit) { + for (unit = 0; unit < 30; unit++) { if (virVMXParseDisk(ctx, xmlopt, conf, VIR_DOMAIN_DISK_DEVICE_DISK, VIR_DOMAIN_DISK_BUS_SATA, controller, unit, &def->disks[def->ndisks], def) < 0) { @@ -1788,8 +1788,8 @@ virVMXParseConfig(virVMXContext *ctx, } /* def:disks (ide) */ - for (bus = 0; bus < 2; ++bus) { - for (unit = 0; unit < 2; ++unit) { + for (bus = 0; bus < 2; bus++) { + for (unit = 0; unit < 2; unit++) { if (virVMXParseDisk(ctx, xmlopt, conf, VIR_DOMAIN_DISK_DEVICE_DISK, VIR_DOMAIN_DISK_BUS_IDE, bus, unit, &def->disks[def->ndisks], def) < 0) { @@ -1813,7 +1813,7 @@ virVMXParseConfig(virVMXContext *ctx, } /* def:disks (floppy) */ - for (unit = 0; unit < 2; ++unit) { + for (unit = 0; unit < 2; unit++) { if (virVMXParseDisk(ctx, xmlopt, conf, VIR_DOMAIN_DISK_DEVICE_FLOPPY, VIR_DOMAIN_DISK_BUS_FDC, 0, unit, &def->disks[def->ndisks], def) < 0) { @@ -1842,7 +1842,7 @@ virVMXParseConfig(virVMXContext *ctx, def->fss = g_new0(virDomainFSDef *, sharedFolder_maxNum); def->nfss = 0; - for (number = 0; number < sharedFolder_maxNum; ++number) { + for (number = 0; number < sharedFolder_maxNum; number++) { if (virVMXParseFileSystem(conf, number, &def->fss[def->nfss]) < 0) { goto cleanup; @@ -1855,7 +1855,7 @@ virVMXParseConfig(virVMXContext *ctx, } /* def:nets */ - for (controller = 0; controller <= results.networks_max_index; ++controller) { + for (controller = 0; controller <= results.networks_max_index; controller++) { virDomainNetDef *net = NULL; if (virVMXParseEthernet(conf, controller, &net) < 0) goto cleanup; @@ -1889,7 +1889,7 @@ virVMXParseConfig(virVMXContext *ctx, def->serials = g_new0(virDomainChrDef *, 4); def->nserials = 0; - for (port = 0; port < 4; ++port) { + for (port = 0; port < 4; port++) { if (virVMXParseSerial(ctx, conf, port, &def->serials[def->nserials]) < 0) { goto cleanup; @@ -1903,7 +1903,7 @@ virVMXParseConfig(virVMXContext *ctx, def->parallels = g_new0(virDomainChrDef *, 3); def->nparallels = 0; - for (port = 0; port < 3; ++port) { + for (port = 0; port < 3; port++) { if (virVMXParseParallel(ctx, conf, port, &def->parallels[def->nparallels]) < 0) { goto cleanup; @@ -2072,7 +2072,7 @@ virVMXParseSCSIController(virConf *conf, int controller, bool *present, if (virtualDev_string != NULL) { tmp = virtualDev_string; - for (; *tmp != '\0'; ++tmp) + for (; *tmp != '\0'; tmp++) *tmp = g_ascii_tolower(*tmp); *virtualDev = virVMXControllerModelSCSITypeFromString(virtualDev_string); @@ -3404,7 +3404,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef } /* def:graphics */ - for (i = 0; i < def->ngraphics; ++i) { + for (i = 0; i < def->ngraphics; i++) { switch (def->graphics[i]->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: if (virVMXFormatVNC(def->graphics[i], &buffer) < 0) @@ -3430,7 +3430,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef } /* def:disks */ - for (i = 0; i < def->ndisks; ++i) { + for (i = 0; i < def->ndisks; i++) { if (virVMXVerifyDiskAddress(xmlopt, def->disks[i], def) < 0 || virVMXHandleLegacySCSIDiskDriverName(def, def->disks[i]) < 0) { goto cleanup; @@ -3442,7 +3442,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef goto cleanup; } - for (i = 0; i < 4; ++i) { + for (i = 0; i < 4; i++) { if (scsi_present[i]) { hasSCSI = true; @@ -3456,7 +3456,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef } } - for (i = 0; i < def->ndisks; ++i) { + for (i = 0; i < def->ndisks; i++) { switch (def->disks[i]->device) { case VIR_DOMAIN_DISK_DEVICE_DISK: case VIR_DOMAIN_DISK_DEVICE_CDROM: @@ -3483,7 +3483,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef } } - for (i = 0; i < 2; ++i) { + for (i = 0; i < 2; i++) { /* floppy[0..1].present defaults to true, disable it explicitly */ if (! floppy_present[i]) virBufferAsprintf(&buffer, "floppy%zu.present = \"false\"\n", i); @@ -3495,13 +3495,13 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef virBufferAsprintf(&buffer, "sharedFolder.maxNum = \"%zu\"\n", def->nfss); } - for (i = 0; i < def->nfss; ++i) { + for (i = 0; i < def->nfss; i++) { if (virVMXFormatFileSystem(def->fss[i], i, &buffer) < 0) goto cleanup; } /* def:nets */ - for (i = 0; i < def->nnets; ++i) { + for (i = 0; i < def->nnets; i++) { if (virVMXFormatEthernet(def->nets[i], i, &buffer, virtualHW_version) < 0) goto cleanup; } @@ -3528,13 +3528,13 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef /* FIXME */ /* def:serials */ - for (i = 0; i < def->nserials; ++i) { + for (i = 0; i < def->nserials; i++) { if (virVMXFormatSerial(ctx, def->serials[i], &buffer) < 0) goto cleanup; } /* def:parallels */ - for (i = 0; i < def->nparallels; ++i) { + for (i = 0; i < def->nparallels; i++) { if (virVMXFormatParallel(ctx, def->parallels[i], &buffer) < 0) goto cleanup; } diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index a9cd3d90c9..cf4950df55 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -647,7 +647,7 @@ vzDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) unsigned long long vtime; size_t i; - for (i = 0; i < virDomainDefGetVcpus(dom->def); ++i) { + for (i = 0; i < virDomainDefGetVcpus(dom->def); i++) { if (prlsdkGetVcpuStats(privdom->stats, i, &vtime) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot read cputime for domain")); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index e09950812d..9e6bf1ee1a 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -796,7 +796,7 @@ prlsdkAddDomainHardDisksInfo(struct _vzDriver *driver, PRL_HANDLE sdkdom, virDom pret = PrlVmCfg_GetHardDisksCount(sdkdom, &hddCount); prlsdkCheckRetGoto(pret, error); - for (i = 0; i < hddCount; ++i) { + for (i = 0; i < hddCount; i++) { PRL_UINT32 emulatedType; @@ -857,7 +857,7 @@ prlsdkAddDomainOpticalDisksInfo(struct _vzDriver *driver, PRL_HANDLE sdkdom, vir pret = PrlVmCfg_GetOpticalDisksCount(sdkdom, &cdromsCount); prlsdkCheckRetGoto(pret, error); - for (i = 0; i < cdromsCount; ++i) { + for (i = 0; i < cdromsCount; i++) { pret = PrlVmCfg_GetOpticalDisk(sdkdom, i, &cdrom); prlsdkCheckRetGoto(pret, error); @@ -935,7 +935,7 @@ prlsdkGetNetAddresses(PRL_HANDLE sdknet, virDomainNetDef *net) PrlStrList_GetItemsCount(addrlist, &num); prlsdkCheckRetGoto(pret, cleanup); - for (i = 0; i < num; ++i) { + for (i = 0; i < num; i++) { virNetDevIPAddr *ip = NULL; PRL_UINT32 buflen = 0; char *addr; @@ -1120,7 +1120,7 @@ prlsdkAddDomainNetInfo(PRL_HANDLE sdkdom, virDomainDef *def) ret = PrlVmCfg_GetNetAdaptersCount(sdkdom, &netAdaptersCount); prlsdkCheckRetGoto(ret, error); - for (i = 0; i < netAdaptersCount; ++i) { + for (i = 0; i < netAdaptersCount; i++) { ret = PrlVmCfg_GetNetAdapter(sdkdom, i, &netAdapter); prlsdkCheckRetGoto(ret, error); @@ -1235,7 +1235,7 @@ prlsdkAddSerialInfo(PRL_HANDLE sdkdom, ret = PrlVmCfg_GetSerialPortsCount(sdkdom, &serialPortsCount); prlsdkCheckRetGoto(ret, cleanup); - for (i = 0; i < serialPortsCount; ++i) { + for (i = 0; i < serialPortsCount; i++) { ret = PrlVmCfg_GetSerialPort(sdkdom, i, &serialPort); prlsdkCheckRetGoto(ret, cleanup); @@ -1524,7 +1524,7 @@ prlsdkGetDevByDevIndex(PRL_HANDLE sdkdom, PRL_DEVICE_TYPE type, PRL_UINT32 devIn pret = PrlVmCfg_GetDevsCountByType(sdkdom, type, &num); prlsdkCheckRetGoto(pret, error); - for (i = 0; i < num; ++i) { + for (i = 0; i < num; i++) { pret = PrlVmCfg_GetDevByType(sdkdom, type, i, &dev); prlsdkCheckRetGoto(pret, error); @@ -1551,7 +1551,7 @@ virFindDiskBootIndex(virDomainDef *def, virDomainDiskDevice type, int index) size_t i; int c = 0; - for (i = 0; i < def->ndisks; ++i) { + for (i = 0; i < def->ndisks; i++) { if (def->disks[i]->device != type) continue; if (c == index) @@ -1584,7 +1584,7 @@ prlsdkInBootList(PRL_HANDLE sdkdom, pret = PrlVmCfg_GetBootDevCount(sdkdom, &bootNum); prlsdkCheckRetExit(pret, false); - for (i = 0; i < bootNum; ++i) { + for (i = 0; i < bootNum; i++) { pret = PrlVmCfg_GetBootDev(sdkdom, i, &bootDev); prlsdkCheckRetGoto(pret, cleanup); @@ -1722,7 +1722,7 @@ prlsdkConvertBootOrderVm(PRL_HANDLE sdkdom, virDomainDef *def) VIR_WARN("Too many boot devices"); } - for (i = 0; i < bootNum; ++i) { + for (i = 0; i < bootNum; i++) { pret = PrlVmCfg_GetBootDev(sdkdom, i, &bootDev); prlsdkCheckRetGoto(pret, cleanup); @@ -3374,7 +3374,7 @@ prlsdkFindNetByMAC(PRL_HANDLE sdkdom, virMacAddr *mac) pret = PrlVmCfg_GetNetAdaptersCount(sdkdom, &adaptersCount); prlsdkCheckRetGoto(pret, cleanup); - for (i = 0; i < adaptersCount; ++i) { + for (i = 0; i < adaptersCount; i++) { pret = PrlVmCfg_GetNetAdapter(sdkdom, i, &adapter); prlsdkCheckRetGoto(pret, cleanup); @@ -3520,7 +3520,7 @@ prlsdkGetDisk(PRL_HANDLE sdkdom, virDomainDiskDef *disk) pret = PrlVmCfg_GetDevsCountByType(sdkdom, devType, &num); prlsdkCheckRetGoto(pret, error); - for (i = 0; i < num; ++i) { + for (i = 0; i < num; i++) { pret = PrlVmCfg_GetDevByType(sdkdom, devType, i, &sdkdisk); prlsdkCheckRetGoto(pret, error); @@ -3822,7 +3822,7 @@ prlsdkSetBootOrderVm(PRL_HANDLE sdkdom, virDomainDef *def) int sdkType; virDomainBootOrder virType; - for (i = 0; i < def->os.nBootDevs; ++i) { + for (i = 0; i < def->os.nBootDevs; i++) { virType = def->os.bootDevs[i]; switch ((int)virType) { @@ -4198,7 +4198,7 @@ prlsdkDetachDomainHardDisks(virDomainObj *dom) pret = PrlVmCfg_GetHardDisksCount(sdkdom, &hddCount); prlsdkCheckRetGoto(pret, cleanup); - for (i = 0; i < hddCount; ++i) { + for (i = 0; i < hddCount; i++) { pret = PrlVmCfg_GetHardDisk(sdkdom, 0, &sdkdisk); prlsdkCheckRetGoto(pret, cleanup); @@ -4394,7 +4394,7 @@ prlsdkFindNetByPath(PRL_HANDLE sdkdom, const char *path) pret = PrlVmCfg_GetNetAdaptersCount(sdkdom, &count); prlsdkCheckRetGoto(pret, error); - for (i = 0; i < count; ++i) { + for (i = 0; i < count; i++) { pret = PrlVmCfg_GetNetAdapter(sdkdom, i, &net); prlsdkCheckRetGoto(pret, error); diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index 2e2020006e..95c3f3db1b 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -41,7 +41,7 @@ testParseDatastorePath(const void *data G_GNUC_UNUSED) char *directoryName = NULL; char *directoryAndFileName = NULL; - for (i = 0; i < G_N_ELEMENTS(paths); ++i) { + for (i = 0; i < G_N_ELEMENTS(paths); i++) { VIR_FREE(datastoreName); VIR_FREE(directoryName); VIR_FREE(directoryAndFileName); @@ -127,7 +127,7 @@ testConvertDateTimeToCalendarTime(const void *data G_GNUC_UNUSED) esxVI_DateTime dateTime; long long calendarTime; - for (i = 0; i < G_N_ELEMENTS(times); ++i) { + for (i = 0; i < G_N_ELEMENTS(times); i++) { dateTime.value = (char *)times[i].dateTime; if (esxVI_DateTime_ConvertToCalendarTime(&dateTime, @@ -177,7 +177,7 @@ testEscapeDatastoreItem(const void *data G_GNUC_UNUSED) size_t i; char *escaped = NULL; - for (i = 0; i < G_N_ELEMENTS(datastoreItems); ++i) { + for (i = 0; i < G_N_ELEMENTS(datastoreItems); i++) { VIR_FREE(escaped); escaped = esxUtil_EscapeDatastoreItem(datastoreItems[i].string); @@ -217,7 +217,7 @@ testConvertWindows1252ToUTF8(const void *data G_GNUC_UNUSED) size_t i; char *utf8 = NULL; - for (i = 0; i < G_N_ELEMENTS(windows1252ToUTF8); ++i) { + for (i = 0; i < G_N_ELEMENTS(windows1252ToUTF8); i++) { VIR_FREE(utf8); utf8 = virVMXConvertToUTF8("Windows-1252", diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index 136c8011b8..6b4da8de6a 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -43,7 +43,7 @@ testReadConfigParam(const void *data G_GNUC_UNUSED) conf = g_strdup_printf("%s/openvzutilstest.conf", abs_srcdir); - for (i = 0; i < G_N_ELEMENTS(configParams); ++i) { + for (i = 0; i < G_N_ELEMENTS(configParams); i++) { if (openvzReadConfigParam(conf, configParams[i].param, &value) != configParams[i].ret) { goto cleanup; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index be576037e2..a20c467ba2 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -593,7 +593,7 @@ testQemuGetLatestCaps(void) VIR_TEST_VERBOSE(""); - for (i = 0; i < G_N_ELEMENTS(archs); ++i) { + for (i = 0; i < G_N_ELEMENTS(archs); i++) { char *cap = testQemuGetLatestCapsForArch(archs[i], "xml"); if (!cap || virHashAddEntry(capslatest, archs[i], cap) < 0) diff --git a/tests/utiltest.c b/tests/utiltest.c index 2921ae8d8c..e589d61482 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -43,7 +43,7 @@ testIndexToDiskName(const void *data G_GNUC_UNUSED) { size_t i; - for (i = 0; i < G_N_ELEMENTS(diskNames); ++i) { + for (i = 0; i < G_N_ELEMENTS(diskNames); i++) { g_autofree char *diskName = NULL; diskName = virIndexToDiskName(i, "sd"); @@ -65,7 +65,7 @@ testDiskNameToIndex(const void *data G_GNUC_UNUSED) size_t i; int idx; - for (i = 0; i < 100000; ++i) { + for (i = 0; i < 100000; i++) { g_autofree char *diskName = NULL; diskName = virIndexToDiskName(i, "sd"); @@ -91,7 +91,7 @@ testDiskNameParse(const void *data G_GNUC_UNUSED) int partition; struct testDiskName *disk = NULL; - for (i = 0; i < G_N_ELEMENTS(diskNamesPart); ++i) { + for (i = 0; i < G_N_ELEMENTS(diskNamesPart); i++) { disk = &diskNamesPart[i]; if (virDiskNameParse(disk->name, &idx, &partition)) return -1; @@ -109,7 +109,7 @@ testDiskNameParse(const void *data G_GNUC_UNUSED) } } - for (i = 0; i < G_N_ELEMENTS(diskNamesInvalid); ++i) { + for (i = 0; i < G_N_ELEMENTS(diskNamesInvalid); i++) { if (!virDiskNameParse(diskNamesInvalid[i], &idx, &partition)) { VIR_TEST_DEBUG("Should Fail [%s]", diskNamesInvalid[i]); return -1; @@ -150,7 +150,7 @@ testParseVersionString(const void *data G_GNUC_UNUSED) size_t i; unsigned long version; - for (i = 0; i < G_N_ELEMENTS(versions); ++i) { + for (i = 0; i < G_N_ELEMENTS(versions); i++) { result = virParseVersionString(versions[i].string, &version, versions[i].allowMissing); @@ -278,7 +278,7 @@ testKernelCmdlineNextParam(const void *data G_GNUC_UNUSED) const char *next; size_t i; - for (i = 0; i < G_N_ELEMENTS(kEntries); ++i) { + for (i = 0; i < G_N_ELEMENTS(kEntries); i++) { g_autofree char * param = NULL; g_autofree char * val = NULL; @@ -343,7 +343,7 @@ testKernelCmdlineMatchParam(const void *data G_GNUC_UNUSED) bool result; size_t i, lenValues; - for (i = 0; i < G_N_ELEMENTS(kMatchEntries); ++i) { + for (i = 0; i < G_N_ELEMENTS(kMatchEntries); i++) { if (kMatchEntries[i].values[0] == NULL) lenValues = 0; else diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c index 87b47ba86e..5efe87416d 100644 --- a/tests/virtypedparamtest.c +++ b/tests/virtypedparamtest.c @@ -276,7 +276,7 @@ testTypedParamsValidator(void) } }; - for (i = 0; test[i].name; ++i) { + for (i = 0; test[i].name; i++) { if (virTestRun(test[i].name, testTypedParamsValidate, &test[i]) < 0) rv = -1; } -- 2.31.1

3 3

[libvirt PATCH v2 00/11] virHashNew refactorings
by Tim Wiederhake 13 Jul '21

13 Jul '21

"virHashNew" cannot return NULL, yet we check for NULL in various places. This series is the first of several that remove these checks. Where applicable, the functions are refactored to use automatic memory management by means of g_autoptr etc. as well. v1: https://listman.redhat.com/archives/libvir-list/2021-July/msg00074.html Changes since v1: * Fixed a memory leak that was introduced in patch #3 and fixed in patch #4 * Split up patches 3 and 4 into three patches Regards, Tim Tim Wiederhake (11): qemuMonitorGetAllBlockStatsInfo: Clean up line break qemuMonitorGetAllBlockStatsInfo: Remove superfluous variable initialization qemuMonitorGetAllBlockStatsInfo: Assign hash table only on success qemuMonitorGetAllBlockStatsInfo: Use automatic memory management qemuMonitorGetAllBlockStatsInfo: `virHashNew` cannot return NULL qemuMonitorGetBlockInfo: Remove superfluous variable "ret" qemuMonitorGetBlockInfo: Use automatic memory management qemuMonitorGetBlockInfo: `virHashNew` cannot return NULL qemuMonitorGetChardevInfo: Remove superfluous variable "ret" qemuMonitorGetChardevInfo: Use automatic memory management qemuMonitorGetChardevInfo: `virHashNew` cannot return NULL src/qemu/qemu_monitor.c | 53 ++++++++++++----------------------------- 1 file changed, 15 insertions(+), 38 deletions(-) -- 2.31.1

2 15

[PATCH] virnettlshelpers: Update private key
by Michal Privoznik 13 Jul '21

13 Jul '21

In not so distant past (v6.5.0~3) I've updated the private key we use for virnettls* tests. Back then I was driven by Fedora 33 change which deprecated RSA-1024 which we used back then. I generated an EC-384 key which was fine as it was considered strong enough until RHEL-9 came along. RHEL-9 no longer considers any of EC keys strong enough (for key exchange) and thus we're back to RSA, but this time with 2048 bits. Generated by this cmd line: openssl genpkey -algorithm RSA -out key.pem -pkeyopt rsa_keygen_bits:2048 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Honestly, I don't fully understand why EC is not good enough. If I run 'gnutls-cli --list' on a RHEL-9 box and Rawhide box the output is the same except for 'Groups' line where Rawhide contains 'GROUP-GC256B, GROUP-GC512A' on the top of what RHEL-9 has. And I can even find the following: enabled-curve = SECP384R1 in /usr/share/crypto-policies/DEFAULT/gnutls.txt on the RHEL-9 box. This all makes me think that something else must be going on, but I have no mental capacity to debug any further. tests/virnettlshelpers.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c index 905e633e60..1886b4b5f5 100644 --- a/tests/virnettlshelpers.c +++ b/tests/virnettlshelpers.c @@ -47,10 +47,32 @@ extern const asn1_static_node pkix_asn1_tab[]; gnutls_x509_privkey_t privkey; # define PRIVATE_KEY \ "-----BEGIN PRIVATE KEY-----\n" \ - "MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDD39t6GRLeEmsYjRGR6\n" \ - "iQiIN2S4zXsgLGS/2GloXdG7K+i/3vEJDt9celZ0DfCLcG6hZANiAAQTJIe13jy7\n" \ - "k4KTXMkHQHEJa/asH263JaPL5kTbfRa6tMq3DS3pzWlOj+NHY/9JzthrKD+Ece+g\n" \ - "2g/POHa0gfXRYXGiHTs8mY0AHFqNNmF38eIVGjOqobIi90MkyI3wx4g=\n" \ + "MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQCo5oG7tx5EGtHW\n" \ + "ZNHNG8lOei7IEuL6N39/Gkhl7XHXBmb2+Q+iGDI7uhzni/2/A6cUsPMKS4YWn74h\n" \ + "NLDyBuB7Fge5iYooKYqb9FyPWLmkAXGOaLMwxEpp2yZUusVLxZ3USeHtVK6e6sXV\n" \ + "x1hTxuntqPW4kZ7gaDWw27I3CBugiLptxb0M2ENRLyCkLKgyYf3PlnpD1ifupVgO\n" \ + "WNLjkoNgjSTOtnFkYQHm/sk37nrzj7yqzo46CeSGEAopnfQ5UaIv21DLyKQKmZfh\n" \ + "aWbDvQq/hDxLbG+nm79DZBHxe9uX9XWeuHp7AWo7G4MTyU7NHj3aMNR8tfdPjF81\n" \ + "2Hbbk+XrAgMBAAECggEAHKXcY2aP76VM6jx3iX6pCnKW9MCfVymKqphep0s6/+nK\n" \ + "FSHxkODhxFexB2UrSPbppAzPbHOa7sNxkFhLmwGnmbkG3mWB1YYWSJWODZJTCopk\n" \ + "JG+F1UO2C3Zsbfqv9EY0mwldFNBEPhg8LiJ9zNf0XadG5mNsu0txr+nTtJnfdb70\n" \ + "k/Af/usszzxSbNZCwmfR4DeS3Nmsi4jpn0XJ/otKQR/up4snjH9rIv8ybArZVJFP\n" \ + "/sGL725jz671O8u5JJ4iLVbI+y7nyxiHDJMCJtg9S0TAeCXR1XdJXWzcwPFpQrMq\n" \ + "HtkdgdHhMOJEloQzEgp98KYzJr5eiwF/jMAC37IBQQKBgQDdGYjC7ckZ4xETBjn0\n" \ + "S/Q6aePYte0Z5RCReoamHmUgrQNe+y7Ts6owSFGr5WUG7euQ6Rq2ewsQQOlU1LeX\n" \ + "JD7YtsHxwSc+aruxuyVcu5uARcoHDYHMV9y8QZkTt9PutApOBB5yfhjkDn09Eask\n" \ + "ZwG4hfVQxqKZDTj/thUvmIJ7AwKBgQDDj6OZgpE9pBLGwBvMHLhIDGaPw/jeA+2k\n" \ + "8xYJqj+y7YXoqNY2/C8LC/fiA9Zu+AnzMZeXm8CS6OA3P7C6e82iDtz6xSzMG3vV\n" \ + "onzQahdP/a/9HtHP6e2mr9jx7odbPzL9Lr9U1w+ymramtzTh8P3YcMlKe7qgpULT\n" \ + "JjuYVXjA+QKBgDCMCMF0YLG0b+1Tcqo3ezrQQV02JQeIimjHFIWpKt9P3eufD5sg\n" \ + "WgAcAQLTball2FGLPXhP8A/zkMg1pNIk/T+scU1Z8fn8iZXu17dS4kP6DvAZgSST\n" \ + "Lj6P0MLJnFlPYuvab60IDwMUQ1+DX6awj2oqz8CavN0KUDeljWVUAWJtAoGBAKC9\n" \ + "tA89zvwHnJdY2IBRKvetma+ZuTljqTXnyLlxAqKjsWmnPUw8xL4jvEA+P0c/AY6v\n" \ + "uJaZIxSd7Y37/9uIX2FRLjnBUC0EeikDQexdB4RsVPeNGY/4C6ry5zMUiJVrwRFy\n" \ + "Fzo4+2Im4PLvq7v7Retd6VYblS7uJ5s+1cVEm9ihAn9W1kDj9xEwwLUfkhCtQSiN\n" \ + "OXADB8Xz/BEtJJoRxf2S0tz3qUBrd7hHG5nfV3tEpU6nP8bFyLU0MIuzV3uRIiov\n" \ + "JPmdRRv4QcweRiPX5kPheanGHvfclMP5mhqLju/NFLqlS13P2/BNQG2XgtkolE4s\n" \ + "/hUIAHybIAqkE5/BlQjA\n" \ "-----END PRIVATE KEY-----\n" /* -- 2.31.1

3 2

[libvirt PATCH 00/10] virHashNew refactorings - part III
by Tim Wiederhake 13 Jul '21

13 Jul '21

"virHashNew" cannot return NULL, yet we check for NULL in various places. See https://listman.redhat.com/archives/libvir-list/2021-July/msg00074.html. Tim Wiederhake (10): testCompareXMLToArgvFiles: `virHashNew` cannot return NULL testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo: Use automatic memory management testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo: Remove superfluous `goto`s testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo: `virHashNew` cannot return NULL testQemuMonitorJSONqemuMonitorJSONGetBlockInfo: Use automatic memory management testQemuMonitorJSONqemuMonitorJSONGetBlockInfo: Remove superfluous `goto`s testQemuMonitorJSONqemuMonitorJSONGetBlockInfo: `virHashNew` cannot return NULL testQemuMonitorJSONqemuMonitorJSONGetChardevInfo: Use automatic memory management testQemuMonitorJSONqemuMonitorJSONGetChardevInfo: Remove superfluous `goto`s testQemuMonitorJSONqemuMonitorJSONGetChardevInfo: `virHashNew` cannot return NULL tests/nwfilterxml2firewalltest.c | 3 -- tests/qemumonitorjsontest.c | 73 +++++++++++--------------------- 2 files changed, 24 insertions(+), 52 deletions(-) -- 2.31.1

2 12

[libvirt PATCH 00/10] virHashNew refactorings - part II
by Tim Wiederhake 13 Jul '21

13 Jul '21

"virHashNew" cannot return NULL, yet we check for NULL in various places. See https://listman.redhat.com/archives/libvir-list/2021-July/msg00074.html. Tim Wiederhake (10): virNWFilterCreateVarsFrom: `virHashNew` cannot return NULL virNWFilterCreateVarsFrom: Use automatic memory management virNWFilterCreateVarsFrom: Remove superfluous `goto`s virNWFilterRuleDefToRuleInst: `virHashNew` cannot return NULL iptablesPrivateChainCreate: `virHashNew` cannot return NULL iptablesPrivateChainCreate: Use automatic memory management iptablesPrivateChainCreate: Remove superfluous `goto`s qemuMonitorGetMemoryDeviceInfo: Assign hash table only on success qemuMonitorGetMemoryDeviceInfo: Use automatic memory management qemuMonitorGetMemoryDeviceInfo: `virHashNew` cannot return NULL src/qemu/qemu_monitor.c | 9 +++------ src/util/viriptables.c | 20 +++++--------------- tests/nwfilterxml2firewalltest.c | 18 ++++++------------ 3 files changed, 14 insertions(+), 33 deletions(-) -- 2.31.1

2 12

[PATCH] virsh: Fix the order of format arguments in doDump
by Han Han 13 Jul '21

13 Jul '21

According to definition of virDomainCoreDumpFormat, the "elf" should be the first argument in VIR_ENUM_*. Fixes: 84cc4543be Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1981625 Signed-off-by: Han Han <hhan(a)redhat.com> --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f2a5fb03a4..29748b0257 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5412,10 +5412,10 @@ static const vshCmdOptDef opts_dump[] = { VIR_ENUM_IMPL(virDomainCoreDumpFormat, VIR_DOMAIN_CORE_DUMP_FORMAT_LAST, + "elf", "kdump-zlib", "kdump-lzo", "kdump-snappy", - "elf", "win-dmp"); static void -- 2.31.1

2 1

Tuning tool
by Cedric Bosdonnat 13 Jul '21

13 Jul '21

Hi all, I have recently started a virt-tuner tool using the python3 binding. The goal of this tool is to help users tune their domains using a few templates. https://github.com/SUSE/virt-tuner As of today I only wrote a template for a giant VM taking almost all the host resources and mapping the host CPU topology. Feel free to submit pull requests to submit other templates that would be of interest to you. Kind regards, -- Cédric

1 0

[PATCH 00/10] ch: Add Console support
by William Douglas 13 Jul '21

13 Jul '21

This series enables console support in the cloud-hypervisor driver. Cloud-hypervisor only supports a single console or serial device at a time, hence the checks to ensure the domain configuration is only passing one or the other. I wasn't sure if the controller device should have some additonal validation handling so I just did the minimal to get the console open functioning. William Douglas (10): ch_monitor: Make unused function static ch_monitor: Update virCHMonitorGet to handle accept a response ch_monitor: Use virCHMonitorGet to access cloud-hypervisor API ch_monitor: Add pty json builder function ch_monitor: Make use of the PTY json builder ch_process: Handle enabled console devices ch_process: Update the domain with console path information ch_domain: Allow controller and chr devices ch_driver: Add handler for console API ch_driver: Turn on the domainOpenConsole API src/ch/ch_domain.c | 4 +- src/ch/ch_driver.c | 78 +++++++++++++++++++++++++++++ src/ch/ch_monitor.c | 117 ++++++++++++++++++++++++++++++++++++++++++-- src/ch/ch_monitor.h | 3 ++ src/ch/ch_process.c | 67 +++++++++++++++++++++++++ 5 files changed, 263 insertions(+), 6 deletions(-) -- 2.31.1

3 18

[libvirt PATCH] virThreadPoolExpand: Prevent expanding worker pool by zero
by Tim Wiederhake 12 Jul '21

12 Jul '21

`virThreadPoolNewFull` may call `virThreadPoolExpand` with `prioWorkers` = 0. This causes `virThreadPoolExpand` to call `VIR_EXPAND_N` on a null pointer and an increment of zero. The zero increment triggers `virReallocN` to not actually allocate any memory and leave the pointer NULL, which, eventually, causes `memset(NULL, 0, 0)` to be called in `virExpandN`. `memset` is declared `__attribute__ ((__nonnull__ 1))`, which triggers the following warning when libvirt is compiled with address sanitizing enabled: src/util/viralloc.c:82:5: runtime error: null pointer passed as argument 1, which is declared to never be null Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/util/virthreadpool.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index 9ddd86a679..c9d2a17ff4 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -179,6 +179,9 @@ virThreadPoolExpand(virThreadPool *pool, size_t gain, bool priority) size_t i = 0; struct virThreadPoolWorkerData *data = NULL; + if (gain == 0) + return 0; + VIR_EXPAND_N(*workers, *curWorkers, gain); for (i = 0; i < gain; i++) { -- 2.31.1

3 4

[PATCH] qemu: Fix crash in virQEMUCapsProbeQMPTPM
by Peter Krempa 12 Jul '21

12 Jul '21

If the queried QMP command doesn't exist qemuMonitorGetTPMModels returns 0 but sets the string list to NULL which isn't accepted by g_strv_contains. Fixes: a5bc5f0ecf8 Reported-by: Olaf Hering <olaf(a)aepfle.de> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_capabilities.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d1cd8f11ac..5b359258a1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3168,6 +3168,9 @@ virQEMUCapsProbeQMPTPM(virQEMUCaps *qemuCaps, if (qemuMonitorGetTPMModels(mon, &models) < 0) return -1; + if (!models) + return 0; + for (i = 0; i < G_N_ELEMENTS(virQEMUCapsTPMModelsToCaps); i++) { const char *needle = virDomainTPMModelTypeToString(virQEMUCapsTPMModelsToCaps[i].type); if (g_strv_contains((const char **)models, needle)) @@ -3177,10 +3180,12 @@ virQEMUCapsProbeQMPTPM(virQEMUCaps *qemuCaps, if (qemuMonitorGetTPMTypes(mon, &types) < 0) return -1; - for (i = 0; i < G_N_ELEMENTS(virQEMUCapsTPMTypesToCaps); i++) { - const char *needle = virDomainTPMBackendTypeToString(virQEMUCapsTPMTypesToCaps[i].type); - if (g_strv_contains((const char **)types, needle)) - virQEMUCapsSet(qemuCaps, virQEMUCapsTPMTypesToCaps[i].caps); + if (types) { + for (i = 0; i < G_N_ELEMENTS(virQEMUCapsTPMTypesToCaps); i++) { + const char *needle = virDomainTPMBackendTypeToString(virQEMUCapsTPMTypesToCaps[i].type); + if (g_strv_contains((const char **)types, needle)) + virQEMUCapsSet(qemuCaps, virQEMUCapsTPMTypesToCaps[i].caps); + } } return 0; -- 2.31.1

2 2

[libvirt PATCH 0/6] More XML parsing boiler code refactoring
by Tim Wiederhake 12 Jul '21

12 Jul '21

In the spirit of https://listman.redhat.com/archives/libvir-list/2021-May/msg00550.html. Tim Wiederhake (6): conf: Add AUTOPTR_CLEANUP_FUNC for virDomainSEVDef conf: virDomainSEVDef: Change type of "sectype" to virDomainLaunchSecurity virDomainSEVDefParseXML: Use virXMLPropEnum virDomainSEVDefParseXML: Use automatic memory management virDomainSEVDefParseXML: Remove superfluous `goto`s virDomainSEVDefParseXML: Remove superfluous variable initialization src/conf/domain_conf.c | 41 +++++++++++------------------------------ src/conf/domain_conf.h | 4 +++- 2 files changed, 14 insertions(+), 31 deletions(-) -- 2.31.1

3 8

What should we do for contributing a new hypervisor driver?
by Motohiro Kawahito 12 Jul '21

12 Jul '21

Hello. This is my first time of sending e-mail to this mailing list. We are developing a new hypervisor driver. What should we prepare for contributing it? So far, we implemented the following functions. Are there any other things we should prepare? .connectOpen .connectClose .domainCreateXML .domainCreate .domainCreateWithFlags .domainShutdown .domainShutdownFlags .domainDestroy .domainDestroyFlags .connectNumOfDomains .connectListDefinedDomains .connectNumOfDefinedDomains .connectListDomains .connectListAllDomains .domainGetInfo .domainGetState .connectIsAlive .domainHasManagedSaveImage .domainGetXMLDesc .connectGetType .connectGetVersion .domainLookupByID .domainLookupByUUID .domainLookupByName .domainIsActive .domainIsPersistent .domainGetOSType .domainUndefine .domainUndefineFlags Motohiro Kawahito, Commercial Systems, IBM Research - Tokyo 19-21 Nihonbashi, Hakozaki-cho Chuo-ku, Tokyo 103-8510, Japan

2 1

[PATCH v3 0/3] Implement virDomainGetMessages for test driver
by Luke Yue 12 Jul '21

12 Jul '21

v3: - Squash tests commit - Extract the same code in test driver and qemu driver to a function Luke Yue (3): test_driver: Implement virDomainGetMessages test_driver: Introduce testDomainObjCheckTaint conf: domain: Introduce and use virDomainObjGetMessages() src/conf/domain_conf.c | 53 +++++++++++++++++++++++++++ src/conf/domain_conf.h | 5 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 34 +----------------- src/test/test_driver.c | 78 ++++++++++++++++++++++++++++++++++++++++ tests/virshtest.c | 2 ++ 6 files changed, 140 insertions(+), 33 deletions(-) -- 2.32.0

2 8

[PATCH 0/3] softmmu/vl: Deprecate old and crufty display options
by Thomas Huth 12 Jul '21

12 Jul '21

-display sdl uses a hand-crafted parser in vl.c, which is quite ugly since the other parts of -display have been QAPIfied already. A straight conversion to QAPI is not advisable since the "alt_grab" and "ctrl_grab" parameters are not the best solution anyway. So this patch series introduces a new "grab-mod" parameter as replacement instead and then deprecates the old and crufty options. While we're at it, the third patch also suggests to deprecated the old -sdl and -curses top-level options. Thomas Huth (3): softmmu/vl: Add a "grab-mod" parameter to the -display sdl option softmmu/vl: Deprecate the old grab options softmmu/vl: Deprecate the -sdl and -curses option docs/system/deprecated.rst | 20 ++++++++++++++++++++ qemu-options.hx | 18 +++++++++++++----- softmmu/vl.c | 24 +++++++++++++++++++++--- 3 files changed, 54 insertions(+), 8 deletions(-) -- 2.27.0

2 4

[PATCH] qemuProcessSetupDisksTransientHotplug: skip system_reset when the all disks have transient shareBacking option
by Masayoshi Mizuma 12 Jul '21

12 Jul '21

From: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> When both <on_reboot>destroy</on_reboot/> and <transient shareBacking='yes'> is set to the domain xml, the guest doesn't start. # virsh start Guest error: Failed to start domain 'Guest' error: internal error: qemu unexpectedly closed the monitor # That's because libvirt does system_reset qmp command when <transient shareBacking='yes'> is set, and the qemu is launched with '-no-reboot' option, so system_reset goes to shutdown. The boot order issue happens only if the guest has not only the transient share backing disks but also disks which isn't set the option. Let's skip system_reset when the all disks has the option. Signed-off-by: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> --- src/qemu/qemu_process.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2b03b0ab98..82dba64e21 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7058,7 +7058,8 @@ qemuProcessSetupDisksTransientHotplug(virDomainObj *vm, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivate *priv = vm->privateData; - bool hasHotpluggedDisk = false; + bool needReset = true; + size_t attached = 0; size_t i; for (i = 0; i < vm->def->ndisks; i++) { @@ -7071,12 +7072,24 @@ qemuProcessSetupDisksTransientHotplug(virDomainObj *vm, if (qemuDomainAttachDiskGeneric(priv->driver, vm, domdisk, asyncJob) < 0) return -1; - hasHotpluggedDisk = true; + attached++; + } + + /* system_reset is needed in case the domain also has the other disks (doesn't + * have <transient shareBacking='yes'/> option) to fix the boot order. */ + if (!attached || vm->def->ndisks == attached) + needReset = false; + + if (needReset && priv->allowReboot == VIR_TRISTATE_BOOL_NO) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Doesn't support this configuration. " + "Change the domain xml to allow rebooting the guest.")); + return -1; } /* in order to allow booting from such disks we need to issue a system-reset * so that the firmware tables recording bootable devices are regerated */ - if (hasHotpluggedDisk) { + if (needReset) { int rc; if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0) -- 2.27.0

2 1

[PATCH] nodedev: fix error when no defined mdev exist
by Boris Fiuczynski 12 Jul '21

12 Jul '21

Commit e9b534905f4 introduced an error when parsing an empty list returned from mdevctl. This occurs e.g. if nodedev-undefine is used to undefine the last defined mdev which cuases the following error messages libvirtd[33143]: internal error: Unexpected format for mdevctl response libvirtd[33143]: internal error: failed to query mdevs from mdevctl: libvirtd[33143]: mdevctl failed to updated mediated devices Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- src/node_device/node_device_driver.c | 68 ++++++++++--------- .../mdevctl-list-empty.json | 1 + .../mdevctl-list-empty.out.xml | 0 tests/nodedevmdevctltest.c | 1 + 4 files changed, 37 insertions(+), 33 deletions(-) create mode 100644 tests/nodedevmdevctldata/mdevctl-list-empty.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-empty.out.xml diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index b4dd57e5f4..31525f2312 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1123,51 +1123,53 @@ nodeDeviceParseMdevctlJSON(const char *jsonstring, /* mdevctl list --dumpjson produces an output that is an array that * contains only a single object which contains a property for each parent * device */ - if (virJSONValueArraySize(json_devicelist) != 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpected format for mdevctl response")); - goto error; - } - - obj = virJSONValueArrayGet(json_devicelist, 0); - - if (!virJSONValueIsObject(obj)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("device list is not an object")); - goto error; - } - - n = virJSONValueObjectKeysNumber(obj); - for (i = 0; i < n; i++) { - const char *parent; - virJSONValue *child_array; - int nchildren; + if (virJSONValueArraySize(json_devicelist) > 0) { + if (virJSONValueArraySize(json_devicelist) != 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unexpected format for mdevctl response")); + goto error; + } - /* The key of each object property is the name of a parent device - * which maps to an array of child devices */ - parent = virJSONValueObjectGetKey(obj, i); - child_array = virJSONValueObjectGetValue(obj, i); + obj = virJSONValueArrayGet(json_devicelist, 0); - if (!virJSONValueIsArray(child_array)) { + if (!virJSONValueIsObject(obj)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Parent device's JSON object data is not an array")); + _("device list is not an object")); goto error; } - nchildren = virJSONValueArraySize(child_array); + n = virJSONValueObjectKeysNumber(obj); + for (i = 0; i < n; i++) { + const char *parent; + virJSONValue *child_array; + int nchildren; - for (j = 0; j < nchildren; j++) { - g_autoptr(virNodeDeviceDef) child = NULL; - virJSONValue *child_obj = virJSONValueArrayGet(child_array, j); + /* The key of each object property is the name of a parent device + * which maps to an array of child devices */ + parent = virJSONValueObjectGetKey(obj, i); + child_array = virJSONValueObjectGetValue(obj, i); - if (!(child = nodeDeviceParseMdevctlChildDevice(parent, child_obj))) { + if (!virJSONValueIsArray(child_array)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to parse child device")); + _("Parent device's JSON object data is not an array")); goto error; } - if (VIR_APPEND_ELEMENT(outdevs, noutdevs, child) < 0) - goto error; + nchildren = virJSONValueArraySize(child_array); + + for (j = 0; j < nchildren; j++) { + g_autoptr(virNodeDeviceDef) child = NULL; + virJSONValue *child_obj = virJSONValueArrayGet(child_array, j); + + if (!(child = nodeDeviceParseMdevctlChildDevice(parent, child_obj))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to parse child device")); + goto error; + } + + if (VIR_APPEND_ELEMENT(outdevs, noutdevs, child) < 0) + goto error; + } } } diff --git a/tests/nodedevmdevctldata/mdevctl-list-empty.json b/tests/nodedevmdevctldata/mdevctl-list-empty.json new file mode 100644 index 0000000000..fe51488c70 --- /dev/null +++ b/tests/nodedevmdevctldata/mdevctl-list-empty.json @@ -0,0 +1 @@ +[] diff --git a/tests/nodedevmdevctldata/mdevctl-list-empty.out.xml b/tests/nodedevmdevctldata/mdevctl-list-empty.out.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c index 8ba1d2da70..e246de4d87 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -360,6 +360,7 @@ mymain(void) DO_TEST_LIST_DEFINED(); + DO_TEST_PARSE_JSON("mdevctl-list-empty"); DO_TEST_PARSE_JSON("mdevctl-list-multiple"); DO_TEST_DEFINE("mdev_d069d019_36ea_4111_8f0a_8c9a70e21366"); -- 2.31.1

2 4

Requesting a release of ruby-libvirt gem
by Darragh Bailey 11 Jul '21

11 Jul '21

Hi, Would it be possible to get a new release of the ruby-libvirt gem pushed to rubygems? Currently with the latest vagrant moving to ruby 3.0, bumping into an issue with ruby-libvirt having problems being installed as a dependency of vagrant-libvirt: https://github.com/vagrant-libvirt/vagrant-libvirt/issues/1322 https://github.com/hashicorp/vagrant/issues/12445 The latest master contains a fix for the include path of the st.h file from ruby includes. There is a workaround mentioned at https://github.com/hashicorp/vagrant/issues/12445#issuecomment-876566065 using: CFLAGS="-I/opt/vagrant/embedded/include/ruby-3.0.0/ruby" vagrant plugin install vagrant-libvirt I've done a test using rvm with both ruby 2.6.6 and 3.0.0 to check building a local package of the latest tip of ruby-libvirt can be installed correctly for both ruby 3.0 and earlier so it shouldn't break with slightly older versions of vagrant. -- Darragh Bailey

1 0

[PATCH 0/2] qemu: Do not erase duplicate input from namespace
by Kristina Hanicova 09 Jul '21

09 Jul '21

If the attempt to attach an input device failed, we erased the unattached device from the namespace. This resulted in erasing an already attached device in case of a duplicate. We need to check for existing file in the namespace in order to determine erasing it in case of a failure. Kristina Hanicova (2): qemu: Check for existing file in namespace qemu: Do not erase input device from namespace if duplicate src/qemu/qemu_hotplug.c | 3 +-- src/qemu/qemu_namespace.c | 34 ++++++++++++++++++++++------------ src/qemu/qemu_namespace.h | 3 ++- src/util/virprocess.c | 6 ++++-- 4 files changed, 29 insertions(+), 17 deletions(-) -- 2.31.1

3 5

[PATCH 3/2] qemu-img: Improve error for rebase without backing format
by Eric Blake 09 Jul '21

09 Jul '21

When removeing support for qemu-img being able to create backing chains without embedded backing formats, we caused a poor error message as caught by iotest 114. Improve the situation to inform the user what went wrong. Suggested-by: Kevin Wolf <kwolf(a)redhat.com> Signed-off-by: Eric Blake <eblake(a)redhat.com> --- qemu-img.c | 3 +++ tests/qemu-iotests/114.out | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/qemu-img.c b/qemu-img.c index 7c0e73882dd4..b017734c255a 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3786,6 +3786,9 @@ static int img_rebase(int argc, char **argv) if (ret == -ENOSPC) { error_report("Could not change the backing file to '%s': No " "space left in the file header", out_baseimg); + } else if (ret == -EINVAL && out_baseimg && !out_basefmt) { + error_report("Could not change the backing file to '%s': backing " + "format must be specified", out_baseimg); } else if (ret < 0) { error_report("Could not change the backing file to '%s': %s", out_baseimg, strerror(-ret)); diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out index 172454401257..016e9ce3ecfb 100644 --- a/tests/qemu-iotests/114.out +++ b/tests/qemu-iotests/114.out @@ -14,7 +14,7 @@ qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknow no file open, try 'help open' read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-img: Could not change the backing file to '/home/eblake/qemu/build/tests/qemu-iotests/scratch/t.qcow2.base': Invalid argument +qemu-img: Could not change the backing file to '/home/eblake/qemu/build/tests/qemu-iotests/scratch/t.qcow2.base': backing format must be specified read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done -- 2.31.1

2 3

[PATCH] qemu: Fix error code for SEV launchSecurity unsupported
by Boris Fiuczynski 09 Jul '21

09 Jul '21

When SEV is not supported but specified in the domain XML by a user it should not result in an internal error (VIR_ERR_INTERNAL_ERROR) therefore switching to XML error (VIR_ERR_CONFIG_UNSUPPORTED). Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- This patch is based on top of the series [PATCH v4 0/8] Support for launchSecurity type s390-pv src/qemu/qemu_validate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 7482bedee6..bb672727d5 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1218,7 +1218,7 @@ qemuValidateDomainDef(const virDomainDef *def, switch ((virDomainLaunchSecurity) def->sec->sectype) { case VIR_DOMAIN_LAUNCH_SECURITY_SEV: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("SEV launch security is not supported with " "this QEMU binary")); return -1; -- 2.31.1

1 0

[libvirt PATCH 0/2] Remove macros "VIR_INSERT_ELEMENT_COPY" and "VIR_INSERT_ELEMENT_COPY_INPLACE"
by Tim Wiederhake 09 Jul '21

09 Jul '21

There was but one use left, and that is removed in patch 1. Tim Wiederhake (2): virQEMUCapsGetMachineTypesCaps: Use GPtrArray viralloc: Delete VIR_INSERT_ELEMENT_COPY and VIR_INSERT_ELEMENT_COPY_INPLACE src/qemu/qemu_capabilities.c | 37 ++++++++++++++++++------------------ src/util/viralloc.h | 22 ++++----------------- 2 files changed, 22 insertions(+), 37 deletions(-) -- 2.31.1

2 5

[libvirt PATCH] qemu: remove default audio backend for migratable XML
by Daniel P. Berrangé 09 Jul '21

09 Jul '21

When seeing a guest with a sound device, and no audio backend, we automatically add an audio backend XML element based on the historical QEMU driver behaviour. Unfortunately when we live migrate back to an old libvirt, it may not understand the audio driver type we configured. We thus need to strip the default audio backend when migrating. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 128 ++++++++++++++++++++++++++++++--------- 2 files changed, 101 insertions(+), 28 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 43e6398ae5..cc7533a707 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -226,6 +226,7 @@ virDiskNameParse; virDiskNameToBusDeviceIndex; virDiskNameToIndex; virDomainActualNetDefFree; +virDomainAudioDefFree; virDomainAudioFormatTypeFromString; virDomainAudioFormatTypeToString; virDomainAudioIOCommonIsSet; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8488f58e09..3af678a283 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3587,18 +3587,19 @@ qemuDomainDefAddImplicitInputDevice(virDomainDef *def) } static int -qemuDomainDefAddDefaultAudioBackend(virQEMUDriver *driver, - virDomainDef *def) +qemuDomainDefSuggestDefaultAudioBackend(virQEMUDriver *driver, + virDomainDef *def, + bool *addAudio, + int *audioBackend, + int *audioSDLDriver) { size_t i; - bool addAudio = false; bool audioPassthrough = false; - int audioBackend = VIR_DOMAIN_AUDIO_TYPE_NONE; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - if (def->naudios > 0) { - return 0; - } + *addAudio = false; + *audioBackend = VIR_DOMAIN_AUDIO_TYPE_NONE; + *audioSDLDriver = VIR_DOMAIN_AUDIO_SDL_DRIVER_DEFAULT; for (i = 0; i < def->ngraphics; i++) { virDomainGraphicsDef *graph = def->graphics[i]; @@ -3609,18 +3610,18 @@ qemuDomainDefAddDefaultAudioBackend(virQEMUDriver *driver, audioPassthrough = true; } else { audioPassthrough = false; - audioBackend = VIR_DOMAIN_AUDIO_TYPE_NONE; + *audioBackend = VIR_DOMAIN_AUDIO_TYPE_NONE; } - addAudio = true; + *addAudio = true; break; case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: audioPassthrough = false; - audioBackend = VIR_DOMAIN_AUDIO_TYPE_SPICE; - addAudio = true; + *audioBackend = VIR_DOMAIN_AUDIO_TYPE_SPICE; + *addAudio = true; break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: audioPassthrough = true; - addAudio = true; + *addAudio = true; break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: @@ -3639,24 +3640,24 @@ qemuDomainDefAddDefaultAudioBackend(virQEMUDriver *driver, audioPassthrough = true; } else { audioPassthrough = false; - audioBackend = VIR_DOMAIN_AUDIO_TYPE_NONE; + *audioBackend = VIR_DOMAIN_AUDIO_TYPE_NONE; } - addAudio = true; + *addAudio = true; } - if (addAudio && audioPassthrough) { + if (*addAudio && audioPassthrough) { const char *audioenv = g_getenv("QEMU_AUDIO_DRV"); if (audioenv == NULL) { - addAudio = false; + *addAudio = false; } else { /* * QEMU audio driver names are mostly the same as * libvirt XML audio backend names */ if (STREQ(audioenv, "pa")) { - audioBackend = VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO; + *audioBackend = VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO; } else { - if ((audioBackend = virDomainAudioTypeTypeFromString(audioenv)) < 0) { + if (((*audioBackend) = virDomainAudioTypeTypeFromString(audioenv)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown QEMU_AUDIO_DRV setting %s"), audioenv); return -1; @@ -3664,6 +3665,79 @@ qemuDomainDefAddDefaultAudioBackend(virQEMUDriver *driver, } } } + + if (*addAudio && *audioBackend == VIR_DOMAIN_AUDIO_TYPE_SDL) { + const char *sdldriver = g_getenv("SDL_AUDIODRIVER"); + if (sdldriver != NULL && + (((*audioSDLDriver) = + virDomainAudioSDLDriverTypeFromString(sdldriver)) <= 0)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown SDL_AUDIODRIVER setting %s"), sdldriver); + return -1; + } + } + + return 0; +} + +static int +qemuDomainDefClearDefaultAudioBackend(virQEMUDriver *driver, + virDomainDef *def) +{ + bool addAudio; + int audioBackend; + int audioSDLDriver; + virDomainAudioDef *audio; + + if (def->naudios != 1) { + return 0; + } + + if (qemuDomainDefSuggestDefaultAudioBackend(driver, + def, + &addAudio, + &audioBackend, + &audioSDLDriver) < 0) + return -1; + + if (!addAudio) + return 0; + + audio = def->audios[0]; + if (audio->type != audioBackend) + return 0; + + if (audio->type == VIR_DOMAIN_AUDIO_TYPE_SDL && + audio->backend.sdl.driver != audioSDLDriver) + return 0; + + virDomainAudioDefFree(audio); + g_free(def->audios); + def->naudios = 0; + def->audios = NULL; + + return 0; +} + +static int +qemuDomainDefAddDefaultAudioBackend(virQEMUDriver *driver, + virDomainDef *def) +{ + bool addAudio; + int audioBackend; + int audioSDLDriver; + + if (def->naudios > 0) { + return 0; + } + + if (qemuDomainDefSuggestDefaultAudioBackend(driver, + def, + &addAudio, + &audioBackend, + &audioSDLDriver) < 0) + return -1; + if (addAudio) { virDomainAudioDef *audio = g_new0(virDomainAudioDef, 1); @@ -3674,16 +3748,8 @@ qemuDomainDefAddDefaultAudioBackend(virQEMUDriver *driver, def->audios = g_new0(virDomainAudioDef *, def->naudios); def->audios[0] = audio; - if (audioBackend == VIR_DOMAIN_AUDIO_TYPE_SDL) { - const char *sdldriver = g_getenv("SDL_AUDIODRIVER"); - if (sdldriver != NULL && - ((audio->backend.sdl.driver = - virDomainAudioSDLDriverTypeFromString(sdldriver)) <= 0)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown SDL_AUDIODRIVER setting %s"), sdldriver); - return -1; - } - } + if (audioBackend == VIR_DOMAIN_AUDIO_TYPE_SDL) + audio->backend.sdl.driver = audioSDLDriver; } return 0; @@ -6298,6 +6364,12 @@ qemuDomainDefFormatBufInternal(virQEMUDriver *driver, if (def->cpu && qemuDomainMakeCPUMigratable(def->cpu) < 0) return -1; + + /* Old libvirt doesn't understand <audio> elements so + * remove any we added by default + */ + if (qemuDomainDefClearDefaultAudioBackend(driver, def) < 0) + return -1; } format: -- 2.31.1

2 1

[PATCH] lib: Specify domain redefinition requirements
by Roman Bolshakov 09 Jul '21

09 Jul '21

There might be misunderstanding [1] when libvirt permits domain redefinition and if it's a valid case at all. 1. https://github.com/ansible-collections/community.libvirt/blob/b973d7c4b4058… Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- src/libvirt-domain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 750e32f0ca..e48f3cdb02 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -6290,8 +6290,8 @@ virDomainGetBlockInfo(virDomainPtr domain, const char *disk, * * Define a domain, but does not start it. * This definition is persistent, until explicitly undefined with - * virDomainUndefine(). A previous definition for this domain would be - * overridden if it already exists. + * virDomainUndefine(). A previous definition for this domain with the same + * UUID and name would be overridden if it already exists. * * virDomainFree should be used to free the resources after the * domain object is no longer needed. @@ -6333,8 +6333,8 @@ virDomainDefineXML(virConnectPtr conn, const char *xml) * * Defines a domain, but does not start it. * This definition is persistent, until explicitly undefined with - * virDomainUndefine(). A previous definition for this domain would be - * overridden if it already exists. + * virDomainUndefine(). A previous definition for this domain with the same + * UUID and name would be overridden if it already exists. * * virDomainFree should be used to free the resources after the * domain object is no longer needed. -- 2.32.0

2 1

[PATCH v4 0/8] Support for launchSecurity type s390-pv
by Boris Fiuczynski 08 Jul '21

08 Jul '21

This patch series introduces the launch security type s390-pv. Specifying s390-pv as launch security type in an s390 domain prepares for running the guest in protected virtualization secure mode, also known as IBM Secure Execution. diff to v3: - moved virDomainSEVDef into a union - improved XML formating for launchSecurity - use a shared id on the qemu cmd line for confidential-guest-support - added check for s390-pv host support into XML validation - changed from ignoring to failing if launchSecuroty child elements are provided for s390-pv - reduced test to a single failing test - add availability of s390-pv in domain capabilities diff to v2: - Broke up previous patch one into three patches diff to v1: - Rebased to current master - Added verification check for confidential-guest-support capability Boris Fiuczynski (8): schemas: Make SEV policy on launch security optional conf: rework SEV XML parse and format methods qemu: make KVMSupportsSecureGuest capability available conf: refactor launch security to allow more types qemu: add s390-pv-guest capability conf: add availability of s390-pv in domain capabilities qemu: use common id lsec0 for launchSecurity docs: add s390-pv documentation docs/formatdomain.rst | 7 + docs/kbase/s390_protected_virt.rst | 55 ++++++- docs/schemas/domaincaps.rng | 9 ++ docs/schemas/domaincommon.rng | 13 +- src/conf/domain_capabilities.c | 1 + src/conf/domain_capabilities.h | 1 + src/conf/domain_conf.c | 143 +++++++++++++----- src/conf/domain_conf.h | 17 ++- src/conf/virconftypes.h | 2 + src/qemu/qemu_capabilities.c | 24 +++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 75 +++++++-- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_firmware.c | 33 ++-- src/qemu/qemu_namespace.c | 21 ++- src/qemu/qemu_process.c | 35 ++++- src/qemu/qemu_validate.c | 32 +++- src/security/security_dac.c | 6 +- tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsmock.c | 17 +++ .../launch-security-s390-pv.xml | 18 +++ tests/genericxml2xmltest.c | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + ...nch-security-s390-pv-fail.s390x-latest.err | 1 + .../launch-security-s390-pv-fail.xml | 33 ++++ .../launch-security-s390-pv.s390x-latest.args | 35 +++++ .../launch-security-s390-pv.xml | 30 ++++ ...v-missing-platform-info.x86_64-2.12.0.args | 4 +- ...urity-sev-missing-policy.x86_64-2.12.0.err | 1 + .../launch-security-sev-missing-policy.xml | 34 +++++ .../launch-security-sev.x86_64-2.12.0.args | 4 +- .../launch-security-sev.x86_64-6.0.0.args | 4 +- tests/qemuxml2argvmock.c | 16 ++ tests/qemuxml2argvtest.c | 4 + 41 files changed, 588 insertions(+), 107 deletions(-) create mode 100644 tests/genericxml2xmlindata/launch-security-s390-pv.xml create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv-fail.s390x-latest.err create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv-fail.xml create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv.xml create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-policy.x86_64-2.12.0.err create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-policy.xml -- 2.31.1

1 8

[PATCH] vircgroup: Improve virCgroupControllerAvailable wrt to CGroupsV2
by Michal Privoznik 08 Jul '21

08 Jul '21

It all started as a simple bug: trying to move domain memory between NUMA nodes (e.g. via virsh numatune) did not work. I've traced the problem to qemuProcessHook() because that's where we decide whether to rely on CGroups or use numactl APIs to satisfy <numatune/>. The problem was that virCgroupControllerAvailable() was telling us that cpuset controller is unavailable. This is CGroupsV2, and pretty weird because CGroupsV2 definitely do support cpuset controller and I had them mounted in a standard way. What I found out (with Pavel's help) was that virCgroupNewSelf() was looking into the following path to detect supported controllers: /sys/fs/cgroup/system.slice/cgroup.controllers However, if there's no other VM running then the system.slice only has 'memory' and 'pids' controllers. Therefore, we saw 'cpuset' as not available. The fix is to look at the top most path, which has the full set of controllers: /sys/fs/cgroup/cgroup.controllers Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1976690 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/vircgroup.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 65a81e8d6f..1b3b28342e 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2996,7 +2996,10 @@ virCgroupControllerAvailable(int controller) { g_autoptr(virCgroup) cgroup = NULL; - if (virCgroupNewSelf(&cgroup) < 0) + /* Don't use virCgroupNewSelf() - we might be running in a slice that + * doesn't have @controller but the domain (for which we will later use + * virCgroupHasController()) might have it. */ + if (virCgroupNew("/", -1, &cgroup) < 0) return false; return virCgroupHasController(cgroup, controller); -- 2.31.1

2 1

Add SELinux policy for Virt
by Nikola Knazekova 08 Jul '21

08 Jul '21

Hi, I created SELinux policy for Libvirt drivers, as part of Decentralized SELinux Policy (DSP) project. DSP guidelines is available: https://fedoraproject.org/wiki/SELinux/IndependentPolicy Discussion about the first version of SELinux policy for Libvirt is available on gitlab: https://gitlab.com/libvirt/libvirt/-/merge_requests/65 SELinux policy was created for: Hypervisor drivers: - virtqemud (QEMU/KVM) - virtlxcd (LXC) - virtvboxd (VirtualBox) Secondary drivers: - virtstoraged (host storage mgmt) - virtnetworkd (virtual network mgmt) - virtinterface (network interface mgmt) - virtnodedevd (physical device mgmt) - virtsecretd (security credential mgmt) - virtnwfilterd (ip[6]tables/ebtables mgmt) - virtproxyd (proxy daemon) SELinux policy for virtvxz and virtxend has not been created yet, because I wasn't able to reproduce AVC messages. These drivers run in unconfined_domain until the AVC messages are reproduced internally and policy for these drivers is made. Can you please look at it? Thanks Nikola

5 45

[PATCH] schemas: Allow cache attribute for bandwidth element for HMAT
by Michal Privoznik 08 Jul '21

08 Jul '21

Turns out, when introducing HMAT support in v6.6.0-rc1~249 I've forgot to allow "cache" attribute for <bandwidth/> element in RNG. It's parsed and formatted, but schema does not allow it. Fixes: a89bbbac86383a10be0cec5a93feb7ed820871eb Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1980162 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/schemas/cputypes.rng | 5 +++++ tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args | 1 + tests/qemuxml2argvdata/numatune-hmat.xml | 1 + 3 files changed, 7 insertions(+) diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng index 77c8fa783b..056e66e1b4 100644 --- a/docs/schemas/cputypes.rng +++ b/docs/schemas/cputypes.rng @@ -250,6 +250,11 @@ <attribute name="target"> <ref name="unsignedInt"/> </attribute> + <optional> + <attribute name="cache"> + <ref name="unsignedInt"/> + </attribute> + </optional> <attribute name="type"> <choice> <value>access</value> diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args index 1ec2e15095..54ab91b09c 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args @@ -30,6 +30,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \ -numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-latency,latency=5 \ -numa hmat-lb,initiator=0,target=0,hierarchy=first-level,data-type=access-latency,latency=10 \ -numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=204800K \ +-numa hmat-lb,initiator=0,target=0,hierarchy=first-level,data-type=access-bandwidth,bandwidth=208896K \ -numa hmat-cache,node-id=0,size=10K,level=1,associativity=direct,policy=write-back,line=8 \ -uuid c7a5fdb2-cdaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/numatune-hmat.xml b/tests/qemuxml2argvdata/numatune-hmat.xml index 51ff3c3425..a64d2ef3e2 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.xml +++ b/tests/qemuxml2argvdata/numatune-hmat.xml @@ -30,6 +30,7 @@ <latency initiator='0' target='0' type='access' value='5'/> <latency initiator='0' target='0' cache='1' type='access' value='10'/> <bandwidth initiator='0' target='0' type='access' value='204800' unit='KiB'/> + <bandwidth initiator='0' target='0' cache='1' type='access' value='208896' unit='KiB'/> </interconnects> </numa> </cpu> -- 2.31.1

2 1

[PATCH 2/2] qemu-img: Require -F with -b backing image
by Eric Blake 08 Jul '21

08 Jul '21

Back in commit d9f059aa6c (qemu-img: Deprecate use of -b without -F), we deprecated the ability to create a file with a backing image that requires qemu to perform format probing. Qemu can still probe older files for backwards compatibility, but it is time to finish off the ability to create such images, due to the potential security risk they present. Update a couple of iotests affected by the change. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- docs/system/deprecated.rst | 20 ----------------- docs/system/removed-features.rst | 19 ++++++++++++++++ block.c | 37 ++++++++++---------------------- qemu-img.c | 6 ++++-- tests/qemu-iotests/114 | 18 ++++++++-------- tests/qemu-iotests/114.out | 11 ++++------ tests/qemu-iotests/301 | 4 +--- tests/qemu-iotests/301.out | 16 ++------------ 8 files changed, 50 insertions(+), 81 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 9ec1a9d0e03e..aa6f7d84e583 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -315,26 +315,6 @@ this CPU is also deprecated. Related binaries ---------------- -qemu-img backing file without format (since 5.1) -'''''''''''''''''''''''''''''''''''''''''''''''' - -The use of ``qemu-img create``, ``qemu-img rebase``, or ``qemu-img -convert`` to create or modify an image that depends on a backing file -now recommends that an explicit backing format be provided. This is -for safety: if QEMU probes a different format than what you thought, -the data presented to the guest will be corrupt; similarly, presenting -a raw image to a guest allows a potential security exploit if a future -probe sees a non-raw image based on guest writes. - -To avoid the warning message, or even future refusal to create an -unsafe image, you must pass ``-o backing_fmt=`` (or the shorthand -``-F`` during create) to specify the intended backing format. You may -use ``qemu-img rebase -u`` to retroactively add a backing format to an -existing image. However, be aware that there are already potential -security risks to blindly using ``qemu-img info`` to probe the format -of an untrusted backing image, when deciding what format to add into -an existing image. - Backwards compatibility ----------------------- diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst index 28b5df757d35..1928d8a483c0 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -466,6 +466,25 @@ backing chain should be performed with ``qemu-img rebase -u`` either before or after the remaining changes being performed by amend, as appropriate. +qemu-img backing file without format (removed in 6.1) +''''''''''''''''''''''''''''''''''''''''''''''''''''' + +The use of ``qemu-img create``, ``qemu-img rebase``, or ``qemu-img +convert`` to create or modify an image that depends on a backing file +now requires that an explicit backing format be provided. This is +for safety: if QEMU probes a different format than what you thought, +the data presented to the guest will be corrupt; similarly, presenting +a raw image to a guest allows a potential security exploit if a future +probe sees a non-raw image based on guest writes. + +To avoid creating unsafe backing chains, you must pass ``-o +backing_fmt=`` (or the shorthand ``-F`` during create) to specify the +intended backing format. You may use ``qemu-img rebase -u`` to +retroactively add a backing format to an existing image. However, be +aware that there are already potential security risks to blindly using +``qemu-img info`` to probe the format of an untrusted backing image, +when deciding what format to add into an existing image. + Block devices ------------- diff --git a/block.c b/block.c index 874c22c43e3d..931e37a8499b 100644 --- a/block.c +++ b/block.c @@ -5033,7 +5033,7 @@ int coroutine_fn bdrv_co_check(BlockDriverState *bs, * -ENOTSUP - format driver doesn't support changing the backing file */ int bdrv_change_backing_file(BlockDriverState *bs, const char *backing_file, - const char *backing_fmt, bool warn) + const char *backing_fmt, bool require) { BlockDriver *drv = bs->drv; int ret; @@ -5047,10 +5047,8 @@ int bdrv_change_backing_file(BlockDriverState *bs, const char *backing_file, return -EINVAL; } - if (warn && backing_file && !backing_fmt) { - warn_report("Deprecated use of backing file without explicit " - "backing format, use of this image requires " - "potentially unsafe format probing"); + if (require && backing_file && !backing_fmt) { + return -EINVAL; } if (drv->bdrv_change_backing_file != NULL) { @@ -6556,24 +6554,11 @@ void bdrv_img_create(const char *filename, const char *fmt, goto out; } else { if (!backing_fmt) { - warn_report("Deprecated use of backing file without explicit " - "backing format (detected format of %s)", - bs->drv->format_name); - if (bs->drv != &bdrv_raw) { - /* - * A probe of raw deserves the most attention: - * leaving the backing format out of the image - * will ensure bs->probed is set (ensuring we - * don't accidentally commit into the backing - * file), and allow more spots to warn the users - * to fix their toolchain when opening this image - * later. For other images, we can safely record - * the format that we probed. - */ - backing_fmt = bs->drv->format_name; - qemu_opt_set(opts, BLOCK_OPT_BACKING_FMT, backing_fmt, - NULL); - } + error_setg(&local_err, + "Backing file specified without backing format"); + error_append_hint(&local_err, "Detected format of %s.", + bs->drv->format_name); + goto out; } if (size == -1) { /* Opened BS, have no size */ @@ -6590,9 +6575,9 @@ void bdrv_img_create(const char *filename, const char *fmt, } /* (backing_file && !(flags & BDRV_O_NO_BACKING)) */ } else if (backing_file && !backing_fmt) { - warn_report("Deprecated use of unopened backing file without " - "explicit backing format, use of this image requires " - "potentially unsafe format probing"); + error_setg(&local_err, + "Backing file specified without backing format"); + goto out; } if (size == -1) { diff --git a/qemu-img.c b/qemu-img.c index a5993682aad4..3cdfcaa23f6b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2505,8 +2505,10 @@ static int img_convert(int argc, char **argv) if (out_baseimg_param) { if (!qemu_opt_get(opts, BLOCK_OPT_BACKING_FMT)) { - warn_report("Deprecated use of backing file without explicit " - "backing format"); + error_report("Use of backing file requires explicit " + "backing format"); + ret = -1; + goto out; } } diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 index 43cb0bc6c344..3e30b402bc4c 100755 --- a/tests/qemu-iotests/114 +++ b/tests/qemu-iotests/114 @@ -44,16 +44,16 @@ _supported_os Linux # qcow2.py does not work too well with external data files _unsupported_imgopts data_file -# Intentionally specify backing file without backing format; demonstrate -# the difference in warning messages when backing file could be probed. -# Note that only a non-raw probe result will affect the resulting image. +# Older qemu-img could set up backing file without backing format; modern +# qemu can't but we can use qcow2.py to simulate older files. truncate -s $((64 * 1024 * 1024)) "$TEST_IMG.orig" -_make_test_img -b "$TEST_IMG.orig" 64M +_make_test_img -b "$TEST_IMG.orig" -F raw 64M +$PYTHON qcow2.py "$TEST_IMG" del-header-ext 0xE2792ACA TEST_IMG="$TEST_IMG.base" _make_test_img 64M $QEMU_IMG convert -O qcow2 -B "$TEST_IMG.orig" "$TEST_IMG.orig" "$TEST_IMG" -_make_test_img -b "$TEST_IMG.base" 64M -_make_test_img -u -b "$TEST_IMG.base" 64M +_make_test_img -b "$TEST_IMG.base" -F $IMGFMT 64M +_make_test_img -u -b "$TEST_IMG.base" -F $IMGFMT 64M # Set an invalid backing file format $PYTHON qcow2.py "$TEST_IMG" add-header-ext 0xE2792ACA "foo" @@ -64,9 +64,9 @@ _img_info $QEMU_IO -c "open $TEST_IMG" -c "read 0 4k" 2>&1 | _filter_qemu_io | _filter_testdir $QEMU_IO -c "open -o backing.driver=$IMGFMT $TEST_IMG" -c "read 0 4k" | _filter_qemu_io -# Rebase the image, to show that omitting backing format triggers a warning, -# but probing now lets us use the backing file. -$QEMU_IMG rebase -u -b "$TEST_IMG.base" "$TEST_IMG" +# Rebase the image, to show that backing format is required. +$QEMU_IMG rebase -u -b "$TEST_IMG.base" "$TEST_IMG" && echo "unexpected pass" +$QEMU_IMG rebase -u -b "$TEST_IMG.base" -F $IMGFMT "$TEST_IMG" $QEMU_IO -c "open $TEST_IMG" -c "read 0 4k" 2>&1 | _filter_qemu_io | _filter_testdir # success, all done diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out index 0a37d20c82a9..172454401257 100644 --- a/tests/qemu-iotests/114.out +++ b/tests/qemu-iotests/114.out @@ -1,12 +1,9 @@ QA output created by 114 -qemu-img: warning: Deprecated use of backing file without explicit backing format (detected format of raw) -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.orig +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.orig backing_fmt=raw Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864 -qemu-img: warning: Deprecated use of backing file without explicit backing format -qemu-img: warning: Deprecated use of backing file without explicit backing format (detected format of IMGFMT) +qemu-img: Use of backing file requires explicit backing format +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT -qemu-img: warning: Deprecated use of unopened backing file without explicit backing format, use of this image requires potentially unsafe format probing -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base image: TEST_DIR/t.IMGFMT file format: IMGFMT virtual size: 64 MiB (67108864 bytes) @@ -17,7 +14,7 @@ qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknow no file open, try 'help open' read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-img: warning: Deprecated use of backing file without explicit backing format, use of this image requires potentially unsafe format probing +qemu-img: Could not change the backing file to '/home/eblake/qemu/build/tests/qemu-iotests/scratch/t.qcow2.base': Invalid argument read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done diff --git a/tests/qemu-iotests/301 b/tests/qemu-iotests/301 index 9f943cadbe24..220de1043fa5 100755 --- a/tests/qemu-iotests/301 +++ b/tests/qemu-iotests/301 @@ -3,7 +3,7 @@ # # Test qcow backing file warnings # -# Copyright (C) 2020 Red Hat, Inc. +# Copyright (C) 2020-2021 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -46,7 +46,6 @@ echo "== qcow backed by qcow ==" TEST_IMG="$TEST_IMG.base" _make_test_img $size _make_test_img -b "$TEST_IMG.base" $size -_img_info _make_test_img -b "$TEST_IMG.base" -F $IMGFMT $size _img_info @@ -71,7 +70,6 @@ echo "== qcow backed by raw ==" rm "$TEST_IMG.base" truncate --size=$size "$TEST_IMG.base" _make_test_img -b "$TEST_IMG.base" $size -_img_info _make_test_img -b "$TEST_IMG.base" -F raw $size _img_info diff --git a/tests/qemu-iotests/301.out b/tests/qemu-iotests/301.out index 9004dad6392f..e280658191e1 100644 --- a/tests/qemu-iotests/301.out +++ b/tests/qemu-iotests/301.out @@ -2,13 +2,7 @@ QA output created by 301 == qcow backed by qcow == Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=33554432 -qemu-img: warning: Deprecated use of backing file without explicit backing format (detected format of IMGFMT) -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33554432 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT -image: TEST_DIR/t.IMGFMT -file format: IMGFMT -virtual size: 32 MiB (33554432 bytes) -cluster_size: 512 -backing file: TEST_DIR/t.IMGFMT.base +qemu-img: TEST_DIR/t.IMGFMT: Backing file specified without backing format Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33554432 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT image: TEST_DIR/t.IMGFMT file format: IMGFMT @@ -36,13 +30,7 @@ cluster_size: 512 backing file: TEST_DIR/t.IMGFMT.base == qcow backed by raw == -qemu-img: warning: Deprecated use of backing file without explicit backing format (detected format of raw) -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33554432 backing_file=TEST_DIR/t.IMGFMT.base -image: TEST_DIR/t.IMGFMT -file format: IMGFMT -virtual size: 32 MiB (33554432 bytes) -cluster_size: 512 -backing file: TEST_DIR/t.IMGFMT.base +qemu-img: TEST_DIR/t.IMGFMT: Backing file specified without backing format Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33554432 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=raw image: TEST_DIR/t.IMGFMT file format: IMGFMT -- 2.31.1

2 4

Re: [PATCH 0/2] Remove deprecated qemu-img backing file without format
by Eric Blake 08 Jul '21

08 Jul '21

On Mon, May 03, 2021 at 04:35:58PM -0500, Eric Blake wrote: > We've gone enough release cycles without noticeable pushback on our > intentions, so time to make it harder to create images that can form a > security hole due to a need for format probing rather than an explicit > format. > > Eric Blake (2): > qcow2: Prohibit backing file changes in 'qemu-img amend' > qemu-img: Require -F with -b backing image Ping. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org

2 1

Re: [PATCH 4/4] x86/tsx: Add cmdline tsx=fake to not clear CPUID bits RTM and HLE
by Eduardo Habkost 08 Jul '21

08 Jul '21

CCing libvir-list, Jiri Denemark, Michal Privoznik, so they are aware that the definition of "supported CPU features" will probably become a bit more complex in the future. On Tue, Jul 6, 2021 at 5:58 PM Paolo Bonzini <pbonzini(a)redhat.com> wrote: > > On 06/07/21 23:33, Eduardo Habkost wrote: > > On Tue, Jul 6, 2021 at 5:05 PM Paolo Bonzini <pbonzini(a)redhat.com> wrote: > >> It's a bit tricky, because HLE and RTM won't really behave well. An old > >> guest that sees RTM=1 might end up retrying and aborting transactions > >> too much. So I'm not sure that a QEMU "-cpu host" guest should have HLE > >> and RTM enabled. > > > > Is the purpose of GET_SUPPORTED_CPUID to return what is supported by > > KVM, or to return what "-cpu host" should enable by default? They are > > conflicting requirements in this case. > > In theory there is GET_EMULATED_CPUID for the former, so it should be > the latter. In practice neither QEMU nor Libvirt use it; maybe now we > have a good reason to add it, but note that userspace could also check > host RTM_ALWAYS_ABORT. > > > Returning HLE=1,RTM=1 in GET_SUPPORTED_CPUID makes existing userspace > > take bad decisions until it's updated. > > > > Returning HLE=0,RTM=0 in GET_SUPPORTED_CPUID prevents existing > > userspace from resuming existing VMs (despite being technically > > possible). > > > > The first option has an easy workaround that doesn't require a > > software update (disabling HLE/RTM in the VM configuration). The > > second option doesn't have a workaround. I'm inclined towards the > > first option. > > The default has already been tsx=off for a while though, so checking > either GET_EMULATED_CPUID or host RTM_ALWAYS_ABORT in userspace might > also be feasible for those that are still on tsx=on. This sounds like a perfect use case for GET_EMULATED_CPUID. My only concern is breaking existing userspace. But if this was already broken for a few kernel releases due to tsx=off being the default, maybe GET_EMULATED_CPUID will be a reasonable approach. -- Eduardo

3 5

[PATCH] virresctrl: Fix updating the mask for a cache resource
by Vinayak Kale 07 Jul '21

07 Jul '21

In 'virResctrlAllocUpdateMask', mask is updated only if 'previous mask' is NULL. By default, the bitmask for a cache resource for a VM is initialized with 'default-resctrl-group' bitmask. So the 'previous mask' would not be NULL and mask won't get updated if cachetune is configured for a VM. This causes libvirt to use same bitmask as 'default-resctrl-group' bitmask for a cache resource for a VM. This patch fixes the issue. Fixes: d8a354954aba9cd45ab0317915a0a2be27c04767 Signed-off-by: Vinayak Kale <vkale(a)nvidia.com> --- src/util/virresctrl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 35e92022db..a7d36f492c 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -1104,8 +1104,10 @@ virResctrlAllocUpdateMask(virResctrlAlloc *alloc, VIR_EXPAND_N(a_type->masks, a_type->nmasks, cache - a_type->nmasks + 1); - if (!a_type->masks[cache]) - a_type->masks[cache] = virBitmapNewCopy(mask); + if (a_type->masks[cache]) + virBitmapFree(a_type->masks[cache]); + + a_type->masks[cache] = virBitmapNewCopy(mask); return 0; } -- 2.17.1

3 3

vfio-user in libvirt
by John Levon 07 Jul '21

07 Jul '21

Hi, has anyone considered support for vfio-user devices in libvirt? I was thinking of something like: <controller type='vfio-user' index='0'> <socket type="path">/path/to/vfio-user.sock</socket> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </controller> The main reason why this is useful is to get a PCI slot assigned for PCI-based vfio-user. Thoughts? thanks john

1 0

[PATCH 0/6] libxl: Misc cleanups and improvements
by Jim Fehlig 07 Jul '21

07 Jul '21

My main objective with this series was to decompose libxlDomainStart a bit, as it had become quite unwieldy. Along the way I made a few other small improvements to the code. Jim Fehlig (6): libxl: Drop unused 'cfg' parameter from libxlDomainSaveImageOpen libxl: Move managed save logic to libxlDomainStartNew libxl: Add a helper function to unprepare network devices libxl: Introduce libxlDomainStartPrepare libxl: Introduce libxlDomainStartPerform libxl: Add helper function for running the hook script src/libxl/libxl_domain.c | 384 ++++++++++++++++++------------------ src/libxl/libxl_domain.h | 11 +- src/libxl/libxl_driver.c | 30 +-- src/libxl/libxl_migration.c | 15 +- 4 files changed, 218 insertions(+), 222 deletions(-) -- 2.31.1

2 8

[PATCH 0/2] qemu: fix migration with non-shared storage (incremental)
by Peter Krempa 07 Jul '21

07 Jul '21

See patch 1/2. Peter Krempa (2): qemu: migration: Use correct flag constant for enabling storage migration NEWS: Mention implications of the bug in migration code NEWS.rst | 7 +++++++ src/qemu/qemu_migration.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) -- 2.31.1

2 4

[PATCH] qemu: Don't use memory-backend-memfd for NVDIMMs
by Michal Privoznik 07 Jul '21

07 Jul '21

If guest is configured to use memfd then the function that build memory-backend-* part of command line will put memory-backend-memfd, always. Even for NVDIMMs. This is not correct, because NVDIMMs need a backing path (usually to a real host NVDIMM device). Therefore, regardless of memfd being requested, we have to stick with memory-backend-file. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 3 ++- .../memfd-memory-numa.x86_64-latest.args | 6 ++++-- tests/qemuxml2argvdata/memfd-memory-numa.xml | 11 +++++++++++ tests/qemuxml2xmltest.c | 3 ++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ea513693f7..0473e7deaa 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3052,7 +3052,8 @@ qemuBuildMemoryBackendProps(virJSONValue **backendProps, props = virJSONValueNewObject(); - if (def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_MEMFD) { + if (!mem->nvdimmPath && + def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_MEMFD) { backendType = "memory-backend-memfd"; if (useHugepage) { diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index 5e54908666..3b33db3c55 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -10,13 +10,15 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \ -name guest=instance-00000092,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-instance-00000092/master-key.aes"}' \ --machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off,nvdimm=on \ -cpu qemu64 \ --m 14336 \ +-m size=14680064k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ -smp 8,sockets=1,dies=1,cores=8,threads=1 \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":true,"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912,"host-nodes":[3],"policy":"preferred"}' \ +-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2argvdata/memfd-memory-numa.xml index 3f448790a6..d9e1a9f564 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.xml +++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml @@ -1,6 +1,7 @@ <domain type='kvm'> <name>instance-00000092</name> <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid> + <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory> <memory unit='KiB'>14680064</memory> <currentMemory unit='KiB'>14680064</currentMemory> <memoryBacking> @@ -41,5 +42,15 @@ <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </memballoon> + <memory model='nvdimm'> + <source> + <path>/tmp/nvdimm</path> + </source> + <target> + <size unit='KiB'>523264</size> + <node>0</node> + </target> + <address type='dimm' slot='0'/> + </memory> </devices> </domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 40e027aaa4..c5005d41a0 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1305,7 +1305,8 @@ mymain(void) DO_TEST("memfd-memory-numa", QEMU_CAPS_OBJECT_MEMORY_MEMFD, QEMU_CAPS_OBJECT_MEMORY_MEMFD_HUGETLB, - QEMU_CAPS_OBJECT_MEMORY_FILE); + QEMU_CAPS_OBJECT_MEMORY_FILE, + QEMU_CAPS_DEVICE_NVDIMM); DO_TEST("memfd-memory-default-hugepage", QEMU_CAPS_OBJECT_MEMORY_MEMFD, QEMU_CAPS_OBJECT_MEMORY_MEMFD_HUGETLB, -- 2.31.1

2 1

[PATCH] virtlockd: Don't report error if lockspace exists
by Jim Fehlig 07 Jul '21

07 Jul '21

When the qemu or libxl driver is configured to use lockd and file_lockspace_dir is set, virtlockd emits an error when libvirtd is retarted May 25 15:44:31 virt81 virtlockd[7723]: Requested operation is not valid: Lockspace for path /data/libvirtd/lockspace already exists There is really no need to fail when the lockspace already exists, paricularly since the user is expected to create the lockspace specified in file_lockspace_dir. Failure to do so will prevent starting any domains virsh start test error: Failed to start domain 'test' error: Unable to open/create resource /data/libvirtd/lockspace/de22c4bf931e7c48b49e8ca64b477d44e78a51543e534df488b05ccd08ec5caa: No such file or directory Also, virLockManagerLockDaemonSetupLockspace already has logic to ignore the error. Since callers are not interested in the error, change virtlockd to not report or return an error when the specified lockspace already exists. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- In response to my earlier query about this problem https://listman.redhat.com/archives/libvir-list/2021-May/msg00872.html src/locking/lock_daemon_dispatch.c | 5 ++--- src/locking/lock_driver_lockd.c | 11 ++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c index e8b9832453..13e688f2e2 100644 --- a/src/locking/lock_daemon_dispatch.c +++ b/src/locking/lock_daemon_dispatch.c @@ -405,9 +405,8 @@ virLockSpaceProtocolDispatchCreateLockSpace(virNetServer *server G_GNUC_UNUSED, } if (virLockDaemonFindLockSpace(lockDaemon, args->path) != NULL) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("Lockspace for path %s already exists"), - args->path); + VIR_DEBUG("Lockspace for path %s already exists", args->path); + rv = 0; goto cleanup; } diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 3a7386af30..87afdbfb78 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -281,15 +281,8 @@ static int virLockManagerLockDaemonSetupLockspace(const char *path) VIR_LOCK_SPACE_PROTOCOL_PROC_CREATE_LOCKSPACE, 0, NULL, NULL, NULL, (xdrproc_t)xdr_virLockSpaceProtocolCreateLockSpaceArgs, (char*)&args, - (xdrproc_t)xdr_void, NULL) < 0) { - if (virGetLastErrorCode() == VIR_ERR_OPERATION_INVALID) { - /* The lockspace already exists */ - virResetLastError(); - rv = 0; - } else { - goto cleanup; - } - } + (xdrproc_t)xdr_void, NULL) < 0) + goto cleanup; rv = 0; -- 2.31.1

2 1

[libvirt PATCH] meson: check for `XDR` and `driver_remote` early
by Pavel Hrdina 07 Jul '21

07 Jul '21

We have several other options that depend on result of `driver_remote` option check so we need to do it early to have the result available. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/185 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- meson.build | 65 ++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/meson.build b/meson.build index c95c7f7444..ca4291e37a 100644 --- a/meson.build +++ b/meson.build @@ -848,6 +848,37 @@ foreach name : optional_programs endforeach +# early checks where lot of other packages depend on the result + +# On MinGW portablexdr provides XDR functions, on linux they are +# provided by libtirpc and on FreeBSD/macOS there is no need to +# use extra library as it's provided by libc directly. +if host_machine.system() == 'windows' + xdr_dep = cc.find_library('portablexdr', required: false) +elif host_machine.system() == 'linux' + xdr_dep = dependency('libtirpc', required: false) +elif host_machine.system() in [ 'freebsd', 'darwin' ] + xdr_dep = cc.find_library('c', required: false) +else + xdr_dep = dependency('', required: false) +endif + +if not get_option('driver_remote').disabled() + use_remote = true + + if not xdr_dep.found() + use_remote = false + if get_option('driver_remote').enabled() + error('XDR is required for remote driver') + endif + endif + + if use_remote + conf.set('WITH_REMOTE', 1) + endif +endif + + # generic build dependencies # FIXME rewrite to use dependency() @@ -1005,7 +1036,7 @@ else endif libssh_version = '0.7' -if not get_option('driver_remote').disabled() +if conf.has('WITH_REMOTE') libssh_dep = dependency('libssh', version: '>=' + libssh_version, required: get_option('libssh')) if libssh_dep.found() conf.set('WITH_LIBSSH', 1) @@ -1028,7 +1059,7 @@ else endif libssh2_version = '1.3' -if not get_option('driver_remote').disabled() +if conf.has('WITH_REMOTE') libssh2_dep = dependency('libssh2', version: '>=' + libssh2_version, required: get_option('libssh2')) if libssh2_dep.found() conf.set('WITH_SSH2', 1) @@ -1172,7 +1203,7 @@ if not get_option('sanlock').disabled() endif sasl_version = '2.1.26' -if get_option('driver_remote').enabled() +if conf.has('WITH_REMOTE') sasl_dep = dependency('libsasl2', version: '>=' + sasl_version, required: get_option('sasl')) if sasl_dep.found() conf.set('WITH_SASL', 1) @@ -1280,19 +1311,6 @@ if wireshark_dep.found() endif endif -# On MinGW portablexdr provides XDR functions, on linux they are -# provided by libtirpc and on FreeBSD/macOS there is no need to -# use extra library as it's provided by libc directly. -if host_machine.system() == 'windows' - xdr_dep = cc.find_library('portablexdr', required: false) -elif host_machine.system() == 'linux' - xdr_dep = dependency('libtirpc', required: false) -elif host_machine.system() in [ 'freebsd', 'darwin' ] - xdr_dep = cc.find_library('c', required: false) -else - xdr_dep = dependency('', required: false) -endif - yajl_version = '2.0.3' yajl_dep = dependency('yajl', version: '>=' + yajl_version, required: get_option('yajl')) if yajl_dep.found() @@ -1406,21 +1424,6 @@ endif # build driver options -if not get_option('driver_remote').disabled() - use_remote = true - - if not xdr_dep.found() - use_remote = false - if get_option('driver_remote').enabled() - error('XDR is required for remote driver') - endif - endif - - if use_remote - conf.set('WITH_REMOTE', 1) - endif -endif - remote_default_mode = get_option('remote_default_mode') if remote_default_mode == 'direct' conf.set('REMOTE_DRIVER_AUTOSTART_DIRECT', '1') -- 2.31.1

2 1

[PATCH] virDomainMachineNameAppendValid: Handle special characters better
by Michal Privoznik 07 Jul '21

07 Jul '21

When constructing guest name for machined we have to be very cautious as machined expects a name that's basically a valid URI. Therefore, if there's a dot it has to be followed by a letter or a number. And if there's a sequence of two or more dashes they should be joined into a single dash. These rules are implemented in virDomainMachineNameAppendValid(). There's the @skip variable which is supposed to track whether it is safe to append a dot or a dash into name. However, the variable is set to false (meaning it is safe to append a dot or a dash) even if the current character we are processing is not in the set of allowed characters (and thus skipped over). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1948433 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/hypervisor/domain_driver.c | 8 ++++---- tests/virsystemdtest.c | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c index f7d49bc38a..29e11c0447 100644 --- a/src/hypervisor/domain_driver.c +++ b/src/hypervisor/domain_driver.c @@ -63,18 +63,18 @@ virDomainMachineNameAppendValid(virBuffer *buf, break; if (*name == '.' || *name == '-') { - if (!skip) + if (!skip) { virBufferAddChar(buf, *name); - skip = true; + skip = true; + } continue; } - skip = false; - if (!strchr(HOSTNAME_CHARS, *name)) continue; virBufferAddChar(buf, *name); + skip = false; } /* trailing dashes or dots are not allowed */ diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index f1c9a4ee5f..a09b428a8a 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -736,6 +736,9 @@ mymain(void) TEST_MACHINE("demo.-.test.", NULL, 11, "qemu-11-demo.test"); TEST_MACHINE("demo", "/tmp/root1", 1, "qemu-embed-0991f456-1-demo"); TEST_MACHINE("demo", "/tmp/root2", 1, "qemu-embed-95d47ff5-1-demo"); + TEST_MACHINE("|.-m", NULL, 1, "qemu-1-m"); + TEST_MACHINE("Auto-esx7.0-rhel7.9-special-characters~!@#$%^&*_=+,?><:;|.\"[]()`\\-m", + NULL, 1, "qemu-1-Auto-esx7.0-rhel7.9-special-characters.m"); # define TESTS_PM_SUPPORT_HELPER(name, function) \ do { \ -- 2.31.1

2 1

[PATCH v3 0/6] Support for launchSecurity type s390-pv
by Boris Fiuczynski 07 Jul '21

07 Jul '21

This patch series introduces the launch security type s390-pv. Specifying s390-pv as launch security type in an s390 domain prepares for running the guest in protected virtualization secure mode, also known as IBM Secure Execution. diff to v2: - Broke up previous patch one into three patches diff to v1: - Rebased to current master - Added verification check for confidential-guest-support capability Boris Fiuczynski (6): schemas: Make SEV policy on launch security optional conf: modernize SEV XML parse and format methods conf: refactor launch security to allow more types qemu: add s390-pv-guest capability conf: add s390-pv as launch security type docs: add s390-pv documentation docs/formatdomain.rst | 7 + docs/kbase/s390_protected_virt.rst | 55 ++++++- docs/schemas/domaincommon.rng | 13 +- src/conf/domain_conf.c | 155 +++++++++++------- src/conf/domain_conf.h | 14 +- src/conf/virconftypes.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 70 +++++++- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_firmware.c | 34 ++-- src/qemu/qemu_namespace.c | 21 ++- src/qemu/qemu_process.c | 34 +++- src/qemu/qemu_validate.c | 31 +++- src/security/security_dac.c | 6 +- .../launch-security-s390-pv-ignore-policy.xml | 24 +++ .../launch-security-s390-pv.xml | 18 ++ .../launch-security-s390-pv-ignore-policy.xml | 1 + tests/genericxml2xmltest.c | 2 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + ...ty-s390-pv-ignore-policy.s390x-latest.args | 35 ++++ .../launch-security-s390-pv-ignore-policy.xml | 33 ++++ .../launch-security-s390-pv.s390x-latest.args | 35 ++++ .../launch-security-s390-pv.xml | 30 ++++ ...urity-sev-missing-policy.x86_64-2.12.0.err | 1 + .../launch-security-sev-missing-policy.xml | 34 ++++ tests/qemuxml2argvtest.c | 4 + 28 files changed, 562 insertions(+), 108 deletions(-) create mode 100644 tests/genericxml2xmlindata/launch-security-s390-pv-ignore-policy.xml create mode 100644 tests/genericxml2xmlindata/launch-security-s390-pv.xml create mode 120000 tests/genericxml2xmloutdata/launch-security-s390-pv-ignore-policy.xml create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv-ignore-policy.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv-ignore-policy.xml create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv.xml create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-policy.x86_64-2.12.0.err create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-policy.xml -- 2.30.2

4 23

[PATCH 0/5] Implement some IOThread related APIs for test driver
by Luke Yue 06 Jul '21

06 Jul '21

- Implement virDomainAddIOThread - Implement virDomainDelIOThread - Implement virDomainGetIOThreadInfo - Add tests for these APIs Luke Yue (5): conf: domain: Introduce and use virDomainAddIOThreadCheck() test_driver: Implement virDomainAddIOThread and virDomainDelIOThread conf: domain: Introduce and use virDomainGetIOThreadsConfig() test_driver: Implement virDomainGetIOThreadInfo tests: Test IOThread related functions for test driver examples/xml/test/testdomfc4.xml | 4 + src/conf/domain_conf.c | 126 +++++++++++++++++++++ src/conf/domain_conf.h | 12 ++ src/libvirt_private.syms | 3 + src/qemu/qemu_driver.c | 113 +------------------ src/test/test_driver.c | 186 +++++++++++++++++++++++++++++++ tests/virshtest.c | 40 +++++++ 7 files changed, 376 insertions(+), 108 deletions(-) -- 2.32.0

1 5

[libvirt PATCH 00/10] virHashNew refactorings
by Tim Wiederhake 05 Jul '21

05 Jul '21

"virHashNew" cannot return NULL, yet we check for NULL in various places. This series is the first of several that remove these checks. Where applicable, the functions are refactored to use automatic memory management by means of g_autoptr etc. as well. Tim Wiederhake (10): qemuMonitorGetAllBlockStatsInfo: Clean up line break qemuMonitorGetAllBlockStatsInfo: Remove superfluous variable initialization qemuMonitorGetAllBlockStatsInfo: Assign hash table only on success qemuMonitorGetAllBlockStatsInfo: Use automatic memory management qemuMonitorGetBlockInfo: Remove superfluous variable "ret" qemuMonitorGetBlockInfo: Use automatic memory management qemuMonitorGetBlockInfo: `virHashNew` cannot return NULL qemuMonitorGetChardevInfo: Remove superfluous variable "ret" qemuMonitorGetChardevInfo: Use automatic memory management qemuMonitorGetChardevInfo: `virHashNew` cannot return NULL src/qemu/qemu_monitor.c | 54 ++++++++++++----------------------------- 1 file changed, 16 insertions(+), 38 deletions(-) -- 2.31.1

2 12

crash in virQEMUCapsProbeQMPTPM
by Olaf Hering 05 Jul '21

05 Jul '21

I got a couple of "g_strv_contains: assertion 'strv != NULL' failed" in the past days. It seems qemuMonitorGetTPMModels can write NULL into "models" in "virQEMUCapsProbeQMPTPM()". As a result g_strv_contains will crash with G_DEBUG=fatal-warnings This is libvirt.git#15073504db and qemu.git#13d5f87cc3 Olaf

2 1

[PATCHv2 0/4] Add qemu support setting qos via ovs on ovs interface
by zhangjl02 02 Jul '21

02 Jul '21

--- diff to v1: - move qemuDomainDefIsOvsport from src/qemu/qemu_domain.c to src/conf/domain_conf.c - call virCommandFree(cmd)free cmd before reusing it. - add g_autofree to variables. - reduce usage of virReportError(), and coupled it with return -1. - fix remove port qos error. - optimise code structure. Thanks to Michal Privoznik for helping reviewing these patches. Now libvirt use tc rules to manage interface's qos. But when an interface is created by ovs, there is no qos setting result in ovs database. Therefore, qos of ovs port should be set via ovs management command. We add a function to tell whether a port definition is an ovs managed virtual port. Change default qdisc rules, which return 0 directly if the port is ovs managed(When the ovs port is set noqueue, qos config on this port will not work). Add ovs management function of setting and cleaning qos. Then check if the port is an ovs managed port during its life cycle, and call the ovs management function to set or clean qos settings. zhangjl02 (4): virDomain: interface: add virDomainNetDefIsOvsport virDomain: interface: add virNetDevOpenvswitchInterfaceSetQos and virNetDevOpenvswitchInterfaceClearQos qemu: interface: remove setting noqueue for ovs port qemu: interface: check and use ovs command to set qos of ovs managed port src/conf/domain_conf.c | 8 + src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 3 + src/qemu/qemu_command.c | 10 +- src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_driver.c | 22 ++- src/qemu/qemu_hotplug.c | 39 +++-- src/qemu/qemu_process.c | 10 +- src/util/virnetdevopenvswitch.c | 271 ++++++++++++++++++++++++++++++++ src/util/virnetdevopenvswitch.h | 11 ++ 10 files changed, 362 insertions(+), 17 deletions(-) -- 2.30.2.windows.1

2 9

[libvirt PATCH 0/2] docs: fix imports of new go modules
by Daniel P. Berrangé 02 Jul '21

02 Jul '21

Daniel P. Berrangé (2): docs: point go imports to gitlab.com repos docs: add go-import meta tags for new go modules docs/page.xsl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.31.1

3 5

[libvirt PATCH] docs: Add go-import directive for module-aware packages
by Andrea Bolognani 02 Jul '21

02 Jul '21

This is how Go figures out the location of the git repository containing the actual code for the package. Addresses the following error message: go: libvirt.org/go/libvirt@v1.7005.0: unrecognized import path "libvirt.org/go/libvirt": parse https://libvirt.org/go/libvirt?go-get=1: no go-import meta tags () Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/page.xsl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/page.xsl b/docs/page.xsl index 5cb4322fdc..1786feb51f 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -105,6 +105,12 @@ <xsl:if test="$pagesrc = 'docs/libvirt-go-xml.rst'"> <meta name="go-import" content="libvirt.org/libvirt-go-xml git https://libvirt.org/git/libvirt-go-xml.git"/> </xsl:if> + <xsl:if test="$pagesrc = 'docs/go/libvirt.rst'"> + <meta name="go-import" content="libvirt.org/go/libvirt git https://libvirt.org/git/libvirt-go-module.git"/> + </xsl:if> + <xsl:if test="$pagesrc = 'docs/go/libvirtxml.rst'"> + <meta name="go-import" content="libvirt.org/go/libvirtxml git https://libvirt.org/git/libvirt-go-xml-module.git"/> + </xsl:if> <xsl:apply-templates select="/html:html/html:head/html:script" mode="content"/> <script type="text/javascript" src="{$href_base}js/main.js"> -- 2.31.1

2 2

[PATCH] domstats:add haltpolling time statistic interface
by Yang Fei 02 Jul '21

02 Jul '21

This patch add the ability to statistic the halt polling time when VM execute HLT(arm is WFI). In actual services, the execution of the HLT instruction by the guest is an important cause of virtualization overhead. The halt polling feature is introduced to solve this problem. When a guest idle VM exit occurs, the host continues polling for a period of time to reduce the guest service delay. This mechanism may cause the CPU usage to be 100% when the physical CPU is idle. If the guest service model is woken up at an interval to process a small amount of traffic, and the interval is shorter than kvm halt_poll_ns. The host polls the block time of the entire VM and the CPU usage increases to 100%. The kernel provides the capability of collecting statistics on the halt polling time after v5.8, Introduced by commit <cb953129bfe5c0f2da835a0469930873fb7e71df>. It is rendered in debugfs. Therefore, we can use this kernel feature to provide the halt poll time to the user to obtain a more accurate CPU usage as required. Signed-off-by: Yang Fei <yangfei85(a)huawei.com> --- src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 29 +++++++++++++ src/util/virutil.c | 89 ++++++++++++++++++++++++++++++++++++++++ src/util/virutil.h | 9 ++++ 4 files changed, 129 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 68e4b6aab8..f92213b8c2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3479,6 +3479,8 @@ virDoesUserExist; virDoubleToStr; virFormatIntDecimal; virFormatIntPretty; +virGetCpuHaltPollTime; +virGetDebugFsKvmValue; virGetDeviceID; virGetDeviceUnprivSGIO; virGetGroupID; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 235f575901..3a2b530ecf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17812,6 +17812,32 @@ qemuDomainGetStatsCpuCache(virQEMUDriver *driver, return ret; } +#ifdef __linux__ +static int +qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom, + virTypedParamList *params) +{ + unsigned long long haltPollSuccess = 0; + unsigned long long haltPollFail = 0; + pid_t pid = dom->pid; + + if (virGetCpuHaltPollTime(pid, &haltPollSuccess, &haltPollFail) != 0) + return -1; + if (virTypedParamListAddULLong(params, haltPollSuccess, "haltpollsuccess.time") < 0) + return -1; + if (virTypedParamListAddULLong(params, haltPollFail, "haltpollfail.time") < 0) + return -1; + + return 0; +} +#else +static int +qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom, + virTypedParamList *params) +{ + return -1; +} +#endif static int qemuDomainGetStatsCpuCgroup(virDomainObj *dom, @@ -17852,6 +17878,9 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver, if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0) return -1; + if (qemuDomainGetStatsCpuHaltPollTime(dom, params) < 0) + return -1; + return 0; } diff --git a/src/util/virutil.c b/src/util/virutil.c index 311cbbf93a..8715deaca5 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1936,3 +1936,92 @@ virPipeNonBlock(int fds[2]) { return virPipeImpl(fds, true, true); } + +int +virGetDebugFsKvmValue(struct dirent *ent, + const char *path, + const char *filename, + unsigned long long *value) +{ + g_autofree char *valToStr = NULL; + g_autofree char *valPath = NULL; + int rc = -1; + int ret = -1; + + valPath = g_strdup_printf("%s/%s/%s", path, ent->d_name, filename); + + if ((rc = virFileReadAll(valPath, 16, &valToStr)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to read from '%s'"), valPath); + goto cleanup; + } + + /* Terminated with '\n' has sometimes harmful effects to the caller */ + if (rc > 0 && (valToStr)[rc - 1] == '\n') + (valToStr)[rc - 1] = '\0'; + + /* 10 is a Cardinality, must be between 2 and 36 inclusive, + * or special value 0. Used in fuction strtoull() + */ + if (virStrToLong_ull(valToStr, NULL, 10, value) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to parse '%s' as an integer"), valToStr); + goto cleanup; + } + + ret = 0; +cleanup: + return ret; +} + +int +virGetCpuHaltPollTime(pid_t pid, + unsigned long long *haltPollSuccess, + unsigned long long *haltPollFail) +{ + g_autofree char *pidToStr = NULL; + g_autofree char *debugFsPath = NULL; + g_autofree char *completePath = NULL; + struct dirent *ent = NULL; + DIR *dir = NULL; + int ret = -1; + int flag = 0; + + if (!(debugFsPath = virFileFindMountPoint("debugfs"))) { + virReportSystemError(errno, "%s", + _("unable to find debugfs mountpoint")); + goto cleanup; + } + + completePath = g_strdup_printf("%s/%s", debugFsPath, "kvm"); + if (virDirOpen(&dir, completePath) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s %s", "Can not open directory", completePath); + return ret; + } + + pidToStr = g_strdup_printf("%d", pid); + while (virDirRead(dir, &ent, NULL) > 0) { + if (strncmp(ent->d_name, pidToStr, strlen(pidToStr)) == 0 && + ent->d_name[strlen(pidToStr)] == '-') { + flag = 1; + break; + } + } + + if (flag == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find VM(Pid %s) in '%s'"), pidToStr, completePath); + goto cleanup; + } + + if (virGetDebugFsKvmValue(ent, completePath, "halt_poll_success_ns", haltPollSuccess) < 0 || + virGetDebugFsKvmValue(ent, completePath, "halt_poll_fail_ns", haltPollFail) < 0) { + goto cleanup; + } + + ret = 0; +cleanup: + closedir(dir); + return ret; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 854b494890..b3c1e8a0bc 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -225,3 +225,12 @@ int virPipeQuiet(int fds[2]); * Returns: -1 on error, 0 on success */ int virPipeNonBlock(int fds[2]); + +int virGetDebugFsKvmValue(struct dirent *ent, + const char *path, + const char *filename, + unsigned long long *value); + +int virGetCpuHaltPollTime(pid_t pid, + unsigned long long *haltPollSuccess, + unsigned long long *haltPollFail); -- 2.23.0

2 2

[PATCH 0/3] Threshold event improvements
by Peter Krempa 02 Jul '21

02 Jul '21

Peter Krempa (3): storage_source: Add flag storing whether threshold event was registered with index qemu: Prevent two threshold events when it was registered with index virDomainSetBlockThreshold: Document that two events are fired when index isn't used src/conf/storage_source_conf.h | 5 +++++ src/libvirt-domain.c | 4 ++++ src/qemu/qemu_domain.c | 8 ++++++++ src/qemu/qemu_driver.c | 4 ++++ src/qemu/qemu_process.c | 3 ++- tests/qemustatusxml2xmldata/modern-in.xml | 1 + 6 files changed, 24 insertions(+), 1 deletion(-) -- 2.31.1

2 4

[PATCH libvirt v1] conf: verify for duplicate hostdevs
by Shalini Chellathurai Saroja 02 Jul '21

02 Jul '21

It is possible to define/edit(in shut off state) a domain XML with same hostdev device repeated more than once, as shown below. This behavior is not expected. So, this patch fixes it. vser1: <domain type='kvm'> [...] <devices> [...] <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ccw'> <source> <address uuid='8e782fea-e5f4-45fa-a0f9-024cf66e5009'/> </source> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0005'/> </hostdev> <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ccw'> <source> <address uuid='8e782fea-e5f4-45fa-a0f9-024cf66e5009'/> </source> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0006'/> </hostdev> [...] </devices> </domain> $ virsh define vser1 Domain 'vser1' defined from vser1 Signed-off-by: Shalini Chellathurai Saroja <shalini(a)linux.ibm.com> Reviewed-by: Bjoern Walk <bwalk(a)linux.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 2 + src/conf/domain_validate.c | 21 ++++++++++ src/libvirt_private.syms | 1 + .../hostdev-mdev-duplicate.err | 1 + .../hostdev-mdev-duplicate.xml | 41 +++++++++++++++++++ .../hostdev-pci-duplicate.err | 1 + .../hostdev-pci-duplicate.xml | 40 ++++++++++++++++++ .../hostdev-scsi-duplicate.err | 1 + .../hostdev-scsi-duplicate.xml | 40 ++++++++++++++++++ .../hostdev-usb-duplicate.err | 1 + .../hostdev-usb-duplicate.xml | 40 ++++++++++++++++++ tests/qemuxml2argvtest.c | 8 ++++ 13 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-duplicate.err create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-pci-duplicate.err create mode 100644 tests/qemuxml2argvdata/hostdev-pci-duplicate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-duplicate.err create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-usb-duplicate.err create mode 100644 tests/qemuxml2argvdata/hostdev-usb-duplicate.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f65509d8..5746f69e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15369,7 +15369,7 @@ virDomainHostdevMatchCaps(virDomainHostdevDef *a, } -static int +int virDomainHostdevMatch(virDomainHostdevDef *a, virDomainHostdevDef *b) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f706c498..4d9d499b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3590,6 +3590,8 @@ virDomainHostdevDef * virDomainHostdevRemove(virDomainDef *def, size_t i); int virDomainHostdevFind(virDomainDef *def, virDomainHostdevDef *match, virDomainHostdevDef **found); +int virDomainHostdevMatch(virDomainHostdevDef *a, + virDomainHostdevDef *b); virDomainGraphicsListenDef * virDomainGraphicsGetListen(virDomainGraphicsDef *def, size_t i); diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 2124d25d..df2ab473 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1068,7 +1068,25 @@ virDomainDefDuplicateDiskInfoValidate(const virDomainDef *def) return 0; } +static int +virDomainDefDuplicateHostdevInfoValidate(const virDomainDef *def) +{ + size_t i; + size_t j; + for (i = 0; i < def->nhostdevs; i++) { + for (j = i + 1; j < def->nhostdevs; j++) { + if (virDomainHostdevMatch(def->hostdevs[i], + def->hostdevs[j])) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Hostdev already exists in the domain configuration")); + return -1; + } + } + } + + return 0; +} /** * virDomainDefDuplicateDriveAddressesValidate: @@ -1529,6 +1547,9 @@ virDomainDefValidateInternal(const virDomainDef *def, if (virDomainDefDuplicateDiskInfoValidate(def) < 0) return -1; + if (virDomainDefDuplicateHostdevInfoValidate(def) < 0) + return -1; + if (virDomainDefDuplicateDriveAddressesValidate(def) < 0) return -1; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2efa7876..f0d1b7b4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -457,6 +457,7 @@ virDomainHostdevDefFree; virDomainHostdevDefNew; virDomainHostdevFind; virDomainHostdevInsert; +virDomainHostdevMatch; virDomainHostdevModeTypeToString; virDomainHostdevRemove; virDomainHostdevSubsysPCIBackendTypeToString; diff --git a/tests/qemuxml2argvdata/hostdev-mdev-duplicate.err b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.err new file mode 100644 index 00000000..590afd30 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.err @@ -0,0 +1 @@ +XML error: Hostdev already exists in the domain configuration diff --git a/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml new file mode 100644 index 00000000..1c5e3263 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i386</emulator> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-pci'> + <source> + <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/> + </source> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </hostdev> + <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-pci'> + <source> + <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/> + </source> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/> + </hostdev> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/hostdev-pci-duplicate.err b/tests/qemuxml2argvdata/hostdev-pci-duplicate.err new file mode 100644 index 00000000..590afd30 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-pci-duplicate.err @@ -0,0 +1 @@ +XML error: Hostdev already exists in the domain configuration diff --git a/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml b/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml new file mode 100644 index 00000000..c744fddf --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml @@ -0,0 +1,40 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i386</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <hostdev mode='subsystem' type='pci' managed='yes'> + <source> + <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='pci' managed='yes'> + <source> + <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> + </source> + </hostdev> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-duplicate.err b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.err new file mode 100644 index 00000000..590afd30 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.err @@ -0,0 +1 @@ +XML error: Hostdev already exists in the domain configuration diff --git a/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml new file mode 100644 index 00000000..ea367de3 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml @@ -0,0 +1,40 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i386</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host0'/> + <address bus='0' target='0' unit='0'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host0'/> + <address bus='0' target='0' unit='0'/> + </source> + </hostdev> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/hostdev-usb-duplicate.err b/tests/qemuxml2argvdata/hostdev-usb-duplicate.err new file mode 100644 index 00000000..590afd30 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-usb-duplicate.err @@ -0,0 +1 @@ +XML error: Hostdev already exists in the domain configuration diff --git a/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml b/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml new file mode 100644 index 00000000..533a9059 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml @@ -0,0 +1,40 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i386</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <hostdev mode='subsystem' type='usb' managed='no'> + <source> + <address bus='14' device='6'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='usb' managed='no'> + <source> + <address bus='14' device='6'/> + </source> + </hostdev> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7fed871c..b9f96532 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1915,8 +1915,11 @@ mymain(void) DO_TEST("hostdev-usb-address", NONE); DO_TEST("hostdev-usb-address-device", NONE); DO_TEST("hostdev-usb-address-device-boot", NONE); + DO_TEST_PARSE_ERROR("hostdev-usb-duplicate", NONE); DO_TEST("hostdev-pci-address", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-pci-address-device", QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST_PARSE_ERROR("hostdev-pci-duplicate", + QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-vfio-multidomain", @@ -1927,6 +1930,8 @@ mymain(void) QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address", QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST_PARSE_ERROR("hostdev-mdev-duplicate", + QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-opengl"); DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-egl-headless"); DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc"); @@ -2856,6 +2861,9 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY); + DO_TEST_PARSE_ERROR("hostdev-scsi-duplicate", + QEMU_CAPS_VIRTIO_SCSI, + QEMU_CAPS_DEVICE_VHOST_SCSI); DO_TEST_CAPS_VER("mlock-on", "3.0.0"); DO_TEST_CAPS_VER("mlock-off", "3.0.0"); -- 2.30.2

2 5

[libvirt PATCH v2 0/5] mdev tweaks
by Jonathon Jongsma 01 Jul '21

01 Jul '21

A few minor fixes to mdev support in the nodedev driver Changes in v2: - split out the error-reporting macro into a separate commit as recommended by Peter - Since virCommandRun() may report an error, ensure that the virMdevctl$COMMAND() functions always set an error to make error-handling consistent. v1 tried to return an error message and have the caller report the error. - Added a new patch (destroying inactive device) Jonathon Jongsma (5): nodedev: Remove useless device name from error message nodedev: Handle NULL command variable nodedev: add macro to handle command errors nodedev: handle mdevctl errors consistently nodedev: improve error message when destroying an inactive device src/node_device/node_device_driver.c | 147 +++++++++++++++++---------- 1 file changed, 94 insertions(+), 53 deletions(-) -- 2.31.1

3 13

[libvirt PATCH] nodedev: handle mdevs from multiple parents
by Jonathon Jongsma 01 Jul '21

01 Jul '21

Due to a rather unfortunate misunderstanding, we were parsing the list of defined devices from mdevctl incorrectly. Since my primary development machine only has a single device capable of mdevs, I apparently neglected to test multiple parent devices and made some assumptions based on reading the mdevctl code. These assumptions turned out to be incorrect, so the parsing failed when devices from more than one parent device were returned. The details: mdevctl returns an array of objects representing the defined devices. But instead of an array of multiple objects (with each object representing a parent device), the array always contains only a single object. That object has a separate property for each parent device. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/node_device/node_device_driver.c | 41 ++++++++++--------- .../mdevctl-list-multiple.json | 4 +- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 8a0a2c3847..cb2c3ceaa4 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1056,6 +1056,7 @@ nodeDeviceParseMdevctlJSON(const char *jsonstring, size_t noutdevs = 0; size_t i; size_t j; + virJSONValue *obj; json_devicelist = virJSONValueFromString(jsonstring); @@ -1065,31 +1066,33 @@ nodeDeviceParseMdevctlJSON(const char *jsonstring, goto error; } - n = virJSONValueArraySize(json_devicelist); + /* mdevctl list --dumpjson produces an output that is an array that + * contains only a single object which contains a property for each parent + * device */ + if (virJSONValueArraySize(json_devicelist) != 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unexpected format for mdevctl response")); + goto error; + } + + obj = virJSONValueArrayGet(json_devicelist, 0); + + if (!virJSONValueIsObject(obj)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("device list is not an object")); + goto error; + } + n = virJSONValueObjectKeysNumber(obj); for (i = 0; i < n; i++) { - virJSONValue *obj = virJSONValueArrayGet(json_devicelist, i); const char *parent; virJSONValue *child_array; int nchildren; - if (!virJSONValueIsObject(obj)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Parent device is not an object")); - goto error; - } - - /* mdevctl returns an array of objects. Each object is a parent device - * object containing a single key-value pair which maps from the name - * of the parent device to an array of child devices */ - if (virJSONValueObjectKeysNumber(obj) != 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpected format for parent device object")); - goto error; - } - - parent = virJSONValueObjectGetKey(obj, 0); - child_array = virJSONValueObjectGetValue(obj, 0); + /* The key of each object property is the name of a parent device + * which maps to an array of child devices */ + parent = virJSONValueObjectGetKey(obj, i); + child_array = virJSONValueObjectGetValue(obj, i); if (!virJSONValueIsArray(child_array)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/tests/nodedevmdevctldata/mdevctl-list-multiple.json b/tests/nodedevmdevctldata/mdevctl-list-multiple.json index eefcd90c62..ca1918d00a 100644 --- a/tests/nodedevmdevctldata/mdevctl-list-multiple.json +++ b/tests/nodedevmdevctldata/mdevctl-list-multiple.json @@ -24,9 +24,7 @@ ] } } - ] - }, - { + ], "matrix": [ { "783e6dbb-ea0e-411f-94e2-717eaad438bf": { "mdev_type": "vfio_ap-passthrough", -- 2.31.1

2 3

[libvirt PATCH] NEWS: Fix spacing between releases
by Andrea Bolognani 01 Jul '21

01 Jul '21

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- NEWS.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 552f845211..2536955a4a 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -90,6 +90,7 @@ v7.4.0 (2021-06-01) Having a 0 offset so that the size of the image can be limited is a valid configuration so it was allowed in the XML schema. + v7.3.0 (2021-05-03) =================== @@ -189,6 +190,7 @@ v7.3.0 (2021-05-03) properly when a connection URI or read only flag were specified on ``virsh`` or ``virt-admin`` command line. + v7.2.0 (2021-04-01) =================== -- 2.31.1

1 1

Release of libvirt-7.5.0
by Jiri Denemark 01 Jul '21

01 Jul '21

The 7.5.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://libvirt.org/sources/ https://libvirt.org/sources/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing any other feedback. Your work is greatly appreciated. * Security * svirt: fix MCS label generation (CVE-2021-3631) A flaw in the way MCS labels were generated could result in a VM's resource not being fully protected from access by another VM were it to be compromised. https://gitlab.com/libvirt/libvirt/-/issues/153 * Removed features * xen: Remove support for Xen < 4.9 In accordance with our platform support policy, the oldest supported Xen version is now bumped from 4.6 to 4.9. * Improvements * docs: Document disk serial truncation status quo Disk ``<serial>`` is being truncated by QEMU before passed to the guest. Since it's impossible to fix it without running into further regressions the documentation was improved to document the intricacies. * Bug fixes * qemu: Fixed validation of disk ``iothread`` configuration The validation of ``iothread`` config was previously moved to a place where it caused bogus errors when address wasn't allocated when hotplugging a disk. The check is now removed as it wasn't actually necessary at all. Enjoy. Jirka

1 0

[PATCH] Add news item for sVirt CVE fix
by Daniel P. Berrangé 01 Jul '21

01 Jul '21

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- NEWS.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 935b0d0aad..3297560941 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -11,6 +11,14 @@ For a more fine-grained view, use the `git log`_. v7.5.0 (unreleased) =================== +* **Security fixes** + + * svirt: fix MCS label generation (CVE-2021-3631) + + A flaw in the way MCS labels were generated could result in a VM's + resource not being fully protected from access by another VM were + it to be compromised. https://gitlab.com/libvirt/libvirt/-/issues/153 + * **Removed features** * xen: Remove support for Xen < 4.9 -- 2.31.1

2 1

[PATCH] qemu: code protection for qemuBlockJobEventProcessLegacy
by huangy81＠chinatelecom.cn 01 Jul '21

01 Jul '21

From: Chongyun Wu <wucy11(a)chinatelecom.cn> pointer disk might be null in some special cases or new usage scenarios, therefore code protection is needed to prevent segment faults. Signed-off-by: Chongyun Wu <wucy11(a)chinatelecom.cn> --- src/qemu/qemu_blockjob.c | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index faf9a9f..00506b9 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -781,12 +781,13 @@ qemuBlockJobEventProcessLegacy(virQEMUDriver *driver, { virDomainDiskDef *disk = job->disk; - VIR_DEBUG("disk=%s, mirrorState=%s, type=%d, state=%d, newstate=%d", - disk->dst, - NULLSTR(virDomainDiskMirrorStateTypeToString(disk->mirrorState)), - job->type, - job->state, - job->newstate); + if (disk) + VIR_DEBUG("disk=%s, mirrorState=%s, type=%d, state=%d, newstate=%d", + disk->dst, + NULLSTR(virDomainDiskMirrorStateTypeToString(disk->mirrorState)), + job->type, + job->state, + job->newstate); if (job->newstate == -1) return; @@ -804,26 +805,30 @@ qemuBlockJobEventProcessLegacy(virQEMUDriver *driver, break; case VIR_DOMAIN_BLOCK_JOB_READY: - disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_READY; - qemuDomainSaveStatus(vm); + if (disk) { + disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_READY; + qemuDomainSaveStatus(vm); + } break; case VIR_DOMAIN_BLOCK_JOB_FAILED: case VIR_DOMAIN_BLOCK_JOB_CANCELED: - if (disk->mirror) { - virDomainLockImageDetach(driver->lockManager, vm, disk->mirror); + if (disk) { + if (disk->mirror) { + virDomainLockImageDetach(driver->lockManager, vm, disk->mirror); - /* Ideally, we would restore seclabels on the backing chain here - * but we don't know if somebody else is not using parts of it. - * Remove security driver metadata so that they are not leaked. */ - qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirror); + /* Ideally, we would restore seclabels on the backing chain here + * but we don't know if somebody else is not using parts of it. + * Remove security driver metadata so that they are not leaked. */ + qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirror); - virObjectUnref(disk->mirror); - disk->mirror = NULL; + virObjectUnref(disk->mirror); + disk->mirror = NULL; + } + disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE; + disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN; + qemuBlockJobUnregister(job, vm); } - disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE; - disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN; - qemuBlockJobUnregister(job, vm); break; case VIR_DOMAIN_BLOCK_JOB_LAST: -- 1.8.3.1

3 3

Avoiding lockspace already exists error from virtlockd
by Jim Fehlig 01 Jul '21

01 Jul '21

Hi All! I received a bug report about virtlockd emitting an error whenever libvirtd is (re)started May 25 15:44:31 virt81 virtlockd[7723]: Requested operation is not valid: Lockspace for path /data/libvirtd/lockspace already exists The problem is easily reproducible with git master by enabling lockd in qemu.conf, setting file_lockspace_dir in qemu-lockd.conf, then restarting libvirtd. If I understand the code correctly, when the qemu driver loads, it calls virLockManagerPluginNew, which dlopens lockd.so and calls drvInit, aka virLockManagerLockDaemonInit. Here the driver object is created, config loaded, and virLockManagerLockDaemonSetupLockspace is called. virLockManagerLockDaemonSetupLockspace sends virLockSpaceProtocolCreateLockSpaceArgs rpc to virtlockd, where it is dispatched to virLockSpaceProtocolDispatchCreateLockSpace. Alas we encounter the error when virLockDaemonFindLockSpace finds the existing lockspace. I'm not really sure how to go about fixing it and fishing for opinions. virLockManagerLockDaemonSetupLockspace already has some code to handle the error https://gitlab.com/libvirt/libvirt/-/blob/master/src/locking/lock_driver_lo… Since libvirtd ignores VIR_ERR_OPERATION_INVALID, should virtlockd be changed to not return error in that case? It would be better if libvirtd knew it already told virtlockd to configure the lockspace and avoid needlessly doing it again. BTW, this cosmetic problem is exasperated by the default '--timeout 120' option to libvirtd, since it results in more daemon restarts. Thanks for any suggestions! Jim

2 2

[libvirt PATCH v2] security: fix SELinux label generation logic
by Daniel P. Berrangé 30 Jun '21

30 Jun '21

A process can access a file if the set of MCS categories for the file is equal-to *or* a subset-of, the set of MCS categories for the process. If there are two VMs: a) svirt_t:s0:c117 b) svirt_t:s0:c117,c720 Then VM (b) is able to access files labelled for VM (a). IOW, we must discard case where the categories are equal because that is a subset of many other valid category pairs. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/153 CVE-2021-3631 Reviewed-by: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed to git, just publishing v2 to show the CVE allocation for the historical record. src/security/security_selinux.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index b50f4463cc..0c2cf1d1c7 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -383,7 +383,15 @@ virSecuritySELinuxMCSFind(virSecurityManager *mgr, VIR_DEBUG("Try cat %s:c%d,c%d", sens, c1 + catMin, c2 + catMin); if (c1 == c2) { - mcs = g_strdup_printf("%s:c%d", sens, catMin + c1); + /* + * A process can access a file if the set of MCS categories + * for the file is equal-to *or* a subset-of, the set of + * MCS categories for the process. + * + * IOW, we must discard case where the categories are equal + * because that is a subset of other category pairs. + */ + continue; } else { if (c1 > c2) { int t = c1; -- 2.31.1

1 0

[libvirt PATCH] security: fix SELinux label generation logic
by Daniel P. Berrangé 30 Jun '21

30 Jun '21

A process can access a file if the set of MCS categories for the file is equal-to *or* a subset-of, the set of MCS categories for the process. If there are two VMs: a) svirt_t:s0:c117 b) svirt_t:s0:c117,c720 Then VM (b) is able to access files labelled for VM (a). IOW, we must discard case where the categories are equal because that is a subset of many other valid category pairs. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/153 CVE-2021-xxxx - tbd before pushing Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/security/security_selinux.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index b50f4463cc..c98dab0d6f 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -383,7 +383,15 @@ virSecuritySELinuxMCSFind(virSecurityManager *mgr, VIR_DEBUG("Try cat %s:c%d,c%d", sens, c1 + catMin, c2 + catMin); if (c1 == c2) { - mcs = g_strdup_printf("%s:c%d", sens, catMin + c1); + /* + * A process can access a file if the set of MCS categories + * for the file is equal-to *or* a subset-of, the set of + * MCS categories for the process. + * + * IOW, we must discard case where the categories are equal + * because that is a subset of other category pairs. + */ + continue } else { if (c1 > c2) { int t = c1; -- 2.31.1

2 3

[PATCH] ui: Mark the '-no-quit' option as deprecated
by Thomas Huth 30 Jun '21

30 Jun '21

It's just a cumbersome wrapper around the -display ...,window_close=off parameter, so we should rather tell our users to use that instead. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- docs/system/deprecated.rst | 6 ++++++ qemu-options.hx | 5 +++-- softmmu/vl.c | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index e2e0090878..c76da98761 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -126,6 +126,12 @@ other options have been processed. This will either have no effect (if if they were not given. The property is therefore useless and should not be specified. +``-no-quit`` (since 6.1.0) +'''''''''''''''''''''''''' + +The ``-no-quit`` is a synonym for ``-display ...,window_close=off`` which +should be used instead. + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/qemu-options.hx b/qemu-options.hx index ba3ca9da1d..9fdd823c1b 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1910,10 +1910,11 @@ SRST ERST DEF("no-quit", 0, QEMU_OPTION_no_quit, - "-no-quit disable SDL window close capability\n", QEMU_ARCH_ALL) + "-no-quit disable SDL window close capability (deprecated)\n", QEMU_ARCH_ALL) SRST ``-no-quit`` - Disable SDL window close capability. + Disable SDL window close capability. This option is deprecated, please + use ``-display ...,window_close=off`` instead. ERST DEF("sdl", 0, QEMU_OPTION_sdl, diff --git a/softmmu/vl.c b/softmmu/vl.c index cee6339580..3f79b9c8a3 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3232,6 +3232,8 @@ void qemu_init(int argc, char **argv, char **envp) case QEMU_OPTION_no_quit: dpy.has_window_close = true; dpy.window_close = false; + warn_report("-no-quit is deprecated, please use " + "-display ...,window_close=off instead."); break; case QEMU_OPTION_sdl: #ifdef CONFIG_SDL -- 2.27.0

3 5

[PATCH] docs: formatdomain: Document disk serial truncation status quo
by Peter Krempa 30 Jun '21

30 Jun '21

Disk serials are truncated arbitrarily and silently by qemu depending on the device type and how they are configured. Since changing the current state would lead to more regressions than we have now, document that the truncation is arbitrary. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/formatdomain.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index aa7bb8da14..3ee537da14 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3146,6 +3146,16 @@ paravirtualized driver is specified via the ``disk`` element. may look like ``<serial>WD-WMAP9A966149</serial>``. Not supported for scsi-block devices, that is those using disk ``type`` 'block' using ``device`` 'lun' on ``bus`` 'scsi'. :since:`Since 0.7.1` + + Note that depending on hypervisor and device type the serial number may be + truncated silently. IDE/SATA devices are commonly limited to 20 characters. + SCSI devices depending on hypervisor version are limited to 20, 36 or 247 + characters. + + Hypervisors may also start rejecting overly long serials instead of + truncating them in the future so it's advised to avoid the implicit + truncation by testing the desired serial length range with the desired device + and hypervisor combination. ``wwn`` If present, this element specifies the WWN (World Wide Name) of a virtual hard disk or CD-ROM drive. It must be composed of 16 hexadecimal digits. -- 2.31.1

3 5

[libvirt PATCH 0/5] qemu: Fix defaults for TPM on ARM virt guests
by Andrea Bolognani 30 Jun '21

30 Jun '21

The current default is unfortunately broken, and the user has to manually step in and provide the version number explicitly for the TPM device to work at all. https://bugzilla.redhat.com/show_bug.cgi?id=1970310 Andrea Bolognani (5): docs: Fix information for default TPM version tests: Add aarch64-tpm test to qemuxml2xml qemu: Default to TPM 2.0 for ARM virt guests tests: Test the defaults for TPM on ARM virt guests qemu: Reject TPM 1.2 for ARM virt guests docs/formatdomain.rst | 9 ++++-- src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_validate.c | 6 ++++ .../aarch64-tpm-wrong-model.err | 1 + ...64-tpm.xml => aarch64-tpm-wrong-model.xml} | 2 +- tests/qemuxml2argvdata/aarch64-tpm.xml | 4 +-- tests/qemuxml2argvtest.c | 1 + .../aarch64-tpm.aarch64-latest.xml | 29 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 9 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/aarch64-tpm-wrong-model.err copy tests/qemuxml2argvdata/{aarch64-tpm.xml => aarch64-tpm-wrong-model.xml} (88%) create mode 100644 tests/qemuxml2xmloutdata/aarch64-tpm.aarch64-latest.xml -- 2.31.1

3 10