- Devel - libvirt List Archives

[PATCH v5 00/18] *** qemu: block: Support block disk along with throttle filters ***
by Harikumar R 12 Feb '25

12 Feb '25

*** BLURB HERE *** Chun Feng Wu (17): schema: Add new domain elements to support multiple throttle groups schema: Add new domain elements to support multiple throttle filters config: Introduce ThrottleGroup and corresponding XML parsing config: Introduce ThrottleFilter and corresponding XML parsing qemu: monitor: Add support for ThrottleGroup operations tests: Test qemuMonitorJSONGetThrottleGroup and qemuMonitorJSONUpdateThrottleGroup remote: New APIs for ThrottleGroup lifecycle management qemu: Refactor qemuDomainSetBlockIoTune to extract common methods qemu: Implement qemu driver for throttle API qemu: helper: throttle filter nodename and preparation processing qemu: block: Support block disk along with throttle filters config: validate: Verify iotune, throttle group and filter qemuxmlconftest: Add 'throttlefilter' tests test_driver: Test throttle group lifecycle APIs virsh: Refactor iotune options for re-use virsh: Add support for throttle group operations virsh: Add option "throttle-groups" to "attach_disk" Harikumar Rajkumar (1): tests: Test qemuxmlactivetestThrottleGroup docs/formatdomain.rst | 47 ++ docs/manpages/virsh.rst | 135 +++- include/libvirt/libvirt-domain.h | 21 + src/conf/domain_conf.c | 398 ++++++++++ src/conf/domain_conf.h | 45 ++ src/conf/domain_validate.c | 119 ++- src/conf/schemas/domaincommon.rng | 293 ++++---- src/conf/virconftypes.h | 4 + src/driver-hypervisor.h | 22 + src/libvirt-domain.c | 174 +++++ src/libvirt_private.syms | 8 + src/libvirt_public.syms | 7 + src/qemu/qemu_block.c | 136 ++++ src/qemu/qemu_block.h | 49 ++ src/qemu/qemu_command.c | 180 +++++ src/qemu/qemu_command.h | 6 + src/qemu/qemu_domain.c | 73 +- src/qemu/qemu_driver.c | 619 +++++++++++++--- src/qemu/qemu_hotplug.c | 33 + src/qemu/qemu_monitor.c | 34 + src/qemu/qemu_monitor.h | 14 + src/qemu/qemu_monitor_json.c | 134 ++++ src/qemu/qemu_monitor_json.h | 14 + src/remote/remote_daemon_dispatch.c | 44 ++ src/remote/remote_driver.c | 40 ++ src/remote/remote_protocol.x | 48 +- src/remote_protocol-structs | 28 + src/test/test_driver.c | 452 ++++++++---- tests/qemumonitorjsontest.c | 86 +++ .../throttlefilter-in.xml | 392 ++++++++++ .../throttlefilter-out.xml | 393 ++++++++++ tests/qemuxmlactivetest.c | 1 + .../throttlefilter-invalid.x86_64-latest.err | 1 + .../throttlefilter-invalid.xml | 89 +++ .../throttlefilter.x86_64-latest.args | 55 ++ .../throttlefilter.x86_64-latest.xml | 105 +++ tests/qemuxmlconfdata/throttlefilter.xml | 95 +++ tests/qemuxmlconftest.c | 2 + tools/virsh-completer-domain.c | 82 +++ tools/virsh-completer-domain.h | 16 + tools/virsh-domain.c | 680 ++++++++++++++---- 41 files changed, 4649 insertions(+), 525 deletions(-) create mode 100644 tests/qemustatusxml2xmldata/throttlefilter-in.xml create mode 100644 tests/qemustatusxml2xmldata/throttlefilter-out.xml create mode 100644 tests/qemuxmlconfdata/throttlefilter-invalid.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/throttlefilter-invalid.xml create mode 100644 tests/qemuxmlconfdata/throttlefilter.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/throttlefilter.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/throttlefilter.xml -- 2.39.5 (Apple Git-154)

4 51

[PATCH] node_device: Do not lock the driver state needlessly
by Martin Kletzander 12 Feb '25

12 Feb '25

