- Devel - libvirt List Archives

[libvirt PATCH] ci: Refresh and add Fedora 37 target
by Erik Skultety 09 Jan '23

09 Jan '23

This patch pulls in latest lcitool changes mainly though moves onto Fedora 37 over Fedora 35 which is dropped. Test pipeline (ignore non-Fedora 37 stuff): https://gitlab.com/eskultety/libvirt/-/pipelines/741518165 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- ...-mingw32.sh => fedora-37-cross-mingw32.sh} | 0 ...-mingw64.sh => fedora-37-cross-mingw64.sh} | 0 ci/buildenv/{fedora-35.sh => fedora-37.sh} | 1 - ci/cirrus/macos-12.vars | 10 +- ...ile => fedora-37-cross-mingw32.Dockerfile} | 2 +- ...ile => fedora-37-cross-mingw64.Dockerfile} | 2 +- ...ora-35.Dockerfile => fedora-37.Dockerfile} | 3 +- ci/gitlab/builds.yml | 76 ++++++------- ci/gitlab/containers.yml | 22 ++-- ci/integration.yml | 104 +++++++++--------- ci/manifest.yml | 16 +-- 11 files changed, 117 insertions(+), 119 deletions(-) rename ci/buildenv/{fedora-36-cross-mingw32.sh => fedora-37-cross-mingw32.sh} (100%) rename ci/buildenv/{fedora-36-cross-mingw64.sh => fedora-37-cross-mingw64.sh} (100%) rename ci/buildenv/{fedora-35.sh => fedora-37.sh} (99%) rename ci/containers/{fedora-36-cross-mingw32.Dockerfile => fedora-37-cross-mingw32.Dockerfile} (98%) rename ci/containers/{fedora-36-cross-mingw64.Dockerfile => fedora-37-cross-mingw64.Dockerfile} (98%) rename ci/containers/{fedora-35.Dockerfile => fedora-37.Dockerfile} (97%) diff --git a/ci/buildenv/fedora-36-cross-mingw32.sh b/ci/buildenv/fedora-37-cross-mingw32.sh similarity index 100% rename from ci/buildenv/fedora-36-cross-mingw32.sh rename to ci/buildenv/fedora-37-cross-mingw32.sh diff --git a/ci/buildenv/fedora-36-cross-mingw64.sh b/ci/buildenv/fedora-37-cross-mingw64.sh similarity index 100% rename from ci/buildenv/fedora-36-cross-mingw64.sh rename to ci/buildenv/fedora-37-cross-mingw64.sh diff --git a/ci/buildenv/fedora-35.sh b/ci/buildenv/fedora-37.sh similarity index 99% rename from ci/buildenv/fedora-35.sh rename to ci/buildenv/fedora-37.sh index 2ee8c901e5..23886ae77c 100644 --- a/ci/buildenv/fedora-35.sh +++ b/ci/buildenv/fedora-37.sh @@ -58,7 +58,6 @@ function install_buildenv() { lvm2 \ make \ meson \ - netcf-devel \ nfs-utils \ ninja-build \ numactl-devel \ diff --git a/ci/cirrus/macos-12.vars b/ci/cirrus/macos-12.vars index a5afb4eb4d..8ecc9c4450 100644 --- a/ci/cirrus/macos-12.vars +++ b/ci/cirrus/macos-12.vars @@ -4,13 +4,13 @@ # # https://gitlab.com/libvirt/libvirt-ci -CCACHE='/usr/local/bin/ccache' +CCACHE='/opt/homebrew/bin/ccache' CPAN_PKGS='' CROSS_PKGS='' -MAKE='/usr/local/bin/gmake' -NINJA='/usr/local/bin/ninja' +MAKE='/opt/homebrew/bin/gmake' +NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' -PIP3='/usr/local/bin/pip3' +PIP3='/opt/homebrew/bin/pip3' PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl' PYPI_PKGS='' -PYTHON='/usr/local/bin/python3' +PYTHON='/opt/homebrew/bin/python3' diff --git a/ci/containers/fedora-36-cross-mingw32.Dockerfile b/ci/containers/fedora-37-cross-mingw32.Dockerfile similarity index 98% rename from ci/containers/fedora-36-cross-mingw32.Dockerfile rename to ci/containers/fedora-37-cross-mingw32.Dockerfile index 24b2760c18..14fb25a17e 100644 --- a/ci/containers/fedora-36-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-37-cross-mingw32.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:36 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/ci/containers/fedora-36-cross-mingw64.Dockerfile b/ci/containers/fedora-37-cross-mingw64.Dockerfile similarity index 98% rename from ci/containers/fedora-36-cross-mingw64.Dockerfile rename to ci/containers/fedora-37-cross-mingw64.Dockerfile index a3369209da..c468dd7a6c 100644 --- a/ci/containers/fedora-36-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-37-cross-mingw64.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:36 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/ci/containers/fedora-35.Dockerfile b/ci/containers/fedora-37.Dockerfile similarity index 97% rename from ci/containers/fedora-35.Dockerfile rename to ci/containers/fedora-37.Dockerfile index f517cf9443..17f586af59 100644 --- a/ci/containers/fedora-35.Dockerfile +++ b/ci/containers/fedora-37.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ @@ -69,7 +69,6 @@ exec "$@"' > /usr/bin/nosync && \ lvm2 \ make \ meson \ - netcf-devel \ nfs-utils \ ninja-build \ numactl-devel \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 0e2daebe97..89c15fa28d 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -193,32 +193,6 @@ x86_64-debian-sid-local-env: NAME: debian-sid -x86_64-fedora-35-prebuilt-env: - extends: .native_build_job_prebuilt_env - needs: - - job: x86_64-fedora-35-container - optional: true - allow_failure: false - variables: - NAME: fedora-35 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - -x86_64-fedora-35-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: registry.fedoraproject.org/fedora:35 - NAME: fedora-35 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - - x86_64-fedora-36-prebuilt-env: extends: .native_build_job_prebuilt_env needs: @@ -245,6 +219,32 @@ x86_64-fedora-36-local-env: - libvirt-rpms +x86_64-fedora-37-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-fedora-37-container + optional: true + allow_failure: false + variables: + NAME: fedora-37 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + +x86_64-fedora-37-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: registry.fedoraproject.org/fedora:37 + NAME: fedora-37 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + + x86_64-fedora-rawhide-prebuilt-env: extends: .native_build_job_prebuilt_env needs: @@ -746,46 +746,46 @@ s390x-debian-sid-local-env: NAME: debian-sid -mingw32-fedora-36-prebuilt-env: +mingw32-fedora-37-prebuilt-env: extends: .cross_build_job_prebuilt_env needs: - - job: mingw32-fedora-36-container + - job: mingw32-fedora-37-container optional: true allow_failure: false variables: CROSS: mingw32 JOB_OPTIONAL: 1 - NAME: fedora-36 + NAME: fedora-37 -mingw32-fedora-36-local-env: +mingw32-fedora-37-local-env: extends: .cross_build_job_local_env needs: [] allow_failure: false variables: CROSS: mingw32 - IMAGE: registry.fedoraproject.org/fedora:36 + IMAGE: registry.fedoraproject.org/fedora:37 JOB_OPTIONAL: 1 - NAME: fedora-36 + NAME: fedora-37 -mingw64-fedora-36-prebuilt-env: +mingw64-fedora-37-prebuilt-env: extends: .cross_build_job_prebuilt_env needs: - - job: mingw64-fedora-36-container + - job: mingw64-fedora-37-container optional: true allow_failure: false variables: CROSS: mingw64 - NAME: fedora-36 + NAME: fedora-37 -mingw64-fedora-36-local-env: +mingw64-fedora-37-local-env: extends: .cross_build_job_local_env needs: [] allow_failure: false variables: CROSS: mingw64 - IMAGE: registry.fedoraproject.org/fedora:36 - NAME: fedora-36 + IMAGE: registry.fedoraproject.org/fedora:37 + NAME: fedora-37 mingw32-fedora-rawhide-prebuilt-env: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 1b7f63955b..fa426bd3a6 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -56,13 +56,6 @@ x86_64-debian-sid-container: NAME: debian-sid -x86_64-fedora-35-container: - extends: .container_job - allow_failure: false - variables: - NAME: fedora-35 - - x86_64-fedora-36-container: extends: .container_job allow_failure: false @@ -70,6 +63,13 @@ x86_64-fedora-36-container: NAME: fedora-36 +x86_64-fedora-37-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-37 + + x86_64-fedora-rawhide-container: extends: .container_job allow_failure: true @@ -235,19 +235,19 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x -mingw32-fedora-36-container: +mingw32-fedora-37-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: fedora-36-cross-mingw32 + NAME: fedora-37-cross-mingw32 -mingw64-fedora-36-container: +mingw64-fedora-37-container: extends: .container_job allow_failure: false variables: - NAME: fedora-36-cross-mingw64 + NAME: fedora-37-cross-mingw64 mingw32-fedora-rawhide-container: diff --git a/ci/integration.yml b/ci/integration.yml index b79d2e0f40..2bdda1d3c1 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -81,46 +81,6 @@ centos-stream-9-tests-local-env: artifacts: true -.fedora-35-tests: - variables: - # needed by libvirt-gitlab-executor - DISTRO: fedora-35 - # can be overridden in forks to set a different runner tag - LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host - tags: - - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG - -fedora-35-tests-prebuilt-env: - extends: - - .integration_tests_prebuilt_env - - .fedora-35-tests - needs: - - x86_64-fedora-35-prebuilt-env - - project: libvirt/libvirt-perl - job: x86_64-fedora-35-prebuilt-env - ref: master - artifacts: true - - project: libvirt/libvirt-python - job: x86_64-fedora-35-prebuilt-env - ref: master - artifacts: true - -fedora-35-tests-local-env: - extends: - - .integration_tests_local_env - - .fedora-35-tests - needs: - - x86_64-fedora-35-local-env - - project: libvirt/libvirt-perl - job: x86_64-fedora-35-prebuilt-env - ref: master - artifacts: true - - project: libvirt/libvirt-python - job: x86_64-fedora-35-prebuilt-env - ref: master - artifacts: true - - .fedora-36-tests: variables: # needed by libvirt-gitlab-executor @@ -161,41 +121,81 @@ fedora-36-tests-local-env: artifacts: true -.fedora-36-upstream-qemu-tests: +.fedora-37-tests: variables: # needed by libvirt-gitlab-executor - DISTRO: fedora-36 + DISTRO: fedora-37 # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG -fedora-36-upstream-qemu-tests-prebuilt-env: +fedora-37-tests-prebuilt-env: extends: - .integration_tests_prebuilt_env - - .fedora-36-upstream-qemu-tests + - .fedora-37-tests needs: - - x86_64-fedora-36-prebuilt-env + - x86_64-fedora-37-prebuilt-env - project: libvirt/libvirt-perl - job: x86_64-fedora-36-prebuilt-env + job: x86_64-fedora-37-prebuilt-env ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-36-prebuilt-env + job: x86_64-fedora-37-prebuilt-env ref: master artifacts: true -fedora-36-upstream-qemu-tests-local-env: +fedora-37-tests-local-env: extends: - .integration_tests_local_env - - .fedora-36-upstream-qemu-tests + - .fedora-37-tests needs: - - x86_64-fedora-36-local-env + - x86_64-fedora-37-local-env - project: libvirt/libvirt-perl - job: x86_64-fedora-36-prebuilt-env + job: x86_64-fedora-37-prebuilt-env ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-36-prebuilt-env + job: x86_64-fedora-37-prebuilt-env + ref: master + artifacts: true + + +.fedora-37-upstream-qemu-tests: + variables: + # needed by libvirt-gitlab-executor + DISTRO: fedora-37 + # can be overridden in forks to set a different runner tag + LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host + tags: + - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG + +fedora-37-upstream-qemu-tests-prebuilt-env: + extends: + - .integration_tests_prebuilt_env + - .fedora-37-upstream-qemu-tests + needs: + - x86_64-fedora-37-prebuilt-env + - project: libvirt/libvirt-perl + job: x86_64-fedora-37-prebuilt-env + ref: master + artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-37-prebuilt-env + ref: master + artifacts: true + +fedora-37-upstream-qemu-tests-local-env: + extends: + - .integration_tests_local_env + - .fedora-37-upstream-qemu-tests + needs: + - x86_64-fedora-37-local-env + - project: libvirt/libvirt-perl + job: x86_64-fedora-37-prebuilt-env + ref: master + artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-37-prebuilt-env ref: master artifacts: true diff --git a/ci/manifest.yml b/ci/manifest.yml index 2aec92dd26..2aa9ce9952 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -116,14 +116,6 @@ targets: containers: false builds: false - fedora-35: - jobs: - - arch: x86_64 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - fedora-36: jobs: - arch: x86_64 @@ -132,6 +124,14 @@ targets: paths: - libvirt-rpms + fedora-37: + jobs: + - arch: x86_64 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + - arch: mingw32 builds: false -- 2.39.0

2 1

[PATCH] virNWFilterSnoopLeaseFileLoad: Don't typecast 'ipl.timeout'
by Peter Krempa 09 Jan '23

09 Jan '23

Use a temporary variable to avoid memory alignment issues on ARM: ../src/nwfilter/nwfilter_dhcpsnoop.c: In function ‘virNWFilterSnoopLeaseFileLoad’: ../src/nwfilter/nwfilter_dhcpsnoop.c:1745:20: error: cast increases required alignment of target type [-Werror=cast-align] 1745 | (unsigned long long *) &ipl.timeout, | Fixes: 0d278aa089bf3a00bf2d6e56d2f01ea4677190a7 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Corresponding job: https://gitlab.com/pipo.sk/libvirt/-/jobs/3565653957 src/nwfilter/nwfilter_dhcpsnoop.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index e604d67b96..20afc1b2d4 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -1733,6 +1733,8 @@ virNWFilterSnoopLeaseFileLoad(void) fp = fopen(LEASEFILE, "r"); time(&now); while (fp && fgets(line, sizeof(line), fp)) { + unsigned long long timeout; + if (line[strlen(line)-1] != '\n') { virReportError(VIR_ERR_INTERNAL_ERROR, _("virNWFilterSnoopLeaseFileLoad lease file " @@ -1742,13 +1744,13 @@ virNWFilterSnoopLeaseFileLoad(void) ln++; /* key len 54 = "VMUUID"+'-'+"MAC" */ if (sscanf(line, "%llu %54s %15s %15s", - (unsigned long long *) &ipl.timeout, - ifkey, ipstr, srvstr) < 4) { + &timeout, ifkey, ipstr, srvstr) < 4) { virReportError(VIR_ERR_INTERNAL_ERROR, _("virNWFilterSnoopLeaseFileLoad lease file " "line %d corrupt"), ln); break; } + ipl.timeout = timeout; if (ipl.timeout && ipl.timeout < now) continue; req = virNWFilterSnoopReqGetByIFKey(ifkey); -- 2.38.1

2 1

