- Devel - libvirt List Archives

[PATCH 0/3] Report CPU model blockers in domain capabilities
by Jiri Denemark 21 Oct '24

21 Oct '24

Jiri Denemark (3): domain_capabilities: Sort CPU models domain_capabilities: Report CPU blockers NEWS: Report CPU model blockers in domain capabilities NEWS.rst | 6 + docs/formatdomaincaps.rst | 56 +- src/conf/domain_capabilities.c | 48 ++ src/conf/domain_capabilities.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 430 +++++++++-- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 649 +++++++++++++++-- .../qemu_5.2.0-virt.aarch64.xml | 56 +- tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 56 +- tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_5.2.0.s390x.xml | 122 ++-- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 430 +++++++++-- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 681 +++++++++++++++-- .../qemu_6.0.0-virt.aarch64.xml | 56 +- tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 56 +- tests/domaincapsdata/qemu_6.0.0.s390x.xml | 122 ++-- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 442 ++++++++++-- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 682 ++++++++++++++++-- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 442 ++++++++++-- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 680 +++++++++++++++-- .../qemu_6.2.0-virt.aarch64.xml | 58 +- tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 58 +- tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 673 +++++++++++++++-- .../qemu_7.0.0-virt.aarch64.xml | 58 +- tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 58 +- tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 403 +++++++++-- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 619 ++++++++++++++-- tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 403 +++++++++-- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 403 +++++++++-- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 511 +++++++++++-- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 511 +++++++++++-- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 403 +++++++++-- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 451 ++++++++++-- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 559 ++++++++++++-- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 451 ++++++++++-- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 570 +++++++++++++-- tests/domaincapsdata/qemu_8.1.0.s390x.xml | 282 ++++++-- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 562 +++++++++++++-- .../qemu_8.2.0-virt.aarch64.xml | 72 +- tests/domaincapsdata/qemu_8.2.0.aarch64.xml | 72 +- tests/domaincapsdata/qemu_8.2.0.s390x.xml | 280 +++++-- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 536 ++++++++++++-- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 576 +++++++++++++-- .../qemu_9.1.0-tcg-virt.riscv64.xml | 16 +- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 557 ++++++++++++-- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 576 +++++++++++++-- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 576 +++++++++++++-- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 557 ++++++++++++-- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 576 +++++++++++++-- 65 files changed, 19644 insertions(+), 2745 deletions(-) -- 2.47.0

2 4

[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

[PATCH 00/10] qemu: Prepare for 'qemu-9.2' and add qemu-9.2 (dev cycle) capabilities
by Peter Krempa 16 Oct '24

16 Oct '24

Adapt to deprecation of 'gluster' replacement of 'reconnect' by 'reconnect-ms' and add qemu-9.2 caps. See individual patches for details. Peter Krempa (10): qemublocktest: Convert all 'gluster' instances to 'nbd' in 'xml2json' cases qemublocktest: Mark gluster cases in XML->json->XML tests as deprecated qemublocktest: Mark 'gluster' case in image creation test as deprecated qemuxmlconftest: Use only 'nfs' protocol in 'disk-network-nfs' qemuxml(conf|active)test: Use 'nbd' instead of 'gluster' in 'disk-backing-chains-(no)index' cases qemuxmlconftest: Pin 'disk-network-gluster' case to qemu-9.1 qemu: capabilities: Introduce QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS qemu: chardev: Use 'reconnect-ms' instead of deprecated 'reconnect' qemuxmlconftest: Add '9.1.0' versions of test cases for 'reconnect' option of chardevs tests: qemucapabilities: Add test data for the qemu-9.2 dev cycle src/qemu/qemu_block.c | 2 +- src/qemu/qemu_block.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_chardev.c | 20 +- src/qemu/qemu_chardev.h | 1 + src/qemu/qemu_command.c | 12 +- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_hotplug.c | 19 +- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 305 + .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 301 + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 305 + tests/qemublocktest.c | 16 +- ...le-backing_basic-aio_io_uring-srconly.json | 19 +- .../file-backing_basic-aio_io_uring.json | 17 +- .../file-backing_basic-aio_io_uring.xml | 2 +- ...ile-backing_basic-aio_threads-srconly.json | 19 +- .../file-backing_basic-aio_threads.json | 17 +- .../file-backing_basic-aio_threads.xml | 2 +- ...acking_basic-cache-directsync-srconly.json | 19 +- .../file-backing_basic-cache-directsync.json | 17 +- .../file-backing_basic-cache-directsync.xml | 2 +- ...file-backing_basic-cache-none-srconly.json | 19 +- .../file-backing_basic-cache-none.json | 17 +- .../file-backing_basic-cache-none.xml | 2 +- ...le-backing_basic-cache-unsafe-srconly.json | 19 +- .../file-backing_basic-cache-unsafe.json | 17 +- .../file-backing_basic-cache-unsafe.xml | 2 +- ...backing_basic-cache-writeback-srconly.json | 19 +- .../file-backing_basic-cache-writeback.json | 17 +- .../file-backing_basic-cache-writeback.xml | 2 +- ...king_basic-cache-writethrough-srconly.json | 19 +- ...file-backing_basic-cache-writethrough.json | 17 +- .../file-backing_basic-cache-writethrough.xml | 2 +- .../file-backing_basic-detect-srconly.json | 19 +- .../xml2json/file-backing_basic-detect.json | 17 +- .../xml2json/file-backing_basic-detect.xml | 2 +- ...le-backing_basic-unmap-detect-srconly.json | 19 +- .../file-backing_basic-unmap-detect.json | 17 +- .../file-backing_basic-unmap-detect.xml | 2 +- ...le-backing_basic-unmap-ignore-srconly.json | 19 +- .../file-backing_basic-unmap-ignore.json | 17 +- .../file-backing_basic-unmap-ignore.xml | 2 +- .../file-backing_basic-unmap-srconly.json | 19 +- .../xml2json/file-backing_basic-unmap.json | 17 +- .../xml2json/file-backing_basic-unmap.xml | 2 +- .../caps_9.2.0_x86_64.replies | 44205 ++++++++++++++++ .../caps_9.2.0_x86_64.xml | 3970 ++ tests/qemumonitorjsontest.c | 2 +- ...king-chains-index-active.x86_64-latest.xml | 4 +- ...ng-chains-index-inactive.x86_64-latest.xml | 4 +- .../chardev-backends-json.x86_64-9.1.0.args | 79 + .../chardev-backends-json.x86_64-9.1.0.xml | 149 + .../chardev-backends-json.x86_64-latest.args | 6 +- .../chardev-backends.x86_64-9.1.0.args | 79 + .../chardev-backends.x86_64-9.1.0.xml | 149 + .../chardev-backends.x86_64-latest.args | 6 +- .../chardev-reconnect.x86_64-9.1.0.args | 46 + .../chardev-reconnect.x86_64-9.1.0.xml | 72 + .../chardev-reconnect.x86_64-latest.args | 10 +- ...isk-backing-chains-index.x86_64-latest.xml | 4 +- .../disk-backing-chains-index.xml | 4 +- ...-backing-chains-noindex.x86_64-latest.args | 4 +- ...k-backing-chains-noindex.x86_64-latest.xml | 4 +- .../disk-backing-chains-noindex.xml | 4 +- ...=> disk-network-gluster.x86_64-9.1.0.args} | 2 +- ... => disk-network-gluster.x86_64-9.1.0.xml} | 2 +- .../qemuxmlconfdata/disk-network-gluster.xml | 2 +- .../disk-network-nfs.x86_64-latest.args | 2 +- .../disk-network-nfs.x86_64-latest.xml | 4 +- tests/qemuxmlconfdata/disk-network-nfs.xml | 4 +- .../disk-vhostuser-numa.x86_64-latest.args | 2 +- .../disk-vhostuser.x86_64-latest.args | 2 +- .../net-vhostuser-multiq.x86_64-latest.args | 4 +- tests/qemuxmlconftest.c | 8 +- 75 files changed, 49938 insertions(+), 301 deletions(-) create mode 100644 tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_9.2.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml create mode 100644 tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args create mode 100644 tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args create mode 100644 tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.args create mode 100644 tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.xml rename tests/qemuxmlconfdata/{disk-network-gluster.x86_64-latest.args => disk-network-gluster.x86_64-9.1.0.args} (96%) rename tests/qemuxmlconfdata/{disk-network-gluster.x86_64-latest.xml => disk-network-gluster.x86_64-9.1.0.xml} (97%) -- 2.46.2

