- Devel - libvirt List Archives

[PATCH 0/4] Prepare webpage for hosting via gitlab pages
by Peter Krempa 10 Jan '24

10 Jan '24

As the progress on the gitlab feature we need to do this seems good: https://gitlab.com/gitlab-org/gitlab-pages/-/issues/601 this series prepares the libvirt project to do the hosting and will allow us to validate it before switching over once the feature is enabled. Patches 1/4 and 2/4 can be pushed right away: - Patch 1/4 prepares the job to publish the page (currently via the libvirt.gitlab.io/libvirt URL each project gets automatically - Patch 2/4 adds the '_redirects' file which is populated from adapted 'mod_rewrite' rules from the current server. This file serves for validation of the rules and will allow us to validate them before switching over The last 2 patches are for the subsequent steps: - 3/4 removes the 'legacy' webpage job, this can be pushed either when we switch over to gitlab pages or when the old server will fetch the archive from the new artifacts file - 4/4 will be needed right before swithching over to gitlab pages as the redirects will need to be adapted for custom domain hosting The new 'pages' artifact from a CI run of this series can be viewed at: https://gitlab.com/pipo.sk/libvirt/-/jobs/5900957150 The 'redirect' validation (from an older version of this series) can be viewed at: https://pipo.sk.gitlab.io/libvirt/_redirects (beware that this will cause a certificate failure, as gitlab pages doesn't work well if you have a dot in your username ...) Peter Krempa (4): gitlab-ci: Configure website build to be published via gitlab pages docs: Add redirects configuration for gitlab pages gitlab-ci: Drop the legacy web page job docs: gitlab redirects: Drop '/libvirt' prefix for hosting the web through gitlab pages .gitlab-ci.yml | 80 +++++++++++++++++++++++++++++++++--------- docs/.gitlab_redirects | 54 ++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 17 deletions(-) create mode 100644 docs/.gitlab_redirects -- 2.43.0

2 6

[PATCH v2 0/4] Introduce dynamicMemslots attribute for virtio-mem
by Michal Privoznik 10 Jan '24

10 Jan '24

v2 of: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/MWYG… diff to v1: - Don't set .unplugged-inaccessible because it's not compatible with !x84_64 and even on x86_64 it's likely to get deprecated soon. Thanks David for pointing this out! Michal Prívozník (4): conf: Introduce dynamicMemslots attribute for virtio-mem qemu_capabilities: Add QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_DYNAMIC_MEMSLOTS capability qemu_validate: Check capability for virtio-mem dynamicMemslots qemu_command: Generate cmd line for virtio-mem dynamicMemslots docs/formatdomain.rst | 6 ++++++ src/conf/domain_conf.c | 18 +++++++++++++++++- src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 5 +++++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 +++ src/qemu/qemu_validate.c | 7 +++++++ .../qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 + ...emory-hotplug-virtio-mem.x86_64-latest.args | 2 +- .../memory-hotplug-virtio-mem.xml | 2 +- 11 files changed, 45 insertions(+), 3 deletions(-) -- 2.41.0

4 19

[PATCH v2 00/14] Unreacheble code cleanup
by Dmitry Frolov 10 Jan '24

10 Jan '24

A lot of unreacheble code was caused by int functions, which return nothing except zero. Unreacheble code was removed. Corresponding functions type was changed to void. Dmitry Frolov (14): cpu: turn virCPUx86DataAddItem() to void cpu: turn virCPUx86DataAdd() to void libxl: turn libxlCapsAddCPUID() to void libxl: turn virCapabilitiesAddHostFeature() to void libxl: turn libxl_get_physinfo() to void conf: turn virCapabilitiesSetNetPrefix() to void libxl: turn libxlMakeDomainOSCaps() to void libxl: turn libxlMakeDomainDeviceDiskCaps() to void libxl: turn libxlMakeDomainDeviceGraphicsCaps() to void libxl: turn libxlMakeDomainDeviceVideoCaps() to void conf: turn virDomainGraphicsListenAppendAddress() to void vbox: turn vboxDumpDisplay() to void libxl: turn xenParseXLNamespaceData() to void rpc: turn virNetClientAddProgram() to void src/admin/admin_remote.c | 3 +- src/conf/capabilities.c | 8 +-- src/conf/capabilities.h | 4 +- src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 2 +- src/cpu/cpu_x86.c | 91 ++++++++++++--------------------- src/cpu/cpu_x86.h | 2 +- src/libxl/libxl_capabilities.c | 54 +++++++------------ src/libxl/libxl_conf.c | 20 ++------ src/libxl/libxl_driver.c | 6 +-- src/libxl/xen_common.c | 7 +-- src/libxl/xen_xl.c | 8 ++- src/locking/lock_driver_lockd.c | 3 +- src/logging/log_manager.c | 3 +- src/lxc/lxc_monitor.c | 4 +- src/remote/remote_driver.c | 7 ++- src/rpc/virnetclient.c | 3 +- src/rpc/virnetclient.h | 2 +- src/test/test_driver.c | 6 +-- src/vbox/vbox_common.c | 13 ++--- src/vmx/vmx.c | 3 +- tests/libxlmock.c | 5 +- 22 files changed, 86 insertions(+), 172 deletions(-) -- 2.34.1

4 55

Re: Re: Re: [libvirt PATCH V2 0/4] add loongarch support for libvirt
by Andrea Bolognani 10 Jan '24

10 Jan '24

On Tue, Jan 09, 2024 at 01:25:16AM -0800, Andrea Bolognani wrote: > On Tue, Jan 09, 2024 at 09:51:59AM +0800, lixianglai wrote: > > Hi Andrea: > > > > I'm so sorry to bother you. > > > > I modified the code according to your suggestion and sent the second version > > of patch to the community, > > > > but I did not find it in the mailing list, I am not sure whether I have > > successfully sent it to the community, > > > > so I would like to confirm that you can receive the email of the second > > version of patch I sent? > > > > Under normal circumstances, can I see the patch I sent in the link below? > > > > https://lists.libvirt.org/archives/list/devel@lists.libvirt.org > > Yeah, it's supposed to show up there as well as in the month view[1] > but I can't see it. I haven't received a copy in my inbox either. > > It looks like something went wrong. Normally my first guess would be > that the messages are held up in the moderation queue, but I've > confirmed with the list admin that was not the case here. > > I'd say maybe give it a bit more time just in case things are > temporarily stuck in between servers, then send the patches again. > Worst case scenario, we're going to get two copies, no big deal :) I think I might have spotted the problem. You probably sent the patches to the old mailing list address (libvir-list(a)redhat.com) instead of the new one (devel(a)lists.libvirt.org) You should have gotten a message back telling you about it (I just did, which is how I noticed) but I've found those notifications to be somewhat hit and miss in the past. Just send the patches to the new address and they should make it to the list. If you use git-publish, it should automatically pick the right address. -- Andrea Bolognani / Red Hat / Virtualization

2 1

[PATCH] qemu: Be less aggressive when dropping channel source paths
by Michal Privoznik 09 Jan '24

09 Jan '24

In v9.7.0-rc1~130 I've shortened the path that's generated for <channel/> source. With that, I had to adjust regex that matches all versions of paths we have ever generated so that we can drop them (see comment around qemuDomainChrDefDropDefaultPath()). But as it is usually the case with regexes - they are write only. And while I attempted to make one portion of the path optional ("/target/") I accidentally made regex accept more, which resulted in libvirt dropping the user provided path and generating our own instead. Fixes: d3759d3674ab9453e5fb5a27ab6c28b8ff8d5569 Resolves: https://issues.redhat.com/browse/RHEL-20807 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 2 +- ...hannel-unix-source-path.x86_64-latest.args | 8 ++++++++ .../channel-unix-source-path.xml | 16 +++++++++++++++ ...-unix-source-path-active.x86_64-latest.xml | 20 +++++++++++++++++++ ...nix-source-path-inactive.x86_64-latest.xml | 20 +++++++++++++++++++ 5 files changed, 65 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 003fe7c71b..3a00fb689e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5447,7 +5447,7 @@ qemuDomainChrMatchDefaultPath(const char *prefix, virBufferEscapeRegex(&buf, "^%s", prefix); if (infix) virBufferEscapeRegex(&buf, "%s", infix); - virBufferAddLit(&buf, "/(target/)?([^/]+\\.)|(domain-[^/]+/)|([0-9]+-[^/]+/)"); + virBufferAddLit(&buf, "/(target/)?(([^/]+\\.)|(domain-[^/]+/)|([0-9]+-[^/]+/))"); virBufferEscapeRegex(&buf, "%s$", target); regexp = virBufferContentAndReset(&buf); diff --git a/tests/qemuxml2argvdata/channel-unix-source-path.x86_64-latest.args b/tests/qemuxml2argvdata/channel-unix-source-path.x86_64-latest.args index 821a508a40..845236d286 100644 --- a/tests/qemuxml2argvdata/channel-unix-source-path.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-unix-source-path.x86_64-latest.args @@ -40,6 +40,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chardev":"charchannel4","id":"channel4","name":"org.qemu.guest_agent.4"}' \ -chardev socket,id=charchannel5,fd=1729,server=on,wait=off \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chardev":"charchannel5","id":"channel5","name":"org.qemu.guest_agent.5"}' \ +-chardev socket,id=charchannel6,fd=1729,server=on,wait=off \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chardev":"charchannel6","id":"channel6","name":"org.qemu.guest_agent.6"}' \ +-chardev socket,id=charchannel7,fd=1729,server=on,wait=off \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chardev":"charchannel7","id":"channel7","name":"org.qemu.guest_agent.7"}' \ +-chardev socket,id=charchannel8,fd=1729,server=on,wait=off \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chardev":"charchannel8","id":"channel8","name":"org.qemu.guest_agent.8"}' \ +-chardev socket,id=charchannel9,fd=1729,server=on,wait=off \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":10,"chardev":"charchannel9","id":"channel9","name":"org.qemu.guest_agent.9"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-unix-source-path.xml b/tests/qemuxml2argvdata/channel-unix-source-path.xml index df548d88e7..265971eb94 100644 --- a/tests/qemuxml2argvdata/channel-unix-source-path.xml +++ b/tests/qemuxml2argvdata/channel-unix-source-path.xml @@ -32,6 +32,22 @@ <source mode='bind' path='/var/run/libvirt/qemu/channel/1-QEMUGuest1/org.qemu.guest_agent.5'/> <target type='virtio' name='org.qemu.guest_agent.5'/> </channel> + <channel type="unix"> + <source mode="bind" path="/1-QEMUGuest1/org.qemu.guest_agent.6"/> + <target type="virtio" name="org.qemu.guest_agent.6" state="connected"/> + </channel> + <channel type="unix"> + <source mode="bind" path="/tmp/1-QEMUGuest1/org.qemu.guest_agent.7"/> + <target type="virtio" name="org.qemu.guest_agent.7" state="connected"/> + </channel> + <channel type="unix"> + <source mode="bind" path="/tmp/libvirt/qemu/channel/1-QEMUGuest1/org.qemu.guest_agent.8"/> + <target type="virtio" name="org.qemu.guest_agent.8" state="connected"/> + </channel> + <channel type="unix"> + <source mode="bind" path="/tmp/org.qemu.guest_agent.9"/> + <target type="virtio" name="org.qemu.guest_agent.9" state="connected"/> + </channel> <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_64-latest.xml b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_64-latest.xml index 022ad7025a..12a981438c 100644 --- a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_64-latest.xml @@ -54,6 +54,26 @@ <target type='virtio' name='org.qemu.guest_agent.5'/> <address type='virtio-serial' controller='0' bus='0' port='6'/> </channel> + <channel type='unix'> + <source mode='bind' path='/1-QEMUGuest1/org.qemu.guest_agent.6'/> + <target type='virtio' name='org.qemu.guest_agent.6'/> + <address type='virtio-serial' controller='0' bus='0' port='7'/> + </channel> + <channel type='unix'> + <source mode='bind' path='/tmp/1-QEMUGuest1/org.qemu.guest_agent.7'/> + <target type='virtio' name='org.qemu.guest_agent.7'/> + <address type='virtio-serial' controller='0' bus='0' port='8'/> + </channel> + <channel type='unix'> + <source mode='bind' path='/tmp/libvirt/qemu/channel/1-QEMUGuest1/org.qemu.guest_agent.8'/> + <target type='virtio' name='org.qemu.guest_agent.8'/> + <address type='virtio-serial' controller='0' bus='0' port='9'/> + </channel> + <channel type='unix'> + <source mode='bind' path='/tmp/org.qemu.guest_agent.9'/> + <target type='virtio' name='org.qemu.guest_agent.9'/> + <address type='virtio-serial' controller='0' bus='0' port='10'/> + </channel> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86_64-latest.xml b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86_64-latest.xml index 3b013e9f87..2315a572e4 100644 --- a/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86_64-latest.xml @@ -49,6 +49,26 @@ <target type='virtio' name='org.qemu.guest_agent.5'/> <address type='virtio-serial' controller='0' bus='0' port='6'/> </channel> + <channel type='unix'> + <source mode='bind' path='/1-QEMUGuest1/org.qemu.guest_agent.6'/> + <target type='virtio' name='org.qemu.guest_agent.6'/> + <address type='virtio-serial' controller='0' bus='0' port='7'/> + </channel> + <channel type='unix'> + <source mode='bind' path='/tmp/1-QEMUGuest1/org.qemu.guest_agent.7'/> + <target type='virtio' name='org.qemu.guest_agent.7'/> + <address type='virtio-serial' controller='0' bus='0' port='8'/> + </channel> + <channel type='unix'> + <source mode='bind' path='/tmp/libvirt/qemu/channel/1-QEMUGuest1/org.qemu.guest_agent.8'/> + <target type='virtio' name='org.qemu.guest_agent.8'/> + <address type='virtio-serial' controller='0' bus='0' port='9'/> + </channel> + <channel type='unix'> + <source mode='bind' path='/tmp/org.qemu.guest_agent.9'/> + <target type='virtio' name='org.qemu.guest_agent.9'/> + <address type='virtio-serial' controller='0' bus='0' port='10'/> + </channel> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> -- 2.41.0