[PATCH v2 00/17] Add support for passing FDs to access disk images
by Peter Krempa 09 Jan '23

09 Jan '23

v2: - fixed uninitialized value usage when reading image header Peter Krempa (17): lib: Introduce virDomainFDAssociate API virsh: Introduce 'dom-fd-associate' for invoking virDomainFDAssociate() conf: storage_source: Introduce type for storing FDs associated for storage qemu: Implement qemuDomainFDAssociate qemuxml2argvtest: Add support for populating 'fds' in private data conf: Add 'fdgroup' attribute for 'file' disks qemu: domain: Introduce qemuDomainStartupCleanup conf: storage_source: Introduce virStorageSourceIsFD qemu: Prepare data for FD-passed disk image sources qemu: block: Add support for passing FDs of disk images secuirity: DAC: Don't relabel FD-passed virStorageSource images security: selinux: Handle security labelling of FD-passed images qemu: Prepare storage backing chain traversal code for FD passed images qemu: driver: Don't allow certain operations with FD-passed disks qemu: cgroup: Don't setup cgroups for FD-passed images qemu: Enable support for FD passed disk sources qemuxml2*test: Enable testing of disks with 'fdgroup' docs/formatdomain.rst | 8 ++ docs/manpages/virsh.rst | 19 +++ include/libvirt/libvirt-domain.h | 20 +++ src/conf/domain_conf.c | 2 + src/conf/domain_conf.h | 1 + src/conf/domain_postparse.c | 9 ++ src/conf/schemas/domaincommon.rng | 3 + src/conf/storage_source_conf.c | 57 ++++++++ src/conf/storage_source_conf.h | 27 ++++ src/driver-hypervisor.h | 8 ++ src/libvirt-domain.c | 80 +++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 5 + src/qemu/qemu_block.c | 31 ++++- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 22 +++ src/qemu/qemu_domain.c | 129 ++++++++++++++++-- src/qemu/qemu_domain.h | 11 +- src/qemu/qemu_driver.c | 89 ++++++++++++ src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 2 +- src/remote/remote_daemon_dispatch.c | 40 ++++++ src/remote/remote_driver.c | 27 ++++ src/remote/remote_protocol.x | 14 +- src/remote_protocol-structs | 6 + src/security/security_dac.c | 16 ++- src/security/security_selinux.c | 32 ++++- src/security/virt-aa-helper.c | 3 +- src/storage_file/storage_source.c | 15 ++ .../disk-source-fd.x86_64-latest.args | 49 +++++++ tests/qemuxml2argvdata/disk-source-fd.xml | 40 ++++++ tests/qemuxml2argvtest.c | 9 ++ .../disk-source-fd.x86_64-latest.xml | 52 +++++++ tests/qemuxml2xmltest.c | 2 + tests/testutilsqemu.c | 33 +++++ tests/testutilsqemu.h | 2 + tools/virsh-domain.c | 76 +++++++++++ 37 files changed, 923 insertions(+), 23 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-source-fd.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-source-fd.xml create mode 100644 tests/qemuxml2xmloutdata/disk-source-fd.x86_64-latest.xml -- 2.38.1

2 18

[libvirt PATCH v3 00/32] introduce external snapshot delete support
by Pavel Hrdina 09 Jan '23

09 Jan '23

This implements virDomainSnapshotDelete API to support external snapshots. The support doesn't include flags VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN and VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY as it would add more complexity and IMHO these flags should not existed at all. Gitlab repo with the patches: https://gitlab.com/phrdina/libvirt/-/commits/snapshot-delete-external Changes in v3: - added new patch to store snapshotDelete in status XML - fixed aborting jobs when daemon is restarted only when snapshot delete was previously stared Changes in v2: - qemuBlockCommit properly unrefs job by calling qemuBlockJobStartupFinalize - added comment to various functions - renamed some functions as suggested in review of v1 patches - improved error messages - introduced virStorageSourceChainLookupBySource() - use virStorageSourceIsBacking() - properly cleanup qemuSnapshotDeleteExternalData - don't allow deleting snapshot if there is another block job Pavel Hrdina (32): libvirt: introduce VIR_DOMAIN_JOB_OPERATION_SNAPSHOT_DELETE qemu_block: extract block commit code to separate function qemu_block: move qemuDomainBlockPivot out of qemu_driver qemu_block: add async domain job support to qemuBlockCommit qemu_block: add async domain job support to qemuBlockPivot qemu_monitor: introduce qemuMonitorJobFinalize qemu_monitor_json: allow configuring autofinalize for block commit qemu_block: allow configuring autofinalize for block commit qemu_block: introduce qemuBlockFinalize qemu_block: change qemuBlockCommit to return job pointer qemu_blockjob: process QEMU_MONITOR_JOB_STATUS_PENDING signal storage_source: introduce virStorageSourceChainLookupBySource qemu_snapshot: refactor qemuSnapshotDelete qemu_snapshot: introduce qemuSnapshotDeleteSingle qemu_snapshot: introduce qemuSnapshotDeleteChildren qemu_snapshot: rework snapshot children deletion qemu_snapshot: move snapshot discard out of qemu_domain.c qemu_snapshot: move snapshot metadata reparent code qemu_snapshot: introduce qemuSnapshotDiscardMetadata qemu_snapshot: introduce qemuSnapshotDeleteValidate function qemu_snapshot: refactor validation of snapshot delete qemu_snapshot: error out when deleting internal snapshot on non-active disk qemu_snapshot: convert snapshot delete to async domain job qemu_snapshot: prepare data for external snapshot deletion qemu_snapshot: implement deletion of external snapshot qemu_snapshot: update metadata when deleting snapshots qemu_snapshot: when deleting snapshot invalidate parent snapshot qemu_domain: store snapshotDelete in qemuDomainJobPrivate qemu_process: abort snapshot delete when daemon starts qemu_snapshot: enable deletion of external snapshots api: document support for external snapshot deletion NEWS: document support for external snapshot deletion NEWS.rst | 6 + include/libvirt/libvirt-domain.h | 1 + src/conf/snapshot_conf.c | 8 + src/conf/snapshot_conf.h | 1 + src/libvirt-domain-snapshot.c | 7 + src/libvirt_private.syms | 1 + src/qemu/qemu_backup.c | 1 + src/qemu/qemu_block.c | 364 +++++++++++ src/qemu/qemu_block.h | 22 + src/qemu/qemu_blockjob.c | 21 +- src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_domain.c | 118 +--- src/qemu/qemu_domain.h | 11 +- src/qemu/qemu_driver.c | 292 +-------- src/qemu/qemu_monitor.c | 21 +- src/qemu/qemu_monitor.h | 8 +- src/qemu/qemu_monitor_json.c | 26 +- src/qemu/qemu_monitor_json.h | 8 +- src/qemu/qemu_process.c | 37 ++ src/qemu/qemu_snapshot.c | 981 +++++++++++++++++++++++++++--- src/qemu/qemu_snapshot.h | 4 + src/storage_file/storage_source.c | 40 ++ src/storage_file/storage_source.h | 6 + tests/qemumonitorjsontest.c | 4 +- tools/virsh-domain.c | 1 + 25 files changed, 1514 insertions(+), 476 deletions(-) -- 2.39.0

2 33

[PATCH] cpu_map: Add -noMPX models for x86 Icelake Server
by Lena Voytek 09 Jan '23

09 Jan '23

Intel has removed MPX capabilities from 10nm Icelake CPUs[1], which is reflected by the new models through the line marking mpx as removed. The original Icelake Server models have been left alone to avoid regressions. This adds: -Icelake-Server-noMPX -Icelake-Server-noTSX-noMPX References: [1] Memory Protection Extensions support removal https://www.intel.com/content/www/us/en/support/articles/000059823/processo… Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1978064 https://gitlab.com/libvirt/libvirt/-/issues/304 Signed-off-by: Lena Voytek <lena.voytek(a)canonical.com> --- src/cpu_map/index.xml | 2 + src/cpu_map/x86_Icelake-Server-noMPX.xml | 93 +++++++++++++++++++ .../x86_Icelake-Server-noTSX-noMPX.xml | 91 ++++++++++++++++++ 3 files changed, 186 insertions(+) create mode 100644 src/cpu_map/x86_Icelake-Server-noMPX.xml create mode 100644 src/cpu_map/x86_Icelake-Server-noTSX-noMPX.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 351c2ae4fa..62c3d44a5c 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -54,6 +54,8 @@ <include filename='x86_Icelake-Client-noTSX.xml'/> <include filename='x86_Icelake-Server.xml'/> <include filename='x86_Icelake-Server-noTSX.xml'/> + <include filename='x86_Icelake-Server-noMPX.xml'/> + <include filename='x86_Icelake-Server-noTSX-noMPX.xml'/> <include filename='x86_Cooperlake.xml'/> <include filename='x86_Snowridge.xml'/> diff --git a/src/cpu_map/x86_Icelake-Server-noMPX.xml b/src/cpu_map/x86_Icelake-Server-noMPX.xml new file mode 100644 index 0000000000..feaf21f91f --- /dev/null +++ b/src/cpu_map/x86_Icelake-Server-noMPX.xml @@ -0,0 +1,93 @@ +<cpus> + <model name='Icelake-Server-noMPX'> + <decode host='on' guest='on'/> + <signature family='6' model='106'/>  + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='intel-pt' removed='yes'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='mpx' removed='yes'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pku'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='rtm'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vme'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Icelake-Server-noTSX-noMPX.xml b/src/cpu_map/x86_Icelake-Server-noTSX-noMPX.xml new file mode 100644 index 0000000000..e55da83ddf --- /dev/null +++ b/src/cpu_map/x86_Icelake-Server-noTSX-noMPX.xml @@ -0,0 +1,91 @@ +<cpus> + <model name='Icelake-Server-noTSX-noMPX'> + <decode host='on' guest='off'/> + <signature family='6' model='106'/>  + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='gfni'/> + <feature name='intel-pt' removed='yes'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='mpx' removed='yes'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pku'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vme'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> -- 2.34.1

5 10

[PATCH 0/2] define g_autoptr for virNWFilterDef and virNWFilterRuleDef
by Jiang Jiacheng 09 Jan '23

09 Jan '23

Define and use g_autoptr() for virNWFilterDef and virNWFilterRuleDef, and remove unnecessary label. Jiang Jiacheng (2): conf: define g_autoptr for virNWFilterDef and virNWFilterRuleDef src/tests: use g_autoptr for virNWFilterDef and virNWFilterRuleDef src/conf/nwfilter_conf.c | 44 ++++++++++++++-------------------- src/conf/nwfilter_conf.h | 2 ++ src/conf/virnwfilterobj.c | 19 +++++++-------- src/nwfilter/nwfilter_driver.c | 7 +++--- tests/nwfilterxml2xmltest.c | 22 +++++++---------- 5 files changed, 39 insertions(+), 55 deletions(-) -- 2.33.0

2 4

[PATCH V2 0/9] use g_autofree
by Jiang Jiacheng 09 Jan '23

09 Jan '23

Use g_autofree more often and remove unnecessary cleanup/error labels. diff to v1: * use g_autofree for uuid in 'virNWFilterDefParseXML' * remove unused rc in security_apparmor.c Jiang Jiacheng (9): conf: use g_autofree and remove unnecessary label interface: use g_autofree and remove unnecessary label locking: use g_autofree and remove unnecessary label remote: use g_autofree and remove unnecessary label rpc: use g_autofree and remove unnecessary label security: use g_autofree and remove unnecessary label util: use g_autofree and remove unnecessary label vmware: use g_autofree and remove unnecessary label vz: use g_autofree and remove unnecessary label src/conf/domain_audit.c | 121 ++++++++----------------- src/conf/node_device_util.c | 49 ++++------ src/conf/nwfilter_conf.c | 55 ++++------- src/conf/virnetworkobj.c | 85 ++++++----------- src/conf/virnetworkportdef.c | 12 +-- src/conf/virnwfilterbindingobj.c | 22 ++--- src/conf/virnwfilterobj.c | 19 +--- src/conf/virstorageobj.c | 23 ++--- src/interface/interface_backend_udev.c | 22 ++--- src/locking/lock_driver_lockd.c | 36 +++----- src/locking/lock_driver_sanlock.c | 46 ++++------ src/remote/remote_driver.c | 22 ++--- src/rpc/virnetclientprogram.c | 6 +- src/rpc/virnettlscontext.c | 16 +--- src/security/security_apparmor.c | 94 +++++++------------ src/util/virconf.c | 27 ++---- src/vmware/vmware_conf.c | 28 ++---- src/vz/vz_utils.c | 18 ++-- 18 files changed, 239 insertions(+), 462 deletions(-) -- 2.33.0

2 11

[PATCH] security_selinux: Set and restore /dev/sgx_* labels
by Michal Privoznik 09 Jan '23

09 Jan '23

For SGX type of memory, QEMU needs to open and talk to /dev/sgx_vepc and /dev/sgx_provision files. But we do not set nor restore SELinux labels on these files when starting a guest. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/security/security_dac.c | 3 --- src/security/security_manager.h | 4 ++++ src/security/security_selinux.c | 24 ++++++++++++++++++++++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 917fcf76a3..abfc07218e 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -47,9 +47,6 @@ VIR_LOG_INIT("security.security_dac"); #define SECURITY_DAC_NAME "dac" -#define DEV_SEV "/dev/sev" -#define DEV_SGX_VEPC "/dev/sgx_vepc" -#define DEV_SGX_PROVISION "/dev/sgx_provision" typedef struct _virSecurityDACData virSecurityDACData; struct _virSecurityDACData { diff --git a/src/security/security_manager.h b/src/security/security_manager.h index 60597ffc0a..4afdcc167b 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -23,6 +23,10 @@ #include "domain_conf.h" #include "vircommand.h" +#define DEV_SEV "/dev/sev" +#define DEV_SGX_VEPC "/dev/sgx_vepc" +#define DEV_SGX_PROVISION "/dev/sgx_provision" + typedef struct _virSecurityManager virSecurityManager; typedef enum { diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 93cc12407a..c4832e1bfc 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1577,10 +1577,21 @@ virSecuritySELinuxSetMemoryLabel(virSecurityManager *mgr, return -1; break; + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); + if (!seclabel || !seclabel->relabel) + return 0; + + if (virSecuritySELinuxSetFilecon(mgr, DEV_SGX_VEPC, + seclabel->imagelabel, true) < 0 || + virSecuritySELinuxSetFilecon(mgr, DEV_SGX_PROVISION, + seclabel->imagelabel, true) < 0) + return -1; + break; + case VIR_DOMAIN_MEMORY_MODEL_NONE: case VIR_DOMAIN_MEMORY_MODEL_DIMM: case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: - case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: case VIR_DOMAIN_MEMORY_MODEL_LAST: break; } @@ -1607,9 +1618,18 @@ virSecuritySELinuxRestoreMemoryLabel(virSecurityManager *mgr, ret = virSecuritySELinuxRestoreFileLabel(mgr, mem->nvdimmPath, true); break; + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); + if (!seclabel || !seclabel->relabel) + return 0; + + ret = virSecuritySELinuxRestoreFileLabel(mgr, DEV_SGX_VEPC, true); + if (virSecuritySELinuxRestoreFileLabel(mgr, DEV_SGX_PROVISION, true) < 0) + ret = -1; + break; + case VIR_DOMAIN_MEMORY_MODEL_DIMM: case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: - case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: case VIR_DOMAIN_MEMORY_MODEL_NONE: case VIR_DOMAIN_MEMORY_MODEL_LAST: ret = 0; -- 2.38.2