2 11

[PATCH] apparmor: Allow running i686 VMs on Debian 12
by Andrea Bolognani 16 Oct '24

16 Oct '24

In Debian 12, the qemu-system-i386 binary in /usr/bin is a wrapper script, with the actual executable living in /usr/libexec instead. This makes it impossible to run i686 VMs when AppArmor is enabled. Allow running the actual binary. https://bugs.debian.org/1030926 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/security/apparmor/libvirt-qemu.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/security/apparmor/libvirt-qemu.in b/src/security/apparmor/libvirt-qemu.in index 8f17256554..694da26dea 100644 --- a/src/security/apparmor/libvirt-qemu.in +++ b/src/security/apparmor/libvirt-qemu.in @@ -172,6 +172,9 @@ /usr/bin/qemu-system-xtensaeb rmix, /usr/bin/qemu-unicore32 rmix, /usr/bin/qemu-x86_64 rmix, + # Debian 12 has a wrapper script in /usr/bin while the actual + # binary lives in /usr/libexec (Debian: #1030926) + /usr/libexec/qemu-system-i386 rmix, # for Debian/Ubuntu qemu-block-extra / RPMs qemu-block-* (LP: #1554761) /usr/{lib,lib64}/qemu/*.so mr, /usr/lib/(a){multiarch}/qemu/*.so mr, -- 2.46.2

2 1

[PATCH 0/5] ci: various CI fixes
by Daniel P. Berrangé 15 Oct '24

15 Oct '24