2 1

[PATCH 0/2] ci: Update to Fedora 39
by Michal Privoznik 09 Jan '24

09 Jan '24

Green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/1106643445 Michal Prívozník (2): ci: integration: Switch upstream integration tests to Fedora 39 ci: Update Alpine and Fedora and regenerate ci/buildenv/{alpine-317.sh => alpine-319.sh} | 0 ci/buildenv/{fedora-37.sh => fedora-39.sh} | 0 ...e-317.Dockerfile => alpine-319.Dockerfile} | 2 +- ...ora-37.Dockerfile => fedora-39.Dockerfile} | 2 +- ci/gitlab/builds.yml | 64 +++++++-------- ci/gitlab/containers.yml | 18 ++--- ci/integration.yml | 80 +++++++++---------- ci/manifest.yml | 18 ++--- 8 files changed, 92 insertions(+), 92 deletions(-) rename ci/buildenv/{alpine-317.sh => alpine-319.sh} (100%) rename ci/buildenv/{fedora-37.sh => fedora-39.sh} (100%) rename ci/containers/{alpine-317.Dockerfile => alpine-319.Dockerfile} (98%) rename ci/containers/{fedora-37.Dockerfile => fedora-39.Dockerfile} (98%) -- 2.41.0

6 15

[PATCH v2 0/2] Deprecate the shix machine and the TC58128 flash device
by Samuel Tardieu 09 Jan '24

09 Jan '24

The shix machine was a research project started around 2003 at Télécom Paris. Preliminary support in QEMU was added in 2005 back when the QEMU architecture was less structured than it is now. Unfortunately, the support for the shix machine and its peripherals, such as the TC58128 16MiB flash device, has never been maintained as the research project used the real machine. This project stopped around 2010 and to the best of my knowledge and after consulting with the original author Alexis Polti, I propose to deprecate it in QEMU as well as the TC58128 flash device which does not implement the QOM model and still contains debug fprintf statements. Samuel Tardieu (2): target/sh4: Deprecate the shix machine hw/block: Deprecate the TC58128 block device docs/about/deprecated.rst | 5 +++++ hw/block/tc58128.c | 1 + hw/sh4/shix.c | 1 + 3 files changed, 7 insertions(+) -- 2.42.0

2 4

[PATCH] qemu: tighten semantics of 'size' when resizing block devices
by Daniel P. Berrangé 09 Jan '24

09 Jan '24

