February 2025 - Devel - libvirt List Archives

[PATCH 0/2] remote_daemon: Silence DBus errors
by Michal Privoznik 13 Feb '25

13 Feb '25

*** BLURB HERE *** Michal Prívozník (2): virgdbus: Introduce virGDBusHasSessionBus() remote_daemon: Silence DBus errors src/libvirt_private.syms | 1 + src/remote/remote_daemon.c | 36 +++++++++++++++------------ src/util/virgdbus.c | 50 +++++++++++++++++++++++++++++++++++--- src/util/virgdbus.h | 3 +++ 4 files changed, 70 insertions(+), 20 deletions(-) -- 2.45.3

2 3

[PATCH v2 0/8] Refactor autostart for VM daemons
by Daniel P. Berrangé 12 Feb '25

12 Feb '25

These patches are a spin off from my bigger auto-shutdown series: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/EIBL… Since they're self contained, they can be merged sooner while I'm still working on Peter's feedback from latter parts of the above patch series. Daniel P. Berrangé (8): bhyve: add 'driver' to bhyveProcessStart method bhyve: stop opening & passing connection to bhyveProcessStart util: add APIs for more systemd notifications remote: notify systemd when reloading config hypervisor: introduce helper for autostart src: convert drivers over to use new autostart helper hypervisor: add support for delay interval during autostart qemu: add 'auto_start_delay' configuration parameter src/bhyve/bhyve_driver.c | 60 ++++++++++-------------------- src/bhyve/bhyve_process.c | 5 +-- src/bhyve/bhyve_process.h | 3 +- src/hypervisor/domain_driver.c | 55 +++++++++++++++++++++++++++ src/hypervisor/domain_driver.h | 19 ++++++++++ src/libvirt_private.syms | 7 +++- src/libxl/libxl_driver.c | 36 +++++------------- src/lxc/lxc_driver.c | 13 ++++--- src/lxc/lxc_process.c | 18 +-------- src/lxc/lxc_process.h | 2 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf.in | 5 +++ src/qemu/qemu_conf.c | 2 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 55 +++++++++------------------ src/qemu/test_libvirtd_qemu.aug.in | 1 + src/remote/libvirtd.service.in | 2 +- src/remote/remote_daemon.c | 2 + src/rpc/virnetdaemon.c | 2 +- src/util/virsystemd.c | 44 ++++++++++++++++++++-- src/util/virsystemd.h | 6 ++- src/virtd.service.in | 2 +- 22 files changed, 202 insertions(+), 139 deletions(-) -- 2.47.1

2 17

Re: [PATCH 2/2] nbd/server: Allow users to adjust handshake limit in QMP
by Eric Blake 12 Feb '25

12 Feb '25

On Thu, Feb 06, 2025 at 10:20:09AM +0300, Vladimir Sementsov-Ogievskiy wrote: > > --- > > qapi/block-export.json | 10 ++++++++++ > > include/block/nbd.h | 6 +++--- > > [..] > > > @@ -52,6 +57,10 @@ > > # > > # @addr: Address on which to listen. > > # > > +# @handshake-max-secs: Time limit, in seconds, at which a client that > > +# has not completed the negotiation handshake will be disconnected, > > +# or 0 for no limit (since 10.0; default: 10). > > +# > > Hmm. [not about the series], shouldn't we finally deprecate older interface? By older interface, you are asking about the QMP command 'nbd-server-start' as compared to struct NbdServerOptions. But the struct is not directly present in any QMP commands; rather, it only appears to be used by qemu-storage-daemon as one of its command line options that needs to set up an NBD server with a JSON-like syntax that has less nesting than QMP nbd-server-start. blockdev-nbd.c has two functions [nbd_server_start_options(NbdServerOPtions *arg...) and qmp_nbd_server_start(args...)] that both unpack their slightly different forms and pass them as parameters to nbd_server_start() that is then agnostic to whether the older QMP command or newer q-s-d CLI option was specified. It looks like libvirt is still using QMP nbd-server-start. If we were to start the deprecation process for qemu 10.0, what would the new command look like? What would everyone be required to use by qemu 10.2? -- Eric Blake, Principal Software Engineer Red Hat, Inc. Virtualization: qemu.org | libguestfs.org

2 1

[PATCH 0/5] qemu: migration: Reactivate block nodes after migration if VM is left paused
by Peter Krempa 12 Feb '25

12 Feb '25

Patch 1/5 is a bugfix for the qemu-replies-tool. For justification of 2-5/5 see 5/5. Peter Krempa (5): qemu-replies-tool: Dump also query string for optional members qemucapabilitiestest: Update 'caps_10.0.0_x86_64' to 'v9.2.0-1636-gffaf7f0376' qemu: capabilies: Introduce QEMU_CAPS_BLOCKDEV_SET_ACTIVE qemu: monitor: Add monitor backend for 'blockdev-set-active' qemu: migration: Reactivate block nodes after migration if VM is left paused scripts/qemu-replies-tool.py | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_migration.c | 46 +- src/qemu/qemu_monitor.c | 21 + src/qemu/qemu_monitor.h | 5 + src/qemu/qemu_monitor_json.c | 21 + src/qemu/qemu_monitor_json.h | 5 + .../caps_10.0.0_x86_64.replies | 3918 +++++++++-------- .../caps_10.0.0_x86_64.xml | 3 +- tests/qemumonitorjsontest.c | 31 + 11 files changed, 2113 insertions(+), 1944 deletions(-) -- 2.48.1

2 12

[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