This fixes various issues with CI across multiple platforms, debian, Fedora and macOS. Daniel P. Berrangé (5): meson: unconditionally enable polkit on non-Windows ci: drop polkit from build deps tests: stop stubbing libselinux APIs for purpose of data overrides wireshark: drop gmodule.h include to avoid glib warnings ci: update macOS versions under test ci/buildenv/almalinux-9.sh | 1 - ci/buildenv/alpine-319.sh | 1 - ci/buildenv/alpine-edge.sh | 1 - ci/buildenv/centos-stream-9.sh | 1 - ci/buildenv/debian-11-cross-aarch64.sh | 1 - ci/buildenv/debian-11-cross-armv6l.sh | 1 - ci/buildenv/debian-11-cross-armv7l.sh | 1 - ci/buildenv/debian-11-cross-i686.sh | 1 - ci/buildenv/debian-11-cross-mips64el.sh | 1 - ci/buildenv/debian-11-cross-mipsel.sh | 1 - ci/buildenv/debian-11-cross-ppc64le.sh | 1 - ci/buildenv/debian-11-cross-s390x.sh | 1 - ci/buildenv/debian-11.sh | 1 - ci/buildenv/debian-12-cross-aarch64.sh | 1 - ci/buildenv/debian-12-cross-armv6l.sh | 1 - ci/buildenv/debian-12-cross-armv7l.sh | 1 - ci/buildenv/debian-12-cross-i686.sh | 1 - ci/buildenv/debian-12-cross-mips64el.sh | 1 - ci/buildenv/debian-12-cross-mipsel.sh | 1 - ci/buildenv/debian-12-cross-ppc64le.sh | 1 - ci/buildenv/debian-12-cross-s390x.sh | 1 - ci/buildenv/debian-12.sh | 1 - ci/buildenv/debian-sid-cross-aarch64.sh | 1 - ci/buildenv/debian-sid-cross-armv6l.sh | 1 - ci/buildenv/debian-sid-cross-armv7l.sh | 1 - ci/buildenv/debian-sid-cross-i686.sh | 1 - ci/buildenv/debian-sid-cross-mips64el.sh | 1 - ci/buildenv/debian-sid-cross-ppc64le.sh | 1 - ci/buildenv/debian-sid-cross-s390x.sh | 1 - ci/buildenv/debian-sid.sh | 1 - ci/buildenv/fedora-39.sh | 1 - ci/buildenv/fedora-40-cross-mingw32.sh | 1 - ci/buildenv/fedora-40-cross-mingw64.sh | 1 - ci/buildenv/fedora-40.sh | 1 - ci/buildenv/fedora-rawhide-cross-mingw32.sh | 1 - ci/buildenv/fedora-rawhide-cross-mingw64.sh | 1 - ci/buildenv/fedora-rawhide.sh | 1 - ci/buildenv/opensuse-leap-15.sh | 2 +- ci/buildenv/opensuse-tumbleweed.sh | 1 - ci/buildenv/ubuntu-2204.sh | 1 - ci/buildenv/ubuntu-2404.sh | 1 - ci/cirrus/build.yml | 2 ++ ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-14.vars | 2 +- ci/cirrus/macos-13.vars | 16 ------------ ci/containers/almalinux-9.Dockerfile | 1 - ci/containers/alpine-319.Dockerfile | 1 - ci/containers/alpine-edge.Dockerfile | 1 - ci/containers/centos-stream-9.Dockerfile | 1 - .../debian-11-cross-aarch64.Dockerfile | 1 - .../debian-11-cross-armv6l.Dockerfile | 1 - .../debian-11-cross-armv7l.Dockerfile | 1 - ci/containers/debian-11-cross-i686.Dockerfile | 1 - .../debian-11-cross-mips64el.Dockerfile | 1 - .../debian-11-cross-mipsel.Dockerfile | 1 - .../debian-11-cross-ppc64le.Dockerfile | 1 - .../debian-11-cross-s390x.Dockerfile | 1 - ci/containers/debian-11.Dockerfile | 1 - .../debian-12-cross-aarch64.Dockerfile | 1 - .../debian-12-cross-armv6l.Dockerfile | 1 - .../debian-12-cross-armv7l.Dockerfile | 1 - ci/containers/debian-12-cross-i686.Dockerfile | 1 - .../debian-12-cross-mips64el.Dockerfile | 1 - .../debian-12-cross-mipsel.Dockerfile | 1 - .../debian-12-cross-ppc64le.Dockerfile | 1 - .../debian-12-cross-s390x.Dockerfile | 1 - ci/containers/debian-12.Dockerfile | 1 - .../debian-sid-cross-aarch64.Dockerfile | 1 - .../debian-sid-cross-armv6l.Dockerfile | 1 - .../debian-sid-cross-armv7l.Dockerfile | 1 - .../debian-sid-cross-i686.Dockerfile | 1 - .../debian-sid-cross-mips64el.Dockerfile | 1 - .../debian-sid-cross-ppc64le.Dockerfile | 1 - .../debian-sid-cross-s390x.Dockerfile | 1 - ci/containers/debian-sid.Dockerfile | 1 - ci/containers/fedora-39.Dockerfile | 1 - .../fedora-40-cross-mingw32.Dockerfile | 1 - .../fedora-40-cross-mingw64.Dockerfile | 1 - ci/containers/fedora-40.Dockerfile | 1 - .../fedora-rawhide-cross-mingw32.Dockerfile | 1 - .../fedora-rawhide-cross-mingw64.Dockerfile | 1 - ci/containers/fedora-rawhide.Dockerfile | 1 - ci/containers/opensuse-leap-15.Dockerfile | 2 +- ci/containers/opensuse-tumbleweed.Dockerfile | 1 - ci/containers/ubuntu-2204.Dockerfile | 1 - ci/containers/ubuntu-2404.Dockerfile | 1 - ci/gitlab/builds.yml | 12 +++++---- ci/lcitool/projects/libvirt.yml | 1 - ci/manifest.yml | 9 ++++--- meson.build | 5 ---- tests/securityselinuxhelper.c | 25 ------------------- tests/securityselinuxlabeltest.c | 5 +++- tests/securityselinuxtest.c | 2 +- tests/viridentitytest.c | 4 +-- tools/wireshark/src/plugin.c | 2 -- 95 files changed, 25 insertions(+), 146 deletions(-) delete mode 100644 ci/cirrus/macos-13.vars -- 2.46.0

