- Devel - libvirt List Archives

[libvirt PATCH] qemu_snapshot: fix snapshot deletion that had multiple children
by Pavel Hrdina 16 Nov '23

16 Nov '23

When we revert to non-leaf snapshot and create new branch or branches the overlay in snapshot metadata is no longer usable as a disk source for deletion of that snapshot. We need to use other places to figure out the correct storage source. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/534 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_snapshot.c | 46 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 1962ba4027..ee06e72b11 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2748,6 +2748,44 @@ qemuSnapshotGetDisksWithBackingStore(virDomainObj *vm, } +/** + * qemuSnapshotExternalGetSnapDiskSrc: + * @vm: domain object + * @snap: snapshot object + * @snapDisk: disk definition from snapshost + * + * Try to get actual disk source for @snapDisk as the source stored in + * snapshot metadata is not always the correct source we need to work with. + * This happens mainly after reverting to non-leaf snapshot and creating + * new branch with new snapshot. + * + * Returns disk source on success, NULL on error. + */ +static virStorageSource * +qemuSnapshotExternalGetSnapDiskSrc(virDomainObj *vm, + virDomainMomentObj *snap, + virDomainSnapshotDiskDef *snapDisk) +{ + virDomainDiskDef *disk = NULL; + + /* Should never happen when deleting external snapshot as for now we do + * not support this specific case for now. */ + if (snap->nchildren > 1) + return snapDisk->src; + + if (snap->first_child) { + disk = qemuDomainDiskByName(snap->first_child->def->dom, snapDisk->name); + } else if (virDomainSnapshotGetCurrent(vm->snapshots) == snap) { + disk = qemuDomainDiskByName(vm->def, snapDisk->name); + } + + if (disk) + return disk->src; + + return snapDisk->src; +} + + /** * qemuSnapshotDeleteExternalPrepareData: * @vm: domain object @@ -2802,18 +2840,22 @@ qemuSnapshotDeleteExternalPrepareData(virDomainObj *vm, } if (data->merge) { + virStorageSource *snapDiskSrc = NULL; + data->domDisk = qemuDomainDiskByName(vm->def, snapDisk->name); if (!data->domDisk) return -1; + snapDiskSrc = qemuSnapshotExternalGetSnapDiskSrc(vm, snap, data->snapDisk); + if (virDomainObjIsActive(vm)) { data->diskSrc = virStorageSourceChainLookupBySource(data->domDisk->src, - data->snapDisk->src, + snapDiskSrc, &data->prevDiskSrc); if (!data->diskSrc) return -1; - if (!virStorageSourceIsSameLocation(data->diskSrc, data->snapDisk->src)) { + if (!virStorageSourceIsSameLocation(data->diskSrc, snapDiskSrc)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("VM disk source and snapshot disk source are not the same")); return -1; -- 2.41.0

2 1

[libvirt PATCH 0/3] Introduce VIR_MIGRATE_ASSUME_SHARED_STORAGE
by Andrea Bolognani 13 Nov '23

13 Nov '23

This was initially motivated by a KubeVirt issue[1] concerning integration with the Portworx storage provide, but it turns out to be more generally applicable: since mounting an NFS share on the same host that is exporting it is known to cause issues and is therefore not recommended, we need a way to allow migration in such a configuration while still not going quite as far as VIR_MIGRATE_UNSAFE does and losing all handrails. [1] https://issues.redhat.com/browse/CNV-34322 Andrea Bolognani (3): include: Introduce VIR_MIGRATE_ASSUME_SHARED_STORAGE qemu: Implement VIR_MIGRATE_ASSUME_SHARED_STORAGE support virsh: Wire up VIR_MIGRATE_ASSUME_SHARED_STORAGE support docs/manpages/virsh.rst | 5 ++++- include/libvirt/libvirt-domain.h | 14 ++++++++++++++ src/qemu/qemu_migration.c | 5 +++++ src/qemu/qemu_migration.h | 1 + tools/virsh-domain.c | 5 +++++ 5 files changed, 29 insertions(+), 1 deletion(-) -- 2.41.0

3 11

[v2 0/4] Support for dirty-limit live migration
by Hyman Huang 12 Nov '23

12 Nov '23

Hello, this is series version 2. Just certain that it won't be overlooked. Please review, thanks, Yong v2: - rebase on master v1: In qemu>=8.1, the dirty-limit functionality for live migration was included. In the live migration scenario, it implements the force convergence using the dirty-limit approach, which results in better reliable read performance. A straightforward dirty-limit capability for live migration is added by this patchset. Users might not care about other dirty-limit arguments like "x-vcpu-dirty-limit-period" or "vcpu-dirty-limit," thus do not expose them to Libvirt and leave the default settings in place. values as default. For more details about dirty-limit. please see the following reference: https://lore.kernel.org/qemu- devel/169024923116.19090.10825599068950039132-0(a)git.sr.ht/ Hyman Huang (4): Add VIR_MIGRATE_DIRTY_LIMIT flag qemu_migration: Implement VIR_MIGRATE_DIRTY_LIMIT flag virsh: Add support for VIR_MIGRATE_DIRTY_LIMIT flag NEWS: document support for dirty-limit live migration NEWS.rst | 8 ++++++++ docs/manpages/virsh.rst | 10 +++++++++- include/libvirt/libvirt-domain.h | 5 +++++ src/libvirt-domain.c | 8 ++++++++ src/qemu/qemu_migration.c | 8 ++++++++ src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_params.c | 6 ++++++ src/qemu/qemu_migration_params.h | 1 + tools/virsh-domain.c | 10 ++++++++++ 9 files changed, 56 insertions(+), 1 deletion(-) -- 2.39.1

1 4

[libvirt PATCH 00/19] RFC: Add versioned CPUs to libvirt
by Jonathon Jongsma 10 Nov '23

10 Nov '23

This is not necessarily intended as a finished proposal, but as a discussion starter. I mentioned in an email last week that for SEV-SNP support we will need to be able to specify versioned CPU models that are not yet supported by libvirt. Rather than just adding a versioned CPU or two that would satisfy my immediate need, I decided to try to add versioned CPUs in a standard way. This involves adding the concept of an 'alias' for a CPU model in libvirt. Qemu already has the concept of a CPU alias for a versioned CPU. In fact, libvirt already provides a select subset of these as configurable CPU models (e.g. 'EPYC-IBPB'). After this patchset, these aliased CPU versions would be configurable by either their versioned name ('EPYC-v2') or their alias ('EPYC-IBPB'). And it would also provide non-aliased CPU versions as options within libvirt ('EPYC-v4'). Assuming that we want to offer all versioned CPUs like this, there are two approaches to naming. I chose to maintain the existing names (e.g. EPYC-IBPB) as the primary name where available, and use the versioned name (EPYC-v2) as the alias. However, some CPU models don't have an alias, so their versioned name would be their primary name. So we have the following set of 'EPYC' CPU models: - EPYC (alias = EPYC-v1) - EPYC-IBPB (alias = EPYC-v2) - EPYC-v3 (no alias) - EPYC-v4 (no alias) An alternative approach is something more like: - EPYC-v1 (alias = EPYC) - EPYC-v2 (alias = EPYC-IBPB) - EPYC-v3 (no alias) - EPYC-v4 (no alias) The naming of the second set is more consistent, but it could result in slight changes to behavior. For example, any call to cpuDecode() that returned EPYC-IBPB in the past might now return EPYC-v2. These two CPUs are just two different names for the same model, so I'm not sure it would result in any issues. But in this patch series I went with the first approach since it maintained stability and resulted in less churn in the test output. Note also that there are a couple of patches that update existing CPU models by re-running this script against the current qemu source code. For example, the patch "cpu_map: Update EPYC cpu definitions from qemu" results in some minor changes to the existing EPYC CPUs by adding a couple of feature flags. In theory, it seems like a good idea for our libvirt models to match how the model is defined in qemu, but I admit that I don't have a great understanding of whether this will result in undesirable side-effects. I'm hoping those of you with deeper knowledge will tell me why this is or is not a good idea. In the same vein, I've included the last patch of the series showing what it would look like if we regenerated all of the other CPU definitions from the qemu source code. Jonathon Jongsma (19): cpu_map: update script to generate versioned CPUs cpu: handle aliases in CPU definitions cpu_map: Update EPYC cpu definitions from qemu cpu_map: Add versioned EPYC CPUs cpu_map: Add versioned Intel Nehalem CPUs cpu_map: Add versioned Intel Westmere CPUs cpu_map: Add versioned Intel SandyBridge CPUs cpu_map: Add versioned Intel IvyBridge CPUs cpu_map: Add versioned Intel Haswell CPUs cpu_map: Add versioned Intel Broadwell CPUs cpu_map: Add versioned Intel Skylake CPUs cpu_map: Add versioned Intel Cascadelake CPUs cpu_map: Add versioned Intel Icelake CPUs cpu_map: Add versioned Intel Cooperlake CPUs cpu_map: Add versioned Intel Snowridge CPUs cpu_map: Add versioned Intel SapphireRapids CPUs cpu_map: Add versioned Dhyana CPUs cpu: advertise CPU aliases NOMERGE: RFC: regenerate all cpu definitions src/cpu/cpu_x86.c | 88 ++++++++---- src/cpu_map/index.xml | 22 +++ src/cpu_map/meson.build | 22 +++ src/cpu_map/sync_qemu_models_i386.py | 44 ++++-- src/cpu_map/x86_Broadwell-IBRS.xml | 19 ++- src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 19 ++- src/cpu_map/x86_Broadwell-noTSX.xml | 19 ++- src/cpu_map/x86_Broadwell.xml | 18 ++- src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 19 ++- src/cpu_map/x86_Cascadelake-Server-v2.xml | 93 +++++++++++++ src/cpu_map/x86_Cascadelake-Server-v4.xml | 91 +++++++++++++ src/cpu_map/x86_Cascadelake-Server-v5.xml | 92 +++++++++++++ src/cpu_map/x86_Cascadelake-Server.xml | 11 +- src/cpu_map/x86_Cooperlake-v2.xml | 98 ++++++++++++++ src/cpu_map/x86_Cooperlake.xml | 9 +- src/cpu_map/x86_Dhyana-v2.xml | 81 ++++++++++++ src/cpu_map/x86_Dhyana.xml | 13 +- src/cpu_map/x86_EPYC-Genoa.xml | 7 + src/cpu_map/x86_EPYC-IBPB.xml | 14 +- src/cpu_map/x86_EPYC-Milan-v2.xml | 108 +++++++++++++++ src/cpu_map/x86_EPYC-Milan.xml | 8 ++ src/cpu_map/x86_EPYC-Rome-v2.xml | 93 +++++++++++++ src/cpu_map/x86_EPYC-Rome-v3.xml | 95 +++++++++++++ src/cpu_map/x86_EPYC-Rome-v4.xml | 94 +++++++++++++ src/cpu_map/x86_EPYC-Rome.xml | 9 ++ src/cpu_map/x86_EPYC-v3.xml | 87 ++++++++++++ src/cpu_map/x86_EPYC-v4.xml | 88 ++++++++++++ src/cpu_map/x86_EPYC.xml | 13 +- src/cpu_map/x86_Haswell-IBRS.xml | 20 ++- src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 20 ++- src/cpu_map/x86_Haswell-noTSX.xml | 20 ++- src/cpu_map/x86_Haswell.xml | 18 ++- src/cpu_map/x86_Icelake-Server-noTSX.xml | 14 +- src/cpu_map/x86_Icelake-Server-v3.xml | 103 +++++++++++++++ src/cpu_map/x86_Icelake-Server-v4.xml | 108 +++++++++++++++ src/cpu_map/x86_Icelake-Server-v5.xml | 109 +++++++++++++++ src/cpu_map/x86_Icelake-Server-v6.xml | 109 +++++++++++++++ src/cpu_map/x86_Icelake-Server.xml | 11 +- src/cpu_map/x86_IvyBridge-IBRS.xml | 13 +- src/cpu_map/x86_IvyBridge.xml | 12 +- src/cpu_map/x86_Nehalem-IBRS.xml | 14 +- src/cpu_map/x86_Nehalem.xml | 13 +- src/cpu_map/x86_SandyBridge-IBRS.xml | 14 +- src/cpu_map/x86_SandyBridge.xml | 13 +- src/cpu_map/x86_SapphireRapids-v2.xml | 125 ++++++++++++++++++ src/cpu_map/x86_SapphireRapids.xml | 7 + src/cpu_map/x86_Skylake-Client-IBRS.xml | 16 ++- src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 18 +-- src/cpu_map/x86_Skylake-Client-v4.xml | 77 +++++++++++ src/cpu_map/x86_Skylake-Client.xml | 15 ++- src/cpu_map/x86_Skylake-Server-IBRS.xml | 12 +- src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 14 +- src/cpu_map/x86_Skylake-Server-v4.xml | 83 ++++++++++++ src/cpu_map/x86_Skylake-Server-v5.xml | 85 ++++++++++++ src/cpu_map/x86_Skylake-Server.xml | 12 +- src/cpu_map/x86_Snowridge-v2.xml | 78 +++++++++++ src/cpu_map/x86_Snowridge-v3.xml | 80 +++++++++++ src/cpu_map/x86_Snowridge-v4.xml | 78 +++++++++++ src/cpu_map/x86_Snowridge.xml | 10 +- src/cpu_map/x86_Westmere-IBRS.xml | 13 +- src/cpu_map/x86_Westmere.xml | 14 +- ...4-baseline-Westmere+Nehalem-migratable.xml | 4 +- ...86_64-baseline-Westmere+Nehalem-result.xml | 4 +- .../x86_64-baseline-features-expanded.xml | 1 + .../x86_64-baseline-features-result.xml | 2 - .../x86_64-baseline-simple-expanded.xml | 3 + .../x86_64-cpuid-Atom-P5362-guest.xml | 3 +- .../x86_64-cpuid-Atom-P5362-host.xml | 3 - .../x86_64-cpuid-Atom-P5362-json.xml | 3 +- .../x86_64-cpuid-Cooperlake-host.xml | 3 +- .../x86_64-cpuid-Core-i5-2500-guest.xml | 3 - .../x86_64-cpuid-Core-i5-2500-host.xml | 3 - .../x86_64-cpuid-Core-i5-2500-json.xml | 3 - .../x86_64-cpuid-Core-i5-2540M-guest.xml | 3 - .../x86_64-cpuid-Core-i5-2540M-host.xml | 3 - .../x86_64-cpuid-Core-i5-2540M-json.xml | 3 - .../x86_64-cpuid-Core-i5-4670T-guest.xml | 6 +- .../x86_64-cpuid-Core-i5-4670T-host.xml | 19 ++- .../x86_64-cpuid-Core-i5-4670T-json.xml | 6 +- .../x86_64-cpuid-Core-i5-650-guest.xml | 3 - .../x86_64-cpuid-Core-i5-650-host.xml | 3 - .../x86_64-cpuid-Core-i5-650-json.xml | 3 - .../x86_64-cpuid-Core-i5-6600-guest.xml | 1 + .../x86_64-cpuid-Core-i5-6600-host.xml | 1 + .../x86_64-cpuid-Core-i5-6600-json.xml | 1 + .../x86_64-cpuid-Core-i7-2600-guest.xml | 3 - .../x86_64-cpuid-Core-i7-2600-host.xml | 3 - .../x86_64-cpuid-Core-i7-2600-json.xml | 3 - ...6_64-cpuid-Core-i7-2600-xsaveopt-guest.xml | 2 - ...86_64-cpuid-Core-i7-2600-xsaveopt-host.xml | 9 +- ...86_64-cpuid-Core-i7-2600-xsaveopt-json.xml | 2 - .../x86_64-cpuid-Core-i7-3520M-guest.xml | 2 - .../x86_64-cpuid-Core-i7-3520M-host.xml | 2 - .../x86_64-cpuid-Core-i7-3740QM-guest.xml | 2 +- .../x86_64-cpuid-Core-i7-3740QM-host.xml | 13 +- .../x86_64-cpuid-Core-i7-3740QM-json.xml | 2 +- .../x86_64-cpuid-Core-i7-3770-guest.xml | 2 - .../x86_64-cpuid-Core-i7-3770-host.xml | 2 - .../x86_64-cpuid-Core-i7-3770-json.xml | 2 +- .../x86_64-cpuid-Core-i7-4510U-guest.xml | 6 - .../x86_64-cpuid-Core-i7-4510U-host.xml | 3 - .../x86_64-cpuid-Core-i7-4510U-json.xml | 6 - .../x86_64-cpuid-Core-i7-4600U-guest.xml | 6 - .../x86_64-cpuid-Core-i7-4600U-host.xml | 6 - .../x86_64-cpuid-Core-i7-4600U-json.xml | 6 - .../x86_64-cpuid-Core-i7-5600U-arat-guest.xml | 6 - .../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 6 - .../x86_64-cpuid-Core-i7-5600U-arat-json.xml | 6 +- .../x86_64-cpuid-Core-i7-5600U-guest.xml | 6 - .../x86_64-cpuid-Core-i7-5600U-host.xml | 6 - .../x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml | 6 - .../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 6 - .../x86_64-cpuid-Core-i7-5600U-ibrs-json.xml | 6 - .../x86_64-cpuid-Core-i7-5600U-json.xml | 6 - .../x86_64-cpuid-Core-i7-7600U-guest.xml | 1 + .../x86_64-cpuid-Core-i7-7600U-host.xml | 1 + .../x86_64-cpuid-Core-i7-7600U-json.xml | 1 + .../x86_64-cpuid-Core-i7-7700-guest.xml | 1 + .../x86_64-cpuid-Core-i7-7700-host.xml | 1 + .../x86_64-cpuid-Core-i7-7700-json.xml | 1 + .../x86_64-cpuid-Core-i7-8550U-guest.xml | 5 +- .../x86_64-cpuid-Core-i7-8550U-host.xml | 4 +- .../x86_64-cpuid-Core-i7-8550U-json.xml | 5 +- .../x86_64-cpuid-Core-i7-8700-guest.xml | 1 + .../x86_64-cpuid-Core-i7-8700-host.xml | 1 + .../x86_64-cpuid-Core-i7-8700-json.xml | 1 + .../x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 1 - .../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 5 +- .../x86_64-cpuid-EPYC-7502-32-Core-json.xml | 1 - .../x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 9 +- .../x86_64-cpuid-EPYC-7601-32-Core-host.xml | 2 - ..._64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml | 2 - ...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 8 +- ...6_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml | 3 - .../x86_64-cpuid-EPYC-7601-32-Core-json.xml | 3 - ..._64-cpuid-Hygon-C86-7185-32-core-guest.xml | 5 +- ...6_64-cpuid-Hygon-C86-7185-32-core-host.xml | 5 +- ...6_64-cpuid-Hygon-C86-7185-32-core-json.xml | 3 - .../x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 + .../x86_64-cpuid-Ice-Lake-Server-host.xml | 1 + .../x86_64-cpuid-Ice-Lake-Server-json.xml | 2 +- .../x86_64-cpuid-Pentium-P6100-guest.xml | 10 +- ...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 9 +- ...64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 2 - ...64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml | 3 - ...6_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml | 1 - ...86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 1 - ...86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml | 1 - .../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml | 1 + .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 1 + .../x86_64-cpuid-Xeon-E3-1225-v5-json.xml | 1 + .../x86_64-cpuid-Xeon-E3-1245-v5-guest.xml | 1 + .../x86_64-cpuid-Xeon-E3-1245-v5-host.xml | 1 + .../x86_64-cpuid-Xeon-E3-1245-v5-json.xml | 1 + .../x86_64-cpuid-Xeon-E5-2609-v3-guest.xml | 6 - .../x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 6 - .../x86_64-cpuid-Xeon-E5-2609-v3-json.xml | 6 - .../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml | 6 - .../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 6 - .../x86_64-cpuid-Xeon-E5-2623-v4-json.xml | 6 - .../x86_64-cpuid-Xeon-E5-2630-v3-guest.xml | 6 - .../x86_64-cpuid-Xeon-E5-2630-v3-host.xml | 6 - .../x86_64-cpuid-Xeon-E5-2630-v3-json.xml | 6 +- .../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml | 6 - .../x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 6 - .../x86_64-cpuid-Xeon-E5-2630-v4-json.xml | 6 - .../x86_64-cpuid-Xeon-E5-2650-guest.xml | 3 - .../x86_64-cpuid-Xeon-E5-2650-host.xml | 3 - .../x86_64-cpuid-Xeon-E5-2650-json.xml | 3 - .../x86_64-cpuid-Xeon-E5-2650-v3-guest.xml | 6 - .../x86_64-cpuid-Xeon-E5-2650-v3-host.xml | 6 - .../x86_64-cpuid-Xeon-E5-2650-v3-json.xml | 6 +- .../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml | 6 - .../x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 6 - .../x86_64-cpuid-Xeon-E5-2650-v4-json.xml | 6 - .../x86_64-cpuid-Xeon-E7-4820-guest.xml | 3 - .../x86_64-cpuid-Xeon-E7-4820-host.xml | 3 - .../x86_64-cpuid-Xeon-E7-4820-json.xml | 4 +- .../x86_64-cpuid-Xeon-E7-4830-guest.xml | 3 - .../x86_64-cpuid-Xeon-E7-4830-host.xml | 3 - .../x86_64-cpuid-Xeon-E7-4830-json.xml | 3 - .../x86_64-cpuid-Xeon-E7-8890-v3-guest.xml | 6 - .../x86_64-cpuid-Xeon-E7-8890-v3-host.xml | 6 - .../x86_64-cpuid-Xeon-E7-8890-v3-json.xml | 6 - .../x86_64-cpuid-Xeon-E7540-guest.xml | 1 - .../x86_64-cpuid-Xeon-E7540-host.xml | 1 - .../x86_64-cpuid-Xeon-E7540-json.xml | 1 - .../x86_64-cpuid-Xeon-Gold-5115-guest.xml | 2 +- .../x86_64-cpuid-Xeon-Gold-5115-host.xml | 2 +- .../x86_64-cpuid-Xeon-Gold-5115-json.xml | 2 + .../x86_64-cpuid-Xeon-Gold-6130-guest.xml | 2 +- .../x86_64-cpuid-Xeon-Gold-6130-host.xml | 2 +- .../x86_64-cpuid-Xeon-Gold-6130-json.xml | 2 +- .../x86_64-cpuid-Xeon-Gold-6148-guest.xml | 3 +- .../x86_64-cpuid-Xeon-Gold-6148-host.xml | 3 +- .../x86_64-cpuid-Xeon-Gold-6148-json.xml | 3 +- .../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-8268-json.xml | 2 +- .../x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 9 +- .../x86_64-cpuid-Xeon-W3520-guest.xml | 1 - .../x86_64-cpuid-Xeon-W3520-host.xml | 1 - .../x86_64-cpuid-Xeon-W3520-json.xml | 1 - ...id-baseline-Broadwell-IBRS+Cascadelake.xml | 6 - ..._64-cpuid-baseline-Cascadelake+Icelake.xml | 9 +- ...puid-baseline-Cascadelake+Skylake-IBRS.xml | 2 +- ..._64-cpuid-baseline-Cascadelake+Skylake.xml | 3 +- ...-cpuid-baseline-Cooperlake+Cascadelake.xml | 9 +- ...6_64-cpuid-baseline-Cooperlake+Icelake.xml | 9 +- .../x86_64-cpuid-baseline-EPYC+Rome.xml | 3 - .../x86_64-cpuid-baseline-Haswell+Skylake.xml | 6 - ...-baseline-Haswell-noTSX-IBRS+Broadwell.xml | 6 - ...seline-Haswell-noTSX-IBRS+Skylake-IBRS.xml | 6 - ...id-baseline-Haswell-noTSX-IBRS+Skylake.xml | 6 - .../x86_64-cpuid-baseline-Ryzen+Rome.xml | 3 - ...4-cpuid-baseline-Skylake-Client+Server.xml | 1 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 33 +++++ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 32 +++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 33 +++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 37 ++++++ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 36 +++++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 37 ++++++ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 40 +++++- .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 39 ++++++ tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 40 +++++- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 40 +++++- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 39 ++++++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 40 +++++- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 42 +++++- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 41 ++++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 42 +++++- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 49 ++++++- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 48 +++++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 49 ++++++- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 50 ++++++- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 49 +++++++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 50 ++++++- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 51 ++++++- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 50 +++++++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 51 ++++++- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 51 ++++++- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 50 +++++++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 51 ++++++- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 51 ++++++- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 51 ++++++- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 51 ++++++- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 51 ++++++- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 52 +++++++- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 52 +++++++- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 52 +++++++- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 61 ++++++++- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 57 +++++++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 61 ++++++++- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 61 ++++++++- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 57 +++++++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 61 ++++++++- ...-Icelake-Server-pconfig.x86_64-latest.args | 2 +- .../cpu-fallback.x86_64-5.2.0.args | 2 +- .../cpu-fallback.x86_64-8.0.0.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.xml | 1 - .../cpu-host-model-fallback.x86_64-7.2.0.args | 2 +- .../cpu-host-model-fallback.x86_64-8.0.0.args | 2 +- ...cpu-host-model-fallback.x86_64-latest.args | 2 +- ...pu-host-model-nofallback.x86_64-7.2.0.args | 2 +- ...pu-host-model-nofallback.x86_64-8.0.0.args | 2 +- ...u-host-model-nofallback.x86_64-latest.args | 2 +- .../cpu-host-model.x86_64-4.2.0.args | 2 +- .../cpu-host-model.x86_64-5.0.0.args | 2 +- .../cpu-host-model.x86_64-5.1.0.args | 2 +- .../cpu-host-model.x86_64-5.2.0.args | 2 +- .../cpu-host-model.x86_64-6.0.0.args | 2 +- .../cpu-host-model.x86_64-6.1.0.args | 2 +- .../cpu-host-model.x86_64-6.2.0.args | 2 +- .../cpu-host-model.x86_64-7.0.0.args | 2 +- .../cpu-host-model.x86_64-7.1.0.args | 2 +- .../cpu-host-model.x86_64-7.2.0.args | 2 +- .../cpu-host-model.x86_64-8.0.0.args | 2 +- .../cpu-host-model.x86_64-latest.args | 2 +- .../cpu-nofallback.x86_64-8.0.0.args | 2 +- tests/qemuxml2argvdata/cpu-nofallback.xml | 1 - 282 files changed, 4591 insertions(+), 692 deletions(-) create mode 100644 src/cpu_map/x86_Cascadelake-Server-v2.xml create mode 100644 src/cpu_map/x86_Cascadelake-Server-v4.xml create mode 100644 src/cpu_map/x86_Cascadelake-Server-v5.xml create mode 100644 src/cpu_map/x86_Cooperlake-v2.xml create mode 100644 src/cpu_map/x86_Dhyana-v2.xml create mode 100644 src/cpu_map/x86_EPYC-Milan-v2.xml create mode 100644 src/cpu_map/x86_EPYC-Rome-v2.xml create mode 100644 src/cpu_map/x86_EPYC-Rome-v3.xml create mode 100644 src/cpu_map/x86_EPYC-Rome-v4.xml create mode 100644 src/cpu_map/x86_EPYC-v3.xml create mode 100644 src/cpu_map/x86_EPYC-v4.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v3.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v4.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v5.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v6.xml create mode 100644 src/cpu_map/x86_SapphireRapids-v2.xml create mode 100644 src/cpu_map/x86_Skylake-Client-v4.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v4.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v5.xml create mode 100644 src/cpu_map/x86_Snowridge-v2.xml create mode 100644 src/cpu_map/x86_Snowridge-v3.xml create mode 100644 src/cpu_map/x86_Snowridge-v4.xml -- 2.41.0

2 21

Versioned CPU types in libvirt
by Jonathon Jongsma 10 Nov '23

10 Nov '23

I'm currently looking at getting libvirt working with AMD's SEV-SNP encrypted virtualization technology. I have access to a test machine with an AMD EPYC 7713 processor which I can use to launch SNP guests with qemu, but only when I specify one of the following versioned -cpu values: - EPYC-v4 - EPYC-Milan-v2 - EPYC-Rome-v3 From what I understand, the unversioned CPU models in qemu are supposed to resolve to a specific versioned CPU model depending on the machine type. But I'm not exactly sure how machine type influences it. I've got some libvirt patches to launch an SEV-SNP guest working now except for the CPU model specification. As far as I can tell, I can currently only specify the un-versioned model in libvirt. Is there any way to request a particular versioned CPU from qemu? I feel like I'm missing something here. I should perhaps also mention that I'm running a development version of qemu from Cole's copr repo[1], which could still have some related bugs [1] https://copr.fedorainfracloud.org/coprs/g/virtmaint-sig/sev-snp-coconut/ Thanks, Jonathon

5 7

[libvirt PATCH] src: reject empty string for 'dname' in migrate APIs
by Daniel P. Berrangé 10 Nov '23

10 Nov '23

A domain name is expected to be non-empty, and we validate this when parsing XML, or accepting a new name during renames. We fail to enforce this property, however, when performing a migration. This was discovered when a user complained about inaccessible VMs after migrating with the Rust APIs which mistakenly hardcoded 'dname' to the empty string. Fixes: https://gitlab.com/libvirt/libvirt-rust/-/issues/11 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/internal.h | 14 +++++++ src/libvirt-domain.c | 97 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 100 insertions(+), 11 deletions(-) diff --git a/src/internal.h b/src/internal.h index 5a9e1c7cd0..01860efad9 100644 --- a/src/internal.h +++ b/src/internal.h @@ -441,6 +441,20 @@ goto label; \ } \ } while (0) +#define virCheckNonEmptyOptStringArgGoto(argname, label) \ + do { \ + if (argname && *argname == '\0') { \ + virReportInvalidEmptyStringArg(argname); \ + goto label; \ + } \ + } while (0) +#define virCheckNonEmptyOptStringArgReturn(argname, retval) \ + do { \ + if (argname && *argname == '\0') { \ + virReportInvalidEmptyStringArg(argname); \ + return retval; \ + } \ + } while (0) #define virCheckPositiveArgGoto(argname, label) \ do { \ if (argname <= 0) { \ diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 58e1e5ea8d..77a9682ecb 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -2991,6 +2991,8 @@ virDomainMigrateVersion1(virDomainPtr domain, "dconn=%p, flags=0x%lx, dname=%s, uri=%s, bandwidth=%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); + virCheckNonEmptyOptStringArgReturn(dname, NULL); + ret = virDomainGetInfo(domain, &info); if (ret == 0 && info.state == VIR_DOMAIN_PAUSED) flags |= VIR_MIGRATE_PAUSED; @@ -3085,6 +3087,8 @@ virDomainMigrateVersion2(virDomainPtr domain, "dconn=%p, flags=0x%lx, dname=%s, uri=%s, bandwidth=%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); + virCheckNonEmptyOptStringArgReturn(dname, NULL); + /* Prepare the migration. * * The destination host may return a cookie, or leave cookie as @@ -3242,6 +3246,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, bandwidth, params, nparams, useParams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); + virCheckNonEmptyOptStringArgReturn(dname, NULL); + if ((!useParams && (!domain->conn->driver->domainMigrateBegin3 || !domain->conn->driver->domainMigratePerform3 || @@ -3582,6 +3588,8 @@ virDomainMigrateUnmanagedProto2(virDomainPtr domain, return -1; } + virCheckNonEmptyOptStringArgReturn(dname, -1); + if (flags & VIR_MIGRATE_PEER2PEER) { if (miguri) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3632,6 +3640,8 @@ virDomainMigrateUnmanagedProto3(virDomainPtr domain, return -1; } + virCheckNonEmptyOptStringArgReturn(dname, -1); + return domain->conn->driver->domainMigratePerform3 (domain, xmlin, NULL, 0, NULL, NULL, dconnuri, miguri, flags, dname, bandwidth); @@ -3802,6 +3812,8 @@ virDomainMigrate(virDomainPtr domain, virCheckConnectGoto(dconn, error); virCheckReadOnlyGoto(dconn->flags, error); + virCheckNonEmptyOptStringArgReturn(dname, NULL); + VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_NON_SHARED_DISK, VIR_MIGRATE_NON_SHARED_INC, error); @@ -3999,6 +4011,8 @@ virDomainMigrate2(virDomainPtr domain, virCheckConnectGoto(dconn, error); virCheckReadOnlyGoto(dconn->flags, error); + virCheckNonEmptyOptStringArgReturn(dname, NULL); + VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_NON_SHARED_DISK, VIR_MIGRATE_NON_SHARED_INC, error); @@ -4232,6 +4246,19 @@ virDomainMigrate3(virDomainPtr domain, goto error; } + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, &uri) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, &dxml) < 0 || + virTypedParamsGetULLong(params, nparams, + VIR_MIGRATE_PARAM_BANDWIDTH, &bandwidth) < 0) { + goto error; + } + + virCheckNonEmptyOptStringArgReturn(dname, NULL); + if (flags & VIR_MIGRATE_OFFLINE) { rc = VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_OFFLINE); @@ -4293,17 +4320,6 @@ virDomainMigrate3(virDomainPtr domain, goto error; } - if (virTypedParamsGetString(params, nparams, - VIR_MIGRATE_PARAM_URI, &uri) < 0 || - virTypedParamsGetString(params, nparams, - VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || - virTypedParamsGetString(params, nparams, - VIR_MIGRATE_PARAM_DEST_XML, &dxml) < 0 || - virTypedParamsGetULLong(params, nparams, - VIR_MIGRATE_PARAM_BANDWIDTH, &bandwidth) < 0) { - goto error; - } - rc_src = VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_V3); if (rc_src < 0) @@ -4475,6 +4491,7 @@ virDomainMigrateToURI(virDomainPtr domain, virCheckDomainReturn(domain, -1); virCheckReadOnlyGoto(domain->conn->flags, error); virCheckNonNullArgGoto(duri, error); + virCheckNonEmptyOptStringArgGoto(dname, error); VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_TUNNELLED, VIR_MIGRATE_PARALLEL, @@ -4554,6 +4571,8 @@ virDomainMigrateToURI2(virDomainPtr domain, virCheckDomainReturn(domain, -1); virCheckReadOnlyGoto(domain->conn->flags, error); + virCheckNonEmptyOptStringArgGoto(dname, error); + VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_TUNNELLED, VIR_MIGRATE_PARALLEL, error); @@ -4679,6 +4698,7 @@ virDomainMigratePrepare(virConnectPtr dconn, virCheckConnectReturn(dconn, -1); virCheckReadOnlyGoto(dconn->flags, error); + virCheckNonEmptyOptStringArgGoto(dname, error); if (dconn->driver->domainMigratePrepare) { int ret; @@ -4723,6 +4743,7 @@ virDomainMigratePerform(virDomainPtr domain, conn = domain->conn; virCheckReadOnlyGoto(conn->flags, error); + virCheckNonEmptyOptStringArgGoto(dname, error); if (conn->driver->domainMigratePerform) { int ret; @@ -4762,6 +4783,7 @@ virDomainMigrateFinish(virConnectPtr dconn, virCheckConnectReturn(dconn, NULL); virCheckReadOnlyGoto(dconn->flags, error); + virCheckNonEmptyOptStringArgGoto(dname, error); if (dconn->driver->domainMigrateFinish) { virDomainPtr ret; @@ -4805,6 +4827,7 @@ virDomainMigratePrepare2(virConnectPtr dconn, virCheckConnectReturn(dconn, -1); virCheckReadOnlyGoto(dconn->flags, error); + virCheckNonEmptyOptStringArgGoto(dname, error); if (dconn->driver->domainMigratePrepare2) { int ret; @@ -4846,6 +4869,7 @@ virDomainMigrateFinish2(virConnectPtr dconn, virCheckConnectReturn(dconn, NULL); virCheckReadOnlyGoto(dconn->flags, error); + virCheckNonEmptyOptStringArgGoto(dname, error); if (dconn->driver->domainMigrateFinish2) { virDomainPtr ret; @@ -4886,6 +4910,7 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, virCheckConnectReturn(conn, -1); virCheckReadOnlyGoto(conn->flags, error); + virCheckNonEmptyOptStringArgGoto(dname, error); if (conn != st->conn) { virReportInvalidArg(conn, "%s", @@ -4936,6 +4961,7 @@ virDomainMigrateBegin3(virDomainPtr domain, conn = domain->conn; virCheckReadOnlyGoto(conn->flags, error); + virCheckNonEmptyOptStringArgGoto(dname, error); if (conn->driver->domainMigrateBegin3) { char *xml; @@ -4983,6 +5009,7 @@ virDomainMigratePrepare3(virConnectPtr dconn, virCheckConnectReturn(dconn, -1); virCheckReadOnlyGoto(dconn->flags, error); + virCheckNonEmptyOptStringArgGoto(dname, error); if (dconn->driver->domainMigratePrepare3) { int ret; @@ -5031,6 +5058,7 @@ virDomainMigratePrepareTunnel3(virConnectPtr conn, virCheckConnectReturn(conn, -1); virCheckReadOnlyGoto(conn->flags, error); + virCheckNonEmptyOptStringArgGoto(dname, error); if (conn != st->conn) { virReportInvalidArg(conn, "%s", @@ -5089,6 +5117,7 @@ virDomainMigratePerform3(virDomainPtr domain, conn = domain->conn; virCheckReadOnlyGoto(conn->flags, error); + virCheckNonEmptyOptStringArgGoto(dname, error); if (conn->driver->domainMigratePerform3) { int ret; @@ -5135,6 +5164,7 @@ virDomainMigrateFinish3(virConnectPtr dconn, virCheckConnectReturn(dconn, NULL); virCheckReadOnlyGoto(dconn->flags, error); + virCheckNonEmptyOptStringArgGoto(dname, error); if (dconn->driver->domainMigrateFinish3) { virDomainPtr ret; @@ -5211,6 +5241,7 @@ virDomainMigrateBegin3Params(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; + const char *dname = NULL; VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, " "cookieout=%p, cookieoutlen=%p, flags=0x%x", @@ -5224,6 +5255,12 @@ virDomainMigrateBegin3Params(virDomainPtr domain, virCheckReadOnlyGoto(conn->flags, error); + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0) + goto error; + + virCheckNonEmptyOptStringArgGoto(dname, error); + if (conn->driver->domainMigrateBegin3Params) { char *xml; xml = conn->driver->domainMigrateBegin3Params(domain, params, nparams, @@ -5258,6 +5295,8 @@ virDomainMigratePrepare3Params(virConnectPtr dconn, char **uri_out, unsigned int flags) { + const char *dname = NULL; + VIR_DEBUG("dconn=%p, params=%p, nparams=%d, cookiein=%p, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_out=%p, flags=0x%x", dconn, params, nparams, cookiein, cookieinlen, @@ -5269,6 +5308,12 @@ virDomainMigratePrepare3Params(virConnectPtr dconn, virCheckConnectReturn(dconn, -1); virCheckReadOnlyGoto(dconn->flags, error); + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0) + goto error; + + virCheckNonEmptyOptStringArgGoto(dname, error); + if (dconn->driver->domainMigratePrepare3Params) { int ret; ret = dconn->driver->domainMigratePrepare3Params(dconn, params, nparams, @@ -5303,6 +5348,8 @@ virDomainMigratePrepareTunnel3Params(virConnectPtr conn, int *cookieoutlen, unsigned int flags) { + const char *dname = NULL; + VIR_DEBUG("conn=%p, stream=%p, params=%p, nparams=%d, cookiein=%p, " "cookieinlen=%d, cookieout=%p, cookieoutlen=%p, flags=0x%x", conn, st, params, nparams, cookiein, cookieinlen, @@ -5320,6 +5367,12 @@ virDomainMigratePrepareTunnel3Params(virConnectPtr conn, goto error; } + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0) + goto error; + + virCheckNonEmptyOptStringArgGoto(dname, error); + if (conn->driver->domainMigratePrepareTunnel3Params) { int rv; rv = conn->driver->domainMigratePrepareTunnel3Params( @@ -5354,6 +5407,7 @@ virDomainMigratePerform3Params(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; + const char *dname = NULL; VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparams=%d, cookiein=%p, " "cookieinlen=%d, cookieout=%p, cookieoutlen=%p, flags=0x%x", @@ -5368,6 +5422,12 @@ virDomainMigratePerform3Params(virDomainPtr domain, virCheckReadOnlyGoto(conn->flags, error); + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0) + goto error; + + virCheckNonEmptyOptStringArgGoto(dname, error); + if (conn->driver->domainMigratePerform3Params) { int ret; ret = conn->driver->domainMigratePerform3Params( @@ -5401,6 +5461,8 @@ virDomainMigrateFinish3Params(virConnectPtr dconn, unsigned int flags, int cancelled) { + const char *dname = NULL; + VIR_DEBUG("dconn=%p, params=%p, nparams=%d, cookiein=%p, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=0x%x, cancelled=%d", dconn, params, nparams, cookiein, cookieinlen, cookieout, @@ -5412,6 +5474,12 @@ virDomainMigrateFinish3Params(virConnectPtr dconn, virCheckConnectReturn(dconn, NULL); virCheckReadOnlyGoto(dconn->flags, error); + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0) + goto error; + + virCheckNonEmptyOptStringArgGoto(dname, error); + if (dconn->driver->domainMigrateFinish3Params) { virDomainPtr ret; ret = dconn->driver->domainMigrateFinish3Params( @@ -5444,6 +5512,7 @@ virDomainMigrateConfirm3Params(virDomainPtr domain, int cancelled) { virConnectPtr conn; + const char *dname = NULL; VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, cookiein=%p, " "cookieinlen=%d, flags=0x%x, cancelled=%d", @@ -5457,6 +5526,12 @@ virDomainMigrateConfirm3Params(virDomainPtr domain, virCheckReadOnlyGoto(conn->flags, error); + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0) + goto error; + + virCheckNonEmptyOptStringArgGoto(dname, error); + if (conn->driver->domainMigrateConfirm3Params) { int ret; ret = conn->driver->domainMigrateConfirm3Params( -- 2.41.0

2 1

[PATCH 0/6] qemucapabilitiestest: Bump 8.2 dev cycle data
by Peter Krempa 10 Nov '23

10 Nov '23

Peter Krempa (6): qemumigrationcookiexmltest: Don't crash when parsing of status XML fails tests: qemumigparamsdata: Drop deprecated fields qemuxml2argvtest: Rename 'cpu-host-model' tests according to emulation type qemuxml2argvtest: Add complementary 'kvm/tcg' test cases for cpu-host-model* qemuxml2argvtest: Add '8.1.0' variants of 'cpu-host-model*' tests qemucapabilitiestest: Update capabilities data for 8.2 dev cycle on x86_64 .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 1 - .../caps_8.2.0_x86_64.replies | 4365 +++++++++-------- .../caps_8.2.0_x86_64.xml | 53 +- tests/qemumigparamsdata/basic.json | 3 - tests/qemumigparamsdata/basic.reply | 3 - tests/qemumigparamsdata/basic.xml | 3 - tests/qemumigparamsdata/tls-enabled.json | 3 - tests/qemumigparamsdata/tls-enabled.reply | 3 - tests/qemumigparamsdata/tls-enabled.xml | 3 - tests/qemumigparamsdata/tls-hostname.json | 3 - tests/qemumigparamsdata/tls-hostname.reply | 3 - tests/qemumigparamsdata/tls-hostname.xml | 3 - tests/qemumigparamsdata/tls.json | 3 - tests/qemumigparamsdata/tls.reply | 3 - tests/qemumigparamsdata/tls.xml | 3 - tests/qemumigrationcookiexmltest.c | 16 +- ...-host-model-fallback-kvm.x86_64-4.2.0.args | 33 + ...-host-model-fallback-kvm.x86_64-5.0.0.args | 33 + ...-host-model-fallback-kvm.x86_64-5.1.0.args | 33 + ...-host-model-fallback-kvm.x86_64-5.2.0.args | 34 + ...-host-model-fallback-kvm.x86_64-6.0.0.args | 34 + ...-host-model-fallback-kvm.x86_64-6.1.0.args | 34 + ...-host-model-fallback-kvm.x86_64-6.2.0.args | 34 + ...-host-model-fallback-kvm.x86_64-7.0.0.args | 34 + ...-host-model-fallback-kvm.x86_64-7.1.0.args | 34 + ...-host-model-fallback-kvm.x86_64-7.2.0.args | 34 + ...-host-model-fallback-kvm.x86_64-8.0.0.args | 33 + ...-host-model-fallback-kvm.x86_64-8.1.0.args | 33 + ...host-model-fallback-kvm.x86_64-latest.args | 33 + .../cpu-host-model-fallback-kvm.xml | 19 + ...host-model-fallback-tcg.x86_64-4.2.0.args} | 0 ...host-model-fallback-tcg.x86_64-5.0.0.args} | 0 ...host-model-fallback-tcg.x86_64-5.1.0.args} | 0 ...host-model-fallback-tcg.x86_64-5.2.0.args} | 0 ...host-model-fallback-tcg.x86_64-6.0.0.args} | 0 ...host-model-fallback-tcg.x86_64-6.1.0.args} | 0 ...host-model-fallback-tcg.x86_64-6.2.0.args} | 0 ...host-model-fallback-tcg.x86_64-7.0.0.args} | 0 ...host-model-fallback-tcg.x86_64-7.1.0.args} | 0 ...host-model-fallback-tcg.x86_64-7.2.0.args} | 0 ...host-model-fallback-tcg.x86_64-8.0.0.args} | 0 ...host-model-fallback-tcg.x86_64-8.1.0.args} | 2 +- ...host-model-fallback-tcg.x86_64-latest.args | 33 + ...ck.xml => cpu-host-model-fallback-tcg.xml} | 0 ...s => cpu-host-model-kvm.x86_64-4.2.0.args} | 0 ...s => cpu-host-model-kvm.x86_64-5.0.0.args} | 0 ...s => cpu-host-model-kvm.x86_64-5.1.0.args} | 0 ...s => cpu-host-model-kvm.x86_64-5.2.0.args} | 0 ...s => cpu-host-model-kvm.x86_64-6.0.0.args} | 0 ...s => cpu-host-model-kvm.x86_64-6.1.0.args} | 0 ...s => cpu-host-model-kvm.x86_64-6.2.0.args} | 0 ...s => cpu-host-model-kvm.x86_64-7.0.0.args} | 0 ...s => cpu-host-model-kvm.x86_64-7.1.0.args} | 0 ...s => cpu-host-model-kvm.x86_64-7.2.0.args} | 0 ...s => cpu-host-model-kvm.x86_64-8.0.0.args} | 0 .../cpu-host-model-kvm.x86_64-8.1.0.args | 38 + ... => cpu-host-model-kvm.x86_64-latest.args} | 0 ...-host-model.xml => cpu-host-model-kvm.xml} | 0 ...ost-model-nofallback-kvm.x86_64-4.2.0.args | 33 + ...ost-model-nofallback-kvm.x86_64-5.0.0.args | 33 + ...ost-model-nofallback-kvm.x86_64-5.1.0.args | 33 + ...ost-model-nofallback-kvm.x86_64-5.2.0.args | 34 + ...ost-model-nofallback-kvm.x86_64-6.0.0.args | 34 + ...ost-model-nofallback-kvm.x86_64-6.1.0.args | 34 + ...ost-model-nofallback-kvm.x86_64-6.2.0.args | 34 + ...ost-model-nofallback-kvm.x86_64-7.0.0.args | 34 + ...ost-model-nofallback-kvm.x86_64-7.1.0.args | 34 + ...ost-model-nofallback-kvm.x86_64-7.2.0.args | 34 + ...ost-model-nofallback-kvm.x86_64-8.0.0.args | 33 + ...ost-model-nofallback-kvm.x86_64-8.1.0.args | 33 + ...st-model-nofallback-kvm.x86_64-latest.args | 33 + .../cpu-host-model-nofallback-kvm.xml | 21 + ...st-model-nofallback-tcg.x86_64-4.2.0.args} | 0 ...st-model-nofallback-tcg.x86_64-5.0.0.args} | 0 ...st-model-nofallback-tcg.x86_64-5.1.0.args} | 0 ...st-model-nofallback-tcg.x86_64-5.2.0.args} | 0 ...st-model-nofallback-tcg.x86_64-6.0.0.args} | 0 ...st-model-nofallback-tcg.x86_64-6.1.0.args} | 0 ...st-model-nofallback-tcg.x86_64-6.2.0.args} | 0 ...st-model-nofallback-tcg.x86_64-7.0.0.args} | 0 ...st-model-nofallback-tcg.x86_64-7.1.0.args} | 0 ...st-model-nofallback-tcg.x86_64-7.2.0.args} | 0 ...st-model-nofallback-tcg.x86_64-8.0.0.args} | 0 ...st-model-nofallback-tcg.x86_64-8.1.0.args} | 2 +- ...st-model-nofallback-tcg.x86_64-latest.args | 33 + ....xml => cpu-host-model-nofallback-tcg.xml} | 0 .../cpu-host-model-tcg.x86_64-4.2.0.args | 38 + .../cpu-host-model-tcg.x86_64-5.0.0.args | 38 + .../cpu-host-model-tcg.x86_64-5.1.0.args | 38 + .../cpu-host-model-tcg.x86_64-5.2.0.args | 39 + .../cpu-host-model-tcg.x86_64-6.0.0.args | 39 + .../cpu-host-model-tcg.x86_64-6.1.0.args | 39 + .../cpu-host-model-tcg.x86_64-6.2.0.args | 39 + .../cpu-host-model-tcg.x86_64-7.0.0.args | 39 + .../cpu-host-model-tcg.x86_64-7.1.0.args | 39 + .../cpu-host-model-tcg.x86_64-7.2.0.args | 39 + .../cpu-host-model-tcg.x86_64-8.0.0.args | 38 + .../cpu-host-model-tcg.x86_64-8.1.0.args | 38 + .../cpu-host-model-tcg.x86_64-latest.args | 38 + tests/qemuxml2argvdata/cpu-host-model-tcg.xml | 21 + tests/qemuxml2argvtest.c | 122 +- 101 files changed, 4025 insertions(+), 2110 deletions(-) create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-6.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-6.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.xml rename tests/qemuxml2argvdata/{cpu-host-model-fallback.x86_64-4.2.0.args => cpu-host-model-fallback-tcg.x86_64-4.2.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.x86_64-5.0.0.args => cpu-host-model-fallback-tcg.x86_64-5.0.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.x86_64-5.1.0.args => cpu-host-model-fallback-tcg.x86_64-5.1.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.x86_64-5.2.0.args => cpu-host-model-fallback-tcg.x86_64-5.2.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.x86_64-6.0.0.args => cpu-host-model-fallback-tcg.x86_64-6.0.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.x86_64-6.1.0.args => cpu-host-model-fallback-tcg.x86_64-6.1.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.x86_64-6.2.0.args => cpu-host-model-fallback-tcg.x86_64-6.2.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.x86_64-7.0.0.args => cpu-host-model-fallback-tcg.x86_64-7.0.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.x86_64-7.1.0.args => cpu-host-model-fallback-tcg.x86_64-7.1.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.x86_64-7.2.0.args => cpu-host-model-fallback-tcg.x86_64-7.2.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.x86_64-8.0.0.args => cpu-host-model-fallback-tcg.x86_64-8.0.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.x86_64-latest.args => cpu-host-model-fallback-tcg.x86_64-8.1.0.args} (95%) create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-host-model-fallback.xml => cpu-host-model-fallback-tcg.xml} (100%) rename tests/qemuxml2argvdata/{cpu-host-model.x86_64-4.2.0.args => cpu-host-model-kvm.x86_64-4.2.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model.x86_64-5.0.0.args => cpu-host-model-kvm.x86_64-5.0.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model.x86_64-5.1.0.args => cpu-host-model-kvm.x86_64-5.1.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model.x86_64-5.2.0.args => cpu-host-model-kvm.x86_64-5.2.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model.x86_64-6.0.0.args => cpu-host-model-kvm.x86_64-6.0.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model.x86_64-6.1.0.args => cpu-host-model-kvm.x86_64-6.1.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model.x86_64-6.2.0.args => cpu-host-model-kvm.x86_64-6.2.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model.x86_64-7.0.0.args => cpu-host-model-kvm.x86_64-7.0.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model.x86_64-7.1.0.args => cpu-host-model-kvm.x86_64-7.1.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model.x86_64-7.2.0.args => cpu-host-model-kvm.x86_64-7.2.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model.x86_64-8.0.0.args => cpu-host-model-kvm.x86_64-8.0.0.args} (100%) create mode 100644 tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-8.1.0.args rename tests/qemuxml2argvdata/{cpu-host-model.x86_64-latest.args => cpu-host-model-kvm.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model.xml => cpu-host-model-kvm.xml} (100%) create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-6.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-6.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.xml rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.x86_64-4.2.0.args => cpu-host-model-nofallback-tcg.x86_64-4.2.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.x86_64-5.0.0.args => cpu-host-model-nofallback-tcg.x86_64-5.0.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.x86_64-5.1.0.args => cpu-host-model-nofallback-tcg.x86_64-5.1.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.x86_64-5.2.0.args => cpu-host-model-nofallback-tcg.x86_64-5.2.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.x86_64-6.0.0.args => cpu-host-model-nofallback-tcg.x86_64-6.0.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.x86_64-6.1.0.args => cpu-host-model-nofallback-tcg.x86_64-6.1.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.x86_64-6.2.0.args => cpu-host-model-nofallback-tcg.x86_64-6.2.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.x86_64-7.0.0.args => cpu-host-model-nofallback-tcg.x86_64-7.0.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.x86_64-7.1.0.args => cpu-host-model-nofallback-tcg.x86_64-7.1.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.x86_64-7.2.0.args => cpu-host-model-nofallback-tcg.x86_64-7.2.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.x86_64-8.0.0.args => cpu-host-model-nofallback-tcg.x86_64-8.0.0.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.x86_64-latest.args => cpu-host-model-nofallback-tcg.x86_64-8.1.0.args} (95%) create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-host-model-nofallback.xml => cpu-host-model-nofallback-tcg.xml} (100%) create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-4.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-5.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-5.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-6.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-6.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-8.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-8.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-tcg.xml -- 2.41.0

2 7

[libvirt PATCH] qemu: add runtime config option for nbdkit
by Jonathon Jongsma 09 Nov '23

09 Nov '23

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 (storage_use_nbdkit), we can build packages with nbdkit support but have it disabled by default. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- Suggested as an option for making testing easier by Andrea Bolognani libvirt.spec.in | 10 +--------- src/qemu/libvirtd_qemu.aug | 3 +++ src/qemu/qemu.conf.in | 10 ++++++++++ src/qemu/qemu_conf.c | 14 ++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 3 +++ tests/qemuxml2argvtest.c | 15 +++++++++------ 7 files changed, 42 insertions(+), 15 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f50c451e73..e2ba245ade 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -174,16 +174,8 @@ %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. -# -# 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} - %if 0%{?fedora} >= 40 - %define with_nbdkit 0%{!?_without_nbdkit:1} - %endif + %define with_nbdkit 0%{!?_without_nbdkit:1} %endif %ifarch %{arches_dmidecode} 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/qemu.conf.in b/src/qemu/qemu.conf.in index 6897e0f760..1017edefa5 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -974,3 +974,13 @@ # "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 access the remote server directly. +# +# Possible values are 0 or 1. Disabled by default. +# +# storage_use_nbdkit = 1 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 513b5ebb1e..b5c0ca10b4 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1065,6 +1065,17 @@ virQEMUDriverConfigLoadCapsFiltersEntry(virQEMUDriverConfig *cfg, } +static int +virQEMUDriverConfigLoadStorageEntry(virQEMUDriverConfig *cfg, + virConf *conf) +{ + if (virConfGetValueBool(conf, "storage_use_nbdkit", &cfg->storageUseNbdkit) < 0) + return -1; + + return 0; +} + + int virQEMUDriverConfigLoadFile(virQEMUDriverConfig *cfg, const char *filename, bool privileged) @@ -1136,6 +1147,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 ae19ce884b..f8dda6c898 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10333,6 +10333,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 4fda68a4ce..3c64fcc7eb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1115,7 +1115,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"); @@ -1161,8 +1160,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"); @@ -1173,13 +1170,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"); @@ -1249,6 +1243,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 1

[PATCH V4] support for hotplug/hotunplug in test hypervisor
by Thanos Makatos 09 Nov '23

09 Nov '23

Signed-off-by: Thanos Makatos <thanos.makatos(a)nutanix.com> --- src/test/test_driver.c | 387 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 385 insertions(+), 2 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index e87d7cfd44..a3b4799a0f 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -26,8 +26,6 @@ #include <unistd.h> #include <sys/stat.h> #include <libxml/xmlsave.h> - - #include "virerror.h" #include "datatypes.h" #include "test_driver.h" @@ -38,10 +36,14 @@ #include "virnetworkobj.h" #include "interface_conf.h" #include "checkpoint_conf.h" +#include "domain_addr.h" +#include "domain_audit.h" #include "domain_conf.h" #include "domain_driver.h" #include "domain_event.h" +#include "domain_validate.h" #include "network_event.h" +#include "nwfilter_conf.h" #include "snapshot_conf.h" #include "virfdstream.h" #include "storage_conf.h" @@ -50,6 +52,7 @@ #include "node_device_conf.h" #include "virnodedeviceobj.h" #include "node_device_event.h" +#include "vircgroup.h" #include "virxml.h" #include "virthread.h" #include "virlog.h" @@ -10035,6 +10038,383 @@ testConnectGetDomainCapabilities(virConnectPtr conn G_GNUC_UNUSED, return virDomainCapsFormat(domCaps); } +static int +testDomainAttachHostPCIDevice(testDriver *driver G_GNUC_UNUSED, + virDomainObj *vm, + virDomainHostdevDef *hostdev) +{ + int backend = hostdev->source.subsys.u.pci.backend; + + switch ((virDomainHostdevSubsysPCIBackendType)backend) { + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO: + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT: + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM: + break; + + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN: + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("test hypervisor does not support device assignment mode '%s'"), + virDomainHostdevSubsysPCIBackendTypeToString(backend)); + return -1; + } + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit during hotplug")); + return -1; + } + + VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1); + + virDomainAuditHostdev(vm, hostdev, "attach", true); + + vm->def->hostdevs[vm->def->nhostdevs++] = hostdev; + + return 0; +} + +static int +testDomainAttachHostDevice(testDriver *driver, + virDomainObj *vm, + virDomainHostdevDef *hostdev) +{ + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("hotplug is not supported for hostdev mode '%s'"), + virDomainHostdevModeTypeToString(hostdev->mode)); + return -1; + } + + if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("hotplug is not supported for hostdev subsys type '%s'"), + virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type)); + return -1; + } + + return testDomainAttachHostPCIDevice(driver, vm, hostdev); +} + +static int +testDomainAttachDeviceLive(virDomainObj *vm, + virDomainDeviceDef *dev, + testDriver *driver) +{ + int ret = -1; + const char *alias = NULL; + + if ((virDomainDeviceType)dev->type != VIR_DOMAIN_DEVICE_HOSTDEV) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("live attach of device '%s' is not supported"), + virDomainDeviceTypeToString(dev->type)); + return -1; + } + + testDomainObjCheckHostdevTaint(vm, dev->data.hostdev); + if ((ret = testDomainAttachHostDevice(driver, vm, dev->data.hostdev)) != 0) + return ret; + + alias = dev->data.hostdev->info->alias; + dev->data.hostdev = NULL; + + if (alias) { + virObjectEvent *event; + event = virDomainEventDeviceAddedNewFromObj(vm, alias); + virObjectEventStateQueue(driver->eventState, event); + } + + return 0; +} + +static int +testDomainAttachDeviceLiveAndConfig(virDomainObj *vm, + testDriver *driver, + const char *xml, + unsigned int flags) +{ + g_autoptr(virDomainDeviceDef) devConf = NULL; + g_autoptr(virDomainDeviceDef) devLive = NULL; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE, -1); + + if (flags & VIR_DOMAIN_AFFECT_LIVE) { + if (!(devLive = virDomainDeviceDefParse(xml, vm->def, + driver->xmlopt, NULL, + parse_flags))) + return -1; + + if (virDomainDeviceValidateAliasForHotplug(vm, devLive, + VIR_DOMAIN_AFFECT_LIVE) < 0) + return -1; + + if (virDomainDefCompatibleDevice(vm->def, devLive, NULL, + VIR_DOMAIN_DEVICE_ACTION_ATTACH, + true) < 0) + return -1; + + if (testDomainAttachDeviceLive(vm, devLive, driver) < 0) + return -1; + } + + return 0; +} + +static int +testDomainAttachDeviceFlags(virDomainPtr domain, + const char *xml, + unsigned int flags) { + + testDriver *driver = domain->conn->privateData; + virDomainObj *vm = NULL; + int ret = -1; + + virNWFilterReadLockFilterUpdates(); + + if (!(vm = testDomObjFromDomain(domain))) + return -1; + + if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) + goto cleanup; + + if (testDomainAttachDeviceLiveAndConfig(vm, driver, xml, flags) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virDomainObjEndAPI(&vm); + virNWFilterUnlockFilterUpdates(); + return ret; + +} + +static int +testDomainAttachDevice(virDomainPtr domain, const char *xml) +{ + return testDomainAttachDeviceFlags(domain, xml, 0); +} + +/* search for a hostdev matching dev and detach it */ +static int +testDomainDetachPrepHostdev(virDomainObj *vm, + virDomainHostdevDef *match, + virDomainHostdevDef **detach) +{ + virDomainHostdevSubsys *subsys = &match->source.subsys; + virDomainHostdevSubsysPCI *pcisrc = &subsys->u.pci; + virDomainHostdevDef *hostdev = NULL; + + if (match->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("hot unplug is not supported for hostdev mode '%s'"), + virDomainHostdevModeTypeToString(match->mode)); + return -1; + } + + if (virDomainHostdevFind(vm->def, match, &hostdev) < 0) { + if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { + virReportError(VIR_ERR_DEVICE_MISSING, + _("host pci device " VIR_PCI_DEVICE_ADDRESS_FMT + " not found"), + pcisrc->addr.domain, pcisrc->addr.bus, + pcisrc->addr.slot, pcisrc->addr.function); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected hostdev type %d"), subsys->type); + } + return -1; + } + + *detach = hostdev; + + return 0; +} + +static int +testDomainRemoveHostDevice(testDriver *driver G_GNUC_UNUSED, + virDomainObj *vm, + virDomainHostdevDef *hostdev) +{ + virDomainNetDef *net = NULL; + size_t i; + + VIR_DEBUG("Removing host device %s from domain %p %s", + hostdev->info->alias, vm, vm->def->name); + + if (hostdev->parentnet) { + net = hostdev->parentnet; + for (i = 0; i < vm->def->nnets; i++) { + if (vm->def->nets[i] == hostdev->parentnet) { + virDomainNetRemove(vm->def, i); + break; + } + } + } + + for (i = 0; i < vm->def->nhostdevs; i++) { + if (vm->def->hostdevs[i] == hostdev) { + virDomainHostdevRemove(vm->def, i); + break; + } + } + + virDomainAuditHostdev(vm, hostdev, "detach", true); + + virDomainHostdevDefFree(hostdev); + + if (net) { + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { + g_autoptr(virConnect) conn = virGetConnectNetwork(); + if (conn) + virDomainNetReleaseActualDevice(conn, vm->def, net); + else + VIR_WARN("Unable to release network device '%s'", NULLSTR(net->ifname)); + } + virDomainNetDefFree(net); + } + + return 0; +} + +static int +testDomainRemoveDevice(testDriver *driver, + virDomainObj *vm, + virDomainDeviceDef *dev) +{ + virDomainDeviceInfo *info; + virObjectEvent *event; + g_autofree char *alias = NULL; + + /* + * save the alias to use when sending a DEVICE_REMOVED event after + * all other teardown is complete + */ + if ((info = virDomainDeviceGetInfo(dev))) + alias = g_strdup(info->alias); + info = NULL; + + if ((virDomainDeviceType)dev->type != VIR_DOMAIN_DEVICE_HOSTDEV) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("don't know how to remove a %s device"), + virDomainDeviceTypeToString(dev->type)); + goto out; + } + + if (testDomainRemoveHostDevice(driver, vm, dev->data.hostdev) < 0) + return -1; + +out: + event = virDomainEventDeviceRemovedNewFromObj(vm, alias); + virObjectEventStateQueue(driver->eventState, event); + + return 0; +} + +static int +testDomainDetachDeviceLive(virDomainObj *vm, + virDomainDeviceDef *match, + testDriver *driver) +{ + virDomainDeviceDef detach = { .type = match->type }; + virDomainDeviceInfo *info = NULL; + + if ((virDomainDeviceType)match->type != VIR_DOMAIN_DEVICE_HOSTDEV) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("live detach of device '%s' is not supported"), + virDomainDeviceTypeToString(match->type)); + return -1; + } + + if (testDomainDetachPrepHostdev(vm, match->data.hostdev, + &detach.data.hostdev) < 0) + return -1; + + /* "detach" now points to the actual device we want to detach */ + + if (!(info = virDomainDeviceGetInfo(&detach))) { + /* + * This should never happen, since all of the device types in + * the switch cases that end with a "break" instead of a + * return have a virDeviceInfo in them. + */ + virReportError(VIR_ERR_INTERNAL_ERROR, + _("device of type '%s' has no device info"), + virDomainDeviceTypeToString(detach.type)); + return -1; + } + + /* Make generic validation checks common to all device types */ + + if (!info->alias) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot detach %s device with no alias"), + virDomainDeviceTypeToString(detach.type)); + return -1; + } + + return testDomainRemoveDevice(driver, vm, &detach); +} + +static int +testDomainDetachDeviceAliasLiveAndConfig(testDriver *driver, + virDomainObj *vm, + const char *alias, + unsigned int flags) +{ + virDomainDef *def = NULL; + g_autoptr(virDomainDef) vmdef = NULL; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE, -1); + + if (virDomainObjGetDefs(vm, flags, &def, NULL) < 0) + return -1; + + if (def) { + virDomainDeviceDef dev; + + if (virDomainDefFindDevice(def, alias, &dev, true) < 0) + return -1; + + if (testDomainDetachDeviceLive(vm, &dev, driver) < 0) + return -1; + } + + if (vmdef) { + if (virDomainDefSave(vmdef, driver->xmlopt, NULL) < 0) + return -1; + virDomainObjAssignDef(vm, &vmdef, false, NULL); + } + + return 0; +} + +static int +testDomainDetachDeviceAlias(virDomainPtr dom, + const char *alias, + unsigned int flags) +{ + testDriver *driver = dom->conn->privateData; + virDomainObj *vm = NULL; + int ret = -1; + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) + goto cleanup; + + if (testDomainDetachDeviceAliasLiveAndConfig(driver, vm, alias, flags) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} /* * Test driver @@ -10058,6 +10438,9 @@ static virHypervisorDriver testHypervisorDriver = { .connectListDomains = testConnectListDomains, /* 0.1.1 */ .connectNumOfDomains = testConnectNumOfDomains, /* 0.1.1 */ .connectListAllDomains = testConnectListAllDomains, /* 0.9.13 */ + .domainAttachDevice = testDomainAttachDevice, /* 9.10.0 */ + .domainAttachDeviceFlags = testDomainAttachDeviceFlags, /* 9.10.0 */ + .domainDetachDeviceAlias = testDomainDetachDeviceAlias, /* 9.10.0 */ .domainCreateXML = testDomainCreateXML, /* 0.1.4 */ .domainCreateXMLWithFiles = testDomainCreateXMLWithFiles, /* 5.7.0 */ .domainLookupByID = testDomainLookupByID, /* 0.1.1 */ -- 2.27.0

1 0

[PATCH V3] support for hotplug/hotunplug in test hypervisor
by Thanos Makatos 07 Nov '23

07 Nov '23

Signed-off-by: Thanos Makatos <thanos.makatos(a)nutanix.com> --- src/test/test_driver.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index e87d7cfd44..d605649262 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -10035,6 +10035,62 @@ testConnectGetDomainCapabilities(virConnectPtr conn G_GNUC_UNUSED, return virDomainCapsFormat(domCaps); } +static int +testVirDomainAttachDeviceFlags(virDomainPtr domain, + const char *xml, + unsigned int flags G_GNUC_UNUSED) { + + int ret = -1; + virDomainObj *vm; + testDriver *driver; + virDomainDeviceDef *devConf; + + if (!(vm = testDomObjFromDomain(domain))) + return -1; + + driver = domain->conn->privateData; + + if (!(devConf = virDomainDeviceDefParse(xml, vm->def, driver->xmlopt, + NULL, 0))) + goto out; + + VIR_APPEND_ELEMENT(vm->def->hostdevs, vm->def->nhostdevs, + devConf->data.hostdev); + virDomainDeviceDefFree(devConf); + ret = 0; +out: + virDomainObjEndAPI(&vm); + return ret; +} + +static int +testVirDomainAttachDevice(virDomainPtr domain, const char *xml) +{ + return testVirDomainAttachDeviceFlags(domain, xml, 0); +} + +static int +testVirDomainDetachDeviceAlias(virDomainPtr domain, + const char *alias, + unsigned int flags G_GNUC_UNUSED) +{ + virDomainObj *vm; + size_t i; + bool found = false; + + if (!(vm = testDomObjFromDomain(domain))) + return -1; + + for (i = 0; i < vm->def->nhostdevs && !found; i++) { + if (!strcmp(vm->def->hostdevs[i]->info->alias, alias)) { + virDomainHostdevDefFree(vm->def->hostdevs[i]); + VIR_DELETE_ELEMENT(vm->def->hostdevs, i, vm->def->nhostdevs); + found = true; + } + } + virDomainObjEndAPI(&vm); + return found ? 0 : -1; +} /* * Test driver @@ -10058,6 +10114,9 @@ static virHypervisorDriver testHypervisorDriver = { .connectListDomains = testConnectListDomains, /* 0.1.1 */ .connectNumOfDomains = testConnectNumOfDomains, /* 0.1.1 */ .connectListAllDomains = testConnectListAllDomains, /* 0.9.13 */ + .domainAttachDevice = testVirDomainAttachDevice, /* 9.9.0 */ + .domainAttachDeviceFlags = testVirDomainAttachDeviceFlags, /* 9.9.0 */ + .domainDetachDeviceAlias = testVirDomainDetachDeviceAlias, /* 9.9.0 */ .domainCreateXML = testDomainCreateXML, /* 0.1.4 */ .domainCreateXMLWithFiles = testDomainCreateXMLWithFiles, /* 5.7.0 */ .domainLookupByID = testDomainLookupByID, /* 0.1.1 */ -- 2.27.0

4 5

[libvirt PATCH] systemd: More tweaks to Description and Documentation lines
by Andrea Bolognani 06 Nov '23

06 Nov '23

We recently unified all services and sockets, except a couple were missed. Finish the job. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/remote/virt-guest-shutdown.target | 4 ++-- tools/libvirt-guests.service.in | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/remote/virt-guest-shutdown.target b/src/remote/virt-guest-shutdown.target index 25d4aaa267..34219d00b0 100644 --- a/src/remote/virt-guest-shutdown.target +++ b/src/remote/virt-guest-shutdown.target @@ -1,3 +1,3 @@ [Unit] -Description=Libvirt guests shutdown -Documentation=https://libvirt.org +Description=libvirt guests shutdown target +Documentation=https://libvirt.org/ diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index c547218f2a..b044444298 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -1,5 +1,7 @@ [Unit] -Description=Suspend/Resume Running libvirt Guests +Description=libvirt guests suspend/resume service +Documentation=man:libvirt-guests(8) +Documentation=https://libvirt.org/ Requires=virt-guest-shutdown.target After=network.target After=time-sync.target @@ -10,8 +12,6 @@ After=virtvboxd.socket After=virtvzd.socket After=virtxend.socket After=virt-guest-shutdown.target -Documentation=man:libvirt-guests(8) -Documentation=https://libvirt.org [Service] EnvironmentFile=-@initconfdir@/libvirt-guests -- 2.41.0

2 1

[libvirt PATCH] conf: virDomainDiskSourceFormat: check for srcpool presence correctly
by Ján Tomko 06 Nov '23

06 Nov '23

As a guard against programming errors, one part of the condition only dereferences srcpool if it exists, other one does not. Move the check up one level so that it actually has a chance to do something useful. Fixes: 19b1c0d31988a3a10c4694c10c27eb15c018f450 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/conf/domain_conf.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 80f467ae7a..99f9d56f07 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22357,14 +22357,12 @@ virDomainDiskSourceFormat(virBuffer *buf, g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); - if (src->type == VIR_STORAGE_TYPE_VOLUME) { - if (src->srcpool) { - virBufferEscapeString(&attrBuf, " pool='%s'", src->srcpool->pool); - virBufferEscapeString(&attrBuf, " volume='%s'", src->srcpool->volume); - if (src->srcpool->mode) - virBufferAsprintf(&attrBuf, " mode='%s'", - virStorageSourcePoolModeTypeToString(src->srcpool->mode)); - } + if (src->type == VIR_STORAGE_TYPE_VOLUME && src->srcpool) { + virBufferEscapeString(&attrBuf, " pool='%s'", src->srcpool->pool); + virBufferEscapeString(&attrBuf, " volume='%s'", src->srcpool->volume); + if (src->srcpool->mode) + virBufferAsprintf(&attrBuf, " mode='%s'", + virStorageSourcePoolModeTypeToString(src->srcpool->mode)); if (flags & VIR_DOMAIN_DEF_FORMAT_VOLUME_TRANSLATED && src->srcpool->actualtype != VIR_STORAGE_TYPE_NONE) { -- 2.41.0

2 1

[PATCH] ci: workaround broken opensuse leap 15.5 tirpc
by Daniel P. Berrangé 06 Nov '23

06 Nov '23

Temporarily disable '-Wmissing-include-dirs' becuase the libtirpc pkg-confog file has a bogus include dir. The headers can fortunately still be found since they are in the system include dir. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- ci/gitlab/builds.yml | 2 ++ ci/manifest.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 9ae2225e35..e1ea87db1b 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -332,6 +332,7 @@ x86_64-opensuse-leap-15-prebuilt-env: optional: true allow_failure: false variables: + CFLAGS: -Wno-missing-include-dirs NAME: opensuse-leap-15 RPM: skip @@ -340,6 +341,7 @@ x86_64-opensuse-leap-15-local-env: needs: [] allow_failure: false variables: + CFLAGS: -Wno-missing-include-dirs IMAGE: registry.opensuse.org/opensuse/leap:15.5 NAME: opensuse-leap-15 RPM: skip diff --git a/ci/manifest.yml b/ci/manifest.yml index 0e5a17a2bd..2af8e62f28 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -205,6 +205,8 @@ targets: - arch: x86_64 variables: RPM: skip + # Keep until fix for: https://bugzilla.opensuse.org/show_bug.cgi?id=1216862 + CFLAGS: -Wno-missing-include-dirs opensuse-tumbleweed: jobs: -- 2.41.0

5 12

[libvirt PATCH 0/5] ci: Add macOS 13 & 14, drop macOS 12
by Andrea Bolognani 06 Nov '23

06 Nov '23

Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1062214982 Assumes that https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/444 has been merged, which it hasn't yet, but I don't expect it to be controversial. I've added both macOS 13 and 14, doubling the amount of coverage. I'm not aware of us being particularly tight on Cirrus CI credits, but if that's the case we can just skip the macOS 13 patch. The job environment is supposed to make the build system pick up dependencies that are installed via Homebrew but can't be exposed by default because they conflict with OS-supplied packages. Right now it doesn't really do anything, because it hasn't been updated with the switch to aarch64. I'm going to look into it later, but for now I've left it as-is as reminder/documentation. Andrea Bolognani (5): ci: Update generated files ci: Drop rpcgen override from macOS $PATH ci: Add macOS 13 ci: Add macOS 14 ci: Drop macOS 12 ci/buildenv/almalinux-8.sh | 1 - ci/buildenv/alpine-317.sh | 1 - ci/buildenv/alpine-edge.sh | 1 - ci/buildenv/centos-stream-8.sh | 1 - ci/buildenv/centos-stream-9.sh | 1 - ci/buildenv/debian-11-cross-aarch64.sh | 1 - ci/buildenv/debian-11-cross-armv6l.sh | 1 - ci/buildenv/debian-11-cross-armv7l.sh | 1 - ci/buildenv/debian-11-cross-i686.sh | 1 - ci/buildenv/debian-11-cross-mips64el.sh | 1 - ci/buildenv/debian-11-cross-mipsel.sh | 1 - ci/buildenv/debian-11-cross-ppc64le.sh | 1 - ci/buildenv/debian-11-cross-s390x.sh | 1 - ci/buildenv/debian-11.sh | 1 - ci/buildenv/debian-12-cross-aarch64.sh | 1 - ci/buildenv/debian-12-cross-armv6l.sh | 1 - ci/buildenv/debian-12-cross-armv7l.sh | 1 - ci/buildenv/debian-12-cross-i686.sh | 1 - ci/buildenv/debian-12-cross-mips64el.sh | 1 - ci/buildenv/debian-12-cross-mipsel.sh | 1 - ci/buildenv/debian-12-cross-ppc64le.sh | 1 - ci/buildenv/debian-12-cross-s390x.sh | 1 - ci/buildenv/debian-12.sh | 1 - ci/buildenv/debian-sid-cross-aarch64.sh | 1 - ci/buildenv/debian-sid-cross-armv6l.sh | 1 - ci/buildenv/debian-sid-cross-armv7l.sh | 1 - ci/buildenv/debian-sid-cross-i686.sh | 1 - ci/buildenv/debian-sid-cross-mips64el.sh | 1 - ci/buildenv/debian-sid-cross-ppc64le.sh | 1 - ci/buildenv/debian-sid-cross-s390x.sh | 1 - ci/buildenv/debian-sid.sh | 1 - ci/buildenv/fedora-37.sh | 1 - ci/buildenv/fedora-38-cross-mingw32.sh | 2 +- ci/buildenv/fedora-38-cross-mingw64.sh | 2 +- ci/buildenv/fedora-38.sh | 1 - ci/buildenv/fedora-rawhide-cross-mingw32.sh | 2 +- ci/buildenv/fedora-rawhide-cross-mingw64.sh | 2 +- ci/buildenv/fedora-rawhide.sh | 1 - ci/buildenv/opensuse-leap-15.sh | 1 - ci/buildenv/opensuse-tumbleweed.sh | 1 - ci/buildenv/ubuntu-2004.sh | 1 - ci/buildenv/ubuntu-2204.sh | 1 - ci/cirrus/{macos-12.vars => macos-13.vars} | 2 +- ci/cirrus/{macos-12.vars => macos-14.vars} | 2 +- ci/containers/almalinux-8.Dockerfile | 1 - ci/containers/alpine-317.Dockerfile | 1 - ci/containers/alpine-edge.Dockerfile | 1 - ci/containers/centos-stream-8.Dockerfile | 1 - ci/containers/centos-stream-9.Dockerfile | 1 - .../debian-11-cross-aarch64.Dockerfile | 1 - .../debian-11-cross-armv6l.Dockerfile | 1 - .../debian-11-cross-armv7l.Dockerfile | 1 - ci/containers/debian-11-cross-i686.Dockerfile | 1 - .../debian-11-cross-mips64el.Dockerfile | 1 - .../debian-11-cross-mipsel.Dockerfile | 1 - .../debian-11-cross-ppc64le.Dockerfile | 1 - .../debian-11-cross-s390x.Dockerfile | 1 - ci/containers/debian-11.Dockerfile | 1 - .../debian-12-cross-aarch64.Dockerfile | 1 - .../debian-12-cross-armv6l.Dockerfile | 1 - .../debian-12-cross-armv7l.Dockerfile | 1 - ci/containers/debian-12-cross-i686.Dockerfile | 1 - .../debian-12-cross-mips64el.Dockerfile | 1 - .../debian-12-cross-mipsel.Dockerfile | 1 - .../debian-12-cross-ppc64le.Dockerfile | 1 - .../debian-12-cross-s390x.Dockerfile | 1 - ci/containers/debian-12.Dockerfile | 1 - .../debian-sid-cross-aarch64.Dockerfile | 1 - .../debian-sid-cross-armv6l.Dockerfile | 1 - .../debian-sid-cross-armv7l.Dockerfile | 1 - .../debian-sid-cross-i686.Dockerfile | 1 - .../debian-sid-cross-mips64el.Dockerfile | 1 - .../debian-sid-cross-ppc64le.Dockerfile | 1 - .../debian-sid-cross-s390x.Dockerfile | 1 - ci/containers/debian-sid.Dockerfile | 1 - ci/containers/fedora-37.Dockerfile | 1 - .../fedora-38-cross-mingw32.Dockerfile | 2 +- .../fedora-38-cross-mingw64.Dockerfile | 2 +- ci/containers/fedora-38.Dockerfile | 1 - .../fedora-rawhide-cross-mingw32.Dockerfile | 2 +- .../fedora-rawhide-cross-mingw64.Dockerfile | 2 +- ci/containers/fedora-rawhide.Dockerfile | 1 - ci/containers/opensuse-leap-15.Dockerfile | 1 - ci/containers/opensuse-tumbleweed.Dockerfile | 1 - ci/containers/ubuntu-2004.Dockerfile | 1 - ci/containers/ubuntu-2204.Dockerfile | 1 - ci/gitlab/builds.yml | 24 +++++++++++++++---- ci/manifest.yml | 11 +++++++-- 88 files changed, 39 insertions(+), 92 deletions(-) copy ci/cirrus/{macos-12.vars => macos-13.vars} (91%) rename ci/cirrus/{macos-12.vars => macos-14.vars} (91%) -- 2.41.0

2 12

[PATCH] virDomainDeviceInfoCheckABIStability: Implement proper check for CCW addresses
by Peter Krempa 06 Nov '23

06 Nov '23

CCW addresses need to be also checked for ABI stability. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/conf/domain_conf.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 80f467ae7a..5ce1793c2d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19719,10 +19719,21 @@ virDomainDeviceInfoCheckABIStability(virDomainDeviceInfo *src, } break; + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: + if (src->addr.ccw.cssid != dst->addr.ccw.cssid || + src->addr.ccw.ssid != dst->addr.ccw.ssid || + src->addr.ccw.devno != dst->addr.ccw.devno) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target device CCW address %1$x.%2$x.%3$04x does not match source %4$x.%5$x.%6$04x"), + dst->addr.ccw.cssid, dst->addr.ccw.ssid, dst->addr.ccw.devno, + src->addr.ccw.cssid, src->addr.ccw.ssid, src->addr.ccw.devno); + return false; + } + break; + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED: -- 2.41.0

2 1

[PATCH] virhostmem: Get total memory on macOS properly
by Michal Privoznik 06 Nov '23

06 Nov '23

Problem with HW_PHYSMEM sysctl on 64-bit macOS is that it returns a 32-bit signed value. Thus it overflows. Switching to HW_MEMSIZE is recommended as it's of an uint_64 type [1]. 1: https://github.com/apple-oss-distributions/xnu/blob/xnu-10002.1.13/bsd/sys/… Reported-by: Jaroslav Suchanek <jsuchane(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virhostmem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 1da2759ac3..a7027af835 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -617,7 +617,10 @@ virHostMemGetTotal(void) unsigned long long physmem = 0; size_t len = sizeof(physmem); - if (sysctlbyname("hw.physmem", &physmem, &len, NULL, 0) < 0) { + /* On macOS hw.physmem is int32_t which doesn't fly with >4GiB of memory. + * But hw.memsize is uint64_t. */ + if (sysctlbyname("hw.memsize", &physmem, &len, NULL, 0) < 0 && + sysctlbyname("hw.physmem", &physmem, &len, NULL, 0) < 0) { virReportSystemError(errno, "%s", _("Unable to query memory total")); return 0; -- 2.41.0

2 1

[libvirt PATCH] rpcgen: use proper operators when comparing types
by Laine Stump 06 Nov '23

06 Nov '23

flake8 (run on all python scripts as a part of the syntax checks) version 6.1.0 (on macOS 14) issued many complaints like this on the new rpcgen python scripts: [...]libvirt/scripts/rpcgen/rpcgen/lexer.py:57:17: E721 do not compare types, for exact checks use `is` / `is not`, for instance checks use `isinstance()` This patch changes all [type] == [type] to use "is" instead of "==", and similarly to use "is not" instead of "!=". (flake8 5.03, e.g. on Fedora 38, is just fine with using "==" and "!=", but python on both likes "is" and "is not") Fixes: commit v9.9.0-24-g8ec79e5e14 Fixes: commit v9.9.0-22-gca3f025011 Fixes: commit v9.9.0-21-g031efb691f Fixes: commit v9.9.0-20-g8c8b97685b Signed-off-by: Laine Stump <laine(a)redhat.com> --- scripts/rpcgen/rpcgen/ast.py | 4 +- scripts/rpcgen/rpcgen/generator.py | 26 ++++++------ scripts/rpcgen/rpcgen/lexer.py | 2 +- scripts/rpcgen/rpcgen/parser.py | 68 +++++++++++++++--------------- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/scripts/rpcgen/rpcgen/ast.py b/scripts/rpcgen/rpcgen/ast.py index 3e3e089713..52d9c3ac46 100644 --- a/scripts/rpcgen/rpcgen/ast.py +++ b/scripts/rpcgen/rpcgen/ast.py @@ -185,9 +185,9 @@ class XDRTypeCustom(XDRType): self.definition = definition def is_scalar(self): - if type(self.definition) == XDRDefinitionEnum: + if type(self.definition) is XDRDefinitionEnum: return True - if type(self.definition) == XDRDefinitionTypedef: + if type(self.definition) is XDRDefinitionTypedef: return self.definition.decl.typ.is_scalar() return False diff --git a/scripts/rpcgen/rpcgen/generator.py b/scripts/rpcgen/rpcgen/generator.py index 73731e1497..c6e210e7b0 100644 --- a/scripts/rpcgen/rpcgen/generator.py +++ b/scripts/rpcgen/rpcgen/generator.py @@ -81,7 +81,7 @@ class XDRTypeDeclarationGenerator(XDRVisitor): ) def visit_declaration_variablearray(self, obj, indent, context): - if type(obj.typ) == XDRTypeString: + if type(obj.typ) is XDRTypeString: return "%schar *%s" % (indent, obj.identifier) else: code = ( @@ -178,10 +178,10 @@ class XDRTypeDeclarationGenerator(XDRVisitor): + "%s union {\n" % indent ) for value in obj.cases: - if type(value.decl.typ) == XDRTypeVoid: + if type(value.decl.typ) is XDRTypeVoid: continue code = code + self.visit_object(value, indent + " ") + ";\n" - if obj.default is not None and type(obj.default.typ) != XDRTypeVoid: + if obj.default is not None and type(obj.default.typ) is not XDRTypeVoid: code = code + self.visit_object(obj.default, indent + " ") + ";\n" code = code + "%s } %su;\n" % (indent, prefix) + "%s}" % indent return code @@ -250,10 +250,10 @@ class XDRMarshallImplementationGenerator(XDRVisitor): return code def generate_type_call(self, decl, field, typename, embedded=False, indent=""): - if type(decl.typ) == XDRTypeVoid: + if type(decl.typ) is XDRTypeVoid: return "" - if type(decl) == XDRDeclarationFixedArray: - if type(decl.typ) == XDRTypeOpaque: + if type(decl) is XDRDeclarationFixedArray: + if type(decl.typ) is XDRTypeOpaque: code = "%s if (!xdr_%s(xdrs, %s, %s))\n" % ( indent, self.visit_object(decl.typ, context="func"), @@ -270,7 +270,7 @@ class XDRMarshallImplementationGenerator(XDRVisitor): self.visit_object(decl.typ), self.visit_object(decl.typ, context="func"), ) - elif type(decl) == XDRDeclarationVariableArray: + elif type(decl) is XDRDeclarationVariableArray: fieldRef = "." pointerStr = "" if embedded: @@ -278,7 +278,7 @@ class XDRMarshallImplementationGenerator(XDRVisitor): else: fieldRef = "->" - if type(decl.typ) == XDRTypeString: + if type(decl.typ) is XDRTypeString: code = "%s if (!xdr_%s(xdrs, %s%s, %s))\n" % ( indent, self.visit_object(decl.typ, context="func"), @@ -286,7 +286,7 @@ class XDRMarshallImplementationGenerator(XDRVisitor): field, decl.maxlength, ) - elif type(decl.typ) == XDRTypeOpaque: + elif type(decl.typ) is XDRTypeOpaque: code = "%s if (!xdr_bytes(xdrs, (char **)&%s%s%s_val, " % ( indent, field, @@ -311,7 +311,7 @@ class XDRMarshallImplementationGenerator(XDRVisitor): self.visit_object(decl.typ, context="func"), ) ) - elif type(decl) == XDRDeclarationPointer: + elif type(decl) is XDRDeclarationPointer: pointerStr = "" if embedded: pointerStr = "&" @@ -327,9 +327,9 @@ class XDRMarshallImplementationGenerator(XDRVisitor): else: pointerStr = "" isFixedArray = ( - type(decl.typ) == XDRTypeCustom - and type(decl.typ.definition) == XDRDefinitionTypedef - and type(decl.typ.definition.decl) == XDRDeclarationFixedArray + type(decl.typ) is XDRTypeCustom + and type(decl.typ.definition) is XDRDefinitionTypedef + and type(decl.typ.definition.decl) is XDRDeclarationFixedArray ) if embedded and not isFixedArray: diff --git a/scripts/rpcgen/rpcgen/lexer.py b/scripts/rpcgen/rpcgen/lexer.py index 989c2ae216..a27d7005b8 100644 --- a/scripts/rpcgen/rpcgen/lexer.py +++ b/scripts/rpcgen/rpcgen/lexer.py @@ -55,7 +55,7 @@ class XDRToken(abc.ABC): def __eq__(self, other): return ( - type(self) == type(other) + type(self) is type(other) and self.line == other.line and self.column == other.column and self.value == other.value diff --git a/scripts/rpcgen/rpcgen/parser.py b/scripts/rpcgen/rpcgen/parser.py index 7efbe5468e..c01ae56755 100644 --- a/scripts/rpcgen/rpcgen/parser.py +++ b/scripts/rpcgen/rpcgen/parser.py @@ -162,10 +162,10 @@ class XDRParser: if token is None: return None - if type(token) == XDRTokenCEscape: + if type(token) is XDRTokenCEscape: return XDRDefinitionCEscape(token.value[1:]) - if type(token) != XDRTokenIdentifier: + if type(token) is not XDRTokenIdentifier: raise Exception("Expected identifier, but got %s" % token) defs = { @@ -186,18 +186,18 @@ class XDRParser: definition = func() semi = self.lexer.next() - if type(semi) != XDRTokenPunctuation or semi.value != ";": + if type(semi) is not XDRTokenPunctuation or semi.value != ";": raise Exception("Expected ';', but got %s" % semi) return definition def parse_definition_const(self): ident = self.lexer.next() - if type(ident) != XDRTokenIdentifier: + if type(ident) is not XDRTokenIdentifier: raise Exception("Expected identifier, but got %s" % ident) assign = self.lexer.next() - if type(assign) != XDRTokenPunctuation or assign.value != "=": + if type(assign) is not XDRTokenPunctuation or assign.value != "=": raise Exception("Expected '=', but got %s" % assign) const = self.lexer.next() @@ -217,7 +217,7 @@ class XDRParser: def parse_definition_enum(self): name = self.lexer.next() - if type(name) != XDRTokenIdentifier: + if type(name) is not XDRTokenIdentifier: raise Exception("Expected identifier, but got %s" % name) body = self.parse_enum_body() @@ -231,7 +231,7 @@ class XDRParser: def parse_definition_struct(self): name = self.lexer.next() - if type(name) != XDRTokenIdentifier: + if type(name) is not XDRTokenIdentifier: raise Exception("Expected identifier, but got %s" % name) body = self.parse_struct_body() @@ -245,7 +245,7 @@ class XDRParser: def parse_definition_union(self): name = self.lexer.next() - if type(name) != XDRTokenIdentifier: + if type(name) is not XDRTokenIdentifier: raise Exception("Expected identifier, but got %s" % name) body = self.parse_union_body() @@ -260,23 +260,23 @@ class XDRParser: def parse_declaration(self): typ = self.parse_type() - if type(typ) == XDRTypeVoid: + if type(typ) is XDRTypeVoid: return XDRDeclarationScalar(typ, None) ident = self.lexer.next() pointer = False - if type(ident) == XDRTokenPunctuation: + if type(ident) is XDRTokenPunctuation: if ident.value != "*": raise Exception("Expected '*' or identifer, but got %s" % ident) - if type(typ) == XDRTypeString or type(typ) == XDRTypeOpaque: + if type(typ) is XDRTypeString or type(typ) is XDRTypeOpaque: raise Exception("Pointer invalid for 'string' and 'opaque' types") pointer = True ident = self.lexer.next() bracket = self.lexer.peek() - if type(bracket) == XDRTokenPunctuation: + if type(bracket) is XDRTokenPunctuation: if bracket.value == "[": _ = self.lexer.next() value = self.lexer.next() @@ -284,10 +284,10 @@ class XDRParser: raise Exception("Expected constant, but got %s" % value) close = self.lexer.next() - if type(close) != XDRTokenPunctuation or close.value != "]": + if type(close) is not XDRTokenPunctuation or close.value != "]": raise Exception("Expected ']', but got %s" % value) - if type(typ) == XDRTypeString: + if type(typ) is XDRTypeString: raise Exception("Fixed array invalid for 'string' type") return XDRDeclarationFixedArray(typ, ident.value, value.value) elif bracket.value == "<": @@ -298,7 +298,7 @@ class XDRParser: value = self.lexer.next().value close = self.lexer.next() - if type(close) != XDRTokenPunctuation or close.value != ">": + if type(close) is not XDRTokenPunctuation or close.value != ">": raise Exception("Expected '>', but got %s" % close) return XDRDeclarationVariableArray(typ, ident.value, value) @@ -310,12 +310,12 @@ class XDRParser: def parse_type(self): typ = self.lexer.next() - if type(typ) != XDRTokenIdentifier: + if type(typ) is not XDRTokenIdentifier: raise Exception("Expected identifier, but got %s" % typ) if typ.value == "unsigned": typ = self.lexer.peek() - if type(typ) != XDRTokenIdentifier: + if type(typ) is not XDRTokenIdentifier: raise Exception("Expected identifier, but got %s" % typ) if typ.value == "char": @@ -366,25 +366,25 @@ class XDRParser: def parse_enum_body(self): body = self.lexer.next() - if type(body) != XDRTokenPunctuation or body.value != "{": + if type(body) is not XDRTokenPunctuation or body.value != "{": raise Exception("Expected '{', but got %s" % body) values = [] while True: ident = self.lexer.next() - if type(ident) != XDRTokenIdentifier: + if type(ident) is not XDRTokenIdentifier: raise Exception("Expected identifier, but got %s" % ident) equal = self.lexer.next() - if type(equal) != XDRTokenPunctuation or equal.value != "=": + if type(equal) is not XDRTokenPunctuation or equal.value != "=": raise Exception("Expected '=', but got %s" % ident) value = self.lexer.next() - if type(value) != XDRTokenConstant: + if type(value) is not XDRTokenConstant: raise Exception("Expected constant, but got %s" % ident) separator = self.lexer.next() - if type(separator) != XDRTokenPunctuation and separator.value not in [ + if type(separator) is not XDRTokenPunctuation and separator.value not in [ "}", ",", ]: @@ -403,7 +403,7 @@ class XDRParser: def parse_struct_body(self): body = self.lexer.next() - if type(body) != XDRTokenPunctuation or body.value != "{": + if type(body) is not XDRTokenPunctuation or body.value != "{": raise Exception("Expected '{', but got %s" % body) fields = [] @@ -412,11 +412,11 @@ class XDRParser: fields.append(field) separator = self.lexer.next() - if type(separator) != XDRTokenPunctuation and separator.value != ";": + if type(separator) is not XDRTokenPunctuation and separator.value != ";": raise Exception("Expected ';', but got %s" % separator) end = self.lexer.peek() - if type(end) == XDRTokenPunctuation and end.value == "}": + if type(end) is XDRTokenPunctuation and end.value == "}": break # discard the '}' we peeked at to end the loop @@ -429,28 +429,28 @@ class XDRParser: def parse_union_body(self): ident = self.lexer.next() - if type(ident) != XDRTokenIdentifier or ident.value != "switch": + if type(ident) is not XDRTokenIdentifier or ident.value != "switch": raise Exception("Expected 'switch', but got %s" % ident) bracket = self.lexer.next() - if type(bracket) != XDRTokenPunctuation or bracket.value != "(": + if type(bracket) is not XDRTokenPunctuation or bracket.value != "(": raise Exception("Expected '(', but got %s" % bracket) discriminator = self.parse_declaration() bracket = self.lexer.next() - if type(bracket) != XDRTokenPunctuation or bracket.value != ")": + if type(bracket) is not XDRTokenPunctuation or bracket.value != ")": raise Exception("Expected ')', but got %s" % bracket) bracket = self.lexer.next() - if type(bracket) != XDRTokenPunctuation or bracket.value != "{": + if type(bracket) is not XDRTokenPunctuation or bracket.value != "{": raise Exception("Expected '{', but got %s" % bracket) default = None cases = [] while True: ident = self.lexer.next() - if type(ident) != XDRTokenIdentifier or ident.value not in [ + if type(ident) is not XDRTokenIdentifier or ident.value not in [ "default", "case", ]: @@ -463,7 +463,7 @@ class XDRParser: raise Exception("Expected constant, but got %s" % value) sep = self.lexer.next() - if type(sep) != XDRTokenPunctuation or sep.value != ":": + if type(sep) is not XDRTokenPunctuation or sep.value != ":": raise Exception("Expected ':', but got %s" % value) decl = self.parse_declaration() @@ -475,17 +475,17 @@ class XDRParser: raise Exception("Duplicate 'default' clause") sep = self.lexer.next() - if type(sep) != XDRTokenPunctuation or sep.value != ":": + if type(sep) is not XDRTokenPunctuation or sep.value != ":": raise Exception("Expected ':', but got %s" % value) default = self.parse_declaration() separator = self.lexer.next() - if type(separator) != XDRTokenPunctuation and separator.value != ";": + if type(separator) is not XDRTokenPunctuation and separator.value != ";": raise Exception("Expected ';', but got %s" % bracket) end = self.lexer.peek() - if type(end) == XDRTokenPunctuation and end.value == "}": + if type(end) is XDRTokenPunctuation and end.value == "}": break # discard the '}' we peeked at to end the loop -- 2.41.0

3 2

[PATCH] ci: drop mipsel on Debian Sid
by Daniel P. Berrangé 06 Nov '23

06 Nov '23

This port was discontinued and purged from the archives: https://lists.debian.org/debian-devel-announce/2023/09/msg00000.html Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- ci/buildenv/debian-sid-cross-mipsel.sh | 115 ----------------- .../debian-sid-cross-mipsel.Dockerfile | 121 ------------------ ci/gitlab/builds.yml | 22 ---- ci/gitlab/containers.yml | 8 -- ci/manifest.yml | 4 - 5 files changed, 270 deletions(-) delete mode 100644 ci/buildenv/debian-sid-cross-mipsel.sh delete mode 100644 ci/containers/debian-sid-cross-mipsel.Dockerfile diff --git a/ci/buildenv/debian-sid-cross-mipsel.sh b/ci/buildenv/debian-sid-cross-mipsel.sh deleted file mode 100644 index 90dac8c22a..0000000000 --- a/ci/buildenv/debian-sid-cross-mipsel.sh +++ /dev/null @@ -1,115 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - iproute2 \ - iptables \ - kmod \ - libc-dev-bin \ - libnbd-dev \ - libxml2-utils \ - locales \ - lvm2 \ - make \ - meson \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - perl-base \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - qemu-utils \ - scrub \ - sed \ - xsltproc - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - export DEBIAN_FRONTEND=noninteractive - dpkg --add-architecture mipsel - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y dpkg-dev - apt-get install --no-install-recommends -y \ - gcc-mipsel-linux-gnu \ - libacl1-dev:mipsel \ - libapparmor-dev:mipsel \ - libattr1-dev:mipsel \ - libaudit-dev:mipsel \ - libblkid-dev:mipsel \ - libc6-dev:mipsel \ - libcap-ng-dev:mipsel \ - libcurl4-gnutls-dev:mipsel \ - libdevmapper-dev:mipsel \ - libfuse-dev:mipsel \ - libglib2.0-dev:mipsel \ - libglusterfs-dev:mipsel \ - libgnutls28-dev:mipsel \ - libiscsi-dev:mipsel \ - libnl-3-dev:mipsel \ - libnl-route-3-dev:mipsel \ - libnuma-dev:mipsel \ - libparted-dev:mipsel \ - libpcap0.8-dev:mipsel \ - libpciaccess-dev:mipsel \ - librbd-dev:mipsel \ - libreadline-dev:mipsel \ - libsanlock-dev:mipsel \ - libsasl2-dev:mipsel \ - libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ - libssh2-1-dev:mipsel \ - libtirpc-dev:mipsel \ - libudev-dev:mipsel \ - libxml2-dev:mipsel \ - libyajl-dev:mipsel \ - systemtap-sdt-dev:mipsel - mkdir -p /usr/local/share/meson/cross - printf "[binaries]\n\ -c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ -ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/mipsel-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'mips'\n\ -cpu = 'mipsel'\n\ -endian = 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export MAKE="/usr/bin/make" -export NINJA="/usr/bin/ninja" -export PYTHON="/usr/bin/python3" - -export ABI="mipsel-linux-gnu" -export MESON_OPTS="--cross-file=mipsel-linux-gnu" diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile deleted file mode 100644 index 81895b23dd..0000000000 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ /dev/null @@ -1,121 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:sid-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - iproute2 \ - iptables \ - kmod \ - libc-dev-bin \ - libnbd-dev \ - libxml2-utils \ - locales \ - lvm2 \ - make \ - meson \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - perl-base \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - qemu-utils \ - scrub \ - sed \ - xsltproc && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture mipsel && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mipsel-linux-gnu \ - libacl1-dev:mipsel \ - libapparmor-dev:mipsel \ - libattr1-dev:mipsel \ - libaudit-dev:mipsel \ - libblkid-dev:mipsel \ - libc6-dev:mipsel \ - libcap-ng-dev:mipsel \ - libcurl4-gnutls-dev:mipsel \ - libdevmapper-dev:mipsel \ - libfuse-dev:mipsel \ - libglib2.0-dev:mipsel \ - libglusterfs-dev:mipsel \ - libgnutls28-dev:mipsel \ - libiscsi-dev:mipsel \ - libnl-3-dev:mipsel \ - libnl-route-3-dev:mipsel \ - libnuma-dev:mipsel \ - libparted-dev:mipsel \ - libpcap0.8-dev:mipsel \ - libpciaccess-dev:mipsel \ - librbd-dev:mipsel \ - libreadline-dev:mipsel \ - libsanlock-dev:mipsel \ - libsasl2-dev:mipsel \ - libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ - libssh2-1-dev:mipsel \ - libtirpc-dev:mipsel \ - libudev-dev:mipsel \ - libxml2-dev:mipsel \ - libyajl-dev:mipsel \ - systemtap-sdt-dev:mipsel && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ -ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/mipsel-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'mips'\n\ -cpu = 'mipsel'\n\ -endian = 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc - -ENV ABI "mipsel-linux-gnu" -ENV MESON_OPTS "--cross-file=mipsel-linux-gnu" diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index e1ea87db1b..2beca51767 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -898,28 +898,6 @@ mips64el-debian-sid-local-env: NAME: debian-sid -mipsel-debian-sid-prebuilt-env: - extends: .cross_build_job_prebuilt_env - needs: - - job: mipsel-debian-sid-container - optional: true - allow_failure: false - variables: - CROSS: mipsel - JOB_OPTIONAL: 1 - NAME: debian-sid - -mipsel-debian-sid-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: mipsel - IMAGE: docker.io/library/debian:sid-slim - JOB_OPTIONAL: 1 - NAME: debian-sid - - ppc64le-debian-sid-prebuilt-env: extends: .cross_build_job_prebuilt_env needs: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 05d22f7336..2463d1a5aa 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -283,14 +283,6 @@ mips64el-debian-sid-container: NAME: debian-sid-cross-mips64el -mipsel-debian-sid-container: - extends: .container_job - allow_failure: false - variables: - JOB_OPTIONAL: 1 - NAME: debian-sid-cross-mipsel - - ppc64le-debian-sid-container: extends: .container_job allow_failure: false diff --git a/ci/manifest.yml b/ci/manifest.yml index 2af8e62f28..e115f45b2c 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -144,10 +144,6 @@ targets: containers: false builds: false - - arch: mipsel - containers: false - builds: false - - arch: ppc64le containers: false builds: false -- 2.41.0

2 1

[libvirt PATCH 01/15] util: properly deal with module vs. driver when binding device to driver
by Laine Stump 06 Nov '23

06 Nov '23

(Sigh, resent because I forgot to update the list address in the reply :-/) Sorry, I meant to respond to this earlier and forgot. Now I'm sending v2 of the patches, and wanted to make sure you didn't think I was just ignoring your comments :-) (since this patch is still there in V2) On 10/23/23 9:39 AM, Jason Gunthorpe wrote: > On Mon, Oct 23, 2023 at 12:54:37AM -0400, Laine Stump wrote: > >> When we recently gained the ability to manually specify a driver to >> bind to with virsh nodedev-detach, the fragility of this system became >> apparent - if a user gives the driver name as "vfio_pci", then we >> would modprobe the module, but then erroneously believe it hadn't been >> loaded because /sys/bus/pci/drivers/vfio_pci didn't exist. For manual >> specification of the driver name, this could be dealt with by telling >> the user "always use the correct name for the driver, don't assume >> that it is the same as the modulename", but it would still end up >> confusing people, especially since some drivers do use underscore in >> their name (e.g. the mlx5_vfio_pci driver/module). > > I think you are creating more confusion by allowing this. The driver > name from module.alias should be used consistently in its exact > format. But the name in the modules.alias file *is not* the name of the driver. It is the name of the module, and the name of the driver may or may not be the same - that's the entire reason this issue came to light. And in the end I don't do anything more than what modprobe itself does. (Well, actually that's not true, since modprobe never has to actually *use* the drivers that are implemented by the modules that it loads, it doesn't need to understand that the name of the driver may be different from the name of the module, and so it doesn't have to look at the link in /sys/modules/$modulename/drivers/pci:$drivername to get the proper name that must be written to sysfs to get the driver bound to the device. It just unilaterally decides that all horizontal lines in a module name are "_", and so it replaces all "-" with "_") Really it is modprobe's practice of auto-translating all "-" to "_", combined with the inconsistency of naming between module names and driver names that is causing the confusion; what this patch is doing is helping to clear up that confusion, not make it worse. Essentially, whether someone uses the module name or the driver name, libvirt will get the correct driver bound to the device. (and we do have to allow both module name and driver name; the former in cases where the module hasn't been loaded yet and so the driver isn't available, and the latter in cases where the driver is statically linked into the kernel, as discussed below). > > Log a 'did you mean XYZ" or something if it doesn't work out. > > Pass the "driver name" directly to modprobe and let it sort it out In the cases (e.g. vfio_pci/vfio-pci) where the module name and driver name mismatch only due to -/_, what you say will work as long as the *driver* name is used (i.e. "vfio-pci"), but if we use the name discovered from modules.alias ("vfio_pci") then the modprobe will succeed, but the bind will fail. And we can't just assume that the driver name will always have "-" in place of "_" and do an auto-replace in the name prior to binding the device to the driver, because some drivers (in particular, mlx5_vfio_pci/mlx5_vfio_pci) *don't* use "-" in the driver name. libvirt has to do *something* in order to work in both of these cases, and I think anything less than what I've done would be "half baked" (well, half *something*, but I'd rather not swear on a public forum :-)) > Forget about modules entirely in the libvirt level, don't even check > it. Yes, if we're manually specifying the driver, then (at least in the case of vfio-pci and mlx5_vfio_pci) it *does* work to always use the driver name (because modprobe will change vfio-pci to vfio_pci, and leave mlx5_vfio_pci alone). But when we're discovering the variant driver via modules.alias (which is the official method of finding the best VFIO variant driver for a device), we don't start out with the driver name, we start out with (a modalias string, that leads us to) the *module* name, not a driver name. And while modprobe will of course accept the name of the module to load, you can't use the module name to bind the driver to the kernel - you have to do *something* to derive the driver name from the module name. That's what this code does. (I haven't seen an example where module name and driver name have more differences than just "-" vs "_", and it appears to be convention to "not do that", however it theoretically is completely doable - the driver name is just a string in a C file. I'd rather not have my code break at some random time in the future when somebody writes such a driver.) > >> c) All of this is conveniently ignoring the possibility of a VFIO >> variant driver that is statically linked in the kernel. The entire >> design of variant driver auto-detection is based on doing a lookup >> in modules.alias, and that only lists *loadable modules* (not >> drivers), so unless I'm missing something, it would be impossible >> to auto-detect a VFIO variant driver that was statically >> linked. This is beyond libvirt's ability to fix; the best that >> could be done would be to manually specify the driver name in the >> libvirt config, which I suppose is better than nothing :-) > > Why? This seems wrong. Statically linked drivers appear in > /sys/bus/drivers/XX too Yes, they appear in /sys/bus/drivers. But there isn't (as far as I know so far) a way to programmatically associate a statically linked variant driver with a device using the information available from the running kernel. What I've been told until now is that the only way to find the proper VFIO variant driver for a particular device is to take the modalias string from that device's sysfs directory, and search for a line in the modules.alias file that starts with "alias vfio_pci:" and has the "most specific match" for the device's modalias - *that* is the name of the *module* that contains the best VFIO variant driver for the device. If a driver is statically linked into the kernel, then it doesn't have a module, so it doesn't get a line in modules.alias (does it? I suppose I should try that to verify, but it doesn't make sense), and so there is no way to identify that driver as being a match for a device. Or am I missing something? In this case, as I've said in the commit logs somewhere, it's still possible to use a statically linked variant driver for a device, you just have to manually specify the driver name rather than having code that discovers it (which is what you have to do for *all* variant drivers until the final patch of this series anyway :-)

1 0

[PATCH] build: suppress "ignoring duplicate libraries" warning on macOS
by Laine Stump 03 Nov '23

03 Nov '23

Xcode 15, which provides the compiler toolchain for building libvirt on macOS has switched to a new linker that warns about duplicated "-lblah" options on the ld commandline. In practice this is impossible to prevent in a large project, and also harmless. Fortunately the new ld command also has an option, -no_warn_duplicate_libraries, that supresses this harmless/pointless warning, meson has a simple way to check if that option is supported, and libvirt's meson.build files already have examples of adding an option to the ld commandline if it's available. Signed-off-by: Laine Stump <laine(a)redhat.com> --- meson.build | 4 ++++ src/meson.build | 1 + tests/meson.build | 1 + tools/meson.build | 1 + 4 files changed, 7 insertions(+) diff --git a/meson.build b/meson.build index dc0969abcc..a39f942617 100644 --- a/meson.build +++ b/meson.build @@ -542,6 +542,10 @@ libvirt_no_indirect = cc.get_supported_link_arguments([ '-Wl,--no-copy-dt-needed-entries', ]) +libvirt_no_warn_duplicate_libraries = cc.get_supported_link_arguments([ + '-Wl,-no_warn_duplicate_libraries', +]) + if host_machine.system() == 'windows' version_script_flags = '-Wl,' elif host_machine.system() == 'darwin' diff --git a/src/meson.build b/src/meson.build index 5fc4d03b4a..6538c43628 100644 --- a/src/meson.build +++ b/src/meson.build @@ -18,6 +18,7 @@ src_dep = declare_dependency( link_args: ( libvirt_relro + libvirt_no_indirect + + libvirt_no_warn_duplicate_libraries + coverage_flags + driver_modules_flags + win32_link_flags diff --git a/tests/meson.build b/tests/meson.build index b235c5f4dd..e1cd57654a 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -28,6 +28,7 @@ tests_dep = declare_dependency( ], link_args: ( libvirt_export_dynamic + + libvirt_no_warn_duplicate_libraries + libvirt_flat_namespace + coverage_flags ), diff --git a/tools/meson.build b/tools/meson.build index f2d58cfdcb..c72f760a1d 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -16,6 +16,7 @@ tools_dep = declare_dependency( libvirt_relro + libvirt_no_indirect + libvirt_no_undefined + + libvirt_no_warn_duplicate_libraries ), ) -- 2.41.0

3 2

[PATCH] tests: ignore $__CF_USER_TEXT_ENCODING in env during commandtest
by Laine Stump 03 Nov '23

03 Nov '23

This environment variable is supposedly set according to the contents of ~/.CFUserTextEncoding, and certainly on MacOS 14 (Sonoma) it shows up in the environment, causing commandtest to fail. However, the value that is shown in $__CF_USER_TEXT_ENCODING during the test 1) is not in the environment of the shell the test is run from, and 2) doesn't match the contents of ~/.CFUserTextEncoding. It is true, though, that filtering out this environment setting from the test results permits commandtest to pass on MacOS 14. Signed-off-by: Laine Stump <laine(a)redhat.com> --- [*] There may be a better way to suppress this environment setting (maybe something done to prevent it from ever being added to the environment in the first place?), and that would be fine too. This patch does work though. [*] Andrea's patches to force rpcgen to generate ANSI C code are also required for the test suite to pass on MacOS 14. tests/commandhelper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 9b56feb120..08ee48a3a8 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -169,9 +169,12 @@ static int printEnvironment(FILE *log) for (i = 0; i < length; i++) { /* Ignore the variables used to instruct the loader into - * behaving differently, as they could throw the tests off. */ - if (!STRPREFIX(newenv[i], "LD_")) + * behaving differently, as they could throw the tests off. + * Also ignore __CF_USER_TEXT_ENCODING, which is set by MacOS. */ + if (!STRPREFIX(newenv[i], "LD_") && + !STRPREFIX(newenv[i], "__CF_USER_TEXT_ENCODING=")) { fprintf(log, "ENV:%s\n", newenv[i]); + } } return 0; -- 2.41.0

3 10

[libvirt PATCH] qemu_process: fix crash in qemuSaveImageDecompressionStart
by Pavel Hrdina 03 Nov '23

03 Nov '23

Commit changing the code to allow passing NULL as @data into qemuSaveImageDecompressionStart() was not correct as it left the original call into the function as well. Introduced-by: 2f3e582a1ac1008eba8d43c751cdba8712dd1614 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2247754 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_process.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1ef032dbd2..b9267d8699 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8208,9 +8208,6 @@ qemuProcessStartWithMemoryState(virConnectPtr conn, } } - if (qemuSaveImageDecompressionStart(data, fd, &intermediatefd, &errbuf, &cmd) < 0) - return -1; - /* No cookie means libvirt which saved the domain was too old to mess up * the CPU definitions. */ -- 2.41.0

2 1

[PATCH 00/16] Farewell rpcgen
by Daniel P. Berrangé 03 Nov '23

03 Nov '23

This series something I was hacking on a little while back in an attempt to make our RPC layer more maintainable. There are many aspects I'm unhappy about with current code * When serializing a message we have no clue how big it will be, but xdrmem_create wants a fixed size, so we have to keep trying to serialize in a loop making it bigger each time * We don't control memory allocation/free'ing directly so we can't do a virSecureErase on fields inside the RPC message struct that handle secrets. * The XDR API is generally unpleasant to use as it is outside our virNetMessage object. Ideally we would be reading/writing directly from/to the virNetMessage buffer with APIs on virNetMessage,instead of indirectly via a XDR object. * We want more from XDR than it actually gives us. Our XDR protocol files have annotations to express what we want our code generator todo, or for ACLs. The relationship between the structs and the message numbers is implicit. Essentially we've defined our own language indirectly via comments, and then parse this with regexes which is horrid. * The code rpcgen creates is poor quality which we have to post-process to fix bugs/problems. It also lacks support for modern features like g_auto. Anyway, in a fit of rage I looked at the XDR RFC and thought.. This language is trivial, why do we need to outsource to rpcgen and libtirpc instead of dealing with it directly. This small series moves in that direction. It creates an XDR language lexer and parser, and then a code generator which emits code that is (nearly) identical to what rpcgen would emit. This is sufficient to eliminate rpcgen usage and support g_auto. Since we're still using libtirpc at this stage we can be confident we're still doing the same thing on the wire. I've got some unit tests too with the rpcgen generation to validate stuff. The next step is to change the code generator so that instead of generating code for libtirpc APIs, it will instead directly speak virNetMessage APIs. That would give us full control over our RPC stack guaranteed to be platform portable instead of fighting slight differences in RPC libraries (eg xdr_quad vs xdr_int64 madness). I was going to wait until I had written such code before sending this series, but I've got diverted onto other more important tasks. So here at least is what I have so far. After that foundation is done, we are in a place where we can actually do more innovative things. For example we can directly extend the XDR protocol language if we like, turning our magic comments into properly parsable constructs. With this, we would be in a position to replace our Perl RPC client/server dispatch code generators with something that is more supportable in Python. The python code would work with properly represented objects and formal parsers and not regexes and anonymous complex perl data structures. Daniel P. Berrangé (16): rpcgen: drop type-puning workarounds build-aux: skip E203 and W503 flake8 checks build-aux: introduce 'black' tool for python formatting rpcgen: add an XDR protocol lexer rpcgen: add an XDR protocol abstract syntax tree rpcgen: add an XDR protocol parser rpcgen: define a visitor API for XDR protocol specs rpcgen: add a C code generator for XDR protocol specs rpcgen: add test case for XDR serialization rpcgen: define entrypoint for running new rpcgen impl build: switch over to new rpc generator code rpcgen: add g_auto function support rpc: use g_auto for client RPC return parameters admin: use g_auto for client RPC return parameters remote: use g_auto for client RPC return parameters rpc: add helpers for XDR type serialization build-aux/Makefile.in | 1 + build-aux/meson.build | 5 + build-aux/syntax-check.mk | 42 +- libvirt.spec.in | 2 +- meson.build | 13 +- scripts/meson.build | 2 + scripts/rpcgen/main.py | 90 ++ scripts/rpcgen/meson.build | 16 + scripts/rpcgen/rpcgen/ast.py | 270 ++++++ scripts/rpcgen/rpcgen/generator.py | 509 ++++++++++++ scripts/rpcgen/rpcgen/lexer.py | 213 +++++ scripts/rpcgen/rpcgen/meson.build | 7 + scripts/rpcgen/rpcgen/parser.py | 497 +++++++++++ scripts/rpcgen/rpcgen/visitor.py | 156 ++++ scripts/rpcgen/tests/demo.c | 495 +++++++++++ scripts/rpcgen/tests/demo.h | 264 ++++++ scripts/rpcgen/tests/demo.x | 127 +++ scripts/rpcgen/tests/meson.build | 20 + scripts/rpcgen/tests/simple.x | 35 + scripts/rpcgen/tests/test_demo.c | 782 ++++++++++++++++++ scripts/rpcgen/tests/test_demo_enum.bin | Bin 0 -> 4 bytes .../tests/test_demo_enum_fixed_array.bin | Bin 0 -> 52 bytes .../tests/test_demo_enum_pointer_null.bin | Bin 0 -> 4 bytes .../tests/test_demo_enum_pointer_set.bin | Bin 0 -> 8 bytes .../rpcgen/tests/test_demo_enum_scalar.bin | Bin 0 -> 4 bytes .../test_demo_enum_variable_array_empty.bin | Bin 0 -> 4 bytes .../test_demo_enum_variable_array_set.bin | Bin 0 -> 16 bytes .../tests/test_demo_int_fixed_array.bin | Bin 0 -> 12 bytes .../tests/test_demo_int_pointer_null.bin | Bin 0 -> 4 bytes .../tests/test_demo_int_pointer_set.bin | Bin 0 -> 8 bytes scripts/rpcgen/tests/test_demo_int_scalar.bin | Bin 0 -> 4 bytes .../test_demo_int_variable_array_empty.bin | Bin 0 -> 4 bytes .../test_demo_int_variable_array_set.bin | Bin 0 -> 16 bytes .../tests/test_demo_opaque_fixed_array.bin | Bin 0 -> 12 bytes .../test_demo_opaque_variable_array_empty.bin | Bin 0 -> 4 bytes .../test_demo_opaque_variable_array_set.bin | Bin 0 -> 8 bytes .../test_demo_string_variable_array_empty.bin | Bin 0 -> 4 bytes .../test_demo_string_variable_array_set.bin | Bin 0 -> 12 bytes scripts/rpcgen/tests/test_demo_struct.bin | Bin 0 -> 8 bytes .../tests/test_demo_struct_fixed_array.bin | Bin 0 -> 136 bytes .../tests/test_demo_struct_pointer_null.bin | Bin 0 -> 4 bytes .../tests/test_demo_struct_pointer_set.bin | Bin 0 -> 12 bytes .../rpcgen/tests/test_demo_struct_scalar.bin | 1 + .../test_demo_struct_variable_array_empty.bin | Bin 0 -> 4 bytes .../test_demo_struct_variable_array_set.bin | Bin 0 -> 28 bytes .../tests/test_demo_test_struct_all_types.bin | Bin 0 -> 1752 bytes scripts/rpcgen/tests/test_demo_union_case.bin | Bin 0 -> 8 bytes .../rpcgen/tests/test_demo_union_default.bin | Bin 0 -> 8 bytes .../tests/test_demo_union_fixed_array.bin | Bin 0 -> 168 bytes .../tests/test_demo_union_no_default_case.bin | Bin 0 -> 8 bytes .../tests/test_demo_union_pointer_null.bin | Bin 0 -> 4 bytes .../tests/test_demo_union_pointer_set.bin | Bin 0 -> 12 bytes .../rpcgen/tests/test_demo_union_scalar.bin | Bin 0 -> 8 bytes .../test_demo_union_variable_array_empty.bin | Bin 0 -> 4 bytes .../test_demo_union_variable_array_set.bin | Bin 0 -> 28 bytes .../test_demo_union_void_default_case.bin | Bin 0 -> 8 bytes .../test_demo_union_void_default_default.bin | 1 + scripts/rpcgen/tests/test_generator.py | 60 ++ scripts/rpcgen/tests/test_lexer.py | 116 +++ scripts/rpcgen/tests/test_parser.py | 91 ++ src/admin/admin_remote.c | 50 +- src/admin/meson.build | 8 +- src/locking/meson.build | 8 +- src/logging/meson.build | 8 +- src/lxc/meson.build | 12 +- src/remote/meson.build | 8 +- src/remote/remote_driver.c | 754 ++++++----------- src/rpc/gendispatch.pl | 60 +- src/rpc/genprotocol.pl | 144 ---- src/rpc/meson.build | 9 +- src/rpc/virnetmessage.c | 704 ++++++++++++++++ src/rpc/virnetmessage.h | 88 ++ 72 files changed, 4897 insertions(+), 771 deletions(-) create mode 100755 scripts/rpcgen/main.py create mode 100644 scripts/rpcgen/meson.build create mode 100644 scripts/rpcgen/rpcgen/ast.py create mode 100644 scripts/rpcgen/rpcgen/generator.py create mode 100644 scripts/rpcgen/rpcgen/lexer.py create mode 100644 scripts/rpcgen/rpcgen/meson.build create mode 100644 scripts/rpcgen/rpcgen/parser.py create mode 100644 scripts/rpcgen/rpcgen/visitor.py create mode 100644 scripts/rpcgen/tests/demo.c create mode 100644 scripts/rpcgen/tests/demo.h create mode 100644 scripts/rpcgen/tests/demo.x create mode 100644 scripts/rpcgen/tests/meson.build create mode 100644 scripts/rpcgen/tests/simple.x create mode 100644 scripts/rpcgen/tests/test_demo.c create mode 100644 scripts/rpcgen/tests/test_demo_enum.bin create mode 100644 scripts/rpcgen/tests/test_demo_enum_fixed_array.bin create mode 100644 scripts/rpcgen/tests/test_demo_enum_pointer_null.bin create mode 100644 scripts/rpcgen/tests/test_demo_enum_pointer_set.bin create mode 100644 scripts/rpcgen/tests/test_demo_enum_scalar.bin create mode 100644 scripts/rpcgen/tests/test_demo_enum_variable_array_empty.bin create mode 100644 scripts/rpcgen/tests/test_demo_enum_variable_array_set.bin create mode 100644 scripts/rpcgen/tests/test_demo_int_fixed_array.bin create mode 100644 scripts/rpcgen/tests/test_demo_int_pointer_null.bin create mode 100644 scripts/rpcgen/tests/test_demo_int_pointer_set.bin create mode 100644 scripts/rpcgen/tests/test_demo_int_scalar.bin create mode 100644 scripts/rpcgen/tests/test_demo_int_variable_array_empty.bin create mode 100644 scripts/rpcgen/tests/test_demo_int_variable_array_set.bin create mode 100644 scripts/rpcgen/tests/test_demo_opaque_fixed_array.bin create mode 100644 scripts/rpcgen/tests/test_demo_opaque_variable_array_empty.bin create mode 100644 scripts/rpcgen/tests/test_demo_opaque_variable_array_set.bin create mode 100644 scripts/rpcgen/tests/test_demo_string_variable_array_empty.bin create mode 100644 scripts/rpcgen/tests/test_demo_string_variable_array_set.bin create mode 100644 scripts/rpcgen/tests/test_demo_struct.bin create mode 100644 scripts/rpcgen/tests/test_demo_struct_fixed_array.bin create mode 100644 scripts/rpcgen/tests/test_demo_struct_pointer_null.bin create mode 100644 scripts/rpcgen/tests/test_demo_struct_pointer_set.bin create mode 100644 scripts/rpcgen/tests/test_demo_struct_scalar.bin create mode 100644 scripts/rpcgen/tests/test_demo_struct_variable_array_empty.bin create mode 100644 scripts/rpcgen/tests/test_demo_struct_variable_array_set.bin create mode 100644 scripts/rpcgen/tests/test_demo_test_struct_all_types.bin create mode 100644 scripts/rpcgen/tests/test_demo_union_case.bin create mode 100644 scripts/rpcgen/tests/test_demo_union_default.bin create mode 100644 scripts/rpcgen/tests/test_demo_union_fixed_array.bin create mode 100644 scripts/rpcgen/tests/test_demo_union_no_default_case.bin create mode 100644 scripts/rpcgen/tests/test_demo_union_pointer_null.bin create mode 100644 scripts/rpcgen/tests/test_demo_union_pointer_set.bin create mode 100644 scripts/rpcgen/tests/test_demo_union_scalar.bin create mode 100644 scripts/rpcgen/tests/test_demo_union_variable_array_empty.bin create mode 100644 scripts/rpcgen/tests/test_demo_union_variable_array_set.bin create mode 100644 scripts/rpcgen/tests/test_demo_union_void_default_case.bin create mode 100644 scripts/rpcgen/tests/test_demo_union_void_default_default.bin create mode 100644 scripts/rpcgen/tests/test_generator.py create mode 100644 scripts/rpcgen/tests/test_lexer.py create mode 100644 scripts/rpcgen/tests/test_parser.py delete mode 100755 src/rpc/genprotocol.pl -- 2.39.1

3 27

[libvirt PATCH 00/11] ci: Build RPMs on MinGW
by Andrea Bolognani 03 Nov '23

03 Nov '23

Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1059447352 The openSUSE Leap 15 job failed, but that's caused by an unrelated packaging issue: $ pkg-config --cflags libtirpc -I/usr/include/tirpc $ rpm -ql libtirpc-devel | grep usr/include /usr/include/netconfig.h /usr/include/rpc /usr/include/rpc/auth.h /usr/include/rpc/auth_des.h ... /usr/include/rpc/types.h /usr/include/rpc/xdr.h /usr/include/rpcsvc /usr/include/rpcsvc/crypt.h /usr/include/rpcsvc/crypt.x The CI updates towards the end depend on the following unmerged libvirt-ci changes: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/440 Andrea Bolognani (11): rpm: Disable expensive tests for MinGW builds rpm: Explicitly enable NLS support rpm: Rename module-init-tools -> kmod rpm: Explain a couple of BuildRequires rpm: Add libxml2 BuildRequires for xmllint rpm: Shuffle BuildRequires around rpm: Split call to mingw_debug_package rpm: Introduce with_mingw32/with_mingw64 rpm: Introduce with_native ci: Refresh generated files ci: Build RPMs on MinGW .gitlab-ci.yml | 11 +- ci/buildenv/fedora-38-cross-mingw32.sh | 1 + ci/buildenv/fedora-38-cross-mingw64.sh | 1 + ci/buildenv/fedora-rawhide-cross-mingw32.sh | 1 + ci/buildenv/fedora-rawhide-cross-mingw64.sh | 1 + .../fedora-38-cross-mingw32.Dockerfile | 1 + .../fedora-38-cross-mingw64.Dockerfile | 1 + .../fedora-rawhide-cross-mingw32.Dockerfile | 1 + .../fedora-rawhide-cross-mingw64.Dockerfile | 1 + ci/jobs.sh | 19 +- libvirt.spec.in | 470 ++++++++++-------- 11 files changed, 296 insertions(+), 212 deletions(-) -- 2.41.0

2 18

[libvirt PATCH v2 0/1] rpc: Make rpcgen produce ANSI C code
by Andrea Bolognani 03 Nov '23

03 Nov '23

Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1060019687 Changes from [v1] * retain portable-rpcgen support. [v1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/2A3K… Andrea Bolognani (1): rpc: Make rpcgen produce ANSI C code src/rpc/genprotocol.pl | 2 ++ 1 file changed, 2 insertions(+) -- 2.41.0

2 2