When VIR_DOMAIN_BLOCK_RESIZE_CAPACITY is set, the 'size' parameter is currently ignored. Since applications must none the less pass a value for this parameter, it is preferrable to declare some explicit semantics for it. This declare that the parameter must be 0, or the exact size of the underlying block device. The latter gives the management application the ability to sanity check that the block device size matches what they think it should be. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/libvirt-domain.c | 5 +++-- src/qemu/qemu_driver.c | 9 ++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 94e5672ed8..83abad251e 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -6389,8 +6389,9 @@ virDomainBlockPeek(virDomainPtr dom, * to the next alignment boundary. * * If @flag contains VIR_DOMAIN_BLOCK_RESIZE_CAPACITY (since 10.0.0) the - * hypervisor will resize the guest block device to fully fill the source, - * ignoring @size. This is possible only for image formats with no metadata + * hypervisor will resize the guest block device to fully fill the source. + * @size must be either set to zero, or to the exact size of the block + * device source. This is possible only for image formats with no metadata * ('raw') and for source devices with limited capacity such as block devices. * * The @disk parameter is either an unambiguous source name of the diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 49bc4a624d..8e529f97b5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9325,7 +9325,14 @@ qemuDomainBlockResize(virDomainPtr dom, goto endjob; } - size = disk->src->physical; + if (size == 0) { + size = disk->src->physical; + } else if (size != disk->src->physical) { + virReportError(VIR_ERR_INVALID_ARG, + _("block resize to full capacity %llu but validate size is %llu"), + size, disk->src->physical); + goto endjob; + } } /* qcow2 and qed must be sized on 512 byte blocks/sectors, -- 2.43.0

2 2

[PATCH 0/2] tests: Add capabilities for QEMU 8.2.0 on aarch64
by Andrea Bolognani 09 Jan '24

09 Jan '24

Edited for brevity. Full version: $ git fetch https://gitlab.com/abologna/libvirt.git qemu-caps Andrea Bolognani (2): tests: Don't use features with vexpress machine tests: Add capabilities for QEMU 8.2.0 on aarch64 .../qemu_8.2.0-virt.aarch64.xml | 227 + tests/domaincapsdata/qemu_8.2.0.aarch64.xml | 227 + .../caps_8.2.0_aarch64.replies | 36411 ++++++++++++++++ .../caps_8.2.0_aarch64.xml | 549 + ...ch64-aavmf-virtio-mmio.aarch64-latest.args | 5 +- ...arch64-cpu-passthrough.aarch64-latest.args | 3 +- ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 3 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 3 +- .../aarch64-features-sve.aarch64-latest.args | 3 +- ...rch64-gic-default-both.aarch64-latest.args | 3 +- ...aarch64-gic-default-v2.aarch64-latest.args | 3 +- ...aarch64-gic-default-v3.aarch64-latest.args | 3 +- .../aarch64-gic-default.aarch64-latest.args | 3 +- .../aarch64-gic-host.aarch64-latest.args | 3 +- .../aarch64-gic-none-both.aarch64-latest.args | 3 +- .../aarch64-gic-none-tcg.aarch64-latest.args | 3 +- .../aarch64-gic-none-v2.aarch64-latest.args | 3 +- .../aarch64-gic-none-v3.aarch64-latest.args | 3 +- .../aarch64-gic-none.aarch64-latest.args | 3 +- .../aarch64-gic-v2.aarch64-latest.args | 3 +- .../aarch64-gic-v3.aarch64-latest.args | 3 +- .../aarch64-kvm-32-on-64.aarch64-latest.args | 4 +- .../aarch64-pci-serial.aarch64-latest.args | 3 +- .../aarch64-tpm.aarch64-latest.args | 3 +- ...arch64-traditional-pci.aarch64-latest.args | 3 +- ...aarch64-usb-controller.aarch64-latest.args | 3 +- .../aarch64-video-default.aarch64-latest.args | 3 +- ...4-video-virtio-gpu-pci.aarch64-latest.args | 5 +- ...rch64-virt-default-nic.aarch64-latest.args | 5 +- .../aarch64-virt-graphics.aarch64-latest.args | 4 +- .../aarch64-virt-headless.aarch64-latest.args | 4 +- ...rch64-virt-virtio-MMIO.aarch64.latest.args | 5 +- .../aarch64-virt-virtio.aarch64-latest.args | 5 +- ...h64-virtio-pci-default.aarch64-latest.args | 5 +- ...o-pci-manual-addresses.aarch64-latest.args | 7 +- .../arm-vexpressa9-basic.aarch64-latest.args | 2 +- .../qemuxml2argvdata/arm-vexpressa9-basic.xml | 5 - .../arm-vexpressa9-nodevs.xml | 5 - .../arm-vexpressa9-virtio.aarch64-latest.args | 2 +- .../arm-vexpressa9-virtio.xml | 5 - .../arm-virt-virtio.aarch64-latest.args | 4 +- .../balloon-mmio-deflate.aarch64-latest.args | 3 +- .../clock-timer-armvtimer.aarch64-latest.args | 3 +- ...ult-video-type-aarch64.aarch64-latest.args | 3 +- .../disk-arm-virtio-sd.aarch64-latest.args | 1 - ...mware-auto-efi-aarch64.aarch64-latest.args | 2 +- ...efi-abi-update-aarch64.aarch64-latest.args | 2 +- ...-loader-raw-abi-update.aarch64-latest.args | 2 +- ...-efi-format-loader-raw.aarch64-latest.args | 2 +- ...i-aarch64-legacy-paths.aarch64-latest.args | 2 +- ...anual-efi-acpi-aarch64.aarch64-latest.args | 2 +- ...ual-efi-noacpi-aarch64.aarch64-latest.args | 3 +- ...l-noefi-noacpi-aarch64.aarch64-latest.args | 3 +- .../iommu-smmuv3.aarch64-latest.args | 3 +- ...ch-virt-console-native.aarch64-latest.args | 3 +- ...ch-virt-console-virtio.aarch64-latest.args | 3 +- ...-serial+console-native.aarch64-latest.args | 3 +- ...ach-virt-serial-compat.aarch64-latest.args | 3 +- ...ach-virt-serial-native.aarch64-latest.args | 3 +- .../mach-virt-serial-pci.aarch64-latest.args | 3 +- .../mach-virt-serial-usb.aarch64-latest.args | 3 +- ...e-expander-bus-aarch64.aarch64-latest.args | 3 +- .../pvpanic-pci-aarch64.aarch64-latest.args | 2 +- ...pci-no-address-aarch64.aarch64-latest.args | 2 +- .../virtio-iommu-aarch64.aarch64-latest.args | 2 +- 65 files changed, 37483 insertions(+), 127 deletions(-) create mode 100644 tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_8.2.0.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml -- 2.43.0

3 7

[PATCH 0/2] Deprecate the shix machine and the TC58128 flash device
by Samuel Tardieu 09 Jan '24

09 Jan '24

The shix machine was a research project started around 2003 at Télécom Paris. Preliminary support in QEMU was added in 2005 back when the QEMU architecture was less structured than it is now. Unfortunately, the support for the shix machine and its peripherals, such as the TC58128 16MiB flash device, has never been maintained as the research project used the real machine. This project stopped around 2010 and to the best of my knowledge and after consulting with the original author Alexis Polti, I propose to deprecate it in QEMU as well as the TC58128 flash device which does not implement the QOM model and still contains debug fprintf statements. Samuel Tardieu (2): target/sh4: Deprecate the shix machine hw/block: Deprecate the TC58128 block device docs/about/deprecated.rst | 5 +++++ hw/block/tc58128.c | 1 + hw/sh4/shix.c | 1 + 3 files changed, 7 insertions(+) -- 2.42.0

4 7

[libvirt PATCH 0/6] qemu: Enable postcopy-preempt migration capability
by Jiri Denemark 08 Jan '24

08 Jan '24

This is technically a v2 of my recent "Introduce VIR_MIGRATE_POSTCOPY_PREEMPT flag", but the two series share exactly two lines of code (those defining a new QEMU_MIGRATION_CAP_POSTCOPY_PREEMPT enum item) so I'm just sending it as a separate series. More details about this feature can be found in patch 5/6. Jiri Denemark (6): qemu: Document qemuMigrationParamsFlagMapItem fields qemu: Use C99 initializers for qemuMigrationParamsFlagMap qemu: Rename remoteCaps parameter in qemuMigrationParamsCheck qemu: Add support for optional migration capabilities qemu: Enable postcopy-preempt migration capability NEWS: Mention postcopy-preempt migration capability NEWS.rst | 8 ++ src/qemu/qemu_migration.c | 19 +++-- src/qemu/qemu_migration_params.c | 127 ++++++++++++++++++++++--------- src/qemu/qemu_migration_params.h | 4 +- 4 files changed, 115 insertions(+), 43 deletions(-) -- 2.43.0

2 12

[libvirt PATCH 0/3] Introduce VIR_MIGRATE_POSTCOPY_PREEMPT flag
by Jiri Denemark 08 Jan '24

08 Jan '24

See 1/3 for details. https://issues.redhat.com/browse/RHEL-7100 Jiri Denemark (3): Introduce VIR_MIGRATE_POSTCOPY_PREEMPT flag virsh migrate: Add --postcopy-preempt option qemu_migration: Implement VIR_MIGRATE_POSTCOPY_PREEMPT docs/manpages/virsh.rst | 9 ++++++--- include/libvirt/libvirt-domain.h | 8 ++++++++ src/qemu/qemu_migration.c | 21 ++++++++++++++++++--- src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_params.c | 6 ++++++ src/qemu/qemu_migration_params.h | 1 + tools/virsh-domain.c | 6 ++++++ 7 files changed, 46 insertions(+), 6 deletions(-) -- 2.43.0

3 7

[PATCH v3 00/13] Support for VFIO variant drivers, Part 2
by Laine Stump 05 Jan '24

05 Jan '24

This is "V3 of Part 2". "V2 of Part 2": is here: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/EVHM… Part 1 (which simply made it possible to use virsh nodedev-detach to bind a device to a manually-specified variant driver, and at guest runtime allowed libvirt to ignore the fact that the driver found to the device was something other than exactly "vfio-pci") was here: https://listman.redhat.com/archives/libvir-list/2023-August/241338.html and pushed upstream as of commit v9.6.0-153-g24beaffec3 Part 2 adds two new pieces of functionality: 1) It is possible to manually specify a VFIO variant driver (or force the generic vfio-pci driver) for a device in the domain XML with, e.g.: <driver name='mlx5_vfio_pci'/> (for the former) or: <driver name='vfio-pci'/> (for the latter). 2) By default libvirt will now find the "best match" VFIO or VFIO variant driver by comparing the device's modalias file contents (in sysfs) with vfio drivers found in the running kernel's modules.alias file. This means that "virsh nodedev-detach" of a host device will bind it to its appropriate VFIO variant driver (if one is available), and also if a <hostdev> decice in a domain config has "managed='yes'", libvirt will bind it to a variant driver if possible (in order to force binding to the basic vfio-pci driver instead, you just need to add the <driver> element mentioned above). Differences from V2 to V3: * I attempted to simplify my explanation of the confusion with module name vs. driver name that I had in the commit log of patch 1. * I think I've addressed all of the minor issues pointed out by Peter in his reviews V2 (joining unnecessarily split lines, failing when a modalias file can't be found (rather than "kind of" ignoring it), and other minor fixes. * The main difference between V2 and V3 is that I've relented on the issue of re-using the existing <driver name='blah'/> attribute (due to potential backwrd compatibility problems we might encounter), and am instead adding a new attribute <driver model='blah'/>. This means that both the driver name and the new driver model attribute names don't make as much sense, but that's what fancy GUI frontends are for -hiding the borderline-confusing names! * One change suggested by Peter that I enthusiastically agree with, but haven't implemented in V3 is to cache the few relevant lines of modules.alias rather than rereading the entire file each time. I do agree with him, but have run out of steam (and time) to implement it now - I do promise a followup with this functionality "soon". Patches 2-9 and 11 were already ACKed by Peter in V2 (several of them conditionally based on some minor fixes that I have made). This leaves only patches 1, 10, 12, and 13 that require an ACK (V2 had 15 patches, but I removed two of them). Laine Stump (13): util: properly deal with VFIO module name vs. driver name schema: consolidate RNG for all hostdev <driver> elements conf: move/rename hostdev PCI driver type enum to device_conf.h conf: normalize hostdev <driver> parsing to simplify adding new attr conf: put hostdev PCI backend into a struct conf: use virDeviceHostdevPCIDriverInfo in network and networkport objects conf: split out hostdev <driver> parse/format to their own functions conf: use new common parser/formatter for hostdev driver in network XML conf: replace virHostdevIsVFIODevice with virHostdevIsPCIDevice xen: explicitly set hostdev driver.name at runtime, not in postparse tests: remove explicit <driver name='vfio'/> from hostdev test cases conf: support manually specifying VFIO variant driver in <hostdev> XML qemu: automatically bind to a vfio variant driver, if available docs/formatdomain.rst | 55 ++- docs/formatnetwork.rst | 22 +- docs/formatnetworkport.rst | 1 - docs/pci-addresses.rst | 1 - src/conf/device_conf.c | 59 +++ src/conf/device_conf.h | 27 ++ src/conf/domain_capabilities.c | 2 +- src/conf/domain_capabilities.h | 2 +- src/conf/domain_conf.c | 98 +---- src/conf/domain_conf.h | 18 +- src/conf/network_conf.c | 42 +- src/conf/network_conf.h | 17 +- src/conf/schemas/basictypes.rng | 20 + src/conf/schemas/domaincommon.rng | 173 ++++---- src/conf/schemas/network.rng | 10 +- src/conf/schemas/networkport.rng | 10 +- src/conf/virconftypes.h | 2 + src/conf/virnetworkportdef.c | 22 +- src/conf/virnetworkportdef.h | 4 +- src/hypervisor/virhostdev.c | 16 +- src/hypervisor/virhostdev.h | 2 - src/libvirt_private.syms | 8 +- src/libxl/libxl_capabilities.c | 3 +- src/libxl/libxl_domain.c | 73 +++- src/libxl/libxl_driver.c | 25 +- src/network/bridge_driver.c | 3 +- src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_command.c | 16 +- src/qemu/qemu_domain.c | 28 +- src/qemu/qemu_hostdev.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_validate.c | 6 +- src/security/security_apparmor.c | 2 +- src/security/security_dac.c | 4 +- src/security/security_selinux.c | 4 +- src/security/virt-aa-helper.c | 7 +- src/test/test_driver.c | 18 +- src/util/virpci.c | 410 ++++++++++++++++-- src/util/virpci.h | 2 + tests/domaincapstest.c | 4 +- tests/libxlxml2domconfigdata/moredevs-hvm.xml | 1 - tests/networkxml2xmlin/hostdev-pf-old.xml | 8 + tests/networkxml2xmlin/hostdev-pf.xml | 1 - tests/networkxml2xmlout/hostdev-pf-old.xml | 8 + tests/networkxml2xmlout/hostdev-pf.xml | 1 - tests/networkxml2xmltest.c | 6 + .../qemuhotplug-hostdev-pci.xml | 1 - .../qemumemlock-pc-hardlimit+hostdev.xml | 1 - ...emumemlock-pc-hardlimit+locked+hostdev.xml | 1 - .../qemumemlock-pc-hostdev-nvme.xml | 1 - .../qemumemlock-pc-hostdev.xml | 1 - .../qemumemlock-pc-locked+hostdev.xml | 1 - .../qemumemlock-pseries-hardlimit+hostdev.xml | 1 - ...mlock-pseries-hardlimit+locked+hostdev.xml | 1 - .../qemumemlock-pseries-hostdev.xml | 1 - .../qemumemlock-pseries-locked+hostdev.xml | 1 - tests/qemustatusxml2xmldata/modern-in.xml | 1 - .../hostdev-pci-address-unassigned.xml | 4 - .../hostdev-pci-multifunction.xml | 7 - .../hostdev-vfio-multidomain.xml | 1 - .../hostdev-vfio-zpci-autogenerate-fids.xml | 2 - .../hostdev-vfio-zpci-autogenerate-uids.xml | 2 - .../hostdev-vfio-zpci-autogenerate.xml | 1 - .../hostdev-vfio-zpci-boundaries.xml | 2 - .../hostdev-vfio-zpci-ccw-memballoon.xml | 1 - .../hostdev-vfio-zpci-duplicate.xml | 2 - ...ostdev-vfio-zpci-invalid-uid-valid-fid.xml | 1 - .../hostdev-vfio-zpci-multidomain-many.xml | 8 - .../hostdev-vfio-zpci-set-zero.xml | 1 - .../hostdev-vfio-zpci-uid-set-zero.xml | 1 - .../hostdev-vfio-zpci-wrong-arch.xml | 1 - tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 1 - .../hostdev-vfio.x86_64-latest.args | 5 +- tests/qemuxml2argvdata/hostdev-vfio.xml | 19 +- .../net-hostdev-vfio-multidomain.xml | 1 - tests/qemuxml2argvdata/net-hostdev-vfio.xml | 1 - tests/qemuxml2argvdata/pseries-hostdevs-1.xml | 3 - tests/qemuxml2argvdata/pseries-hostdevs-2.xml | 2 - tests/qemuxml2argvdata/pseries-hostdevs-3.xml | 2 - ...v-pci-address-unassigned.x86_64-latest.xml | 4 - ...ostdev-pci-multifunction.x86_64-latest.xml | 7 - ...dev-vfio-old-driver-name.x86_64-latest.xml | 46 ++ ...io-zpci-autogenerate-fids.s390x-latest.xml | 2 - ...io-zpci-autogenerate-uids.s390x-latest.xml | 2 - ...ev-vfio-zpci-autogenerate.s390x-latest.xml | 1 - ...tdev-vfio-zpci-boundaries.s390x-latest.xml | 2 - ...-vfio-zpci-ccw-memballoon.s390x-latest.xml | 1 - ...fio-zpci-multidomain-many.s390x-latest.xml | 8 - .../hostdev-vfio-zpci.s390x-latest.xml | 1 - .../hostdev-vfio.x86_64-latest.xml | 24 +- .../net-hostdev-vfio.x86_64-latest.xml | 1 - .../pseries-hostdevs-1.ppc64-latest.xml | 3 - .../pseries-hostdevs-2.ppc64-latest.xml | 2 - .../pseries-hostdevs-3.ppc64-latest.xml | 2 - tests/virhostdevtest.c | 2 +- .../plug-hostdev-pci-unmanaged.xml | 1 - .../plug-hostdev-pci.xml | 1 - tests/virpcimock.c | 9 + tests/xlconfigdata/test-fullvirt-pci.xml | 2 - tests/xmconfigdata/test-pci-dev-syntax.xml | 2 - tests/xmconfigdata/test-pci-devs.xml | 2 - tools/virsh-completer-nodedev.c | 4 +- 102 files changed, 927 insertions(+), 530 deletions(-) create mode 100644 tests/networkxml2xmlin/hostdev-pf-old.xml create mode 100644 tests/networkxml2xmlout/hostdev-pf-old.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-old-driver-name.x86_64-latest.xml -- 2.43.0

2 25

[PATCH 0/6] qemu: Update capabilities and add support for assigning multiple iothreads to a virtio-blk device
by Peter Krempa 05 Jan '24

05 Jan '24

See 4/6 for docs, 6/6 for examples Peter Krempa (6): qemucapabilitiesdata: Add data for the qemu-9.0 development cycle util: xml: Return GPtrArray from virXMLNodeGetSubelement qemu: capabilities: Introduce QEMU_CAPS_VIRTIO_BLK_IOTHREAD_MAPPING conf: Add possibility to configure multiple iothreads per disk qemu: Implement support for configuring iothread to virtqueue mapping for disks tests: Add xml->argv and xml->xml tests for the new iothread mapping feature docs/formatdomain.rst | 23 +- src/conf/domain_conf.c | 116 +- src/conf/domain_conf.h | 14 + src/conf/domain_validate.c | 8 + src/conf/network_conf.c | 33 +- src/conf/nwfilter_conf.c | 20 +- src/conf/schemas/domaincommon.rng | 47 +- src/hypervisor/domain_driver.c | 15 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 45 + src/qemu/qemu_validate.c | 117 +- src/util/virxml.c | 21 +- src/util/virxml.h | 5 +- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 289 + .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 288 + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 289 + .../caps_9.0.0_x86_64.replies | 42923 ++++++++++++++++ .../caps_9.0.0_x86_64.xml | 3760 ++ .../iothreads-disk.x86_64-latest.args | 13 +- tests/qemuxml2argvdata/iothreads-disk.xml | 25 +- .../iothreads-disk.x86_64-latest.xml | 26 +- 22 files changed, 47986 insertions(+), 94 deletions(-) create mode 100644 tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_9.0.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml -- 2.43.0

2 8

[PATCH 0/2] tests: Ensure test files are newline-terminated
by Andrea Bolognani 05 Jan '24

05 Jan '24

Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1128046264 Andrea Bolognani (2): tests: Drop some unused qemunbdkit data files tests: Ensure test files are newline-terminated ...69d019_36ea_4111_8f0a_8c9a70e21366-create.json | 2 +- ...69d019_36ea_4111_8f0a_8c9a70e21366-define.json | 2 +- ...441d39_495e_4243_ad9f_beb3f14c23d9-create.json | 2 +- ...441d39_495e_4243_ad9f_beb3f14c23d9-define.json | 2 +- ...dc4916_1ca8_49ac_b176_871d16c13076-create.json | 2 +- ...dc4916_1ca8_49ac_b176_871d16c13076-define.json | 2 +- .../disk-cdrom-network.args.disk1.pipe.778 | 2 +- .../disk-cdrom-network.args.disk2.pipe.780 | 2 +- .../disk-network-http.args.disk2.pipe.778 | 2 +- .../disk-network-http.args.disk3.pipe.780 | 2 +- ...source-curl-nbdkit-backing.args.disk0.pipe.778 | 2 +- .../disk-network-source-curl.args.disk0.pipe.778 | 2 +- .../disk-network-source-curl.args.disk1.pipe.780 | 2 +- .../disk-network-source-curl.args.disk1.pipe.782 | 2 +- .../disk-network-source-curl.args.disk2.pipe.782 | 1 - .../disk-network-source-curl.args.disk2.pipe.784 | 2 +- .../disk-network-ssh-password.args.disk0.pipe.778 | 2 +- tests/qemunbdkitdata/disk-network-ssh.args.disk1 | 8 -------- .../disk-network-ssh.args.disk1.pipe.778 | 1 - tests/qemunbdkitdata/disk-network-ssh.args.disk2 | 9 --------- tests/testutils.c | 15 ++++++--------- .../linux-ppc64-deconf-cpus.signature | 2 +- .../linux-ppc64-subcores1.signature | 2 +- .../linux-ppc64-subcores2.signature | 2 +- .../linux-ppc64-subcores3.signature | 2 +- .../linux-s390x-with-frequency.signature | 2 +- 26 files changed, 27 insertions(+), 49 deletions(-) delete mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.782 delete mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk1 delete mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk1.pipe.778 delete mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk2 -- 2.43.0

2 3

[PATCH v4] qemu: add runtime config option for nbdkit
by Jonathon Jongsma 05 Jan '24

05 Jan '24

Currently when we build with nbdkit support, libvirt will always try to use nbdkit to access remote disk sources when it is available. But without an up-to-date selinux policy allowing this, it will fail. because the required selinux policies are not yet widely available, we have disabled nbdkit support on rpm builds for all distributions before Fedora 40. Unfortunately, this makes it more difficult to test nbdkit support. After someone updates to the necessary selinux policies, they would also need to rebuild libvirt to enable nbdkit support. By introducing a configure option (nbdkit_config_default), we can build packages with nbdkit support but have it disabled by default. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> Suggested-by: Andrea Bolognani <abologna(a)redhat.com> --- changes in v4 - squashed in Andrea's suggested changes - updated error message - Changed one instance of WITH_NDBKIT to WITH_NBDKIT :) - tested libvirt.spec.in | 18 ++++++++++++++---- meson.build | 10 ++++++++++ meson_options.txt | 3 ++- src/qemu/libvirtd_qemu.aug | 3 +++ src/qemu/meson.build | 2 ++ src/qemu/qemu.conf.in | 11 +++++++++++ src/qemu/qemu_conf.c | 24 ++++++++++++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 3 +++ src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemuxml2argvtest.c | 15 +++++++++------ 11 files changed, 81 insertions(+), 11 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1d0ec5073d..2f2d713732 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -96,6 +96,7 @@ %define with_sanlock 0 %define with_numad 0 %define with_nbdkit 0 +%define with_nbdkit_config_default 0 %define with_firewalld_zone 0 %define with_netcf 0 %define with_libssh2 0 @@ -174,15 +175,17 @@ %endif %endif -# We should only enable nbdkit support if the OS ships a SELinux policy that -# allows libvirt to launch it. Right now that's not the case anywhere, but -# things should be fine by the time Fedora 40 is released. +# We want to build with nbdkit support, but should only enable nbdkit by +# default if the OS ships a SELinux policy that allows libvirt to launch it. +# Right now that's not the case anywhere, but things should be fine by the time +# Fedora 40 is released. # # TODO: add RHEL 9 once a minor release that contains the necessary SELinux # bits exists (we only support the most recent minor release) %if %{with_qemu} + %define with_nbdkit 0%{!?_without_nbdkit:1} %if 0%{?fedora} >= 40 - %define with_nbdkit 0%{!?_without_nbdkit:1} + %define with_nbdkit_config_default 0%{!?_without_nbdkit_config_default:1} %endif %endif @@ -1207,6 +1210,12 @@ exit 1 %define arg_nbdkit -Dnbdkit=disabled %endif +%if %{with_nbdkit_config_default} + %define arg_nbdkit_config_default -Dnbdkit_config_default=enabled +%else + %define arg_nbdkit_config_default -Dnbdkit_config_default=disabled +%endif + %if %{with_fuse} %define arg_fuse -Dfuse=enabled %else @@ -1322,6 +1331,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) %{?arg_sanlock} \ -Dlibpcap=enabled \ %{?arg_nbdkit} \ + %{?arg_nbdkit_config_default} \ -Dlibnl=enabled \ -Daudit=enabled \ -Ddtrace=enabled \ diff --git a/meson.build b/meson.build index 4d96b32e58..1e5e1d7954 100644 --- a/meson.build +++ b/meson.build @@ -1009,6 +1009,16 @@ if not conf.has('WITH_NBDKIT') libnbd_dep = dependency('', required: false) endif +# default value for storage_use_nbdkit config option. +# For now 'auto' just maps to disabled, but in the future it may depend on +# which security drivers are enabled +use_nbdkit_default = get_option('nbdkit_config_default').enabled() + +if use_nbdkit_default and not conf.has('WITH_NBDKIT') + error('nbdkit_config_default requires nbdkit to be enabled') +endif +conf.set10('USE_NBDKIT_DEFAULT', use_nbdkit_default) + libnl_version = '3.0' if not get_option('libnl').disabled() and host_machine.system() == 'linux' libnl_dep = dependency('libnl-3.0', version: '>=' + libnl_version, required: get_option('libnl')) diff --git a/meson_options.txt b/meson_options.txt index a0928102bf..182e28b3d1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -104,7 +104,8 @@ option('loader_nvram', type: 'string', value: '', description: 'Pass list of pai option('login_shell', type: 'feature', value: 'auto', description: 'build virt-login-shell') option('nss', type: 'feature', value: 'auto', description: 'enable Name Service Switch plugin for resolving guest IP addresses') option('numad', type: 'feature', value: 'auto', description: 'use numad to manage CPU placement dynamically') -option('nbdkit', type: 'feature', value: 'auto', description: 'use nbdkit to access network disks') +option('nbdkit', type: 'feature', value: 'auto', description: 'Build nbdkit storage backend') +option('nbdkit_config_default', type: 'feature', value: 'auto', description: 'Whether to use nbdkit storage backend for network disks by default (configurable)') option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-utils for power management') option('sysctl_config', type: 'feature', value: 'auto', description: 'Whether to install sysctl configs') option('tls_priority', type: 'string', value: 'NORMAL', description: 'set the default TLS session priority string') diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ed097ea3d9..43485b43fb 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -147,6 +147,8 @@ module Libvirtd_qemu = let capability_filters_entry = str_array_entry "capability_filters" + let storage_entry = bool_entry "storage_use_nbdkit" + (* Each entry in the config is one of the following ... *) let entry = default_tls_entry | vnc_entry @@ -170,6 +172,7 @@ module Libvirtd_qemu = | nbd_entry | swtpm_entry | capability_filters_entry + | storage_entry | obsolete_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 2279fef2ca..4c3e1dee78 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -137,6 +137,7 @@ if conf.has('WITH_QEMU') qemu_user_group_conf = configuration_data({ 'QEMU_USER': qemu_user, 'QEMU_GROUP': qemu_group, + 'USE_NBDKIT_DEFAULT': use_nbdkit_default.to_int(), }) qemu_conf = configure_file( input: 'qemu.conf.in', @@ -147,6 +148,7 @@ if conf.has('WITH_QEMU') qemu_user_group_hack_conf = configuration_data({ 'QEMU_USER': qemu_user, 'QEMU_GROUP': qemu_group, + 'USE_NBDKIT_DEFAULT': use_nbdkit_default.to_int(), # This hack is necessary because the output file is going to be # used as input for another configure_file() call later, which # will take care of substituting @CONFIG@ with useful data diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in index 6897e0f760..34025a02ef 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -974,3 +974,14 @@ # "full" - both QEMU and its helper processes are placed into separate # scheduling group #sched_core = "none" + +# Using nbdkit to access remote disk sources +# +# If this is set then libvirt will use nbdkit to access remote disk sources +# when available. nbdkit will export an NBD share to QEMU rather than having +# QEMU attempt to access the remote server directly. +# +# Possible values are 0 or 1. Default value is @USE_NBDKIT_DEFAULT@. Please +# note that the default might change in future releases. +# +#storage_use_nbdkit = @USE_NBDKIT_DEFAULT@ diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 513b5ebb1e..53eec9c43a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -285,6 +285,7 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privileged, return NULL; cfg->deprecationBehavior = g_strdup("none"); + cfg->storageUseNbdkit = USE_NBDKIT_DEFAULT; return g_steal_pointer(&cfg); } @@ -1065,6 +1066,26 @@ virQEMUDriverConfigLoadCapsFiltersEntry(virQEMUDriverConfig *cfg, } +static int +virQEMUDriverConfigLoadStorageEntry(virQEMUDriverConfig *cfg, + virConf *conf) +{ + if (virConfGetValueBool(conf, "storage_use_nbdkit", &cfg->storageUseNbdkit) < 0) + return -1; + +#if !WITH_NBDKIT + if (cfg->storageUseNbdkit) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", + _("configuration option 'storage_use_nbdkit' was specified, but nbdkit is not supported by this libvirt")); + return -1; + } +#endif /* WITH_NBDKIT */ + + return 0; +} + + int virQEMUDriverConfigLoadFile(virQEMUDriverConfig *cfg, const char *filename, bool privileged) @@ -1136,6 +1157,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfig *cfg, if (virQEMUDriverConfigLoadCapsFiltersEntry(cfg, conf) < 0) return -1; + if (virQEMUDriverConfigLoadStorageEntry(cfg, conf) < 0) + return -1; + return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 1a3ba3a0fb..36049b4bfa 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -230,6 +230,8 @@ struct _virQEMUDriverConfig { char *deprecationBehavior; + bool storageUseNbdkit; + virQEMUSchedCore schedCore; }; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 734d63f8a4..e16ba1c225 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10296,6 +10296,9 @@ qemuDomainPrepareStorageSourceNbdkit(virStorageSource *src, { g_autoptr(qemuNbdkitCaps) nbdkit = NULL; + if (!cfg->storageUseNbdkit) + return false; + if (virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_NETWORK) return false; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index c730df40b0..e4cfde6cc7 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -117,3 +117,4 @@ module Test_libvirtd_qemu = } { "deprecation_behavior" = "none" } { "sched_core" = "none" } +{ "storage_use_nbdkit" = "@USE_NBDKIT_DEFAULT@" } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b2ea2191dc..74d20b9132 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1125,7 +1125,6 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid"); DO_TEST_CAPS_LATEST("disk-cdrom-bus-other"); DO_TEST_CAPS_LATEST("disk-cdrom-network"); - DO_TEST_CAPS_LATEST_NBDKIT("disk-cdrom-network-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); DO_TEST_CAPS_LATEST("disk-cdrom-tray"); DO_TEST_CAPS_LATEST("disk-floppy"); DO_TEST_CAPS_LATEST("disk-floppy-q35"); @@ -1171,8 +1170,6 @@ mymain(void) DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0"); DO_TEST_CAPS_LATEST("disk-network-source-auth"); DO_TEST_CAPS_LATEST("disk-network-source-curl"); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-source-curl-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-source-curl-nbdkit-backing", QEMU_NBDKIT_CAPS_PLUGIN_CURL); DO_TEST_CAPS_LATEST("disk-network-nfs"); driver.config->vxhsTLS = 1; driver.config->nbdTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); @@ -1183,13 +1180,10 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0"); DO_TEST_CAPS_LATEST("disk-network-http"); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-http-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); VIR_FREE(driver.config->nbdTLSx509secretUUID); VIR_FREE(driver.config->vxhsTLSx509secretUUID); driver.config->vxhsTLS = 0; DO_TEST_CAPS_LATEST("disk-network-ssh"); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-ssh-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_SSH); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-ssh-password", QEMU_NBDKIT_CAPS_PLUGIN_SSH); DO_TEST_CAPS_LATEST("disk-no-boot"); DO_TEST_CAPS_LATEST("disk-nvme"); DO_TEST_CAPS_VER("disk-vhostuser-numa", "4.2.0"); @@ -1259,6 +1253,15 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-geometry"); DO_TEST_CAPS_LATEST("disk-blockio"); + driver.config->storageUseNbdkit = 1; + DO_TEST_CAPS_LATEST_NBDKIT("disk-cdrom-network-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-source-curl-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-source-curl-nbdkit-backing", QEMU_NBDKIT_CAPS_PLUGIN_CURL); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-http-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-ssh-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_SSH); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-ssh-password", QEMU_NBDKIT_CAPS_PLUGIN_SSH); + driver.config->storageUseNbdkit = 0; + DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); -- 2.43.0

