- Devel - libvirt List Archives

[PATCH v2 0/2] qemu: Don't complain when <transient/> disk overlay is left behind
by Peter Krempa 18 Oct '24

18 Oct '24

v2: - remove the overlay unconditionally - document the overlay filename template Peter Krempa (2): qemu: snapshot: Delete leftover overlay files for <transient/> disks docs: formatdomain: Document the temporary file for transient disks docs/formatdomain.rst | 7 +++++++ src/qemu/qemu_snapshot.c | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) -- 2.47.0

2 3

[PATCH] rpm: Require dmidecode on more architectures
by Andrea Bolognani 18 Oct '24

18 Oct '24

It's not only used on x86_64 these days. See virSysinfoRead(). Technically we should include loongarch64 in the list as well, but Fedora hasn't been bootstrapped on the architecture yet, and when the time comes several more changes are going to be necessary anyway. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c3dc6e21c0..f26de04553 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -19,7 +19,7 @@ %define arches_x86 %{ix86} x86_64 %define arches_systemtap_64bit %{arches_64bit} -%define arches_dmidecode %{arches_x86} +%define arches_dmidecode %{arches_x86} aarch64 riscv64 %define arches_xen %{arches_x86} aarch64 %if 0%{?fedora} %define arches_xen x86_64 aarch64 -- 2.46.2

2 1

Plans for 10.9.0 release (freeze on Friday 25 Oct)
by Jiri Denemark 18 Oct '24

18 Oct '24

We are getting close to 10.9.0 release of libvirt. To aim for the release on Friday 01 Nov I suggest entering the freeze on Friday 25 Oct and tagging RC2 on Wednesday 30 Oct. I hope this works for everyone. Jirka

1 0

[PATCH] qemu: Give the users possibility to overwrite temp files for <transient\> disk
by Peter Krempa 18 Oct '24

18 Oct '24