2 15

[libvirt ci] Why no artifacts for macOS & FreeBSD?
by Richard W.M. Jones 14 Oct '24

14 Oct '24

[I couldn't find out where to send questions / bugs related to libvirt CI, so here I am ...] https://gitlab.com/nbdkit/libnbd/-/pipelines/1493147187 It would be much easier to fix the above pipeline (which doesn't reproduce locally) if I could download artifacts for the failing builds. However we don't seem to have them for macOS and FreeBSD. They work fine for Linux. Why, and can they be generated somehow? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com nbdkit - Flexible, fast NBD server with plugins https://gitlab.com/nbdkit/nbdkit

2 4

[PATCH v2 00/13] Implement support for QCOW2 data files
by Nikolai Barybin 14 Oct '24

14 Oct '24

Hello everyone! With help of Peter's review and after researching Cole's patches I've come up with the second version. Changes since last revision: - properly taken in account (while probing disk chain) usecase when we have data-file as part of some backing image - added proper integration with security drivers instead of call to chown - data-file is added to qemu cmdline as a reference to blockdev - added XML formatiing and parsing - added basic tests to qemublocktest Nikolai Barybin (13): conf: add data-file feature and related fields to virStorageSource storage file: add getDataFile function to FileTypeInfo storage file: add qcow2 data-file path parsing from header storage file: fill in src->dataFileStore during file probe security: DAC: handle qcow2 data-file on image label set/restore security: selinux: handle qcow2 data-file on image label set/restore security: apparmor: handle qcow2 data-file qemu: put data-file path to VM's cgroup and namespace qemu: factor out qemuDomainPrepareStorageSource() qemu: enable basic qcow2 data-file feature support conf: schemas: add data-file store to domain rng schema conf: implement XML parsing/formatingo for dataFileStore tests: add qcow2 data-file basic tests to qemublocktest src/conf/domain_conf.c | 98 +++++++++++++++++++ src/conf/domain_conf.h | 13 +++ src/conf/schemas/domaincommon.rng | 15 +++ src/conf/storage_source_conf.c | 11 +++ src/conf/storage_source_conf.h | 5 + src/qemu/qemu_block.c | 7 ++ src/qemu/qemu_cgroup.c | 4 + src/qemu/qemu_command.c | 5 + src/qemu/qemu_domain.c | 50 +++++++--- src/qemu/qemu_namespace.c | 5 + src/security/security_dac.c | 26 ++++- src/security/security_selinux.c | 20 +++- src/security/virt-aa-helper.c | 4 + src/storage_file/storage_file_probe.c | 85 ++++++++++++---- src/storage_file/storage_source.c | 28 ++++++ src/storage_file/storage_source.h | 3 + tests/qemublocktest.c | 78 +++++++++------ ...backing-with-data-file-noopts-srconly.json | 27 +++++ ...e-qcow2-backing-with-data-file-noopts.json | 41 ++++++++ ...le-qcow2-backing-with-data-file-noopts.xml | 35 +++++++ .../file-qcow2-data-file-noopts-srconly.json | 18 ++++ .../xml2json/file-qcow2-data-file-noopts.json | 27 +++++ .../xml2json/file-qcow2-data-file-noopts.xml | 24 +++++ 23 files changed, 558 insertions(+), 71 deletions(-) create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-with-data-file-noopts-srconly.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-with-data-file-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-with-data-file-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-data-file-noopts-srconly.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-data-file-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-data-file-noopts.xml -- 2.43.5

2 26

[PATCH] qemu: migration: Fix blockdev config with VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES
by Peter Krempa 14 Oct '24

14 Oct '24