3 8

[PATCH] libvirt.spec: Fix nbdkit selection logic on mingw and old rhel
by Peter Krempa 05 Jan '24

05 Jan '24

rhel-8 lacks 'pidfd_open()' support and thus nbdkit can't be enabled there. mingw builds explicitly disable nbdkit support, but use '--auto-features=enabled' thus omitting setting of 'nbdkit_config_default' results in meson thinking we want to enable it: ../meson.build:1018:2: ERROR: Problem encountered: nbdkit_config_default requires nbdkit to be enabled Disable it explicitly. The meson logic might need to be fixed eventually when switching it on by default. Fixes: 9eabf14afbd429af1be195723fdeab5ccdd0b2cd Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- libvirt.spec.in | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2f2d713732..8413e3c19a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -179,13 +179,19 @@ # default if the OS ships a SELinux policy that allows libvirt to launch it. # Right now that's not the case anywhere, but things should be fine by the time # Fedora 40 is released. -# -# TODO: add RHEL 9 once a minor release that contains the necessary SELinux -# bits exists (we only support the most recent minor release) %if %{with_qemu} - %define with_nbdkit 0%{!?_without_nbdkit:1} - %if 0%{?fedora} >= 40 - %define with_nbdkit_config_default 0%{!?_without_nbdkit_config_default:1} + # rhel-8 lacks pidfd_open + %if 0%{?fedora} || 0%{?rhel} >= 9 + %define with_nbdkit 0%{!?_without_nbdkit:1} + + # setting 'with_nbdkit_config_default' must be done only when compiling + # in nbdkit support + # + # TODO: add RHEL 9 once a minor release that contains the necessary SELinux + # bits exists (we only support the most recent minor release) + %if 0%{?fedora} >= 40 + %define with_nbdkit_config_default 0%{!?_without_nbdkit_config_default:1} + %endif %endif %endif @@ -1397,6 +1403,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) -Dhost_validate=disabled \ -Dlibiscsi=disabled \ -Dnbdkit=disabled \ + -Dnbdkit_config_default=disabled \ -Dlibnl=disabled \ -Dlibpcap=disabled \ -Dlibssh2=disabled \ -- 2.43.0