2 1

[PATCH 0/7] Support crypto device
by zhenwei pi 07 Jan '23

07 Jan '23

Hi, This series supports crypto device, also add support for QEMU. The basic xml schema looks like: <crypto model='virtio' type='qemu'> <backend model='builtin' queues='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </crypto> <crypto model='virtio' type='qemu'> <backend model='lkcf'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> </crypto> Each patch has been tested by 'ninja -C build test', and launch a QEMU with crypto devices, it works fine. zhenwei pi (7): docs: introduce crypto device conf: support crypto device domain_capabilities: define capabilities for crypto qemu_capabilities: support crypto qemu: alias: support crypto device qemu: command: support crypto device NEWS: Document 'crypto' device NEWS.rst | 3 + docs/formatdomain.rst | 21 ++ src/conf/domain_capabilities.c | 15 ++ src/conf/domain_capabilities.h | 12 ++ src/conf/domain_conf.c | 191 ++++++++++++++++++ src/conf/domain_conf.h | 40 ++++ src/conf/domain_postparse.c | 1 + src/conf/domain_validate.c | 18 ++ src/conf/schemas/domaincaps.rng | 10 + src/conf/virconftypes.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 23 +++ src/qemu/qemu_capabilities.c | 32 +++ src/qemu/qemu_capabilities.h | 8 + src/qemu/qemu_command.c | 109 ++++++++++ src/qemu/qemu_domain.c | 3 + src/qemu/qemu_domain_address.c | 26 +++ src/qemu/qemu_driver.c | 5 + src/qemu/qemu_hotplug.c | 3 + src/qemu/qemu_validate.c | 22 ++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 11 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 11 + .../qemu_4.2.0-virt.aarch64.xml | 11 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 11 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 11 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 11 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 11 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 11 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 11 + .../qemu_5.0.0-virt.aarch64.xml | 11 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 11 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 11 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 11 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 11 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 11 + tests/domaincapsdata/qemu_5.1.0.sparc.xml | 9 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 11 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 11 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 11 + .../qemu_5.2.0-virt.aarch64.xml | 11 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 11 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 11 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 11 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 11 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 11 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 11 + .../qemu_6.0.0-virt.aarch64.xml | 11 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 11 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 11 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 11 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 11 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 11 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 11 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 11 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 11 + .../qemu_6.2.0-virt.aarch64.xml | 11 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 11 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 11 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 11 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 11 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 11 + .../qemu_7.0.0-virt.aarch64.xml | 11 + tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 11 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 11 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 11 + .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 11 + .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 11 + tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 11 + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 11 + .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 12 ++ .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 12 ++ tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 12 ++ .../caps_4.2.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 2 + .../caps_4.2.0.x86_64.xml | 2 + .../caps_5.0.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 2 + .../caps_5.0.0.riscv64.xml | 2 + .../caps_5.0.0.x86_64.xml | 2 + .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 + .../caps_5.1.0.x86_64.xml | 2 + .../caps_5.2.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 2 + .../caps_5.2.0.riscv64.xml | 2 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 2 + .../caps_5.2.0.x86_64.xml | 2 + .../caps_6.0.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 2 + .../caps_6.0.0.x86_64.xml | 2 + .../caps_6.1.0.x86_64.xml | 2 + .../caps_6.2.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 2 + .../caps_6.2.0.x86_64.xml | 2 + .../caps_7.0.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 2 + .../caps_7.0.0.x86_64.xml | 2 + .../qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 2 + .../caps_7.1.0.x86_64.xml | 2 + .../caps_7.2.0.x86_64.xml | 3 + 100 files changed, 1174 insertions(+) -- 2.34.1

2 13

[libvirt PATCH 0/4] qemu: Fix post-copy recovery after dest domain gets paused
by Jiri Denemark 06 Jan '23

06 Jan '23

See 3/4 for details. Jiri Denemark (4): conf: Drop virDomainJobOperation parameter from virDomainObjIsPostcopy conf: Add job parameter to virDomainObjIsFailedPostcopy qemu: Remember failed post-copy migration in job virDomainObjGetState: Promote VIR_DOMAIN_PAUSED_POSTCOPY_FAILED src/conf/domain_conf.c | 41 +++++++++++++++------------- src/conf/domain_conf.h | 5 ++-- src/conf/virdomainjob.c | 1 + src/conf/virdomainjob.h | 1 + src/qemu/qemu_domainjob.c | 9 +++++++ src/qemu/qemu_driver.c | 4 +-- src/qemu/qemu_migration.c | 56 ++++++++++++++++++++++++--------------- src/qemu/qemu_process.c | 23 +++++++++++++--- 8 files changed, 92 insertions(+), 48 deletions(-) -- 2.39.0

2 6

[PATCH 00/36] Add support for passing FDs to access disk images
by Peter Krempa 06 Jan '23

06 Jan '23

First part of the series refactors close callbacks to allow having more of them and then implements new API virDomainFDAssociate and plumbs it to pass to qemu. Peter Krempa (36): datatypes: Simplify error path of 'virGetDomain' datatypes: Clean up whitespace in definition of struct _virConnect conf: virdomainobjlist: Convert header to contemporary style conf: virdomainobjlist: Introduce 'virDomainObjListCollectAll' conf: virdomainobjlist: Remove return value from virDomainObjListCollect conf: domain: Add helper infrastructure for new connection close callbacks virclosecallbacks: Add new close callbacks APIs lxc: Use new connection close callbacks API bhyve: Use new connection close callbacks API qemu: Use new connection close callbacks API qemuMigrationSrcIsAllowed: Remove unused 'driver' argument qemuMigrationSrcBeginResumePhase: Remove unused 'driver' argument virclosecallbacks: Remove old close callbacks code gendispatch: Add 'G_GNUC_WARN_UNUSED_RESULT' to output of 'aclheader' remote_driver: Return 'virLockGuard' from 'remoteDriverLock' remote_driver: Refactor few functions as example of auto-locking virStorageSourceIsSameLocation: Use switch statement for individual storage types qemuxml2argvtest: Add seclabels in <backingStore> to disk-backing-chains-(no)index qemuxml2xmltest: Remove 'disk-backing-chain' case and output files lib: Introduce virDomainFDAssociate API virsh: Introduce 'dom-fd-associate' for invoking virDomainFDAssociate() conf: storage_source: Introduce type for storing FDs associated for storage qemu: Implement qemuDomainFDAssociate qemuxml2argvtest: Add support for populating 'fds' in private data conf: Add 'fdgroup' attribute for 'file' disks qemu: domain: Introduce qemuDomainStartupCleanup conf: storage_source: Introduce virStorageSourceIsFD qemu: Prepare data for FD-passed disk image sources qemu: block: Add support for passing FDs of disk images secuirity: DAC: Don't relabel FD-passed virStorageSource images security: selinux: Handle security labelling of FD-passed images qemu: Prepare storage backing chain traversal code for FD passed images qemu: driver: Don't allow certain operations with FD-passed disks qemu: cgroup: Don't setup cgroups for FD-passed images qemu: Enable support for FD passed disk sources qemuxml2*test: Enable testing of disks with 'fdgroup' docs/formatdomain.rst | 8 + docs/manpages/virsh.rst | 22 + include/libvirt/libvirt-domain.h | 22 + po/POTFILES | 1 - src/bhyve/bhyve_domain.c | 15 +- src/bhyve/bhyve_driver.c | 6 +- src/bhyve/bhyve_process.c | 9 +- src/bhyve/bhyve_utils.h | 2 - src/conf/domain_conf.c | 15 + src/conf/domain_conf.h | 26 + src/conf/domain_postparse.c | 9 + src/conf/schemas/domaincommon.rng | 3 + src/conf/storage_source_conf.c | 80 ++- src/conf/storage_source_conf.h | 27 ++ src/conf/virdomainobjlist.c | 39 +- src/conf/virdomainobjlist.h | 160 +++--- src/datatypes.c | 14 +- src/datatypes.h | 5 +- src/driver-hypervisor.h | 8 + src/hypervisor/virclosecallbacks.c | 454 ++++++++++-------- src/hypervisor/virclosecallbacks.h | 37 +- src/libvirt-domain.c | 82 ++++ src/libvirt_private.syms | 14 +- src/libvirt_public.syms | 5 + src/lxc/lxc_conf.c | 15 +- src/lxc/lxc_conf.h | 3 - src/lxc/lxc_driver.c | 8 +- src/lxc/lxc_process.c | 8 +- src/qemu/qemu_block.c | 31 +- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 22 + src/qemu/qemu_conf.c | 17 +- src/qemu/qemu_conf.h | 3 - src/qemu/qemu_domain.c | 129 ++++- src/qemu/qemu_domain.h | 11 +- src/qemu/qemu_driver.c | 108 ++++- src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_migration.c | 54 +-- src/qemu/qemu_migration.h | 3 +- src/qemu/qemu_process.c | 37 +- src/qemu/qemu_process.h | 11 +- src/qemu/qemu_snapshot.c | 4 +- src/remote/remote_daemon_dispatch.c | 40 ++ src/remote/remote_driver.c | 70 ++- src/remote/remote_protocol.x | 14 +- src/remote_protocol-structs | 6 + src/rpc/gendispatch.pl | 2 +- src/security/security_dac.c | 16 +- src/security/security_selinux.c | 32 +- src/security/virt-aa-helper.c | 3 +- src/storage_file/storage_source.c | 14 + src/test/test_driver.c | 4 +- src/vz/vz_driver.c | 7 +- .../disk-backing-chains-index.xml | 6 +- .../disk-backing-chains-noindex.xml | 6 +- .../qemuxml2argvdata/disk-backing-chains.xml | 98 ---- .../disk-source-fd.x86_64-latest.args | 49 ++ tests/qemuxml2argvdata/disk-source-fd.xml | 40 ++ tests/qemuxml2argvtest.c | 9 + .../disk-backing-chains-active.xml | 110 ----- .../disk-backing-chains-inactive.xml | 110 ----- .../disk-backing-chains-index-active.xml | 6 +- .../disk-backing-chains-index-inactive.xml | 6 +- .../disk-backing-chains-noindex.xml | 6 +- .../disk-source-fd.x86_64-latest.xml | 52 ++ tests/qemuxml2xmltest.c | 3 +- tests/testutilsqemu.c | 33 ++ tests/testutilsqemu.h | 2 + tools/virsh-domain.c | 83 ++++ 69 files changed, 1512 insertions(+), 847 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains.xml create mode 100644 tests/qemuxml2argvdata/disk-source-fd.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-source-fd.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-active.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml create mode 100644 tests/qemuxml2xmloutdata/disk-source-fd.x86_64-latest.xml -- 2.38.1

3 83

[libvirt PATCH v2 00/31] introduce external snapshot delete support
by Pavel Hrdina 06 Jan '23

06 Jan '23

This implements virDomainSnapshotDelete API to support external snapshots. The support doesn't include flags VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN and VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY as it would add more complexity and IMHO these flags should not existed at all. Gitlab repo with the patches: https://gitlab.com/phrdina/libvirt/-/commits/snapshot-delete-external Changes in v2: - qemuBlockCommit properly unrefs job by calling qemuBlockJobStartupFinalize - added comment to various functions - renamed some functions as suggested in review of v1 patches - improved error messages - introduced virStorageSourceChainLookupBySource() - use virStorageSourceIsBacking() - properly cleanup qemuSnapshotDeleteExternalData - don't allow deleting snapshot if there is another block job Pavel Hrdina (31): libvirt: introduce VIR_DOMAIN_JOB_OPERATION_SNAPSHOT_DELETE qemu_block: extract block commit code to separate function qemu_block: move qemuDomainBlockPivot out of qemu_driver qemu_block: add async domain job support to qemuBlockCommit qemu_block: add async domain job support to qemuBlockPivot qemu_monitor: introduce qemuMonitorJobFinalize qemu_monitor_json: allow configuring autofinalize for block commit qemu_block: allow configuring autofinalize for block commit qemu_block: introduce qemuBlockFinalize qemu_block: change qemuBlockCommit to return job pointer qemu_blockjob: process QEMU_MONITOR_JOB_STATUS_PENDING signal storage_source: introduce virStorageSourceChainLookupBySource qemu_snapshot: refactor qemuSnapshotDelete qemu_snapshot: introduce qemuSnapshotDeleteSingle qemu_snapshot: introduce qemuSnapshotDeleteChildren qemu_snapshot: rework snapshot children deletion qemu_snapshot: move snapshot discard out of qemu_domain.c qemu_snapshot: move snapshot metadata reparent code qemu_snapshot: introduce qemuSnapshotDiscardMetadata qemu_snapshot: introduce qemuSnapshotDeleteValidate function qemu_snapshot: refactor validation of snapshot delete qemu_snapshot: error out when deleting internal snapshot on non-active disk qemu_snapshot: convert snapshot delete to async domain job qemu_snapshot: prepare data for external snapshot deletion qemu_snapshot: implement deletion of external snapshot qemu_snapshot: update metadata when deleting snapshots qemu_snapshot: when deleting snapshot invalidate parent snapshot qemu_process: abort snapshot delete when daemon starts qemu_snapshot: enable deletion of external snapshots api: document support for external snapshot deletion NEWS: document support for external snapshot deletion NEWS.rst | 6 + include/libvirt/libvirt-domain.h | 1 + src/conf/snapshot_conf.c | 8 + src/conf/snapshot_conf.h | 1 + src/libvirt-domain-snapshot.c | 7 + src/libvirt_private.syms | 1 + src/qemu/qemu_backup.c | 1 + src/qemu/qemu_block.c | 364 +++++++++++ src/qemu/qemu_block.h | 22 + src/qemu/qemu_blockjob.c | 21 +- src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_domain.c | 95 +-- src/qemu/qemu_domain.h | 9 - src/qemu/qemu_driver.c | 292 +-------- src/qemu/qemu_monitor.c | 21 +- src/qemu/qemu_monitor.h | 8 +- src/qemu/qemu_monitor_json.c | 26 +- src/qemu/qemu_monitor_json.h | 8 +- src/qemu/qemu_process.c | 32 + src/qemu/qemu_snapshot.c | 973 +++++++++++++++++++++++++++--- src/qemu/qemu_snapshot.h | 4 + src/storage_file/storage_source.c | 39 ++ src/storage_file/storage_source.h | 6 + tests/qemumonitorjsontest.c | 4 +- tools/virsh-domain.c | 1 + 25 files changed, 1475 insertions(+), 476 deletions(-) -- 2.39.0