The idea of migration with VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES populated is to sparsify the image. The QEMU NBD client as it was configured in commit 621f879adf98e2c93ac5c8c869733a57f06cd9aa would signal to the destination to do thick allocation of holes which would result in a non-sparse image for any backend except a qcow2 image which I used to test it. Switch to VIR_DOMAIN_DISK_DETECT_ZEROES_UNMAP and VIR_DOMAIN_DISK_DISCARD_UNMAP which tells the NBD client (and that in turn the NBD server) to preserve the sparse blocks it detected from the image. Fixes: 621f879adf98e2c93ac5c8c869733a57f06cd9aa Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_migration.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 179e9d7c83..832b2946e0 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1092,8 +1092,14 @@ qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(virDomainDiskDef *disk, copysrc->protocol = VIR_STORAGE_NET_PROTOCOL_NBD; copysrc->format = VIR_STORAGE_FILE_RAW; - if (detect_zeroes) - copysrc->detect_zeroes = VIR_DOMAIN_DISK_DETECT_ZEROES_ON; + if (detect_zeroes) { + /* We need to use both VIR_DOMAIN_DISK_DETECT_ZEROES_UNMAP and + * VIR_DOMAIN_DISK_DISCARD_UNMAP as the qemu NBD client otherwise singals + * to the server to fully allocate the zero blocks + */ + copysrc->detect_zeroes = VIR_DOMAIN_DISK_DETECT_ZEROES_UNMAP; + copysrc->discard = VIR_DOMAIN_DISK_DISCARD_UNMAP; + } copysrc->backingStore = virStorageSourceNew(); -- 2.46.2

2 1

Re: [PATCH RFC v4 11/17] qemu: block: Support block disk along with throttle filters
by Peter Krempa 14 Oct '24

14 Oct '24

On Mon, Sep 30, 2024 at 10:14:59 +0000, Edward Arulanadam wrote: > Dear All, > > My sincere apologies on reaching out regarding this change as I know, someone would be reviewing the change and provide review comments as per the community guidelines. Since this change is very critical for us to move forward, may I request for a review and let us know if this is good now. Hi, when this last iteration was posted I got a note (off-list) from the author stating that they might not be able to continue work on that series. Are you going to pick up the work on that series? If so make sure to configure your mail client to avoid breaking threads (as you did with this mail). I'll use the existing convention of using 'reply-all' to the patches so you might not get CC'd for the postings which are already on-list. If that's a problem please re-post the series (obviously keeping authorship intact). I'm keeping it on my to-do list but due to personal reasons I'm really backlogged in reviews so please be patient.

1 1

[PATCH] qemu: snapshot: Remove dead code in 'qemuSnapshotDeleteBlockJobRunning'
by Peter Krempa 14 Oct '24

14 Oct '24

'qemuSnapshotDeleteBlockJobIsRunning' returns only 0 and 1. Convert it to bool and remove the dead code handling -1 return in the caller. Closes: https://gitlab.com/libvirt/libvirt/-/issues/682 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_snapshot.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 77ff842fab..1187ebf276 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -3303,7 +3303,7 @@ qemuSnapshotDeleteUpdateDisks(void *payload, /* Deleting external snapshot is started by running qemu block-commit job. * We need to wait for all block-commit jobs to be 'ready' or 'pending' to * continue with external snapshot deletion. */ -static int +static bool qemuSnapshotDeleteBlockJobIsRunning(qemuBlockjobState state) { switch (state) { @@ -3311,7 +3311,7 @@ qemuSnapshotDeleteBlockJobIsRunning(qemuBlockjobState state) case QEMU_BLOCKJOB_STATE_RUNNING: case QEMU_BLOCKJOB_STATE_ABORTING: case QEMU_BLOCKJOB_STATE_PIVOTING: - return 1; + return true; case QEMU_BLOCKJOB_STATE_COMPLETED: case QEMU_BLOCKJOB_STATE_FAILED: @@ -3323,7 +3323,7 @@ qemuSnapshotDeleteBlockJobIsRunning(qemuBlockjobState state) break; } - return 0; + return false; } @@ -3359,18 +3359,14 @@ static int qemuSnapshotDeleteBlockJobRunning(virDomainObj *vm, qemuBlockJobData *job) { - int rc; qemuBlockJobUpdate(vm, job, VIR_ASYNC_JOB_SNAPSHOT); - while ((rc = qemuSnapshotDeleteBlockJobIsRunning(job->state)) > 0) { + while (qemuSnapshotDeleteBlockJobIsRunning(job->state)) { if (qemuDomainObjWait(vm) < 0) return -1; qemuBlockJobUpdate(vm, job, VIR_ASYNC_JOB_SNAPSHOT); } - if (rc < 0) - return -1; - return 0; } -- 2.46.2

2 1

[PATCH] docs: Document watchdog action=dump slightly more
by Martin Kletzander 12 Oct '24

12 Oct '24

With watchdog action=dump the actual watchdog action is set to pause and the daemon then proceeds to dump the process. After that the domain is resumed. That was the case since the feature was added. However the resuming of the domain might be unexpected, especially when compared to HW watchdog, which will never run the guest from the point where it got interrupted. Document the pre-existing behaviour, since any change might be unexpected as well. Change of behaviour would require new options like dump+reset, dump+pause, etc. That option is still possible, but orthogonal to this change. Resolves: https://issues.redhat.com/browse/RHEL-753 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/formatdomain.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 4336cff3ac05..e6f09a728f0f 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -7914,7 +7914,8 @@ southbridge, which is used with the q35 machine type. :since:`Since 9.1.0` - 'poweroff' - forcefully power off the guest - 'pause' - pause the guest - 'none' - do nothing - - 'dump' - automatically dump the guest :since:`Since 0.8.7` + - 'dump' - automatically dump the guest, beware that after the + dump the guest will be resumed :since:`Since 0.8.7` - 'inject-nmi' - inject a non-maskable interrupt into the guest :since:`Since 1.2.17` -- 2.46.2

3 2

[PATCH] ch: Enable a logfile for ch guests
by Praveen K Paladugu 11 Oct '24

11 Oct '24

Create a logfile to capture output from cloud-hypervisor whenever a guest is started. Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com> --- src/ch/ch_monitor.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 3e49902791..7421a550b6 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -541,6 +541,9 @@ virCHMonitorNew(virDomainObj *vm, virCHDriverConfig *cfg) g_autoptr(virCHMonitor) mon = NULL; g_autoptr(virCommand) cmd = NULL; const char *socketdir = cfg->stateDir; + const char *logdir = cfg->logDir; + g_autofree char *logfile = NULL; + int socket_fd = 0; if (virCHMonitorInitialize() < 0) @@ -564,6 +567,14 @@ virCHMonitorNew(virDomainObj *vm, virCHDriverConfig *cfg) return NULL; } + logfile = g_strdup_printf("%s/%s.log", logdir, vm->def->name); + if (g_mkdir_with_parents(logdir, 0777) < 0) { + virReportSystemError(errno, + _("Cannot create log directory '%1$s'"), + logdir); + return NULL; + } + if (g_mkdir_with_parents(cfg->saveDir, 0777) < 0) { virReportSystemError(errno, _("Cannot create save directory '%1$s'"), @@ -583,6 +594,9 @@ virCHMonitorNew(virDomainObj *vm, virCHDriverConfig *cfg) virCommandAddArg(cmd, "--api-socket"); virCommandAddArgFormat(cmd, "fd=%d", socket_fd); + virCommandAddArg(cmd, "-v"); + virCommandAddArg(cmd, "--log-file"); + virCommandAddArgFormat(cmd, "%s", logfile); virCommandPassFD(cmd, socket_fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); /* launch Cloud-Hypervisor socket */ -- 2.44.0

1 0

[PATCH] util: Rename variable "major" in virIsDevMapperDevice
by Jiri Denemark 11 Oct '24

11 Oct '24

major() is a macro defined in sys/sysmacros.h so luckily the code works, but it's very confusing. Let's rename the local variable to make the difference between it and the macro more obvious. And while touching the line we can also initialize it to make sure "clever" analyzers do not think it may be used uninitialized. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/util/virdevmapper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index 70ce0f0c23..d0eae671ab 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -321,14 +321,14 @@ bool virIsDevMapperDevice(const char *dev_name) { struct stat buf; - unsigned int major; + unsigned int maj = 0; - if (virDevMapperGetMajor(&major) < 0) + if (virDevMapperGetMajor(&maj) < 0) return false; if (!stat(dev_name, &buf) && S_ISBLK(buf.st_mode) && - major(buf.st_rdev) == major) + major(buf.st_rdev) == maj) return true; return false; -- 2.47.0

2 1

[libvirt PATCH] Remove pointless bool conversions
by Ján Tomko 11 Oct '24

11 Oct '24

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_process.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 8 ++++---- src/qemu/qemu_process.c | 2 +- tools/virsh-snapshot.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 0f129ec69c..c0122eb295 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -855,7 +855,7 @@ libxlDomainCleanup(libxlDriverPrivate *driver, priv->deathW = NULL; } - if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) + if (g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) driver->inhibitCallback(false, driver->inhibitOpaque); /* Release auto-allocated graphics ports */ diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 205ab96ebb..dc6f4fc03c 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -203,7 +203,7 @@ static void virLXCProcessCleanup(virLXCDriver *driver, vm->pid = 0; vm->def->id = -1; - if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) + if (g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) driver->inhibitCallback(false, driver->inhibitOpaque); virLXCDomainReAttachHostDevices(driver, vm->def); diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 26072ec26e..e65dbb93d9 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -588,7 +588,7 @@ virNWFilterSnoopReqPut(virNWFilterSnoopReq *req) if (!req) return; - if (!!g_atomic_int_dec_and_test(&req->refctr)) { + if (g_atomic_int_dec_and_test(&req->refctr)) { /* * delete the request: * - if we don't find req on the global list anymore @@ -743,7 +743,7 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReq *req, skip_instantiate: g_free(ipl); - ignore_value(!!g_atomic_int_dec_and_test(&virNWFilterSnoopState.nLeases)); + ignore_value(g_atomic_int_dec_and_test(&virNWFilterSnoopState.nLeases)); return ret; } @@ -1004,7 +1004,7 @@ static void virNWFilterDHCPDecodeWorker(void *jobdata, void *opaque) _("Instantiation of rules failed on interface '%1$s'"), req->binding->portdevname); } - ignore_value(!!g_atomic_int_dec_and_test(job->qCtr)); + ignore_value(g_atomic_int_dec_and_test(job->qCtr)); } /* @@ -1388,7 +1388,7 @@ virNWFilterDHCPSnoopThread(void *req0) pcap_close(pcapConf[i].handle); } - ignore_value(!!g_atomic_int_dec_and_test(&virNWFilterSnoopState.nThreads)); + ignore_value(g_atomic_int_dec_and_test(&virNWFilterSnoopState.nThreads)); return; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a00066e88e..f85e164c10 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8743,7 +8743,7 @@ void qemuProcessStop(virQEMUDriver *driver, if (priv->eventThread) g_object_unref(g_steal_pointer(&priv->eventThread)); - if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) + if (g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) driver->inhibitCallback(false, driver->inhibitOpaque); /* Clear network bandwidth */ diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 8b6a950a01..e0be8e7582 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -780,8 +780,8 @@ virshSnapshotFilter(vshControl *ctl, virDomainSnapshotPtr snapshot, return -1; } if (STREQ(state, "disk-snapshot")) { - return !!((flags & VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY) && - (flags & VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL)); + return (flags & VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY) && + (flags & VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL); } if (!(flags & VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL)) -- 2.47.0

2 1

[PATCH] network: inhibit idle timeout of daemon if there are any active networks
by Laine Stump 11 Oct '24

11 Oct '24

When the daemons were split out from the monolithic libvirtd, the network driver didn't implement "inhibit idle timeout if there are any active objects" as was done for other drivers, so virtnetworkd would always exit after 120 seconds of no incoming connections. This didn't every cause any visible problem, although it did mean that anytime a network API was called after an idle time > 120 seconds, that the restarting virtnetworkd would flush and reload all the iptables/nftables rules for any active networks. This patch replicates what is done in the QEMU driver - an nactive is added to the network driver object, along with an inhibitCallback; the latter is passed into networkStateInitialize when the driver is loaded, and the former is incremented for each already-active network, then incremented/decremented each time a network is started or stopped. If nactive transitions from 0 to 1 or 1 to 0, inhibitCallback is called, and it "does the right stuff" to prevent/enable the idle timeout. Signed-off-by: Laine Stump <laine(a)redhat.com> --- I had made this patch as a part of a larger series that will require it, but haven't sent that yet and keep being annoyed when virtnetworkd exits out from under a gdb session, so I decided it has enough general usefulness to send by itself. src/network/bridge_driver.c | 20 +++++++++++++++++--- src/network/bridge_driver_conf.h | 9 ++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 74ba59b4e9..6a48516fdf 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -501,9 +501,13 @@ networkUpdateState(virNetworkObj *obj, return -1; } - if (virNetworkObjIsActive(obj)) + if (virNetworkObjIsActive(obj)) { virNetworkObjPortForEach(obj, networkUpdatePort, obj); + if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback) + driver->inhibitCallback(true, driver->inhibitOpaque); + } + /* Try and read dnsmasq pids of both active and inactive networks, just in * case a network became inactive and we need to clean up. */ if (def->ips && (def->nips > 0)) { @@ -617,8 +621,8 @@ static virDrvStateInitResult networkStateInitialize(bool privileged, const char *root, bool monolithic G_GNUC_UNUSED, - virStateInhibitCallback callback G_GNUC_UNUSED, - void *opaque G_GNUC_UNUSED) + virStateInhibitCallback callback, + void *opaque) { virNetworkDriverConfig *cfg; bool autostart = true; @@ -640,6 +644,9 @@ networkStateInitialize(bool privileged, goto error; } + network_driver->inhibitCallback = callback; + network_driver->inhibitOpaque = opaque; + network_driver->privileged = privileged; if (!(network_driver->xmlopt = networkDnsmasqCreateXMLConf())) @@ -2427,6 +2434,9 @@ networkStartNetwork(virNetworkDriverState *driver, obj, network_driver->xmlopt) < 0) goto cleanup; + if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback) + driver->inhibitCallback(true, driver->inhibitOpaque); + virNetworkObjSetActive(obj, true); VIR_INFO("Network '%s' started up", def->name); ret = 0; @@ -2500,6 +2510,10 @@ networkShutdownNetwork(virNetworkDriverState *driver, VIR_HOOK_SUBOP_END); virNetworkObjSetActive(obj, false); + + if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) + driver->inhibitCallback(false, driver->inhibitOpaque); + virNetworkObjUnsetDefTransient(obj); return ret; } diff --git a/src/network/bridge_driver_conf.h b/src/network/bridge_driver_conf.h index 8f221f391e..1beed01efb 100644 --- a/src/network/bridge_driver_conf.h +++ b/src/network/bridge_driver_conf.h @@ -21,7 +21,7 @@ #pragma once -#include "internal.h" +#include "libvirt_internal.h" #include "virthread.h" #include "virdnsmasq.h" #include "virnetworkobj.h" @@ -49,6 +49,13 @@ typedef struct _virNetworkDriverState virNetworkDriverState; struct _virNetworkDriverState { virMutex lock; + /* Atomic inc/dec only */ + unsigned int nactive; + + /* Immutable pointers. Caller must provide locking */ + virStateInhibitCallback inhibitCallback; + void *inhibitOpaque; + /* Read-only */ bool privileged; -- 2.46.1

4 4

[PATCH v2] chardev: introduce 'reconnect-ms' and deprecate 'reconnect'
by Daniil Tatianin 10 Oct '24

10 Oct '24

The 'reconnect' option only allows to specify the time in seconds, which is way too long for certain workflows. We have a lightweight disk backend server, which takes about 20ms to live update, but due to this limitation in QEMU, previously the guest disk controller would hang for one second because it would take this long for QEMU to reinitialize the socket connection. Introduce a new option called 'reconnect-ms', which is the same as 'reconnect', except the value is treated as milliseconds. These are mutually exclusive and specifying both results in an error. 'reconnect' is also deprecated by this commit to make it possible to remove it in the future as to not keep two options that control the same thing. Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)yandex-team.ru> Acked-by: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Daniil Tatianin <d-tatianin(a)yandex-team.ru> --- Changes since v0: - Mention the deprecation in docs (Paolo) Changes since v1: - Move option validation to qmp_chardev_validate_socket as qemu_chr_parse_socket is only called for the command line and not QMP. (thanks to Markus Armbruster for spotting) --- chardev/char-socket.c | 33 ++++++++++++++++++++++++--------- chardev/char.c | 3 +++ docs/about/deprecated.rst | 6 ++++++ include/chardev/char-socket.h | 2 +- qapi/char.json | 17 +++++++++++++++-- 5 files changed, 49 insertions(+), 12 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 1ca9441b1b..91496ceda9 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -74,7 +74,7 @@ static void qemu_chr_socket_restart_timer(Chardev *chr) assert(!s->reconnect_timer); name = g_strdup_printf("chardev-socket-reconnect-%s", chr->label); s->reconnect_timer = qemu_chr_timeout_add_ms(chr, - s->reconnect_time * 1000, + s->reconnect_time_ms, socket_reconnect_timeout, chr); g_source_set_name(s->reconnect_timer, name); @@ -481,7 +481,7 @@ static void tcp_chr_disconnect_locked(Chardev *chr) if (emit_close) { qemu_chr_be_event(chr, CHR_EVENT_CLOSED); } - if (s->reconnect_time && !s->reconnect_timer) { + if (s->reconnect_time_ms && !s->reconnect_timer) { qemu_chr_socket_restart_timer(chr); } } @@ -1080,9 +1080,9 @@ static int tcp_chr_wait_connected(Chardev *chr, Error **errp) } else { Error *err = NULL; if (tcp_chr_connect_client_sync(chr, &err) < 0) { - if (s->reconnect_time) { + if (s->reconnect_time_ms) { error_free(err); - g_usleep(s->reconnect_time * 1000ULL * 1000ULL); + g_usleep(s->reconnect_time_ms * 1000ULL); } else { error_propagate(errp, err); return -1; @@ -1267,13 +1267,13 @@ skip_listen: static int qmp_chardev_open_socket_client(Chardev *chr, - int64_t reconnect, + int64_t reconnect_ms, Error **errp) { SocketChardev *s = SOCKET_CHARDEV(chr); - if (reconnect > 0) { - s->reconnect_time = reconnect; + if (reconnect_ms > 0) { + s->reconnect_time_ms = reconnect_ms; tcp_chr_connect_client_async(chr); return 0; } else { @@ -1354,6 +1354,12 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, } } + if (sock->has_reconnect_ms && sock->has_reconnect) { + error_setg(errp, + "'reconnect' and 'reconnect-ms' are mutually exclusive"); + return false; + } + return true; } @@ -1371,7 +1377,7 @@ static void qmp_chardev_open_socket(Chardev *chr, bool is_tn3270 = sock->has_tn3270 ? sock->tn3270 : false; bool is_waitconnect = sock->has_wait ? sock->wait : false; bool is_websock = sock->has_websocket ? sock->websocket : false; - int64_t reconnect = sock->has_reconnect ? sock->reconnect : 0; + int64_t reconnect_ms = 0; SocketAddress *addr; s->is_listen = is_listen; @@ -1443,7 +1449,13 @@ static void qmp_chardev_open_socket(Chardev *chr, return; } } else { - if (qmp_chardev_open_socket_client(chr, reconnect, errp) < 0) { + if (sock->has_reconnect) { + reconnect_ms = sock->reconnect * 1000ULL; + } else if (sock->has_reconnect_ms) { + reconnect_ms = sock->reconnect_ms; + } + + if (qmp_chardev_open_socket_client(chr, reconnect_ms, errp) < 0) { return; } } @@ -1509,6 +1521,9 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->wait = qemu_opt_get_bool(opts, "wait", true); sock->has_reconnect = qemu_opt_find(opts, "reconnect"); sock->reconnect = qemu_opt_get_number(opts, "reconnect", 0); + sock->has_reconnect_ms = qemu_opt_find(opts, "reconnect-ms"); + sock->reconnect_ms = qemu_opt_get_number(opts, "reconnect-ms", 0); + sock->tls_creds = g_strdup(qemu_opt_get(opts, "tls-creds")); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); diff --git a/chardev/char.c b/chardev/char.c index ba847b6e9e..35623c78a3 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -888,6 +888,9 @@ QemuOptsList qemu_chardev_opts = { },{ .name = "reconnect", .type = QEMU_OPT_NUMBER, + },{ + .name = "reconnect-ms", + .type = QEMU_OPT_NUMBER, },{ .name = "telnet", .type = QEMU_OPT_BOOL, diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 88f0f03786..e5db9bc6e9 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -430,6 +430,12 @@ Backend ``memory`` (since 9.0) ``memory`` is a deprecated synonym for ``ringbuf``. +``reconnect`` (since 9.2) +^^^^^^^^^^^^^^^^^^^^^^^^^ + +The ``reconnect`` option only allows specifiying second granularity timeouts, +which is not enough for all types of use cases, use ``reconnect-ms`` instead. + CPU device properties ''''''''''''''''''''' diff --git a/include/chardev/char-socket.h b/include/chardev/char-socket.h index 0708ca6fa9..d6d13ad37f 100644 --- a/include/chardev/char-socket.h +++ b/include/chardev/char-socket.h @@ -74,7 +74,7 @@ struct SocketChardev { bool is_websock; GSource *reconnect_timer; - int64_t reconnect_time; + int64_t reconnect_time_ms; bool connect_err_reported; QIOTask *connect_task; diff --git a/qapi/char.json b/qapi/char.json index ef58445cee..7f117438c6 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -273,7 +273,19 @@ # # @reconnect: For a client socket, if a socket is disconnected, then # attempt a reconnect after the given number of seconds. Setting -# this to zero disables this function. (default: 0) (Since: 2.2) +# this to zero disables this function. The use of this member is +# deprecated, use @reconnect-ms instead. (default: 0) (Since: 2.2) +# +# @reconnect-ms: For a client socket, if a socket is disconnected, +# then attempt a reconnect after the given number of milliseconds. +# Setting this to zero disables this function. This member is +# mutually exclusive with @reconnect. +# (default: 0) (Since: 9.2) +# +# Features: +# +# @deprecated: Member @reconnect is deprecated. Use @reconnect-ms +# instead. # # Since: 1.4 ## @@ -287,7 +299,8 @@ '*telnet': 'bool', '*tn3270': 'bool', '*websocket': 'bool', - '*reconnect': 'int' }, + '*reconnect': { 'type': 'int', 'features': [ 'deprecated' ] }, + '*reconnect-ms': 'int' }, 'base': 'ChardevCommon' } ## -- 2.34.1

4 4