2 1

[PATCH 0/7] Code cleanup 2
by Artem Chernyshev 05 Jan '24

05 Jan '24

Several functions was modified to become invariant. Change their type to void and remove unnecessary checks of their return values. Found by Linux Verification Center (linuxtesting.org) with SVACE. Artem Chernyshev (7): cpu: : virCPUx86DataAddItem() to void rpc: virnetserver: virNetServerAddService() to void lxc: virLXCControllerAddConsole() to void conf: virDomainNetUpdate() to void virprocess: virProcessGetNamespaces() to void node_device: udevTranslatePCIIds() to void node_device: udevGetStringSysfsAttr() to void src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 2 +- src/cpu/cpu_x86.c | 179 +++++++++++------------------ src/cpu/cpu_x86.h | 4 +- src/libvirt-lxc.c | 5 +- src/libxl/libxl_capabilities.c | 13 +-- src/lxc/lxc_controller.c | 9 +- src/lxc/lxc_driver.c | 6 +- src/node_device/node_device_udev.c | 69 ++++------- src/qemu/qemu_capabilities.c | 3 +- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_monitor_json.c | 7 +- src/qemu/qemu_process.c | 3 +- src/rpc/virnetserver.c | 25 +--- src/rpc/virnetserver.h | 2 +- src/util/virprocess.c | 4 +- src/util/virprocess.h | 2 +- tests/virnetdaemontest.c | 6 +- 18 files changed, 118 insertions(+), 227 deletions(-) -- 2.43.0

2 13

[libvirt PATCH v2 00/15] Support for VFIO variant drivers, Part 2
by Laine Stump 05 Jan '24

05 Jan '24

(Thisis "V2 of Part 2". "V1 of Part 2" is here: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/5GF4… ) Part 1 (which simply made it possible to use virsh nodedev-detach to bind a device to a manually-specified variant driver, and at guest runtime allowed libvirt to ignore the fact that the driver found to the device was something other than exactly "vfio-pci") was here: https://listman.redhat.com/archives/libvir-list/2023-August/241338.html and pushed upstream as of commit v9.6.0-153-g24beaffec3 Part 2 adds two new pieces of functionality: 1) It is possible to manually specify a VFIO variant driver (or force the generic vfio-pci driver) for a device in the domain XML with, e.g.: <driver name='mlx5_vfio_pci'/> (for the former) or: <driver name='vfio-pci'/> (for the latter). 2) By default libvirt will now find the "best match" VFIO or VFIO variant driver by comparing the device's modalias file contents (in sysfs) with vfio drivers found in the running kernel's modules.alias file. This means that "virsh nodedev-detach" of a host device will bind it to its appropriate VFIO variant driver (if one is available), and also if a <hostdev> decice in a domain config has "managed='yes'", libvirt will bind it to a variant driver if possible (in order to force binding to the basic vfio-pci driver instead, you just need to add the <driver> element mentioned above). The first 12 patches are all just getting (1) going (a lot of it is refactoring code to use common code for the four places that use the hostdev <driver> element), and the final 3 patches implement (2). More details are spread along the way. Differences from V1: I squashed together a couple of the patches, and fixed some things that caused CI jobs to fail (I'd forgotten to push the branch to gitlab and trigger CI). Laine Stump (15): util: properly deal with module vs. driver when binding device to driver schema: consolidate RNG for all hostdev <driver> elements conf: move/rename hostdev PCI driver type enum to device_conf.h conf: normalize hostdev <driver> parsing to simplify adding new attr conf: put hostdev PCI backend into a struct conf: use virDeviceHostdevPCIDriverInfo in network and networkport objects conf: split out hostdev <driver> parse/format to their own functions conf: use new common parser/formatter for hostdev driver in network XML tests: remove explicit <driver name='vfio'/> from hostdev test cases xen: explicitly set hostdev driver.type at runtime, not in postparse conf: replace virHostdevIsVFIODevice with virHostdevIsPCIDevice conf: support manually specifying VFIO variant driver in <hostdev> XML util: new function virStringSkipToSpace() tests: mock virPCIDevice(BindTo|UnbindFrom)Stub with nop functions qemu: automatically bind to a vfio variant driver, if available docs/formatdomain.rst | 55 ++- src/conf/device_conf.c | 75 +++ src/conf/device_conf.h | 27 ++ src/conf/domain_capabilities.c | 2 +- src/conf/domain_capabilities.h | 2 +- src/conf/domain_conf.c | 98 +--- src/conf/domain_conf.h | 18 +- src/conf/network_conf.c | 43 +- src/conf/network_conf.h | 17 +- src/conf/schemas/basictypes.rng | 20 + src/conf/schemas/domaincommon.rng | 173 ++++--- src/conf/schemas/network.rng | 10 +- src/conf/schemas/networkport.rng | 10 +- src/conf/virconftypes.h | 2 + src/conf/virnetworkportdef.c | 22 +- src/conf/virnetworkportdef.h | 4 +- src/hypervisor/virhostdev.c | 16 +- src/hypervisor/virhostdev.h | 2 - src/libvirt_private.syms | 10 +- src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_domain.c | 65 ++- src/libxl/libxl_driver.c | 25 +- src/network/bridge_driver.c | 2 +- src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_command.c | 14 +- src/qemu/qemu_domain.c | 29 +- src/qemu/qemu_hostdev.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_validate.c | 6 +- src/security/security_apparmor.c | 2 +- src/security/security_dac.c | 4 +- src/security/security_selinux.c | 4 +- src/security/virt-aa-helper.c | 8 +- src/util/virpci.c | 438 ++++++++++++++++-- src/util/virpci.h | 3 + src/util/virstring.c | 17 + src/util/virstring.h | 1 + tests/domaincapstest.c | 4 +- tests/libxlxml2domconfigdata/moredevs-hvm.xml | 1 - tests/networkxml2xmlin/hostdev-pf-old.xml | 8 + tests/networkxml2xmlin/hostdev-pf.xml | 2 +- tests/networkxml2xmlout/hostdev-pf-old.xml | 8 + tests/networkxml2xmlout/hostdev-pf.xml | 2 +- tests/networkxml2xmltest.c | 6 + tests/qemuhotplugmock.c | 15 + .../qemuhotplug-hostdev-pci.xml | 1 - .../qemuhotplug-base-live+hostdev-pci.xml | 2 +- ...uhotplug-pseries-base-live+hostdev-pci.xml | 2 +- tests/qemustatusxml2xmldata/modern-in.xml | 2 +- .../hostdev-pci-address-unassigned.xml | 4 - .../hostdev-pci-multifunction.xml | 7 - .../hostdev-vfio-multidomain.xml | 1 - .../hostdev-vfio-zpci-autogenerate-fids.xml | 2 - .../hostdev-vfio-zpci-autogenerate-uids.xml | 2 - .../hostdev-vfio-zpci-autogenerate.xml | 1 - .../hostdev-vfio-zpci-boundaries.xml | 2 - .../hostdev-vfio-zpci-ccw-memballoon.xml | 1 - .../hostdev-vfio-zpci-duplicate.xml | 2 - ...ostdev-vfio-zpci-invalid-uid-valid-fid.xml | 1 - .../hostdev-vfio-zpci-multidomain-many.xml | 8 - .../hostdev-vfio-zpci-set-zero.xml | 1 - .../hostdev-vfio-zpci-uid-set-zero.xml | 1 - .../hostdev-vfio-zpci-wrong-arch.xml | 1 - tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 1 - .../hostdev-vfio.x86_64-latest.args | 5 +- tests/qemuxml2argvdata/hostdev-vfio.xml | 19 +- .../net-hostdev-vfio-multidomain.xml | 1 - tests/qemuxml2argvdata/net-hostdev-vfio.xml | 1 - tests/qemuxml2argvdata/pseries-hostdevs-1.xml | 3 - tests/qemuxml2argvdata/pseries-hostdevs-2.xml | 2 - tests/qemuxml2argvdata/pseries-hostdevs-3.xml | 2 - ...v-pci-address-unassigned.x86_64-latest.xml | 4 - ...ostdev-pci-multifunction.x86_64-latest.xml | 7 - ...io-zpci-autogenerate-fids.s390x-latest.xml | 2 - ...io-zpci-autogenerate-uids.s390x-latest.xml | 2 - ...ev-vfio-zpci-autogenerate.s390x-latest.xml | 1 - ...tdev-vfio-zpci-boundaries.s390x-latest.xml | 2 - ...-vfio-zpci-ccw-memballoon.s390x-latest.xml | 1 - ...fio-zpci-multidomain-many.s390x-latest.xml | 8 - .../hostdev-vfio-zpci.s390x-latest.xml | 1 - .../hostdev-vfio.x86_64-latest.xml | 24 +- .../net-hostdev-vfio.x86_64-latest.xml | 1 - .../pseries-hostdevs-1.ppc64-latest.xml | 3 - .../pseries-hostdevs-2.ppc64-latest.xml | 2 - .../pseries-hostdevs-3.ppc64-latest.xml | 2 - tests/virhostdevtest.c | 2 +- .../plug-hostdev-pci-unmanaged.xml | 2 +- .../plug-hostdev-pci.xml | 2 +- tests/xlconfigdata/test-fullvirt-pci.xml | 2 - tests/xmconfigdata/test-pci-dev-syntax.xml | 2 - tests/xmconfigdata/test-pci-devs.xml | 2 - tools/virsh-completer-nodedev.c | 4 +- 92 files changed, 933 insertions(+), 498 deletions(-) create mode 100644 tests/networkxml2xmlin/hostdev-pf-old.xml create mode 100644 tests/networkxml2xmlout/hostdev-pf-old.xml -- 2.41.0

