- Devel - libvirt List Archives

[PATCH (pushed)] qemu: Fix variable sizing issues with 'bandwidth' argument of qemuBlockCommit
by Peter Krempa 09 Jan '23

09 Jan '23

The patch moving the code didn't faithfully represent the typecasting of the 'bandwidth' variable needed to properly convert from the legacy 'unsigned long' argument which resulted in a build failure on 32 bit systems: ../src/qemu/qemu_block.c: In function ‘qemuBlockCommit’: ../src/qemu/qemu_block.c:3249:23: error: comparison is always false due to limited range of data type [-Werror=type-limits] 3249 | if (bandwidth > LLONG_MAX >> 20) { | ^ Fix it by returning the check into qemuDomainBlockCommit as it's needed only because of the legacy argument type in the old API and use 'unsigned long long' for qemuBlockCommit. Fixes: f5a77198bf9 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-breaker rule. src/qemu/qemu_block.c | 15 ++------------- src/qemu/qemu_block.h | 2 +- src/qemu/qemu_driver.c | 14 +++++++++++++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 7ea42961b6..9bfb06ac08 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3205,7 +3205,7 @@ qemuBlockExportAddNBD(virDomainObj *vm, * @baseSource: disk source within backing chain to commit data into * @topSource: disk source within backing chain with data we will commit * @top_parent: disk source that has @topSource as backing disk - * @bandwidth: bandwidth limit, flags determine the unit + * @bandwidth: bandwidth limit in bytes/s * @asyncJob: qemu async job type * @autofinalize: virTristateBool controlling qemu block job finalization * @flags: bitwise-OR of virDomainBlockCommitFlags @@ -3227,7 +3227,7 @@ qemuBlockCommit(virDomainObj *vm, virStorageSource *baseSource, virStorageSource *topSource, virStorageSource *top_parent, - unsigned long bandwidth, + unsigned long long bandwidth, virDomainAsyncJob asyncJob, virTristateBool autofinalize, unsigned int flags) @@ -3244,17 +3244,6 @@ qemuBlockCommit(virDomainObj *vm, if (virDomainObjCheckActive(vm) < 0) return NULL; - /* Convert bandwidth MiB to bytes, if necessary */ - if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES)) { - if (bandwidth > LLONG_MAX >> 20) { - virReportError(VIR_ERR_OVERFLOW, - _("bandwidth must be less than %llu"), - LLONG_MAX >> 20); - return NULL; - } - bandwidth <<= 20; - } - if (!qemuDomainDiskBlockJobIsSupported(disk)) return NULL; diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index a8079c2207..eac986e0f0 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -283,7 +283,7 @@ qemuBlockCommit(virDomainObj *vm, virStorageSource *baseSource, virStorageSource *topSource, virStorageSource *top_parent, - unsigned long bandwidth, + unsigned long long bandwidth, virDomainAsyncJob asyncJob, virTristateBool autofinalize, unsigned int flags); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3ea48c9049..d9f7ce234e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14994,6 +14994,7 @@ qemuDomainBlockCommit(virDomainPtr dom, virStorageSource *topSource; virStorageSource *baseSource = NULL; virStorageSource *top_parent = NULL; + unsigned long long speed = bandwidth; g_autoptr(qemuBlockJobData) job = NULL; virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW | @@ -15011,6 +15012,17 @@ qemuDomainBlockCommit(virDomainPtr dom, if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; + /* Convert bandwidth MiB to bytes, if necessary */ + if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES)) { + if (speed > LLONG_MAX >> 20) { + virReportError(VIR_ERR_OVERFLOW, + _("bandwidth must be less than %llu"), + LLONG_MAX >> 20); + goto endjob; + } + speed <<= 20; + } + if (!(disk = qemuDomainDiskByName(vm->def, path))) goto endjob; @@ -15027,7 +15039,7 @@ qemuDomainBlockCommit(virDomainPtr dom, goto endjob; job = qemuBlockCommit(vm, disk, baseSource, topSource, top_parent, - bandwidth, VIR_ASYNC_JOB_NONE, VIR_TRISTATE_BOOL_YES, + speed, VIR_ASYNC_JOB_NONE, VIR_TRISTATE_BOOL_YES, flags); if (job) ret = 0; -- 2.38.1

1 0

[PATCH V6 00/11] spec: Decompose the daemon subpackage
by Jim Fehlig 09 Jan '23

09 Jan '23

This is V6 of https://listman.redhat.com/archives/libvir-list/2022-December/236502.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 V5: * Remove lockd dependency from hypervisor packages * Add virtproxyd as a weak dependency to the hypervisor packages 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 | 48 +++-- libvirt.spec.in | 325 ++++++++++++++++++++++++---------- 2 files changed, 265 insertions(+), 108 deletions(-) -- 2.38.1

3 17

[PATCH] qemu: snapshot: Restructure control flow to detect errors sooner and work around compiler
by Peter Krempa 09 Jan '23

09 Jan '23

Some compilers aren't happy when an automatically freed variable is used just to free something (thus it's only assigned in the code): When compiling qemuSnapshotDelete after recent commits they complain: ../src/qemu/qemu_snapshot.c:3153:61: error: variable 'delData' set but not used [-Werror,-Wunused-but-set-variable] g_autoslist(qemuSnapshotDeleteExternalData) delData = NULL; ^ To work around the issue we can restructure the code which also has the following semantic implications: - since qemuSnapshotDeleteExternalPrepare does validation we error out sooner than attempting to start the VM - we read the temporary variable at least in one code path Fixes: 4a4d89a9252 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_snapshot.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 32f7011cbe..b8416808b3 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -3146,12 +3146,13 @@ qemuSnapshotDelete(virDomainObj *vm, if (virDomainSnapshotIsExternal(snap) && !(flags & (VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY))) { + g_autoslist(qemuSnapshotDeleteExternalData) tmpData = NULL; - externalData = qemuSnapshotDeleteExternalPrepare(vm, snap); + /* this also serves as validation whether the snapshot can be deleted */ + if (!(tmpData = qemuSnapshotDeleteExternalPrepare(vm, snap))) + goto endjob; if (!virDomainObjIsActive(vm)) { - g_autoslist(qemuSnapshotDeleteExternalData) delData = NULL; - if (qemuProcessStart(NULL, driver, vm, NULL, VIR_ASYNC_JOB_SNAPSHOT, NULL, -1, NULL, NULL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, @@ -3163,20 +3164,19 @@ qemuSnapshotDelete(virDomainObj *vm, /* Call the prepare again as some data require that the VM is * running to get everything we need. */ - delData = g_steal_pointer(&externalData); - externalData = qemuSnapshotDeleteExternalPrepare(vm, snap); + if (!(externalData = qemuSnapshotDeleteExternalPrepare(vm, snap))) + goto endjob; } else { qemuDomainJobPrivate *jobPriv = vm->job->privateData; + externalData = g_steal_pointer(&tmpData); + /* If the VM is running we need to indicate that the async snapshot * job is snapshot delete job. */ jobPriv->snapshotDelete = true; qemuDomainSaveStatus(vm); } - - if (!externalData) - goto endjob; } } -- 2.38.1

2 1

[PATCH V4 00/11] spec: Decompose the daemon subpackage
by Jim Fehlig 09 Jan '23

09 Jan '23

This is V4 of https://listman.redhat.com/archives/libvir-list/2022-December/236427.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 V3: - Address review comments, some of which I overlooked from V2 review 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 | 51 ++++-- libvirt.spec.in | 334 ++++++++++++++++++++++++---------- 2 files changed, 276 insertions(+), 109 deletions(-) -- 2.38.1

3 26

[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