October 2022 - Devel - libvirt List Archives

Re: [PATCH RFC v2 00/13] IOMMUFD Generic interface
by Alex Williamson 22 Oct '22

22 Oct '22

[Cc+ Steve, libvirt, Daniel, Laine] On Tue, 20 Sep 2022 16:56:42 -0300 Jason Gunthorpe <jgg(a)nvidia.com> wrote: > On Tue, Sep 13, 2022 at 09:28:18AM +0200, Eric Auger wrote: > > Hi, > > > > On 9/13/22 03:55, Tian, Kevin wrote: > > > We didn't close the open of how to get this merged in LPC due to the > > > audio issue. Then let's use mails. > > > > > > Overall there are three options on the table: > > > > > > 1) Require vfio-compat to be 100% compatible with vfio-type1 > > > > > > Probably not a good choice given the amount of work to fix the remaining > > > gaps. And this will block support of new IOMMU features for a longer time. > > > > > > 2) Leave vfio-compat as what it is in this series > > > > > > Treat it as a vehicle to validate the iommufd logic instead of immediately > > > replacing vfio-type1. Functionally most vfio applications can work w/o > > > change if putting aside the difference on locked mm accounting, p2p, etc. > > > > > > Then work on new features and 100% vfio-type1 compat. in parallel. > > > > > > 3) Focus on iommufd native uAPI first > > > > > > Require vfio_device cdev and adoption in Qemu. Only for new vfio app. > > > > > > Then work on new features and vfio-compat in parallel. > > > > > > I'm fine with either 2) or 3). Per a quick chat with Alex he prefers to 3). > > > > I am also inclined to pursue 3) as this was the initial Jason's guidance > > and pre-requisite to integrate new features. In the past we concluded > > vfio-compat would mostly be used for testing purpose. Our QEMU > > integration fully is based on device based API. > > There are some poor chicken and egg problems here. > > I had some assumptions: > a - the vfio cdev model is going to be iommufd only > b - any uAPI we add as we go along should be generally useful going > forward > c - we should try to minimize the 'minimally viable iommufd' series > > The compat as it stands now (eg #2) is threading this needle. Since it > can exist without cdev it means (c) is made smaller, to two series. > > Since we add something useful to some use cases, eg DPDK is deployable > that way, (b) is OK. > > If we focus on a strict path with 3, and avoid adding non-useful code, > then we have to have two more (unwritten!) series beyond where we are > now - vfio group compartmentalization, and cdev integration, and the > initial (c) will increase. > > 3 also has us merging something that currently has no usable > userspace, which I also do dislike alot. > > I still think the compat gaps are small. I've realized that > VFIO_DMA_UNMAP_FLAG_VADDR has no implementation in qemu, and since it > can deadlock the kernel I propose we purge it completely. Steve won't be happy to hear that, QEMU support exists but isn't yet merged. > P2P is ongoing. > > That really just leaves the accounting, and I'm still not convinced at > this must be a critical thing. Linus's latest remarks reported in lwn > at the maintainer summit on tracepoints/BPF as ABI seem to support > this. Let's see an actual deployed production configuration that would > be impacted, and we won't find that unless we move forward. I'll try to summarize the proposed change so that we can get better advice from libvirt folks, or potentially anyone else managing locked memory limits for device assignment VMs. Background: when a DMA range, ex. guest RAM, is mapped to a vfio device, we use the system IOMMU to provide GPA to HPA translation for assigned devices. Unlike CPU page tables, we don't generally have a means to demand fault these translations, therefore the memory target of the translation is pinned to prevent that it cannot be swapped or relocated, ie. to guarantee the translation is always valid. The issue is where we account these pinned pages, where accounting is necessary such that a user cannot lock an arbitrary number of pages into RAM to generate a DoS attack. Duplicate accounting should be resolved by iommufd, but is outside the scope of this discussion. Currently, vfio tests against the mm_struct.locked_vm relative to rlimit(RLIMIT_MEMLOCK), which reads task->signal->rlim[limit].rlim_cur, where task is the current process. This is the same limit set via the setrlimit syscall used by prlimit(1) and reported via 'ulimit -l'. Note that in both cases above, we're dealing with a task, or process limit and both prlimit and ulimit man pages describe them as such. iommufd supposes instead, and references existing kernel implementations, that despite the descriptions above these limits are actually meant to be user limits and therefore instead charges pinned pages against user_struct.locked_vm and also marks them in mm_struct.pinned_vm. The proposed algorithm is to read the _task_ locked memory limit, then attempt to charge the _user_ locked_vm, such that user_struct.locked_vm cannot exceed the task locked memory limit. This obviously has implications. AFAICT, any management tool that doesn't instantiate assigned device VMs under separate users are essentially untenable. For example, if we launch VM1 under userA and set a locked memory limit of 4GB via prlimit to account for an assigned device, that works fine, until we launch VM2 from userA as well. In that case we can't simply set a 4GB limit on the VM2 task because there's already 4GB charged against user_struct.locked_vm for VM1. So we'd need to set the VM2 task limit to 8GB to be able to launch VM2. But not only that, we'd need to go back and also set VM1's task limit to 8GB or else it will fail if a DMA mapped memory region is transient and needs to be re-mapped. Effectively any task under the same user and requiring pinned memory needs to have a locked memory limit set, and updated, to account for all tasks using pinned memory by that user. How does this affect known current use cases of locked memory management for assigned device VMs? Does qemu://system by default sandbox into per VM uids or do they all use the qemu user by default. I imagine qemu://session mode is pretty screwed by this, but I also don't know who/where locked limits are lifted for such VMs. Boxes, who I think now supports assigned device VMs, could also be affected. > So, I still like 2 because it yields the smallest next step before we > can bring all the parallel work onto the list, and it makes testing > and converting non-qemu stuff easier even going forward. If a vfio compatible interface isn't transparently compatible, then I have a hard time understanding its value. Please correct my above description and implications, but I suspect these are not just theoretical ABI compat issues. Thanks, Alex

6 33

[libvirt RFC PATCH 0/4] add external backend for tpm
by Ján Tomko 21 Oct '22

21 Oct '22

Ján Tomko (3): qemu: tpm: fix spacing qemu: add external backend for tpm qemu: add tests for external swtpm Peter Krempa (1): schema: domain: Allow interleaving of 'tpm' config elements src/conf/domain_audit.c | 11 +++++ src/conf/domain_conf.c | 16 +++++++ src/conf/domain_conf.h | 4 ++ src/conf/domain_validate.c | 1 + src/conf/schemas/domaincommon.rng | 42 ++++++++++++++----- src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_cgroup.c | 1 + src/qemu/qemu_command.c | 11 ++++- src/qemu/qemu_domain.c | 3 ++ src/qemu/qemu_namespace.c | 1 + src/qemu/qemu_tpm.c | 2 +- src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 + .../qemu_6.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + .../qemu_7.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 + .../tpm-external.x86_64-latest.args | 36 ++++++++++++++++ tests/qemuxml2argvdata/tpm-external.xml | 40 ++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../tpm-external.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 60 files changed, 208 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/tpm-external.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-external.xml create mode 120000 tests/qemuxml2xmloutdata/tpm-external.x86_64-latest.xml -- 2.37.3

2 5

[libvirt PATCH] qemu: do not attempt to pass unopened vsock FD
by Ján Tomko 21 Oct '22

21 Oct '22

On normal vm startup, we open a file descriptor for the vsock device in qemuProcessPrepareHost. However, when doing domxml-to-native, no file descriptors are open. Only pass the fd if it's not -1, to make domxml-to-native work. https://bugzilla.redhat.com/show_bug.cgi?id=1777212 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Technically a v2 of: https://listman.redhat.com/archives/libvir-list/2021-July/msg00803.html I did not look at other cases, but IIRC the ones converted to use qemuFD* wrappers should handle missing FDs gracefully. src/qemu/qemu_command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 150824f2e1..bbbde57c0f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9717,7 +9717,8 @@ qemuBuildVsockCommandLine(virCommand *cmd, if (!(devprops = qemuBuildVsockDevProps(def, vsock, qemuCaps, ""))) return -1; - virCommandPassFD(cmd, priv->vhostfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); + if (priv->vhostfd != -1) + virCommandPassFD(cmd, priv->vhostfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); priv->vhostfd = -1; if (qemuCommandAddExtDevice(cmd, &vsock->info, def, qemuCaps) < 0) -- 2.37.3

2 1

[libvirt PATCH 00/12] tools: provide virt-qemu-sev-validate for SEV(-ES) launch attestation
by Daniel P. Berrangé 20 Oct '22

20 Oct '22

The libvirt QEMU driver provides all the functionality required for launching a guest on AMD SEV(-ES) platforms, with a configuration that enables attestation of the launch measurement. The documentation for how to actually perform an attestation is severely lacking and not suitable for mere mortals to understand. IOW, someone trying to implement attestation is in for a world of pain and suffering. This series doesn't fix the documentation problem, but it does provide a reference implementation of a tool for performing attestation of SEV(-ES) guests in the context of libvirt / KVM. There will be other tools and libraries that implement attestation logic too, but this tool is likely somewhat unique in its usage of libvirt. Now for a attestation to be trustworthy you don't want to perform it on the hypervisor host, since the goal is to prove that the hypervisor has not acted maliciously. None the less it is still beneficial to have libvirt integration to some extent. When running this tool on a remote (trusted) host, it can connect to the libvirt hypervisor and fetch the data provided by the virDomainLaunchSecurityInfo API, which is safe to trust as the key pieces are cryptographically measured. Attestation is a complex problem though and it is very easy to screw up and feed the wrong information and then waste hours trying to figure out what piece was wrong, to cause the hash digest to change. For debugging such problems, you can thus tell the tool to operate insecurely, by querying libvirt for almost all of the configuration information required to determine the expected measurement. By comparing these results,to the results obtained in offline mode it helps narrow down where the mistake lies. So I view this tool as being useful in a number of ways: * Quality assurance engineers needing to test libvirt/QEMU/KVM get a simple and reliable tool for automating tests with. * Users running simple libvirt deployments without any large management stack, get a standalone tool for attestation they can rely on. * Developers writing/integrating attestation support into management stacks above libvirt, get a reference against which they can debug their own tools. * Users wanting to demonstrate the core SEV/SEV-ES functionality get a simple and reliable tool to illustrate the core concepts involved. Since I didn't fancy writing such complex logic in C, this tool is a python3 program. As such, we don't want to include it in the main libvirt-client RPM, nor any other existing RPM. THus, this series puts it in a new libvirt-client-qemu RPM which, through no co-inicidence at all, is the same RPM I invented a few days ago to hold the virt-qemu-qmp-proxy command. Note, people will have already seen an earlier version of this tool I hacked up some months ago. This code is very significantly changed since that earlier version, to make it more maintainable, and simpler to use (especially for SEV-ES) but the general theme is still the same. Daniel P. Berrangé (12): build-aux: only forbid gethostname in C files tools: support validating SEV firmware boot measurements tools: load guest config from libvirt tools: support validating SEV direct kernel boot measurements tools: load direct kernel config from libvirt tools: support validating SEV-ES initial vCPU state measurements tools: support automatically constructing SEV-ES vCPU state tools: load CPU count and CPU SKU from libvirt tools: support generating SEV secret injection tables docs/kbase: describe attestation for SEV guests scripts: add systemtap script for capturing SEV-ES VMSA docs/manpages: add checklist of problems for SEV attestation build-aux/syntax-check.mk | 1 + docs/kbase/launch_security_sev.rst | 102 ++ docs/manpages/meson.build | 1 + docs/manpages/virt-qemu-sev-validate.rst | 643 +++++++++++ examples/systemtap/amd-sev-es-vmsa.stp | 48 + libvirt.spec.in | 15 + tools/meson.build | 9 + tools/virt-qemu-sev-validate.py | 1289 ++++++++++++++++++++++ 8 files changed, 2108 insertions(+) create mode 100644 docs/manpages/virt-qemu-sev-validate.rst create mode 100644 examples/systemtap/amd-sev-es-vmsa.stp create mode 100755 tools/virt-qemu-sev-validate.py -- 2.37.3

3 27

[PATCH] qemuxml2argvtest: Don't re-parse and re-generate commandline for QAPI schema validation
by Peter Krempa 20 Oct '22

20 Oct '22

The removal of the special internal flag for '-netdev' validatition now allows us to use the same virCommand object for validation of the schema. Pass it into the validator instead of re-parsing and re-generating everything. This improved the runtime of qemuxml2argvtest by ~25% on my box. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/qemuxml2argvtest.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index de69cd426a..7ede68d555 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -548,17 +548,11 @@ testCompareXMLToArgvValidateSchemaCommand(GStrv args, static int -testCompareXMLToArgvValidateSchema(virQEMUDriver *drv, - const char *migrateURI, - struct testQemuInfo *info, - unsigned int flags) +testCompareXMLToArgvValidateSchema(virCommand *cmd, + struct testQemuInfo *info) { g_auto(GStrv) args = NULL; - g_autoptr(virDomainObj) vm = NULL; - qemuDomainObjPrivate *priv = NULL; GHashTable *schema = NULL; - g_autoptr(virCommand) cmd = NULL; - unsigned int parseFlags = info->parseFlags; /* comment out with line comment to enable schema checking for non _CAPS tests if (!info->schemafile) @@ -580,23 +574,6 @@ testCompareXMLToArgvValidateSchema(virQEMUDriver *drv, if (!schema) return 0; - if (!(vm = virDomainObjNew(driver.xmlopt))) - return -1; - - parseFlags |= VIR_DOMAIN_DEF_PARSE_INACTIVE; - if (!(vm->def = virDomainDefParseFile(info->infile, - driver.xmlopt, - NULL, parseFlags))) - return -1; - - priv = vm->privateData; - - if (virBitmapParse("0-3", &priv->autoNodeset, 4) < 0) - return -1; - - if (!(cmd = testCompareXMLToArgvCreateArgs(drv, vm, migrateURI, info, flags))) - return -1; - if (virCommandGetArgList(cmd, &args) < 0) return -1; @@ -762,7 +739,7 @@ testCompareXMLToArgv(const void *data) goto cleanup; } - if (testCompareXMLToArgvValidateSchema(&driver, migrateURI, info, flags) < 0) + if (testCompareXMLToArgvValidateSchema(cmd, info) < 0) goto cleanup; if (virCommandToStringBuf(cmd, &actualBuf, true, false) < 0) -- 2.37.3

2 1

[RFC PATCH 0/6] qemu: add support for query-stats-schemas
by Amneesh Singh 20 Oct '22

20 Oct '22

This patch adds an API for query-stats-schemas and uses it to work with the pre-existing API for query-stats to display those stats. [1/6]: This patch adds a simple API for query-stats-schemas and an extractor function to deserialise it into a GHashTable. The GHashTable here is a pair of the name of the stat and the schema for it. Some fields in the latter like the exponent, base and bucket-size are not utilised in this patchset but they will be useful in the subsequent patches which add the support for the histograms. [2/6]: Add query-stats-schemas to the qemu capabilities. [3/6]: This patch adds the schema hashtable to the virDomainObjectPrivate. This decision was made due to QEMU upstream not having vCPUs to generate the schema, so that they could be stored as the file cache. This might be changed in the future if there is workaround upstream or if libvirt ends up using a dummy VM just to query the schema. [4/6]: This patch simply adds a utility function to traverse the schemas to find the object that corresponds to the provided QOM path. [5/6]: This patch adds vCPU stats in addition to the pre-existing ones using a helper function. Histograms are ignored for now but they will be added in the next patchset. [6/6]: This patch adds a new stat worker for QEMU called "Vm" due to the stats being for the "vm" target. It utilises the same helper function as above. Comments are much appreciated. Amneesh Singh (6): qemu_monitor: add qemuMonitorQueryStatsSchema qemu_capabilities: add "query-stats-schemas" QMP command to the QEMU capabilities qemu_domain: add statsSchema to qemuDomainObjPrivate qemu_monitor: add qemuMonitorGetStatsByQOMPath qemu_driver: add the vCPU stats by KVM to the current stats qemu_driver: add new stats worker qemuDomainGetStatsVm include/libvirt/libvirt-domain.h | 1 + src/libvirt-domain.c | 3 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 41 ++++++ src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 127 ++++++++++++++++++ src/qemu/qemu_monitor.c | 67 +++++++++ src/qemu/qemu_monitor.h | 39 ++++++ src/qemu/qemu_monitor_json.c | 93 +++++++++++++ src/qemu/qemu_monitor_json.h | 4 + .../caps_7.1.0.x86_64.xml | 1 + tools/virsh-domain-monitor.c | 7 + 13 files changed, 391 insertions(+) -- 2.37.1

3 11

[PATCH 0/3] Support only socket activation for libvirtd and virtproxyd on systemd
by Martin Kletzander 20 Oct '22

20 Oct '22

After dealing with some issues and talking to Daniel it seems we don't really need to properly support non-socket activation for all the daemons on systemd. I'm not sure how to phrase that in the documentation, but I gave it a shot. Martin Kletzander (3): docs: Specify reverting to traditional service mode more clearly virtproxyd: use Wants instead of Requires for sockets docs: Do not support non-socket activated modular daemons with systemd docs/manpages/libvirtd.rst | 10 +++++++-- docs/manpages/virtinterfaced.rst | 23 +++++++++---------- docs/manpages/virtlxcd.rst | 37 +++++++++---------------------- docs/manpages/virtnetworkd.rst | 23 +++++++++---------- docs/manpages/virtnodedevd.rst | 23 +++++++++---------- docs/manpages/virtnwfilterd.rst | 23 +++++++++---------- docs/manpages/virtproxyd.rst | 10 +++++++-- docs/manpages/virtqemud.rst | 37 +++++++++---------------------- docs/manpages/virtsecretd.rst | 23 +++++++++---------- docs/manpages/virtstoraged.rst | 23 +++++++++---------- docs/manpages/virtvboxd.rst | 38 ++++++++++---------------------- docs/manpages/virtvzd.rst | 37 +++++++++---------------------- docs/manpages/virtxend.rst | 37 +++++++++---------------------- src/remote/virtproxyd.service.in | 6 ++--- 14 files changed, 141 insertions(+), 209 deletions(-) -- 2.38.0

2 6

[PATCH] qemu_driver: Fix indentation in qemuDomainGetStatsVcpu
by Martin Kletzander 20 Oct '22

20 Oct '22

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5c7500074269..d76ab25ff240 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17979,9 +17979,9 @@ qemuDomainGetStatsVcpu(virQEMUDriver *driver G_GNUC_UNUSED, if (HAVE_JOB(privflags) && virDomainObjIsActive(dom) && qemuDomainRefreshVcpuHalted(dom, VIR_ASYNC_JOB_NONE) < 0) { - /* it's ok to be silent and go ahead, because halted vcpu info - * wasn't here from the beginning */ - virResetLastError(); + /* it's ok to be silent and go ahead, because halted vcpu info + * wasn't here from the beginning */ + virResetLastError(); } if (qemuDomainHelperGetVcpus(dom, cpuinfo, cpuwait, cpudelay, -- 2.38.0

1 0

[PATCH v4 RESEND 0/8] qemu: Enable SCHED_CORE for domains and helper processes
by Michal Privoznik 20 Oct '22

20 Oct '22

This is just a resend of: https://listman.redhat.com/archives/libvir-list/2022-August/233895.html Michal Prívozník (8): virprocess: Core Scheduling support virCommand: Introduce APIs for core scheduling qemu_conf: Introduce a knob to set SCHED_CORE qemu_domain: Introduce qemuDomainSchedCoreStart() qemu_process: Enable SCHED_CORE for QEMU process qemu: Enable SCHED_CORE for helper processes qemu: Enable SCHED_CORE for vCPUs qemu: Enable for vCPUs on hotplug src/libvirt_private.syms | 6 ++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf.in | 16 ++++ src/qemu/qemu_conf.c | 38 +++++++++ src/qemu/qemu_conf.h | 13 +++ src/qemu/qemu_domain.c | 105 ++++++++++++++++++++++++ src/qemu/qemu_domain.h | 12 +++ src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 116 ++++++++++++++++++++++++++- src/qemu/qemu_process.h | 3 +- src/qemu/qemu_security.c | 11 +++ src/qemu/qemu_virtiofs.c | 11 +++ src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/vircommand.c | 63 +++++++++++++++ src/util/vircommand.h | 5 ++ src/util/virprocess.c | 124 +++++++++++++++++++++++++++++ src/util/virprocess.h | 8 ++ 17 files changed, 531 insertions(+), 4 deletions(-) -- 2.35.1

3 13

Plans for the next release
by Jiri Denemark 19 Oct '22

19 Oct '22

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

1 1

[libvirt PATCH 0/2] fix LXC with cgroup libvirt sub-directory
by Pavel Hrdina 19 Oct '22

19 Oct '22

Pavel Hrdina (2): vircgroupmock: fix cgroup v1 mocking vircgroup: rework virCgroupNewSelf src/util/vircgroup.c | 15 ++++++++++++++- tests/vircgroupmock.c | 4 ++-- tests/vircgrouptest.c | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) -- 2.37.3

2 3

[libvirt PATCH] cputestdata: Fix test data for EPYC 7502
by Tim Wiederhake 19 Oct '22

19 Oct '22

Commit 5c17a7ba41 introduced a new feature (ibrs) but did not update existing cputestdata. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml index ca71b9efb5..82b6c1bc1a 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml @@ -5,5 +5,6 @@ <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01423408' edx='0x00000000'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> + <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x00004000' ecx='0x00000000' edx='0x00000000'/> <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000014f6'/> </cpudata> -- 2.36.1

2 1

[PATCH 0/5] qemu: Refresh rx-filters more often
by Michal Privoznik 19 Oct '22

19 Oct '22

See the last patch for explanation. I haven't found a gitlab issue for this nor a bug open. But I remember somebody complaining about problems during restore from a save file, on IRC perhaps? Michal Prívozník (5): processNicRxFilterChangedEvent: Free @guestFilter and @hostFilter automatically qemu: Move parts of NIC_RX_FILTER_CHANGED even handling into a function qemu: Acquire QUERY job instead of MODIFY when handling NIC_RX_FILTER_CHANGED event qemu: Refresh state after restore from a save image qemu: Refresh rx-filters more often src/qemu/qemu_domain.c | 254 ++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 250 +------------------------------------ src/qemu/qemu_process.c | 27 ++++ src/qemu/qemu_saveimage.c | 2 + 5 files changed, 291 insertions(+), 247 deletions(-) -- 2.37.3

2 7

[PATCH v2 0/9] qemu: tpm: Add support for migration across shared storage
by Stefan Berger 19 Oct '22

19 Oct '22

This series of patches adds support for migrating vTPMs across hosts whose storage has been set up to share the directory structure holding the state of the TPM (swtpm). A new migration flag VIR_MIGRATE_TPM_SHARED_STORAGE is added to enable this. This flag influences the management of the directory structure holding the TPM state, which for example is only removed when a domain is undefined and not when a VM is removed on the migration source host. Further, when shared storage is used then security labeling on the destination side is skipped assuming that the labeling was already done on the source side. I have tested this with an NFS setup where I had to turn SELinux off on the hosts since the SELinux MLS range labeling is not supported by NFS. Shared storage migration requires (upcoming) swtpm v0.8. Stefan Stefan Berger (9): util: Add parsing support for swtpm's cmdarg-migration capability qemu: Introduced VIR_MIGRATE_TPM_SHARED_STORAGE for TPM migration qemu: tpm: Conditionally create storage on incoming migration qemu: tpm: Pass --migration option to swtpm if supported qemu: tpm: Avoid security labels on incoming migration with shared storage qemu: tpm: Require UNDEFINE_TPM to be set to remove TPM state qemu: tpm: Determine whether to remove TPM state during migration qemu: tpm: Enable migration with VIR_MIGRATE_TPM_SHARED_STORAGE virsh: Add support for --tpm-shared-storage flag for migration docs/manpages/virsh.rst | 6 +++ include/libvirt/libvirt-domain.h | 8 +++ src/conf/domain_conf.h | 1 + src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_extdevice.c | 5 +- src/qemu/qemu_extdevice.h | 3 +- src/qemu/qemu_migration.c | 23 +++++++-- src/qemu/qemu_migration.h | 1 + src/qemu/qemu_process.c | 10 ++-- src/qemu/qemu_process.h | 6 ++- src/qemu/qemu_saveimage.c | 2 +- src/qemu/qemu_snapshot.c | 4 +- src/qemu/qemu_tpm.c | 87 ++++++++++++++++++++++++++++---- src/qemu/qemu_tpm.h | 24 ++++++++- src/util/virtpm.c | 1 + src/util/virtpm.h | 1 + tools/virsh-domain.c | 7 +++ 17 files changed, 164 insertions(+), 29 deletions(-) -- 2.37.3

3 28

[PATCH 0/3] test: Fix regression parsing nested <volume> XML
by Cole Robinson 18 Oct '22

18 Oct '22

This adds a couple extensions to the example/ testdriver XML, and fixes a regression introduced in b3e33a0ef7e Cole Robinson (3): examples: testdriver: Add xmlns runstate example examples: testdriver: Add a nested inline <volume> example test: Fix parsing nested <volume> XML examples/xml/test/testnodeinline.xml | 25 ++++++++++++++++++++++++- src/test/test_driver.c | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) -- 2.37.3

2 6

[PATCH] NEWS: Mention new channel and redirdev devices in domcaps
by Jim Fehlig 18 Oct '22

18 Oct '22

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index b6bcb5524d..cd297c4fed 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -32,6 +32,11 @@ v8.9.0 (unreleased) * Improved documentation of CPU ``usable`` attribute in domain capabilities + * Report ``channel`` and ``redirdev`` devices in domain capabilities + + The channel and redirect devices supported by the hypervisor are now + reported in domain capabilities. + * **Bug fixes** * qemu: Disable all blocker features in CPU baseline -- 2.37.3

2 1

[PATCH 00/15] schema: Fix forgotten interleaving of elements (part 1)
by Peter Krempa 17 Oct '22

17 Oct '22

Context: https://listman.redhat.com/archives/libvir-list/2022-October/234860.html This series fixes the trivial/straightforward cases found by using Daniel's "fuzzing" script. Note that you have to exclude '-invalid.xml' files and all output-only XMLs (domaincaps, capabilities). Best viewed with 'git show -w'. There's 7 more pathces needed to fix the schema to work with the above mentioned script but they have more complex interactions and I'll need to re-consider them. Peter Krempa (15): schema: domain: Allow interleaving of character device config elements schema: domain: Allow interleaving of PCI controller config elements schema: domain: Allow interleaving of 'tpm' config elements schema: domain: Allow interleaving of subelements of 'memtune' schema: domain: Allow interleaving of subelements of disk's 'mirror' schema: domain: Allow interleaving 'ip' and 'route' sub-elements of interface schema: domain: Add the 'type' subelement of the osexe case of 'os' element to interleave schema: domain: Allow interleaving of <bootloader> and <os> schema: domain: Allow interleaving of 'watchdog' subelements schema: networkport: Allow interleaving of subelements of 'owner' schema: networkport: Allow interleaving of subelements of 'driver' subelement of hostdev-pci schema: nwfilter: Allow interleaving subelements of the top level 'filter' element schema: nwfilterbinding: Allow interleaving of subelements of 'owner' element schema: storagepool: Allow interleaving of per-pool custom namespace elements schema: cpu: include 'arch' subelement in interleave definition of 'hostcpu' src/conf/schemas/cputypes.rng | 6 +- src/conf/schemas/domaincommon.rng | 813 ++++++++++++++------------- src/conf/schemas/networkport.rng | 42 +- src/conf/schemas/nwfilter.rng | 36 +- src/conf/schemas/nwfilterbinding.rng | 14 +- src/conf/schemas/storagepool.rng | 12 +- 6 files changed, 476 insertions(+), 447 deletions(-) -- 2.37.3

2 16

[libvirt PATCH] docs: formatdomain: fix since tag for TPM PCR banks
by Ján Tomko 17 Oct '22

17 Oct '22

Fixes: a5bbe1a8b6321852634817c423695e58518c4f4f Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. docs/formatdomain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 34e4906eb4..e28b805009 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -7784,7 +7784,7 @@ Example: usage of the TPM Emulator active PCR banks upon VM start but leave them at their last configuration. This attribute requires that swtpm_setup v0.7 or later is installed and may not have any effect otherwise. The selection of PCR banks only works - with the ``emulator`` backend. since:`Since 7.10.0` + with the ``emulator`` backend. :since:`Since 7.10.0` ``encryption`` The ``encryption`` element allows the state of a TPM emulator to be -- 2.37.3

1 0

[PATCH v2] capabilities: use g_autofree in capabilities.c
by Jiang Jiacheng 17 Oct '22

17 Oct '22

Use g_autofree in capabilities.c for some pointers still using manual cleanup, and remove unnecessary cleanup. Signed-off-by: Jiang Jiacheng <jiangjiacheng(a)huawei.com> --- src/conf/capabilities.c | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 1a7ebf4a13..e498c77efc 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1489,15 +1489,14 @@ virCapabilitiesGetNUMADistances(int node, virNumaDistance **distancesRet, int *ndistancesRet) { - virNumaDistance *tmp = NULL; + g_autofree virNumaDistance *tmp = NULL; int tmp_size = 0; - int ret = -1; - int *distances = NULL; + g_autofree int *distances = NULL; int ndistances = 0; size_t i; if (virNumaGetDistances(node, &distances, &ndistances) < 0) - goto cleanup; + return -1; if (!distances) { *distancesRet = NULL; @@ -1521,11 +1520,8 @@ virCapabilitiesGetNUMADistances(int node, *ndistancesRet = tmp_size; *distancesRet = g_steal_pointer(&tmp); tmp_size = 0; - ret = 0; - cleanup: - VIR_FREE(distances); - VIR_FREE(tmp); - return ret; + + return 0; } static int @@ -1533,13 +1529,12 @@ virCapabilitiesGetNUMAPagesInfo(int node, virCapsHostNUMACellPageInfo **pageinfo, int *npageinfo) { - int ret = -1; - unsigned int *pages_size = NULL; - unsigned long long *pages_avail = NULL; + g_autofree unsigned int *pages_size = NULL; + g_autofree unsigned long long *pages_avail = NULL; size_t npages, i; if (virNumaGetPages(node, &pages_size, &pages_avail, NULL, &npages) < 0) - goto cleanup; + return -1; *pageinfo = g_new0(virCapsHostNUMACellPageInfo, npages); *npageinfo = npages; @@ -1549,12 +1544,7 @@ virCapabilitiesGetNUMAPagesInfo(int node, (*pageinfo)[i].avail = pages_avail[i]; } - ret = 0; - - cleanup: - VIR_FREE(pages_avail); - VIR_FREE(pages_size); - return ret; + return 0; } @@ -2034,22 +2024,18 @@ virCapabilitiesHostNUMANewHost(void) int virCapabilitiesInitPages(virCaps *caps) { - int ret = -1; - unsigned int *pages_size = NULL; + g_autofree unsigned int *pages_size = NULL; size_t npages; if (virNumaGetPages(-1 /* Magic constant for overall info */, &pages_size, NULL, NULL, &npages) < 0) - goto cleanup; + return -1; caps->host.pagesSize = g_steal_pointer(&pages_size); caps->host.nPagesSize = npages; npages = 0; - ret = 0; - cleanup: - VIR_FREE(pages_size); - return ret; + return 0; } -- 2.33.0

2 1

[libvirt PATCH] virvhba.c: use g_autofree
by ttxine 17 Oct '22

17 Oct '22

Change strings to use g_autofree. Signed-off-by: Maxim Kostin <ttxinee(a)outlook.com> --- src/util/virvhba.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/util/virvhba.c b/src/util/virvhba.c index a4e88024d1..76c39e5f2b 100644 --- a/src/util/virvhba.c +++ b/src/util/virvhba.c @@ -49,7 +49,7 @@ bool virVHBAPathExists(const char *sysfs_prefix, int host) { - char *sysfs_path = NULL; + g_autofree char *sysfs_path = NULL; bool ret = false; sysfs_path = g_strdup_printf("%s/host%d", @@ -58,7 +58,6 @@ virVHBAPathExists(const char *sysfs_prefix, if (virFileExists(sysfs_path)) ret = true; - VIR_FREE(sysfs_path); return ret; } @@ -79,8 +78,8 @@ bool virVHBAIsVportCapable(const char *sysfs_prefix, int host) { - char *scsi_host_path = NULL; - char *fc_host_path = NULL; + g_autofree char *scsi_host_path = NULL; + g_autofree char *fc_host_path = NULL; bool ret = false; fc_host_path = g_strdup_printf("%s/host%d/%s", @@ -94,8 +93,6 @@ virVHBAIsVportCapable(const char *sysfs_prefix, if (virFileExists(fc_host_path) || virFileExists(scsi_host_path)) ret = true; - VIR_FREE(fc_host_path); - VIR_FREE(scsi_host_path); return ret; } @@ -115,9 +112,9 @@ virVHBAGetConfig(const char *sysfs_prefix, int host, const char *entry) { - char *sysfs_path = NULL; + g_autofree char *sysfs_path = NULL; char *p = NULL; - char *buf = NULL; + g_autofree char *buf = NULL; char *result = NULL; sysfs_path = g_strdup_printf("%s/host%d/%s", @@ -140,8 +137,6 @@ virVHBAGetConfig(const char *sysfs_prefix, result = g_strdup(p); cleanup: - VIR_FREE(sysfs_path); - VIR_FREE(buf); return result; } @@ -315,8 +310,8 @@ vhbaReadCompareWWN(const char *prefix, const char *f_name, const char *wwn) { - char *path; - char *buf = NULL; + g_autofree char *path = NULL; + g_autofree char *buf = NULL; char *p; int ret = -1; @@ -343,8 +338,6 @@ vhbaReadCompareWWN(const char *prefix, ret = 1; cleanup: - VIR_FREE(path); - VIR_FREE(buf); return ret; } -- 2.34.1

2 1

Re: [PATCH 2/3] qemu: get the stackManager lock before getting nested lock
by Michal Prívozník 17 Oct '22

17 Oct '22

[please keep the list on CC] On 10/15/22 13:55, Jiang Jiacheng wrote: > Thanks for your reply. > In other similar situation, we will get the StacksecurityManager lock > before get other driver's lock to keep the use of the security drivers > is internally serialized(in 'virSecurityManagerGenLabel'). > > In the functions of this patch, we haven't get the StacksecurityManager > lock but get the lock of other drivers in qemuSecurityGetBaseLabel. I > think it's the reason of this problem. > > And I think 'virSecurityManagerGetNested' is used to get a list of other > SecurityManager, i'm not sure whether we need a lock here. Yeah, we might need to rework locking a bit. Or shuffle some code around, but locking the object from outside does not feel right, since it's supposed to manage locks itself. Michal

1 0

[PATCH V3] conf: Add channel devices to domain capabilities
by Jim Fehlig 17 Oct '22

17 Oct '22

As qemu becomes more modularized, it is important for libvirt to advertise availability of the modularized functionality through capabilities. This change adds channel devices to domain capabilities, allowing clients such as virt-install to avoid using spicevmc channel devices when not supported by the target qemu. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V2: https://listman.redhat.com/archives/libvir-list/2022-October/234840.html New in V3: - rebased to current master - use existing QEMU_CAPS_SPICE for spicevmc channel device docs/formatdomaincaps.rst | 24 +++++++++++++++++++ src/conf/domain_capabilities.c | 13 ++++++++++ src/conf/domain_capabilities.h | 8 +++++++ src/conf/schemas/domaincaps.rng | 10 ++++++++ src/qemu/qemu_capabilities.c | 15 ++++++++++++ src/qemu/qemu_capabilities.h | 3 +++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 7 ++++++ .../qemu_4.2.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_4.2.0.s390x.xml | 6 +++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 7 ++++++ .../qemu_5.0.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 7 ++++++ tests/domaincapsdata/qemu_5.1.0.sparc.xml | 7 ++++++ tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 7 ++++++ .../qemu_5.2.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_5.2.0.s390x.xml | 6 +++++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 7 ++++++ .../qemu_6.0.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_6.0.0.s390x.xml | 6 +++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 7 ++++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 7 ++++++ .../qemu_6.2.0-virt.aarch64.xml | 7 ++++++ tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 7 ++++++ tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 7 ++++++ .../qemu_7.0.0-virt.aarch64.xml | 7 ++++++ tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 7 ++++++ tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 7 ++++++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 7 ++++++ tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 7 ++++++ 55 files changed, 399 insertions(+) diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index 93d36f2702..f95d3a7083 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -565,6 +565,30 @@ USB redirdev device capabilities are exposed under the ``redirdev`` element. For ``bus`` Options for the ``bus`` attribute of the ``<redirdev/>`` element. +Channel device +^^^^^^^^^^^^^^ + +Channel device capabilities are exposed under the ``channel`` element. For instance: + +:: + + <domainCapabilities> + ... + <devices> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel + ... + </devices> + </domainCapabilities> + +``type`` + Options for the ``type`` attribute of the ``<channel/>`` element. + Features ~~~~~~~~ diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index f8b2f88376..a7f256e4ec 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -574,6 +574,18 @@ virDomainCapsDeviceRedirdevFormat(virBuffer *buf, } +static void +virDomainCapsDeviceChannelFormat(virBuffer *buf, + const virDomainCapsDeviceChannel *channel) +{ + FORMAT_PROLOGUE(channel); + + ENUM_PROCESS(channel, type, virDomainChrTypeToString); + + FORMAT_EPILOGUE(channel); +} + + /** * virDomainCapsFeatureGICFormat: * @buf: target buffer @@ -688,6 +700,7 @@ virDomainCapsFormat(const virDomainCaps *caps) virDomainCapsDeviceFilesystemFormat(&buf, &caps->filesystem); virDomainCapsDeviceTPMFormat(&buf, &caps->tpm); virDomainCapsDeviceRedirdevFormat(&buf, &caps->redirdev); + virDomainCapsDeviceChannelFormat(&buf, &caps->channel); virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</devices>\n"); diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index ba7c2a5e42..e0cfa75531 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -137,6 +137,13 @@ struct _virDomainCapsDeviceRedirdev { virDomainCapsEnum bus; /* virDomainRedirdevBus */ }; +STATIC_ASSERT_ENUM(VIR_DOMAIN_CHR_TYPE_LAST); +typedef struct _virDomainCapsDeviceChannel virDomainCapsDeviceChannel; +struct _virDomainCapsDeviceChannel { + virTristateBool supported; + virDomainCapsEnum type; /* virDomainChrType */ +}; + STATIC_ASSERT_ENUM(VIR_DOMAIN_FS_DRIVER_TYPE_LAST); typedef struct _virDomainCapsDeviceFilesystem virDomainCapsDeviceFilesystem; struct _virDomainCapsDeviceFilesystem { @@ -234,6 +241,7 @@ struct _virDomainCaps { virDomainCapsDeviceFilesystem filesystem; virDomainCapsDeviceTPM tpm; virDomainCapsDeviceRedirdev redirdev; + virDomainCapsDeviceChannel channel; /* add new domain devices here */ virDomainCapsFeatureGIC gic; diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.rng index cf7a1d1d89..a6747b20ef 100644 --- a/src/conf/schemas/domaincaps.rng +++ b/src/conf/schemas/domaincaps.rng @@ -201,6 +201,9 @@ <optional> <ref name="redirdev"/> </optional> + <optional> + <ref name="channel"/> + </optional> </element> </define> @@ -260,6 +263,13 @@ </element> </define> + <define name="channel"> + <element name="channel"> + <ref name="supported"/> + <ref name="enum"/> + </element> + </define> + <define name="features"> <element name="features"> <optional> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 40da6f1b50..0f34957998 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6347,6 +6347,19 @@ virQEMUCapsFillDomainDeviceRedirdevCaps(virQEMUCaps *qemuCaps, } +void +virQEMUCapsFillDomainDeviceChannelCaps(virQEMUCaps *qemuCaps, + virDomainCapsDeviceChannel *channel) +{ + channel->supported = VIR_TRISTATE_BOOL_YES; + channel->type.report = true; + VIR_DOMAIN_CAPS_ENUM_SET(channel->type, + VIR_DOMAIN_CHR_TYPE_PTY, VIR_DOMAIN_CHR_TYPE_UNIX); + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE)) + VIR_DOMAIN_CAPS_ENUM_SET(channel->type, VIR_DOMAIN_CHR_TYPE_SPICEVMC); +} + /** * virQEMUCapsSupportsGICVersion: @@ -6484,6 +6497,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virDomainCapsDeviceFilesystem *filesystem = &domCaps->filesystem; virDomainCapsDeviceTPM *tpm = &domCaps->tpm; virDomainCapsDeviceRedirdev *redirdev = &domCaps->redirdev; + virDomainCapsDeviceChannel *channel = &domCaps->channel; virDomainCapsMemoryBacking *memoryBacking = &domCaps->memoryBacking; virQEMUCapsFillDomainFeaturesFromQEMUCaps(qemuCaps, domCaps); @@ -6517,6 +6531,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virQEMUCapsFillDomainDeviceFSCaps(qemuCaps, filesystem); virQEMUCapsFillDomainDeviceTPMCaps(qemuCaps, tpm); virQEMUCapsFillDomainDeviceRedirdevCaps(qemuCaps, redirdev); + virQEMUCapsFillDomainDeviceChannelCaps(qemuCaps, channel); virQEMUCapsFillDomainFeatureGICCaps(qemuCaps, domCaps); virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps); virQEMUCapsFillDomainFeatureS390PVCaps(qemuCaps, domCaps); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 051bfbc0a1..4edbb5d40f 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -833,6 +833,9 @@ void virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps, void virQEMUCapsFillDomainDeviceRedirdevCaps(virQEMUCaps *qemuCaps, virDomainCapsDeviceRedirdev *redirdev); +void virQEMUCapsFillDomainDeviceChannelCaps(virQEMUCaps *qemuCaps, + virDomainCapsDeviceChannel *channel); + bool virQEMUCapsGuestIsNative(virArch host, virArch guest); diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml index 5b83883e39..def80fe8cd 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -221,6 +221,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml index ab55ec2452..9e920d1ccb 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -236,6 +236,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml index e0af576d5c..776173e60e 100644 --- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml @@ -166,6 +166,12 @@ </filesystem> <tpm supported='no'/> <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml index 61839a1983..b6711fc3a4 100644 --- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml @@ -164,6 +164,12 @@ </filesystem> <tpm supported='no'/> <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml index 1626d9b186..88790451b0 100644 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml @@ -137,6 +137,12 @@ </enum> </tpm> <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml index ee07f4c274..fa416af038 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -243,6 +243,12 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml index a6eaf7962f..ed9de89dfa 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -221,6 +221,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml index 232f1f0e12..af0335eb3a 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -223,6 +223,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml index ce2c08f205..fc09e9ff28 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -238,6 +238,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml index 9215371d0c..88bc77f50b 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -178,6 +178,12 @@ </enum> </tpm> <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml index fcc77ad8db..5e030047d1 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -176,6 +176,12 @@ </enum> </tpm> <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml index 711ccc2cb0..0c5aaade40 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -143,6 +143,12 @@ </enum> </tpm> <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml index f52613f584..5b2a0bc83d 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -223,6 +223,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml index 542d32b018..fb9f69bb9a 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -224,6 +224,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml index 8bd5c6073c..ea31348ab1 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -238,6 +238,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsdata/qemu_5.1.0.sparc.xml index ea4d1d28dd..5bbf4720dc 100644 --- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml +++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml @@ -110,6 +110,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml index 5c48efc8c6..584dad5a89 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -224,6 +224,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 70c4f3cbd1..f1d20991e9 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -224,6 +224,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index 636a84e55f..cec260f56d 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -238,6 +238,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml index 900d10f720..be7262211c 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -178,6 +178,12 @@ </enum> </tpm> <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml index fcc77ad8db..5e030047d1 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -176,6 +176,12 @@ </enum> </tpm> <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml index 99c2767276..9367738157 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -143,6 +143,12 @@ </enum> </tpm> <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml index bdade9c5bb..adc197648f 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -245,6 +245,12 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index db22085e31..a3707e6804 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -224,6 +224,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index 395eb3b9eb..7edb84e9bc 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -226,6 +226,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index 769a1147b6..cc0bfcac2d 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -240,6 +240,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml index 2f56e36c28..db9b45d74e 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -180,6 +180,12 @@ </enum> </tpm> <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml index 4639a84c1d..1a65156544 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -178,6 +178,12 @@ </enum> </tpm> <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml index 25abcac608..56d87f7a2f 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -246,6 +246,12 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 2be8f3e33b..3afab2f4c2 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -226,6 +226,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index f23e758b1a..d0dbadd6d3 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -227,6 +227,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index f78abdefc5..52071fc2c5 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -240,6 +240,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 9de18c682e..17c30b394d 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -227,6 +227,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index dff92d65aa..c185ae4510 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -227,6 +227,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index f027eb25a5..7bebc1f8b2 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -241,6 +241,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml index c572b0481c..3d79cd7486 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -186,6 +186,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml index eb521a0cfa..4ccffb3695 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -184,6 +184,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml index 7797b94cf2..ba7bc17a98 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -142,6 +142,12 @@ </enum> </tpm> <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index aff2ee6662..ba40728489 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -227,6 +227,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index e70b0990a7..94c6f3d712 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -228,6 +228,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 03c5411c4e..c6a02b6512 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -242,6 +242,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml index 59f89afd9b..3addb1fc57 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -185,6 +185,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml index 1e6bf544dc..9f07a10a90 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -183,6 +183,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml index 76da1f4f7d..ed6c74aac1 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -147,6 +147,12 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index da23f5703a..5913f44937 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -228,6 +228,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 05b36ee79e..2d76581915 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -227,6 +227,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index 0786cd8430..c0b59c0d44 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -240,6 +240,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml index d430e54caa..a5c2d8e598 100644 --- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml @@ -140,6 +140,12 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index ae67a16947..a419005ee3 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -227,6 +227,13 @@ <value>usb</value> </enum> </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + <value>spicevmc</value> + </enum> + </channel> </devices> <features> <gic supported='no'/> -- 2.37.3

2 1

[PATCH V2 0/3] domain capabilites improvements
by Jim Fehlig 17 Oct '22

17 Oct '22

A V2 of https://listman.redhat.com/archives/libvir-list/2022-September/234189.html Although not much has changed beyond a rebase to current master Jim Fehlig (3): conf: Add USB redirect devices to domain capabilities conf: Add channel devices to domain capabilities qemu: Use command line to properly check for spice support docs/formatdomaincaps.rst | 46 +++++++++++++++++++ src/conf/domain_capabilities.c | 26 +++++++++++ src/conf/domain_capabilities.h | 16 +++++++ src/conf/schemas/domaincaps.rng | 20 ++++++++ src/qemu/qemu_capabilities.c | 35 +++++++++++++- src/qemu/qemu_capabilities.h | 6 +++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 12 +++++ .../qemu_4.2.0-virt.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 7 +++ tests/domaincapsdata/qemu_4.2.0.s390x.xml | 11 +++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 12 +++++ .../qemu_5.0.0-virt.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 7 +++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 12 +++++ tests/domaincapsdata/qemu_5.1.0.sparc.xml | 12 +++++ tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 12 +++++ .../qemu_5.2.0-virt.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 7 +++ tests/domaincapsdata/qemu_5.2.0.s390x.xml | 11 +++++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 12 +++++ .../qemu_6.0.0-virt.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 7 +++ tests/domaincapsdata/qemu_6.0.0.s390x.xml | 11 +++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 12 +++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 12 +++++ .../qemu_6.2.0-virt.aarch64.xml | 12 +++++ tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 12 +++++ tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 7 +++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 12 +++++ .../qemu_7.0.0-virt.aarch64.xml | 12 +++++ tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 12 +++++ tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 11 +++++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 12 +++++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 12 +++++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 12 +++++ .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.aarch64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + .../caps_7.1.0.x86_64.xml | 1 + 68 files changed, 674 insertions(+), 1 deletion(-) -- 2.37.3

2 12

[PATCH 0/2] qemu: Create base hugepages path on memory hotplug
by Michal Privoznik 15 Oct '22

15 Oct '22

*** BLURB HERE *** Michal Prívozník (2): qemu: Separate out hugepages basedir making qemu: Create base hugepages path on memory hotplug src/qemu/qemu_conf.c | 27 +++++++++++++++++++++++++++ src/qemu/qemu_conf.h | 3 +++ src/qemu/qemu_driver.c | 17 +---------------- src/qemu/qemu_process.c | 4 ++++ 4 files changed, 35 insertions(+), 16 deletions(-) -- 2.35.1

2 4

[PATCH] qemu: validate: Clarify error messages for unsupported 3d video acceleration
by Peter Krempa 14 Oct '22

14 Oct '22

The error message doesn't really convey the information that 3d acceleration works only for the 'virtio' model and similarly the same error would be reported if qemu doesn't support acceleration, which is hard to debug. Split and clarify the errors. Noticed in https://gitlab.com/libvirt/libvirt/-/issues/388 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_validate.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index cb4e32c0ff..079009ea4b 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2765,15 +2765,20 @@ qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video, return -1; } } else if (video->accel) { - if (video->accel->accel3d == VIR_TRISTATE_BOOL_YES && - (video->type != VIR_DOMAIN_VIDEO_TYPE_VIRTIO || - !(virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL) || - virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_GL_PCI) || - virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_VGA_GL)))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("%s 3d acceleration is not supported"), - virDomainVideoTypeToString(video->type)); - return -1; + if (video->accel->accel3d == VIR_TRISTATE_BOOL_YES) { + if (video->type != VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("3d acceleration is supported only with 'virtio' video device")); + return -1; + } + + if (!(virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_GL_PCI) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_VGA_GL))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("3d acceleration is not supported by this QEMU binary")); + return -1; + } } } -- 2.37.3

2 1