3 44

[libvirt PATCH 0/5] Initial network support in ch driver.
by Praveen K Paladugu 04 Jan '24

04 Jan '24

This series introduces network support for ch guests. ETHERNET network mode is the only mode supported. More modes will be add once this series is merged. For security reasons, cloud-hypervisor requries FDs for guests to be sent using SCM_RIGHTS. This patch series introduces 2 methods that support sending FDs to ch in Patch 3. Network support in ch driver is introduced by Patch 5. I previously sent "hypervisor: Move interface mgmt methods to hypervisor" patch by itself. I merged this patch also into Patch 2 in this series. Praveen K Paladugu (5): conf: Drop unused parameter hypervisor: Move domain interface mgmt methods util: Add util methods required by ch networking ch: Introduce version based cap for network support ch: Enable ETHERNET Network mode support po/POTFILES | 3 + src/ch/ch_capabilities.c | 9 + src/ch/ch_capabilities.h | 1 + src/ch/ch_conf.h | 4 + src/ch/ch_domain.c | 41 +++ src/ch/ch_domain.h | 3 + src/ch/ch_interface.c | 104 +++++++ src/ch/ch_interface.h | 35 +++ src/ch/ch_monitor.c | 205 +++++--------- src/ch/ch_monitor.h | 7 +- src/ch/ch_process.c | 160 ++++++++++- src/ch/meson.build | 2 + src/conf/domain_conf.c | 1 - src/conf/domain_conf.h | 3 +- src/hypervisor/domain_interface.c | 457 ++++++++++++++++++++++++++++++ src/hypervisor/domain_interface.h | 45 +++ src/hypervisor/meson.build | 1 + src/libvirt_private.syms | 11 + src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_process.c | 4 +- src/qemu/qemu_command.c | 6 +- src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_interface.c | 339 +--------------------- src/qemu/qemu_interface.h | 11 - src/qemu/qemu_process.c | 73 +---- src/util/virsocket.c | 109 +++++++ src/util/virsocket.h | 3 + 29 files changed, 1093 insertions(+), 567 deletions(-) create mode 100644 src/ch/ch_interface.c create mode 100644 src/ch/ch_interface.h create mode 100644 src/hypervisor/domain_interface.c create mode 100644 src/hypervisor/domain_interface.h -- 2.41.0

3 9

[PATCH 00/19] qemu XML testing improvements, part 1 - forgotten test files and network driver
by Peter Krempa 04 Jan '24

04 Jan '24

This patch saga aims to improve and simplify testing of qemu XML configs. Part 1 deals with input test files which are not used in qemuxml2argvtest, introduces a mock network driver and adds a checker that all input files are in fact used. Peter Krempa (19): qemuxml2argvtest: Reinstate 'console-compat-chardev' and 'pci-serial-dev-chardev' qemuxml2argvtest: Fix and use 'disk-network-ssh-key' case qemuxml2argvtest: Reinstate 'pseries-vio-address-clash' case qemuxml2argvdata: Move 'smbios-multiple-type2' case to genericxml2xmltest qemuxml2argvtest: Remove duplicated invocations of tests qemuxml2argvtest: Check for duplicate invocation of tests qemuxml2argvmock: Mock qemuInterfaceBridgeConnect qemuxml2argvtest: Add test cases covered only by qemuxml2xmltest - part 1 qemuxml2xmltest: Move 'graphics-listen-network2' case go genericxml2xmltest qemuxml2*test: Add specific test case for interface link state qemuxml*test: Improve 'vhost_queues' test case qemuxml2xmltest: Delete 'interface-driver' case qemu: process: Separate setup of network device objects qemuxml2argvmock: Mock virNetDevSetMTU qemuxml2xmltest: Introduce fake network driver qemuxml2argvtest: Enable 'graphics-listen-network' case virnetworkportxml2xmltest: Add simple versions of bridge/network tests qemuxml2argvtest: Add test cases covered only by qemuxml2xmltest - part 2 qemuxml2argvtest: Add checker that all input files are used src/qemu/qemu_interface.h | 2 +- src/qemu/qemu_process.c | 45 ++-- src/util/virnetdev.h | 2 +- .../graphics-listen-network2.xml | 0 .../smbios-multiple-type2.xml | 0 .../graphics-listen-network2.xml | 35 +++ tests/genericxml2xmltest.c | 3 + tests/qemustatusxml2xmltest.c | 2 +- ...nu-disable-with-timeout.x86_64-latest.args | 36 +++ ...hannel-unix-source-path.x86_64-latest.args | 45 ++++ .../chardev-label.x86_64-latest.args | 41 +++ .../console-compat2.x86_64-latest.args | 40 +++ .../cpu-empty.x86_64-latest.args | 33 +++ ...cpu-host-model-features.x86_64-latest.args | 33 +++ .../cpu-numa-disordered.x86_64-latest.args | 38 +++ .../disk-active-commit.x86_64-latest.args | 38 +++ .../disk-mirror-old.x86_64-latest.args | 45 ++++ .../disk-mirror.x86_64-latest.args | 48 ++++ .../disk-network-ssh-key.x86_64-latest.args | 38 +++ .../qemuxml2argvdata/disk-network-ssh-key.xml | 2 +- .../disk-network-vxhs.x86_64-5.0.0.args | 35 +++ .../downscript.x86_64-latest.args | 43 +++ ...graphics-listen-network.x86_64-latest.args | 37 +++ .../graphics-listen-network.xml | 2 +- .../hostdev-mdev-display.x86_64-latest.args | 34 +++ ...ev-scsi-autogen-address.x86_64-latest.args | 60 +++++ ...hostdev-scsi-large-unit.x86_64-latest.args | 39 +++ .../hostdev-scsi-shareable.x86_64-latest.args | 39 +++ tests/qemuxml2argvdata/interface-driver.xml | 54 ---- .../qemuxml2argvdata/lease.x86_64-latest.args | 39 +++ .../memorybacking-set.x86_64-latest.args | 33 +++ .../memorybacking-unset.x86_64-latest.args | 33 +++ .../metadata-duplicate.x86_64-latest.args | 36 +++ .../metadata.x86_64-latest.args | 36 +++ .../net-bandwidth.x86_64-latest.args | 47 ++++ tests/qemuxml2argvdata/net-bandwidth.xml | 2 +- .../net-bandwidth2.x86_64-latest.args | 44 +++ tests/qemuxml2argvdata/net-bandwidth2.xml | 2 +- .../net-coalesce.x86_64-latest.args | 48 ++++ tests/qemuxml2argvdata/net-coalesce.xml | 6 +- .../net-isolated-port.x86_64-latest.args | 43 +++ tests/qemuxml2argvdata/net-isolated-port.xml | 2 +- .../net-linkstate.x86_64-latest.args | 36 +++ tests/qemuxml2argvdata/net-linkstate.xml | 34 +++ .../net-midonet.x86_64-latest.args | 38 +++ .../net-mtu.x86_64-latest.args | 46 ++++ tests/qemuxml2argvdata/net-mtu.xml | 4 +- .../net-openvswitch.x86_64-latest.args | 38 +++ tests/qemuxml2argvdata/net-openvswitch.xml | 2 +- ...irtio-network-portgroup.x86_64-latest.args | 42 +++ .../net-virtio-network-portgroup.xml | 6 +- ...-virtio-teaming-network.x86_64-latest.args | 39 +++ .../net-virtio-teaming-network.xml | 4 +- .../net-virtio-vhost.x86_64-latest.args | 42 +++ ...{vhost_queues.xml => net-virtio-vhost.xml} | 25 +- ...d-auto-vcpu-no-numatune.x86_64-latest.args | 36 +++ ...static-vcpu-no-numatune.x86_64-latest.args | 36 +++ ...vcpus-topology-mismatch.x86_64-latest.args | 34 +++ .../panic-pseries.ppc64-latest.args | 34 +++ .../pcihole64-gib.x86_64-latest.args | 34 +++ ...pseries-vio-address-clash.ppc64-latest.err | 1 + .../s390-defaultconsole.s390x-latest.args | 33 +++ .../s390-panic.s390x-latest.args | 35 +++ ...eclabel-device-multiple.x86_64-latest.args | 36 +++ ...el-dynamic-none-relabel.x86_64-latest.args | 37 +++ .../seclabel-dynamic-none.x86_64-latest.args | 36 +++ ...serial-target-port-auto.x86_64-latest.args | 42 +++ .../tap-vhost-incorrect.x86_64-latest.args | 40 +++ .../qemuxml2argvdata/tap-vhost-incorrect.xml | 4 +- .../tap-vhost.x86_64-latest.args | 44 +++ tests/qemuxml2argvdata/tap-vhost.xml | 2 +- .../vhost-user-fs-sock.x86_64-latest.args | 34 +++ ...ideo-virtio-gpu-ccw-auto.s390x-latest.args | 36 +++ tests/qemuxml2argvmock.c | 25 ++ tests/qemuxml2argvtest.c | 255 +++++++++++++++++- .../graphics-listen-network.x86_64-latest.xml | 2 +- .../interface-driver.x86_64-latest.xml | 67 ----- .../net-bandwidth.x86_64-latest.xml | 2 +- .../net-bandwidth2.x86_64-latest.xml | 2 +- .../net-coalesce.x86_64-latest.xml | 6 +- .../net-isolated-port.x86_64-latest.xml | 2 +- ...st.xml => net-linkstate.x86_64-latest.xml} | 34 ++- .../net-openvswitch.x86_64-latest.xml | 2 +- ...virtio-network-portgroup.x86_64-latest.xml | 6 +- ...t-virtio-teaming-network.x86_64-latest.xml | 4 +- ...xml => net-virtio-vhost.x86_64-latest.xml} | 29 +- .../tap-vhost-incorrect.x86_64-latest.xml | 4 +- .../tap-vhost.x86_64-latest.xml | 2 +- tests/qemuxml2xmltest.c | 6 +- tests/testutils.c | 14 + tests/testutils.h | 2 + tests/testutilsqemu.h | 3 + .../plug-bridge-basic.xml | 11 + .../plug-network-basic.xml | 10 + tests/virnetworkportxml2xmltest.c | 2 + 95 files changed, 2407 insertions(+), 233 deletions(-) rename tests/{qemuxml2argvdata => genericxml2xmlindata}/graphics-listen-network2.xml (100%) rename tests/{qemuxml2argvdata => genericxml2xmlindata}/smbios-multiple-type2.xml (100%) create mode 100644 tests/genericxml2xmloutdata/graphics-listen-network2.xml create mode 100644 tests/qemuxml2argvdata/boot-menu-disable-with-timeout.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/channel-unix-source-path.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/chardev-label.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/console-compat2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-empty.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-features.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-active-commit.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-mirror-old.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-mirror.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-key.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-vxhs.x86_64-5.0.0.args create mode 100644 tests/qemuxml2argvdata/downscript.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/graphics-listen-network.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-autogen-address.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-large-unit.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-shareable.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/interface-driver.xml create mode 100644 tests/qemuxml2argvdata/lease.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memorybacking-set.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memorybacking-unset.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/metadata-duplicate.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/metadata.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-bandwidth.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-bandwidth2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-coalesce.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-isolated-port.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-linkstate.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-linkstate.xml create mode 100644 tests/qemuxml2argvdata/net-midonet.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-mtu.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-openvswitch.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-virtio-network-portgroup.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming-network.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-virtio-vhost.x86_64-latest.args rename tests/qemuxml2argvdata/{vhost_queues.xml => net-virtio-vhost.xml} (67%) create mode 100644 tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numavcpus-topology-mismatch.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/panic-pseries.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/pcihole64-gib.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/pseries-vio-address-clash.ppc64-latest.err create mode 100644 tests/qemuxml2argvdata/s390-defaultconsole.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-panic.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/seclabel-device-multiple.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-none.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-target-port-auto.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tap-vhost-incorrect.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tap-vhost.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-sock.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw-auto.s390x-latest.args delete mode 100644 tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml rename tests/qemuxml2xmloutdata/{graphics-listen-network2.x86_64-latest.xml => net-linkstate.x86_64-latest.xml} (63%) rename tests/qemuxml2xmloutdata/{vhost_queues.x86_64-latest.xml => net-virtio-vhost.x86_64-latest.xml} (78%) create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge-basic.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-network-basic.xml -- 2.43.0