Normally when starting up a VM with a transient disk, if the file libvirt would use as the temp overlay for the original disk image exists libvirt will not touch it and fail startup. This is done in order to avoid any potential removal of user files if they manage to create a colliding filename. In case when the user doesn't want the above behaviour this patch' introduces a 'overwriteTemp' attribute for the '<transient/>' element which allows users to opt into simply removing the file before the next start. Closes: https://gitlab.com/libvirt/libvirt/-/issues/684 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/formatdomain.rst | 7 +++++++ src/conf/domain_conf.c | 7 +++++++ src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 5 +++++ src/qemu/qemu_snapshot.c | 17 +++++++++++++---- .../disk-transient.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/disk-transient.xml | 2 +- 7 files changed, 35 insertions(+), 6 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index e6f09a728f..ab2fccdd97 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3479,6 +3479,13 @@ paravirtualized driver is specified via the ``disk`` element. ``shareBacking`` attribute should be set to ``yes``. Note that hypervisor drivers may need to hotplug such disk and thus it works only with configurations supporting hotplug. :since:`Since 7.4.0` + + Hypervisors may need to store a temporary file containing the data written + by the domain while running, which may be stored in the same location + as the original source of the disk. Note that in some cases the temporary + file can't be cleaned up (e.g. when the domain is not shutdown before the host). + An optional attribute ``overwriteTemp`` set to ``yes`` (:since:`Since 10.10`) + indicates that the hypervisor may overwrite the file rather than fail startup. ``serial`` If present, this specify serial number of virtual hard drive. For example, it may look like ``<serial>WD-WMAP9A966149</serial>``. Not supported for diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6d7dee7956..359591d8f7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8240,6 +8240,11 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, VIR_XML_PROP_NONE, &def->transientShareBacking) < 0) return NULL; + + if (virXMLPropTristateBool(transientNode, "overwriteTemp", + VIR_XML_PROP_NONE, + &def->transientOverwriteTemp) < 0) + return NULL; } if (virDomainDiskDefIotuneParse(def, ctxt) < 0) @@ -23233,6 +23238,8 @@ virDomainDiskDefFormat(virBuffer *buf, virBufferAddLit(&childBuf, "<transient"); if (def->transientShareBacking == VIR_TRISTATE_BOOL_YES) virBufferAddLit(&childBuf, " shareBacking='yes'"); + if (def->transientOverwriteTemp == VIR_TRISTATE_BOOL_YES) + virBufferAddLit(&childBuf, " overwriteTemp='yes'"); virBufferAddLit(&childBuf, "/>\n"); } virBufferEscapeString(&childBuf, "<serial>%s</serial>\n", def->serial); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a15af4fae3..169c626584 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -569,6 +569,7 @@ struct _virDomainDiskDef { virDomainStartupPolicy startupPolicy; bool transient; virTristateBool transientShareBacking; + virTristateBool transientOverwriteTemp; virDomainDeviceInfo info; virTristateBool rawio; virDomainDeviceSGIO sgio; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index efb5f00d77..cd87e83410 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -1618,6 +1618,11 @@ <ref name='virYesNo'/> </attribute> </optional> + <optional> + <attribute name="overwriteTemp"> + <ref name='virYesNo'/> + </attribute> + </optional> <empty/> </element> </optional> diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 1187ebf276..b8ca045900 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1287,10 +1287,19 @@ qemuSnapshotGetTransientDiskDef(virDomainDiskDef *domdisk, domdisk->src->path, suffix); if (virFileExists(snapdisk->src->path)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("Overlay file '%1$s' for transient disk '%2$s' already exists"), - snapdisk->src->path, domdisk->dst); - return NULL; + if (domdisk->transientOverwriteTemp == VIR_TRISTATE_BOOL_YES) { + if (unlink(snapdisk->src->path) != 0) { + virReportSystemError(errno, + _("Failed to delete overlay file '%1$s' for transient disk '%2$s'"), + snapdisk->src->path, domdisk->dst); + return NULL; + } + } else { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("Overlay file '%1$s' for transient disk '%2$s' already exists"), + snapdisk->src->path, domdisk->dst); + return NULL; + } } return g_steal_pointer(&snapdisk); diff --git a/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml index aab5894447..5f8f15f714 100644 --- a/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml @@ -21,7 +21,7 @@ <driver name='qemu' type='qcow2' cache='none'/> <source file='/tmp/QEMUGuest2.img'/> <target dev='vda' bus='virtio'/> - <transient shareBacking='yes'/> + <transient shareBacking='yes' overwriteTemp='yes'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </disk> <disk type='file' device='disk'> diff --git a/tests/qemuxmlconfdata/disk-transient.xml b/tests/qemuxmlconfdata/disk-transient.xml index edd65a0da0..722f1f9a92 100644 --- a/tests/qemuxmlconfdata/disk-transient.xml +++ b/tests/qemuxmlconfdata/disk-transient.xml @@ -18,7 +18,7 @@ <driver name='qemu' type='qcow2' cache='none'/> <source file='/tmp/QEMUGuest2.img'/> <target dev='vda' bus='virtio'/> - <transient shareBacking='yes'/> + <transient shareBacking='yes' overwriteTemp='yes'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> -- 2.47.0

2 3

[PATCH] NEWS: Fix naming of DISK_DETECT_ZEROES migration parameter
by Michal Privoznik 17 Oct '24

17 Oct '24

There's a typo in NEWS.rst where VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES has the _ZEROES suffix duplicated referring to a non-existent migration parameter. Drop the suffix. Fixes: 2e29ab3269701535f71cf56cc51165e7eeb1e49f Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Merged as trivial. NEWS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index f9a0d11896..56adf8df8b 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -25,7 +25,7 @@ v10.9.0 (unreleased) has no access to the allocation state of blocks at the cost of CPU overhead. This feature is available via the ``--migrate-disks-detect-zeroes`` option - for ``virsh migrate`` or ``VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES_ZEROES`` + for ``virsh migrate`` or ``VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES`` migration parameter. See the documentation for caveats. * **Improvements** -- 2.45.2