When processing the PCI devices we can only read the configs for each of them if running as privileged. That information is saved in the driver state as a boolean introduced in commit 643c74abff01. However since that version it is only written to once during nodeStateInitialize() and only read from that point (apart from some commits around v3.9.0 release when it was not even set, but that was fixed before v3.10.0). And it is only read once, just to store that boolean in a temporary variable which is also used in only one condition. Rewrite this without locking and save few lines of code. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/node_device/node_device_udev.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 7b4ff80f8fb4..be5ee0108c85 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -430,7 +430,6 @@ udevProcessPCI(virNodeDeviceDriverState *driver_state, g_autofree char *linkpath = NULL; int ret = -1; char *p; - bool privileged = false; linkpath = g_strdup_printf("%s/config", udev_device_get_syspath(device)); if (virFileWaitForExists(linkpath, 10, 100) < 0) { @@ -440,10 +439,6 @@ udevProcessPCI(virNodeDeviceDriverState *driver_state, goto cleanup; } - VIR_WITH_MUTEX_LOCK_GUARD(&driver_state->lock) { - privileged = driver_state->privileged; - } - pci_dev->klass = -1; if (udevGetIntProperty(device, "PCI_CLASS", &pci_dev->klass, 16) < 0) goto cleanup; @@ -491,7 +486,7 @@ udevProcessPCI(virNodeDeviceDriverState *driver_state, goto cleanup; /* We need to be root to read PCI device configs */ - if (privileged) { + if (driver_state->privileged) { if (virPCIGetHeaderType(pciDev, &pci_dev->hdrType) < 0) goto cleanup; -- 2.48.1

2 3

[libvirt PATCH] qemu: fix qemuDomainSaveImageDefineXML
by Pavel Hrdina 12 Feb '25

12 Feb '25

The commit in question made an incorrect change that resulted in getting O_RDONLY FD instead of O_RDWR preventing any writes to happen with the following error: virQEMUSaveDataWrite:176 : failed to write header to domain save file '/path/to/save.img': Bad file descriptor Fixes: 517248e2394476a3105ff5866b0b718fc6583073 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 78bfaa5b3a..a35abf2747 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5949,7 +5949,7 @@ qemuDomainSaveImageDefineXML(virConnectPtr conn, const char *path, if (qemuSaveImageGetMetadata(driver, NULL, path, &def, &data) < 0) goto cleanup; - fd = qemuSaveImageOpen(driver, path, 0, NULL, false); + fd = qemuSaveImageOpen(driver, path, false, NULL, true); if (fd < 0) goto cleanup; -- 2.48.1

3 2

[PATCH] ci: refresh with 'lcitool manifest'
by Daniel P. Berrangé 12 Feb '25

12 Feb '25

This replaces Fedora 39 with Fedora 41, updates the FreeBSD Cirrus CI image names, and tweaks some package names Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- NB: this updates the integration test config files but the integration test machine lacks updates. I have disabled running of integration tests in the scheduled nightly build pipelines. ci/buildenv/debian-11-cross-aarch64.sh | 2 +- ci/buildenv/debian-11-cross-armv6l.sh | 2 +- ci/buildenv/debian-11-cross-armv7l.sh | 2 +- ci/buildenv/debian-11-cross-i686.sh | 2 +- ci/buildenv/debian-11-cross-mips64el.sh | 2 +- ci/buildenv/debian-11-cross-mipsel.sh | 2 +- ci/buildenv/debian-11-cross-ppc64le.sh | 2 +- ci/buildenv/debian-11-cross-s390x.sh | 2 +- ci/buildenv/debian-11.sh | 2 +- 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 +- ...-mingw32.sh => fedora-41-cross-mingw32.sh} | 2 +- ...-mingw64.sh => fedora-41-cross-mingw64.sh} | 2 +- ci/buildenv/{fedora-39.sh => fedora-41.sh} | 3 +- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-14.vars | 2 +- .../debian-11-cross-aarch64.Dockerfile | 2 +- .../debian-11-cross-armv6l.Dockerfile | 2 +- .../debian-11-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-11-cross-i686.Dockerfile | 2 +- .../debian-11-cross-mips64el.Dockerfile | 2 +- .../debian-11-cross-mipsel.Dockerfile | 2 +- .../debian-11-cross-ppc64le.Dockerfile | 2 +- .../debian-11-cross-s390x.Dockerfile | 2 +- ci/containers/debian-11.Dockerfile | 2 +- .../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 +- .../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 +- .../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 +- ...ile => fedora-41-cross-mingw32.Dockerfile} | 4 +-- ...ile => fedora-41-cross-mingw64.Dockerfile} | 4 +-- ...ora-39.Dockerfile => fedora-41.Dockerfile} | 5 +-- ci/gitlab.yml | 1 + ci/gitlab/build-templates.yml | 4 +-- ci/gitlab/builds.yml | 36 +++++++++---------- ci/gitlab/containers.yml | 16 ++++----- ci/integration.yml | 20 +++++------ ci/manifest.yml | 4 +-- 66 files changed, 106 insertions(+), 103 deletions(-) rename ci/buildenv/{fedora-40-cross-mingw32.sh => fedora-41-cross-mingw32.sh} (98%) rename ci/buildenv/{fedora-40-cross-mingw64.sh => fedora-41-cross-mingw64.sh} (98%) rename ci/buildenv/{fedora-39.sh => fedora-41.sh} (97%) rename ci/containers/{fedora-40-cross-mingw32.Dockerfile => fedora-41-cross-mingw32.Dockerfile} (96%) rename ci/containers/{fedora-40-cross-mingw64.Dockerfile => fedora-41-cross-mingw64.Dockerfile} (96%) rename ci/containers/{fedora-39.Dockerfile => fedora-41.Dockerfile} (96%) diff --git a/ci/buildenv/debian-11-cross-aarch64.sh b/ci/buildenv/debian-11-cross-aarch64.sh index 6600b73e74..a52164a851 100644 --- a/ci/buildenv/debian-11-cross-aarch64.sh +++ b/ci/buildenv/debian-11-cross-aarch64.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/buildenv/debian-11-cross-armv6l.sh b/ci/buildenv/debian-11-cross-armv6l.sh index 761d813df0..caef8e80a4 100644 --- a/ci/buildenv/debian-11-cross-armv6l.sh +++ b/ci/buildenv/debian-11-cross-armv6l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/buildenv/debian-11-cross-armv7l.sh b/ci/buildenv/debian-11-cross-armv7l.sh index 6c016bd90b..81d92e6386 100644 --- a/ci/buildenv/debian-11-cross-armv7l.sh +++ b/ci/buildenv/debian-11-cross-armv7l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/buildenv/debian-11-cross-i686.sh b/ci/buildenv/debian-11-cross-i686.sh index b9705f1c3c..7ab7242654 100644 --- a/ci/buildenv/debian-11-cross-i686.sh +++ b/ci/buildenv/debian-11-cross-i686.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/buildenv/debian-11-cross-mips64el.sh b/ci/buildenv/debian-11-cross-mips64el.sh index 065c61ba57..f983ab2981 100644 --- a/ci/buildenv/debian-11-cross-mips64el.sh +++ b/ci/buildenv/debian-11-cross-mips64el.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/buildenv/debian-11-cross-mipsel.sh b/ci/buildenv/debian-11-cross-mipsel.sh index 89a0a8904b..55a99b861f 100644 --- a/ci/buildenv/debian-11-cross-mipsel.sh +++ b/ci/buildenv/debian-11-cross-mipsel.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/buildenv/debian-11-cross-ppc64le.sh b/ci/buildenv/debian-11-cross-ppc64le.sh index c898939f09..b7d26e67fd 100644 --- a/ci/buildenv/debian-11-cross-ppc64le.sh +++ b/ci/buildenv/debian-11-cross-ppc64le.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/buildenv/debian-11-cross-s390x.sh b/ci/buildenv/debian-11-cross-s390x.sh index f1b94ac872..ac259c5625 100644 --- a/ci/buildenv/debian-11-cross-s390x.sh +++ b/ci/buildenv/debian-11-cross-s390x.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/buildenv/debian-11.sh b/ci/buildenv/debian-11.sh index 9ba9e80183..affdf6e445 100644 --- a/ci/buildenv/debian-11.sh +++ b/ci/buildenv/debian-11.sh @@ -57,7 +57,7 @@ function install_buildenv() { libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-12-cross-aarch64.sh index b4a056d940..1d69c099a4 100644 --- a/ci/buildenv/debian-12-cross-aarch64.sh +++ b/ci/buildenv/debian-12-cross-aarch64.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-12-cross-armv6l.sh index 07ffb3da37..db2ee46af5 100644 --- a/ci/buildenv/debian-12-cross-armv6l.sh +++ b/ci/buildenv/debian-12-cross-armv6l.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-12-cross-armv7l.sh index 6f88f6cc06..9ab435d0d7 100644 --- a/ci/buildenv/debian-12-cross-armv7l.sh +++ b/ci/buildenv/debian-12-cross-armv7l.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh index 5da816d086..fbc6da5dd4 100644 --- a/ci/buildenv/debian-12-cross-i686.sh +++ b/ci/buildenv/debian-12-cross-i686.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh index 09c445758c..f7067dfeb3 100644 --- a/ci/buildenv/debian-12-cross-mips64el.sh +++ b/ci/buildenv/debian-12-cross-mips64el.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh index a762d1e3b8..6dd5333ae4 100644 --- a/ci/buildenv/debian-12-cross-mipsel.sh +++ b/ci/buildenv/debian-12-cross-mipsel.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-12-cross-ppc64le.sh index fe7b672799..97de655904 100644 --- a/ci/buildenv/debian-12-cross-ppc64le.sh +++ b/ci/buildenv/debian-12-cross-ppc64le.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh index 1ca0768d14..725d1ee113 100644 --- a/ci/buildenv/debian-12-cross-s390x.sh +++ b/ci/buildenv/debian-12-cross-s390x.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh index fcd5291f22..5e5b759f08 100644 --- a/ci/buildenv/debian-12.sh +++ b/ci/buildenv/debian-12.sh @@ -57,7 +57,7 @@ function install_buildenv() { libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh index b4a056d940..1d69c099a4 100644 --- a/ci/buildenv/debian-sid-cross-aarch64.sh +++ b/ci/buildenv/debian-sid-cross-aarch64.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh index 53d2d79b38..ac03caeb5c 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh index 4e60877e77..c540104cb0 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh index 98e08b2397..b558576fca 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh index 09c445758c..f7067dfeb3 100644 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ b/ci/buildenv/debian-sid-cross-mips64el.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh index fe7b672799..97de655904 100644 --- a/ci/buildenv/debian-sid-cross-ppc64le.sh +++ b/ci/buildenv/debian-sid-cross-ppc64le.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh index 1ca0768d14..725d1ee113 100644 --- a/ci/buildenv/debian-sid-cross-s390x.sh +++ b/ci/buildenv/debian-sid-cross-s390x.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh index fcd5291f22..5e5b759f08 100644 --- a/ci/buildenv/debian-sid.sh +++ b/ci/buildenv/debian-sid.sh @@ -57,7 +57,7 @@ function install_buildenv() { libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/buildenv/fedora-40-cross-mingw32.sh b/ci/buildenv/fedora-41-cross-mingw32.sh similarity index 98% rename from ci/buildenv/fedora-40-cross-mingw32.sh rename to ci/buildenv/fedora-41-cross-mingw32.sh index 9104b2e20e..b19f0dccb2 100644 --- a/ci/buildenv/fedora-40-cross-mingw32.sh +++ b/ci/buildenv/fedora-41-cross-mingw32.sh @@ -8,7 +8,7 @@ function install_buildenv() { dnf update -y dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/buildenv/fedora-40-cross-mingw64.sh b/ci/buildenv/fedora-41-cross-mingw64.sh similarity index 98% rename from ci/buildenv/fedora-40-cross-mingw64.sh rename to ci/buildenv/fedora-41-cross-mingw64.sh index 35120064ec..20dca703b5 100644 --- a/ci/buildenv/fedora-40-cross-mingw64.sh +++ b/ci/buildenv/fedora-41-cross-mingw64.sh @@ -8,7 +8,7 @@ function install_buildenv() { dnf update -y dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/buildenv/fedora-39.sh b/ci/buildenv/fedora-41.sh similarity index 97% rename from ci/buildenv/fedora-39.sh rename to ci/buildenv/fedora-41.sh index e45ac2230f..c32a689fbd 100644 --- a/ci/buildenv/fedora-39.sh +++ b/ci/buildenv/fedora-41.sh @@ -9,7 +9,7 @@ function install_buildenv() { dnf install -y \ audit-libs-devel \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ clang \ @@ -82,6 +82,7 @@ function install_buildenv() { systemd-devel \ systemd-rpm-macros \ systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index fbcd613095..56b66e3b2a 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' +PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-14.vars b/ci/cirrus/freebsd-14.vars index 3002987cbd..fb665d16ee 100644 --- a/ci/cirrus/freebsd-14.vars +++ b/ci/cirrus/freebsd-14.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' +PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile index f8d4ea8ed2..79c359f9fa 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile index f974163000..27bd6c578b 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile index ced175c7c0..3b413673a6 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile index c1ee60f3b6..ab5173f2f1 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile index 98c40beef4..04fa68f688 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile index e3531a9fac..558382ad25 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile index 8f9f729909..ed68e8f0af 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile index b09076b148..62791ac154 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile index 1660bd9c52..48c59e3aab 100644 --- a/ci/containers/debian-11.Dockerfile +++ b/ci/containers/debian-11.Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-12-cross-aarch64.Dockerfile index f4d587177b..ebccfbc203 100644 --- a/ci/containers/debian-12-cross-aarch64.Dockerfile +++ b/ci/containers/debian-12-cross-aarch64.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-12-cross-armv6l.Dockerfile index d8f2a3bc42..a6f51c80fd 100644 --- a/ci/containers/debian-12-cross-armv6l.Dockerfile +++ b/ci/containers/debian-12-cross-armv6l.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-12-cross-armv7l.Dockerfile index 1abfb79931..132938ce10 100644 --- a/ci/containers/debian-12-cross-armv7l.Dockerfile +++ b/ci/containers/debian-12-cross-armv7l.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-12-cross-i686.Dockerfile index 5681121d80..3a76ee4e76 100644 --- a/ci/containers/debian-12-cross-i686.Dockerfile +++ b/ci/containers/debian-12-cross-i686.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile index a4f2aabe10..c8009062ef 100644 --- a/ci/containers/debian-12-cross-mips64el.Dockerfile +++ b/ci/containers/debian-12-cross-mips64el.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile index a3f0652818..efb4639a26 100644 --- a/ci/containers/debian-12-cross-mipsel.Dockerfile +++ b/ci/containers/debian-12-cross-mipsel.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-12-cross-ppc64le.Dockerfile index caf8229a8e..3b0cfab7ef 100644 --- a/ci/containers/debian-12-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-12-cross-s390x.Dockerfile index c4f8479c13..c730b44e03 100644 --- a/ci/containers/debian-12-cross-s390x.Dockerfile +++ b/ci/containers/debian-12-cross-s390x.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile index 3e6d0597e2..778f6962d9 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-12.Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 3a06f01c5c..2d0e4d8a98 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index fdf129aa04..d3034c0131 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index 8dbb705d69..30234b6755 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index f856306a62..2c2c4772c8 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 468c5fbc3e..0af87394cc 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 37c256fe1e..d91a84c65b 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 232a8d7844..147c5e992f 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index febd286d86..daa750324b 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/containers/fedora-40-cross-mingw32.Dockerfile b/ci/containers/fedora-41-cross-mingw32.Dockerfile similarity index 96% rename from ci/containers/fedora-40-cross-mingw32.Dockerfile rename to ci/containers/fedora-41-cross-mingw32.Dockerfile index ed8566f273..6ab14be6fc 100644 --- a/ci/containers/fedora-40-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-41-cross-mingw32.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:40 +FROM registry.fedoraproject.org/fedora:41 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -19,7 +19,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/containers/fedora-40-cross-mingw64.Dockerfile b/ci/containers/fedora-41-cross-mingw64.Dockerfile similarity index 96% rename from ci/containers/fedora-40-cross-mingw64.Dockerfile rename to ci/containers/fedora-41-cross-mingw64.Dockerfile index b030427e0c..a0ec65d74a 100644 --- a/ci/containers/fedora-40-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-41-cross-mingw64.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:40 +FROM registry.fedoraproject.org/fedora:41 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -19,7 +19,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/containers/fedora-39.Dockerfile b/ci/containers/fedora-41.Dockerfile similarity index 96% rename from ci/containers/fedora-39.Dockerfile rename to ci/containers/fedora-41.Dockerfile index 2e35ca426d..a46f220de0 100644 --- a/ci/containers/fedora-39.Dockerfile +++ b/ci/containers/fedora-41.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:39 +FROM registry.fedoraproject.org/fedora:41 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -20,7 +20,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf install -y \ audit-libs-devel \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ clang \ @@ -93,6 +93,7 @@ exec "$@"\n' > /usr/bin/nosync && \ systemd-devel \ systemd-rpm-macros \ systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel && \ nosync dnf autoremove -y && \ diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 0daab12676..0e6de9f36d 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -55,6 +55,7 @@ variables: RUN_UPSTREAM_NAMESPACE: libvirt + CONTAINER_UPSTREAM_NAMESPACE: libvirt FF_SCRIPT_SECTIONS: 1 diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index 5ba91ffc67..a4b76e06d0 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -35,7 +35,7 @@ fi - cat /packages.txt variables: - IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest + IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest rules: ### PUSH events @@ -179,7 +179,7 @@ fi - cat /packages.txt variables: - IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest + IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest rules: ### PUSH events diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 3e7f36802e..9c2f0ecad8 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -127,30 +127,30 @@ x86_64-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -x86_64-fedora-39: +x86_64-fedora-40: extends: .native_build_job needs: - - job: x86_64-fedora-39-container + - job: x86_64-fedora-40-container optional: true allow_failure: false variables: - NAME: fedora-39 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:39 + NAME: fedora-40 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 artifacts: expire_in: 1 day paths: - libvirt-rpms -x86_64-fedora-40: +x86_64-fedora-41: extends: .native_build_job needs: - - job: x86_64-fedora-40-container + - job: x86_64-fedora-41-container optional: true allow_failure: false variables: - NAME: fedora-40 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 artifacts: expire_in: 1 day paths: @@ -544,29 +544,29 @@ s390x-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -mingw32-fedora-40: +mingw32-fedora-41: extends: .cross_build_job needs: - - job: mingw32-fedora-40-container + - job: mingw32-fedora-41-container optional: true allow_failure: false variables: CROSS: mingw32 JOB_OPTIONAL: 1 - NAME: fedora-40 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 -mingw64-fedora-40: +mingw64-fedora-41: extends: .cross_build_job needs: - - job: mingw64-fedora-40-container + - job: mingw64-fedora-41-container optional: true allow_failure: false variables: CROSS: mingw64 - NAME: fedora-40 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 mingw32-fedora-rawhide: @@ -602,7 +602,7 @@ x86_64-freebsd-13: allow_failure: exit_codes: 3 variables: - CIRRUS_VM_IMAGE_NAME: freebsd-13-3 + CIRRUS_VM_IMAGE_NAME: freebsd-13-4 CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_INSTANCE_TYPE: freebsd_instance INSTALL_COMMAND: pkg install -y @@ -617,7 +617,7 @@ x86_64-freebsd-14: allow_failure: exit_codes: 3 variables: - CIRRUS_VM_IMAGE_NAME: freebsd-14-1 + CIRRUS_VM_IMAGE_NAME: freebsd-14-2 CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_INSTANCE_TYPE: freebsd_instance INSTALL_COMMAND: pkg install -y diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 55137dc1c3..0cfc8ca952 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -57,18 +57,18 @@ x86_64-debian-sid-container: NAME: debian-sid -x86_64-fedora-39-container: +x86_64-fedora-40-container: extends: .container_job allow_failure: false variables: - NAME: fedora-39 + NAME: fedora-40 -x86_64-fedora-40-container: +x86_64-fedora-41-container: extends: .container_job allow_failure: false variables: - NAME: fedora-40 + NAME: fedora-41 x86_64-fedora-rawhide-container: @@ -292,19 +292,19 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x -mingw32-fedora-40-container: +mingw32-fedora-41-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: fedora-40-cross-mingw32 + NAME: fedora-41-cross-mingw32 -mingw64-fedora-40-container: +mingw64-fedora-41-container: extends: .container_job allow_failure: false variables: - NAME: fedora-40-cross-mingw64 + NAME: fedora-41-cross-mingw64 mingw32-fedora-rawhide-container: diff --git a/ci/integration.yml b/ci/integration.yml index 2fc8d02956..ced3fbc3c2 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -29,23 +29,23 @@ centos-stream-9-tests: # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. -fedora-39-tests: +fedora-40-tests: extends: .integration_tests variables: # needed by libvirt-gitlab-executor - DISTRO: fedora-39 + DISTRO: fedora-40 # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG needs: - - x86_64-fedora-39 + - x86_64-fedora-40 - project: libvirt/libvirt-perl - job: x86_64-fedora-39 + job: x86_64-fedora-40 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-39 + job: x86_64-fedora-40 ref: master artifacts: true @@ -53,22 +53,22 @@ fedora-39-tests: # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. -.fedora-39-upstream-qemu-tests: +.fedora-40-upstream-qemu-tests: extends: .integration_tests variables: # needed by libvirt-gitlab-executor - DISTRO: fedora-39 + DISTRO: fedora-40 # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG needs: - - x86_64-fedora-39 + - x86_64-fedora-40 - project: libvirt/libvirt-perl - job: x86_64-fedora-39 + job: x86_64-fedora-40 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-39 + job: x86_64-fedora-40 ref: master artifacts: true diff --git a/ci/manifest.yml b/ci/manifest.yml index 43b9995717..2c036aaa39 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -144,7 +144,7 @@ targets: containers: false builds: false - fedora-39: + fedora-40: jobs: - arch: x86_64 artifacts: @@ -152,7 +152,7 @@ targets: paths: - libvirt-rpms - fedora-40: + fedora-41: jobs: - arch: x86_64 artifacts: -- 2.47.1

2 1

[PATCH 0/2] qemu: acpi-generic-initiator support
by Andrea Righi 12 Feb '25

12 Feb '25

= Overview = This patch set introduces support for acpi-generic-initiator devices, supported by QEMU [1]. The acpi-generic-initiator object is required to support Multi-Instance GPU (MIG) configurations on NVIDIA GPUs [2]. MIG enables partitioning of GPU resources into multiple isolated instances, each requiring a dedicated NUMA node definition. = Implementation = This patch set implements the libvirt counterpart to the QEMU feature, enabling users to configure acpi-generic-initiator objects within libvirt domain XML. This includes: - adding XML syntax to define acpi-generic-initiator objects, - resolving the acpi-generic-initiator definitions into the proper QEMU command-line arguments, - ensuring compatibility with existing NUMA configuration. = Example = - Domain XML: ``` ... <cpu mode='host-passthrough' check='none'> <numa> <cell id='0' cpus='0-15' memory='8388608' unit='KiB'/> <cell id='1' memory='0' unit='KiB'/> <cell id='2' memory='0' unit='KiB'/> <cell id='3' memory='0' unit='KiB'/> <cell id='4' memory='0' unit='KiB'/> <cell id='5' memory='0' unit='KiB'/> <cell id='6' memory='0' unit='KiB'/> <cell id='7' memory='0' unit='KiB'/> <cell id='8' memory='0' unit='KiB'/> </numa> </cpu> ... <devices> ... <hostdev mode='subsystem' type='pci' managed='no'> <source> <address domain='0x0009' bus='0x01' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> </hostdev> <acpi-generic-initiator> <alias name="gi1" /> <pci-dev>hostdev0</pci-dev> <numa-node>1</numa-node> </acpi-generic-initiator> <acpi-generic-initiator> <alias name="gi2" /> <pci-dev>hostdev0</pci-dev> <numa-node>2</numa-node> </acpi-generic-initiator> <acpi-generic-initiator> <alias name="gi3" /> <pci-dev>hostdev0</pci-dev> <numa-node>3</numa-node> </acpi-generic-initiator> <acpi-generic-initiator> <alias name="gi4" /> <pci-dev>hostdev0</pci-dev> <numa-node>4</numa-node> </acpi-generic-initiator> <acpi-generic-initiator> <alias name="gi5" /> <pci-dev>hostdev0</pci-dev> <numa-node>5</numa-node> </acpi-generic-initiator> <acpi-generic-initiator> <alias name="gi6" /> <pci-dev>hostdev0</pci-dev> <numa-node>6</numa-node> </acpi-generic-initiator> <acpi-generic-initiator> <alias name="gi7" /> <pci-dev>hostdev0</pci-dev> <numa-node>7</numa-node> </acpi-generic-initiator> <acpi-generic-initiator> <alias name="gi8" /> <pci-dev>hostdev0</pci-dev> <numa-node>8</numa-node> </acpi-generic-initiator> </devices> ``` - Generated QEMU command line options: ``` ... /usr/bin/qemu-system-aarch64 \ ... -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":8589934592}' \ -numa node,nodeid=0,cpus=0-15,memdev=ram-node0 \ -numa node,nodeid=1 \ -numa node,nodeid=2 \ -numa node,nodeid=3 \ -numa node,nodeid=4 \ -numa node,nodeid=5 \ -numa node,nodeid=6 \ -numa node,nodeid=7 \ -numa node,nodeid=8 \ ... -device '{"driver":"vfio-pci","host":"0009:01:00.0","id":"hostdev0","bus":"pci.3","addr":"0x0"}' ... -object acpi-generic-initiator,id=gi1,pci-dev=hostdev0,node=1 \ -object acpi-generic-initiator,id=gi2,pci-dev=hostdev0,node=2 \ -object acpi-generic-initiator,id=gi3,pci-dev=hostdev0,node=3 \ -object acpi-generic-initiator,id=gi4,pci-dev=hostdev0,node=4 \ -object acpi-generic-initiator,id=gi5,pci-dev=hostdev0,node=5 \ -object acpi-generic-initiator,id=gi6,pci-dev=hostdev0,node=6 \ -object acpi-generic-initiator,id=gi7,pci-dev=hostdev0,node=7 \ -object acpi-generic-initiator,id=gi8,pci-dev=hostdev0,node=8 ``` = References = [1] https://lore.kernel.org/all/20231225045603.7654-2-ankita@nvidia.com/ [2] https://www.nvidia.com/en-in/technologies/multi-instance-gpu/ Andrea Righi (2): qemu: Allow to define NUMA nodes without memory or CPUs assigned qemu: Introduce acpi-generic-initiator device src/ch/ch_domain.c | 1 + src/conf/domain_conf.c | 153 ++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 14 ++++ src/conf/domain_postparse.c | 1 + src/conf/domain_validate.c | 40 ++++++++++ src/conf/numa_conf.c | 3 + src/conf/schemas/domaincommon.rng | 19 +++++ src/conf/virconftypes.h | 2 + src/libxl/libxl_driver.c | 6 ++ src/lxc/lxc_driver.c | 6 ++ src/qemu/qemu_command.c | 40 ++++++++-- src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain_address.c | 4 + src/qemu/qemu_driver.c | 3 + src/qemu/qemu_hotplug.c | 5 ++ src/qemu/qemu_postparse.c | 1 + src/qemu/qemu_validate.c | 1 + src/test/test_driver.c | 4 + 18 files changed, 297 insertions(+), 8 deletions(-)

2 4

[PATCH 1/3] [bhyve] list pci devices on host
by Alexander Shursha 12 Feb '25

12 Feb '25

Linux gets the list via sysfs. FreeBSD can get the list through ioctl Sponsored by: Future Crew, LLC Signed-off-by: Alexander Shursha <kekek2(a)ya.ru> --- src/bhyve/bhyve_capabilities.c | 2 +- src/conf/node_device_conf.c | 2 +- src/node_device/node_device_driver.c | 2 +- src/util/virmdev.c | 2 +- src/util/virpci.c | 400 ++++++++++++++++++++++++++- 5 files changed, 399 insertions(+), 9 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index b065256cf0..fcef91c435 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -108,7 +108,7 @@ virBhyveDomainCapsFill(virDomainCaps *caps, VIR_DOMAIN_CAPS_ENUM_SET(caps->video.modelType, VIR_DOMAIN_VIDEO_TYPE_GOP); } - caps->hostdev.supported = VIR_TRISTATE_BOOL_NO; + caps->hostdev.supported = VIR_TRISTATE_BOOL_YES; caps->features[VIR_DOMAIN_CAPS_FEATURE_IOTHREADS] = VIR_TRISTATE_BOOL_NO; caps->features[VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO] = VIR_TRISTATE_BOOL_NO; caps->features[VIR_DOMAIN_CAPS_FEATURE_GENID] = VIR_TRISTATE_BOOL_NO; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 08a89942ba..39e6b78f3d 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2836,7 +2836,7 @@ virNodeDeviceSyncMdevActiveConfig(virNodeDeviceDef *def) } } -#ifdef __linux__ +#if defined(__linux__) || defined(__FreeBSD__) int virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHost *scsi_host) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index fa5db0d5d5..282af02724 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -111,7 +111,7 @@ int nodeConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) return 1; } -#if defined (__linux__) && defined(WITH_UDEV) +#if (defined(__linux__) || defined(__FreeBSD__)) && defined(WITH_UDEV) /* NB: It was previously believed that changes in driver name were * relayed to libvirt as "change" events by udev, and the udev event * notification is setup to recognize such events and effectively diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 6ecdbdf0ab..3a07ba75f2 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -565,7 +565,7 @@ virMediatedDeviceParentGetAddress(const char *sysfspath, return -1; } -#ifdef __linux__ +#if defined(__linux__) || defined(__FreeBSD__) ssize_t virMediatedDeviceGetMdevTypes(const char *sysfspath, diff --git a/src/util/virpci.c b/src/util/virpci.c index 90617e69c6..f954ce4df2 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -30,6 +30,13 @@ #include <sys/stat.h> #include <unistd.h> +#ifdef __FreeBSD__ +# ifdef WITH_BHYVE +# include <libudev.h> +# endif +# include <sys/pciio.h> +#endif + #ifdef __linux__ # include <sys/utsname.h> #endif @@ -72,7 +79,11 @@ struct _virPCIDevice { char *name; /* domain:bus:slot.function */ char id[PCI_ID_LEN]; /* product vendor */ +#ifndef __FreeBSD__ char *path; +#else + struct pci_match_conf patterns[1]; +#endif /* The driver:domain which uses the device */ char *used_by_drvname; @@ -99,6 +110,9 @@ struct _virPCIDevice { bool unbind_from_stub; bool remove_slot; bool reprobe; +#ifdef __FreeBSD__ + u_int8_t pc_hdr; /* PCI header type */ +#endif }; struct _virPCIDeviceList { @@ -359,6 +373,7 @@ virPCIDeviceGetCurrentDriverNameAndType(virPCIDevice *dev, } +#ifndef __FreeBSD__ static int virPCIDeviceConfigOpenInternal(virPCIDevice *dev, bool readonly, bool fatal) { @@ -429,6 +444,7 @@ virPCIDeviceRead(virPCIDevice *dev, return 0; } +#endif /** * virPCIDeviceReadN: @@ -450,6 +466,7 @@ virPCIDeviceRead(virPCIDevice *dev, * and the return value is 0, then the config file really does contain * the value 0 at @pos. */ +#ifndef __FreeBSD__ static uint8_t virPCIDeviceRead8(virPCIDevice *dev, int cfgfd, unsigned int pos) { @@ -473,7 +490,56 @@ virPCIDeviceRead32(virPCIDevice *dev, int cfgfd, unsigned int pos) virPCIDeviceRead(dev, cfgfd, pos, &buf[0], sizeof(buf)); return (buf[0] << 0) | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24); } +#else +static int +virPCIDeviceRead(virPCIDevice *dev, int pi_reg, int pi_width, u_int32_t *pi_data) +{ + struct pci_io pc; + int fd; + + bzero(&pc, sizeof(struct pci_io)); + pc.pi_sel.pc_domain = dev->address.domain; + pc.pi_sel.pc_bus = dev->address.bus; + pc.pi_sel.pc_dev = dev->address.slot; + pc.pi_sel.pc_func = dev->address.function; + pc.pi_reg = pi_reg; + pc.pi_width = pi_width; + + fd = open("/dev/pci", O_RDWR, 0); + errno = 0; + if (ioctl(fd, PCIOCREAD, &pc) == -1) { + VIR_FORCE_CLOSE(fd); + VIR_WARN("Failed to read from '%s' : %s", dev->name, g_strerror(errno)); + return -1; + } + VIR_FORCE_CLOSE(fd); + *pi_data = pc.pi_data; + return 0; +} +static uint8_t +virPCIDeviceRead8(virPCIDevice *dev, int pi_reg) +{ + u_int32_t pi_data; + virPCIDeviceRead(dev, pi_reg, 1, &pi_data); + return pi_data & 0xff; +} +static uint16_t +virPCIDeviceRead16(virPCIDevice *dev, int pi_reg) +{ + u_int32_t pi_data; + virPCIDeviceRead(dev, pi_reg, 2, &pi_data); + return pi_data & 0xffff; +} + +static uint32_t +virPCIDeviceRead32(virPCIDevice *dev, int pi_reg) +{ + u_int32_t pi_data; + virPCIDeviceRead(dev, pi_reg, 4, &pi_data); + return pi_data; +} +#endif static int virPCIDeviceReadClass(virPCIDevice *dev, uint16_t *device_class) { @@ -499,6 +565,7 @@ virPCIDeviceReadClass(virPCIDevice *dev, uint16_t *device_class) return 0; } +#ifndef __FreeBSD__ static int virPCIDeviceWrite(virPCIDevice *dev, int cfgfd, @@ -528,6 +595,44 @@ virPCIDeviceWrite32(virPCIDevice *dev, int cfgfd, unsigned int pos, uint32_t val uint8_t buf[4] = { (val >> 0), (val >> 8), (val >> 16), (val >> 24) }; virPCIDeviceWrite(dev, cfgfd, pos, &buf[0], sizeof(buf)); } +#else +static int +virPCIDeviceWrite(virPCIDevice *dev, int pi_reg, int pi_width, u_int32_t pi_data) +{ + struct pci_io pc; + int fd; + + bzero(&pc, sizeof(struct pci_io)); + pc.pi_sel.pc_domain = dev->address.domain; + pc.pi_sel.pc_bus = dev->address.bus; + pc.pi_sel.pc_dev = dev->address.slot; + pc.pi_sel.pc_func = dev->address.function; + pc.pi_reg = pi_reg; + pc.pi_width = pi_width; + pc.pi_data = pi_data; + + fd = open("/dev/pci", O_RDWR, 0); + errno = 0; + if (ioctl(fd, PCIOCWRITE, &pc) == -1) { + VIR_FORCE_CLOSE(fd); + VIR_WARN("Failed to write to '%s' : %s", dev->name, g_strerror(errno)); + return -1; + } + VIR_FORCE_CLOSE(fd); + return 0; +} +static void +virPCIDeviceWrite16(virPCIDevice *dev, int pi_reg, u_int16_t val) +{ + virPCIDeviceWrite(dev, pi_reg, 2, val); +} + +static void +virPCIDeviceWrite32(virPCIDevice *dev, int pi_reg, uint32_t val) +{ + virPCIDeviceWrite(dev, pi_reg, 4, val); +} +#endif typedef int (*virPCIDeviceIterPredicate)(virPCIDevice *, virPCIDevice *, void *); @@ -610,7 +715,9 @@ virPCIDeviceIterDevices(virPCIDeviceIterPredicate predicate, */ static int virPCIDeviceFindCapabilityOffset(virPCIDevice *dev, +#ifndef __FreeBSD__ int cfgfd, +#endif unsigned int capability, unsigned int *offset) { @@ -619,11 +726,19 @@ virPCIDeviceFindCapabilityOffset(virPCIDevice *dev, *offset = 0; /* assume failure (*nothing* can be at offset 0) */ +#ifndef __FreeBSD__ status = virPCIDeviceRead16(dev, cfgfd, PCI_STATUS); +#else + status = virPCIDeviceRead16(dev, PCI_STATUS); +#endif if (errno != 0 || !(status & PCI_STATUS_CAP_LIST)) goto error; +#ifndef __FreeBSD__ pos = virPCIDeviceRead8(dev, cfgfd, PCI_CAPABILITY_LIST); +#else + pos = virPCIDeviceRead8(dev, PCI_CAPABILITY_LIST); +#endif if (errno != 0) goto error; @@ -635,7 +750,11 @@ virPCIDeviceFindCapabilityOffset(virPCIDevice *dev, * capabilities here. */ while (pos >= PCI_CONF_HEADER_LEN && pos != 0xff) { +#ifndef __FreeBSD__ uint8_t capid = virPCIDeviceRead8(dev, cfgfd, pos); +#else + uint8_t capid = virPCIDeviceRead8(dev, pos); +#endif if (errno != 0) goto error; @@ -646,7 +765,11 @@ virPCIDeviceFindCapabilityOffset(virPCIDevice *dev, return 0; } +#ifndef __FreeBSD__ pos = virPCIDeviceRead8(dev, cfgfd, pos + 1); +#else + pos = virPCIDeviceRead8(dev, pos + 1); +#endif if (errno != 0) goto error; } @@ -665,7 +788,9 @@ virPCIDeviceFindCapabilityOffset(virPCIDevice *dev, static unsigned int virPCIDeviceFindExtendedCapabilityOffset(virPCIDevice *dev, +#ifndef __FreeBSD__ int cfgfd, +#endif unsigned int capability) { int ttl; @@ -677,7 +802,11 @@ virPCIDeviceFindExtendedCapabilityOffset(virPCIDevice *dev, pos = PCI_EXT_CAP_BASE; while (ttl > 0 && pos >= PCI_EXT_CAP_BASE) { +#ifndef __FreeBSD__ header = virPCIDeviceRead32(dev, cfgfd, pos); +#else + header = virPCIDeviceRead32(dev, pos); +#endif if ((header & PCI_EXT_CAP_ID_MASK) == capability) return pos; @@ -693,7 +822,11 @@ virPCIDeviceFindExtendedCapabilityOffset(virPCIDevice *dev, * not have FLR, 1 if it does, and -1 on error */ static bool +#ifndef __FreeBSD__ virPCIDeviceDetectFunctionLevelReset(virPCIDevice *dev, int cfgfd) +#else +virPCIDeviceDetectFunctionLevelReset(virPCIDevice *dev) +#endif { uint32_t caps; unsigned int pos; @@ -707,7 +840,11 @@ virPCIDeviceDetectFunctionLevelReset(virPCIDevice *dev, int cfgfd) * on SR-IOV NICs at the moment. */ if (dev->pcie_cap_pos) { +#ifndef __FreeBSD__ caps = virPCIDeviceRead32(dev, cfgfd, dev->pcie_cap_pos + PCI_EXP_DEVCAP); +#else + caps = virPCIDeviceRead32(dev, dev->pcie_cap_pos + PCI_EXP_DEVCAP); +#endif if (caps & PCI_EXP_DEVCAP_FLR) { VIR_DEBUG("%s %s: detected PCIe FLR capability", dev->id, dev->name); return true; @@ -718,11 +855,19 @@ virPCIDeviceDetectFunctionLevelReset(virPCIDevice *dev, int cfgfd) * the same thing, except for conventional PCI * devices. This is not common yet. */ +#ifndef __FreeBSD__ if (virPCIDeviceFindCapabilityOffset(dev, cfgfd, PCI_CAP_ID_AF, &pos) < 0) +#else + if (virPCIDeviceFindCapabilityOffset(dev, PCI_CAP_ID_AF, &pos) < 0) +#endif goto error; if (pos) { +#ifndef __FreeBSD__ caps = virPCIDeviceRead16(dev, cfgfd, pos + PCI_AF_CAP); +#else + caps = virPCIDeviceRead16(dev, pos + PCI_AF_CAP); +#endif if (caps & PCI_AF_CAP_FLR) { VIR_DEBUG("%s %s: detected PCI FLR capability", dev->id, dev->name); return true; @@ -754,13 +899,21 @@ virPCIDeviceDetectFunctionLevelReset(virPCIDevice *dev, int cfgfd) * internal reset, not just a soft reset. */ static bool +#ifndef __FreeBSD__ virPCIDeviceDetectPowerManagementReset(virPCIDevice *dev, int cfgfd) +#else +virPCIDeviceDetectPowerManagementReset(virPCIDevice *dev) +#endif { if (dev->pci_pm_cap_pos) { uint32_t ctl; /* require the NO_SOFT_RESET bit is clear */ +#ifndef __FreeBSD__ ctl = virPCIDeviceRead32(dev, cfgfd, dev->pci_pm_cap_pos + PCI_PM_CTRL); +#else + ctl = virPCIDeviceRead32(dev, dev->pci_pm_cap_pos + PCI_PM_CTRL); +#endif if (!(ctl & PCI_PM_CTRL_NO_SOFT_RESET)) { VIR_DEBUG("%s %s: detected PM reset capability", dev->id, dev->name); return true; @@ -811,13 +964,17 @@ virPCIDeviceIsParent(virPCIDevice *dev, virPCIDevice *check, void *data) uint8_t header_type, secondary, subordinate; virPCIDevice **best = data; int ret = 0; +#ifndef __FreeBSD__ int fd; +#endif if (dev->address.domain != check->address.domain) return 0; +#ifndef __FreeBSD__ if ((fd = virPCIDeviceConfigOpenTry(check)) < 0) return 0; +#endif /* Is it a bridge? */ ret = virPCIDeviceReadClass(check, &device_class); @@ -825,12 +982,21 @@ virPCIDeviceIsParent(virPCIDevice *dev, virPCIDevice *check, void *data) goto cleanup; /* Is it a plane? */ +#ifndef __FreeBSD__ header_type = virPCIDeviceRead8(check, fd, PCI_HEADER_TYPE); +#else + header_type = virPCIDeviceRead8(check, PCI_HEADER_TYPE); +#endif if ((header_type & PCI_HEADER_TYPE_MASK) != PCI_HEADER_TYPE_BRIDGE) goto cleanup; +#ifndef __FreeBSD__ secondary = virPCIDeviceRead8(check, fd, PCI_SECONDARY_BUS); subordinate = virPCIDeviceRead8(check, fd, PCI_SUBORDINATE_BUS); +#else + secondary = virPCIDeviceRead8(check, PCI_SECONDARY_BUS); + subordinate = virPCIDeviceRead8(check, PCI_SUBORDINATE_BUS); +#endif VIR_DEBUG("%s %s: found parent device %s", dev->id, dev->name, check->name); @@ -858,13 +1024,19 @@ virPCIDeviceIsParent(virPCIDevice *dev, virPCIDevice *check, void *data) * parent. See if the current device is more restrictive than the * best, and if so, make it the new best */ +#ifndef __FreeBSD__ int bestfd; +#endif uint8_t best_secondary; +#ifndef __FreeBSD__ if ((bestfd = virPCIDeviceConfigOpenTry(*best)) < 0) goto cleanup; best_secondary = virPCIDeviceRead8(*best, bestfd, PCI_SECONDARY_BUS); virPCIDeviceConfigClose(*best, bestfd); +#else + best_secondary = virPCIDeviceRead8(*best, PCI_SECONDARY_BUS); +#endif if (secondary > best_secondary) { virPCIDeviceFree(*best); @@ -878,7 +1050,9 @@ virPCIDeviceIsParent(virPCIDevice *dev, virPCIDevice *check, void *data) } cleanup: +#ifndef __FreeBSD__ virPCIDeviceConfigClose(check, fd); +#endif return ret; } @@ -902,7 +1076,9 @@ virPCIDeviceGetParent(virPCIDevice *dev, virPCIDevice **parent) */ static int virPCIDeviceTrySecondaryBusReset(virPCIDevice *dev, +#ifndef __FreeBSD__ int cfgfd, +#endif virPCIDeviceList *inactiveDevs) { g_autoptr(virPCIDevice) parent = NULL; @@ -910,7 +1086,9 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevice *dev, uint8_t config_space[PCI_CONF_LEN]; uint16_t ctl; int ret = -1; +#ifndef __FreeBSD__ int parentfd; +#endif /* Refuse to do a secondary bus reset if there are other * devices/functions behind the bus are used by the host @@ -932,8 +1110,11 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevice *dev, dev->name); return -1; } + +#ifndef __FreeBSD__ if ((parentfd = virPCIDeviceConfigOpenWrite(parent)) < 0) goto out; +#endif VIR_DEBUG("%s %s: doing a secondary bus reset", dev->id, dev->name); @@ -941,7 +1122,11 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevice *dev, * for the supplied device since we refuse to do a reset if there * are multiple devices/functions */ +#ifndef __FreeBSD__ if (virPCIDeviceRead(dev, cfgfd, 0, config_space, PCI_CONF_LEN) < 0) { +#else + if (virPCIDeviceRead(dev, 0, PCI_CONF_LEN, (u_int32_t *) config_space) < 0) { +#endif virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to read PCI config space for %1$s"), dev->name); @@ -951,6 +1136,7 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevice *dev, /* Read the control register, set the reset flag, wait 200ms, * unset the reset flag and wait 200ms. */ +#ifndef __FreeBSD__ ctl = virPCIDeviceRead16(dev, parentfd, PCI_BRIDGE_CONTROL); virPCIDeviceWrite16(parent, parentfd, PCI_BRIDGE_CONTROL, @@ -963,6 +1149,20 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevice *dev, g_usleep(200 * 1000); /* sleep 200ms */ if (virPCIDeviceWrite(dev, cfgfd, 0, config_space, PCI_CONF_LEN) < 0) { +#else + ctl = virPCIDeviceRead16(parent, PCI_BRIDGE_CONTROL); + + virPCIDeviceWrite16(parent, PCI_BRIDGE_CONTROL, + ctl | PCI_BRIDGE_CTL_RESET); + + g_usleep(200 * 1000); /* sleep 200ms */ + + virPCIDeviceWrite16(parent, PCI_BRIDGE_CONTROL, ctl); + + g_usleep(200 * 1000); /* sleep 200ms */ + + if (virPCIDeviceWrite(dev, 0, PCI_CONF_LEN, (config_space[0] << 0) | (config_space[1] << 8) | (config_space[2] << 16) | (config_space[3] << 24)) < 0) { +#endif virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to restore PCI config space for %1$s"), dev->name); @@ -971,7 +1171,9 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevice *dev, ret = 0; out: +#ifndef __FreeBSD__ virPCIDeviceConfigClose(parent, parentfd); +#endif return ret; } @@ -980,7 +1182,11 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevice *dev, * above we require the device supports a full internal reset. */ static int +#ifndef __FreeBSD__ virPCIDeviceTryPowerManagementReset(virPCIDevice *dev, int cfgfd) +#else +virPCIDeviceTryPowerManagementReset(virPCIDevice *dev) +#endif { uint8_t config_space[PCI_CONF_LEN]; uint32_t ctl; @@ -989,6 +1195,7 @@ virPCIDeviceTryPowerManagementReset(virPCIDevice *dev, int cfgfd) return -1; /* Save and restore the device's config space. */ +#ifndef __FreeBSD__ if (virPCIDeviceRead(dev, cfgfd, 0, &config_space[0], PCI_CONF_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to read PCI config space for %1$s"), @@ -1012,6 +1219,31 @@ virPCIDeviceTryPowerManagementReset(virPCIDevice *dev, int cfgfd) g_usleep(10 * 1000); /* sleep 10ms */ if (virPCIDeviceWrite(dev, cfgfd, 0, &config_space[0], PCI_CONF_LEN) < 0) { +#else + if (virPCIDeviceRead(dev, 0, PCI_CONF_LEN, (u_int32_t *) config_space) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to read PCI config space for %1$s"), + dev->name); + return -1; + } + + VIR_DEBUG("%s %s: doing a power management reset", dev->id, dev->name); + + ctl = virPCIDeviceRead32(dev, dev->pci_pm_cap_pos + PCI_PM_CTRL); + ctl &= ~PCI_PM_CTRL_STATE_MASK; + + virPCIDeviceWrite32(dev, dev->pci_pm_cap_pos + PCI_PM_CTRL, + ctl | PCI_PM_CTRL_STATE_D3hot); + + g_usleep(10 * 1000); /* sleep 10ms */ + + virPCIDeviceWrite32(dev, dev->pci_pm_cap_pos + PCI_PM_CTRL, + ctl | PCI_PM_CTRL_STATE_D0); + + g_usleep(10 * 1000); /* sleep 10ms */ + + if (virPCIDeviceWrite(dev, 0, PCI_CONF_LEN, (config_space[0] << 0) | (config_space[1] << 8) | (config_space[2] << 16) | (config_space[3] << 24)) < 0) { +#endif virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to restore PCI config space for %1$s"), dev->name); @@ -1046,10 +1278,18 @@ virPCIDeviceTryPowerManagementReset(virPCIDevice *dev, int cfgfd) * Always returns success (0) (for now) */ static int +#ifndef __FreeBSD__ virPCIDeviceInit(virPCIDevice *dev, int cfgfd) +#else +virPCIDeviceInit(virPCIDevice *dev) +#endif { dev->is_pcie = false; +#ifndef __FreeBSD__ if (virPCIDeviceFindCapabilityOffset(dev, cfgfd, PCI_CAP_ID_EXP, &dev->pcie_cap_pos) < 0) { +#else + if (virPCIDeviceFindCapabilityOffset(dev, PCI_CAP_ID_EXP, &dev->pcie_cap_pos) < 0) { +#endif /* an unprivileged process is unable to read *all* of a * device's PCI config (it can only read the first 64 * bytes, which isn't enough for see the Express @@ -1065,6 +1305,7 @@ virPCIDeviceInit(virPCIDevice *dev, int cfgfd) * -1), then we blindly assume the most likely outcome - * PCIe. */ +#ifndef __FreeBSD__ off_t configLen = virFileLength(virPCIDeviceGetConfigPath(dev), -1); if (configLen != 256) @@ -1077,6 +1318,16 @@ virPCIDeviceInit(virPCIDevice *dev, int cfgfd) virPCIDeviceFindCapabilityOffset(dev, cfgfd, PCI_CAP_ID_PM, &dev->pci_pm_cap_pos); dev->has_flr = virPCIDeviceDetectFunctionLevelReset(dev, cfgfd); dev->has_pm_reset = virPCIDeviceDetectPowerManagementReset(dev, cfgfd); +#else + + } else { + dev->is_pcie = (dev->pcie_cap_pos != 0); + } + + virPCIDeviceFindCapabilityOffset(dev, PCI_CAP_ID_PM, &dev->pci_pm_cap_pos); + dev->has_flr = virPCIDeviceDetectFunctionLevelReset(dev); + dev->has_pm_reset = virPCIDeviceDetectPowerManagementReset(dev); +#endif return 0; } @@ -1089,7 +1340,9 @@ virPCIDeviceReset(virPCIDevice *dev, g_autofree char *drvName = NULL; virPCIStubDriver drvType; int ret = -1; +#ifndef __FreeBSD__ int fd = -1; +#endif int hdrType = -1; if (virPCIGetHeaderType(dev, &hdrType) < 0) @@ -1125,10 +1378,14 @@ virPCIDeviceReset(virPCIDevice *dev, VIR_DEBUG("Resetting device %s", dev->name); +#ifndef __FreeBSD__ if ((fd = virPCIDeviceConfigOpenWrite(dev)) < 0) goto cleanup; if (virPCIDeviceInit(dev, fd) < 0) +#else + if (virPCIDeviceInit(dev) < 0) +#endif goto cleanup; /* KVM will perform FLR when starting and stopping @@ -1144,11 +1401,19 @@ virPCIDeviceReset(virPCIDevice *dev, * the function, not the whole device. */ if (dev->has_pm_reset) +#ifndef __FreeBSD__ ret = virPCIDeviceTryPowerManagementReset(dev, fd); +#else + ret = virPCIDeviceTryPowerManagementReset(dev); +#endif /* Bus reset is not an option with the root bus */ if (ret < 0 && dev->address.bus != 0) +#ifndef __FreeBSD__ ret = virPCIDeviceTrySecondaryBusReset(dev, fd, inactiveDevs); +#else + ret = virPCIDeviceTrySecondaryBusReset(dev, inactiveDevs); +#endif if (ret < 0) { virErrorPtr err = virGetLastError(); @@ -1160,7 +1425,9 @@ virPCIDeviceReset(virPCIDevice *dev, } cleanup: +#ifndef __FreeBSD__ virPCIDeviceConfigClose(dev, fd); +#endif return ret; } @@ -1868,6 +2135,12 @@ virPCIDeviceNew(const virPCIDeviceAddress *address) g_autoptr(virPCIDevice) dev = NULL; g_autofree char *vendor = NULL; g_autofree char *product = NULL; +#ifdef __FreeBSD__ + struct pci_conf_io pc; + struct pci_match_conf patterns[1]; + struct pci_conf conf[1]; + int fd; +#endif dev = g_new0(virPCIDevice, 1); @@ -1875,6 +2148,7 @@ virPCIDeviceNew(const virPCIDeviceAddress *address) dev->name = virPCIDeviceAddressAsString(&dev->address); +#ifndef __FreeBSD__ dev->path = g_strdup_printf(PCI_SYSFS "devices/%s/config", dev->name); if (!virFileExists(dev->path)) { @@ -1902,6 +2176,52 @@ virPCIDeviceNew(const virPCIDeviceAddress *address) &vendor[2], &product[2]); return NULL; } +#else + fd = open("/dev/pci", O_RDONLY, 0); + if (fd < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("Error open /dev/pci: %1$d"), errno); + return NULL; + } + + bzero(&pc, sizeof(struct pci_conf_io)); + pc.match_buf_len = sizeof(conf); + pc.matches = conf; + + bzero(patterns, sizeof(patterns)); + patterns[0].pc_sel.pc_domain = address->domain; + patterns[0].pc_sel.pc_bus = address->bus; + patterns[0].pc_sel.pc_dev = address->slot; + patterns[0].pc_sel.pc_func = address->function; + + patterns[0].flags = PCI_GETCONF_MATCH_DOMAIN | PCI_GETCONF_MATCH_BUS | PCI_GETCONF_MATCH_DEV | PCI_GETCONF_MATCH_FUNC; + pc.num_patterns = 1; + pc.pat_buf_len = sizeof(patterns); + pc.patterns = patterns; + + if (ioctl(fd, PCIOCGETCONF, &pc) == -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("ioctl(PCIOCGETCONF) eroor: %1$d"), errno); + return NULL; + } + if (pc.status != PCI_GETCONF_LAST_DEVICE && pc.status != PCI_GETCONF_MORE_DEVS) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("error returned from PCIOCGETCONF ioctl: %1$d"), pc.status); + return NULL; + } + VIR_FORCE_CLOSE(fd); + if (pc.num_matches == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("Device not found: %1$d"), pc.num_matches); + return NULL; + } + + /* strings contain '0x' prefix */ + if (g_snprintf(dev->id, sizeof(dev->id), "%x %x", pc.matches->pc_vendor, + pc.matches->pc_device) >= sizeof(dev->id)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("dev->id buffer overflow: %1$x %2$x"), + pc.matches->pc_vendor, pc.matches->pc_device); + return NULL; + } + dev->pc_hdr = pc.matches->pc_hdr; +#endif VIR_DEBUG("%s %s: initialized", dev->id, dev->name); @@ -1918,10 +2238,12 @@ virPCIDeviceCopy(virPCIDevice *dev) /* shallow copy to take care of most attributes */ *copy = *dev; +#ifndef __FreeBSD__ copy->path = NULL; + copy->path = g_strdup(dev->path); +#endif copy->used_by_drvname = copy->used_by_domname = NULL; copy->name = g_strdup(dev->name); - copy->path = g_strdup(dev->path); copy->used_by_drvname = g_strdup(dev->used_by_drvname); copy->used_by_domname = g_strdup(dev->used_by_domname); copy->stubDriverName = g_strdup(dev->stubDriverName); @@ -1936,7 +2258,9 @@ virPCIDeviceFree(virPCIDevice *dev) return; VIR_DEBUG("%s %s: freeing", dev->id, dev->name); g_free(dev->name); +#ifndef __FreeBSD__ g_free(dev->path); +#endif g_free(dev->used_by_drvname); g_free(dev->used_by_domname); g_free(dev->stubDriverName); @@ -1970,11 +2294,19 @@ virPCIDeviceGetName(virPCIDevice *dev) * Returns a pointer to a string containing the path of @dev's PCI * config file. */ +#ifndef __FreeBSD__ const char * virPCIDeviceGetConfigPath(virPCIDevice *dev) { return dev->path; } +#else +const char * +virPCIDeviceGetConfigPath(virPCIDevice *dev G_GNUC_UNUSED) +{ + return NULL; +} +#endif void virPCIDeviceSetManaged(virPCIDevice *dev, bool managed) { @@ -2484,14 +2816,20 @@ virPCIDeviceDownstreamLacksACS(virPCIDevice *dev) uint16_t flags; uint16_t ctrl; unsigned int pos; +#ifndef __FreeBSD__ int fd; +#endif int ret = 0; uint16_t device_class; +#ifndef __FreeBSD__ if ((fd = virPCIDeviceConfigOpen(dev)) < 0) return -1; if (virPCIDeviceInit(dev, fd) < 0) { +#else + if (virPCIDeviceInit(dev) < 0) { +#endif ret = -1; goto cleanup; } @@ -2503,18 +2841,30 @@ virPCIDeviceDownstreamLacksACS(virPCIDevice *dev) if (!pos || device_class != PCI_CLASS_BRIDGE_PCI) goto cleanup; +#ifndef __FreeBSD__ flags = virPCIDeviceRead16(dev, fd, pos + PCI_EXP_FLAGS); +#else + flags = virPCIDeviceRead16(dev, pos + PCI_EXP_FLAGS); +#endif if (((flags & PCI_EXP_FLAGS_TYPE) >> 4) != PCI_EXP_TYPE_DOWNSTREAM) goto cleanup; +#ifndef __FreeBSD__ pos = virPCIDeviceFindExtendedCapabilityOffset(dev, fd, PCI_EXT_CAP_ID_ACS); +#else + pos = virPCIDeviceFindExtendedCapabilityOffset(dev, PCI_EXT_CAP_ID_ACS); +#endif if (!pos) { VIR_DEBUG("%s %s: downstream port lacks ACS", dev->id, dev->name); ret = 1; goto cleanup; } +#ifndef __FreeBSD__ ctrl = virPCIDeviceRead16(dev, fd, pos + PCI_EXT_ACS_CTRL); +#else + ctrl = virPCIDeviceRead16(dev, pos + PCI_EXT_ACS_CTRL); +#endif if ((ctrl & PCI_EXT_CAP_ACS_ENABLED) != PCI_EXT_CAP_ACS_ENABLED) { VIR_DEBUG("%s %s: downstream port has ACS disabled", dev->id, dev->name); @@ -2523,7 +2873,9 @@ virPCIDeviceDownstreamLacksACS(virPCIDevice *dev) } cleanup: +#ifndef __FreeBSD__ virPCIDeviceConfigClose(dev, fd); +#endif return ret; } @@ -2689,7 +3041,7 @@ virPCIGetVirtualFunctions(const char *sysfs_path, } -#ifdef __linux__ +#if defined(__linux__) || defined(__FreeBSD__) virPCIDeviceAddress * virPCIGetDeviceAddressFromSysfsLink(const char *device_link) @@ -3189,33 +3541,43 @@ virPCIDeviceGetVPD(virPCIDevice *dev G_GNUC_UNUSED) int virPCIDeviceIsPCIExpress(virPCIDevice *dev) { +int ret = -1; +#ifndef __FreeBSD__ int fd; - int ret = -1; if ((fd = virPCIDeviceConfigOpen(dev)) < 0) return ret; if (virPCIDeviceInit(dev, fd) < 0) +#else + if (virPCIDeviceInit(dev) < 0) +#endif goto cleanup; ret = dev->is_pcie; cleanup: +#ifndef __FreeBSD__ virPCIDeviceConfigClose(dev, fd); +#endif return ret; } int virPCIDeviceHasPCIExpressLink(virPCIDevice *dev) { - int fd; int ret = -1; uint16_t cap, type; +#ifndef __FreeBSD__ + int fd; if ((fd = virPCIDeviceConfigOpen(dev)) < 0) return ret; if (virPCIDeviceInit(dev, fd) < 0) +#else + if (virPCIDeviceInit(dev) < 0) +#endif goto cleanup; if (dev->pcie_cap_pos == 0) { @@ -3223,13 +3585,19 @@ virPCIDeviceHasPCIExpressLink(virPCIDevice *dev) goto cleanup; } +#ifndef __FreeBSD__ cap = virPCIDeviceRead16(dev, fd, dev->pcie_cap_pos + PCI_CAP_FLAGS); +#else + cap = virPCIDeviceRead16(dev, dev->pcie_cap_pos + PCI_CAP_FLAGS); +#endif type = (cap & PCI_EXP_FLAGS_TYPE) >> 4; ret = type != PCI_EXP_TYPE_ROOT_INT_EP && type != PCI_EXP_TYPE_ROOT_EC; cleanup: +#ifndef __FreeBSD__ virPCIDeviceConfigClose(dev, fd); +#endif return ret; } @@ -3242,13 +3610,17 @@ virPCIDeviceGetLinkCapSta(virPCIDevice *dev, unsigned int *sta_width) { uint32_t t; - int fd; int ret = -1; +#ifndef __FreeBSD__ + int fd; if ((fd = virPCIDeviceConfigOpen(dev)) < 0) return ret; if (virPCIDeviceInit(dev, fd) < 0) +#else + if (virPCIDeviceInit(dev) < 0) +#endif goto cleanup; if (!dev->pcie_cap_pos) { @@ -3258,26 +3630,37 @@ virPCIDeviceGetLinkCapSta(virPCIDevice *dev, goto cleanup; } +#ifndef __FreeBSD__ t = virPCIDeviceRead32(dev, fd, dev->pcie_cap_pos + PCI_EXP_LNKCAP); +#else + t = virPCIDeviceRead32(dev, dev->pcie_cap_pos + PCI_EXP_LNKCAP); +#endif *cap_port = t >> 24; *cap_speed = t & PCI_EXP_LNKCAP_SPEED; *cap_width = (t & PCI_EXP_LNKCAP_WIDTH) >> 4; +#ifndef __FreeBSD__ t = virPCIDeviceRead16(dev, fd, dev->pcie_cap_pos + PCI_EXP_LNKSTA); +#else + t = virPCIDeviceRead16(dev, dev->pcie_cap_pos + PCI_EXP_LNKSTA); +#endif *sta_speed = t & PCI_EXP_LNKSTA_SPEED; *sta_width = (t & PCI_EXP_LNKSTA_WIDTH) >> 4; ret = 0; cleanup: +#ifndef __FreeBSD__ virPCIDeviceConfigClose(dev, fd); +#endif return ret; } int virPCIGetHeaderType(virPCIDevice *dev, int *hdrType) { +#ifndef __FreeBSD__ int fd; uint8_t type; @@ -3289,6 +3672,13 @@ int virPCIGetHeaderType(virPCIDevice *dev, int *hdrType) type = virPCIDeviceRead8(dev, fd, PCI_HEADER_TYPE); virPCIDeviceConfigClose(dev, fd); +#else + uint8_t type = dev->pc_hdr; + + *hdrType = -1; + + type = virPCIDeviceRead8(dev, PCI_HEADER_TYPE); +#endif type &= PCI_HEADER_TYPE_MASK; if (type >= VIR_PCI_HEADER_LAST) { -- 2.47.1

3 6

Re: Support for: VIR_DOMAIN_EVENT_ID_DBGTOOLS.
by Daniel P. Berrangé 11 Feb '25

11 Feb '25

On Fri, Feb 07, 2025 at 02:34:34PM +0000, Martin Harvey wrote: > Probably a FAQ. > > I have implemented a prototype: > > * > QEMU event for an in-guest issue (tools installation / crash etc), via fwcfg / vmcore (similar). (QEMU_PROCESS_EVENT_DBGTOOLS_CHANGED). > * > Qemu Process / QemuMonitor handling for same event. > * > Mapped this through to VIR_DOMAIN_EVENT_ID_DBG_TOOLS, > * > Corresponding changes to top level event handling. > > We would find this *very useful* in cases where vm migration, > debugging and the like require co-operation with guest user-mode. > > Are you folks happy to countenance some simple, but top-level, > event handling changes triggered by guest software, or is this > considered a no no? Should I be burying the details somewhere > in EVENT_TUNABLE instead? This is all very abstract, making it hard to give a useful answer. > Patchsets also available ... IMHO it would be better to make a concrete proposal to QEMU so we can understand the whole problem space better. With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

Re: Support for: VIR_DOMAIN_EVENT_ID_DBGTOOLS.
by Michal Prívozník 11 Feb '25

11 Feb '25

On 2/7/25 15:34, Martin Harvey wrote: > Probably a FAQ. > > I have implemented a prototype: > > * > QEMU event for an in-guest issue (tools installation / crash etc), > via fwcfg / vmcore (similar). (QEMU_PROCESS_EVENT_DBGTOOLS_CHANGED). > * > Qemu Process / QemuMonitor handling for same event. > * > Mapped this through to VIR_DOMAIN_EVENT_ID_DBG_TOOLS, > * > Corresponding changes to top level event handling. > > We would find this *very useful* in cases where vm migration, debugging > and the like require co-operation with guest user-mode. > > Are you folks happy to countenance some simple, but top-level, event > handling changes triggered by guest software, or is this considered a no > no? Should I be burying the details somewhere in EVENT_TUNABLE instead? I don't think this is achievable via EVENT_TUNABLE. I mean, EVENT_TUNABLE is completely detached from QEMU process, it's a libvirt originated event that's fired whenever some knob changes (alright, there are only a few specific cases where this event is emitted, but still). If you need to detect changes made by guest OS in fwcfg then we need QEMU to send an event to libvirt so that it can be relayed to users. Once it's merged in QEMU then libvirt can start supporting it too (we've had bad experience with merging patches in libvirt before they landed in QEMU). But hey, patches can be sent at the same time, it's only merging them that has to be serialized. Michal

2 1

[PATCH] cpu_map: Add missing feature "bhi-no"
by Tim Wiederhake 11 Feb '25

11 Feb '25

Introduced in qemu commit b611931d4f70b9a3e49e39c405c63b3b5e9c0df1. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/cpu_map/x86_features.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index d06d60e230..08519a37bf 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -873,6 +873,9 @@ <feature name='fb-clear'> <msr index='0x0000010a' edx='0x00000000' eax='0x00020000'/> </feature> + <feature name='bhi-no'> + <msr index='0x0000010a' edx='0x00000000' eax='0x00100000'/> + </feature> <feature name='pbrsb-no'> <msr index='0x0000010a' edx='0x00000000' eax='0x01000000'/> </feature> -- 2.48.1

2 1

[PATCH] tests: Record negative tests as pass instead of expected-fail
by Tim Wiederhake 10 Feb '25

10 Feb '25

meson's "test()" function provides a "should_fail: bool" argument that checks for a command to exit with a non-zero exit code instead of the usual zero exit code to signal success. If the program under test does so, it is recorded as "EXPECTEDFAIL" instead of "OK". While there is an argument to be made that the program under test failed as expected, the test in itself is successful and should be recorded as such. Before: $ meson test ... 151/300 libvirt:bin / libvirtd fail with missing config EXPECTEDFAIL 0.03s exit status 1 ... Ok: 299 Expected Fail: 1 Fail: 0 Unexpected Pass: 0 Skipped: 0 Timeout: 0 After: $ meson test ... 151/300 libvirt:bin / libvirtd fail with missing config OK 0.03s ... Ok: 300 Expected Fail: 0 Fail: 0 Unexpected Pass: 0 Skipped: 0 Timeout: 0 Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- tests/expected-fail | 13 +++++++++++++ tests/meson.build | 5 ++--- 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100755 tests/expected-fail diff --git a/tests/expected-fail b/tests/expected-fail new file mode 100755 index 0000000000..85738c95dc --- /dev/null +++ b/tests/expected-fail @@ -0,0 +1,13 @@ +#!/bin/sh + +# meson's "test()" function provides a "should_fail: bool" argument that +# checks for a command to exit with a non-zero exit code instead of the usual +# zero exit code to signal success. If the program under test does so, it is +# recorded as "EXPECTEDFAIL" instead of "OK". While there is an argument to be +# made that the program under test failed as expected, the test in itself is +# successful and should be recorded as such. + +if "$@" +then + exit 1 +fi diff --git a/tests/meson.build b/tests/meson.build index 0d76d37959..0ebcdc1496 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -725,9 +725,8 @@ endif if conf.has('WITH_LIBVIRTD') test('libvirtd fail with missing config', - libvirtd_prog, - args: [ '--config=no-such-conf', '--timeout=5' ], - should_fail: true, + find_program('expected-fail'), + args: [ libvirtd_prog, '--config=no-such-conf', '--timeout=5' ], suite: 'bin', ) -- 2.48.1

3 5

[PATCH V3 00/19] qemu: support mapped-ram+directio+mulitfd
by Jim Fehlig 07 Feb '25

07 Feb '25

V3 series adding support for QEMU's mapped-ram stream format [1] and migration capability. The use of mapped-ram is controlled by extending save_image_format setting in qemu.conf with a new 'sparse' option. The 'raw' format continues to be the default. Also included are patches that leverage mapped-ram to add support for parallel save/restore. In one of the previous threads on this topic we discussed per-VM control of save image format by adding a 'format' parameter to virDomainSaveParams. I can do that as a followup series if folks agree its useful. Changes in V3: * Drop patch adding qemuFDPassGetId * Drop now upstream patch decomposing qemuSaveImageOpen * Add patch to get an FDPass from fdset * If qemu is still running after save, remove fdset V1: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/MNB… V2: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/GNJ… [1] https://gitlab.com/qemu-project/qemu/-/blob/master/docs/devel/migration/map… Claudio Fontana (3): include: Define constants for parallel save/restore tools: add parallel parameter to virsh save command tools: add parallel parameter to virsh restore command Jim Fehlig (16): lib: virDomain{Save,Restore}Params: Ensure absolute path qemu: Add function to get FDPass object from monitor qemu: Add function to check capability in migration params qemu: Add function to get bool value from migration params qemu: Add mapped-ram migration capability qemu: Add function to get migration params for save qemu_saveimage: add "sparse" to supported save image formats qemu: Add helper function for creating save image fd qemu: Move declaration of virQEMUSaveFormat to header file qemu: Add support for mapped-ram on save qemu: Move creation of qemuProcessIncomingDef struct qemu: Apply migration parameters in qemuMigrationDstRun qemu: Add support for mapped-ram on restore qemu: Support O_DIRECT with mapped-ram on save qemu: Support O_DIRECT with mapped-ram on restore qemu: Add support for parallel save and restore docs/manpages/virsh.rst | 21 +++- include/libvirt/libvirt-domain.h | 11 ++ src/libvirt-domain.c | 95 +++++++++++--- src/qemu/qemu.conf.in | 9 +- src/qemu/qemu_driver.c | 78 +++++++++--- src/qemu/qemu_fd.c | 46 +++++++ src/qemu/qemu_fd.h | 4 + src/qemu/qemu_migration.c | 204 ++++++++++++++++++++++--------- src/qemu/qemu_migration.h | 10 +- src/qemu/qemu_migration_params.c | 92 ++++++++++++++ src/qemu/qemu_migration_params.h | 17 +++ src/qemu/qemu_monitor.c | 37 ++++++ src/qemu/qemu_monitor.h | 5 + src/qemu/qemu_process.c | 100 ++++++++++----- src/qemu/qemu_process.h | 19 ++- src/qemu/qemu_saveimage.c | 141 ++++++++++++--------- src/qemu/qemu_saveimage.h | 23 ++++ src/qemu/qemu_snapshot.c | 22 +++- tools/virsh-domain.c | 81 ++++++++++-- 19 files changed, 805 insertions(+), 210 deletions(-) -- 2.43.0

1 19

[PATCH] qemu: snapshot: Limit scope of checkpoint-snapshot interlock
by Peter Krempa 07 Feb '25

07 Feb '25

'qemuDomainSupportsCheckpointsBlockjobs()' should really be used only with active VMs based on the scope of interlocking it does. This means that the inactive snapshot code path needs to do the interlocking based on what's supported: - external snapshot support was not implemented yet (bitmaps need to be propagated to the new overlay image) - internal snapshot support can be deferred to qemu Move the check inside qemuSnapshotPrepare() which has knowledge about the snapshot type and implement an explicit check for the inactive case. See: https://gitlab.com/libvirt/libvirt/-/issues/739 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_snapshot.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 7ce018b026..ecf8eb3cca 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -39,6 +39,7 @@ #include "domain_audit.h" #include "locking/domain_lock.h" #include "virdomainsnapshotobjlist.h" +#include "virdomaincheckpointobjlist.h" #include "virqemu.h" #include "storage_source.h" @@ -1067,6 +1068,23 @@ qemuSnapshotPrepare(virDomainObj *vm, } + /* Handle interlocking with 'checkpoints': + * - if the VM is online use qemuDomainSupportsCheckpointsBlockjobs + * - if the VM is offline disallow external snapshots as the support for + * propagating bitmaps into the would-be-created overlay is not yet implemented + */ + if (!active) { + if (external && + virDomainListCheckpoints(vm->checkpoints, NULL, NULL, NULL, 0) > 0) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("support for offline external snapshots while checkpoint exists was not yet implemented")); + return -1; + } + } else { + if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) + return -1; + } + /* Alter flags to let later users know what we learned. */ if (external && !active) *flags |= VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY; @@ -2134,9 +2152,6 @@ qemuSnapshotCreateXML(virDomainPtr domain, VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE, NULL); - if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) - return NULL; - if (!vm->persistent && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot halt after transient domain snapshot")); -- 2.48.1

2 1

Support for: VIR_DOMAIN_EVENT_ID_DBGTOOLS.
by Martin Harvey 07 Feb '25

07 Feb '25

Probably a FAQ. I have implemented a prototype: * QEMU event for an in-guest issue (tools installation / crash etc), via fwcfg / vmcore (similar). (QEMU_PROCESS_EVENT_DBGTOOLS_CHANGED). * Qemu Process / QemuMonitor handling for same event. * Mapped this through to VIR_DOMAIN_EVENT_ID_DBG_TOOLS, * Corresponding changes to top level event handling. We would find this *very useful* in cases where vm migration, debugging and the like require co-operation with guest user-mode. Are you folks happy to countenance some simple, but top-level, event handling changes triggered by guest software, or is this considered a no no? Should I be burying the details somewhere in EVENT_TUNABLE instead? Patchsets also available ... MH.

1 0

[PATCH] node_device_udev: add error reporting to udevProcessCCWGroup
by Boris Fiuczynski 07 Feb '25

07 Feb '25

Add reporting an internal error when the string to type conversion of devtype fails as this indicates a serious problem since devtype was used to get into this method during the udev event handling. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- src/node_device/node_device_udev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 7b4ff80f8f..344b39e97a 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1415,8 +1415,12 @@ udevProcessCCWGroup(struct udev_device *device, udevGenerateDeviceName(device, def, NULL); - if ((tmp = virNodeDevCCWGroupCapTypeFromString(devtype)) < 0) + if ((tmp = virNodeDevCCWGroupCapTypeFromString(devtype)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to find a supported CCW group capability type '%1$s'"), + devtype); return -1; + } data->ccwgroup_dev.type = tmp; -- 2.47.0

2 1

[PATCH 0/3] qemu: fix setup of FD passed disks
by Peter Krempa 07 Feb '25

07 Feb '25

See 3/3 Peter Krempa (3): qemuxmlconftest: Allow testing of the 'writable' flag for passed FDs for disks qemuxmlconftest: Add testing of FDs with 'writable' flag in 'disk-source-fd' qemu: domain: Initialize FD passthrough for a virStorageSource before using it src/qemu/qemu_domain.c | 6 ++-- .../disk-source-fd.x86_64-latest.args | 36 +++++++++++-------- .../disk-source-fd.x86_64-latest.xml | 21 +++++++++-- tests/qemuxmlconfdata/disk-source-fd.xml | 16 +++++++-- tests/qemuxmlconftest.c | 9 +++-- tests/testutilsqemu.c | 2 ++ tests/testutilsqemu.h | 2 +- 7 files changed, 67 insertions(+), 25 deletions(-) -- 2.48.1

2 4

[PATCH v2] ch: Enable SEV SNP support
by Praveen K Paladugu 06 Feb '25

06 Feb '25

Enable SEV-SNP support for ch guests. Co-Authored-by: Smit Gardhariya <sgardhariya(a)microsoft.com> Signed-off-by: Praveen K Paladugu <praveenkpaladugu(a)gmail.com> --- src/ch/ch_monitor.c | 70 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 58 insertions(+), 12 deletions(-) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index bedcde2dde..55f0353fa9 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -130,29 +130,56 @@ static int virCHMonitorBuildPayloadJson(virJSONValue *content, virDomainDef *vmdef) { g_autoptr(virJSONValue) payload = virJSONValueNewObject(); - + g_autofree unsigned char *tmp = NULL; + size_t len; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_autofree char *host_data = NULL; + const size_t host_data_len = 32; if (vmdef->os.kernel == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Kernel image path in this domain is not defined")); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Kernel image path is not defined. With sev_snp=on, pass an igvm path")); return -1; - } else { - if (virJSONValueObjectAppendString(payload, "kernel", vmdef->os.kernel) < 0) - return -1; } - if (vmdef->os.cmdline) { - if (virJSONValueObjectAppendString(payload, "cmdline", vmdef->os.cmdline) < 0) + if (vmdef->sec && + vmdef->sec->sectype == VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP) { + if (virJSONValueObjectAppendString(payload, "igvm", vmdef->os.kernel) < 0) return -1; - } - if (vmdef->os.initrd != NULL) { - if (virJSONValueObjectAppendString(payload, "initramfs", vmdef->os.initrd) < 0) + if (vmdef->sec->data.sev_snp.host_data) { + /* Libvirt provided host_data is base64 encoded and cloud-hypervisor + requires host_data as hex encoded. Base64 decode and hex encode + before sending to cloud-hypervisor.*/ + tmp = g_base64_decode(vmdef->sec->data.sev_snp.host_data, &len); + if (len != host_data_len) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid host_data provdied. Expected '%1$ld' bytes"), + host_data_len); + return -1; + } + + while (len > 0) { + virBufferAsprintf(&buf, "%02x", tmp[host_data_len-len]); + len--; + } + + host_data = virBufferContentAndReset(&buf); + if (virJSONValueObjectAppendString(payload, "host_data", + host_data) < 0) + return -1; + } + } else { + if (virJSONValueObjectAdd(&payload, + "s:kernel", vmdef->os.kernel, + "S:cmdline", vmdef->os.cmdline, + "S:initramfs", vmdef->os.initrd, + NULL) < 0) return -1; } if (virJSONValueObjectAppend(content, "payload", &payload) < 0) - return -1; + return -1; return 0; } @@ -426,6 +453,23 @@ virCHMonitorBuildDevicesJson(virJSONValue *content, return 0; } +static int +virCHMonitorBuildPlatformJson(virJSONValue *content, virDomainDef *vmdef) +{ + g_autoptr(virJSONValue) platform = virJSONValueNewObject(); + + if (vmdef->sec && + vmdef->sec->sectype == VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP) { + if (virJSONValueObjectAppendBoolean(platform, "sev_snp", 1) < 0) + return -1; + + if (virJSONValueObjectAppend(content, "platform", &platform) < 0) + return -1; + } + + return 0; +} + static int virCHMonitorBuildVMJson(virCHDriver *driver, virDomainDef *vmdef, char **jsonstr) @@ -454,6 +498,8 @@ virCHMonitorBuildVMJson(virCHDriver *driver, virDomainDef *vmdef, return -1; } + if (virCHMonitorBuildPlatformJson(content, vmdef) < 0) + return -1; if (virCHMonitorBuildDisksJson(content, vmdef) < 0) return -1; -- 2.47.0

2 1

[PATCH] ch: Enable SEV SNP support
by Praveen K Paladugu 06 Feb '25

06 Feb '25

Enable SEV-SNP support for ch guests. Co-Authored-by: Smit Gardhariya <sgardhariya(a)microsoft.com> Signed-off-by: Praveen K Paladugu <praveenkpaladugu(a)gmail.com> --- src/ch/ch_monitor.c | 74 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 12 deletions(-) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index bedcde2dde..1d9e45219e 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -130,29 +130,60 @@ static int virCHMonitorBuildPayloadJson(virJSONValue *content, virDomainDef *vmdef) { g_autoptr(virJSONValue) payload = virJSONValueNewObject(); - + g_autofree unsigned char *tmp = NULL; + size_t len; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_autofree char *host_data = NULL; + size_t host_data_len = 32; if (vmdef->os.kernel == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Kernel image path in this domain is not defined")); + _("Kernel image path in this domain is not defined. With sev_snp=on, pass an igvm path")); return -1; - } else { - if (virJSONValueObjectAppendString(payload, "kernel", vmdef->os.kernel) < 0) - return -1; } - if (vmdef->os.cmdline) { - if (virJSONValueObjectAppendString(payload, "cmdline", vmdef->os.cmdline) < 0) + if (vmdef->sec && + vmdef->sec->sectype == VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP) { + if (virJSONValueObjectAppendString(payload, "igvm", vmdef->os.kernel) < 0) return -1; - } - - if (vmdef->os.initrd != NULL) { - if (virJSONValueObjectAppendString(payload, "initramfs", vmdef->os.initrd) < 0) + if (vmdef->sec->data.sev_snp.host_data) { + /* Libvirt provided host_data is base64 encoded and cloud-hypervisor + requires host_data as hex encoded. Base64 decode and hex encode + before sending to cloud-hypervisor.*/ + tmp = g_base64_decode(vmdef->sec->data.sev_snp.host_data, &len); + if (len != host_data_len) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Invalid host_data provdied. Expected 32 bytes")); + return -1; + } + while (len > 0) { + virBufferAsprintf(&buf, "%02x", tmp[host_data_len-len]); + len--; + } + host_data = virBufferContentAndReset(&buf); + if (virJSONValueObjectAppendString(payload, "host_data", + host_data) < 0) + return -1; + } + } else { + if (virJSONValueObjectAppendString(payload, "kernel", + vmdef->os.kernel) < 0) return -1; + if (vmdef->os.cmdline) { + if (virJSONValueObjectAppendString(payload, "cmdline", + vmdef->os.cmdline) < 0) + return -1; + } + + if (vmdef->os.initrd != NULL) { + if (virJSONValueObjectAppendString(payload, "initramfs", + vmdef->os.initrd) < 0) + return -1; + } } if (virJSONValueObjectAppend(content, "payload", &payload) < 0) - return -1; + return -1; return 0; } @@ -426,6 +457,23 @@ virCHMonitorBuildDevicesJson(virJSONValue *content, return 0; } +static int +virCHMonitorBuildPlatformJson(virJSONValue *content, virDomainDef *vmdef) +{ + g_autoptr(virJSONValue) platform = virJSONValueNewObject(); + + if (vmdef->sec && + vmdef->sec->sectype == VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP) { + if (virJSONValueObjectAppendBoolean(platform, "sev_snp", 1) < 0) + return -1; + + if (virJSONValueObjectAppend(content, "platform", &platform) < 0) + return -1; + } + + return 0; +} + static int virCHMonitorBuildVMJson(virCHDriver *driver, virDomainDef *vmdef, char **jsonstr) @@ -454,6 +502,8 @@ virCHMonitorBuildVMJson(virCHDriver *driver, virDomainDef *vmdef, return -1; } + if (virCHMonitorBuildPlatformJson(content, vmdef) < 0) + return -1; if (virCHMonitorBuildDisksJson(content, vmdef) < 0) return -1; -- 2.47.0

2 2

[PATCH 0/8] nodedev: add support for ccwgroup based qeth devices
by Boris Fiuczynski 06 Feb '25

06 Feb '25

CCW group devices are devices that use multiple subchannels on the mainframe's channel subsystem. A qeth group device maps to subchannels and their corresponding device numbers and device bus-IDs. The qeth device driver requires three I/O subchannels for each HiperSockets CHPID or OSA-Express CHPID in QDIO mode. One subchannel is for control reads, one for control writes, and the third is for data. The qeth device driver uses the QDIO protocol to communicate with the HiperSockets and OSA-Express adapter. As the node device driver is building a tree relationship between nodes the ccwgroup device is placed besides the subchannel nodes under computer and list the group members within a new ccwgroup capability. A new capability ccwgroup_member is added into capability ccw to represent a device membership to a ccwgroup. Filters are added to find ccwgroups as well as ccwgroup members. Boris Fiuczynski (8): nodedev: refactor CCW device address format nodedev: refactor CCW device address nodedev: remove virNodeDeviceCapCCWDefFormat nodedev: refactor CCW state format for use in ccwgroup nodedev: refactor udevCCWGetState nodedev: add ccwgroup node device support nodedev: add ccwgroup capability support to ccw devices nodedev: add qeth layer2 and layer3 device types docs/manpages/virsh.rst | 19 +- include/libvirt/libvirt-nodedev.h | 2 + src/conf/node_device_conf.c | 369 +++++++++++++++++- src/conf/node_device_conf.h | 43 +- src/conf/schemas/nodedev.rng | 59 +++ src/conf/virnodedeviceobj.c | 13 +- src/libvirt_private.syms | 3 + src/node_device/node_device_driver.c | 18 +- src/node_device/node_device_udev.c | 66 +++- src/util/virccw.c | 125 ++++++ src/util/virccw.h | 25 ++ tests/nodedevmdevctltest.c | 7 +- .../ccw_0_0_ff02_ccwgroup.xml | 13 + tests/nodedevschemadata/ccwgroup_0_0_bd00.xml | 20 + .../ccw_0_0_ff02_ccwgroup.xml | 1 + tests/nodedevxml2xmlout/ccwgroup_0_0_bd00.xml | 1 + tests/nodedevxml2xmltest.c | 2 + tools/virsh-nodedev.c | 6 + 18 files changed, 738 insertions(+), 54 deletions(-) create mode 100644 tests/nodedevschemadata/ccw_0_0_ff02_ccwgroup.xml create mode 100644 tests/nodedevschemadata/ccwgroup_0_0_bd00.xml create mode 120000 tests/nodedevxml2xmlout/ccw_0_0_ff02_ccwgroup.xml create mode 120000 tests/nodedevxml2xmlout/ccwgroup_0_0_bd00.xml -- 2.47.0

3 12

[PATCH] docs: Reword virDomainGetEmulatorPinInfo description
by Martin Kletzander 06 Feb '25

06 Feb '25

This API only queries the XML settings and not the running threads themselves. In order to avoid confusion, change the wording slightly. Resolves: https://issues.redhat.com/browse/RHEL-72052 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/libvirt-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index e8e5379672ae..275d65b8c16b 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -7998,8 +7998,8 @@ virDomainPinEmulator(virDomainPtr domain, unsigned char *cpumap, * Must not be VIR_DOMAIN_AFFECT_LIVE and * VIR_DOMAIN_AFFECT_CONFIG concurrently. * - * Query the CPU affinity setting of all emulator threads of domain, store - * it in cpumap. + * Query the CPU pinning setting of all emulator threads from the domain XML, + * store it in cpumap. * * Returns 1 in case of success, * 0 in case of no emulator threads are pined to pcpus, -- 2.48.0

2 1

[PATCH] tests: emuxmlconfdata: Update launch-security-sev-snp.xml
by Michal Privoznik 06 Feb '25

06 Feb '25

Recently, I was part of a discussion where it was suspected that libvirt does not pick up correct FW for SEV-SNP guests. Update our test to demonstrate it does. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- ...launch-security-sev-snp.x86_64-latest.args | 13 +++- .../launch-security-sev-snp.x86_64-latest.xml | 74 ++++++++++++++++++- .../launch-security-sev-snp.xml | 38 ++++++++-- 3 files changed, 113 insertions(+), 12 deletions(-) mode change 120000 => 100644 tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.xml diff --git a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args index e74335f09d..b3bc7fcf04 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args +++ b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args @@ -10,7 +10,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,confidential-guest-support=lsec0,acpi=off \ +-blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF.amdsev.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ +-machine pc-q35-8.2,usb=off,dump-guest-core=off,memory-backend=pc.ram,confidential-guest-support=lsec0,pflash0=libvirt-pflash0-format,acpi=on \ -accel kvm \ -cpu qemu64 \ -m size=219136k \ @@ -26,10 +28,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-storage","id":"ide0-0-0","bootindex":1}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=off \ +-watchdog-action reset \ -object '{"qom-type":"sev-snp-guest","id":"lsec0","cbitpos":47,"reduced-phys-bits":1,"policy":196608,"guest-visible-workarounds":"bGlidmlydGxpYnZpcnRsaQ==","id-block":"bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZp","id-auth":"bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bA==","host-data":"bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnY=","author-key-enabled":true,"vcek-disabled":true}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.xml b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.xml deleted file mode 120000 index 0159cc057b..0000000000 --- a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.xml +++ /dev/null @@ -1 +0,0 @@ -launch-security-sev-snp.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.xml b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.xml new file mode 100644 index 0000000000..d9bf146993 --- /dev/null +++ b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.xml @@ -0,0 +1,73 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os firmware='efi'> + <type arch='x86_64' machine='pc-q35-8.2'>hvm</type> + <firmware> + <feature enabled='no' name='enrolled-keys'/> + <feature enabled='no' name='secure-boot'/> + </firmware> + <loader readonly='yes' type='pflash' stateless='yes' format='raw'>/usr/share/edk2/ovmf/OVMF.amdsev.fd</loader> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> + </disk> + <controller type='usb' index='0' model='qemu-xhci'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </controller> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='1' port='0x8'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='2' port='0x9'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='3' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='3' port='0xa'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <watchdog model='itco' action='reset'/> + <memballoon model='none'/> + </devices> + <launchSecurity type='sev-snp' authorKey='yes' vcek='no'> + <cbitpos>47</cbitpos> + <reducedPhysBits>1</reducedPhysBits> + <policy>0x00030000</policy> + <guestVisibleWorkarounds>bGlidmlydGxpYnZpcnRsaQ==</guestVisibleWorkarounds> + <idBlock>bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZp</idBlock> + <idAuth>bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnZpcnRsaWJ2aXJ0bA==</idAuth> + <hostData>bGlidmlydGxpYnZpcnRsaWJ2aXJ0bGlidmlydGxpYnY=</hostData> + </launchSecurity> +</domain> diff --git a/tests/qemuxmlconfdata/launch-security-sev-snp.xml b/tests/qemuxmlconfdata/launch-security-sev-snp.xml index b277d7de1b..408198674e 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-snp.xml +++ b/tests/qemuxmlconfdata/launch-security-sev-snp.xml @@ -4,10 +4,16 @@ <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> + <os firmware='efi'> + <type arch='x86_64' machine='pc-q35-8.2'>hvm</type> + <loader stateless='yes'/> <boot dev='hd'/> </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> </cpu> @@ -20,19 +26,35 @@ <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> </disk> - <controller type='usb' index='0' model='piix3-uhci'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + <controller type='usb' index='0' model='qemu-xhci'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </controller> - <controller type='ide' index='0'> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='1' port='0x8'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='2' port='0x9'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> - <controller type='pci' index='0' model='pci-root'/> + <controller type='pci' index='3' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='3' port='0xa'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> + <watchdog model='itco' action='reset'/> <memballoon model='none'/> </devices> <launchSecurity type='sev-snp' authorKey='yes' vcek='no'> -- 2.45.2

2 1

[PATCH] nodedev: udev: Hook up virFileWaitForExist to address uevent, race of pci device
by Guoyi Tu 06 Feb '25

06 Feb '25

this commit addresses the same issue that as commit 1af45804 does. the following message is copying from that commit: If we find ourselves in the situation that the 'add' uevent has been fired earlier than the sysfs tree for a device was created, we should use the best-effort approach and give kernel some predetermined amount of time, thus waiting for the attributes to be ready rather than discarding the device from our device list forever. If those don't appear in the given time frame, we need to move on, since libvirt can't wait indefinitely. Signed-off-by: Guoyi Tu <tugy(a)chinatelecom.cn> --- src/node_device/node_device_udev.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 1d8486f623..4a1786c21c 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -427,10 +427,19 @@ udevProcessPCI(virNodeDeviceDriverState *driver_state, virPCIEDeviceInfo *pci_express = NULL; virPCIDevice *pciDev = NULL; virPCIDeviceAddress devAddr = { 0 }; + g_autofree char *linkpath = NULL; int ret = -1; char *p; bool privileged = false; + linkpath = g_strdup_printf("%s/config", udev_device_get_syspath(device)); + if (virFileWaitForExists(linkpath, 10, 100) < 0) { + virReportSystemError(errno, + _("failed to wait for file '%1$s' to appear"), + linkpath); + goto cleanup; + } + VIR_WITH_MUTEX_LOCK_GUARD(&driver_state->lock) { privileged = driver_state->privileged; } -- 2.27.0 -- Guoyi

2 2

[PATCH pushed] node_device_udev: Fix build failure in ccw device code
by Peter Krempa 05 Feb '25

05 Feb '25

clang complains: ../../../libvirt/src/node_device/node_device_udev.c:1408:82: error: result of comparison of unsigned enum expression < 0 is always false [-Werror,-Wtautological-unsigned-enum-zero-compare] 1408 | if ((data->ccwgroup_dev.type = virNodeDevCCWGroupCapTypeFromString(devtype)) < 0) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ 1 error generated. Fix it by adding a temporary int variable to facilitate the check before assigning to the unsigned enum value. Fixes: 985cb9c32a6 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/node_device/node_device_udev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 082f9d5cf0..94e8626aee 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1398,6 +1398,7 @@ udevProcessCCWGroup(struct udev_device *device, { const char *devtype = udev_device_get_devtype(device); virNodeDevCapData *data = &def->caps->data; + int tmp; data->ccwgroup_dev.address = virCCWDeviceAddressFromString(udev_device_get_sysname(device)); @@ -1405,9 +1406,11 @@ udevProcessCCWGroup(struct udev_device *device, udevGenerateDeviceName(device, def, NULL); - if ((data->ccwgroup_dev.type = virNodeDevCCWGroupCapTypeFromString(devtype)) < 0) + if ((tmp = virNodeDevCCWGroupCapTypeFromString(devtype)) < 0) return -1; + data->ccwgroup_dev.type = tmp; + switch (data->ccwgroup_dev.type) { case VIR_NODE_DEV_CAP_CCWGROUP_QETH_GENERIC: case VIR_NODE_DEV_CAP_CCWGROUP_QETH_LAYER2: -- 2.48.1

1 0

[PATCH] docs: fix 'virsh domstats --vcpu' measure units and descriptions
by Fabricio Duarte 05 Feb '25

05 Feb '25

The fields are in nanoseconds, not microseconds. Also fixes the description of `vcpu.<num>.wait`, as it does not actually represent the time waiting on I/O. Signed-off-by: Fabricio Duarte <fabricio.duarte.jr(a)gmail.com> --- docs/manpages/virsh.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 2e525d3fac..b0a21e019a 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -2428,14 +2428,14 @@ When selecting the *--state* group the following fields are returned: * ``vcpu.<num>.state`` - state of the virtual CPU <num>, as number from virVcpuState enum * ``vcpu.<num>.time`` - virtual cpu time spent by virtual - CPU <num> (in microseconds) -* ``vcpu.<num>.wait`` - virtual cpu time spent by virtual - CPU <num> waiting on I/O (in microseconds) + CPU <num> (in nanoseconds) +* ``vcpu.<num>.wait`` - time the vCPU <num> wants to run, but the host + scheduler has something else running ahead of it (in nanoseconds) * ``vcpu.<num>.halted`` - virtual CPU <num> is halted: yes or no (may indicate the processor is idle or even disabled, depending on the architecture) * ``vcpu.<num>.delay`` - time the vCPU <num> thread was enqueued by the - host scheduler, but was waiting in the queue instead of running. + host scheduler, but was waiting in the queue instead of running (in nanoseconds). Exposed to the VM as a steal time. This group of statistics also reports additional hypervisor-originating per-vCPU -- 2.39.2

2 1

[PATCH 0/3] qemu: Fix corner case in internal inactive snapshots
by Peter Krempa 05 Feb '25

05 Feb '25

Peter Krempa (3): qemuSnapshotForEachQcow2: Don't initialize 'nrollback' qemu: process: Export qemuPrepareNVRAM for use in snapshot code qemu: snapshot: Ensure that NVRAM image exists when taking inactive internal snapshot src/qemu/qemu_process.c | 26 ++++++++++++++------------ src/qemu/qemu_process.h | 4 ++++ src/qemu/qemu_snapshot.c | 25 ++++++++++++++++++++----- 3 files changed, 38 insertions(+), 17 deletions(-) -- 2.48.1

2 4

Investigating MAC Address Conflict Resolution in libvirt: Log Analysis and Code Location Inquiry
by Xuda Zhang 05 Feb '25

05 Feb '25

Dear Team, I am reaching out regarding an issue I encountered with libvirt and MAC address conflicts. Below is a summary of the situation: 1. Initially, the vNIC's MAC address was different from the target VM's MAC address. 2. After modifying the vNIC's MAC address to match the VM's MAC address, the network was interrupted. 3. After rebooting the VM, the vNIC's MAC address was automatically modified again. I have observed the following kernel logs during this process: Dec 24 16:59:40 zstack-manager kernel: br_enp2s0: port 14(vnic43.0) entered disabled stateDec 24 16:59:40 zstack-manager kernel: device vnic43.0 left promiscuous modeDec 24 16:59:40 zstack-manager kernel: br_enp2s0: port 14(vnic43.0) entered disabled stateDec 24 17:00:11 zstack-manager kernel: br_enp2s0: port 14(vnic43.0) entered blocking stateDec 24 17:00:11 zstack-manager kernel: br_enp2s0: port 14(vnic43.0) entered disabled stateDec 24 17:00:11 zstack-manager kernel: device vnic43.0 entered promiscuous modeDec 24 17:00:11 zstack-manager kernel: br_enp2s0: port 14(vnic43.0) entered blocking stateDec 24 17:00:11 zstack-manager kernel: br_enp2s0: port 14(vnic43.0) entered forwarding state I am looking to understand the underlying code that handles the automatic modification of the vNIC's MAC address after the conflict and how the network interruption occurs. Can you help direct me to the relevant code segment or provide any insights into this behavior? Thank you for your assistance. Best regards,

4 7

[PATCH 0/5] qemu: Fix handling of persistent reservations daemon with blockjobs
by Peter Krempa 05 Feb '25

05 Feb '25

See 5/5 Peter Krempa (5): qemu_hotplug.h: Reformat according to new coding style virDomainDefHasManagedPR: Consider also disk's 'mirror' chain qemu: hotplug: Export persistent reservations manager helper functions qemu: blockjob: Remove persistent reservations manager when dropping disk images qemu: Attach persistent reservations manager if block-copy target requires it src/conf/domain_conf.c | 3 + src/qemu/qemu_blockjob.c | 3 + src/qemu/qemu_driver.c | 5 ++ src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_hotplug.h | 175 ++++++++++++++++++++++----------------- 5 files changed, 113 insertions(+), 77 deletions(-) -- 2.48.1

2 6

[PATCH 0/2] qemucapabilitiestest: Update qemu-9.2 and add qemu-10.0 caps dumps on x86_64
by Peter Krempa 05 Feb '25

05 Feb '25

Peter Krempa (2): qemucapabilitiestest: Final update for qemu-9.2 release on x86_64 qemucapabilitiestest: Add data for the qemu-10.0 dev cycle on x86_64 .../domaincapsdata/qemu_10.0.0-q35.x86_64.xml | 1702 + .../domaincapsdata/qemu_10.0.0-tcg.x86_64.xml | 1810 + tests/domaincapsdata/qemu_10.0.0.x86_64.xml | 1702 + .../caps_10.0.0_x86_64.replies | 44998 ++++++++++++++++ .../caps_10.0.0_x86_64.xml | 4160 ++ .../caps_9.2.0_x86_64.replies | 14 +- .../caps_9.2.0_x86_64.xml | 12 +- 7 files changed, 54385 insertions(+), 13 deletions(-) create mode 100644 tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_10.0.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml -- 2.48.1

2 3

[PATCH v3 00/17] hw/microblaze: Allow running cross-endian vCPUs
by Philippe Mathieu-Daudé 05 Feb '25

05 Feb '25

Missing review: 4 (new) & 10 Since v2: - Addressed Richard's review comments Since v1: - Make device endianness configurable (Edgar) - Convert more Xilinx devices - Avoid preprocessor #if (Richard) - Add R-b tags Make machines endianness-agnostic, allowing to run a big-endian vCPU on the little-endian 'qemu-system-microblazeel' binary, and a little endian one on the big-endian 'qemu-system-microblaze' binary. Tests added, following combinations covered: - little-endian vCPU using little-endian binary (in-tree) - little-endian vCPU using big-endian binary (new) - big-endian vCPU using little-endian binary (new) - big-endian vCPU using big-endian binary (in-tree) To make a target endian-agnostic we need to remove the MO_TE uses. In order to do that, we propagate the MemOp from earlier in the call stack, or we extract it from the vCPU env (on MicroBlaze the CPU endianness is exposed by the 'ENDI' bit). Next step: Look at unifying binaries. Please review, Phil. Philippe Mathieu-Daudé (17): hw/microblaze: Restrict MemoryRegionOps are implemented as 32-bit hw/microblaze: Propagate CPU endianness to microblaze_load_kernel() hw/intc/xilinx_intc: Make device endianness configurable RFC hw/net/xilinx_ethlite: Simplify by having configurable endianness RFC hw/timer/xilinx_timer: Allow down to 8-bit memory access hw/timer/xilinx_timer: Make device endianness configurable hw/char/xilinx_uartlite: Make device endianness configurable hw/ssi/xilinx_spi: Make device endianness configurable hw/ssi/xilinx_spips: Make device endianness configurable hw/arm/xlnx-zynqmp: Use &error_abort for programming errors target/microblaze: Explode MO_TExx -> MO_TE | MO_xx target/microblaze: Set MO_TE once in do_load() / do_store() target/microblaze: Introduce mo_endian() helper target/microblaze: Consider endianness while translating code hw/microblaze: Support various endianness for s3adsp1800 machines tests/functional: Explicit endianness of microblaze assets tests/functional: Add microblaze cross-endianness tests hw/microblaze/boot.h | 4 +- include/hw/ssi/xilinx_spips.h | 1 + target/microblaze/cpu.h | 7 +++ hw/arm/xilinx_zynq.c | 1 + hw/arm/xlnx-zynqmp.c | 40 +++++-------- hw/char/xilinx_uartlite.c | 31 ++++++---- hw/intc/xilinx_intc.c | 50 ++++++++++++---- hw/microblaze/boot.c | 8 +-- hw/microblaze/petalogix_ml605_mmu.c | 4 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 58 ++++++++++++++++--- hw/microblaze/xlnx-zynqmp-pmu.c | 2 +- hw/net/xilinx_ethlite.c | 42 +++++++++----- hw/ppc/virtex_ml507.c | 1 + hw/ssi/xilinx_spi.c | 24 +++++--- hw/ssi/xilinx_spips.c | 36 +++++++----- hw/timer/xilinx_timer.c | 33 +++++++---- target/microblaze/translate.c | 49 ++++++++++------ .../functional/test_microblaze_s3adsp1800.py | 27 ++++++++- .../test_microblazeel_s3adsp1800.py | 25 +++++++- 19 files changed, 309 insertions(+), 134 deletions(-) -- 2.45.2

4 27

[PATCH v2 0/8] Enable virtio-mem-ccw
by Michal Privoznik 04 Feb '25

04 Feb '25

v2 of: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/KA2D… diff to v1: - Previously, virtio-mem-pci wasn't supported (in fact QEMU errored out), but this changed in QEMU upstream, so this limitation is lifted. - Added a test case for virtio-mem-pci on s390x Most of the patches is ACKed already (thanks Boris and David!), only a few remain for review. Michal Prívozník (8): qemu: Do NOT autoadd NUMA node for s390 qemu_command: Use qemuBuildVirtioDevProps() to build cmd line for virtio-mem and virtio-pmem qemuxmlconftest: Introduce memory-hotplug-virtio-mem-pci-s390x.xml qemu_caps: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW qemu: Validate virtio-mem-ccw qemu: Allow virtio-mem on CCW qemuxmlconftest: Introduce memory-hotplug-virtio-mem-ccw-s390x.xml NEWS: Document virtio-mem-ccw NEWS.rst | 5 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 28 ++++++-- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_postparse.c | 1 + src/qemu/qemu_validate.c | 35 ++++++++- .../caps_10.0.0_s390x.xml | 1 + ...lug-virtio-mem-ccw-s390x.s390x-latest.args | 39 ++++++++++ ...plug-virtio-mem-ccw-s390x.s390x-latest.xml | 60 ++++++++++++++++ .../memory-hotplug-virtio-mem-ccw-s390x.xml | 57 +++++++++++++++ ...lug-virtio-mem-pci-s390x.s390x-latest.args | 41 +++++++++++ ...plug-virtio-mem-pci-s390x.s390x-latest.xml | 71 +++++++++++++++++++ .../memory-hotplug-virtio-mem-pci-s390x.xml | 59 +++++++++++++++ tests/qemuxmlconftest.c | 2 + 15 files changed, 399 insertions(+), 9 deletions(-) create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.args create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.xml create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.xml create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.args create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.xml create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.xml -- 2.45.3

3 16

[PATCH 0/7] hw/arm/raspi4b: Add models with 4GB and 8GB of DRAM
by Philippe Mathieu-Daudé 04 Feb '25

04 Feb '25

- Deprecate the 'raspi4b' machine name, renaming it as 'raspi4b-1g' on 32-bit hosts, 'raspi4b-2g' otherwise. - Add the 'raspi4b-4g' and 'raspi4b-8g' machines, with respectively 4GB and 8GB of DRAM. Philippe Mathieu-Daudé (7): hw/arm/raspi4b: Declare machine types using DEFINE_TYPES() macro hw/arm/raspi4b: Introduce abstract raspi4-base machine type hw/arm/raspi4b: Split raspi4b_machine_class_init() in two (1g and 2g) hw/arm/raspi4b: Rename as raspi4b-1g / raspi4b-2g, deprecating old name hw/arm/raspi4b: Expose the raspi4b-1g machine on 64-bit hosts hw/arm/raspi4b: Add the raspi4b-4g machine hw/arm/raspi4b: Add the raspi4b-8g machine docs/about/deprecated.rst | 6 +++ hw/arm/raspi4b.c | 91 +++++++++++++++++++++++++++++++-------- 2 files changed, 79 insertions(+), 18 deletions(-) -- 2.47.1

5 17

[libvirt PATCH] ci: refresh with latest 'lcitool manifest'
by Pavel Hrdina 03 Feb '25

03 Feb '25

Fedora and Alpine updated to latest versions. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- ci/buildenv/{alpine-319.sh => alpine-320.sh} | 0 ci/buildenv/debian-11-cross-aarch64.sh | 2 +- ci/buildenv/debian-11-cross-armv6l.sh | 2 +- ci/buildenv/debian-11-cross-armv7l.sh | 2 +- ci/buildenv/debian-11-cross-i686.sh | 2 +- ci/buildenv/debian-11-cross-mips64el.sh | 2 +- ci/buildenv/debian-11-cross-mipsel.sh | 2 +- ci/buildenv/debian-11-cross-ppc64le.sh | 2 +- ci/buildenv/debian-11-cross-s390x.sh | 2 +- ci/buildenv/debian-11.sh | 2 +- 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 +- ...-mingw32.sh => fedora-41-cross-mingw32.sh} | 2 +- ...-mingw64.sh => fedora-41-cross-mingw64.sh} | 2 +- ci/buildenv/{fedora-39.sh => fedora-41.sh} | 3 +- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-14.vars | 2 +- ...e-319.Dockerfile => alpine-320.Dockerfile} | 2 +- .../debian-11-cross-aarch64.Dockerfile | 2 +- .../debian-11-cross-armv6l.Dockerfile | 2 +- .../debian-11-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-11-cross-i686.Dockerfile | 2 +- .../debian-11-cross-mips64el.Dockerfile | 2 +- .../debian-11-cross-mipsel.Dockerfile | 2 +- .../debian-11-cross-ppc64le.Dockerfile | 2 +- .../debian-11-cross-s390x.Dockerfile | 2 +- ci/containers/debian-11.Dockerfile | 2 +- .../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 +- .../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 +- .../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 +- ...ile => fedora-41-cross-mingw32.Dockerfile} | 4 +- ...ile => fedora-41-cross-mingw64.Dockerfile} | 4 +- ...ora-39.Dockerfile => fedora-41.Dockerfile} | 5 +- ci/gitlab.yml | 1 + ci/gitlab/build-templates.yml | 4 +- ci/gitlab/builds.yml | 54 +++++++++---------- ci/gitlab/containers.yml | 26 ++++----- ci/integration.yml | 20 +++---- ci/manifest.yml | 18 +++---- 68 files changed, 128 insertions(+), 125 deletions(-) rename ci/buildenv/{alpine-319.sh => alpine-320.sh} (100%) rename ci/buildenv/{fedora-40-cross-mingw32.sh => fedora-41-cross-mingw32.sh} (98%) rename ci/buildenv/{fedora-40-cross-mingw64.sh => fedora-41-cross-mingw64.sh} (98%) rename ci/buildenv/{fedora-39.sh => fedora-41.sh} (97%) rename ci/containers/{alpine-319.Dockerfile => alpine-320.Dockerfile} (98%) rename ci/containers/{fedora-40-cross-mingw32.Dockerfile => fedora-41-cross-mingw32.Dockerfile} (96%) rename ci/containers/{fedora-40-cross-mingw64.Dockerfile => fedora-41-cross-mingw64.Dockerfile} (96%) rename ci/containers/{fedora-39.Dockerfile => fedora-41.Dockerfile} (96%) diff --git a/ci/buildenv/alpine-319.sh b/ci/buildenv/alpine-320.sh similarity index 100% rename from ci/buildenv/alpine-319.sh rename to ci/buildenv/alpine-320.sh diff --git a/ci/buildenv/debian-11-cross-aarch64.sh b/ci/buildenv/debian-11-cross-aarch64.sh index 6600b73e74..a52164a851 100644 --- a/ci/buildenv/debian-11-cross-aarch64.sh +++ b/ci/buildenv/debian-11-cross-aarch64.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/buildenv/debian-11-cross-armv6l.sh b/ci/buildenv/debian-11-cross-armv6l.sh index 761d813df0..caef8e80a4 100644 --- a/ci/buildenv/debian-11-cross-armv6l.sh +++ b/ci/buildenv/debian-11-cross-armv6l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/buildenv/debian-11-cross-armv7l.sh b/ci/buildenv/debian-11-cross-armv7l.sh index 6c016bd90b..81d92e6386 100644 --- a/ci/buildenv/debian-11-cross-armv7l.sh +++ b/ci/buildenv/debian-11-cross-armv7l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/buildenv/debian-11-cross-i686.sh b/ci/buildenv/debian-11-cross-i686.sh index b9705f1c3c..7ab7242654 100644 --- a/ci/buildenv/debian-11-cross-i686.sh +++ b/ci/buildenv/debian-11-cross-i686.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/buildenv/debian-11-cross-mips64el.sh b/ci/buildenv/debian-11-cross-mips64el.sh index 065c61ba57..f983ab2981 100644 --- a/ci/buildenv/debian-11-cross-mips64el.sh +++ b/ci/buildenv/debian-11-cross-mips64el.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/buildenv/debian-11-cross-mipsel.sh b/ci/buildenv/debian-11-cross-mipsel.sh index 89a0a8904b..55a99b861f 100644 --- a/ci/buildenv/debian-11-cross-mipsel.sh +++ b/ci/buildenv/debian-11-cross-mipsel.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/buildenv/debian-11-cross-ppc64le.sh b/ci/buildenv/debian-11-cross-ppc64le.sh index c898939f09..b7d26e67fd 100644 --- a/ci/buildenv/debian-11-cross-ppc64le.sh +++ b/ci/buildenv/debian-11-cross-ppc64le.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/buildenv/debian-11-cross-s390x.sh b/ci/buildenv/debian-11-cross-s390x.sh index f1b94ac872..ac259c5625 100644 --- a/ci/buildenv/debian-11-cross-s390x.sh +++ b/ci/buildenv/debian-11-cross-s390x.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/buildenv/debian-11.sh b/ci/buildenv/debian-11.sh index 9ba9e80183..affdf6e445 100644 --- a/ci/buildenv/debian-11.sh +++ b/ci/buildenv/debian-11.sh @@ -57,7 +57,7 @@ function install_buildenv() { libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-12-cross-aarch64.sh index b4a056d940..1d69c099a4 100644 --- a/ci/buildenv/debian-12-cross-aarch64.sh +++ b/ci/buildenv/debian-12-cross-aarch64.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-12-cross-armv6l.sh index 07ffb3da37..db2ee46af5 100644 --- a/ci/buildenv/debian-12-cross-armv6l.sh +++ b/ci/buildenv/debian-12-cross-armv6l.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-12-cross-armv7l.sh index 6f88f6cc06..9ab435d0d7 100644 --- a/ci/buildenv/debian-12-cross-armv7l.sh +++ b/ci/buildenv/debian-12-cross-armv7l.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh index 5da816d086..fbc6da5dd4 100644 --- a/ci/buildenv/debian-12-cross-i686.sh +++ b/ci/buildenv/debian-12-cross-i686.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh index 09c445758c..f7067dfeb3 100644 --- a/ci/buildenv/debian-12-cross-mips64el.sh +++ b/ci/buildenv/debian-12-cross-mips64el.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh index a762d1e3b8..6dd5333ae4 100644 --- a/ci/buildenv/debian-12-cross-mipsel.sh +++ b/ci/buildenv/debian-12-cross-mipsel.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-12-cross-ppc64le.sh index fe7b672799..97de655904 100644 --- a/ci/buildenv/debian-12-cross-ppc64le.sh +++ b/ci/buildenv/debian-12-cross-ppc64le.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh index 1ca0768d14..725d1ee113 100644 --- a/ci/buildenv/debian-12-cross-s390x.sh +++ b/ci/buildenv/debian-12-cross-s390x.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh index fcd5291f22..5e5b759f08 100644 --- a/ci/buildenv/debian-12.sh +++ b/ci/buildenv/debian-12.sh @@ -57,7 +57,7 @@ function install_buildenv() { libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh index b4a056d940..1d69c099a4 100644 --- a/ci/buildenv/debian-sid-cross-aarch64.sh +++ b/ci/buildenv/debian-sid-cross-aarch64.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh index 53d2d79b38..ac03caeb5c 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh index 4e60877e77..c540104cb0 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh index 98e08b2397..b558576fca 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh index 09c445758c..f7067dfeb3 100644 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ b/ci/buildenv/debian-sid-cross-mips64el.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh index fe7b672799..97de655904 100644 --- a/ci/buildenv/debian-sid-cross-ppc64le.sh +++ b/ci/buildenv/debian-sid-cross-ppc64le.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh index 1ca0768d14..725d1ee113 100644 --- a/ci/buildenv/debian-sid-cross-s390x.sh +++ b/ci/buildenv/debian-sid-cross-s390x.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh index fcd5291f22..5e5b759f08 100644 --- a/ci/buildenv/debian-sid.sh +++ b/ci/buildenv/debian-sid.sh @@ -57,7 +57,7 @@ function install_buildenv() { libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/buildenv/fedora-40-cross-mingw32.sh b/ci/buildenv/fedora-41-cross-mingw32.sh similarity index 98% rename from ci/buildenv/fedora-40-cross-mingw32.sh rename to ci/buildenv/fedora-41-cross-mingw32.sh index 9104b2e20e..b19f0dccb2 100644 --- a/ci/buildenv/fedora-40-cross-mingw32.sh +++ b/ci/buildenv/fedora-41-cross-mingw32.sh @@ -8,7 +8,7 @@ function install_buildenv() { dnf update -y dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/buildenv/fedora-40-cross-mingw64.sh b/ci/buildenv/fedora-41-cross-mingw64.sh similarity index 98% rename from ci/buildenv/fedora-40-cross-mingw64.sh rename to ci/buildenv/fedora-41-cross-mingw64.sh index 35120064ec..20dca703b5 100644 --- a/ci/buildenv/fedora-40-cross-mingw64.sh +++ b/ci/buildenv/fedora-41-cross-mingw64.sh @@ -8,7 +8,7 @@ function install_buildenv() { dnf update -y dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/buildenv/fedora-39.sh b/ci/buildenv/fedora-41.sh similarity index 97% rename from ci/buildenv/fedora-39.sh rename to ci/buildenv/fedora-41.sh index e45ac2230f..c32a689fbd 100644 --- a/ci/buildenv/fedora-39.sh +++ b/ci/buildenv/fedora-41.sh @@ -9,7 +9,7 @@ function install_buildenv() { dnf install -y \ audit-libs-devel \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ clang \ @@ -82,6 +82,7 @@ function install_buildenv() { systemd-devel \ systemd-rpm-macros \ systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index fbcd613095..56b66e3b2a 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' +PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-14.vars b/ci/cirrus/freebsd-14.vars index 3002987cbd..fb665d16ee 100644 --- a/ci/cirrus/freebsd-14.vars +++ b/ci/cirrus/freebsd-14.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' +PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/containers/alpine-319.Dockerfile b/ci/containers/alpine-320.Dockerfile similarity index 98% rename from ci/containers/alpine-319.Dockerfile rename to ci/containers/alpine-320.Dockerfile index 2e4842ef3e..1b95c92e65 100644 --- a/ci/containers/alpine-319.Dockerfile +++ b/ci/containers/alpine-320.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.19 +FROM docker.io/library/alpine:3.20 RUN apk update && \ apk upgrade && \ diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile index f8d4ea8ed2..79c359f9fa 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile index f974163000..27bd6c578b 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile index ced175c7c0..3b413673a6 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile index c1ee60f3b6..ab5173f2f1 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile index 98c40beef4..04fa68f688 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile index e3531a9fac..558382ad25 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile index 8f9f729909..ed68e8f0af 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile index b09076b148..62791ac154 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile index 1660bd9c52..48c59e3aab 100644 --- a/ci/containers/debian-11.Dockerfile +++ b/ci/containers/debian-11.Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-12-cross-aarch64.Dockerfile index f4d587177b..ebccfbc203 100644 --- a/ci/containers/debian-12-cross-aarch64.Dockerfile +++ b/ci/containers/debian-12-cross-aarch64.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-12-cross-armv6l.Dockerfile index d8f2a3bc42..a6f51c80fd 100644 --- a/ci/containers/debian-12-cross-armv6l.Dockerfile +++ b/ci/containers/debian-12-cross-armv6l.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-12-cross-armv7l.Dockerfile index 1abfb79931..132938ce10 100644 --- a/ci/containers/debian-12-cross-armv7l.Dockerfile +++ b/ci/containers/debian-12-cross-armv7l.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-12-cross-i686.Dockerfile index 5681121d80..3a76ee4e76 100644 --- a/ci/containers/debian-12-cross-i686.Dockerfile +++ b/ci/containers/debian-12-cross-i686.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile index a4f2aabe10..c8009062ef 100644 --- a/ci/containers/debian-12-cross-mips64el.Dockerfile +++ b/ci/containers/debian-12-cross-mips64el.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile index a3f0652818..efb4639a26 100644 --- a/ci/containers/debian-12-cross-mipsel.Dockerfile +++ b/ci/containers/debian-12-cross-mipsel.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-12-cross-ppc64le.Dockerfile index caf8229a8e..3b0cfab7ef 100644 --- a/ci/containers/debian-12-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-12-cross-s390x.Dockerfile index c4f8479c13..c730b44e03 100644 --- a/ci/containers/debian-12-cross-s390x.Dockerfile +++ b/ci/containers/debian-12-cross-s390x.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile index 3e6d0597e2..778f6962d9 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-12.Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 3a06f01c5c..2d0e4d8a98 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index fdf129aa04..d3034c0131 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index 8dbb705d69..30234b6755 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index f856306a62..2c2c4772c8 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 468c5fbc3e..0af87394cc 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 37c256fe1e..d91a84c65b 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 232a8d7844..147c5e992f 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index febd286d86..daa750324b 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/containers/fedora-40-cross-mingw32.Dockerfile b/ci/containers/fedora-41-cross-mingw32.Dockerfile similarity index 96% rename from ci/containers/fedora-40-cross-mingw32.Dockerfile rename to ci/containers/fedora-41-cross-mingw32.Dockerfile index ed8566f273..6ab14be6fc 100644 --- a/ci/containers/fedora-40-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-41-cross-mingw32.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:40 +FROM registry.fedoraproject.org/fedora:41 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -19,7 +19,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/containers/fedora-40-cross-mingw64.Dockerfile b/ci/containers/fedora-41-cross-mingw64.Dockerfile similarity index 96% rename from ci/containers/fedora-40-cross-mingw64.Dockerfile rename to ci/containers/fedora-41-cross-mingw64.Dockerfile index b030427e0c..a0ec65d74a 100644 --- a/ci/containers/fedora-40-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-41-cross-mingw64.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:40 +FROM registry.fedoraproject.org/fedora:41 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -19,7 +19,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/containers/fedora-39.Dockerfile b/ci/containers/fedora-41.Dockerfile similarity index 96% rename from ci/containers/fedora-39.Dockerfile rename to ci/containers/fedora-41.Dockerfile index 2e35ca426d..a46f220de0 100644 --- a/ci/containers/fedora-39.Dockerfile +++ b/ci/containers/fedora-41.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:39 +FROM registry.fedoraproject.org/fedora:41 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -20,7 +20,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf install -y \ audit-libs-devel \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ clang \ @@ -93,6 +93,7 @@ exec "$@"\n' > /usr/bin/nosync && \ systemd-devel \ systemd-rpm-macros \ systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel && \ nosync dnf autoremove -y && \ diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 0daab12676..0e6de9f36d 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -55,6 +55,7 @@ variables: RUN_UPSTREAM_NAMESPACE: libvirt + CONTAINER_UPSTREAM_NAMESPACE: libvirt FF_SCRIPT_SECTIONS: 1 diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index 5ba91ffc67..a4b76e06d0 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -35,7 +35,7 @@ fi - cat /packages.txt variables: - IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest + IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest rules: ### PUSH events @@ -179,7 +179,7 @@ fi - cat /packages.txt variables: - IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest + IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest rules: ### PUSH events diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 3e7f36802e..fc0001b70a 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -33,15 +33,15 @@ x86_64-almalinux-9-clang: TARGET_BASE_IMAGE: docker.io/library/almalinux:9 -x86_64-alpine-319: +x86_64-alpine-320: extends: .native_build_job needs: - - job: x86_64-alpine-319-container + - job: x86_64-alpine-320-container optional: true allow_failure: false variables: - NAME: alpine-319 - TARGET_BASE_IMAGE: docker.io/library/alpine:3.19 + NAME: alpine-320 + TARGET_BASE_IMAGE: docker.io/library/alpine:3.20 x86_64-alpine-edge: @@ -127,21 +127,6 @@ x86_64-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -x86_64-fedora-39: - extends: .native_build_job - needs: - - job: x86_64-fedora-39-container - optional: true - allow_failure: false - variables: - NAME: fedora-39 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:39 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - - x86_64-fedora-40: extends: .native_build_job needs: @@ -157,6 +142,21 @@ x86_64-fedora-40: - libvirt-rpms +x86_64-fedora-41: + extends: .native_build_job + needs: + - job: x86_64-fedora-41-container + optional: true + allow_failure: false + variables: + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + + x86_64-fedora-rawhide: extends: .native_build_job needs: @@ -544,29 +544,29 @@ s390x-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -mingw32-fedora-40: +mingw32-fedora-41: extends: .cross_build_job needs: - - job: mingw32-fedora-40-container + - job: mingw32-fedora-41-container optional: true allow_failure: false variables: CROSS: mingw32 JOB_OPTIONAL: 1 - NAME: fedora-40 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 -mingw64-fedora-40: +mingw64-fedora-41: extends: .cross_build_job needs: - - job: mingw64-fedora-40-container + - job: mingw64-fedora-41-container optional: true allow_failure: false variables: CROSS: mingw64 - NAME: fedora-40 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 mingw32-fedora-rawhide: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 55137dc1c3..b4244650c3 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -14,11 +14,11 @@ x86_64-almalinux-9-container: NAME: almalinux-9 -x86_64-alpine-319-container: +x86_64-alpine-320-container: extends: .container_job allow_failure: false variables: - NAME: alpine-319 + NAME: alpine-320 x86_64-alpine-edge-container: @@ -57,13 +57,6 @@ x86_64-debian-sid-container: NAME: debian-sid -x86_64-fedora-39-container: - extends: .container_job - allow_failure: false - variables: - NAME: fedora-39 - - x86_64-fedora-40-container: extends: .container_job allow_failure: false @@ -71,6 +64,13 @@ x86_64-fedora-40-container: NAME: fedora-40 +x86_64-fedora-41-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-41 + + x86_64-fedora-rawhide-container: extends: .container_job allow_failure: true @@ -292,19 +292,19 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x -mingw32-fedora-40-container: +mingw32-fedora-41-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: fedora-40-cross-mingw32 + NAME: fedora-41-cross-mingw32 -mingw64-fedora-40-container: +mingw64-fedora-41-container: extends: .container_job allow_failure: false variables: - NAME: fedora-40-cross-mingw64 + NAME: fedora-41-cross-mingw64 mingw32-fedora-rawhide-container: diff --git a/ci/integration.yml b/ci/integration.yml index 2fc8d02956..2c5e5a65bc 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -29,23 +29,23 @@ centos-stream-9-tests: # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. -fedora-39-tests: +fedora-41-tests: extends: .integration_tests variables: # needed by libvirt-gitlab-executor - DISTRO: fedora-39 + DISTRO: fedora-41 # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG needs: - - x86_64-fedora-39 + - x86_64-fedora-41 - project: libvirt/libvirt-perl - job: x86_64-fedora-39 + job: x86_64-fedora-41 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-39 + job: x86_64-fedora-41 ref: master artifacts: true @@ -53,22 +53,22 @@ fedora-39-tests: # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. -.fedora-39-upstream-qemu-tests: +.fedora-41-upstream-qemu-tests: extends: .integration_tests variables: # needed by libvirt-gitlab-executor - DISTRO: fedora-39 + DISTRO: fedora-41 # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG needs: - - x86_64-fedora-39 + - x86_64-fedora-41 - project: libvirt/libvirt-perl - job: x86_64-fedora-39 + job: x86_64-fedora-41 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-39 + job: x86_64-fedora-41 ref: master artifacts: true diff --git a/ci/manifest.yml b/ci/manifest.yml index 43b9995717..cd68f5f7cb 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -19,7 +19,7 @@ targets: RPM: skip CC: clang - alpine-319: x86_64 + alpine-320: x86_64 alpine-edge: jobs: @@ -144,14 +144,6 @@ targets: containers: false builds: false - fedora-39: - jobs: - - arch: x86_64 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - fedora-40: jobs: - arch: x86_64 @@ -160,6 +152,14 @@ targets: paths: - libvirt-rpms + fedora-41: + jobs: + - arch: x86_64 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + - arch: mingw32 builds: false -- 2.48.1

2 3

[libvirt PATCH] libvirt.spec.in: fix indentation
by Pavel Hrdina 03 Feb '25

03 Feb '25

Fixes: cf32953f5b6ec30386f71b40cf458467752a6dca Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed libvirt.spec.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index be91fa6bb4..cb41ea1de1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -541,10 +541,10 @@ Requires(posttrans): /usr/bin/systemctl Requires(preun): /usr/bin/systemctl # libvirtd depends on 'messagebus' service Requires: dbus -%if %{with_account_add} + %if %{with_account_add} # For uid creation during pre Requires(pre): shadow-utils -%endif + %endif # Needed by /usr/libexec/libvirt-guests.sh script. %if 0%{?fedora} Requires: gettext-runtime @@ -1103,10 +1103,10 @@ Wireshark dissector plugin for better analysis of libvirt RPC traffic. %package login-shell Summary: Login shell for connecting users to an LXC container Requires: libvirt-libs = %{version}-%{release} -%if %{with_account_add} + %if %{with_account_add} # For uid creation during pre Requires(pre): shadow-utils -%endif + %endif %description login-shell Provides the set-uid virt-login-shell binary that is used to @@ -1806,12 +1806,12 @@ export VIR_TEST_DEBUG=1 %pre daemon-common %libvirt_sysconfig_pre libvirt-guests %libvirt_systemd_oneshot_pre libvirt-guests -%if %{with_account_add} + %if %{with_account_add} # 'libvirt' group is just to allow password-less polkit access to libvirt # daemons. The uid number is irrelevant, so we use dynamic allocation. getent group libvirt >/dev/null || groupadd -r libvirt exit 0 -%endif + %endif %posttrans daemon-common %libvirt_sysconfig_posttrans libvirt-guests @@ -1934,7 +1934,7 @@ exit 0 %libvirt_sysconfig_pre virtqemud %libvirt_systemd_unix_pre virtqemud -%if %{with_account_add} + %if %{with_account_add} # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name. # See https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/ @@ -1950,7 +1950,7 @@ if ! getent passwd 'qemu' >/dev/null; then fi fi exit 0 -%endif + %endif %posttrans daemon-driver-qemu %libvirt_sysconfig_posttrans virtqemud @@ -2077,10 +2077,10 @@ done %if %{with_lxc} %pre login-shell -%if %{with_account_add} + %if %{with_account_add} getent group virtlogin >/dev/null || groupadd -r virtlogin exit 0 -%endif + %endif %endif %endif -- 2.48.1

1 0

[PATCH] qemu: introduce load qemu.conf for "virt-qemu-run"
by Adam Julis 31 Jan '25

31 Jan '25

Adding a new option --config (or -c) for specifying a custom qemu.conf file. Previously, virt-qemu-run loaded default configuration values for QEMU via qemuStateInitialize(). The configuration was loaded from a temporary ../etc/ directory using virQEMUDriverConfigLoadFile(), and any qemu.conf file present in that directory was also loaded automatically. This patch allows users to specify a custom configuration file, which is copied into the temporary directory (or a permanent folder if the -r option is used) before loading the configuration. If an existing qemu.conf is present, it is properly backed up and restored in case of a permanent folder. The custom qemu.conf is always removed when the program exits. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/723 Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- docs/manpages/virt-qemu-run.rst | 9 +++ src/qemu/qemu_shim.c | 121 +++++++++++++++++++++++++++++++- 2 files changed, 129 insertions(+), 1 deletion(-) diff --git a/docs/manpages/virt-qemu-run.rst b/docs/manpages/virt-qemu-run.rst index 4d546ff8cc..ba1c90b52a 100644 --- a/docs/manpages/virt-qemu-run.rst +++ b/docs/manpages/virt-qemu-run.rst @@ -72,6 +72,15 @@ whose UUID should match a secret referenced in the guest domain XML. Display verbose information about startup. +``-c`` *QEMU-CONF-FILE*, +``--config``\ =\ *QEMU-CONF-FILE* + +Specify the QEMU configuration file to be used for starting the VM. +*QEMU-CONF-FILE* is the full path to the QEMU configuration file. + +If this parameter is omitted, the default configuration values will +be used. + ``-h``, ``--help`` Display the command line help. diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c index 7fdd69b538..64c87ab264 100644 --- a/src/qemu/qemu_shim.c +++ b/src/qemu/qemu_shim.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <stdbool.h> #include <unistd.h> +#include <fcntl.h> #include "virfile.h" #include "virgettext.h" @@ -132,6 +133,100 @@ qemuShimQuench(void *userData G_GNUC_UNUSED, { } +/* Load specific QEMU config file, is the -c option is used */ +static int +qemuAddConfigFile(const char *source_file, const char *root, bool *config_to_delete, long long deltams) +{ + int ret = -1; + struct stat st; + VIR_AUTOCLOSE srcFD = -1; + VIR_AUTOCLOSE dstFD = -1; + g_autofree char *config_dir = NULL; + g_autofree char *source_file_real = NULL; + g_autofree char *config_path_file = NULL; + g_autofree char *config_path_file_real = NULL; + + if ((srcFD = open(source_file, O_RDONLY)) < 0) { + g_printerr("Couldn't open specific config file\n"); + goto cleanup; + } + + if (fstat(srcFD, &st) != 0) { + g_printerr("Specific config file does not exist\n"); + goto cleanup; + } + if (!S_ISREG(st.st_mode)) { + g_printerr("Specific config is not a regular file\n"); + goto cleanup; + } + + /* Since source file exists, make the destination path or + * validate that it already exists */ + config_dir = g_strdup_printf("%s/etc/", root); + + if (g_mkdir_with_parents(config_dir, 0777) < 0) { + g_printerr("Couldn't make the directory for specific config file\n"); + goto cleanup; + } + + config_path_file = g_strdup_printf("%sqemu.conf", config_dir); + + /* If the source file is same as the destination file, no action needed */ + if ((source_file_real = realpath(source_file, NULL)) && + (config_path_file_real = realpath(config_path_file, NULL))) { + if (STREQ(source_file_real, config_path_file_real)) { + ret = 0; + goto cleanup; + } + } + + /* Check already existing qemu.conf in the subfolder, if so, renamed + * (appended via deltams constant - should be unique). Final cleanup + * at main() will revert this change */ + if (access(config_path_file, R_OK) == 0) { + if (rename(config_path_file, g_strdup_printf("%sqemu_old_%lld.conf", + config_dir, deltams)) != 0) { + g_printerr("Couldn't rename old config file, try delete it\n"); + goto cleanup; + } + } + + if ((dstFD = open(config_path_file, O_WRONLY | O_CREAT | O_TRUNC, 0644)) < 0) { + g_printerr("Couldn't open file for define specific config\n"); + goto cleanup; + } + + /* Set the flag for deleting the new/modified config in main() cleanup, + * for ensure that behaviour without the user config will be always + * consistent and take default value */ + *config_to_delete = true; + + do { + char buffer[1024]; + ssize_t readed = 0; + + readed = saferead(srcFD, buffer, 1024); + + if (readed < 0) { + g_printerr("Couldn't read from specific config\n"); + goto cleanup; + } else if (readed == 0) { + break; + } else { + ssize_t writed = safewrite(dstFD, buffer, readed); + if (writed != readed) { + g_printerr("Couldn't write to file for define specific config\n"); + goto cleanup; + } + } + } while (1); + + ret = 0; + + cleanup: + return ret; +} + int main(int argc, char **argv) { g_autoptr(virIdentity) sysident = NULL; @@ -142,8 +237,11 @@ int main(int argc, char **argv) g_autofree char *uri = NULL; g_autofree char *suri = NULL; const char *root = NULL; + const char *config = NULL; + long long delta_ms = 0; g_autofree char *escaped = NULL; bool tmproot = false; + bool config_to_delete = false; int ret = 1; g_autoptr(GError) error = NULL; g_auto(GStrv) secrets = NULL; @@ -156,6 +254,7 @@ int main(int argc, char **argv) { "root", 'r', 0, G_OPTION_ARG_STRING, &root, "Root directory", "DIR" }, { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug, "Debug output", NULL }, { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Verbose output", NULL }, + { "config", 'c', 0, G_OPTION_ARG_STRING, &config, "Load specific QEMU configuration file", "QEMU-CONF-FILE"}, { 0 } }; int quitfd[2] = {-1, -1}; @@ -172,7 +271,7 @@ int main(int argc, char **argv) return 1; } - if (argc != 2) { + if (argc != 2 && argc != 3) { g_autofree char *help = g_option_context_get_help(ctx, TRUE, NULL); g_printerr("%s", help); return 1; @@ -234,6 +333,10 @@ int main(int argc, char **argv) goto cleanup; } + delta_ms = deltams(); + if (config && (qemuAddConfigFile(config, root, &config_to_delete, delta_ms) < 0)) + g_printerr("Specific config file was not loaded, default was used\n"); + escaped = g_uri_escape_string(root, NULL, true); virFileActivateDirOverrideForProg(argv[0]); @@ -402,6 +505,22 @@ int main(int argc, char **argv) VIR_FORCE_CLOSE(quitfd[0]); VIR_FORCE_CLOSE(quitfd[1]); + if (config_to_delete) { + g_autofree char *possible_old_file = g_strdup_printf("%s/etc/qemu_old_%lld.conf", + root, delta_ms); + g_autofree char *to_delete = g_strdup_printf("%s/etc/qemu.conf", root); + + if (remove(to_delete) != 0) + g_printerr("Deleting specific config failed, located in: %s\n", + to_delete); + + if (access(possible_old_file, R_OK) == 0) { + if (rename(possible_old_file, to_delete) != 0) + g_printerr("Renaming your old qemu.conf failed, ups, located in %s\n", + possible_old_file); + } + } + if (dom != NULL) virDomainFree(dom); if (sconn != NULL) -- 2.47.1

3 3

[PATCH 0/5] Drop support for VirtualBox-6.1
by Michal Privoznik 31 Jan '25

31 Jan '25

This was initiated by the following issue: https://gitlab.com/libvirt/libvirt/-/issues/681 and I tried to add support for VBOX-7.1 but unfortunately got hit by a bug in VBOX which renders the way we initialize C bindings useless. I've reported the bug here: https://www.virtualbox.org/ticket/22224 but it didn't get any attention. Michal Prívozník (5): vbox: Use g_autofree in tryLoadOne() vbox: Report an error when VBox CAPI initialization fails vbox: Drop support for VirtualBox-6.1.x vbox: Drop code supporting old VBox version NEWS: Document VBOX-6.1 removal NEWS.rst | 5 + src/vbox/meson.build | 1 - src/vbox/vbox_CAPI_v6_1.h | 32896 -------------------------------- src/vbox/vbox_V6_1.c | 13 - src/vbox/vbox_XPCOMCGlue.c | 5 +- src/vbox/vbox_XPCOMCGlue.h | 2 +- src/vbox/vbox_common.h | 4 +- src/vbox/vbox_storage.c | 4 +- src/vbox/vbox_tmpl.c | 30 +- src/vbox/vbox_uniformed_api.h | 1 - 10 files changed, 16 insertions(+), 32945 deletions(-) delete mode 100644 src/vbox/vbox_CAPI_v6_1.h delete mode 100644 src/vbox/vbox_V6_1.c -- 2.45.2

2 6

[PATCH V2 0/3] qemu: Improve opening and verifying save images
by Jim Fehlig 31 Jan '25

31 Jan '25

V2 of https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/DAT… Changes in V2: * Move unlinking corrupt save images from qemuSaveImageOpen to the only caller using that functionality * Add a function to read save image header * Correctly position file pointer of save image for QEMU Jim Fehlig (3): qemu: Move unlinking corrupt save image file to caller qemu: Decompose qemuSaveImageOpen qemu: Check for valid save image format when verifying image header src/qemu/qemu_driver.c | 46 ++++--- src/qemu/qemu_saveimage.c | 268 +++++++++++++++++++++++--------------- src/qemu/qemu_saveimage.h | 21 ++- src/qemu/qemu_snapshot.c | 9 +- 4 files changed, 207 insertions(+), 137 deletions(-) -- 2.43.0

2 4

[PATCH 0/2] qemu: Improve opening and verifying save images
by Jim Fehlig 31 Jan '25

31 Jan '25

qemuSaveImageOpen does a lot of stuff. When bypass-cache is specified, it creates a virFileWrapperFd, which is not cleaned up in the subsequent failure paths. This results in errors from the iohelper, which can overwrite the actual error. E.g. consider libvirt attempting to restore an image saved in an unknown format # virsh restore --bypass-cache /data/test.sav.sparse error: Failed to restore domain from /data/test.sav.sparse error: internal error: Child process (LIBVIRT_LOG_OUTPUTS=1:stderr /usr/lib64/libvirt/libvirt_iohelper /data/test.sav.sparse 0) unexpected fatal signal 13 When not using the iohelper, and not creating a virFileWrapperFd, we see the real error: # virsh restore /data/test.sav.sparse error: Failed to restore domain from /data/test.sav.sparse error: operation failed: Invalid compressed save format 6 Although that error highlights a spot I missed when removing the "compression" implications around the 'foo_image_format' settings in qemu.conf with commit bd6d7ebf622 :-). IMO, the error message would be best fixed by checking for valid values when reading the save image metadata. Patch 1 decomposes qemuSaveImageOpen to allow for better error handling and more flexibility. Patch 2 checks for a valid format when checking the other header fields. Jim Fehlig (2): qemu: Decompose qemuSaveImageOpen qemu: Check for valid save image format when verifying image header src/qemu/qemu_driver.c | 37 +++++++-------- src/qemu/qemu_saveimage.c | 95 +++++++++++++++++++++++++-------------- src/qemu/qemu_saveimage.h | 16 ++++--- src/qemu/qemu_snapshot.c | 9 ++-- 4 files changed, 95 insertions(+), 62 deletions(-) -- 2.43.0

2 8

[PATCH 0/2] finish sysusers support
by Daniel P. Berrangé 30 Jan '25

30 Jan '25

This fixes another missing sysusers file and changes the RPM spec to take account of new RPM processing of sysusers files at install time. Daniel P. Berrangé (2): tools: add sysusers file to create 'virtlogin' group rpm: disable account creation for Fedora >= 42 libvirt.spec.in | 19 +++++++++++++++++++ tools/libvirt-login-shell.sysusers.conf | 1 + tools/meson.build | 7 +++++++ 3 files changed, 27 insertions(+) create mode 100644 tools/libvirt-login-shell.sysusers.conf -- 2.47.1

2 6

[RFC PATCH 0/5] qemu: Route hostdevs to multiple nested SMMUs
by Nathan Chen 30 Jan '25

30 Jan '25

Hi, This is a draft solution for supporting multiple vSMMU instances in a qemu VM. Based on discussions/suggestions received for a previous RFC by Nicolin here[0], the association of vSMMUs to VFIO devices in VM PCIe topology should be moved out of qemu into libvirt. In addition, the nested SMMU nodes should be passed to qemu as pluggable devices. To address these changes, this patch series introduces a new "nestedSmmuv3" IOMMU model and "nestedSmmuv3" device type. Upon specifying the nestedSmmuv3 IOMMU model, nestedSmmuv3 devices will be auto-added to the VM definition based on the available SMMU nodes in the host's sysfs. The nestedSmmuv3 devices will each be attached to a separate PXB controller, and VFIO devices will be routed to PXBs based on their association with host SMMU nodes. This will maintain a VM PCIe topology that allows for multiple nested SMMUs per Nicolin's original qemu patch series in [0] and Shameer's work in [1] to remove VM topology changes from qemu and allow the nested SMMUs to be specified as pluggable devices. For instance, if we specify the nestedSmmuv3 IOMMU model and a hostdev for passthrough: <devices> <hostdev mode='subsystem' type='pci' managed='no'> <source> <address domain='0x0009' bus='0x01' slot='0x00' function='0x0'/> </source> </hostdev> <iommu model='nestedSmmuv3'/> </devices> Libvirt will scan sysfs and populate the VM definition with controllers and nestedSmmuv3 devices based on host config. So if /sys/bus/pci/devices/0009:01:00.0/iommu is a symlink to the host SMMU node represented by /sys/devices/platform/arm-smmu-v3.8.auto/iommu/smmu3.0x0000000016000000 and there are 3 host SMMU nodes under /sys/class/iommu/, we'll see three auto-added nestedSmmuv3 devices, each routed to a pcie-expander-bus controller. Then the hostdev will be routed to a PXB controller that has a matching host SMMU node associated with it: <devices> ... <controller type='pci' index='1' model='pcie-expander-bus'> <model name='pxb-pcie'/> <target busNr='254'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </controller> <controller type='pci' index='2' model='pcie-expander-bus'> <model name='pxb-pcie'/> <target busNr='251'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </controller> <controller type='pci' index='3' model='pcie-expander-bus'> <model name='pxb-pcie'/> <target busNr='249'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </controller> <controller type='pci' index='4' model='pcie-root-port'> <model name='pcie-root-port'/> <target chassis='7' port='0x8'/> <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/> </controller> <hostdev mode='subsystem' type='pci' managed='no'> <source> <address domain='0x0009' bus='0x01' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/> </hostdev> <iommu model='nestedSmmuv3'/> <nestedSmmuv3> <name>smmu3.0x0000000012000000</name> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </nestedSmmuv3> <nestedSmmuv3> <name>smmu3.0x0000000016000000</name> <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> </nestedSmmuv3> <nestedSmmuv3> <name>smmu3.0x0000000011000000</name> <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> </nestedSmmuv3> <iommu model='nestedSmmuv3'/> </devices> TODO: - No DMA mapping can found by UEFI when specifying multiple passthrough devices in the VM definition, and VM boot is subsequently blocked. We need to investigate this for the next revision, but we don't encounter this issue when passing through a single device. We'll include iommufd support in the next revision to narrow down whether the required fix would be outside of libvirt. - Shameer's qemu branch specifies nestedSmmuv3 bus number with "pci-bus" instead of "bus", so the libvirt compilation test args and qemu args in qemuBuildPCINestedSmmuv3DevProps() need to be modified to match this revision of qemu. It will be reverted to using "bus" in the next qemu revision. - This patchset decrements PXB busNr based on how many devices are attached downstream, and the libvirt documentation states we must reserve busNr for the PXB itself in addition to any devices attached downstream. When I launch a VM and a PXB has a pcie-root-port and hostdev attached downstream, busNrs 253, 252, and 251 are reserved. But the PXB itself already has a bus number assigned via the <address/> attribute, and I see 253 and 252 assigned to the hostdev and pcie-root-port in the VM but not 251. Should we decrement busNr based on libvirt documentation or do we only need two busNrs 253 and 252 in the example here? This series is on Github: https://github.com/NathanChenNVIDIA/libvirt/tree/nested-smmuv3-12-05-24 Thanks, Nathan [0] https://lore.kernel.org/qemu-devel/cover.1719361174.git.nicolinc@nvidia.com/ [1] https://lore.kernel.org/qemu-devel/20241108125242.60136-1-shameerali.koloth… Signed-off-by: Nathan Chen <nathanc(a)nvidia.com> Nathan Chen (5): conf: Add a nestedSmmuv3 IOMMU model qemu: Implement and auto-add a nestedSmmuv3 device type qemu: Create PXBs and auto-assign VFIO devs and nested SMMUs qemu: Update PXB busNr for nestedSmmuv3 controllers qemu: Add test case for specifying multiple nested SMMUs docs/formatdomain.rst | 25 ++- src/ch/ch_domain.c | 1 + src/conf/domain_addr.c | 26 ++- src/conf/domain_addr.h | 4 +- src/conf/domain_conf.c | 188 +++++++++++++++++ src/conf/domain_conf.h | 15 ++ src/conf/domain_postparse.c | 1 + src/conf/domain_validate.c | 24 +++ src/conf/schemas/domaincommon.rng | 17 ++ src/conf/virconftypes.h | 2 + src/libvirt_private.syms | 2 + src/lxc/lxc_driver.c | 6 + src/qemu/qemu_command.c | 64 +++++- src/qemu/qemu_command.h | 4 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain_address.c | 193 ++++++++++++++++++ src/qemu/qemu_driver.c | 3 + src/qemu/qemu_hotplug.c | 5 + src/qemu/qemu_postparse.c | 1 + src/qemu/qemu_validate.c | 16 ++ src/test/test_driver.c | 4 + tests/meson.build | 1 + .../iommu-nestedsmmuv3.aarch64-latest.args | 38 ++++ .../iommu-nestedsmmuv3.aarch64-latest.xml | 61 ++++++ tests/qemuxmlconfdata/iommu-nestedsmmuv3.xml | 29 +++ tests/qemuxmlconftest.c | 4 +- tests/schemas/device.rng.in | 1 + tests/virnestedsmmuv3mock.c | 57 ++++++ 28 files changed, 788 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxmlconfdata/iommu-nestedsmmuv3.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/iommu-nestedsmmuv3.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommu-nestedsmmuv3.xml create mode 100644 tests/virnestedsmmuv3mock.c -- 2.34.1

4 18

[PATCH v2 00/15] qemu: Store I/O error messages for disks
by Peter Krempa 30 Jan '25

30 Jan '25

v2: - ACK'd patches were pushed - the QEMU 'qom-path' regression is no longer mentioned - it's worker around by prefering lookup via node-name - the patch is justified without the need to mention it - 'qom-path' is now properly used for lookup of the disk - I/O error messages are now stored in virStorageSource - the messages can be viewed via virDomainGetMessages() - various refactors to make the addition clean added - news added Peter Krempa (15): qemu: Handle quirks of 'device' field of BLOCK_IO_ERROR event in monitor code qemu: Rename 'diskAlias' to 'device' in qemu IO error event handling qemuProcessHandleIOError: Rename local variables qemuMonitorJSONHandleIOError: Do not munge 'reason' field of IO error event qemuProcessHandleIOError: Prefer lookup by node name qemuMonitorJSONHandleIOError: Propagate new 'qom-path' field virStorageSource: Add fields for storing last I/O error message qemuProcessHandleIOError: Populate I/O error reason to virStorageSource qemuProcessHandleIOError: Log IO errors in the VM log file libxlDomainGetMessages: Add existing flags to 'virCheckFlags' virDomainObjGetMessages: Refactor using GPtrArray virDomainGetMessages: Introduce VIR_DOMAIN_MESSAGE_IOERRORS include: libvirt-domain: Reword documentation for @reason of VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON include: libvirt-domain: Add 'hypervisor-message' @reason of VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON NEWS: Mention preserving I/O error messages for qemu VMs NEWS.rst | 6 +++ include/libvirt/libvirt-domain.h | 19 ++++++-- src/conf/domain_conf.c | 80 +++++++++++++++++++++----------- src/conf/domain_conf.h | 9 +++- src/conf/storage_source_conf.c | 5 ++ src/conf/storage_source_conf.h | 6 +++ src/libvirt_private.syms | 1 + src/libxl/libxl_driver.c | 13 +++++- src/qemu/qemu_driver.c | 24 +++++++++- src/qemu/qemu_monitor.c | 6 ++- src/qemu/qemu_monitor.h | 8 +++- src/qemu/qemu_monitor_json.c | 23 ++++++--- src/qemu/qemu_process.c | 61 +++++++++++++++--------- src/test/test_driver.c | 12 ++++- 14 files changed, 202 insertions(+), 71 deletions(-) -- 2.48.1

2 32

[PATCH] glibcompat: Updating "backport" 'g_string_replace'
by Adam Julis 30 Jan '25

30 Jan '25

Update the vir_g_string_replace with following commits from glib: c9e48947e gstring: Fix a heap buffer overflow in the new g_string_replace() code e8517e777 remove quadratic behavior in g_string_replace Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- src/util/glibcompat.c | 125 +++++++++++++++++++++++++++++++++++------- 1 file changed, 105 insertions(+), 20 deletions(-) diff --git a/src/util/glibcompat.c b/src/util/glibcompat.c index bcb666992a..47e3edef13 100644 --- a/src/util/glibcompat.c +++ b/src/util/glibcompat.c @@ -65,7 +65,7 @@ /** * Adapted (to pass syntax check) from 'g_string_replace' from - * glib-2.81.1. Drop once minimum glib is bumped to 2.68. + * glib-2.83.3. Drop once minimum glib is bumped to 2.68. * * g_string_replace: * @string: a #GString @@ -94,35 +94,120 @@ vir_g_string_replace(GString *string, const gchar *replace, guint limit) { - gsize f_len, r_len, pos; - gchar *cur, *next; - guint n = 0; + GString *new_string = NULL; + gsize f_len, r_len, new_len; + gchar *cur, *next, *first, *dst; + guint n; g_return_val_if_fail(string != NULL, 0); g_return_val_if_fail(find != NULL, 0); g_return_val_if_fail(replace != NULL, 0); + first = strstr(string->str, find); + + if (first == NULL) + return 0; + + new_len = string->len; f_len = strlen(find); r_len = strlen(replace); - cur = string->str; - while ((next = strstr(cur, find)) != NULL) { - pos = next - string->str; - g_string_erase(string, pos, f_len); - g_string_insert(string, pos, replace); - cur = string->str + pos + r_len; - n++; - /* Only match the empty string once at any given position, to - * avoid infinite loops */ - if (f_len == 0) { - if (cur[0] == '\0') - break; - else - cur++; + /* It removes a lot of branches and possibility for infinite loops if we + * handle the case of an empty @find string separately. */ + if (G_UNLIKELY(f_len == 0)) { + size_t i; + if (limit == 0 || limit > string->len) { + if (string->len > G_MAXSIZE - 1) + g_error("inserting in every position in string would overflow"); + + limit = string->len + 1; + } + + if (r_len > 0 && + (limit > G_MAXSIZE / r_len || + limit * r_len > G_MAXSIZE - string->len)) + g_error("inserting in every position in string would overflow"); + + new_len = string->len + limit * r_len; + new_string = g_string_sized_new(new_len); + for (i = 0; i < limit; i++) { + g_string_append_len(new_string, replace, r_len); + if (i < string->len) + g_string_append_c(new_string, string->str[i]); } - if (n == limit) - break; + if (limit < string->len) + g_string_append_len(new_string, string->str + limit, string->len - limit); + + g_free(string->str); + string->allocated_len = new_string->allocated_len; + string->len = new_string->len; + string->str = g_string_free(g_steal_pointer(&new_string), FALSE); + + return limit; } + /* Potentially do two passes: the first to calculate the length of the new string, + * new_len, if it’s going to be longer than the original string; and the second to + * do the replacements. The first pass is skipped if the new string is going to be + * no longer than the original. + * + * The second pass calls various g_string_insert_len() (and similar) methods + * which would normally potentially reallocate string->str, and hence + * invalidate the cur/next/first/dst pointers. Because we’ve pre-calculated + * the new_len and do all the string manipulations on new_string, that + * shouldn’t happen. This means we scan `string` while modifying + * `new_string`. */ + do { + dst = first; + cur = first; + n = 0; + while ((next = strstr(cur, find)) != NULL) { + n++; + + if (r_len <= f_len) { + memmove(dst, cur, next - cur); + dst += next - cur; + memcpy(dst, replace, r_len); + dst += r_len; + } else { + if (new_string == NULL) { + new_len += r_len - f_len; + } else { + g_string_append_len(new_string, cur, next - cur); + g_string_append_len(new_string, replace, r_len); + } + } + cur = next + f_len; + + if (n == limit) + break; + } + + /* Append the trailing characters from after the final instance of @find + * in the input string. */ + if (r_len <= f_len) { + /* First pass skipped. */ + gchar *end = string->str + string->len; + memmove(dst, cur, end - cur); + end = dst + (end - cur); + *end = 0; + string->len = end - string->str; + break; + } else { + if (new_string == NULL) { + /* First pass. */ + new_string = g_string_sized_new(new_len); + g_string_append_len(new_string, string->str, first - string->str); + } else { + /* Second pass. */ + g_string_append_len(new_string, cur, (string->str + string->len) - cur); + g_free(string->str); + string->allocated_len = new_string->allocated_len; + string->len = new_string->len; + string->str = g_string_free(g_steal_pointer(&new_string), FALSE); + break; + } + } + } while (1); return n; } -- 2.47.1

2 1

[PATCH] remote: add sysusers file to create 'libvirt' group
by Daniel P. Berrangé 29 Jan '25

29 Jan '25

We previously added a sysusers file, but missed the 'libvirt' group. This group is referenced in the polkit rules, so we should be registering that too. It must be done in a separate sysusers file, however, since it is common to all daemons. Fixes: a2c3e390f7bedf36f4ddc544d09fe3b8772c5c6f Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 1 + src/remote/libvirt.sysusers.conf | 1 + src/remote/meson.build | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 src/remote/libvirt.sysusers.conf diff --git a/libvirt.spec.in b/libvirt.spec.in index a82c366334..5c5d36966d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2110,6 +2110,7 @@ exit 0 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.api.policy %{_datadir}/polkit-1/rules.d/50-libvirt.rules +%{_sysusersdir}/libvirt.conf %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper %attr(0755, root, root) %{_bindir}/virt-ssh-helper diff --git a/src/remote/libvirt.sysusers.conf b/src/remote/libvirt.sysusers.conf new file mode 100644 index 0000000000..50c6716cce --- /dev/null +++ b/src/remote/libvirt.sysusers.conf @@ -0,0 +1 @@ +g libvirt - diff --git a/src/remote/meson.build b/src/remote/meson.build index ea063ed6cc..e503263266 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -310,6 +310,13 @@ if conf.has('WITH_REMOTE') ) endif + # Install the sysuser config for the daemon polkit rules + install_data( + 'libvirt.sysusers.conf', + install_dir: sysusersdir, + rename: [ 'libvirt.conf' ], + ) + virt_helpers += { 'name': 'virt-ssh-helper', 'sources': [ -- 2.47.1

2 2

Re: [PATCH] Сheck snapshot disk is not NULL when searching it in the VM config
by Peter Krempa 29 Jan '25

29 Jan '25

On Mon, May 20, 2024 at 14:48:47 +0000, Efim Shevrin via Devel wrote: > Hello, > > > If vmdisk is NULL, shouldn't this function (qemuSnapshotDeleteValidate()) return an error? > > I think this qemuSnapshotDeleteValidate should not return an error. > > It seems to me that when vmdisk is NULL, this does not invalidate > the snapshot itself, but indicates that the config has changed since > the snapshot was done. And if the VM config has changed, this adds evidence that the snapshot should be deleted, > because the snapshot does not reflect the real vm config. > > Since we do not have an analogue of the --force option for deleting a snapshot, in the case when qemuSnapshotDeleteValidate returns > an error when vmdisk is NULL, we will never delete a snapshot which has invalid disk. Snapshot deletion does have something that can be considered force and that is the '--metadata' option that removes just the snapshot definition (metadata) and doesn't touch the disk images. > > Similarly, disk can be NULL too > Thank you for the comment regarding the disk variable. I`ve reworked patch. > > When creating a snapshot of a VM with multiple hard disks, > the snapshot takes into account the presence of all disks > in the system. If, over time, one of the disks is deleted, > the snapshot will continue to store knowledge of the deleted disk. > This results in the fact that at the moment of deleting the snapshot, > at the validation stage, a disk from the snapshot will be searched which > is not in the VM configuration. As a result, vmdisk variable will > be equal to NULL. Dereferencing a null pointer at the time of calling > virStorageSourceIsSameLocation(vmdisk->src, disk->src) > will result in SIGSEGV. Crashing is obviously not okay ... > Also, the disk variable can also be equal to NULL and this > requires to check that disk != NULL before calling the > virStorageSourceIsSameLocation function to avoid SIGSEGV. .. but going ahead with the snapshot deletion isn't always okay either. The disk isn't referenced by the VM so the disk state can't be merged, while the state would be merged for any other disk. When reverting back to a previous snapshot, which is still referencing the older state of the disk which was removed from the VM, the VM would see that the image state of disks that were present at deletion would contain the merged state, but only a partial state for the disk which was later removed.

3 3

[PATCH] qemuSnapshotDeleteValidate: Fix crash when disk is not found in VM definition
by kaihuan 29 Jan '25

29 Jan '25

qemuDomainDiskByName() can return a NULL pointer on failure. But this returned value in qemuSnapshotDeleteValidate is not checked.It will make libvirtd crash. Signed-off-by: kaihuan <jungleman759(a)gmail.com> --- src/qemu/qemu_snapshot.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 18b2e478f6..bcbd913073 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -4242,8 +4242,19 @@ qemuSnapshotDeleteValidate(virDomainObj *vm, virDomainDiskDef *vmdisk = NULL; virDomainDiskDef *disk = NULL; - vmdisk = qemuDomainDiskByName(vm->def, snapDisk->name); - disk = qemuDomainDiskByName(snapdef->parent.dom, snapDisk->name); + if (!(vmdisk = qemuDomainDiskByName(vm->def, snapDisk->name))) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("disk '%1$s' referenced by snapshot '%2$s' not found in the current definition"), + snapDisk->name, snap->def->name); + return -1; + } + + if (!(disk = qemuDomainDiskByName(snapdef->parent.dom, snapDisk->name))) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("disk '%1$s' referenced by snapshot '%2$s' not found in the VM definition of the deleted snapshot"), + snapDisk->name, snap->def->name); + return -1; + } if (!virStorageSourceIsSameLocation(vmdisk->src, disk->src)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, -- 2.33.1.windows.1

3 3

[PATCH] Support IDE/SATA disk 'product' parameter
by Adam Julis 29 Jan '25

29 Jan '25

Since we supported 'product' parameter for SCSI, just expanded existing solution makes IDE/SATA parameter works too. QEMU requires parameter 'model' in case of IDE/SATA (instead of 'product'), so the process of making JSON object is slightly modified for that. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/697 Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- docs/formatdomain.rst | 7 ++-- src/qemu/qemu_command.c | 11 +++++- src/qemu/qemu_validate.c | 14 ++++++-- ...disk-product-build-error.x86_64-latest.err | 1 + .../disk-scsi-disk-product-build-error.xml | 34 +++++++++++++++++++ ...-disk-vendor-build-error.x86_64-latest.err | 1 + ... => disk-scsi-disk-vendor-build-error.xml} | 0 ...csi-disk-vpd-build-error.x86_64-latest.err | 1 - .../disk-scsi-disk-vpd.x86_64-latest.args | 4 +-- .../disk-scsi-disk-vpd.x86_64-latest.xml | 7 ++-- tests/qemuxmlconfdata/disk-scsi-disk-vpd.xml | 4 +-- tests/qemuxmlconftest.c | 3 +- 12 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxmlconfdata/disk-scsi-disk-product-build-error.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/disk-scsi-disk-product-build-error.xml create mode 100644 tests/qemuxmlconfdata/disk-scsi-disk-vendor-build-error.x86_64-latest.err rename tests/qemuxmlconfdata/{disk-scsi-disk-vpd-build-error.xml => disk-scsi-disk-vendor-build-error.xml} (100%) delete mode 100644 tests/qemuxmlconfdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 60bee8bd4f..c93a321401 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3551,12 +3551,13 @@ paravirtualized driver is specified via the ``disk`` element. :since:`Since 0.10.1` ``vendor`` If present, this element specifies the vendor of a virtual hard disk or - CD-ROM device. It must not be longer than 8 printable characters. - :since:`Since 1.0.1` + CD-ROM device. It must not be longer than 8 printable characters. Only for + devices using 'scsi' ``bus``. :since:`Since 1.0.1` ``product`` If present, this element specifies the product of a virtual hard disk or CD-ROM device. It must not be longer than 16 printable characters. - :since:`Since 1.0.1` + Only for devices using 'scsi' (:since:`Since 1.0.1`), 'sata' or 'ide' ``bus``. + :since:`Since 11.0.0` ``address`` If present, the ``address`` element ties the disk to a given slot of a controller (the actual ``<controller>`` device can often be inferred by diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index dcb9c4934e..5c38858f5d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1628,6 +1628,11 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, else driver = "ide-hd"; + if (virJSONValueObjectAdd(&props, + "S:model", disk->product, + NULL) < 0) + return NULL; + break; case VIR_DOMAIN_DISK_BUS_SCSI: @@ -1654,6 +1659,11 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, } } + if (virJSONValueObjectAdd(&props, + "S:product", disk->product, + NULL) < 0) + return NULL; + break; case VIR_DOMAIN_DISK_BUS_VIRTIO: { @@ -1803,7 +1813,6 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, "A:wwn", &wwn, "p:rotation_rate", disk->rotation_rate, "S:vendor", disk->vendor, - "S:product", disk->product, "T:removable", removable, "S:write-cache", qemuOnOffAuto(writeCache), "p:cyls", disk->geometry.cylinders, diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index aaa056379e..f0be236533 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2947,10 +2947,20 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, } } - if (disk->vendor || disk->product) { + if (disk->vendor) { if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only scsi disk supports vendor and product")); + _("Only scsi disk supports vendor")); + return -1; + } + } + + if (disk->product) { + if ((disk->bus != VIR_DOMAIN_DISK_BUS_IDE) && + (disk->bus != VIR_DOMAIN_DISK_BUS_SATA) && + (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only ide, sata and scsi disk supports product")); return -1; } } diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-product-build-error.x86_64-latest.err b/tests/qemuxmlconfdata/disk-scsi-disk-product-build-error.x86_64-latest.err new file mode 100644 index 0000000000..93dfac0d1e --- /dev/null +++ b/tests/qemuxmlconfdata/disk-scsi-disk-product-build-error.x86_64-latest.err @@ -0,0 +1 @@ +unsupported configuration: Only ide, sata and scsi disk supports product diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-product-build-error.xml b/tests/qemuxmlconfdata/disk-scsi-disk-product-build-error.xml new file mode 100644 index 0000000000..da2fc59da3 --- /dev/null +++ b/tests/qemuxmlconfdata/disk-scsi-disk-product-build-error.xml @@ -0,0 +1,34 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='virtio'/> + <product>ST3146707LC</product> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <vendor>SEAGATE</vendor> + <product>ST3567807GD</product> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-vendor-build-error.x86_64-latest.err b/tests/qemuxmlconfdata/disk-scsi-disk-vendor-build-error.x86_64-latest.err new file mode 100644 index 0000000000..88bd9e5468 --- /dev/null +++ b/tests/qemuxmlconfdata/disk-scsi-disk-vendor-build-error.x86_64-latest.err @@ -0,0 +1 @@ +unsupported configuration: Only scsi disk supports vendor diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-vpd-build-error.xml b/tests/qemuxmlconfdata/disk-scsi-disk-vendor-build-error.xml similarity index 100% rename from tests/qemuxmlconfdata/disk-scsi-disk-vpd-build-error.xml rename to tests/qemuxmlconfdata/disk-scsi-disk-vendor-build-error.xml diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err b/tests/qemuxmlconfdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err deleted file mode 100644 index f70b7a774f..0000000000 --- a/tests/qemuxmlconfdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: Only scsi disk supports vendor and product diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args index 4234a7e677..1d3aaf3819 100644 --- a/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args @@ -30,9 +30,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","read-only":true}' \ --device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-2-storage","id":"scsi0-0-0-0","vendor":"SEAGATE","product":"ST3146707LC"}' \ +-device '{"model":"ST3146707LC","driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-2-storage","id":"ide0-0-0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","read-only":true}' \ --device '{"driver":"scsi-hd","bus":"scsi1.0","scsi-id":0,"device_id":"drive-scsi1-0-0","drive":"libvirt-1-storage","id":"scsi1-0-0","bootindex":1,"vendor":"SEA GATE","product":"ST67 807GD"}' \ +-device '{"product":"ST67 807GD","driver":"scsi-hd","bus":"scsi1.0","scsi-id":0,"device_id":"drive-scsi1-0-0","drive":"libvirt-1-storage","id":"scsi1-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.xml index 4b23fbfcfe..39148f6ce7 100644 --- a/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.xml @@ -20,9 +20,8 @@ <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sda' bus='scsi'/> + <target dev='sda' bus='ide'/> <readonly/> - <vendor>SEAGATE</vendor> <product>ST3146707LC</product> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> @@ -31,7 +30,6 @@ <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='sdb' bus='scsi'/> <readonly/> - <vendor>SEA GATE</vendor> <product>ST67 807GD</product> <address type='drive' controller='1' bus='0' target='0' unit='0'/> </disk> @@ -45,6 +43,9 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </controller> <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-vpd.xml b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.xml index 36dd2a89ba..e3665d3afa 100644 --- a/tests/qemuxmlconfdata/disk-scsi-disk-vpd.xml +++ b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.xml @@ -16,9 +16,8 @@ <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='cdrom'> <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sda' bus='scsi'/> + <target dev='sda' bus='ide'/> <readonly/> - <vendor>SEAGATE</vendor> <product>ST3146707LC</product> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> @@ -26,7 +25,6 @@ <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='sdb' bus='scsi'/> <readonly/> - <vendor>SEA GATE</vendor> <product>ST67 807GD</product> <address type='drive' controller='1' bus='0' target='0' unit='0'/> </disk> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 21b56dc94e..083b0ab7f6 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1620,7 +1620,8 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-scsi-disk-split"); DO_TEST_CAPS_LATEST("disk-scsi-disk-wwn"); DO_TEST_CAPS_LATEST("disk-scsi-disk-vpd"); - DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-vendor-build-error"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-product-build-error"); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST_CAPS_LATEST("controller-scsi-auto"); DO_TEST_CAPS_LATEST("disk-sata-device"); -- 2.47.0

2 5

[libvirt PATCH] qemu_snapshot: allow reverting to external disk only snapshot
by Pavel Hrdina 29 Jan '25

29 Jan '25

When snapshot is created with disk-only flag it is always external snapshot without memory state. Historically when there was not support to revert external snapshots this produced error message. error: Failed to revert snapshot s1 error: internal error: Invalid target domain state 'disk-snapshot'. Refusing snapshot reversion Now we can simply consider this as reverting to offline snapshot as the possible damage to file system is already done at the point of snapshot creation. Resolves: https://issues.redhat.com/browse/RHEL-21549 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_snapshot.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 0cac0c4146..7964f70553 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2606,6 +2606,7 @@ qemuSnapshotRevert(virDomainObj *vm, case VIR_DOMAIN_SNAPSHOT_SHUTDOWN: case VIR_DOMAIN_SNAPSHOT_SHUTOFF: case VIR_DOMAIN_SNAPSHOT_CRASHED: + case VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT: ret = qemuSnapshotRevertInactive(vm, snapshot, snap, driver, cfg, &inactiveConfig, @@ -2617,8 +2618,6 @@ qemuSnapshotRevert(virDomainObj *vm, _("qemu doesn't support reversion of snapshot taken in PMSUSPENDED state")); goto endjob; - case VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT: - /* Rejected earlier as an external snapshot */ case VIR_DOMAIN_SNAPSHOT_NOSTATE: case VIR_DOMAIN_SNAPSHOT_BLOCKED: case VIR_DOMAIN_SNAPSHOT_LAST: -- 2.43.0

2 1

[PATCH pushed 0/3] Patches from MR
by Peter Krempa 29 Jan '25

29 Jan '25

I've reviewed and fixed some patches from MR's: Assaf Admi (1): docs: Document that 'vcpu.delay' statistic is in nanoseconds https://gitlab.com/libvirt/libvirt/-/merge_requests/352 Bronek Kozicki (1): tools: Move libvirt-guests lock file out of subsys directory https://gitlab.com/libvirt/libvirt/-/merge_requests/448 Philipp Schuster (1): virsh: pool-list: remove unnecessary spaces to align behavior https://gitlab.com/libvirt/libvirt/-/merge_requests/452 docs/manpages/virsh.rst | 2 +- src/libvirt-domain.c | 2 +- tools/libvirt-guests.sh.in | 2 +- tools/virsh-pool.c | 7 +------ 4 files changed, 4 insertions(+), 9 deletions(-) -- 2.48.1

1 3

[PATCH v2 0/2] qemu: Improve block I/O throttle API errors
by Fabian Leditzky 29 Jan '25

29 Jan '25

This is v2 of: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/PNHO… Changes since v1: - Report more accurate errors instead of suppressing the error message when the drive is empty. - Add check for this condition earlier in the API code. Fabian Leditzky (2): qemu: Check empty drives in block I/O throttle API qemu: Clarify block I/O throttle JSON parsing errors src/qemu/qemu_driver.c | 8 ++++++++ src/qemu/qemu_monitor_json.c | 11 +++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) -- 2.48.1

2 4

[PATCH] build: Bump minimul glib2 version to 2.66.0
by Peter Krempa 28 Jan '25

28 Jan '25

Per our supported platforms the minimum available versions are: CentOS Stream 9: 2.68.4 Debian 11: 2.66.8 Fedora 39: 2.78.6 openSUSE Leap 15.6: 2.78.6 Ubuntu 24.04: 2.72.4 FreeBSD: 2.80.5 Bump to 2.66 which is limited by Debian 11. While ideally we'd bump to 2.68 which would give us 'g_strv_builder' and friends 2.66 is enough for g_ptr_array_steal() which can be used to emulate the former with almost no extra code. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- libvirt.spec.in | 2 +- meson.build | 2 +- src/libvirt_private.syms | 4 -- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/util/glibcompat.c | 94 ---------------------------------------- src/util/glibcompat.h | 18 -------- src/util/vireventglib.c | 12 ++--- 8 files changed, 10 insertions(+), 126 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f397b95b79..c5585a72c0 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -357,7 +357,7 @@ BuildRequires: gcc %if %{with_libxl} BuildRequires: xen-devel %endif -BuildRequires: glib2-devel >= 2.58 +BuildRequires: glib2-devel >= 2.66 BuildRequires: libxml2-devel BuildRequires: readline-devel BuildRequires: pkgconfig(bash-completion) >= 2.0 diff --git a/meson.build b/meson.build index 1b0b717901..52fef8c0fb 100644 --- a/meson.build +++ b/meson.build @@ -1004,7 +1004,7 @@ else endif endif -glib_version = '2.58.0' +glib_version = '2.66.0' glib_dep = dependency('glib-2.0', version: '>=' + glib_version) gobject_dep = dependency('gobject-2.0', version: '>=' + glib_version) if host_machine.system() == 'windows' diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ee90fb2b84..2fe0a07944 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1879,10 +1879,6 @@ virStorageSourceUpdatePhysicalSize; # util/glibcompat.h -vir_g_fsync; -vir_g_source_unref; -vir_g_strdup_printf; -vir_g_strdup_vprintf; vir_g_string_replace; diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 22359f8518..43fca86f10 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -448,7 +448,7 @@ qemuAgentUnregister(qemuAgent *agent) { if (agent->watch) { g_source_destroy(agent->watch); - vir_g_source_unref(agent->watch, agent->context); + g_source_unref(agent->watch); agent->watch = NULL; } } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ec2f166785..e0b1bf1d37 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -745,7 +745,7 @@ qemuMonitorUnregister(qemuMonitor *mon) { if (mon->watch) { g_source_destroy(mon->watch); - vir_g_source_unref(mon->watch, mon->context); + g_source_unref(mon->watch); mon->watch = NULL; } } diff --git a/src/util/glibcompat.c b/src/util/glibcompat.c index 98dcfab389..bcb666992a 100644 --- a/src/util/glibcompat.c +++ b/src/util/glibcompat.c @@ -63,100 +63,6 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#undef g_fsync -#undef g_strdup_printf -#undef g_strdup_vprintf - - -/* Drop when min glib >= 2.63.0 */ -gint -vir_g_fsync(gint fd) -{ -#ifdef G_OS_WIN32 - return _commit(fd); -#else - return fsync(fd); -#endif -} - - -/* Due to a bug in glib, g_strdup_printf() nor g_strdup_vprintf() - * abort on OOM. It's fixed in glib's upstream. Provide our own - * implementation until the fix gets distributed. */ -char * -vir_g_strdup_printf(const char *msg, ...) -{ - va_list args; - char *ret; - va_start(args, msg); - ret = g_strdup_vprintf(msg, args); - if (!ret) - abort(); - va_end(args); - return ret; -} - - -char * -vir_g_strdup_vprintf(const char *msg, va_list args) -{ - char *ret; - ret = g_strdup_vprintf(msg, args); - if (!ret) - abort(); - return ret; -} - - -/* - * If the last reference to a GSource is released in a non-main - * thread we're exposed to a race condition that causes a - * crash: - * - * https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1358 - * - * Thus we're using an idle func to release our ref... - * - * ...but this imposes a significant performance penalty on - * I/O intensive workloads which are sensitive to the iterations - * of the event loop, so avoid the workaround if we know we have - * new enough glib. - * - * The function below is used from a header file definition. - * - * Drop when min glib >= 2.64.0 - */ -#if GLIB_CHECK_VERSION(2, 64, 0) -void vir_g_source_unref(GSource *src, GMainContext *ctx G_GNUC_UNUSED) -{ - g_source_unref(src); -} -#else - -static gboolean -virEventGLibSourceUnrefIdle(gpointer data) -{ - GSource *src = data; - - g_source_unref(src); - - return FALSE; -} - -void vir_g_source_unref(GSource *src, GMainContext *ctx) -{ - GSource *idle = g_idle_source_new(); - - g_source_set_callback(idle, virEventGLibSourceUnrefIdle, src, NULL); - - g_source_attach(idle, ctx); - - g_source_unref(idle); -} - -#endif - - /** * Adapted (to pass syntax check) from 'g_string_replace' from * glib-2.81.1. Drop once minimum glib is bumped to 2.68. diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h index 474ff95bc5..a3d01089e6 100644 --- a/src/util/glibcompat.h +++ b/src/util/glibcompat.h @@ -42,24 +42,6 @@ #endif /* GLib < 2.67.0 */ - -gint vir_g_fsync(gint fd); -char *vir_g_strdup_printf(const char *msg, ...) - G_GNUC_PRINTF(1, 2); -char *vir_g_strdup_vprintf(const char *msg, va_list args) - G_GNUC_PRINTF(1, 0); - -#if !GLIB_CHECK_VERSION(2, 64, 0) -# define g_strdup_printf vir_g_strdup_printf -# define g_strdup_vprintf vir_g_strdup_vprintf -#endif - -#undef g_fsync -#define g_fsync vir_g_fsync - -void vir_g_source_unref(GSource *src, GMainContext *ctx); - - /* Drop once we require glib-2.68 at minimum */ guint vir_g_string_replace(GString *string, diff --git a/src/util/vireventglib.c b/src/util/vireventglib.c index 023dc37445..6c54f62123 100644 --- a/src/util/vireventglib.c +++ b/src/util/vireventglib.c @@ -213,7 +213,7 @@ virEventGLibHandleUpdate(int watch, if (data->source != NULL) { VIR_DEBUG("Removed old handle source=%p", data->source); g_source_destroy(data->source); - vir_g_source_unref(data->source, NULL); + g_source_unref(data->source); } data->source = virEventGLibAddSocketWatch( @@ -227,7 +227,7 @@ virEventGLibHandleUpdate(int watch, VIR_DEBUG("Removed old handle source=%p", data->source); g_source_destroy(data->source); - vir_g_source_unref(data->source, NULL); + g_source_unref(data->source); data->source = NULL; data->events = 0; } @@ -276,7 +276,7 @@ virEventGLibHandleRemove(int watch) if (data->source != NULL) { g_source_destroy(data->source); - vir_g_source_unref(data->source, NULL); + g_source_unref(data->source); data->source = NULL; data->events = 0; } @@ -409,7 +409,7 @@ virEventGLibTimeoutUpdate(int timer, if (interval >= 0) { if (data->source != NULL) { g_source_destroy(data->source); - vir_g_source_unref(data->source, NULL); + g_source_unref(data->source); } data->interval = interval; @@ -419,7 +419,7 @@ virEventGLibTimeoutUpdate(int timer, goto cleanup; g_source_destroy(data->source); - vir_g_source_unref(data->source, NULL); + g_source_unref(data->source); data->source = NULL; } @@ -468,7 +468,7 @@ virEventGLibTimeoutRemove(int timer) if (data->source != NULL) { g_source_destroy(data->source); - vir_g_source_unref(data->source, NULL); + g_source_unref(data->source); data->source = NULL; } -- 2.48.1

2 2

[PATCH] secret: Check length of value in secret object
by Adam Julis 28 Jan '25

28 Jan '25

Ensure that the value in the secret object is validated not only for NULL but also for its size. An empty value may not always be NULL, if it has been manually deleted from the .base64 file. Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- src/conf/virsecretobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 455798d414..3cb1ec2b4b 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -719,7 +719,7 @@ virSecretObjGetValue(virSecretObj *obj) virSecretDef *def = obj->def; unsigned char *ret = NULL; - if (!obj->value) { + if (!obj->value || (obj->value_size < 1 )) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(def->uuid, uuidstr); virReportError(VIR_ERR_NO_SECRET, -- 2.47.1

2 3

[PATCH] ch: Include unistd.h in ch_events.c
by Michal Privoznik 27 Jan '25

27 Jan '25

There's a call to read() in the file but corresponding include of unistd.h is missing causing a build failure. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/1642845347 src/ch/ch_events.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ch/ch_events.c b/src/ch/ch_events.c index ba5b247c83..1cce30836a 100644 --- a/src/ch/ch_events.c +++ b/src/ch/ch_events.c @@ -20,6 +20,8 @@ #include <config.h> +#include <unistd.h> + #include "ch_domain.h" #include "ch_events.h" #include "ch_process.h" -- 2.45.2

2 1