2 28

[PATCH 0/4] Introduce dynamicMemslots attribute for virtio-mem
by Michal Privoznik 04 Jan '24

04 Jan '24

I couldn't decide whether the new attribute should be in <target/> or <memory/> element. I went with the former, but if anybody feels I should have went with the latter then I can change it. Michal Prívozník (4): conf: Introduce dynamicMemslots attribute for virtio-mem qemu_capabilities: Add QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_DYNAMIC_MEMSLOTS capability qemu_validate: Check capability for virtio-mem dynamicMemslots qemu_command: Generate cmd line for virtio-mem dynamicMemslots docs/formatdomain.rst | 6 ++++++ src/conf/domain_conf.c | 18 +++++++++++++++++- src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 5 +++++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 12 ++++++++++++ src/qemu/qemu_validate.c | 7 +++++++ .../qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 + ...emory-hotplug-virtio-mem.x86_64-latest.args | 2 +- .../memory-hotplug-virtio-mem.xml | 2 +- 11 files changed, 54 insertions(+), 3 deletions(-) -- 2.41.0

1 4

[libvirt PATCH v3] qemu: add runtime config option for nbdkit
by Jonathon Jongsma 04 Jan '24

04 Jan '24

Currently when we build with nbdkit support, libvirt will always try to use nbdkit to access remote disk sources when it is available. But without an up-to-date selinux policy allowing this, it will fail. because the required selinux policies are not yet widely available, we have disabled nbdkit support on rpm builds for all distributions before Fedora 40. Unfortunately, this makes it more difficult to test nbdkit support. After someone updates to the necessary selinux policies, they would also need to rebuild libvirt to enable nbdkit support. By introducing a configure option (nbdkit_config_default), we can build packages with nbdkit support but have it disabled by default. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> Suggested-by: Andrea Bolognani <abologna(a)redhat.com> --- Sorry for the delay in getting out a new version. Thanksgiving break in the USA, etc. Changes in v3: - nbdkit_config_default changed from a meson 'boolean' to a meson 'feature' configure option - print error message for senseless configurations where nbdkit is disabled but nbdkit_config_default is enabled - added a comment to example config file about possibility of the default value changing in the future - don't include the storage_use_nbdkit in the config file if nbdkit support is not compiled in. I used the same strategy that is used in the remote driver where certain config options are disabled based on whether WITH_IP is defined or not. When WITH_NBDKIT is not defined, the value is not included in the config file and we don't attempt to parse it from the config file either. libvirt.spec.in | 18 +++++++-- meson.build | 10 +++++ meson_options.txt | 3 +- ...libvirtd_qemu.aug => libvirtd_qemu.aug.in} | 7 ++++ src/qemu/meson.build | 37 ++++++++++++++++++- src/qemu/qemu.conf.in | 13 +++++++ src/qemu/qemu_conf.c | 19 ++++++++++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 3 ++ tests/qemuxml2argvtest.c | 15 +++++--- 10 files changed, 114 insertions(+), 13 deletions(-) rename src/qemu/{libvirtd_qemu.aug => libvirtd_qemu.aug.in} (98%) diff --git a/libvirt.spec.in b/libvirt.spec.in index f3fdedfde4..7aa497a565 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -96,6 +96,7 @@ %define with_sanlock 0 %define with_numad 0 %define with_nbdkit 0 +%define with_nbdkit_config_default 0 %define with_firewalld_zone 0 %define with_netcf 0 %define with_libssh2 0 @@ -174,15 +175,17 @@ %endif %endif -# We should only enable nbdkit support if the OS ships a SELinux policy that -# allows libvirt to launch it. Right now that's not the case anywhere, but -# things should be fine by the time Fedora 40 is released. +# We want to build with nbdkit support, but should only enable nbdkit by +# default if the OS ships a SELinux policy that allows libvirt to launch it. +# Right now that's not the case anywhere, but things should be fine by the time +# Fedora 40 is released. # # TODO: add RHEL 9 once a minor release that contains the necessary SELinux # bits exists (we only support the most recent minor release) %if %{with_qemu} + %define with_nbdkit 0%{!?_without_nbdkit:1} %if 0%{?fedora} >= 40 - %define with_nbdkit 0%{!?_without_nbdkit:1} + %define with_nbdkit_config_default 0%{!?_without_nbdkit_config_default:1} %endif %endif @@ -1214,6 +1217,12 @@ exit 1 %define arg_nbdkit -Dnbdkit=disabled %endif +%if %{with_nbdkit_config_default} + %define arg_nbdkit_config_default -Dnbdkit_config_default=enabled +%else + %define arg_nbdkit_config_default -Dnbdkit_config_default=disabled +%endif + %if %{with_fuse} %define arg_fuse -Dfuse=enabled %else @@ -1329,6 +1338,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) %{?arg_sanlock} \ -Dlibpcap=enabled \ %{?arg_nbdkit} \ + %{?arg_nbdkit_config_default} \ -Dlibnl=enabled \ -Daudit=enabled \ -Ddtrace=enabled \ diff --git a/meson.build b/meson.build index 62481a008d..e63b807f21 100644 --- a/meson.build +++ b/meson.build @@ -1012,6 +1012,16 @@ if not conf.has('WITH_NBDKIT') libnbd_dep = dependency('', required: false) endif +# default value for storage_use_nbdkit config option. +# For now 'auto' just maps to disabled, but in the future it may depend on +# which security drivers are enabled +use_nbdkit_default = get_option('nbdkit_config_default').enabled() + +if use_nbdkit_default and not conf.has('WITH_NBDKIT') + error('nbdkit_config_default requires nbdkit to be enabled') +endif +conf.set10('USE_NBDKIT_DEFAULT', use_nbdkit_default) + libnl_version = '3.0' if not get_option('libnl').disabled() and host_machine.system() == 'linux' libnl_dep = dependency('libnl-3.0', version: '>=' + libnl_version, required: get_option('libnl')) diff --git a/meson_options.txt b/meson_options.txt index a0928102bf..05fd63dd41 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -104,7 +104,8 @@ option('loader_nvram', type: 'string', value: '', description: 'Pass list of pai option('login_shell', type: 'feature', value: 'auto', description: 'build virt-login-shell') option('nss', type: 'feature', value: 'auto', description: 'enable Name Service Switch plugin for resolving guest IP addresses') option('numad', type: 'feature', value: 'auto', description: 'use numad to manage CPU placement dynamically') -option('nbdkit', type: 'feature', value: 'auto', description: 'use nbdkit to access network disks') +option('nbdkit', type: 'feature', value: 'auto', description: 'Build nbdkit storage backend') +option('nbdkit_config_default', type: 'feature', value: 'disabled', description: 'Whether to use nbdkit storage backend for network disks by default (configurable)') option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-utils for power management') option('sysctl_config', type: 'feature', value: 'auto', description: 'Whether to install sysctl configs') option('tls_priority', type: 'string', value: 'NORMAL', description: 'set the default TLS session priority string') diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug.in similarity index 98% rename from src/qemu/libvirtd_qemu.aug rename to src/qemu/libvirtd_qemu.aug.in index ed097ea3d9..bcc0aa8938 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug.in @@ -147,6 +147,10 @@ module Libvirtd_qemu = let capability_filters_entry = str_array_entry "capability_filters" +@CUT_WITH_NBDKIT@ + let storage_entry = bool_entry "storage_use_nbdkit" + +@END@ (* Each entry in the config is one of the following ... *) let entry = default_tls_entry | vnc_entry @@ -170,6 +174,9 @@ module Libvirtd_qemu = | nbd_entry | swtpm_entry | capability_filters_entry +@CUT_WITH_NBDKIT@ + | storage_entry +@END@ | obsolete_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 2279fef2ca..43519e2834 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -137,9 +137,41 @@ if conf.has('WITH_QEMU') qemu_user_group_conf = configuration_data({ 'QEMU_USER': qemu_user, 'QEMU_GROUP': qemu_group, + 'USE_NBDKIT_DEFAULT': use_nbdkit_default.to_int(), }) + + # preprocess config files to remove items related to features that are not + # compiled in + preprocess_config_files = [ + { + 'inpath': 'qemu.conf.in', + 'outpath': 'qemu.conf.tmp', + 'outvar': 'qemu_conf_tmp', + }, + { + 'inpath': 'libvirtd_qemu.aug.in', + 'outpath': 'libvirtd_qemu.aug', + 'outvar': 'libvirtd_qemu_aug', + } + ] + foreach item : preprocess_config_files + if conf.has('WITH_NBDKIT') + preprocess_cmd = [ 'sed', '-e', '/[@]CUT_WITH_NBDKIT[@]/d', '-e', '/[@]END[@]/d', '@INPUT@' ] + else + preprocess_cmd = [ 'sed', '-e', '/[@]CUT_WITH_NBDKIT[@]/,/[@]END[@]/d', '@INPUT@' ] + endif + + tmp = configure_file( + input: item['inpath'], + output: item['outpath'], + command: preprocess_cmd, + capture: true, + ) + set_variable(item['outvar'], tmp) + endforeach + qemu_conf = configure_file( - input: 'qemu.conf.in', + input: qemu_conf_tmp, output: 'qemu.conf', configuration: qemu_user_group_conf, ) @@ -147,6 +179,7 @@ if conf.has('WITH_QEMU') qemu_user_group_hack_conf = configuration_data({ 'QEMU_USER': qemu_user, 'QEMU_GROUP': qemu_group, + 'USE_NBDKIT_DEFAULT': use_nbdkit_default.to_int(), # This hack is necessary because the output file is going to be # used as input for another configure_file() call later, which # will take care of substituting @CONFIG@ with useful data @@ -159,7 +192,7 @@ if conf.has('WITH_QEMU') ) virt_conf_files += qemu_conf - virt_aug_files += files('libvirtd_qemu.aug') + virt_aug_files += libvirtd_qemu_aug virt_test_aug_files += { 'name': 'test_libvirtd_qemu.aug', 'aug': test_libvirtd_qemu_aug_tmp, diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in index 6897e0f760..76633c6a2f 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -974,3 +974,16 @@ # "full" - both QEMU and its helper processes are placed into separate # scheduling group #sched_core = "none" + +@CUT_WITH_NBDKIT@ +# Using nbdkit to access remote disk sources +# +# If this is set then libvirt will use nbdkit to access remote disk sources +# when available. nbdkit will export an NBD share to QEMU rather than having +# QEMU attempt to access the remote server directly. +# +# Possible values are 0 or 1. Default value is @USE_NBDKIT_DEFAULT@. Please +# note that the default might change in future releases. +# +# storage_use_nbdkit = @USE_NBDKIT_DEFAULT@ +@END@ diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 513b5ebb1e..e1a1bc3655 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -285,6 +285,7 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privileged, return NULL; cfg->deprecationBehavior = g_strdup("none"); + cfg->storageUseNbdkit = USE_NBDKIT_DEFAULT; return g_steal_pointer(&cfg); } @@ -1065,6 +1066,19 @@ virQEMUDriverConfigLoadCapsFiltersEntry(virQEMUDriverConfig *cfg, } +#if WITH_NBDKIT +static int +virQEMUDriverConfigLoadStorageEntry(virQEMUDriverConfig *cfg, + virConf *conf) +{ + if (virConfGetValueBool(conf, "storage_use_nbdkit", &cfg->storageUseNbdkit) < 0) + return -1; + + return 0; +} +#endif /* WITH_NBDKIT */ + + int virQEMUDriverConfigLoadFile(virQEMUDriverConfig *cfg, const char *filename, bool privileged) @@ -1136,6 +1150,11 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfig *cfg, if (virQEMUDriverConfigLoadCapsFiltersEntry(cfg, conf) < 0) return -1; +#if WITH_NBDKIT + if (virQEMUDriverConfigLoadStorageEntry(cfg, conf) < 0) + return -1; +#endif /* WITH_NBDKIT */ + return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 1a3ba3a0fb..36049b4bfa 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -230,6 +230,8 @@ struct _virQEMUDriverConfig { char *deprecationBehavior; + bool storageUseNbdkit; + virQEMUSchedCore schedCore; }; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 953808fcfe..0891ddabe9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10296,6 +10296,9 @@ qemuDomainPrepareStorageSourceNbdkit(virStorageSource *src, { g_autoptr(qemuNbdkitCaps) nbdkit = NULL; + if (!cfg->storageUseNbdkit) + return false; + if (virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_NETWORK) return false; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b2ea2191dc..74d20b9132 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1125,7 +1125,6 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid"); DO_TEST_CAPS_LATEST("disk-cdrom-bus-other"); DO_TEST_CAPS_LATEST("disk-cdrom-network"); - DO_TEST_CAPS_LATEST_NBDKIT("disk-cdrom-network-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); DO_TEST_CAPS_LATEST("disk-cdrom-tray"); DO_TEST_CAPS_LATEST("disk-floppy"); DO_TEST_CAPS_LATEST("disk-floppy-q35"); @@ -1171,8 +1170,6 @@ mymain(void) DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0"); DO_TEST_CAPS_LATEST("disk-network-source-auth"); DO_TEST_CAPS_LATEST("disk-network-source-curl"); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-source-curl-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-source-curl-nbdkit-backing", QEMU_NBDKIT_CAPS_PLUGIN_CURL); DO_TEST_CAPS_LATEST("disk-network-nfs"); driver.config->vxhsTLS = 1; driver.config->nbdTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); @@ -1183,13 +1180,10 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0"); DO_TEST_CAPS_LATEST("disk-network-http"); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-http-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); VIR_FREE(driver.config->nbdTLSx509secretUUID); VIR_FREE(driver.config->vxhsTLSx509secretUUID); driver.config->vxhsTLS = 0; DO_TEST_CAPS_LATEST("disk-network-ssh"); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-ssh-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_SSH); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-ssh-password", QEMU_NBDKIT_CAPS_PLUGIN_SSH); DO_TEST_CAPS_LATEST("disk-no-boot"); DO_TEST_CAPS_LATEST("disk-nvme"); DO_TEST_CAPS_VER("disk-vhostuser-numa", "4.2.0"); @@ -1259,6 +1253,15 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-geometry"); DO_TEST_CAPS_LATEST("disk-blockio"); + driver.config->storageUseNbdkit = 1; + DO_TEST_CAPS_LATEST_NBDKIT("disk-cdrom-network-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-source-curl-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-source-curl-nbdkit-backing", QEMU_NBDKIT_CAPS_PLUGIN_CURL); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-http-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-ssh-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_SSH); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-ssh-password", QEMU_NBDKIT_CAPS_PLUGIN_SSH); + driver.config->storageUseNbdkit = 0; + DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); -- 2.41.0