1 0

[PATCH 0/4] virbitmap: Fix buffer overflow when shrinking a bitmap and copying it
by Peter Krempa 17 Oct '24

17 Oct '24

See patches for rationale. Peter Krempa (4): virBitmapNewCopy: Honor sizes of either bitmap when doing memcpy() virbitmap: Extract and reuse buffer size calculation into a function util: virbitmap: Extract clearing of unused bits at the end of the last unit util: bitmap: Rewrite virBitmapShrink using new helpers src/util/virbitmap.c | 84 +++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 44 deletions(-) -- 2.47.0

2 5

[PATCH 0/2] Hyper-V feature fixes
by Martin Kletzander 17 Oct '24

17 Oct '24

I wrote so many good commit messages today, leave me alone. Martin Kletzander (2): qemu: Add more translations to virQEMUCapsCPUFeatureTranslationTable qemu: Do not hardcode Hyper-V feature names on command line src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_command.c | 22 +++++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-) -- 2.47.0

2 4

[PATCH] ci: refresh with 'lcitool manifest'
by Daniel P. Berrangé 16 Oct '24

16 Oct '24

Major changes: * macOS 13 is removed. Cirrus CI now only supports a single version, macOS 14, so there is no addition of macOS 15 possible. * The polkit lcitool mapping is renamed to pkcheck * The polkit package is renamed on Debian & Ubuntu Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- ci/buildenv/debian-12-cross-aarch64.sh | 2 +- ci/buildenv/debian-12-cross-armv6l.sh | 2 +- ci/buildenv/debian-12-cross-armv7l.sh | 2 +- ci/buildenv/debian-12-cross-i686.sh | 2 +- ci/buildenv/debian-12-cross-mips64el.sh | 2 +- ci/buildenv/debian-12-cross-mipsel.sh | 2 +- ci/buildenv/debian-12-cross-ppc64le.sh | 2 +- ci/buildenv/debian-12-cross-s390x.sh | 2 +- ci/buildenv/debian-12.sh | 2 +- ci/buildenv/debian-sid-cross-aarch64.sh | 2 +- ci/buildenv/debian-sid-cross-armv6l.sh | 2 +- ci/buildenv/debian-sid-cross-armv7l.sh | 2 +- ci/buildenv/debian-sid-cross-i686.sh | 2 +- ci/buildenv/debian-sid-cross-mips64el.sh | 2 +- ci/buildenv/debian-sid-cross-ppc64le.sh | 2 +- ci/buildenv/debian-sid-cross-s390x.sh | 2 +- ci/buildenv/debian-sid.sh | 2 +- ci/buildenv/opensuse-leap-15.sh | 1 + ci/buildenv/ubuntu-2204.sh | 2 +- ci/buildenv/ubuntu-2404.sh | 2 +- ci/cirrus/macos-13.vars | 16 ---------------- .../debian-12-cross-aarch64.Dockerfile | 2 +- .../debian-12-cross-armv6l.Dockerfile | 2 +- .../debian-12-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-12-cross-i686.Dockerfile | 2 +- .../debian-12-cross-mips64el.Dockerfile | 2 +- .../debian-12-cross-mipsel.Dockerfile | 2 +- .../debian-12-cross-ppc64le.Dockerfile | 2 +- ci/containers/debian-12-cross-s390x.Dockerfile | 2 +- ci/containers/debian-12.Dockerfile | 2 +- .../debian-sid-cross-aarch64.Dockerfile | 2 +- .../debian-sid-cross-armv6l.Dockerfile | 2 +- .../debian-sid-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-sid-cross-i686.Dockerfile | 2 +- .../debian-sid-cross-mips64el.Dockerfile | 2 +- .../debian-sid-cross-ppc64le.Dockerfile | 2 +- .../debian-sid-cross-s390x.Dockerfile | 2 +- ci/containers/debian-sid.Dockerfile | 2 +- ci/containers/opensuse-leap-15.Dockerfile | 1 + ci/containers/ubuntu-2204.Dockerfile | 2 +- ci/containers/ubuntu-2404.Dockerfile | 2 +- ci/gitlab/builds.yml | 18 +----------------- ci/lcitool/projects/libvirt.yml | 2 +- ci/manifest.yml | 7 ------- 44 files changed, 42 insertions(+), 79 deletions(-) delete mode 100644 ci/cirrus/macos-13.vars diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-12-cross-aarch64.sh index 93288ae46f..b4a056d940 100644 --- a/ci/buildenv/debian-12-cross-aarch64.sh +++ b/ci/buildenv/debian-12-cross-aarch64.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-12-cross-armv6l.sh index 37e743478d..07ffb3da37 100644 --- a/ci/buildenv/debian-12-cross-armv6l.sh +++ b/ci/buildenv/debian-12-cross-armv6l.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-12-cross-armv7l.sh index 1b8e4f7019..6f88f6cc06 100644 --- a/ci/buildenv/debian-12-cross-armv7l.sh +++ b/ci/buildenv/debian-12-cross-armv7l.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh index 060b6ea75e..5da816d086 100644 --- a/ci/buildenv/debian-12-cross-i686.sh +++ b/ci/buildenv/debian-12-cross-i686.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh index 6da5920d1d..09c445758c 100644 --- a/ci/buildenv/debian-12-cross-mips64el.sh +++ b/ci/buildenv/debian-12-cross-mips64el.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh index 5ad809c625..a762d1e3b8 100644 --- a/ci/buildenv/debian-12-cross-mipsel.sh +++ b/ci/buildenv/debian-12-cross-mipsel.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-12-cross-ppc64le.sh index eca66706fc..fe7b672799 100644 --- a/ci/buildenv/debian-12-cross-ppc64le.sh +++ b/ci/buildenv/debian-12-cross-ppc64le.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh index 65dc4ce545..1ca0768d14 100644 --- a/ci/buildenv/debian-12-cross-s390x.sh +++ b/ci/buildenv/debian-12-cross-s390x.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh index d06f33af12..fcd5291f22 100644 --- a/ci/buildenv/debian-12.sh +++ b/ci/buildenv/debian-12.sh @@ -74,7 +74,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh index 93288ae46f..b4a056d940 100644 --- a/ci/buildenv/debian-sid-cross-aarch64.sh +++ b/ci/buildenv/debian-sid-cross-aarch64.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh index f19ec82093..53d2d79b38 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh index 4ebf3126e3..4e60877e77 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh index 43c02e784e..98e08b2397 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh index 6da5920d1d..09c445758c 100644 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ b/ci/buildenv/debian-sid-cross-mips64el.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh index eca66706fc..fe7b672799 100644 --- a/ci/buildenv/debian-sid-cross-ppc64le.sh +++ b/ci/buildenv/debian-sid-cross-ppc64le.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh index 65dc4ce545..1ca0768d14 100644 --- a/ci/buildenv/debian-sid-cross-s390x.sh +++ b/ci/buildenv/debian-sid-cross-s390x.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh index d06f33af12..fcd5291f22 100644 --- a/ci/buildenv/debian-sid.sh +++ b/ci/buildenv/debian-sid.sh @@ -74,7 +74,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-15.sh index 2a1c1e2314..add707c752 100644 --- a/ci/buildenv/opensuse-leap-15.sh +++ b/ci/buildenv/opensuse-leap-15.sh @@ -6,6 +6,7 @@ function install_buildenv() { zypper update -y + zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports… zypper install -y \ audit-devel \ augeas \ diff --git a/ci/buildenv/ubuntu-2204.sh b/ci/buildenv/ubuntu-2204.sh index 95762d663c..e581ce6012 100644 --- a/ci/buildenv/ubuntu-2204.sh +++ b/ci/buildenv/ubuntu-2204.sh @@ -75,7 +75,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/ubuntu-2404.sh b/ci/buildenv/ubuntu-2404.sh index 5ce8e74a91..8e459cbb25 100644 --- a/ci/buildenv/ubuntu-2404.sh +++ b/ci/buildenv/ubuntu-2404.sh @@ -75,7 +75,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-13.vars deleted file mode 100644 index d23fe3cd47..0000000000 --- a/ci/cirrus/macos-13.vars +++ /dev/null @@ -1,16 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -CCACHE='/opt/homebrew/bin/ccache' -CPAN_PKGS='' -CROSS_PKGS='' -MAKE='/opt/homebrew/bin/gmake' -NINJA='/opt/homebrew/bin/ninja' -PACKAGING_COMMAND='brew' -PIP3='/opt/homebrew/bin/pip3' -PKGS='augeas bash-completion black ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep json-c libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline' -PYPI_PKGS='pytest' -PYTHON='/opt/homebrew/bin/python3' diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-12-cross-aarch64.Dockerfile index e57cbffaec..f4d587177b 100644 --- a/ci/containers/debian-12-cross-aarch64.Dockerfile +++ b/ci/containers/debian-12-cross-aarch64.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-12-cross-armv6l.Dockerfile index 9572f4d28f..d8f2a3bc42 100644 --- a/ci/containers/debian-12-cross-armv6l.Dockerfile +++ b/ci/containers/debian-12-cross-armv6l.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-12-cross-armv7l.Dockerfile index e29eea8a6b..1abfb79931 100644 --- a/ci/containers/debian-12-cross-armv7l.Dockerfile +++ b/ci/containers/debian-12-cross-armv7l.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-12-cross-i686.Dockerfile index 39f5e9ef8d..5681121d80 100644 --- a/ci/containers/debian-12-cross-i686.Dockerfile +++ b/ci/containers/debian-12-cross-i686.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile index af15c9c76a..a4f2aabe10 100644 --- a/ci/containers/debian-12-cross-mips64el.Dockerfile +++ b/ci/containers/debian-12-cross-mips64el.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile index 63caa15b20..a3f0652818 100644 --- a/ci/containers/debian-12-cross-mipsel.Dockerfile +++ b/ci/containers/debian-12-cross-mipsel.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-12-cross-ppc64le.Dockerfile index 6c6e747120..caf8229a8e 100644 --- a/ci/containers/debian-12-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-12-cross-s390x.Dockerfile index 4e124ca26a..c4f8479c13 100644 --- a/ci/containers/debian-12-cross-s390x.Dockerfile +++ b/ci/containers/debian-12-cross-s390x.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile index 682f8217f4..3e6d0597e2 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-12.Dockerfile @@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 1932a7cfbe..3a06f01c5c 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index bd7b1a12a3..fdf129aa04 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index a0ee83d25b..8dbb705d69 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index b2f96a6c03..f856306a62 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index bcb24e13ff..468c5fbc3e 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 66180dcb1e..37c256fe1e 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 5f9fbc8ffd..232a8d7844 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 87aee59bbd..febd286d86 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile index 38160bf7dc..952799aede 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-15.Dockerfile @@ -7,6 +7,7 @@ FROM registry.opensuse.org/opensuse/leap:15.6 RUN zypper update -y && \ + zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports… && \ zypper install -y \ audit-devel \ augeas \ diff --git a/ci/containers/ubuntu-2204.Dockerfile b/ci/containers/ubuntu-2204.Dockerfile index 18555693d1..dc69a7d4df 100644 --- a/ci/containers/ubuntu-2204.Dockerfile +++ b/ci/containers/ubuntu-2204.Dockerfile @@ -77,7 +77,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/ubuntu-2404.Dockerfile b/ci/containers/ubuntu-2404.Dockerfile index b2f461b629..ecccfc637a 100644 --- a/ci/containers/ubuntu-2404.Dockerfile +++ b/ci/containers/ubuntu-2404.Dockerfile @@ -77,7 +77,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 214119b902..771fa67501 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -624,28 +624,12 @@ x86_64-freebsd-14: UPGRADE_COMMAND: pkg upgrade -y -aarch64-macos-13: - extends: .cirrus_build_job - needs: [] - allow_failure: false - variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest - CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_INSTANCE_TYPE: macos_instance - INSTALL_COMMAND: brew install - NAME: macos-13 - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - UPDATE_COMMAND: brew update - UPGRADE_COMMAND: brew upgrade - - aarch64-macos-14: extends: .cirrus_build_job needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_INSTANCE_TYPE: macos_instance INSTALL_COMMAND: brew install diff --git a/ci/lcitool/projects/libvirt.yml b/ci/lcitool/projects/libvirt.yml index 9f8fc06ce4..aa0dc5924a 100644 --- a/ci/lcitool/projects/libvirt.yml +++ b/ci/lcitool/projects/libvirt.yml @@ -63,8 +63,8 @@ packages: - numad - openwsman - perl + - pkcheck - pkg-config - - polkit - portablexdr - python3 - python3-docutils diff --git a/ci/manifest.yml b/ci/manifest.yml index 647510ed2f..43b9995717 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -203,13 +203,6 @@ targets: variables: RPM: skip - macos-13: - jobs: - - arch: aarch64 - variables: - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - macos-14: jobs: - arch: aarch64 -- 2.46.0

2 1

[PATCH v2] lxc: fix variable storage order before call
by Adam Julis 16 Oct '24

16 Oct '24

virDomainConfNWFilterInstantiate() was called without updated net->ifname, it caused in some cases throwing error message. If function failed, change is reverted. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/658 Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- src/lxc/lxc_process.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 205ab96ebb..0233d17f4e 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -271,6 +271,7 @@ virLXCProcessSetupInterfaceTap(virDomainDef *vm, { g_autofree char *parentVeth = NULL; g_autofree char *containerVeth = NULL; + g_autofree char *backupIfname = NULL; const virNetDevVPortProfile *vport = virDomainNetGetActualVirtPortProfile(net); VIR_DEBUG("calling vethCreate()"); @@ -315,14 +316,17 @@ virLXCProcessSetupInterfaceTap(virDomainDef *vm, return NULL; } - if (net->filter && - virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) - return NULL; - - /* success is guaranteed, so update the interface object */ - g_free(net->ifname); + /* success almost guaranteed, next function needs updated net->ifname */ + backupIfname = g_steal_pointer(net->ifname); net->ifname = g_steal_pointer(&parentVeth); + if (net->filter && + virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) { + g_free(net->ifname); + net->ifname = g_steal_pointer(&backupIfname); + return NULL; + } + return g_steal_pointer(&containerVeth); } -- 2.45.2

2 1

[PATCH 0/3] Do not relabel existing device files on hotplug
by Martin Kletzander 16 Oct '24

16 Oct '24

When hotplugging a /dev device that already exists in the process namespace we reset all the permissions, labels etc. to the same state as the parent namespace. Then, when we are trying to label the device for qemu we find out there are label-remembering attributes with a positive reference count and because we are trying to set a different label (the device now has the label of the original device from the parent namespace) we refuse to reset it. Not only the hotplug fails (purposefully not questioning the usability of hotplugging the same device for a second time) but it also resets the labels to something we do not want. Now the quiestion is: What does this patchset do? You can have a guess. Martin Kletzander (3): qemu_namespace: Rename variable qemu_namespace: Properly report new files qemu_namespace: Only replicate labels on created files src/qemu/qemu_namespace.c | 64 +++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 30 deletions(-) -- 2.47.0

2 8