2 37

[PATCH 1/1] nwfilter: use time_t for timeout for consistency
by Shaleen Bathla 06 Jan '23

06 Jan '23

Coverity scan reports: "A time_t value is stored in an integer with too few bits to accommodate it. The expression timeout is cast to unsigned int" We are already casting and storing time_t timeout variable into unsigned int. We can use time_t for timeout and cast it to unsigned long (should be big enough) instead of unsigned int in sscanf, g_strdup_printf as required. Signed-off-by: Shaleen Bathla <shaleen.bathla(a)oracle.com> --- src/nwfilter/nwfilter_dhcpsnoop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index a10a14cfc16d..62586be35dfb 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -146,7 +146,7 @@ struct _virNWFilterSnoopIPLease { virSocketAddr ipAddress; virSocketAddr ipServer; virNWFilterSnoopReq * snoopReq; - unsigned int timeout; + time_t timeout; /* timer list */ virNWFilterSnoopIPLease *prev; virNWFilterSnoopIPLease *next; @@ -1580,7 +1580,7 @@ virNWFilterSnoopLeaseFileWrite(int lfd, const char *ifkey, return -1; /* time intf ip dhcpserver */ - lbuf = g_strdup_printf("%u %s %s %s\n", ipl->timeout, ifkey, ipstr, dhcpstr); + lbuf = g_strdup_printf("%lu %s %s %s\n", ipl->timeout, ifkey, ipstr, dhcpstr); len = strlen(lbuf); if (safewrite(lfd, lbuf, len) != len) { @@ -1739,7 +1739,7 @@ virNWFilterSnoopLeaseFileLoad(void) } ln++; /* key len 54 = "VMUUID"+'-'+"MAC" */ - if (sscanf(line, "%u %54s %15s %15s", &ipl.timeout, + if (sscanf(line, "%lu %54s %15s %15s", &ipl.timeout, ifkey, ipstr, srvstr) < 4) { virReportError(VIR_ERR_INTERNAL_ERROR, _("virNWFilterSnoopLeaseFileLoad lease file " -- 2.31.1

2 1

[libvirt PATCH 0/2] qemu: Always check nodeset provided to numatune
by Andrea Bolognani 06 Jan '23

06 Jan '23

Behave more consistently when presented with an invalid configuration. Andrea Bolognani (2): tests: Add cases for numatune with unavailable nodes qemu: Always check nodeset provided to numatune src/qemu/qemu_command.c | 6 ++++-- ...-unavailable-restrictive.x86_64-latest.err | 1 + ...matune-memnode-unavailable-restrictive.xml | 20 +++++++++++++++++++ ...mnode-unavailable-strict.x86_64-latest.err | 1 + .../numatune-memnode-unavailable-strict.xml | 20 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 6 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/numatune-memnode-unavailable-restrictive.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/numatune-memnode-unavailable-restrictive.xml create mode 100644 tests/qemuxml2argvdata/numatune-memnode-unavailable-strict.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/numatune-memnode-unavailable-strict.xml -- 2.39.0

2 3

[PATCH] qemu: fix several codecheck in qemu_monitor.c
by Jiang Jiacheng 06 Jan '23

06 Jan '23

1.clear passwd in debug log 2.alignment 3.use the same variable name for function definition and declaration Signed-off-by: Jiang Jiacheng <jiangjiacheng(a)huawei.com> --- src/qemu/qemu_monitor.c | 8 ++++---- src/qemu/qemu_monitor.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 80f262cec7..de9a1b26f6 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -943,7 +943,7 @@ qemuMonitorInitBalloonObjectPath(qemuMonitor *mon, case VIR_DOMAIN_MEMBALLOON_MODEL_XEN: case VIR_DOMAIN_MEMBALLOON_MODEL_NONE: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("invalid model for virtio-balloon-pci")); + _("invalid model for virtio-balloon-pci")); return; case VIR_DOMAIN_MEMBALLOON_MODEL_LAST: default: @@ -2053,8 +2053,8 @@ qemuMonitorSetPassword(qemuMonitor *mon, if (!protocol) return -1; - VIR_DEBUG("protocol=%s, password=%p, action_if_connected=%s", - protocol, password, action_if_connected); + VIR_DEBUG("protocol=%s, action_if_connected=%s", + protocol, action_if_connected); QEMU_CHECK_MONITOR(mon); @@ -3485,7 +3485,7 @@ qemuMonitorBlockExportAdd(qemuMonitor *mon, int qemuMonitorGetTPMModels(qemuMonitor *mon, - char ***tpmmodels) + char ***tpmmodels) { VIR_DEBUG("tpmmodels=%p", tpmmodels); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index c690fc3655..7278f2e706 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -627,8 +627,8 @@ struct _qemuMonitorCPUInfo { }; typedef struct _qemuMonitorCPUInfo qemuMonitorCPUInfo; -void qemuMonitorCPUInfoFree(qemuMonitorCPUInfo *list, - size_t nitems); +void qemuMonitorCPUInfoFree(qemuMonitorCPUInfo *cpus, + size_t ncpus); int qemuMonitorGetCPUInfo(qemuMonitor *mon, qemuMonitorCPUInfo **vcpus, size_t maxvcpus, @@ -1184,7 +1184,7 @@ int qemuMonitorNBDServerAdd(qemuMonitor *mon, const char *export, bool writable, const char *bitmap); -int qemuMonitorNBDServerStop(qemuMonitor *); +int qemuMonitorNBDServerStop(qemuMonitor *mon); int qemuMonitorBlockExportAdd(qemuMonitor *mon, virJSONValue **props); -- 2.33.0

2 1

[PATCH] qemu: Fix Commnad -> Command typo
by Martin Kletzander 06 Jan '23

06 Jan '23

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as 'trivial'. src/qemu/qemu_command.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ee2e873b9562..74069587bfea 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9843,11 +9843,11 @@ typedef enum { QEMU_COMMAND_DEPRECATION_BEHAVIOR_CRASH, QEMU_COMMAND_DEPRECATION_BEHAVIOR_LAST -} qemuCommnadDeprecationBehavior; +} qemuCommandDeprecationBehavior; -VIR_ENUM_DECL(qemuCommnadDeprecationBehavior); -VIR_ENUM_IMPL(qemuCommnadDeprecationBehavior, +VIR_ENUM_DECL(qemuCommandDeprecationBehavior); +VIR_ENUM_IMPL(qemuCommandDeprecationBehavior, QEMU_COMMAND_DEPRECATION_BEHAVIOR_LAST, "none", "omit", @@ -9863,7 +9863,7 @@ qemuBuildCompatDeprecatedCommandLine(virCommand *cmd, g_autoptr(virJSONValue) props = NULL; g_autofree char *propsstr = NULL; qemuDomainXmlNsDef *nsdata = def->namespaceData; - qemuCommnadDeprecationBehavior behavior = QEMU_COMMAND_DEPRECATION_BEHAVIOR_NONE; + qemuCommandDeprecationBehavior behavior = QEMU_COMMAND_DEPRECATION_BEHAVIOR_NONE; const char *behaviorStr = cfg->deprecationBehavior; int tmp; const char *deprecatedOutput = NULL; @@ -9872,7 +9872,7 @@ qemuBuildCompatDeprecatedCommandLine(virCommand *cmd, if (nsdata && nsdata->deprecationBehavior) behaviorStr = nsdata->deprecationBehavior; - if ((tmp = qemuCommnadDeprecationBehaviorTypeFromString(behaviorStr)) < 0) { + if ((tmp = qemuCommandDeprecationBehaviorTypeFromString(behaviorStr)) < 0) { VIR_WARN("Unsupported deprecation behavior '%s' for VM '%s'", behaviorStr, def->name); return; -- 2.39.0

1 0

[PATCH 0/3] fix some coding issues
by Jiang Jiacheng 06 Jan '23

06 Jan '23

Jiang Jiacheng (3): qemu:fix a misspelling in log remote: fix misspelling in the documation of 'daemonCreateClientStream' storage/util: replace unnecessary while loop by if src/qemu/qemu_process.c | 2 +- src/remote/remote_daemon_stream.c | 4 ++-- src/storage/storage_util.c | 4 +--- src/util/virutil.c | 6 +----- 4 files changed, 5 insertions(+), 11 deletions(-) -- 2.33.0

2 5

[PATCH 0/9] use g_autofree
by Jiang Jiacheng 06 Jan '23

06 Jan '23

Use g_autofree more often and remove unnecessary cleanup/error labels. Jiang Jiacheng (9): conf: use g_autofree and remove unnecessary label interface: use g_autofree and remove unnecessary label locking: use g_autofree and remove unnecessary label remote: use g_autofree and remove unnecessary label rpc: use g_autofree and remove unnecessary label security: use g_autofree and remove unnecessary label util: use g_autofree and remove unnecessary label vmware: use g_autofree and remove unnecessary label vz: use g_autofree and remove unnecessary label src/conf/domain_audit.c | 121 ++++++++----------------- src/conf/node_device_util.c | 49 ++++------ src/conf/nwfilter_conf.c | 51 ++++------- src/conf/virnetworkobj.c | 85 ++++++----------- src/conf/virnetworkportdef.c | 12 +-- src/conf/virnwfilterbindingobj.c | 22 ++--- src/conf/virnwfilterobj.c | 14 +-- src/conf/virstorageobj.c | 23 ++--- src/interface/interface_backend_udev.c | 22 ++--- src/locking/lock_driver_lockd.c | 36 +++----- src/locking/lock_driver_sanlock.c | 46 ++++------ src/remote/remote_driver.c | 22 ++--- src/rpc/virnetclientprogram.c | 6 +- src/rpc/virnettlscontext.c | 16 +--- src/security/security_apparmor.c | 91 +++++++------------ src/util/virconf.c | 27 ++---- src/vmware/vmware_conf.c | 28 ++---- src/vz/vz_utils.c | 18 ++-- 18 files changed, 237 insertions(+), 452 deletions(-) -- 2.33.0

2 14

[PATCH] qemu_namespace: Move umount() call into #fdef __linux__
by Michal Privoznik 05 Jan '23

05 Jan '23

In a recent commit I've introduced an umount() call. But the function where the call lives is compiled on all OSes, not just Linux. But umount() is Linux specific. Other OSes have unmount (FreeBSD), or maybe something else. But since namespaces are Linux specific, we can wrap the call in #ifdef __linux__ and not care about other OSes. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_namespace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index fc348c043e..5769a4dfe0 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -776,10 +776,12 @@ qemuDomainUnshareNamespace(virQEMUDriverConfig *cfg, goto cleanup; } +#if defined(__linux__) if (umount("/dev") < 0) { virReportSystemError(errno, "%s", _("failed to umount devfs on /dev")); return -1; } +#endif /* !defined(__linux__) */ if (virFileMoveMount(devPath, "/dev") < 0) goto cleanup; -- 2.38.2

2 1

[PATCH v2] virQEMUDriverGetDomainCapabilities: Validate arguments
by Michal Privoznik 05 Jan '23

05 Jan '23

When calling virConnectGetDomainCapabilities() (exposed as virsh domcapabilities) users have option to specify whatever sub-set of { emulatorbin, arch, machine, virttype } they want. Then we have a logic (hidden in virQEMUCapsCacheLookupDefault()) that picks qemuCaps that satisfy values passed by user. And whatever was not specified is then set to the default value as specified by picked qemuCaps. For instance: if no machine type was provided but emulatorbin was, then the machine type is set to the default one as defined by the emulatorbin. Or, when just virttype was set then the remaining three values are set to their respective defaults. Except, we have a crasher in this case: # virsh domcapabilities --virttype hvf error: Disconnected from qemu:///system due to end of file error: failed to get emulator capabilities error: End of file while reading data: Input/output error This is because for 'hvf' virttype (at least my) QEMU does not have any machine type. Therefore, @machine is set to NULL and the rest of the code does not expect that. What we can do about this is to validate all arguments. Well, except for the emulatorbin which is obtained from passed qemuCaps. This also fixes the issue when domcapabilities for a virttype of a different driver are requested, or a different arch. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2022-December/236460.html diff to v1: - validate @arch, @virttype as well, not just @machine src/qemu/qemu_conf.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index ae5bbcd138..6760bef14c 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1454,6 +1454,27 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriver *driver, g_autoptr(virDomainCaps) domCaps = NULL; const char *path = virQEMUCapsGetBinary(qemuCaps); + if (!virQEMUCapsIsArchSupported(qemuCaps, arch)) { + virReportError(VIR_ERR_INVALID_ARG, + _("Emulator '%s' does not support arch '%s'"), + path, virArchToString(arch)); + return NULL; + } + + if (!virQEMUCapsIsVirtTypeSupported(qemuCaps, virttype)) { + virReportError(VIR_ERR_INVALID_ARG, + _("Emulator '%s' does not support virt type '%s'"), + path, virDomainVirtTypeToString(virttype)); + return NULL; + } + + if (!virQEMUCapsIsMachineSupported(qemuCaps, virttype, machine)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Emulator '%s' does not support machine type '%s'"), + path, NULLSTR(machine)); + return NULL; + } + if (!(domCaps = virDomainCapsNew(path, machine, arch, virttype))) return NULL; -- 2.38.2

2 1

[PATCH v2 0/7] qemu_capabilities: Report Hyper-V Enlightenments in domcapabilities
by Michal Privoznik 05 Jan '23

05 Jan '23

v2 of: https://listman.redhat.com/archives/libvir-list/2022-December/236464.html diff to v1: - Merged some cleanup patches from v1 - Store capabilities in cache - More cleanup patches Michal Prívozník (7): virDomainCapsEnumFormat: Switch to virXMLFormatElement() virDomainCapsEnumFormat: Retrun void domain_capabilities: Expose Hyper-V Enlightenments qemuMonitorJSONMakeCPUModel: Introduce @hv_passthrough argument qemuMonitorJSONGetCPUModelExpansion: Introduce @hv_passthrough argument qemu_capabilities: Query for Hyper-V Enlightenments qemu_capabilities: Report Hyper-V Enlightenments in domcapabilities docs/formatdomaincaps.rst | 15 + src/conf/domain_capabilities.c | 38 +- src/conf/domain_capabilities.h | 8 + src/conf/schemas/domaincaps.rng | 10 + src/qemu/qemu_capabilities.c | 178 ++++++- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 21 +- src/qemu/qemu_monitor_json.h | 1 + tests/cputest.c | 2 +- tests/domaincapsdata/empty.xml | 1 + tests/domaincapsdata/libxl-xenfv.xml | 1 + tests/domaincapsdata/libxl-xenpv.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.sparc.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 + .../qemu_6.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + .../qemu_7.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 18 + .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 18 + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 18 + .../caps_4.2.0.aarch64.replies | 45 ++ .../caps_4.2.0.aarch64.xml | 1 + .../caps_4.2.0.x86_64.replies | 317 ++++++++++++ .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.replies | 46 ++ .../caps_5.0.0.aarch64.xml | 1 + .../caps_5.0.0.x86_64.replies | 318 ++++++++++++ .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.replies | 323 ++++++++++++ .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.replies | 47 ++ .../caps_5.2.0.aarch64.xml | 1 + .../caps_5.2.0.x86_64.replies | 324 +++++++++++++ .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.replies | 47 ++ .../caps_6.0.0.aarch64.xml | 1 + .../caps_6.0.0.x86_64.replies | 336 +++++++++++++ .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.replies | 338 +++++++++++++ .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.replies | 47 ++ .../caps_6.2.0.aarch64.xml | 1 + .../caps_6.2.0.x86_64.replies | 348 +++++++++++++ .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.aarch64.replies | 48 ++ .../caps_7.0.0.aarch64.xml | 1 + .../caps_7.0.0.x86_64.replies | 352 ++++++++++++++ .../caps_7.0.0.x86_64.xml | 1 + .../caps_7.1.0.x86_64.replies | 353 ++++++++++++++ .../caps_7.1.0.x86_64.xml | 1 + .../caps_7.2.0.x86_64.replies | 353 ++++++++++++++ .../caps_7.2.0.x86_64.xml | 1 + .../caps_8.0.0.x86_64.replies | 458 ++++++++++++++++++ .../caps_8.0.0.x86_64.xml | 16 + 103 files changed, 4495 insertions(+), 28 deletions(-) -- 2.38.2

2 12

Plans for the next release
by Jiri Denemark 04 Jan '23

04 Jan '23

We are getting close to the next release of libvirt. To aim for the release on Jan 16 I suggest entering the freeze on Tuesday Jan 10 and tagging RC2 on Thursday Jan 12. I hope this works for everyone. Jirka

1 0

[PATCH] virQEMUCapsLoadCache: Parse <selfvers/> properly
by Michal Privoznik 04 Jan '23

04 Jan '23

In a recent commit, when ditching virXPathULong() the parsing of <selfvers/> was changed. But it was changed to virXMLPropUInt() which is not correct because the value we're interested in is not in an attribute but element itself. Fixes: a3c7426839df25f4026707c5877be75f2461f5e9 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_capabilities.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e6024a2d75..0c16366f21 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4533,8 +4533,8 @@ virQEMUCapsLoadCache(virArch hostArch, } qemuCaps->libvirtCtime = (time_t)l; - if (virXMLPropUInt(ctxt->node, "selfvers", 10, VIR_XML_PROP_NONE, - &qemuCaps->libvirtVersion) < 0) + if (virXPathUInt("string(./selfvers)", ctxt, + &qemuCaps->libvirtVersion) < 0) return -1; if (!skipInvalidation && -- 2.38.2

2 1

[PATCH] qemu_namespace: Fix detection of nested mount points
by Michal Privoznik 03 Jan '23

03 Jan '23

When deciding whether to bind mount a path in domain's namespace, we look at the QEMU mount table (/proc/$pid/mounts) and try to match prefix of given path with one of mount points. Well, we do that in a bit clumsy way. For instance, if there's "/dev/hugepages" already mounted inside the namespace and we are deciding whether to bind mount "/dev/hugepages1G/..." we decide to skip over the path and NOT bind mount it. This is because plain STRPREFIX() is used and yes, the former is prefix of the latter. What we need to check also is whether the next character after the prefix is slash. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_namespace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index fb79460109..fc348c043e 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -1264,9 +1264,11 @@ qemuNamespacePrepareOneItem(qemuNamespaceMknodData *data, bool found = false; for (n = devMountsPath; n && *n; n++) { + const char *p; + if (STREQ(*n, "/dev")) continue; - if (STRPREFIX(item.file, *n)) { + if ((p = STRSKIP(item.file, *n)) && *p == '/') { found = true; break; } -- 2.38.2

2 1

[PATCH v1 0/7] qemu_capabilities: Report Hyper-V Enlightenments in domcapabilities
by Michal Privoznik 03 Jan '23

03 Jan '23

Michal Prívozník (7): domain_capabilities: s/qemuDomainCapsFeatureFormatSimple/virDomainCapsFeatureFormatSimple/ qemu_capabilities: Decrease scope of @hash in virQEMUCapsProbeQMPHostCPU() qemuMonitorJSONMakeCPUModel: Introduce @hv_passthrough argument qemuMonitorJSONGetCPUModelExpansion: Introduce @hv_passthrough argument qemu_capabilities: Query for Hyper-V Enlightenments domain_capabilities: Expose Hyper-V Enlightenments qemu_capabilities: Report Hyper-V Enlightenments in domcapabilities docs/formatdomaincaps.rst | 15 + src/conf/domain_capabilities.c | 28 +- src/conf/domain_capabilities.h | 8 + src/conf/schemas/domaincaps.rng | 10 + src/qemu/qemu_capabilities.c | 86 ++++- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 21 +- src/qemu/qemu_monitor_json.h | 1 + tests/cputest.c | 2 +- .../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.sparc.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 + .../qemu_6.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + .../qemu_7.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.replies | 45 +++ .../caps_4.2.0.x86_64.replies | 317 ++++++++++++++++ .../caps_5.0.0.aarch64.replies | 46 +++ .../caps_5.0.0.x86_64.replies | 318 ++++++++++++++++ .../caps_5.1.0.x86_64.replies | 323 ++++++++++++++++ .../caps_5.2.0.aarch64.replies | 47 +++ .../caps_5.2.0.x86_64.replies | 324 ++++++++++++++++ .../caps_6.0.0.aarch64.replies | 47 +++ .../caps_6.0.0.x86_64.replies | 336 +++++++++++++++++ .../caps_6.1.0.x86_64.replies | 338 +++++++++++++++++ .../caps_6.2.0.aarch64.replies | 47 +++ .../caps_6.2.0.x86_64.replies | 348 +++++++++++++++++ .../caps_7.0.0.aarch64.replies | 48 +++ .../caps_7.0.0.x86_64.replies | 352 +++++++++++++++++ .../caps_7.1.0.x86_64.replies | 353 ++++++++++++++++++ .../caps_7.2.0.x86_64.replies | 353 ++++++++++++++++++ 79 files changed, 3850 insertions(+), 24 deletions(-) -- 2.38.2

2 12

[PATCH 0/7] qemu: Cleanup code around TPM seclabels
by Michal Privoznik 03 Jan '23

03 Jan '23

*** BLURB HERE *** Michal Prívozník (7): qemu_security: Rework qemuSecurityCleanupTPMEmulator() qemu_security: Rename qemuSecurityCleanupTPMEmulator() qemu_security: Introduce qemuSecuritySetTPMLabels() qemu_tpm: Restore TPM labels on failed start qemu_tpm: Open code qemuSecurityStartTPMEmulator() qemu_security: Drop qemuSecurityStartTPMEmulator() docs: Recommend static seclabels for migration on shared storage docs/drvqemu.rst | 7 ++++ src/qemu/qemu_security.c | 90 ++++++++++------------------------------ src/qemu/qemu_security.h | 17 +++----- src/qemu/qemu_tpm.c | 15 ++++--- 4 files changed, 43 insertions(+), 86 deletions(-) -- 2.38.2

2 14

[PATCH v2] i386: Deprecate the -no-hpet QEMU command line option
by Thomas Huth 03 Jan '23

03 Jan '23

The HPET setting has been turned into a machine property a while ago already, so we should finally do the next step and deprecate the legacy CLI option, too. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- v2: - Rebased to current version from master branch / adjusted version info - Dropped the descrpition in hw/i386/pc.c (already done via another patch) Note: The "hpet" property should now show up in the output of the "query-command-line-options" QMP command since commit 2f129fc107b4a, so it should be feasible for libvirt now to properly probe for the property . docs/about/deprecated.rst | 6 ++++++ softmmu/vl.c | 1 + qemu-options.hx | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 93affe3669..2ae6a79b21 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -114,6 +114,12 @@ form is preferred. Using ``-drive if=none`` to configure the OTP device of the sifive_u RISC-V machine is deprecated. Use ``-drive if=pflash`` instead. +``-no-hpet`` (since 8.0) +'''''''''''''''''''''''' + +The HPET setting has been turned into a machine property. +Use ``-machine hpet=off`` instead. + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/softmmu/vl.c b/softmmu/vl.c index 798e1dc933..9bd0e52d01 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3259,6 +3259,7 @@ void qemu_init(int argc, char **argv) qdict_put_str(machine_opts_dict, "acpi", "off"); break; case QEMU_OPTION_no_hpet: + warn_report("-no-hpet is deprecated, use '-machine hpet=off' instead"); qdict_put_str(machine_opts_dict, "hpet", "off"); break; case QEMU_OPTION_no_reboot: diff --git a/qemu-options.hx b/qemu-options.hx index 7f99d15b23..a3adb4163e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2542,7 +2542,7 @@ DEF("no-hpet", 0, QEMU_OPTION_no_hpet, "-no-hpet disable HPET\n", QEMU_ARCH_I386) SRST ``-no-hpet`` - Disable HPET support. + Disable HPET support. Deprecated, use '-machine hpet=off' instead. ERST DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, -- 2.31.1

4 3

[PATCH 0/3] qemu: Add caps test data for qemu-8.0 cycle and prepare for deprecation of -no-hpet
by Peter Krempa 03 Jan '23

03 Jan '23

Peter Krempa (3): tests: qemucapabilitiesdata: Add test data for the qemu-8.0 dev cycle qemu: capabilities: Introduce QEMU_CAPS_MACHINE_HPET capability qemu: Use '-machine hpet=off' instead of '-no-hpet' src/qemu/qemu_capabilities.c | 9 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 29 +- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 253 + .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 252 + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 253 + .../caps_8.0.0.x86_64.replies | 39227 ++++++++++++++++ .../caps_8.0.0.x86_64.xml | 3253 ++ .../q35-virt-manager-basic.x86_64-latest.args | 3 +- .../x86_64-pc-graphics.x86_64-latest.args | 3 +- .../x86_64-pc-headless.x86_64-latest.args | 3 +- .../x86_64-q35-graphics.x86_64-latest.args | 3 +- .../x86_64-q35-headless.x86_64-latest.args | 3 +- 13 files changed, 43283 insertions(+), 11 deletions(-) create mode 100644 tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_8.0.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_8.0.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml -- 2.38.1

3 6

[PATCH 0/4] Check that max_clients is not less than max_anonymous_clients
by Martin Kletzander 02 Jan '23

02 Jan '23

One check is there, but there ought to be more. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2033879 Martin Kletzander (4): Fix test case to actually test something tests: Check error message in virnetdaemontest rpc: Fix error message in virNetServerSetClientLimits rpc: Check client limits in more places src/rpc/virnetserver.c | 19 ++++++++++-- ...nput-data-client-auth-pending-failure.json | 4 +-- ...nput-data-invalid-max-clients-failure.json | 31 +++++++++++++++++++ .../output-data-anon-clients.err | 1 + ...utput-data-client-auth-pending-failure.err | 1 + ...utput-data-invalid-max-clients-failure.err | 1 + tests/virnetdaemontest.c | 20 +++++++----- 7 files changed, 64 insertions(+), 13 deletions(-) create mode 100644 tests/virnetdaemondata/input-data-invalid-max-clients-failure.json create mode 100644 tests/virnetdaemondata/output-data-anon-clients.err create mode 100644 tests/virnetdaemondata/output-data-client-auth-pending-failure.err create mode 100644 tests/virnetdaemondata/output-data-invalid-max-clients-failure.err -- 2.39.0

2 5

Re: [PATCH] qemu: fix several codecheck in qemu_monitor.c
by Jiang Jiacheng 24 Dec '22

24 Dec '22

Ping... On 2022/12/8 20:49, Jiang Jiacheng wrote: > 1.clear passwd in debug log > 2.alignment > 3.use the same variable name for function definition and declaration > > Signed-off-by: Jiang Jiacheng <jiangjiacheng(a)huawei.com> > --- > src/qemu/qemu_monitor.c | 8 ++++---- > src/qemu/qemu_monitor.h | 6 +++--- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c > index 80f262cec7..de9a1b26f6 100644 > --- a/src/qemu/qemu_monitor.c > +++ b/src/qemu/qemu_monitor.c > @@ -943,7 +943,7 @@ qemuMonitorInitBalloonObjectPath(qemuMonitor *mon, > case VIR_DOMAIN_MEMBALLOON_MODEL_XEN: > case VIR_DOMAIN_MEMBALLOON_MODEL_NONE: > virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > - _("invalid model for virtio-balloon-pci")); > + _("invalid model for virtio-balloon-pci")); > return; > case VIR_DOMAIN_MEMBALLOON_MODEL_LAST: > default: > @@ -2053,8 +2053,8 @@ qemuMonitorSetPassword(qemuMonitor *mon, > if (!protocol) > return -1; > > - VIR_DEBUG("protocol=%s, password=%p, action_if_connected=%s", > - protocol, password, action_if_connected); > + VIR_DEBUG("protocol=%s, action_if_connected=%s", > + protocol, action_if_connected); > > QEMU_CHECK_MONITOR(mon); > > @@ -3485,7 +3485,7 @@ qemuMonitorBlockExportAdd(qemuMonitor *mon, > > int > qemuMonitorGetTPMModels(qemuMonitor *mon, > - char ***tpmmodels) > + char ***tpmmodels) > { > VIR_DEBUG("tpmmodels=%p", tpmmodels); > > diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h > index c690fc3655..7278f2e706 100644 > --- a/src/qemu/qemu_monitor.h > +++ b/src/qemu/qemu_monitor.h > @@ -627,8 +627,8 @@ struct _qemuMonitorCPUInfo { > }; > typedef struct _qemuMonitorCPUInfo qemuMonitorCPUInfo; > > -void qemuMonitorCPUInfoFree(qemuMonitorCPUInfo *list, > - size_t nitems); > +void qemuMonitorCPUInfoFree(qemuMonitorCPUInfo *cpus, > + size_t ncpus); > int qemuMonitorGetCPUInfo(qemuMonitor *mon, > qemuMonitorCPUInfo **vcpus, > size_t maxvcpus, > @@ -1184,7 +1184,7 @@ int qemuMonitorNBDServerAdd(qemuMonitor *mon, > const char *export, > bool writable, > const char *bitmap); > -int qemuMonitorNBDServerStop(qemuMonitor *); > +int qemuMonitorNBDServerStop(qemuMonitor *mon); > > int qemuMonitorBlockExportAdd(qemuMonitor *mon, > virJSONValue **props);

1 0

Re: [PATCH] conf: check vhost-user queues with vcpus
by Jiang Jiacheng 24 Dec '22

24 Dec '22

Ping... On 2022/12/8 20:49, Jiang Jiacheng wrote: > With kernel without the ref patch, if queues > vcpus, interrupts > will be centralized on one vcpu affecting guest performance. After > the ref patch merged, the queues whose number is greater than the > number of vcpus will not be used. > > Considering the above, it's better to check the counts of vhost-user > queues and vcpus. > > ref: > https://patchwork.kernel.org/project/linux-scsi/cover/1553682995-5682-1-git… > > Signed-off-by: Jiang Jiacheng <jiangjiacheng(a)huawei.com> > --- > src/conf/domain_validate.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c > index 95b8d9b419..6106e79999 100644 > --- a/src/conf/domain_validate.c > +++ b/src/conf/domain_validate.c > @@ -308,7 +308,7 @@ virSecurityDeviceLabelDefValidate(virSecurityDeviceLabelDef **seclabels, > > > static int > -virDomainDiskVhostUserValidate(const virDomainDiskDef *disk) > +virDomainDiskVhostUserValidate(const virDomainDef *def, const virDomainDiskDef *disk) > { > if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) { > virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > @@ -465,6 +465,12 @@ virDomainDiskVhostUserValidate(const virDomainDiskDef *disk) > return -1; > } > > + if (disk->queues > virDomainDefGetVcpus(def)) { > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > + _("vhost-user disk queues must <= vcpus")); > + return -1; > + } > + > return 0; > } > > @@ -807,7 +813,7 @@ virDomainDiskDefValidate(const virDomainDef *def, > } > > if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER && > - virDomainDiskVhostUserValidate(disk) < 0) { > + virDomainDiskVhostUserValidate(def, disk) < 0) { > return -1; > } >

1 0

[PATCH V3 0/7] qemu: support updating device's bootindex
by Jiang Jiacheng 24 Dec '22

24 Dec '22

Support updating device's(support cdrom, disk and network) bootindex online in virDomainUpdateDeviceFlags. The new bootindex will take effect after guest rebooting. Enable bootindex can be set to 0, it means cancel the device's bootindex. To use this feature, we need to get the device's xml first and modify the boot order in the xml, then use 'virsh update-device <domain> <xml> --flag' to update the bootindex. Note that the flag should be --config or --persistent if the vm is running. Jiang Jiacheng (7): qemu: Introduce qemuDomainChangeBootIndex to update device's bootindex qemu: Marking a device's bootindex can be changed qemu: check the bootIndex could be changed or not qemu: Support update disk's bootindex qemu: Support update net's bootindex qemu: Support set bootindex to 0 to cancel bootindex setting test: add a test for bootIndex = 0 provided by the user diff to v2: * improve function description and commit message * move functions in qemu_conf.c to qemu_domain.c * add a test for bootindex = 0 provided by user * fix a bug in logical of checking bootindex src/conf/device_conf.h | 3 + src/conf/domain_conf.c | 10 ++- src/conf/domain_postparse.c | 8 ++- src/conf/schemas/domaincommon.rng | 2 +- src/qemu/qemu_conf.c | 41 +++++++++++ src/qemu/qemu_conf.h | 5 ++ src/qemu/qemu_domain.c | 69 +++++++++++++++++- src/qemu/qemu_domain.h | 9 +++ src/qemu/qemu_driver.c | 32 +++++++++ src/qemu/qemu_hotplug.c | 17 +++-- src/qemu/qemu_monitor.c | 12 ++++ src/qemu/qemu_monitor.h | 6 ++ src/qemu/qemu_monitor_json.c | 22 ++++++ src/qemu/qemu_monitor_json.h | 6 ++ tests/qemuxml2argvdata/boot-order-set-0.xml | 72 +++++++++++++++++++ tests/qemuxml2xmloutdata/boot-order-set-0.xml | 72 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 17 files changed, 376 insertions(+), 11 deletions(-) create mode 100644 tests/qemuxml2argvdata/boot-order-set-0.xml create mode 100644 tests/qemuxml2xmloutdata/boot-order-set-0.xml -- 2.33.0

1 7

[PATCH] qemu: implement QEMU NBD source reconnect delay attribute
by Christian Nautze 23 Dec '22

23 Dec '22

Currently it's only possible to set this parameter during domain creation via QEMU commandline passthrough feature. With the new delay attribute it's also possible to set this parameter if you want to attach a new NBD disk using "virsh attach-device domain device.xml" e.g.: <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='nbd' name='foo'> <host name='example.org' port='6000'/> <reconnect enabled='yes' delay='10'/> </source> <target dev='vdb' bus='virtio'/> </disk> Signed-off-by: Christian Nautze <christian.nautze(a)exoscale.ch> --- docs/formatdomain.rst | 10 ++++++-- src/conf/domain_conf.c | 19 +++++++++++++++ src/conf/schemas/domaincommon.rng | 3 +++ src/conf/schemas/storagecommon.rng | 5 ++++ src/conf/storage_source_conf.c | 1 + src/conf/storage_source_conf.h | 4 ++++ src/qemu/qemu_block.c | 4 +++- src/qemu/qemu_domain.c | 9 ++++++++ .../disk-network-nbd.x86_64-latest.args | 23 +++++++++++-------- tests/qemuxml2argvdata/disk-network-nbd.xml | 8 +++++++ tests/qemuxml2xmloutdata/disk-network-nbd.xml | 9 ++++++++ 11 files changed, 82 insertions(+), 13 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index d7fffc6e0b..3fbeba644a 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2938,13 +2938,19 @@ paravirtualized driver is specified via the ``disk`` element. are intended to be default, then the entire element may be omitted. ``reconnect`` For disk type ``vhostuser`` configures reconnect timeout if the connection - is lost. It has two mandatory attributes: + is lost. This is set with the two mandatory attributes ``enabled`` and + ``timeout``. For disk type ``network`` and protocol ``nbd`` the QEMU NBD + reconnect delay can be set via the mandatory attributes ``enabled`` + and ``delay``: ``enabled`` If the reconnect feature is enabled, accepts ``yes`` and ``no`` ``timeout`` The amount of seconds after which hypervisor tries to reconnect. - + ``delay`` + The amount of seconds during which all requests are paused and will be rerun + after a successful reconnect. After that time, any delayed requests and all + future requests before a successful reconnect will immediately fail. For a "file" or "volume" disk type which represents a cdrom or floppy (the ``device`` attribute), it is possible to define policy what to do with the diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6c088ff295..909c78ef28 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7024,6 +7024,22 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, src->tlsFromConfig = !!value; } + if (src->protocol == VIR_STORAGE_NET_PROTOCOL_NBD) { + xmlNodePtr cur; + if ((cur = virXPathNode("./reconnect", ctxt))) { + virTristateBool enabled; + if (virXMLPropTristateBool(cur, "enabled", VIR_XML_PROP_NONE, + &enabled) < 0) + return -1; + + if (enabled == VIR_TRISTATE_BOOL_YES) { + if (virXMLPropUInt(cur, "delay", 10, VIR_XML_PROP_REQUIRED, + &src->reconnectDelay) < 0) + return -1; + } + } + } + /* for historical reasons we store the volume and image name in one XML * element although it complicates thing when attempting to access them. */ if (src->path && @@ -21729,6 +21745,9 @@ virDomainDiskSourceFormatNetwork(virBuffer *attrBuf, virBufferAddLit(childBuf, "/>\n"); } + if (src->reconnectDelay) { + virBufferAsprintf(childBuf, "<reconnect enabled='yes' delay='%u'/>\n", src->reconnectDelay); + } virBufferEscapeString(childBuf, "<snapshot name='%s'/>\n", src->snapshot); virBufferEscapeString(childBuf, "<config file='%s'/>\n", src->configFile); diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index c588a48fd2..72587416fe 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -2184,6 +2184,9 @@ </optional> <ref name="diskSourceCommon"/> <ref name="diskSourceNetworkHost"/> + <optional> + <ref name="reconnect"/> + </optional> <optional> <ref name="encryption"/> </optional> diff --git a/src/conf/schemas/storagecommon.rng b/src/conf/schemas/storagecommon.rng index 76714c9aad..2842376e78 100644 --- a/src/conf/schemas/storagecommon.rng +++ b/src/conf/schemas/storagecommon.rng @@ -61,6 +61,11 @@ <ref name="unsignedInt"/> </attribute> </optional> + <optional> + <attribute name="delay"> + <ref name="unsignedInt"/> + </attribute> + </optional> </element> </define> diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index 2b4cf5e241..edfd17c77c 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -810,6 +810,7 @@ virStorageSourceCopy(const virStorageSource *src, def->sslverify = src->sslverify; def->readahead = src->readahead; def->timeout = src->timeout; + def->reconnectDelay = src->reconnectDelay; def->metadataCacheMaxSize = src->metadataCacheMaxSize; /* storage driver metadata are not copied */ diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h index f2440cec6a..b60a4b3346 100644 --- a/src/conf/storage_source_conf.h +++ b/src/conf/storage_source_conf.h @@ -290,6 +290,10 @@ struct _virStorageSource { unsigned long long readahead; /* size of the readahead buffer in bytes */ unsigned long long timeout; /* connection timeout in seconds */ + /* NBD QEMU reconnect-delay option, + * 0 as default value */ + unsigned int reconnectDelay; + virStorageSourceNVMeDef *nvme; /* type == VIR_STORAGE_TYPE_NVME */ virDomainChrSourceDef *vhostuser; /* type == VIR_STORAGE_TYPE_VHOST_USER */ diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 8a6f601b29..6913c380a0 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -530,6 +530,7 @@ qemuBlockStorageSourceGetNBDProps(virStorageSource *src, "S:export", src->path, "S:tls-creds", tlsAlias, "S:tls-hostname", tlsHostname, + "p:reconnect-delay", src->reconnectDelay, NULL) < 0) return NULL; @@ -1817,7 +1818,8 @@ qemuBlockGetBackingStoreString(virStorageSource *src, src->ncookies == 0 && src->sslverify == VIR_TRISTATE_BOOL_ABSENT && src->timeout == 0 && - src->readahead == 0) { + src->readahead == 0 && + src->reconnectDelay == 0) { switch ((virStorageNetProtocol) src->protocol) { case VIR_STORAGE_NET_PROTOCOL_NBD: diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5c05032ce3..840d857f78 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4927,6 +4927,15 @@ qemuDomainValidateStorageSource(virStorageSource *src, } } + if (src->reconnectDelay > 0) { + if (actualType != VIR_STORAGE_TYPE_NETWORK || + src->protocol != VIR_STORAGE_NET_PROTOCOL_NBD) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("reconnect delay is supported only with NBD protocol")); + return -1; + } + } + if (src->query && (actualType != VIR_STORAGE_TYPE_NETWORK || (src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTPS && diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 21e619af3e..e8d13b0bd4 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -28,21 +28,24 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw","file":"libvirt-6-storage"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-6-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"bar","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw","file":"libvirt-5-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-5-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"bar","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-5-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"6000"},"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw","file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-4-format","id":"virtio-disk1"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"6000"},"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-4-format","id":"virtio-disk2"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"6000"},"export":"bar","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-3-format","id":"virtio-disk2"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"6000"},"export":"bar","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"libvirt-3-format","id":"virtio-disk3"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsock"},"export":"bar","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"libvirt-2-format","id":"virtio-disk3"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsock"},"export":"bar","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"libvirt-2-format","id":"virtio-disk4"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"foo","reconnect-delay":10,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"libvirt-1-format","id":"virtio-disk4"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"libvirt-1-format","id":"virtio-disk5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-network-nbd.xml b/tests/qemuxml2argvdata/disk-network-nbd.xml index 8ac6cc3b7b..243ffeb1ed 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.xml +++ b/tests/qemuxml2argvdata/disk-network-nbd.xml @@ -49,6 +49,14 @@ </source> <target dev='vde' bus='virtio'/> </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='nbd' name='foo'> + <host name='example.org' port='6000'/> + <reconnect enabled='yes' delay='10'/> + </source> + <target dev='vdf' bus='virtio'/> + </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd.xml b/tests/qemuxml2xmloutdata/disk-network-nbd.xml index f8dcca4bab..ed0c760d5b 100644 --- a/tests/qemuxml2xmloutdata/disk-network-nbd.xml +++ b/tests/qemuxml2xmloutdata/disk-network-nbd.xml @@ -54,6 +54,15 @@ <target dev='vde' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='nbd' name='foo'> + <host name='example.org' port='6000'/> + <reconnect enabled='yes' delay='10'/> + </source> + <target dev='vdf' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> -- 2.34.1

1 0

[PATCH] qemumonitortestutils: Fix line counting in qemuMonitorTestProcessFileEntries()
by Michal Privoznik 23 Dec '22

23 Dec '22

It just so happens that our JSON snippets in qemucapabilitiesdata/*.replies files are separated by an empty line. These empty lines are then overwritten to make a single line JSON. Nevertheless, the line counter @line is not incremented which then leads to a misleading numbers in errors: Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemumonitortestutils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 46791931b0..4e99c4b54e 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1302,6 +1302,9 @@ qemuMonitorTestProcessFileEntries(char *inputstr, continue; } + /* We've seen a new line, increment the counter */ + line++; + /* Cut off a single reply. */ *(tmp + 1) = '\0'; -- 2.38.2

2 1

[PATCH 0/3] Introduce and use virDirOpenSorted()
by Michal Privoznik 23 Dec '22

23 Dec '22

Whiles working on Hyper-V patches I've posted yesterday I ran domaincapstest occasionally and was puzzled for a moment that qemu-7.2.0 wasn't tested. Well it is, but it's harder to see immediately because individual test cases are in 'random' order: 11) qemu_7.2.0.x86_64 ... OK .... 46) qemu_5.1.0.sparc ... OK 47) qemu_6.1.0.x86_64 ... OK 48) qemu_6.1.0-q35.x86_64 ... OK 49) qemu_6.1.0-tcg.x86_64 ... OK 50) qemu_7.0.0.ppc64 ... OK 51) qemu_6.2.0.x86_64 ... OK 52) qemu_6.2.0-q35.x86_64 ... OK 53) qemu_6.2.0-tcg.x86_64 ... OK Huge thanks to Martin, who helped me realize (in 2/3) that 'struct dirent' while declared as 'char d_name[256]' is rather peculiar and a little dance is needed to copy it properly. Michal Prívozník (3): util: Introduce a wrapper struct around DIR util: Introduce virDirOpenSorted() tests: Use virDirOpenSorted() build-aux/syntax-check.mk | 2 +- src/bhyve/bhyve_capabilities.c | 2 +- src/bhyve/bhyve_firmware.c | 2 +- src/conf/capabilities.c | 8 +- src/conf/virdomainobjlist.c | 2 +- src/conf/virnetworkobj.c | 8 +- src/conf/virnwfilterbindingobjlist.c | 2 +- src/conf/virnwfilterobj.c | 2 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 4 +- src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_interop_config.c | 2 +- src/security/security_selinux.c | 4 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_util.c | 10 +- src/util/vircgroup.c | 4 +- src/util/vircgroupv1.c | 2 +- src/util/vircommand.c | 2 +- src/util/virdevmapper.c | 2 +- src/util/virfile.c | 146 ++++++++++++++++++++++----- src/util/virfile.h | 16 +-- src/util/virhook.c | 4 +- src/util/virhostcpu.c | 6 +- src/util/virmdev.c | 4 +- src/util/virnetdev.c | 2 +- src/util/virnuma.c | 2 +- src/util/virpci.c | 8 +- src/util/virprocess.c | 2 +- src/util/virresctrl.c | 8 +- src/util/virscsi.c | 4 +- src/util/virscsihost.c | 2 +- src/util/virusb.c | 2 +- src/util/virutil.c | 4 +- src/util/virvhba.c | 6 +- tests/testutilsqemu.c | 8 +- tests/virschematest.c | 4 +- tools/virt-host-validate-common.c | 2 +- 41 files changed, 201 insertions(+), 102 deletions(-) -- 2.38.2

2 4

[PATCH] virQEMUDriverGetDomainCapabilities: Validate machine type
by Michal Privoznik 22 Dec '22

22 Dec '22

When calling virConnectGetDomainCapabilities() (exposed as virsh domcapabilities) users have option to specify whatever sub-set of { emulatorbin, arch, machine, virttype } they want. Then we have a logic (hidden in virQEMUCapsCacheLookupDefault()) that picks qemuCaps that satisfy values passed by user. And whatever was not specified is then set to the default value as specified by picked qemuCaps. For instance: if no machine type was provided but emulatorbin was, then the machine type is set to the default one as defined by the emulatorbin. Or, when just virttype was set then the remaining three values are set to their respective defaults. Except, we have a crasher in this case: # virsh domcapabilities --virttype hvf error: Disconnected from qemu:///system due to end of file error: failed to get emulator capabilities error: End of file while reading data: Input/output error This is because for 'hvf' virttype (at least my) QEMU does not have any machine type. Therefore, @machine is set to NULL and the rest of the code does not expect that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index ae5bbcd138..cbd339f594 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1454,6 +1454,13 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriver *driver, g_autoptr(virDomainCaps) domCaps = NULL; const char *path = virQEMUCapsGetBinary(qemuCaps); + if (!virQEMUCapsIsMachineSupported(qemuCaps, virttype, machine)) { + virReportError(VIR_ERR_INVALID_ARG, + _("the machine '%s' is not supported by emulator '%s'"), + NULLSTR(machine), path); + return NULL; + } + if (!(domCaps = virDomainCapsNew(path, machine, arch, virttype))) return NULL; -- 2.38.2

2 1

[PATCH v2] MIPS: remove support for trap and emulate KVM
by Philippe Mathieu-Daudé 22 Dec '22

22 Dec '22

From: Paolo Bonzini <pbonzini(a)redhat.com> This support was limited to the Malta board, drop it. I do not have a machine that can run VZ KVM, so I am assuming that it works for -M malta as well. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> --- Since Paolo's v1: - Remove cpu_mips_kvm_um_phys_to_kseg0() declaration in "cpu.h" - Remove unused KVM_KSEG0_BASE/KVM_KSEG2_BASE definitions - Use USEG_LIMIT/KSEG0_BASE instead of magic values /* Check where the kernel has been linked */ - if (!(kernel_entry & 0x80000000ll)) { - error_report("CONFIG_KVM_GUEST kernels are not supported"); + if (kernel_entry <= USEG_LIMIT) { + error_report("Trap-and-Emul kernels (Linux CONFIG_KVM_GUEST)" + " are not supported"); - env->CP0_EBase = (cs->cpu_index & 0x3FF) | (int32_t)0x80000000; + env->CP0_EBase = KSEG0_BASE | (cs->cpu_index & 0x3FF); --- docs/about/deprecated.rst | 9 ------- docs/about/removed-features.rst | 9 +++++++ hw/mips/malta.c | 46 +++++---------------------------- target/mips/cpu.c | 7 +---- target/mips/cpu.h | 3 --- target/mips/internal.h | 3 --- target/mips/kvm.c | 11 +------- target/mips/sysemu/addr.c | 17 ------------ target/mips/sysemu/physaddr.c | 13 ---------- 9 files changed, 18 insertions(+), 100 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 93affe3669..b28f50b22f 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -199,15 +199,6 @@ deprecated. Use ``sections`` instead. Member ``section-size`` in return value elements with meta-type ``uint64`` is deprecated. Use ``sections`` instead. -System accelerators -------------------- - -MIPS ``Trap-and-Emul`` KVM support (since 6.0) -'''''''''''''''''''''''''''''''''''''''''''''' - -The MIPS ``Trap-and-Emul`` KVM host and guest support has been removed -from Linux upstream kernel, declare it deprecated. - Host Architectures ------------------ diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 63df9848fd..22b4b5d128 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -617,6 +617,15 @@ x86 ``Icelake-Client`` CPU (removed in 7.1) There isn't ever Icelake Client CPU, it is some wrong and imaginary one. Use ``Icelake-Server`` instead. +System accelerators +------------------- + +MIPS "Trap-and-Emulate" KVM support (removed in 8.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''' + +The MIPS "Trap-and-Emulate" KVM host and guest support was removed +from Linux in 2021, and is not supported anymore by QEMU either. + System emulator machines ------------------------ diff --git a/hw/mips/malta.c b/hw/mips/malta.c index e5050ecd3c..fed8b65f1e 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -58,6 +58,7 @@ #include "semihosting/semihost.h" #include "hw/mips/cps.h" #include "hw/qdev-clock.h" +#include "target/mips/internal.h" #define ENVP_PADDR 0x2000 #define ENVP_VADDR cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR) @@ -870,7 +871,6 @@ static uint64_t load_kernel(void) uint32_t *prom_buf; long prom_size; int prom_index = 0; - uint64_t (*xlate_to_kseg0) (void *opaque, uint64_t addr); uint8_t rng_seed[32]; char rng_seed_hex[sizeof(rng_seed) * 2 + 1]; size_t rng_seed_prom_offset; @@ -894,19 +894,10 @@ static uint64_t load_kernel(void) } /* Check where the kernel has been linked */ - if (kernel_entry & 0x80000000ll) { - if (kvm_enabled()) { - error_report("KVM guest kernels must be linked in useg. " - "Did you forget to enable CONFIG_KVM_GUEST?"); - exit(1); - } - - xlate_to_kseg0 = cpu_mips_phys_to_kseg0; - } else { - /* if kernel entry is in useg it is probably a KVM T&E kernel */ - mips_um_ksegs_enable(); - - xlate_to_kseg0 = cpu_mips_kvm_um_phys_to_kseg0; + if (kernel_entry <= USEG_LIMIT) { + error_report("Trap-and-Emul kernels (Linux CONFIG_KVM_GUEST)" + " are not supported"); + exit(1); } /* load initrd */ @@ -947,7 +938,7 @@ static uint64_t load_kernel(void) if (initrd_size > 0) { prom_set(prom_buf, prom_index++, "rd_start=0x%" PRIx64 " rd_size=%" PRId64 " %s", - xlate_to_kseg0(NULL, initrd_offset), + cpu_mips_phys_to_kseg0(NULL, initrd_offset), initrd_size, loaderparams.kernel_cmdline); } else { prom_set(prom_buf, prom_index++, "%s", loaderparams.kernel_cmdline); @@ -1039,11 +1030,6 @@ static void main_cpu_reset(void *opaque) } malta_mips_config(cpu); - - if (kvm_enabled()) { - /* Start running from the bootloader we wrote to end of RAM */ - env->active_tc.PC = 0x40000000 + loaderparams.ram_low_size; - } } static void create_cpu_without_cps(MachineState *ms, MaltaState *s, @@ -1177,13 +1163,7 @@ void mips_malta_init(MachineState *machine) fl_idx++; if (kernel_filename) { ram_low_size = MIN(ram_size, 256 * MiB); - /* For KVM we reserve 1MB of RAM for running bootloader */ - if (kvm_enabled()) { - ram_low_size -= 0x100000; - bootloader_run_addr = cpu_mips_kvm_um_phys_to_kseg0(NULL, ram_low_size); - } else { - bootloader_run_addr = cpu_mips_phys_to_kseg0(NULL, RESET_ADDRESS); - } + bootloader_run_addr = cpu_mips_phys_to_kseg0(NULL, RESET_ADDRESS); /* Write a small bootloader to the flash location. */ loaderparams.ram_size = ram_size; @@ -1200,20 +1180,8 @@ void mips_malta_init(MachineState *machine) write_bootloader_nanomips(memory_region_get_ram_ptr(bios), bootloader_run_addr, kernel_entry); } - if (kvm_enabled()) { - /* Write the bootloader code @ the end of RAM, 1MB reserved */ - write_bootloader(memory_region_get_ram_ptr(ram_low_preio) + - ram_low_size, - bootloader_run_addr, kernel_entry); - } } else { target_long bios_size = FLASH_SIZE; - /* The flash region isn't executable from a KVM guest */ - if (kvm_enabled()) { - error_report("KVM enabled but no -kernel argument was specified. " - "Booting from flash is not supported with KVM."); - exit(1); - } /* Load firmware from flash. */ if (!dinfo) { /* Load a BIOS image. */ diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 17bbcbf5ff..f8c8e0ba39 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -291,12 +291,7 @@ static void mips_cpu_reset_hold(Object *obj) env->tlb->tlb_in_use = env->tlb->nb_tlb; env->CP0_Wired = 0; env->CP0_GlobalNumber = (cs->cpu_index & 0xFF) << CP0GN_VPId; - env->CP0_EBase = (cs->cpu_index & 0x3FF); - if (mips_um_ksegs_enabled()) { - env->CP0_EBase |= 0x40000000; - } else { - env->CP0_EBase |= (int32_t)0x80000000; - } + env->CP0_EBase = KSEG0_BASE | (cs->cpu_index & 0x3FF); if (env->CP0_Config3 & (1 << CP0C3_CMGCR)) { env->CP0_CMGCRBase = 0x1fbf8000 >> 4; } diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 0a085643a3..caf2b06911 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1296,11 +1296,8 @@ void cpu_set_exception_base(int vp_index, target_ulong address); uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr); uint64_t cpu_mips_phys_to_kseg0(void *opaque, uint64_t addr); -uint64_t cpu_mips_kvm_um_phys_to_kseg0(void *opaque, uint64_t addr); uint64_t cpu_mips_kseg1_to_phys(void *opaque, uint64_t addr); uint64_t cpu_mips_phys_to_kseg1(void *opaque, uint64_t addr); -bool mips_um_ksegs_enabled(void); -void mips_um_ksegs_enable(void); #if !defined(CONFIG_USER_ONLY) diff --git a/target/mips/internal.h b/target/mips/internal.h index 57b312689a..4b0031d10d 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -99,9 +99,6 @@ int mips_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); #define KSEG2_BASE ((target_ulong)(int32_t)0xC0000000UL) #define KSEG3_BASE ((target_ulong)(int32_t)0xE0000000UL) -#define KVM_KSEG0_BASE ((target_ulong)(int32_t)0x40000000UL) -#define KVM_KSEG2_BASE ((target_ulong)(int32_t)0x60000000UL) - #if !defined(CONFIG_USER_ONLY) enum { diff --git a/target/mips/kvm.c b/target/mips/kvm.c index bcb8e06b2c..c14e8f550f 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -1268,25 +1268,16 @@ int kvm_arch_msi_data_to_gsi(uint32_t data) int mips_kvm_type(MachineState *machine, const char *vm_type) { -#if defined(KVM_CAP_MIPS_VZ) || defined(KVM_CAP_MIPS_TE) +#if defined(KVM_CAP_MIPS_VZ) int r; KVMState *s = KVM_STATE(machine->accelerator); -#endif -#if defined(KVM_CAP_MIPS_VZ) r = kvm_check_extension(s, KVM_CAP_MIPS_VZ); if (r > 0) { return KVM_VM_MIPS_VZ; } #endif -#if defined(KVM_CAP_MIPS_TE) - r = kvm_check_extension(s, KVM_CAP_MIPS_TE); - if (r > 0) { - return KVM_VM_MIPS_TE; - } -#endif - return -1; } diff --git a/target/mips/sysemu/addr.c b/target/mips/sysemu/addr.c index 86f1c129c9..4f025be44a 100644 --- a/target/mips/sysemu/addr.c +++ b/target/mips/sysemu/addr.c @@ -23,8 +23,6 @@ #include "qemu/osdep.h" #include "cpu.h" -static int mips_um_ksegs; - uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr) { return addr & 0x1fffffffll; @@ -35,11 +33,6 @@ uint64_t cpu_mips_phys_to_kseg0(void *opaque, uint64_t addr) return addr | ~0x7fffffffll; } -uint64_t cpu_mips_kvm_um_phys_to_kseg0(void *opaque, uint64_t addr) -{ - return addr | 0x40000000ll; -} - uint64_t cpu_mips_kseg1_to_phys(void *opaque, uint64_t addr) { return addr & 0x1fffffffll; @@ -49,13 +42,3 @@ uint64_t cpu_mips_phys_to_kseg1(void *opaque, uint64_t addr) { return (addr & 0x1fffffffll) | 0xffffffffa0000000ll; } - -bool mips_um_ksegs_enabled(void) -{ - return mips_um_ksegs; -} - -void mips_um_ksegs_enable(void) -{ - mips_um_ksegs = 1; -} diff --git a/target/mips/sysemu/physaddr.c b/target/mips/sysemu/physaddr.c index 1918633aa1..2970df8a09 100644 --- a/target/mips/sysemu/physaddr.c +++ b/target/mips/sysemu/physaddr.c @@ -130,19 +130,6 @@ int get_physical_address(CPUMIPSState *env, hwaddr *physical, /* effective address (modified for KVM T&E kernel segments) */ target_ulong address = real_address; - if (mips_um_ksegs_enabled()) { - /* KVM T&E adds guest kernel segments in useg */ - if (real_address >= KVM_KSEG0_BASE) { - if (real_address < KVM_KSEG2_BASE) { - /* kseg0 */ - address += KSEG0_BASE - KVM_KSEG0_BASE; - } else if (real_address <= USEG_LIMIT) { - /* kseg2/3 */ - address += KSEG2_BASE - KVM_KSEG2_BASE; - } - } - } - if (address <= USEG_LIMIT) { /* useg */ uint16_t segctl; -- 2.38.1

2 2

[PATCH v2 1/2] libxl: add validation if sound device is supported
by Marek Marczykowski-Górecki 21 Dec '22

21 Dec '22

Xen supports only subset of libvirt's sound devices, and starting with Xen 4.17 it is enforced by libxl. Verify it early. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/libxl/libxl_domain.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 2d53250895..6507e34469 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -312,6 +312,27 @@ libxlDomainDefValidate(const virDomainDef *def, return -1; } + if (def->nsounds > 0) { + virDomainSoundDef *snd = def->sounds[0]; + switch (snd->model) { + case VIR_DOMAIN_SOUND_MODEL_ICH6: + case VIR_DOMAIN_SOUND_MODEL_ES1370: + case VIR_DOMAIN_SOUND_MODEL_AC97: + case VIR_DOMAIN_SOUND_MODEL_SB16: + break; + default: + case VIR_DOMAIN_SOUND_MODEL_PCSPK: + case VIR_DOMAIN_SOUND_MODEL_ICH7: + case VIR_DOMAIN_SOUND_MODEL_USB: + case VIR_DOMAIN_SOUND_MODEL_ICH9: + case VIR_DOMAIN_SOUND_MODEL_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported audio model %s"), + virDomainSoundModelTypeToString(snd->model)); + return -1; + } + } + return 0; } -- 2.37.3

2 3

[PATCH V3 00/11] spec: Decompose the daemon subpackage
by Jim Fehlig 21 Dec '22

21 Dec '22

This is V3 of https://listman.redhat.com/archives/libvir-list/2022-December/236337.html The end goal is to remove the libvirt-dameon dependency on the various libvirt-daemon-driver-foo subpackages, allowing installation of a modular daemon configuration without the traditional monolithic libvirtd. Changes from V2: * Move more files and dependencies to the libvirt-daemon-common package * Address many more review comments Jim Fehlig (11): spec: Move virtlockd to a new subpackage libvirt-daemon-lock spec: Move virtlogd to a new subpackage libvirt-daemon-log spec: Move virtproxyd to a new subpackage libvirt-daemon-proxy spec: Move lockd plugin to a new subpackage spec: Rename the libvirt-lock-sanlock subpackage spec: Move common files and dependencies to libvirt-daemon-common spec: Add module-init-tools dependency to nodedev and lxc drivers spec: Add numad dependency to qemu and lxc drivers spec: Remove libvirt-daemon dependency from drivers spec: Remove libvirt-daemon dependency from hypervisor subpackages kbase: Update rpm-deployment.rst with new subpackages docs/kbase/rpm-deployment.rst | 50 ++++-- libvirt.spec.in | 329 ++++++++++++++++++++++++---------- 2 files changed, 267 insertions(+), 112 deletions(-) -- 2.38.1

2 16

[PATCH] libxl: adjust 'ich6' sound card name
by Marek Marczykowski-Górecki 20 Dec '22

20 Dec '22

Xen 4.17 has strict parsing of 'soundhw' option that allows only specific values (instead of passing through any value directly to qemu's -soundhw option, it uses -device now). For 'intel-hda' audio device, it requires "hda" string. "hda" works with older libxl too. Other supported models are the same as in libvirt XML. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/libxl/libxl_conf.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index d13e48abb2..b84257bc12 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -593,7 +593,26 @@ libxlMakeDomBuildInfo(virDomainDef *def, */ virDomainSoundDef *snd = def->sounds[0]; - b_info->u.hvm.soundhw = g_strdup(virDomainSoundModelTypeToString(snd->model)); + switch (snd->model) { + case VIR_DOMAIN_SOUND_MODEL_ICH6: + b_info->u.hvm.soundhw = g_strdup("hda"); + break; + case VIR_DOMAIN_SOUND_MODEL_ES1370: + case VIR_DOMAIN_SOUND_MODEL_AC97: + case VIR_DOMAIN_SOUND_MODEL_SB16: + b_info->u.hvm.soundhw = g_strdup(virDomainSoundModelTypeToString(snd->model)); + break; + default: + case VIR_DOMAIN_SOUND_MODEL_PCSPK: + case VIR_DOMAIN_SOUND_MODEL_ICH7: + case VIR_DOMAIN_SOUND_MODEL_USB: + case VIR_DOMAIN_SOUND_MODEL_ICH9: + case VIR_DOMAIN_SOUND_MODEL_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported audio model %s"), + virDomainSoundModelTypeToString(snd->model)); + return -1; + } } for (i = 0; i < def->os.nBootDevs; i++) { -- 2.37.3

2 1

[PATCH 0/2] util: qemu: Perform the 'skipKey' handling only on the top level object
by Peter Krempa 20 Dec '22

20 Dec '22

Semantically we need to handle one of the keys in the top level object spearately, thus skipping it in nested objects doesn't make sense. Peter Krempa (2): virqemu: Don't strip the requested key from nested objects util: qemu: Remove 'skipKey' argument from virQEMUBuildCommandLineJSONArrayFormatFunc prototype src/util/virqemu.c | 21 +++++++++------------ src/util/virqemu.h | 12 ++++-------- 2 files changed, 13 insertions(+), 20 deletions(-) -- 2.38.1

2 3

[RFC PATCH 0/1] secret: Inhibit shutdown for ephemeral secrets
by Michal Privoznik 20 Dec '22

20 Dec '22

I'm kind of convinced that we want to do this, but also it's a significant change in the behaviour of the daemon, hence RFC prefix. This stemmed from a discussion with a user who wants us to use something more secure than base64 encoded secret values stored on a disk. They suggested storing the values in TPM and while that might sound like a good idea, I suggested using ephemeral secrets for the time being. Well, because of '--timeout 120', ephemeral secrets are short lived, indeed. Meanwhile, let me see if there's a library we could use to talk to TPM. Michal Prívozník (1): secret: Inhibit shutdown for ephemeral secrets src/secret/secret_driver.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) -- 2.38.2

2 3

[PATCH V2 0/9] spec: Decompose the daemon subpackage
by Jim Fehlig 19 Dec '22

19 Dec '22

This is a V2 of: https://listman.redhat.com/archives/libvir-list/2022-December/236073.html Original RFC: https://listman.redhat.com/archives/libvir-list/2022-November/235924.html The end goal is to remove the libvirt-dameon dependency on the various libvirt-daemon-driver-foo subpackages, allowing installation of a modular daemon configuration without the traditional monolithic libvirtd. Change from V1: - Change name of new subpackage libvirt-daemon-client to libvirt-daemon-common - Rename the libvirt-lock-sanlock package to libvirt-daemon-plugin-sanlock - Update rpm-deployment kbase article - Misc review comments addressed Jim Fehlig (9): spec: Move virtlockd to a new subpackage libvirt-daemon-lock spec: Move virtlogd to a new subpackage libvirt-daemon-log spec: Move virtproxyd to a new subpackage libvirt-daemon-proxy spec: Move lockd plugin to a new subpackage spec: Rename the libvirt-lock-sanlock subpackage spec: Move common files to a new subpackage libvirt-daemon-common spec: Remove libvirt-daemon dependency from drivers spec: Remove libvirt-daemon dependency from hypervisor subpackages kbase: Update rpm-deployment.rst with new subpackages docs/kbase/rpm-deployment.rst | 38 ++++- libvirt.spec.in | 294 +++++++++++++++++++++++----------- 2 files changed, 235 insertions(+), 97 deletions(-) -- 2.38.1

3 35

Setting SELinux label on TPM state during migration
by Michal Prívozník 19 Dec '22

19 Dec '22

Stefan, as you saw, I'm trying to implement support for migration with TPM state on a shared volume. I mean, it is working when the shared volume is an NFS mount point because NFS does not really propagate SELinux labels, but rather has this 'virt_use_nfs' sebool which effectivelly allows all svirt_t processes to access NFS (thus including swtpm). But things get trickier when a distributed FS that knows SELinux properly (e.g. ceph) is used instead. What I am currently struggling with is - finding the sweet spot when the source swtpm has let go of the state and the destination has not accessed it (because if it did it would get EPERM). Bottom line - the SELinux label is generated dynamically on each guest startup (to ensure its uniqueness on the system). Therefore, the label on the destination is different to the one on the source. The behavior I'm seeing now is: 1) the source starts migration: {"execute":"migrate","arguments":{"detach":true,"resume":false,"uri":"fd:migrate"},"id":"libvirt-428"} 2) the destination does not touch the swtpm state right away, but when the TPM state comes in the migration stream, it is touched. Partial logs from the destination: -> {"execute":"migrate-incoming","arguments":{"uri":"tcp:[::]:49152"},"id":"libvirt-415"} <- {"timestamp": {"seconds": 1671449778, "microseconds": 500164}, "event": "MIGRATION", "data": {"status": "setup"}}] <- {"return": {}, "id": "libvirt-415"} <- {"timestamp": {"seconds": 1671449778, "microseconds": 732358}, "event": "MIGRATION", "data": {"status": "active"}} Now, before QEMU sends MIGRATION status:completed, I can see QEMU accessing the TPM state: Thread 1 "qemu-kvm" hit Breakpoint 1, tpm_emulator_set_state_blob (tpm_emu=0x5572af389cb0, type=1, tsb=0x5572af389db0, flags=0) at ../backends/tpm/tpm_emulator.c:796 796 { (gdb) bt #0 tpm_emulator_set_state_blob (tpm_emu=0x5572af389cb0, type=1, tsb=0x5572af389db0, flags=0) at ../backends/tpm/tpm_emulator.c:796 #1 0x00005572acf21fe5 in tpm_emulator_post_load (opaque=0x5572af389cb0, version_id=<optimized out>) at ../backends/tpm/tpm_emulator.c:868 #2 0x00005572acf25497 in vmstate_load_state (f=0x5572af512a10, vmsd=0x5572ad7743b8 <vmstate_tpm_emulator>, opaque=0x5572af389cb0, version_id=1) at ../migration/vmstate.c:162 #3 0x00005572acf45753 in qemu_loadvm_state_main (f=0x5572af512a10, mis=0x5572af39b4e0) at ../migration/savevm.c:876 #4 0x00005572acf47591 in qemu_loadvm_state (f=0x5572af512a10) at ../migration/savevm.c:2712 #5 0x00005572acf301f6 in process_incoming_migration_co (opaque=<optimized out>) at ../migration/migration.c:591 #6 0x00005572ad400976 in coroutine_trampoline (i0=<optimized out>, i1=<optimized out>) at ../util/coroutine-ucontext.c:177 #7 0x00007f64ca22a360 in ?? () from target:/lib64/libc.so.6 #8 0x00007f64c948cbc0 in ?? () #9 0x0000000000000000 in ?? () This in turn means that swtpm on the destination is going to CMD_INIT itself while the source is still using it. I wonder what we can do about this. Perhaps - postpone init until the time the vCPUs on the destination are resumed? That way libvirt on the source could restore labels (effectively cut the source swtpm process off the TPM state), then libvirtd on the destination could set the label and 'cont'. If 'cont' fails for whatever reason then the source libvirtd would just set the label on the TPM state and everything is back to normal. Corresponding BZ link: https://bugzilla.redhat.com/show_bug.cgi?id=2130192 Michal

3 2

Libvirt support for qemu reconnect flag
by Miguel Ping 19 Dec '22

19 Dec '22

Hello, Qemu has support for reconnect-delay parameter, that allows for the qemu nbd client to retry failed NBD operations. This is useful if you are running a custom NBD server and want to update the server without failing requests. Unfortunately, the only way to supply these flags is at domain creation via qemu commandline passthrough feature [1]; there is no way to supply them when eg hotpluggin a disk via eg: "virsh attach-device ..." Is there interest in libvirt for a patch that supports qemu "reconnect delay" param? What would be the best way to move forward with such a patch? I think the param can be supported in either the device definition (eg: the <reconnect enabled='yes' timeout='10'/> option already exists for disk type="vhostuser"), or globally via the qemu.conf configuration file. Thank you for your time [1] https://libvirt.org/kbase/qemu-passthrough-security.html#xml-document-addit…

1 0

[PATCH v2 0/3] More work on deprecation/removal of clear text passwords
by Daniel P. Berrangé 16 Dec '22

16 Dec '22

This deprecates the -iscsi clear text 'password' option and deletes the previously deprecated -spice 'password' option. Changed in v2: * Fixed section placement for iscsi deprecation docs * Fixed missing brackets in -iscsi help * Write in past tense for -spice password removal docs Daniel P. Berrangé (3): block: mention 'password-secret' option for -iscsi block: deprecate iSCSI 'password' in favour of 'password-secret' ui: remove deprecated 'password' option for SPICE block/iscsi.c | 3 +++ docs/about/deprecated.rst | 16 ++++++++-------- docs/about/removed-features.rst | 7 +++++++ qemu-options.hx | 13 +++---------- ui/spice-core.c | 15 --------------- 5 files changed, 21 insertions(+), 33 deletions(-) -- 2.38.1

2 6

[PATCH 0/3] More work on deprecation/removal of clear text passwords
by Daniel P. Berrangé 16 Dec '22

16 Dec '22

This deprecates the -iscsi clear text 'password' option and deletes the previously deprecated -spice 'password' option. Daniel P. Berrangé (3): block: mention 'password-secret' option for -iscsi block: deprecate iSCSI 'password' in favour of 'password-secret' ui: remove deprecated 'password' option for SPICE block/iscsi.c | 3 +++ docs/about/deprecated.rst | 19 +++++++++++-------- docs/about/removed-features.rst | 7 +++++++ qemu-options.hx | 11 ++--------- ui/spice-core.c | 15 --------------- 5 files changed, 23 insertions(+), 32 deletions(-) -- 2.38.1

3 7

[libvirt PATCHv2 0/2] add external backend for tpm
by Ján Tomko 16 Dec '22

16 Dec '22

v2: add more chardev-like attributes to the source https://bugzilla.redhat.com/show_bug.cgi?id=2063723 Ján Tomko (2): qemu: add external backend for tpm qemu: add tests for external swtpm src/conf/domain_audit.c | 11 +++++ src/conf/domain_conf.c | 35 ++++++++++++++++ src/conf/domain_conf.h | 4 ++ src/conf/domain_validate.c | 15 +++++++ src/conf/schemas/domaincommon.rng | 22 ++++++++++ src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_cgroup.c | 1 + src/qemu/qemu_command.c | 11 ++++- src/qemu/qemu_domain.c | 4 ++ src/qemu/qemu_namespace.c | 1 + src/qemu/qemu_tpm.c | 2 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.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 | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 + .../qemu_6.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + .../qemu_7.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 1 + .../tpm-external.x86_64-latest.args | 36 +++++++++++++++++ tests/qemuxml2argvdata/tpm-external.xml | 40 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../tpm-external.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 63 files changed, 236 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/tpm-external.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-external.xml create mode 120000 tests/qemuxml2xmloutdata/tpm-external.x86_64-latest.xml -- 2.38.1

2 4

[libvirt PATCH] qemu: tpm: fix spacing
by Ján Tomko 15 Dec '22

15 Dec '22

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial src/qemu/qemu_tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 0939f64e4e..36d5beb202 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -213,7 +213,7 @@ qemuTPMEmulatorCreateStorage(virDomainTPMDef *tpm, static void qemuTPMEmulatorDeleteStorage(virDomainTPMDef *tpm) { - g_autofree char *path = g_path_get_dirname(tpm->data.emulator.storagepath); + g_autofree char *path = g_path_get_dirname(tpm->data.emulator.storagepath); ignore_value(virFileDeleteTree(path)); } -- 2.38.1

1 0

[libvirt PATCH 0/2] kbase: Reorder contents for rpm-deployment
by Andrea Bolognani 15 Dec '22

15 Dec '22

Andrea Bolognani (2): kbase: Reorder sections kbase: Reorder deployments docs/kbase/rpm-deployment.rst | 134 +++++++++++++++++----------------- 1 file changed, 67 insertions(+), 67 deletions(-) -- 2.38.1

2 4