2 3

[libvirt PATCH 0/5] add loongarch support for libvirt
by xianglai li 04 Jan '24

04 Jan '24

From: lixianglai <lixianglai(a)loongson.cn> Hello, Everyone: This patch series adds libvirt support for loongarch.Although the bios path and name has not been officially integrated into qemu and we think there are still many shortcomings, we try to push a version of patch to the community according to the opinions of the community, hoping to listen to everyone's opinions. Anyway we have a version of libvirt that supports loongarch. You can also get libvirt's patch from the link below: https://gitlab.com/lixianglai/libvirt branch: loongarch Since the patch associated with loongarch has not yet been submitted to the virt-manager community, we are providing a temporary patch with loongarch for the time being patch's virt-manager, the open source work of virt-manager adding loongarch will be followed up later or synchronized with the open source libvirt. You can get the virt-manager code with loongarch patch from the link below: https://github.com/loongson/virt-manager branch: loongarch loongarch's virtual machine bios is not yet available in qemu, so you can get it from the following link https://github.com/loongson/Firmware/tree/main/LoongArchVirtMachine (Note: You should clone the repository using git instead of downloading the file via wget or you'll get xml) We named the bios edk2-loongarch64-code.fd, edk2-loongarch64-vars.fd is used to store pflash images of non-volatile variables.After installing qemu-system-loongarch64, you need to manually copy these two files to the /user/share/qemu directory. Since there is no fedora operating system that supports the loongarch architecture, you can find an iso that supports loongarch at the link below for testing purposes: https://github.com/fedora-remix-loongarch/releases-info Well, if you have completed the above steps I think you can now install loongarch virtual machine, you can install it through the virt-manager graphical interface, or install it through vrit-install, here is an example of installing it using virt-install: virt-install \ --virt-type=qemu \ --name loongarch-test \ --memory 4096 \ --vcpus=4 \ --arch=loongarch64 \ --boot cdrom \ --disk device=cdrom,bus=scsi,path=/root/livecd-fedora-mate-4.loongarch64.iso \ --disk path=/var/lib/libvirt/images/debian12-loongarch64.qcow2,size=10,format=qcow2,bus=scsi \ --network network=default \ --osinfo archlinux \ --feature acpi=true \ --video=virtio \ --graphics=vnc,listen=0.0.0.0 lixianglai (5): Add loongarch cpu support Add loongarch cpu model and vendor info Config some capabilities for loongarch virt machine Implement the method of getting host info for loongarch Add bios path for loongarch po/POTFILES | 1 + src/conf/schemas/basictypes.rng | 1 + src/cpu/cpu.c | 2 + src/cpu/cpu.h | 2 + src/cpu/cpu_loongarch.c | 742 +++++++++++++++++++++++++++++ src/cpu/cpu_loongarch.h | 25 + src/cpu/cpu_loongarch_data.h | 37 ++ src/cpu/meson.build | 1 + src/cpu_map/index.xml | 5 + src/cpu_map/loongarch_la464.xml | 6 + src/cpu_map/loongarch_vendors.xml | 3 + src/cpu_map/meson.build | 2 + src/qemu/qemu.conf.in | 3 +- src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 32 ++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 55 +++ src/qemu/qemu_validate.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virarch.c | 4 + src/util/virarch.h | 4 + src/util/virhostcpu.c | 4 +- src/util/virsysinfo.c | 5 +- 24 files changed, 940 insertions(+), 7 deletions(-) create mode 100644 src/cpu/cpu_loongarch.c create mode 100644 src/cpu/cpu_loongarch.h create mode 100644 src/cpu/cpu_loongarch_data.h create mode 100644 src/cpu_map/loongarch_la464.xml create mode 100644 src/cpu_map/loongarch_vendors.xml -- 2.27.0

3 23

[PATCH] Fix regression on default bus for keyboard/mouse from c4bc4d3b #577
by Jonathan Wright 03 Jan '24

03 Jan '24

Signed-off-by: Jonathan Wright <jonathan(a)almalinux.org> --- src/conf/domain_postparse.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c index e79913b73f..ee27023f3e 100644 --- a/src/conf/domain_postparse.c +++ b/src/conf/domain_postparse.c @@ -657,6 +657,7 @@ virDomainInputDefPostParse(virDomainInputDef *input, if ((input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE || input->type == VIR_DOMAIN_INPUT_TYPE_KBD) && (ARCH_IS_X86(def->os.arch) || def->os.arch == VIR_ARCH_NONE)) { + input->bus = VIR_DOMAIN_INPUT_BUS_PS2; } else if (ARCH_IS_S390(def->os.arch) || input->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) { input->bus = VIR_DOMAIN_INPUT_BUS_VIRTIO; -- 2.43.0

2 2