- Devel - libvirt List Archives

[PATCH] QEMU: allow to hot plugging virtio-serial-pci device
by shenjiatong 21 Nov '24

21 Nov '24

Virtio-serial-pci device is hot pluggable, losen the restriction and allow user to hot plug it. --- src/qemu/qemu_hotplug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index bddd553c88..55512476e4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -837,7 +837,8 @@ qemuDomainAttachControllerDevice(virDomainObj *vm, { .controller = controller } }; bool releaseaddr = false; - if (controller->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { + if (controller->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI && \ + controller->type != VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("'%1$s' controller cannot be hot plugged."), virDomainControllerTypeToString(controller->type)); -- 2.43.0

3 3

[PATCH 0/4] qemu: Adapt to deprecation of 'reconnect' field for 'stream 'netdevs' and update qemu capablities
by Peter Krempa 19 Nov '24

19 Nov '24

Peter Krempa (4): qemu: capabilities: Restore grouping in 'virQEMUCapsQMPSchemaQueries' qemu: capabilities: Introduce QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS qemu: passt: Use 'reconnect-ms' instead of 'reconnect' with new qemus tests: qemucapabilitiesdata: Update 'x86_64' capabilities for the qemu-9.2 dev cycle src/qemu/qemu_capabilities.c | 18 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_passt.c | 14 +- .../qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 + .../caps_9.2.0_x86_64.replies | 4407 +++++++++-------- .../caps_9.2.0_x86_64.xml | 310 +- .../net-user-passt.x86_64-latest.args | 2 +- 7 files changed, 2523 insertions(+), 2230 deletions(-) -- 2.47.0

2 6

[PATCH 0/4] Add news for recent features and CVEs
by Han Han 19 Nov '24

19 Nov '24

Han Han (4): NEWS: qemu: Add support for hyperv enlightenments features NEWS: cpu_map: Add the EPYC-Genoa cpu mode NEWS: Add the news for CVE-2024-2494 NEWS: Add the news for CVE-2024-4418 NEWS.rst | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) -- 2.47.0

2 5

[PATCH v2] qemuDomainDiskChangeSupported: Add missing iothreads check
by Peter Krempa 19 Nov '24

19 Nov '24

From: Adam Julis <ajulis(a)redhat.com> GSList of iothreads is not allowed to be changed while the virtual machine is running. Resolves: https://issues.redhat.com/browse/RHEL-23607 Signed-off-by: Adam Julis <ajulis(a)redhat.com> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Changes to v1: - extrac to separate function - improve readability of loops and handling of error - fix possibility of infinitely looping if first queue of both queue lists matches src/qemu/qemu_domain.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 66ab4baa8b..153bd56e86 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6591,6 +6591,49 @@ qemuDomainStorageSourceAccessAllow(virQEMUDriver *driver, } +static bool +qemuDomainDiskChangeSupportedIothreads(virDomainDiskDef *disk, + virDomainDiskDef *orig_disk) +{ + GSList *old = orig_disk->iothreads; + GSList *new = disk->iothreads; + + while (true) { + virDomainDiskIothreadDef *old_def; + virDomainDiskIothreadDef *new_def; + size_t i; + + /* match - both empty or both at the end */ + if (!old && !new) + return true; + + /* mismatched length of lists */ + if (!old || !new) + goto fail; + + old_def = old->data; + new_def = new->data; + + if (old_def->id != new_def->id || + old_def->nqueues != new_def->nqueues) + goto fail; + + for (i = 0; i < old_def->nqueues; i++) { + if (old_def->queues[i] != new_def->queues[i]) + goto fail; + } + + new = new->next; + old = old->next; + } + + fail: + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot modify field '<iothreads>' (or it's parts) of the disk")); + return false; +} + + /* * Makes sure the @disk differs from @orig_disk only by the source * path and nothing else. Fields that are being checked and the @@ -6735,6 +6778,9 @@ qemuDomainDiskChangeSupported(virDomainDiskDef *disk, CHECK_EQ(discard, "discard", true); CHECK_EQ(iothread, "iothread", true); + if (!qemuDomainDiskChangeSupportedIothreads(disk, orig_disk)) + return false; + CHECK_STREQ_NULLABLE(domain_name, "backenddomain"); -- 2.47.0

2 1

Plans for 10.10.0 release (freeze on Tuesday 26 Nov)
by Jiri Denemark 19 Nov '24

19 Nov '24

We are getting close to 10.10.0 release of libvirt. To aim for the release on Monday 02 Dec I suggest entering the freeze on Tuesday 26 Nov and tagging RC2 on Thursday 28 Nov. I hope this works for everyone. Jirka

1 0

[PATCH] qemuDomainDiskChangeSupported: Add missing iothreads check
by Adam Julis 18 Nov '24

18 Nov '24

GSList of iothreads is not allowed to be changed while the virtual machine is running. Resolves: https://issues.redhat.com/browse/RHEL-23607 Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- While the qemuDomainDiskChangeSupported() design primarily uses its macros (CHECK_EQ and CHECK_STREQ_NULLABLE), the logic for comparing 2 GSList of iothreads could perhaps be extracted into a separate function (e.g. IothreadsGslistCompare(GSList *first, GSList *second)). I am absolutely not sure about this idea so feel free to comment. src/qemu/qemu_domain.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 298f4bfb9e..2b5222c685 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8505,6 +8505,59 @@ qemuDomainDiskChangeSupported(virDomainDiskDef *disk, CHECK_EQ(discard, "discard", true); CHECK_EQ(iothread, "iothread", true); + /* compare list of iothreads, no change allowed */ + if (orig_disk->iothreads != disk->iothreads) { + GSList *old; + GSList *new = disk->iothreads; + bool print_err = true; + + for (old = orig_disk->iothreads; old; old = old->next) { + virDomainDiskIothreadDef *orig = old->data; + virDomainDiskIothreadDef *update; + print_err = false; + + if (new == NULL) { + print_err = true; + break; + } + + update = new->data; + + if (orig->id != update->id) { + print_err = true; + break; + } + + if (orig->nqueues != update->nqueues) { + print_err = true; + break; + } + + if (orig->nqueues != 0) { + ssize_t i = 0; + + while (i < orig->nqueues) { + if (orig->queues[i] != update->queues[i]) { + print_err = true; + break; + } + } + } + + new = new->next; + if (new) + print_err = true; + } + + if (print_err) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("cannot modify field '%1$s' (or it's parts) of the disk"), + "iothreads"); + return false; + } + } + + CHECK_STREQ_NULLABLE(domain_name, "backenddomain"); -- 2.45.2

3 2

[PATCH 0/3] migration: Fix attempt to fix use of VIR_MIGRATE_PARAM_DEST_XML with VIR_MIGRATE_PERSIST_DEST
by Peter Krempa 18 Nov '24

18 Nov '24

Revert the code, document the quirks. Peter Krempa (3): Revert "qemu: migration: Improve handling of VIR_MIGRATE_PARAM_DEST_XML with VIR_MIGRATE_PERSIST_DEST" API: migration: Warn about use of VIR_MIGRATE_PERSIST_DEST with VIR_MIGRATE_PARAM_DEST_XML manpage: virsh: Add warning about 'migrate' with '--persistent' together with '--xml' docs/manpages/virsh.rst | 22 +++++++++++++-------- include/libvirt/libvirt-domain.h | 13 +++++++++++++ src/qemu/qemu_migration.c | 33 ++++++++++---------------------- 3 files changed, 37 insertions(+), 31 deletions(-) -- 2.47.0

2 4

[PATCH] vmx: Get the VMware boolean uefi.secureBoot.enabled
by Richard W.M. Jones 18 Nov '24

18 Nov '24

Some VMware guests have a boolean uefi.secureBoot.enabled. If found, and it's set to "TRUE", and if it's a UEFI guest, then add this clause into the domain XML: <os firmware='efi'> <firmware> <feature enabled='yes' name='enrolled-keys'/> <feature enabled='yes' name='secure-boot'/> </firmware> </os> This approximates the meaning of this VMware flag. Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> Fixes: https://issues.redhat.com/browse/RHEL-67836 --- src/vmx/vmx.c | 22 ++++++++++++++++++++++ tests/vmx2xmldata/esx-in-the-wild-12.xml | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 132e54e15f..23a8a35360 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1387,6 +1387,7 @@ virVMXParseConfig(virVMXContext *ctx, char *sched_cpu_shares = NULL; char *guestOS = NULL; bool smbios_reflecthost = false; + bool uefi_secureboot = false; int controller; int bus; int port; @@ -1963,6 +1964,27 @@ virVMXParseConfig(virVMXContext *ctx, } } + /* vmx:uefi.secureBoot.enabled */ + if (virVMXGetConfigBoolean(conf, "uefi.secureBoot.enabled", + &uefi_secureboot, false, true) < 0) { + goto cleanup; + } + if (uefi_secureboot && + def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { + int *features = def->os.firmwareFeatures; + + if (!features) { + features = g_new0(int, VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_LAST); + def->os.firmwareFeatures = features; + } + /* Just set both to true, as VMware doesn't have any concept + * of the two features separately. + */ + features[VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_SECURE_BOOT] = + features[VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_ENROLLED_KEYS] = + VIR_TRISTATE_BOOL_YES; + } + if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) goto cleanup; diff --git a/tests/vmx2xmldata/esx-in-the-wild-12.xml b/tests/vmx2xmldata/esx-in-the-wild-12.xml index 42184501d0..c5aad90677 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-12.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-12.xml @@ -9,6 +9,10 @@ </cputune> <os firmware='efi'> <type arch='x86_64'>hvm</type> + <firmware> + <feature enabled='yes' name='enrolled-keys'/> + <feature enabled='yes' name='secure-boot'/> + </firmware> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> -- 2.46.0

2 1

[PATCH v2] ch: Enable callbacks for ch domain events
by Praveen K Paladugu 18 Nov '24

18 Nov '24

From: Praveen K Paladugu <prapal(a)linux.microsoft.com> Enable callbacks for define, undefine, started, booted, stopped, destroyed events of ch guests. Signed-off-by: Praveen K Paladugu <praveenkpaladugu(a)gmail.com> --- src/ch/ch_conf.h | 4 +++ src/ch/ch_driver.c | 82 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/src/ch/ch_conf.h b/src/ch/ch_conf.h index a77cad7a2a..97c6c24aa5 100644 --- a/src/ch/ch_conf.h +++ b/src/ch/ch_conf.h @@ -24,6 +24,7 @@ #include "virthread.h" #include "ch_capabilities.h" #include "virebtables.h" +#include "object_event.h" #define CH_DRIVER_NAME "CH" #define CH_CMD "cloud-hypervisor" @@ -75,6 +76,9 @@ struct _virCHDriver * then lockless thereafter */ virCHDriverConfig *config; + /* Immutable pointer, self-locking APIs */ + virObjectEventState *domainEventState; + /* pid file FD, ensures two copies of the driver can't use the same root */ int lockFD; diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index dab025edc1..d18f266387 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -28,6 +28,7 @@ #include "ch_monitor.h" #include "ch_process.h" #include "domain_cgroup.h" +#include "domain_event.h" #include "datatypes.h" #include "driver.h" #include "viraccessapicheck.h" @@ -263,6 +264,7 @@ chDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) virCHDriver *driver = dom->conn->privateData; virDomainObj *vm; virCHDomainObjPrivate *priv; + virObjectEvent *event; g_autofree char *managed_save_path = NULL; int ret = -1; @@ -304,6 +306,14 @@ chDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) ret = virCHProcessStart(driver, vm, VIR_DOMAIN_RUNNING_BOOTED); } + if (ret == 0) { + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_BOOTED); + if (event) + virObjectEventStateQueue(driver->domainEventState, event); + } + endjob: virDomainObjEndJob(vm); @@ -323,8 +333,10 @@ chDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) { virCHDriver *driver = conn->privateData; g_autoptr(virDomainDef) vmdef = NULL; + g_autoptr(virDomainDef) oldDef = NULL; virDomainObj *vm = NULL; virDomainPtr dom = NULL; + virObjectEvent *event = NULL; g_autofree char *managed_save_path = NULL; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; @@ -345,7 +357,7 @@ chDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) if (!(vm = virDomainObjListAdd(driver->domains, &vmdef, driver->xmlopt, - 0, NULL))) + 0, &oldDef))) goto cleanup; /* cleanup if there's any stale managedsave dir */ @@ -358,11 +370,17 @@ chDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) } vm->persistent = 1; - + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_DEFINED, + !oldDef ? + VIR_DOMAIN_EVENT_DEFINED_ADDED : + VIR_DOMAIN_EVENT_DEFINED_UPDATED); dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); cleanup: virDomainObjEndAPI(&vm); + virObjectEventStateQueue(driver->domainEventState, event); + return dom; } @@ -378,6 +396,7 @@ chDomainUndefineFlags(virDomainPtr dom, { virCHDriver *driver = dom->conn->privateData; virDomainObj *vm; + virObjectEvent *event = NULL; int ret = -1; virCheckFlags(0, -1); @@ -393,6 +412,9 @@ chDomainUndefineFlags(virDomainPtr dom, "%s", _("Cannot undefine transient domain")); goto cleanup; } + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_UNDEFINED, + VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); vm->persistent = 0; if (!virDomainObjIsActive(vm)) { @@ -403,6 +425,8 @@ chDomainUndefineFlags(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); + virObjectEventStateQueue(driver->domainEventState, event); + return ret; } @@ -643,6 +667,7 @@ chDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { virCHDriver *driver = dom->conn->privateData; virDomainObj *vm; + virObjectEvent *event = NULL; int ret = -1; virCheckFlags(0, -1); @@ -662,6 +687,9 @@ chDomainDestroyFlags(virDomainPtr dom, unsigned int flags) if (virCHProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED) < 0) goto endjob; + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DESTROYED); virCHDomainRemoveInactive(driver, vm); ret = 0; @@ -670,6 +698,8 @@ chDomainDestroyFlags(virDomainPtr dom, unsigned int flags) cleanup: virDomainObjEndAPI(&vm); + virObjectEventStateQueue(driver->domainEventState, event); + return ret; } @@ -1365,6 +1395,7 @@ static int chStateCleanup(void) virObjectUnref(ch_driver->xmlopt); virObjectUnref(ch_driver->caps); virObjectUnref(ch_driver->domains); + virObjectUnref(ch_driver->domainEventState); virMutexDestroy(&ch_driver->lock); g_clear_pointer(&ch_driver, g_free); @@ -1414,6 +1445,9 @@ chStateInitialize(bool privileged, if (!(ch_driver->config = virCHDriverConfigNew(privileged))) goto cleanup; + if (!(ch_driver->domainEventState = virObjectEventStateNew())) + goto cleanup; + if ((rv = chExtractVersion(ch_driver)) < 0) { if (rv == -2) ret = VIR_DRV_STATE_INIT_SKIPPED; @@ -2205,6 +2239,48 @@ chDomainSetNumaParameters(virDomainPtr dom, return ret; } +static int +chConnectDomainEventRegisterAny(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) +{ + virCHDriver *driver = conn->privateData; + int ret = -1; + + if (virConnectDomainEventRegisterAnyEnsureACL(conn) < 0) + return -1; + + if (virDomainEventStateRegisterID(conn, + driver->domainEventState, + dom, eventID, + callback, opaque, freecb, &ret) < 0) + ret = -1; + + return ret; +} + + +static int +chConnectDomainEventDeregisterAny(virConnectPtr conn, + int callbackID) +{ + virCHDriver *driver = conn->privateData; + + if (virConnectDomainEventDeregisterAnyEnsureACL(conn) < 0) + return -1; + + if (virObjectEventStateDeregisterID(conn, + driver->domainEventState, + callbackID, true) < 0) + return -1; + + return 0; +} + + /* Function Tables */ static virHypervisorDriver chHypervisorDriver = { .name = "CH", @@ -2262,6 +2338,8 @@ static virHypervisorDriver chHypervisorDriver = { .domainHasManagedSaveImage = chDomainHasManagedSaveImage, /* 10.2.0 */ .domainRestore = chDomainRestore, /* 10.2.0 */ .domainRestoreFlags = chDomainRestoreFlags, /* 10.2.0 */ + .connectDomainEventRegisterAny = chConnectDomainEventRegisterAny, /* 10.8.0 */ + .connectDomainEventDeregisterAny = chConnectDomainEventDeregisterAny, /* 10.8.0 */ }; static virConnectDriver chConnectDriver = { -- 2.44.0

2 4

[PATCH] ch: enable virNodeGetMemoryStats API
by Praveen K Paladugu 18 Nov '24

18 Nov '24

Enable virNodeGetMemoryStats API to return the stats of host memory. Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com> Signed-off-by: Praveen K Paladugu <praveenkpaladugu(a)gmail.com> --- src/ch/ch_driver.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 17ae488a02..34f3a495fc 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -40,6 +40,7 @@ #include "virutil.h" #include "viruuid.h" #include "virnuma.h" +#include "virhostmem.h" #define VIR_FROM_THIS VIR_FROM_CH @@ -2209,6 +2210,19 @@ chDomainSetNumaParameters(virDomainPtr dom, return ret; } +static int +chNodeGetMemoryStats(virConnectPtr conn, + int cellNum, + virNodeMemoryStatsPtr params, + int *nparams, + unsigned int flags) +{ + if (virNodeGetMemoryStatsEnsureACL(conn) < 0) + return -1; + + return virHostMemGetStats(cellNum, params, nparams, flags); +} + /* Function Tables */ static virHypervisorDriver chHypervisorDriver = { .name = "CH", @@ -2266,6 +2280,7 @@ static virHypervisorDriver chHypervisorDriver = { .domainHasManagedSaveImage = chDomainHasManagedSaveImage, /* 10.2.0 */ .domainRestore = chDomainRestore, /* 10.2.0 */ .domainRestoreFlags = chDomainRestoreFlags, /* 10.2.0 */ + .nodeGetMemoryStats = chNodeGetMemoryStats, /* 10.10.0 */ }; static virConnectDriver chConnectDriver = { -- 2.47.0

2 1

[PATCH 00/10] PCI passthrough support for ch guests
by Praveen K Paladugu 15 Nov '24

15 Nov '24

This patch series introduces PCI passthrough support for ch guests. While enabling this feature I refactored a bunch of methods from qemu to hypervisor to reduce duplication of logic between the drivers. Praveen K Paladugu (7): hypervisor: move HostdevNeedsVFIO to hypervisor hypervisor: move HostdevHostSupportsPassthroughVFIO qemu: replace qemuHostdevPreparePCIDevices ch: prepare domain definition for pci passthrough ch: allow hostdev in domain definitions ch: reattach PCI devices to host while stopping guest ch: explicitly set INFILESIZE to 0 Wei Liu (3): ch: add host device manager to driver ch: add scaffolding for host devices management ch: prepare host for PCI passthrough po/POTFILES | 1 + src/ch/ch_conf.h | 4 ++ src/ch/ch_domain.c | 2 +- src/ch/ch_driver.c | 4 ++ src/ch/ch_hostdev.c | 115 +++++++++++++++++++++++++++++++++++ src/ch/ch_hostdev.h | 32 ++++++++++ src/ch/ch_monitor.c | 1 + src/ch/ch_process.c | 74 +++++++++++++++++++++- src/ch/meson.build | 2 + src/hypervisor/virhostdev.c | 23 +++++++ src/hypervisor/virhostdev.h | 5 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_cgroup.c | 5 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hostdev.c | 40 +----------- src/qemu/qemu_hostdev.h | 10 --- src/qemu/qemu_hotplug.c | 5 +- src/qemu/qemu_namespace.c | 2 +- tests/domaincapstest.c | 2 +- 21 files changed, 276 insertions(+), 59 deletions(-) create mode 100644 src/ch/ch_hostdev.c create mode 100644 src/ch/ch_hostdev.h -- 2.44.0

2 17

[PATCH] qemu: Avoid useless tmp variable in qemuCanonicalizeMachine
by Jiri Denemark 15 Nov '24

15 Nov '24

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_postparse.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 11134fb030..03b5ef825a 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -947,10 +947,8 @@ qemuCanonicalizeMachine(virDomainDef *def, virQEMUCaps *qemuCaps) return 0; if (STRNEQ(canon, def->os.machine)) { - char *tmp; - tmp = g_strdup(canon); VIR_FREE(def->os.machine); - def->os.machine = tmp; + def->os.machine = g_strdup(canon); } return 0; -- 2.47.0

2 1

[PATCH 0/9] qemu: snapshot: Fix internal snapshot reversion with NVRAM image
by Peter Krempa 15 Nov '24

15 Nov '24

This series fixes two things: - inactive snapshot handling with NVRAM image - use of '-loadvm' commandline option to revert snapshots, both are individually described Peter Krempa (9): qemu: Don't store path to qemu img qemuDomainSnapshotForEachQcow2Raw: Remove 'driver' argument qemu: Move 'qemuDomainSnapshotForEachQcow2(Raw)' to qemu_snapshot.c qemuSnapshotForEachQcow2: Refactor qemuSnapshotForEachQcow2: Handle also NVRAM image for internal snapshots qemu: monitor: Add monitor infrastructure for 'snapshot-load' QMP command qemu: Add enum entries for 'snapshot-load' qemu job qemu: monitor: Extract vmstate presence for internal snapshots in qemuBlockGetNamedNodeData qemu: Avoid use of '-loadvm' commandline argument for internal snapshot reversion src/qemu/qemu_block.c | 1 + src/qemu/qemu_blockjob.c | 2 + src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_command.c | 5 +- src/qemu/qemu_conf.h | 3 - src/qemu/qemu_domain.c | 106 +---- src/qemu/qemu_domain.h | 8 - src/qemu/qemu_driver.c | 3 - src/qemu/qemu_monitor.c | 16 + src/qemu/qemu_monitor.h | 19 +- src/qemu/qemu_monitor_json.c | 49 +- src/qemu/qemu_monitor_json.h | 7 + src/qemu/qemu_process.c | 7 + src/qemu/qemu_snapshot.c | 437 ++++++++++++++++-- src/qemu/qemu_snapshot.h | 5 + tests/qemublocktest.c | 14 +- .../bitmap/snapshots-internal.out | 2 +- 17 files changed, 511 insertions(+), 174 deletions(-) -- 2.47.0

2 10

[PATCH] kbase: virtiofs: Clarify migration support statement
by Peter Krempa 15 Nov '24

15 Nov '24

virtiofs 1.11 contains support for migration so update the 'Note' which states that migration is not supported. Additionally mention that VM snapshots don't save state of the files shared via virtiofs so reverting is not a good idea. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/kbase/virtiofs.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/kbase/virtiofs.rst b/docs/kbase/virtiofs.rst index 457c15da7f..d0e09b078f 100644 --- a/docs/kbase/virtiofs.rst +++ b/docs/kbase/virtiofs.rst @@ -13,9 +13,13 @@ is designed to offer local file system semantics and performance. See https://virtio-fs.gitlab.io/ -*Note:* virtiofs currently does not support migration so operations such as -migration, save/managed-save, or snapshots with memory are not supported if -a VM has a virtiofs filesystem connected. +*Note:* Older versions of ``virtiofsd`` (prior to ``1.11``) do not not support +migration so operations such as migration, save/managed-save, or snapshots with +memory may not supported if a VM has a virtiofs filesystem connected. + +Additionally snapshot operations managed by libvirt do not snapshot the state +of the files shared via ``virtiofs``, and thus reverting to an earlier state is +not recommended. Sharing a host directory with a guest ===================================== -- 2.47.0

2 1

[PATCH] syntax-check: Suggest ways to fix internal references
by Andrea Bolognani 14 Nov '24

14 Nov '24

The rule catches incorrect attempts to use internal references, but doesn't guide the developer hitting a failure towards the not exactly obvious acceptable alternatives. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- build-aux/syntax-check.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 6ed2a61192..2c9593c28f 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1135,7 +1135,7 @@ sc_prohibit_backup_files: sc_avoid_remote_reference_to_local_file: @prohibit='<#' \ in_vc_files='\.rst$$' \ - halt='use local reference within a file' \ + halt='use `section`_ or `here <section_>`__ instead of `here <#section>`__' \ $(_sc_search_regexp) # This Perl code is slightly obfuscated. Not only is each "$" doubled -- 2.47.0

2 1

[PATCH 0/2] docs: Rework and extend NSS module page
by Andrea Bolognani 13 Nov '24

13 Nov '24

My initial goal was to write the second patch, but as usual I just couldn't stop myself... Andrea Bolognani (2): docs: Rework documentation for the NSS module docs: Document authselect to enable the NSS module docs/nss.rst | 194 ++++++++++++++++++++------------------------------- 1 file changed, 76 insertions(+), 118 deletions(-) -- 2.47.0

2 5

[PATCH] qemu: Move PostParse functions out of qemu_domain.c
by Michal Privoznik 13 Nov '24

13 Nov '24

Problem with qemu_domain.c is that it's constantly growing. But there are few options for improvement. For instance, validation functions were moved out and now live in qemu_validate.c. We can do the same for PostParse functions, though since PostParse may modify domain definition, some functions need to be exported from qemu_domain.c. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Best viewed via 'git show --color-moved'. po/POTFILES | 1 + src/qemu/meson.build | 1 + src/qemu/qemu_domain.c | 1898 +----------------------------------- src/qemu/qemu_domain.h | 16 +- src/qemu/qemu_postparse.c | 1925 +++++++++++++++++++++++++++++++++++++ src/qemu/qemu_postparse.h | 54 ++ tests/qemublocktest.c | 1 + 7 files changed, 2001 insertions(+), 1895 deletions(-) create mode 100644 src/qemu/qemu_postparse.c create mode 100644 src/qemu/qemu_postparse.h diff --git a/po/POTFILES b/po/POTFILES index 1ed4086d2c..c20781e1a8 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -189,6 +189,7 @@ src/qemu/qemu_monitor_text.c src/qemu/qemu_namespace.c src/qemu/qemu_nbdkit.c src/qemu/qemu_passt.c +src/qemu/qemu_postparse.c src/qemu/qemu_process.c src/qemu/qemu_qapi.c src/qemu/qemu_saveimage.c diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 1d904bbc68..2a85e2e604 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -32,6 +32,7 @@ qemu_driver_sources = [ 'qemu_namespace.c', 'qemu_nbdkit.c', 'qemu_passt.c', + 'qemu_postparse.c', 'qemu_process.c', 'qemu_qapi.c', 'qemu_saveimage.c', diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 562fa76a78..c798ef37fd 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -27,7 +27,6 @@ #include "qemu_cgroup.h" #include "qemu_command.h" #include "qemu_capabilities.h" -#include "qemu_firmware.h" #include "qemu_hostdev.h" #include "qemu_migration_params.h" #include "qemu_security.h" @@ -38,6 +37,7 @@ #include "qemu_checkpoint.h" #include "qemu_validate.h" #include "qemu_namespace.h" +#include "qemu_postparse.h" #include "viralloc.h" #include "virlog.h" #include "virerror.h" @@ -71,8 +71,6 @@ #include <sys/time.h> #include <fcntl.h> -#define QEMU_QXL_VGAMEM_DEFAULT 16 * 1024 - #define VIR_FROM_THIS VIR_FROM_QEMU VIR_LOG_INIT("qemu.qemu_domain"); @@ -2020,7 +2018,7 @@ qemuDomainObjPrivateAlloc(void *opaque) } -static int +int qemuStorageSourcePrivateDataAssignSecinfo(qemuDomainSecretInfo **secinfo, char **alias) { @@ -4001,26 +3999,6 @@ virXMLNamespace virQEMUDriverDomainXMLNamespace = { }; -static int -qemuDomainDefAddImplicitInputDevice(virDomainDef *def, - virQEMUCaps *qemuCaps) -{ - if (virQEMUCapsSupportsI8042(qemuCaps, def) && - def->features[VIR_DOMAIN_FEATURE_PS2] != VIR_TRISTATE_SWITCH_OFF) { - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - VIR_DOMAIN_INPUT_BUS_PS2) < 0) - return -1; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - VIR_DOMAIN_INPUT_BUS_PS2) < 0) - return -1; - } - - return 0; -} - static int qemuDomainDefSuggestDefaultAudioBackend(virQEMUDriver *driver, virDomainDef *def, @@ -4168,7 +4146,7 @@ qemuDomainDefClearDefaultAudioBackend(virQEMUDriver *driver, return 0; } -static int +int qemuDomainDefAddDefaultAudioBackend(virQEMUDriver *driver, virDomainDef *def) { @@ -4227,7 +4205,7 @@ qemuDomainGetSCSIControllerModel(const virDomainDef *def, } -static virDomainPanicModel +virDomainPanicModel qemuDomainDefaultPanicModel(const virDomainDef *def) { if (qemuDomainIsPSeries(def)) @@ -4246,834 +4224,6 @@ qemuDomainDefaultPanicModel(const virDomainDef *def) } -static int -qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, - virDomainDef *def, - virQEMUCaps *qemuCaps) -{ - bool addDefaultUSB = false; - int usbModel = -1; /* "default for machinetype" */ - int pciRoot; /* index within def->controllers */ - bool addImplicitSATA = false; - bool addPCIRoot = false; - bool addPCIeRoot = false; - bool addDefaultMemballoon = false; - bool addDefaultUSBKBD = false; - bool addDefaultUSBMouse = false; - bool addPanicDevice = false; - bool addITCOWatchdog = false; - bool addIOMMU = false; - - /* add implicit input devices */ - if (qemuDomainDefAddImplicitInputDevice(def, qemuCaps) < 0) - return -1; - - /* Add implicit PCI root controller if the machine has one */ - switch (def->os.arch) { - case VIR_ARCH_I686: - case VIR_ARCH_X86_64: - addDefaultMemballoon = true; - - if (STREQ(def->os.machine, "isapc")) { - break; - } - - addDefaultUSB = true; - - if (qemuDomainIsQ35(def)) { - addPCIeRoot = true; - addImplicitSATA = true; - addITCOWatchdog = true; - - if (virDomainDefGetVcpusMax(def) > QEMU_MAX_VCPUS_WITHOUT_EIM) { - addIOMMU = true; - } - - /* Prefer adding a USB3 controller if supported, fall back - * to USB2 if there is no USB3 available, and if that's - * unavailable don't add anything. - */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) - usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI; - else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI)) - usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI; - else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_USB_EHCI1)) - usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1; - else - addDefaultUSB = false; - break; - } - if (qemuDomainIsI440FX(def)) - addPCIRoot = true; - break; - - case VIR_ARCH_ARMV6L: - case VIR_ARCH_ARMV7L: - case VIR_ARCH_ARMV7B: - case VIR_ARCH_AARCH64: - if (STREQ(def->os.machine, "versatilepb")) - addPCIRoot = true; - - /* Add default USB for the two machine types which historically - * supported -usb */ - if (STREQ(def->os.machine, "versatilepb") || - STRPREFIX(def->os.machine, "realview")) { - addDefaultUSB = true; - usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; - } - - if (qemuDomainIsARMVirt(def)) - addPCIeRoot = true; - - break; - - case VIR_ARCH_PPC64: - case VIR_ARCH_PPC64LE: - addPCIRoot = true; - addDefaultUSB = true; - addDefaultUSBKBD = true; - addDefaultUSBMouse = true; - addDefaultMemballoon = true; - /* For pSeries guests, the firmware provides the same - * functionality as the pvpanic device, so automatically - * add the definition if not already present */ - if (qemuDomainIsPSeries(def)) - addPanicDevice = true; - break; - - case VIR_ARCH_ALPHA: - case VIR_ARCH_PPC: - case VIR_ARCH_PPCEMB: - case VIR_ARCH_SH4: - case VIR_ARCH_SH4EB: - addDefaultUSB = true; - addDefaultMemballoon = true; - addPCIRoot = true; - break; - - case VIR_ARCH_RISCV32: - case VIR_ARCH_RISCV64: - addDefaultMemballoon = true; - if (qemuDomainIsRISCVVirt(def)) - addPCIeRoot = true; - break; - - case VIR_ARCH_S390: - case VIR_ARCH_S390X: - addDefaultMemballoon = true; - addPanicDevice = true; - addPCIRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_ZPCI); - break; - - case VIR_ARCH_SPARC64: - addDefaultUSB = true; - addDefaultMemballoon = true; - addPCIRoot = true; - break; - - case VIR_ARCH_MIPS: - case VIR_ARCH_MIPSEL: - case VIR_ARCH_MIPS64: - case VIR_ARCH_MIPS64EL: - addDefaultUSB = true; - addDefaultMemballoon = true; - if (qemuDomainIsMipsMalta(def)) - addPCIRoot = true; - break; - - case VIR_ARCH_LOONGARCH64: - addPCIeRoot = true; - break; - - case VIR_ARCH_CRIS: - case VIR_ARCH_ITANIUM: - case VIR_ARCH_LM32: - case VIR_ARCH_M68K: - case VIR_ARCH_MICROBLAZE: - case VIR_ARCH_MICROBLAZEEL: - case VIR_ARCH_OR32: - case VIR_ARCH_PARISC: - case VIR_ARCH_PARISC64: - case VIR_ARCH_PPCLE: - case VIR_ARCH_SPARC: - case VIR_ARCH_UNICORE32: - case VIR_ARCH_XTENSA: - case VIR_ARCH_XTENSAEB: - case VIR_ARCH_NONE: - case VIR_ARCH_LAST: - default: - break; - } - - if (addDefaultUSB && - virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0) < 0 && - virDomainDefAddUSBController(def, 0, usbModel) < 0) - return -1; - - if (addImplicitSATA && - virDomainDefMaybeAddController( - def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, 0, -1) < 0) - return -1; - - pciRoot = virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0); - - /* NB: any machine that sets addPCIRoot to true must also return - * true from the function qemuDomainSupportsPCI(). - */ - if (addPCIRoot) { - if (pciRoot >= 0) { - if (def->controllers[pciRoot]->model != VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) { - virReportError(VIR_ERR_XML_ERROR, - _("The PCI controller with index='0' must be model='pci-root' for this machine type, but model='%1$s' was found instead"), - virDomainControllerModelPCITypeToString(def->controllers[pciRoot]->model)); - return -1; - } - } else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0, - VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT)) { - return -1; - } - } - - /* When a machine has a pcie-root, make sure that there is always - * a dmi-to-pci-bridge controller added as bus 1, and a pci-bridge - * as bus 2, so that standard PCI devices can be connected - * - * NB: any machine that sets addPCIeRoot to true must also return - * true from the function qemuDomainSupportsPCI(). - */ - if (addPCIeRoot) { - if (pciRoot >= 0) { - if (def->controllers[pciRoot]->model != VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) { - virReportError(VIR_ERR_XML_ERROR, - _("The PCI controller with index='0' must be model='pcie-root' for this machine type, but model='%1$s' was found instead"), - virDomainControllerModelPCITypeToString(def->controllers[pciRoot]->model)); - return -1; - } - } else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0, - VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT)) { - return -1; - } - } - - if (addDefaultMemballoon && !def->memballoon) { - virDomainMemballoonDef *memballoon; - memballoon = g_new0(virDomainMemballoonDef, 1); - - memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO; - def->memballoon = memballoon; - } - - if (addDefaultUSBMouse) { - bool hasUSBTablet = false; - size_t j; - - for (j = 0; j < def->ninputs; j++) { - if (def->inputs[j]->type == VIR_DOMAIN_INPUT_TYPE_TABLET && - def->inputs[j]->bus == VIR_DOMAIN_INPUT_BUS_USB) { - hasUSBTablet = true; - break; - } - } - - /* Historically, we have automatically added USB keyboard and - * mouse to some guests. While the former device is generally - * safe to have, adding the latter is undesiderable if a USB - * tablet is already present in the guest */ - if (hasUSBTablet) - addDefaultUSBMouse = false; - } - - if (addDefaultUSBKBD && - def->ngraphics > 0 && - virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - VIR_DOMAIN_INPUT_BUS_USB) < 0) - return -1; - - if (addDefaultUSBMouse && - def->ngraphics > 0 && - virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - VIR_DOMAIN_INPUT_BUS_USB) < 0) - return -1; - - if (addPanicDevice) { - virDomainPanicModel defaultModel = qemuDomainDefaultPanicModel(def); - size_t j; - - for (j = 0; j < def->npanics; j++) { - if (def->panics[j]->model == VIR_DOMAIN_PANIC_MODEL_DEFAULT || - def->panics[j]->model == defaultModel) - break; - } - - if (j == def->npanics) { - virDomainPanicDef *panic = g_new0(virDomainPanicDef, 1); - - VIR_APPEND_ELEMENT_COPY(def->panics, def->npanics, panic); - } - } - - if (addITCOWatchdog) { - size_t i = 0; - - for (i = 0; i < def->nwatchdogs; i++) { - if (def->watchdogs[i]->model == VIR_DOMAIN_WATCHDOG_MODEL_ITCO) - break; - } - - if (i == def->nwatchdogs) { - virDomainWatchdogDef *watchdog = g_new0(virDomainWatchdogDef, 1); - - watchdog->model = VIR_DOMAIN_WATCHDOG_MODEL_ITCO; - if (def->nwatchdogs) - watchdog->action = def->watchdogs[0]->action; - else - watchdog->action = VIR_DOMAIN_WATCHDOG_ACTION_RESET; - - VIR_APPEND_ELEMENT(def->watchdogs, def->nwatchdogs, watchdog); - } - } - - if (addIOMMU && !def->iommu && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_INTEL_IOMMU) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_INTREMAP) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_EIM)) { - g_autoptr(virDomainIOMMUDef) iommu = NULL; - - iommu = virDomainIOMMUDefNew(); - iommu->model = VIR_DOMAIN_IOMMU_MODEL_INTEL; - /* eim requires intremap. */ - iommu->intremap = VIR_TRISTATE_SWITCH_ON; - iommu->eim = VIR_TRISTATE_SWITCH_ON; - - def->iommu = g_steal_pointer(&iommu); - } - - if (qemuDomainDefAddDefaultAudioBackend(driver, def) < 0) - return -1; - - return 0; -} - - -/** - * qemuDomainDefEnableDefaultFeatures: - * @def: domain definition - * @qemuCaps: QEMU capabilities - * - * Make sure that features that should be enabled by default are actually - * enabled and configure default values related to those features. - */ -static void -qemuDomainDefEnableDefaultFeatures(virDomainDef *def, - virQEMUCaps *qemuCaps) -{ - /* The virt machine type always uses GIC: if the relevant information - * was not included in the domain XML, we need to choose a suitable - * GIC version ourselves */ - if ((def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ABSENT && - qemuDomainIsARMVirt(def)) || - (def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ON && - def->gic_version == VIR_GIC_VERSION_NONE)) { - virGICVersion version; - - VIR_DEBUG("Looking for usable GIC version in domain capabilities"); - for (version = VIR_GIC_VERSION_LAST - 1; - version > VIR_GIC_VERSION_NONE; - version--) { - - /* We want to use the highest available GIC version for guests; - * however, the emulated GICv3 is currently lacking a MSI controller, - * making it unsuitable for the pure PCIe topology we aim for. - * - * For that reason, we skip this step entirely for TCG guests, - * and rely on the code below to pick the default version, GICv2, - * which supports all the features we need. - * - * See https://bugzilla.redhat.com/show_bug.cgi?id=1414081 */ - if (version == VIR_GIC_VERSION_3 && - def->virtType == VIR_DOMAIN_VIRT_QEMU) { - continue; - } - - if (virQEMUCapsSupportsGICVersion(qemuCaps, - def->virtType, - version)) { - VIR_DEBUG("Using GIC version %s", - virGICVersionTypeToString(version)); - def->gic_version = version; - break; - } - } - - /* Use the default GIC version (GICv2) as a last-ditch attempt - * if no match could be found above */ - if (def->gic_version == VIR_GIC_VERSION_NONE) { - VIR_DEBUG("Using GIC version 2 (default)"); - def->gic_version = VIR_GIC_VERSION_2; - } - - /* Even if we haven't found a usable GIC version in the domain - * capabilities, we still want to enable this */ - def->features[VIR_DOMAIN_FEATURE_GIC] = VIR_TRISTATE_SWITCH_ON; - } -} - - -static int -qemuCanonicalizeMachine(virDomainDef *def, virQEMUCaps *qemuCaps) -{ - const char *canon; - - if (!(canon = virQEMUCapsGetCanonicalMachine(qemuCaps, def->virtType, - def->os.machine))) - return 0; - - if (STRNEQ(canon, def->os.machine)) { - char *tmp; - tmp = g_strdup(canon); - VIR_FREE(def->os.machine); - def->os.machine = tmp; - } - - return 0; -} - - -static int -qemuDomainRecheckInternalPaths(virDomainDef *def, - virQEMUDriverConfig *cfg, - unsigned int flags) -{ - size_t i = 0; - size_t j = 0; - - for (i = 0; i < def->ngraphics; ++i) { - virDomainGraphicsDef *graphics = def->graphics[i]; - - for (j = 0; j < graphics->nListens; ++j) { - virDomainGraphicsListenDef *glisten = &graphics->listens[j]; - - /* This will happen only if we parse XML from old libvirts where - * unix socket was available only for VNC graphics. In this - * particular case we should follow the behavior and if we remove - * the auto-generated socket based on config option from qemu.conf - * we need to change the listen type to address. */ - if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && - glisten->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET && - glisten->socket && - !glisten->autoGenerated && - STRPREFIX(glisten->socket, cfg->libDir)) { - if (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) { - VIR_FREE(glisten->socket); - glisten->type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS; - } else { - glisten->fromConfig = true; - } - } - } - } - - return 0; -} - - -static int -qemuDomainDefBootPostParse(virDomainDef *def, - virQEMUDriver *driver, - unsigned int parseFlags) -{ - bool abiUpdate = !!(parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE); - - /* If we're loading an existing configuration from disk, we - * should try as hard as possible to preserve historical - * behavior. In particular, firmware autoselection being enabled - * could never have resulted, before libvirt 9.2.0, in anything - * but a raw firmware image being selected. - * - * In order to ensure that existing domains keep working even if - * a firmware descriptor for a build with a different format is - * given higher priority, explicitly add this requirement to the - * definition before performing firmware selection */ - if (!abiUpdate && def->os.firmware) { - if (!def->os.loader) - def->os.loader = virDomainLoaderDefNew(); - if (!def->os.loader->format) - def->os.loader->format = VIR_STORAGE_FILE_RAW; - } - - /* Firmware selection can fail for a number of reasons, but the - * most likely one is that the requested configuration contains - * mistakes or includes constraints that are impossible to - * satisfy on the current system. - * - * If that happens, we have to react differently based on the - * situation: if we're defining a new domain or updating its ABI, - * we should let the user know immediately so that they can - * change the requested configuration, hopefully into one that we - * can work with; if we're loading the configuration of an - * existing domain from disk, however, we absolutely cannot error - * out here, or the domain will disappear. - * - * To handle the second case gracefully, we clear any reported - * errors and continue as if nothing had happened. When it's time - * to start the domain, qemuFirmwareFillDomain() will be run - * again, fail in the same way, and at that point we'll have a - * chance to inform the user of any issues */ - if (qemuFirmwareFillDomain(driver, def, abiUpdate) < 0) { - if (abiUpdate) { - return -1; - } else { - virResetLastError(); - return 0; - } - } - - return 0; -} - - -static int -qemuDomainDefMachinePostParse(virDomainDef *def, - virQEMUCaps *qemuCaps) -{ - if (!def->os.machine) { - const char *machine = virQEMUCapsGetPreferredMachine(qemuCaps, - def->virtType); - if (!machine) { - virReportError(VIR_ERR_INVALID_ARG, - _("could not get preferred machine for %1$s type=%2$s"), - def->emulator, - virDomainVirtTypeToString(def->virtType)); - return -1; - } - - def->os.machine = g_strdup(machine); - } - - if (qemuCanonicalizeMachine(def, qemuCaps) < 0) - return -1; - - return 0; -} - - -static int -qemuDomainDefVcpusPostParse(virDomainDef *def) -{ - unsigned int maxvcpus = virDomainDefGetVcpusMax(def); - virDomainVcpuDef *vcpu; - virDomainVcpuDef *prevvcpu; - size_t i; - bool has_order = false; - - /* vcpu 0 needs to be present, first, and non-hotpluggable */ - vcpu = virDomainDefGetVcpu(def, 0); - if (!vcpu->online) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vcpu 0 can't be offline")); - return -1; - } - if (vcpu->hotpluggable == VIR_TRISTATE_BOOL_YES) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vcpu0 can't be hotpluggable")); - return -1; - } - if (vcpu->order != 0 && vcpu->order != 1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vcpu0 must be enabled first")); - return -1; - } - - if (vcpu->order != 0) - has_order = true; - - prevvcpu = vcpu; - - /* all online vcpus or non online vcpu need to have order set */ - for (i = 1; i < maxvcpus; i++) { - vcpu = virDomainDefGetVcpu(def, i); - - if (vcpu->online && - (vcpu->order != 0) != has_order) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("all vcpus must have either set or unset order")); - return -1; - } - - /* few conditions for non-hotpluggable (thus online) vcpus */ - if (vcpu->hotpluggable == VIR_TRISTATE_BOOL_NO) { - /* they can be ordered only at the beginning */ - if (prevvcpu->hotpluggable == VIR_TRISTATE_BOOL_YES) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("online non-hotpluggable vcpus need to be ordered prior to hotplugable vcpus")); - return -1; - } - - /* they need to be in order (qemu doesn't support any order yet). - * Also note that multiple vcpus may share order on some platforms */ - if (prevvcpu->order > vcpu->order) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("online non-hotpluggable vcpus must be ordered in ascending order")); - return -1; - } - } - - prevvcpu = vcpu; - } - - return 0; -} - - -static int -qemuDomainDefSetDefaultCPU(virDomainDef *def, - virArch hostarch, - virQEMUCaps *qemuCaps) -{ - const char *model; - - if (def->cpu && - (def->cpu->mode != VIR_CPU_MODE_CUSTOM || - def->cpu->model)) - return 0; - - if (!virCPUArchIsSupported(def->os.arch)) - return 0; - - /* Default CPU model info from QEMU is usable for TCG only except for - * x86, s390, and ppc64. */ - if (!ARCH_IS_X86(def->os.arch) && - !ARCH_IS_S390(def->os.arch) && - !ARCH_IS_PPC64(def->os.arch) && - def->virtType != VIR_DOMAIN_VIRT_QEMU) - return 0; - - model = virQEMUCapsGetMachineDefaultCPU(qemuCaps, def->os.machine, def->virtType); - if (!model) { - VIR_DEBUG("Unknown default CPU model for domain '%s'", def->name); - return 0; - } - - if (STREQ(model, "host") && def->virtType != VIR_DOMAIN_VIRT_KVM) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("QEMU reports invalid default CPU model \"host\" for non-kvm domain virt type")); - return -1; - } - - if (!def->cpu) - def->cpu = virCPUDefNew(); - - def->cpu->type = VIR_CPU_TYPE_GUEST; - - if (STREQ(model, "host")) { - if (ARCH_IS_S390(def->os.arch) && - virQEMUCapsIsCPUModeSupported(qemuCaps, hostarch, def->virtType, - VIR_CPU_MODE_HOST_MODEL, - def->os.machine)) { - def->cpu->mode = VIR_CPU_MODE_HOST_MODEL; - } else { - def->cpu->mode = VIR_CPU_MODE_HOST_PASSTHROUGH; - } - - VIR_DEBUG("Setting default CPU mode for domain '%s' to %s", - def->name, virCPUModeTypeToString(def->cpu->mode)); - } else { - /* We need to turn off all CPU checks when the domain is started - * because the default CPU (e.g., qemu64) may not be runnable on any - * host. QEMU will just disable the unavailable features and we will - * update the CPU definition accordingly and set check to FULL when - * starting the domain. */ - def->cpu->check = VIR_CPU_CHECK_NONE; - def->cpu->mode = VIR_CPU_MODE_CUSTOM; - def->cpu->match = VIR_CPU_MATCH_EXACT; - def->cpu->fallback = VIR_CPU_FALLBACK_FORBID; - def->cpu->model = g_strdup(model); - - VIR_DEBUG("Setting default CPU model for domain '%s' to %s", - def->name, model); - } - - return 0; -} - - -static int -qemuDomainDefCPUPostParse(virDomainDef *def, - virQEMUCaps *qemuCaps) -{ - virCPUFeatureDef *sveFeature = NULL; - bool sveVectorLengthsProvided = false; - size_t i; - - if (!def->cpu) - return 0; - - for (i = 0; i < def->cpu->nfeatures; i++) { - virCPUFeatureDef *feature = &def->cpu->features[i]; - - if (STREQ(feature->name, "sve")) { - sveFeature = feature; - } else if (STRPREFIX(feature->name, "sve")) { - sveVectorLengthsProvided = true; - } - } - - if (sveVectorLengthsProvided) { - if (sveFeature) { - if (sveFeature->policy == VIR_CPU_FEATURE_DISABLE || - sveFeature->policy == VIR_CPU_FEATURE_FORBID) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("SVE disabled, but SVE vector lengths provided")); - return -1; - } else { - sveFeature->policy = VIR_CPU_FEATURE_REQUIRE; - } - } else { - VIR_RESIZE_N(def->cpu->features, def->cpu->nfeatures_max, - def->cpu->nfeatures, 1); - - def->cpu->features[def->cpu->nfeatures].name = g_strdup("sve"); - def->cpu->features[def->cpu->nfeatures].policy = VIR_CPU_FEATURE_REQUIRE; - - def->cpu->nfeatures++; - } - } - - /* Running domains were either started before QEMU_CAPS_CPU_MIGRATABLE was - * introduced and thus we can't rely on it or they already have the - * migratable default set. */ - if (def->id == -1 && - qemuCaps && - def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH && - def->cpu->migratable == VIR_TRISTATE_SWITCH_ABSENT) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MIGRATABLE)) - def->cpu->migratable = VIR_TRISTATE_SWITCH_ON; - else if (ARCH_IS_X86(def->os.arch)) - def->cpu->migratable = VIR_TRISTATE_SWITCH_OFF; - } - - /* Nothing to be done if only CPU topology is specified. */ - if (def->cpu->mode == VIR_CPU_MODE_CUSTOM && - !def->cpu->model) - return 0; - - if (def->cpu->check != VIR_CPU_CHECK_DEFAULT) - return 0; - - switch ((virCPUMode) def->cpu->mode) { - case VIR_CPU_MODE_HOST_PASSTHROUGH: - case VIR_CPU_MODE_MAXIMUM: - def->cpu->check = VIR_CPU_CHECK_NONE; - break; - - case VIR_CPU_MODE_HOST_MODEL: - def->cpu->check = VIR_CPU_CHECK_PARTIAL; - break; - - case VIR_CPU_MODE_CUSTOM: - /* Custom CPUs in TCG mode are not compared to host CPU by default. */ - if (def->virtType == VIR_DOMAIN_VIRT_QEMU) - def->cpu->check = VIR_CPU_CHECK_NONE; - else - def->cpu->check = VIR_CPU_CHECK_PARTIAL; - break; - - case VIR_CPU_MODE_LAST: - break; - } - - return 0; -} - - -static int -qemuDomainDefTsegPostParse(virDomainDef *def, - virQEMUCaps *qemuCaps) -{ - if (def->features[VIR_DOMAIN_FEATURE_SMM] != VIR_TRISTATE_SWITCH_ON) - return 0; - - if (!def->tseg_specified) - return 0; - - if (!qemuDomainIsQ35(def)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("SMM TSEG is only supported with q35 machine type")); - return -1; - } - - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting TSEG size is not supported with this QEMU binary")); - return -1; - } - - if (def->tseg_size & ((1 << 20) - 1)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("SMM TSEG size must be divisible by 1 MiB")); - return -1; - } - - return 0; -} - - -static int -qemuDomainDefNumaAutoAdd(virDomainDef *def, - unsigned int parseFlags) -{ - bool abiUpdate = !!(parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE); - unsigned long long nodeMem; - size_t i; - - if (!abiUpdate || - !virDomainDefHasMemoryHotplug(def) || - virDomainNumaGetNodeCount(def->numa) > 0) { - return 0; - } - - nodeMem = virDomainDefGetMemoryTotal(def); - - if (!def->numa) - def->numa = virDomainNumaNew(); - - virDomainNumaSetNodeCount(def->numa, 1); - - for (i = 0; i < def->nmems; i++) { - virDomainMemoryDef *mem = def->mems[i]; - - if (mem->size > nodeMem) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Total size of memory devices exceeds the total memory size")); - return -1; - } - - nodeMem -= mem->size; - - switch (mem->model) { - case VIR_DOMAIN_MEMORY_MODEL_DIMM: - case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: - case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: - if (mem->targetNode == -1) - mem->targetNode = 0; - break; - - case VIR_DOMAIN_MEMORY_MODEL_NONE: - case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: - case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: - case VIR_DOMAIN_MEMORY_MODEL_LAST: - break; - } - } - - virDomainNumaSetNodeMemorySize(def->numa, 0, nodeMem); - - return 0; -} - - /** * qemuDomainDefNumaCPUsRectify: * @numa: pointer to numa definition @@ -5106,141 +4256,6 @@ qemuDomainDefNumaCPUsRectify(virDomainDef *def, } -static int -qemuDomainDefNumaCPUsPostParse(virDomainDef *def, - virQEMUCaps *qemuCaps, - unsigned int parseFlags) -{ - if (qemuDomainDefNumaAutoAdd(def, parseFlags) < 0) - return -1; - - return qemuDomainDefNumaCPUsRectify(def, qemuCaps); -} - - -static int -qemuDomainDefPostParseBasic(virDomainDef *def, - void *opaque G_GNUC_UNUSED) -{ - virQEMUDriver *driver = opaque; - - /* check for emulator and create a default one if needed */ - if (!def->emulator) { - if (!(def->emulator = virQEMUCapsGetDefaultEmulator( - driver->hostarch, def->os.arch))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("No emulator found for arch '%1$s'"), - virArchToString(def->os.arch)); - return 1; - } - } - - return 0; -} - - -/** - * qemuDomainDefACPIPostParse: - * @def: domain definition - * @qemuCaps: qemu capabilities object - * - * Fixup the use of ACPI flag on certain architectures that never supported it - * and users for some reason used it, which would break migration to newer - * libvirt versions which check whether given machine type supports ACPI. - * - * The fixup is done in post-parse as it's hard to update the ABI stability - * check on source of the migration. - */ -static void -qemuDomainDefACPIPostParse(virDomainDef *def, - virQEMUCaps *qemuCaps, - unsigned int parseFlags) -{ - /* Only cases when ACPI is enabled need to be fixed up */ - if (def->features[VIR_DOMAIN_FEATURE_ACPI] != VIR_TRISTATE_SWITCH_ON) - return; - - /* Strip the <acpi/> feature only for non-fresh configs, in order to still - * produce an error if the feature is present in a newly defined one. - * - * The use of the VIR_DOMAIN_DEF_PARSE_ABI_UPDATE looks counter-intuitive, - * but it's used only in qemuDomainCreateXML/qemuDomainDefineXMLFlags APIs - * */ - if (parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE) - return; - - /* This fixup is applicable _only_ on architectures which were present as of - * libvirt-9.2 and *never* supported ACPI. The fixup is currently done only - * for existing users of s390(x) to fix migration for configs which had - * <acpi/> despite being ignored. - */ - if (def->os.arch != VIR_ARCH_S390 && - def->os.arch != VIR_ARCH_S390X) - return; - - /* To be sure, we only strip ACPI if given machine type doesn't support it */ - if (virQEMUCapsMachineSupportsACPI(qemuCaps, def->virtType, def->os.machine) != VIR_TRISTATE_BOOL_NO) - return; - - def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ABSENT; -} - - -static int -qemuDomainDefPostParse(virDomainDef *def, - unsigned int parseFlags, - void *opaque, - void *parseOpaque) -{ - virQEMUDriver *driver = opaque; - g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - virQEMUCaps *qemuCaps = parseOpaque; - - /* Note that qemuCaps may be NULL when this function is called. This - * function shall not fail in that case. It will be re-run on VM startup - * with the capabilities populated. - */ - if (!qemuCaps) - return 1; - - if (qemuDomainDefMachinePostParse(def, qemuCaps) < 0) - return -1; - - qemuDomainDefACPIPostParse(def, qemuCaps, parseFlags); - - if (qemuDomainDefBootPostParse(def, driver, parseFlags) < 0) - return -1; - - if (qemuDomainDefAddDefaultDevices(driver, def, qemuCaps) < 0) - return -1; - - if (qemuDomainDefSetDefaultCPU(def, driver->hostarch, qemuCaps) < 0) - return -1; - - qemuDomainDefEnableDefaultFeatures(def, qemuCaps); - - if (qemuDomainRecheckInternalPaths(def, cfg, parseFlags) < 0) - return -1; - - if (qemuSecurityVerify(driver->securityManager, def) < 0) - return -1; - - if (qemuDomainDefVcpusPostParse(def) < 0) - return -1; - - if (qemuDomainDefCPUPostParse(def, qemuCaps) < 0) - return -1; - - if (qemuDomainDefTsegPostParse(def, qemuCaps) < 0) - return -1; - - if (qemuDomainDefNumaCPUsPostParse(def, qemuCaps, parseFlags) < 0) - return -1; - - return 0; -} - - int qemuDomainValidateActualNetDef(const virDomainNetDef *net, virQEMUCaps *qemuCaps G_GNUC_UNUSED) @@ -5605,63 +4620,6 @@ qemuDomainValidateStorageSource(virStorageSource *src, } -/** - * qemuDomainDefaultNetModel: - * @def: domain definition - * @qemuCaps: qemu capabilities - * - * Returns the default network model for a given domain. Note that if @qemuCaps - * is NULL this function may return NULL if the default model depends on the - * capabilities. - */ -static int -qemuDomainDefaultNetModel(const virDomainDef *def, - virQEMUCaps *qemuCaps) -{ - /* When there are no backwards compatibility concerns getting in - * the way, virtio is a good default */ - if (ARCH_IS_S390(def->os.arch) || - qemuDomainIsLoongArchVirt(def) || - qemuDomainIsRISCVVirt(def)) { - return VIR_DOMAIN_NET_MODEL_VIRTIO; - } - - if (ARCH_IS_ARM(def->os.arch)) { - if (STREQ(def->os.machine, "versatilepb")) - return VIR_DOMAIN_NET_MODEL_SMC91C111; - - if (qemuDomainIsARMVirt(def)) - return VIR_DOMAIN_NET_MODEL_VIRTIO; - - /* Incomplete. vexpress (and a few others) use this, but not all - * arm boards */ - return VIR_DOMAIN_NET_MODEL_LAN9118; - } - - /* In all other cases the model depends on the capabilities. If they were - * not provided don't report any default. */ - if (!qemuCaps) - return VIR_DOMAIN_NET_MODEL_UNKNOWN; - - /* Try several network devices in turn; each of these devices is - * less likely be supported out-of-the-box by the guest operating - * system than the previous one */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_RTL8139)) - return VIR_DOMAIN_NET_MODEL_RTL8139; - - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_E1000)) - return VIR_DOMAIN_NET_MODEL_E1000; - - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_NET)) - return VIR_DOMAIN_NET_MODEL_VIRTIO; - - /* We've had no luck detecting support for any network device, - * but we have to return something: might as well be rtl8139 */ - return VIR_DOMAIN_NET_MODEL_RTL8139; -} - - - static bool qemuDomainChrMatchDefaultPath(const char *prefix, const char *infix, @@ -5707,7 +4665,7 @@ qemuDomainChrMatchDefaultPath(const char *prefix, * Please note, as of libvirt 9.7.0 the channelTargetDir is no longer derived * from cfg->libDir but rather cfg->stateDir. */ -static void +void qemuDomainChrDefDropDefaultPath(virDomainChrDef *chr, virQEMUDriver *driver) { @@ -5750,640 +4708,7 @@ qemuDomainChrDefDropDefaultPath(virDomainChrDef *chr, } -static int -qemuDomainShmemDefPostParse(virDomainShmemDef *shm) -{ - /* This was the default since the introduction of this device. */ - if (shm->model != VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_DOORBELL && !shm->size) - shm->size = 4 << 20; - - /* Nothing more to check/change for IVSHMEM */ - if (shm->model == VIR_DOMAIN_SHMEM_MODEL_IVSHMEM) - return 0; - - if (!shm->server.enabled) { - if (shm->model == VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_DOORBELL) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("shmem model '%1$s' is supported only with server option enabled"), - virDomainShmemModelTypeToString(shm->model)); - return -1; - } - - if (shm->msi.enabled) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("shmem model '%1$s' doesn't support msi"), - virDomainShmemModelTypeToString(shm->model)); - } - } else { - if (shm->model == VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_PLAIN) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("shmem model '%1$s' is supported only with server option disabled"), - virDomainShmemModelTypeToString(shm->model)); - return -1; - } - - if (shm->size) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("shmem model '%1$s' does not support size setting"), - virDomainShmemModelTypeToString(shm->model)); - return -1; - } - shm->msi.enabled = true; - if (!shm->msi.ioeventfd) - shm->msi.ioeventfd = VIR_TRISTATE_SWITCH_ON; - } - - return 0; -} - - -#define QEMU_USB_XHCI_MAXPORTS 15 - - -static int -qemuDomainControllerDefPostParse(virDomainControllerDef *cont, - const virDomainDef *def, - virQEMUCaps *qemuCaps, - unsigned int parseFlags) -{ - switch (cont->type) { - case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: - /* Set the default SCSI controller model if not already set */ - cont->model = qemuDomainGetSCSIControllerModel(def, cont, qemuCaps); - - if (cont->model < 0) - return -1; - break; - - case VIR_DOMAIN_CONTROLLER_TYPE_USB: - if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT && qemuCaps) { - /* Pick a suitable default model for the USB controller if none - * has been selected by the user and we have the qemuCaps for - * figuring out which controllers are supported. - * - * We rely on device availability instead of setting the model - * unconditionally because, for some machine types, there's a - * chance we will get away with using the legacy USB controller - * when the relevant device is not available. - * - * See qemuBuildControllersCommandLine() */ - - /* Default USB controller is piix3-uhci if available. Fall back to - * 'pci-ohci' otherwise which is the default for non-x86 machines - * which honour -usb */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI)) - cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI; - else if (!ARCH_IS_X86(def->os.arch) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI)) - cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; - - if (ARCH_IS_S390(def->os.arch)) { - if (cont->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { - /* set the default USB model to none for s390 unless an - * address is found */ - cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE; - } - } else if (ARCH_IS_PPC64(def->os.arch)) { - /* To not break migration we need to set default USB controller - * for ppc64 to pci-ohci if we cannot change ABI of the VM. - * The nec-usb-xhci or qemu-xhci controller is used as default - * only for newly defined domains or devices. */ - if ((parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) { - cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI; - } else if ((parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI)) { - cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI; - } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI)) { - cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; - } else { - /* Explicitly fallback to legacy USB controller for PPC64. */ - cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT; - } - } else if (def->os.arch == VIR_ARCH_AARCH64) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) - cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI; - else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI)) - cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI; - } else if (ARCH_IS_LOONGARCH(def->os.arch)) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) - cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI; - } - } - /* forbid usb model 'qusb1' and 'qusb2' in this kind of hyperviosr */ - if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB1 || - cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("USB controller model type 'qusb1' or 'qusb2' is not supported in %1$s"), - virDomainVirtTypeToString(def->virtType)); - return -1; - } - if ((cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI || - cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI) && - cont->opts.usbopts.ports > QEMU_USB_XHCI_MAXPORTS) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("'%1$s' controller only supports up to '%2$u' ports"), - virDomainControllerModelUSBTypeToString(cont->model), - QEMU_USB_XHCI_MAXPORTS); - return -1; - } - break; - - case VIR_DOMAIN_CONTROLLER_TYPE_PCI: - - /* pSeries guests can have multiple pci-root controllers, - * but other machine types only support a single one */ - if (!qemuDomainIsPSeries(def) && - (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT || - cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) && - cont->idx != 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("pci-root and pcie-root controllers should have index 0")); - return -1; - } - - if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS && - !qemuDomainIsI440FX(def)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("pci-expander-bus controllers are only supported on 440fx-based machinetypes")); - return -1; - } - if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS && - !(qemuDomainIsQ35(def) || qemuDomainIsARMVirt(def))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("pcie-expander-bus controllers are not supported with this machine type")); - return -1; - } - - /* if a PCI expander bus or pci-root on Pseries has a NUMA node - * set, make sure that NUMA node is configured in the guest - * <cpu><numa> array. NUMA cell id's in this array are numbered - * from 0 .. size-1. - */ - if (cont->opts.pciopts.numaNode >= 0 && - cont->opts.pciopts.numaNode >= - (int)virDomainNumaGetNodeCount(def->numa)) { - virReportError(VIR_ERR_XML_ERROR, - _("%1$s with index %2$d is configured for a NUMA node (%3$d) not present in the domain's <cpu><numa> array (%4$zu)"), - virDomainControllerModelPCITypeToString(cont->model), - cont->idx, cont->opts.pciopts.numaNode, - virDomainNumaGetNodeCount(def->numa)); - return -1; - } - break; - - case VIR_DOMAIN_CONTROLLER_TYPE_SATA: - case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: - case VIR_DOMAIN_CONTROLLER_TYPE_CCID: - case VIR_DOMAIN_CONTROLLER_TYPE_IDE: - case VIR_DOMAIN_CONTROLLER_TYPE_FDC: - case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: - case VIR_DOMAIN_CONTROLLER_TYPE_ISA: - case VIR_DOMAIN_CONTROLLER_TYPE_LAST: - break; - } - - return 0; -} - -static int -qemuDomainChrDefPostParse(virDomainChrDef *chr, - const virDomainDef *def, - virQEMUDriver *driver, - unsigned int parseFlags) -{ - /* Historically, isa-serial and the default matched, so in order to - * maintain backwards compatibility we map them here. The actual default - * will be picked below based on the architecture and machine type. */ - if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && - chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA) { - chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE; - } - - /* Set the default serial type */ - if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && - chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE) { - if (ARCH_IS_X86(def->os.arch)) { - chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA; - } else if (qemuDomainIsPSeries(def)) { - chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO; - } else if (qemuDomainIsARMVirt(def) || - qemuDomainIsLoongArchVirt(def) || - qemuDomainIsRISCVVirt(def)) { - chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM; - } else if (ARCH_IS_S390(def->os.arch)) { - chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP; - } - } - - /* Set the default target model */ - if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && - chr->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE) { - switch ((virDomainChrSerialTargetType)chr->targetType) { - case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA: - chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL; - break; - case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB: - chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL; - break; - case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI: - chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL; - break; - case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO: - chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY; - break; - case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM: - if (qemuDomainIsARMVirt(def)) { - chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011; - } else if (qemuDomainIsLoongArchVirt(def) || - qemuDomainIsRISCVVirt(def)) { - chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A; - } - break; - case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP: - chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE; - break; - case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA_DEBUG: - chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_DEBUGCON; - break; - case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE: - case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST: - /* Nothing to do */ - break; - } - } - - /* clear auto generated unix socket path for inactive definitions */ - if (parseFlags & VIR_DOMAIN_DEF_PARSE_INACTIVE) { - qemuDomainChrDefDropDefaultPath(chr, driver); - - /* For UNIX chardev if no path is provided we generate one. - * This also implies that the mode is 'bind'. */ - if (chr->source && - chr->source->type == VIR_DOMAIN_CHR_TYPE_UNIX && - !chr->source->data.nix.path) { - chr->source->data.nix.listen = true; - } - } - - return 0; -} - - -/** - * qemuDomainDeviceDiskDefPostParseRestoreSecAlias: - * - * Re-generate aliases for objects related to the storage source if they - * were not stored in the status XML by an older libvirt. - * - * Note that qemuCaps should be always present for a status XML. - */ -static int -qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDomainDiskDef *disk, - unsigned int parseFlags) -{ - qemuDomainStorageSourcePrivate *priv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src); - bool restoreAuthSecret = false; - bool restoreEncSecret = false; - g_autofree char *authalias = NULL; - g_autofree char *encalias = NULL; - - if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) || - virStorageSourceIsEmpty(disk->src)) - return 0; - - /* network storage authentication secret */ - if (disk->src->auth && - (!priv || !priv->secinfo)) { - - /* only RBD and iSCSI (with capability) were supporting authentication - * using secret object at the time we did not format the alias into the - * status XML */ - if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_NETWORK && - (disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD || - disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI)) - restoreAuthSecret = true; - } - - /* disk encryption secret */ - if (disk->src->encryption && - disk->src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS && - (!priv || !priv->encinfo)) - restoreEncSecret = true; - - if (!restoreAuthSecret && !restoreEncSecret) - return 0; - - if (!priv) { - if (!(disk->src->privateData = qemuDomainStorageSourcePrivateNew())) - return -1; - - priv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src); - } - - if (restoreAuthSecret) { - authalias = g_strdup_printf("%s-secret0", disk->info.alias); - - if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->secinfo, &authalias) < 0) - return -1; - } - - if (restoreEncSecret) { - if (!priv->encinfo) { - priv->enccount = 1; - priv->encinfo = g_new0(qemuDomainSecretInfo *, 1); - } - - encalias = g_strdup_printf("%s-luks-secret0", disk->info.alias); - - if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->encinfo[0], &encalias) < 0) - return -1; - } - - return 0; -} - - int -qemuDomainDeviceDiskDefPostParse(virDomainDiskDef *disk, - unsigned int parseFlags) -{ - virStorageSource *n; - - /* set default disk types and drivers */ - if (!virDomainDiskGetDriver(disk)) - virDomainDiskSetDriver(disk, "qemu"); - - /* default disk format for drives */ - if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && - virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_VOLUME) - virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); - - /* default disk format for mirrored drive */ - if (disk->mirror && - disk->mirror->format == VIR_STORAGE_FILE_NONE) - disk->mirror->format = VIR_STORAGE_FILE_RAW; - - /* default disk encryption engine */ - for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) { - if (n->encryption && n->encryption->engine == VIR_STORAGE_ENCRYPTION_ENGINE_DEFAULT) - n->encryption->engine = VIR_STORAGE_ENCRYPTION_ENGINE_QEMU; - } - - if (qemuDomainDeviceDiskDefPostParseRestoreSecAlias(disk, parseFlags) < 0) - return -1; - - /* regenerate TLS alias for old status XMLs */ - if (parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS && - disk->src->haveTLS == VIR_TRISTATE_BOOL_YES && - !disk->src->tlsAlias && - !(disk->src->tlsAlias = qemuAliasTLSObjFromSrcAlias(disk->info.alias))) - return -1; - - return 0; -} - - -static int -qemuDomainDeviceNetDefPostParse(virDomainNetDef *net, - const virDomainDef *def, - virQEMUCaps *qemuCaps) -{ - if (net->type == VIR_DOMAIN_NET_TYPE_VDPA && - !virDomainNetGetModelString(net)) { - net->model = VIR_DOMAIN_NET_MODEL_VIRTIO; - } else if (net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && - !virDomainNetGetModelString(net) && - virDomainNetResolveActualType(net) != VIR_DOMAIN_NET_TYPE_HOSTDEV) { - net->model = qemuDomainDefaultNetModel(def, qemuCaps); - } - - if (net->type == VIR_DOMAIN_NET_TYPE_USER && - net->backend.type == VIR_DOMAIN_NET_BACKEND_DEFAULT) { - virDomainCapsDeviceNet netCaps = { }; - - virQEMUCapsFillDomainDeviceNetCaps(qemuCaps, &netCaps); - - if (!VIR_DOMAIN_CAPS_ENUM_IS_SET(netCaps.backendType, VIR_DOMAIN_NET_BACKEND_DEFAULT) && - VIR_DOMAIN_CAPS_ENUM_IS_SET(netCaps.backendType, VIR_DOMAIN_NET_BACKEND_PASST)) { - net->backend.type = VIR_DOMAIN_NET_BACKEND_PASST; - } - } - - return 0; -} - - -static int -qemuDomainDefaultVideoDevice(const virDomainDef *def, - virQEMUCaps *qemuCaps) -{ - if (ARCH_IS_PPC64(def->os.arch)) - return VIR_DOMAIN_VIDEO_TYPE_VGA; - if (qemuDomainIsARMVirt(def) || - qemuDomainIsLoongArchVirt(def) || - qemuDomainIsRISCVVirt(def) || - ARCH_IS_S390(def->os.arch)) { - return VIR_DOMAIN_VIDEO_TYPE_VIRTIO; - } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_CIRRUS_VGA)) - return VIR_DOMAIN_VIDEO_TYPE_CIRRUS; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VGA)) - return VIR_DOMAIN_VIDEO_TYPE_VGA; - return VIR_DOMAIN_VIDEO_TYPE_DEFAULT; -} - - -static int -qemuDomainDeviceVideoDefPostParse(virDomainVideoDef *video, - const virDomainDef *def, - virQEMUCaps *qemuCaps) -{ - if (video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) - video->type = qemuDomainDefaultVideoDevice(def, qemuCaps); - - if (video->type == VIR_DOMAIN_VIDEO_TYPE_QXL && - !video->vgamem) { - video->vgamem = QEMU_QXL_VGAMEM_DEFAULT; - } - - return 0; -} - - -static int -qemuDomainDevicePanicDefPostParse(virDomainPanicDef *panic, - const virDomainDef *def) -{ - if (panic->model == VIR_DOMAIN_PANIC_MODEL_DEFAULT) - panic->model = qemuDomainDefaultPanicModel(def); - - return 0; -} - - -static int -qemuDomainVsockDefPostParse(virDomainVsockDef *vsock) -{ - if (vsock->model == VIR_DOMAIN_VSOCK_MODEL_DEFAULT) - vsock->model = VIR_DOMAIN_VSOCK_MODEL_VIRTIO; - - return 0; -} - - -/** - * qemuDomainDeviceHostdevDefPostParseRestoreSecAlias: - * - * Re-generate aliases for objects related to the storage source if they - * were not stored in the status XML by an older libvirt. - * - * Note that qemuCaps should be always present for a status XML. - */ -static int -qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(virDomainHostdevDef *hostdev, - unsigned int parseFlags) -{ - qemuDomainStorageSourcePrivate *priv; - virDomainHostdevSubsysSCSI *scsisrc = &hostdev->source.subsys.u.scsi; - virDomainHostdevSubsysSCSIiSCSI *iscsisrc = &scsisrc->u.iscsi; - g_autofree char *authalias = NULL; - - if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS)) - return 0; - - if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || - hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI || - scsisrc->protocol != VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI || - !iscsisrc->src->auth) - return 0; - - if (!(priv = qemuDomainStorageSourcePrivateFetch(iscsisrc->src))) - return -1; - - if (priv->secinfo) - return 0; - - authalias = g_strdup_printf("%s-secret0", hostdev->info->alias); - - if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->secinfo, &authalias) < 0) - return -1; - - return 0; -} - - -/** - * qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias: - * - * Re-generate backend alias if it wasn't stored in the status XML by an older - * libvirtd. - * - * Note that qemuCaps should be always present for a status XML. - */ -static int -qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(virDomainHostdevDef *hostdev, - unsigned int parseFlags) -{ - virDomainHostdevSubsysSCSI *scsisrc = &hostdev->source.subsys.u.scsi; - virStorageSource *src; - - if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS)) - return 0; - - if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || - hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) - return 0; - - switch (scsisrc->protocol) { - case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: - if (!scsisrc->u.host.src) - scsisrc->u.host.src = virStorageSourceNew(); - - src = scsisrc->u.host.src; - break; - - case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI: - src = scsisrc->u.iscsi.src; - break; - - case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST: - default: - virReportEnumRangeError(virDomainHostdevSCSIProtocolType, scsisrc->protocol); - return -1; - } - - if (!qemuBlockStorageSourceGetStorageNodename(src)) - qemuBlockStorageSourceSetStorageNodename(src, g_strdup_printf("libvirt-%s-backend", hostdev->info->alias)); - - return 0; -} - - -static int -qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDev *mdevsrc) -{ - /* QEMU 2.12 added support for vfio-pci display type, we default to - * 'display=off' to stay safe from future changes */ - if (mdevsrc->model == VIR_MDEV_MODEL_TYPE_VFIO_PCI && - mdevsrc->display == VIR_TRISTATE_SWITCH_ABSENT) - mdevsrc->display = VIR_TRISTATE_SWITCH_OFF; - - return 0; -} - - -static int -qemuDomainHostdevDefPostParse(virDomainHostdevDef *hostdev, - unsigned int parseFlags) -{ - virDomainHostdevSubsys *subsys = &hostdev->source.subsys; - - if (qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(hostdev, parseFlags) < 0) - return -1; - - if (qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(hostdev, parseFlags) < 0) - return -1; - - if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV && - qemuDomainHostdevDefMdevPostParse(&subsys->u.mdev) < 0) - return -1; - - return 0; -} - - -static int -qemuDomainTPMDefPostParse(virDomainTPMDef *tpm, - const virDomainDef *def) -{ - if (tpm->model == VIR_DOMAIN_TPM_MODEL_DEFAULT) { - if (ARCH_IS_PPC64(def->os.arch)) - tpm->model = VIR_DOMAIN_TPM_MODEL_SPAPR; - else - tpm->model = VIR_DOMAIN_TPM_MODEL_TIS; - } - - /* TPM 1.2 and 2 are not compatible, so we choose a specific version here */ - if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR && - tpm->data.emulator.version == VIR_DOMAIN_TPM_VERSION_DEFAULT) { - /* tpm-tis on x86 defaults to TPM 1.2 to preserve the - * historical behavior, but in all other scenarios we want - * TPM 2.0 instead */ - if (tpm->model == VIR_DOMAIN_TPM_MODEL_TIS && - ARCH_IS_X86(def->os.arch)) { - tpm->data.emulator.version = VIR_DOMAIN_TPM_VERSION_1_2; - } else { - tpm->data.emulator.version = VIR_DOMAIN_TPM_VERSION_2_0; - } - } - - return 0; -} - - -static int qemuDomainNVDimmAlignSizePseries(virDomainMemoryDef *mem) { /* For NVDIMMs in ppc64 in we want to align down the guest @@ -6418,194 +4743,6 @@ qemuDomainNVDimmAlignSizePseries(virDomainMemoryDef *mem) } -static int -qemuDomainMemoryDefPostParse(virDomainMemoryDef *mem, virArch arch, - unsigned int parseFlags) -{ - /* Memory alignment can't be done for migration or snapshot - * scenarios. This logic was defined by commit c7d7ba85a624. - * - * There is no easy way to replicate at this point the same conditions - * used to call qemuDomainAlignMemorySizes(), which means checking if - * we're not migrating and not in a snapshot. - * - * We can use the PARSE_ABI_UPDATE flag, which is more strict - - * existing guests will not activate the flag to avoid breaking - * boot ABI. This means that any alignment done here will be replicated - * later on by qemuDomainAlignMemorySizes() to contemplate existing - * guests as well. */ - if (parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE) { - if (ARCH_IS_PPC64(arch)) { - unsigned long long ppc64MemModuleAlign = 256 * 1024; - - if (mem->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) { - if (qemuDomainNVDimmAlignSizePseries(mem) < 0) - return -1; - } else { - mem->size = VIR_ROUND_UP(mem->size, ppc64MemModuleAlign); - } - } - } - - return 0; -} - - -static int -qemuDomainPstoreDefPostParse(virDomainPstoreDef *pstore, - const virDomainDef *def, - virQEMUDriver *driver) -{ - g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - - switch (pstore->backend) { - case VIR_DOMAIN_PSTORE_BACKEND_ACPI_ERST: - if (!pstore->path) - pstore->path = g_strdup_printf("%s/%s_PSTORE.raw", - cfg->nvramDir, def->name); - break; - - case VIR_DOMAIN_PSTORE_BACKEND_LAST: - break; - } - - return 0; -} - - -static int -qemuDomainIOMMUDefPostParse(virDomainIOMMUDef *iommu, - const virDomainDef *def, - virQEMUCaps *qemuCaps, - unsigned int parseFlags) -{ - /* In case domain has huge number of vCPUS and Extended Interrupt Mode - * (EIM) is not explicitly turned off, let's enable it. If we didn't then - * guest will have troubles with interrupts. */ - if (parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE && - ARCH_IS_X86(def->os.arch) && - virDomainDefGetVcpusMax(def) > QEMU_MAX_VCPUS_WITHOUT_EIM && - qemuDomainIsQ35(def) && - iommu && iommu->model == VIR_DOMAIN_IOMMU_MODEL_INTEL) { - - /* eim requires intremap. */ - if (iommu->intremap == VIR_TRISTATE_SWITCH_ABSENT && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_INTREMAP)) { - iommu->intremap = VIR_TRISTATE_SWITCH_ON; - } - - if (iommu->eim == VIR_TRISTATE_SWITCH_ABSENT && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_EIM)) { - iommu->eim = VIR_TRISTATE_SWITCH_ON; - } - } - - return 0; -} - - -static int -qemuDomainDeviceDefPostParse(virDomainDeviceDef *dev, - const virDomainDef *def, - unsigned int parseFlags, - void *opaque, - void *parseOpaque) -{ - virQEMUDriver *driver = opaque; - /* Note that qemuCaps may be NULL when this function is called. This - * function shall not fail in that case. It will be re-run on VM startup - * with the capabilities populated. */ - virQEMUCaps *qemuCaps = parseOpaque; - int ret = -1; - - switch (dev->type) { - case VIR_DOMAIN_DEVICE_NET: - ret = qemuDomainDeviceNetDefPostParse(dev->data.net, def, qemuCaps); - break; - - case VIR_DOMAIN_DEVICE_DISK: - ret = qemuDomainDeviceDiskDefPostParse(dev->data.disk, parseFlags); - break; - - case VIR_DOMAIN_DEVICE_VIDEO: - ret = qemuDomainDeviceVideoDefPostParse(dev->data.video, def, qemuCaps); - break; - - case VIR_DOMAIN_DEVICE_PANIC: - ret = qemuDomainDevicePanicDefPostParse(dev->data.panic, def); - break; - - case VIR_DOMAIN_DEVICE_CONTROLLER: - ret = qemuDomainControllerDefPostParse(dev->data.controller, def, - qemuCaps, parseFlags); - break; - - case VIR_DOMAIN_DEVICE_SHMEM: - ret = qemuDomainShmemDefPostParse(dev->data.shmem); - break; - - case VIR_DOMAIN_DEVICE_CHR: - ret = qemuDomainChrDefPostParse(dev->data.chr, def, driver, parseFlags); - break; - - case VIR_DOMAIN_DEVICE_VSOCK: - ret = qemuDomainVsockDefPostParse(dev->data.vsock); - break; - - case VIR_DOMAIN_DEVICE_HOSTDEV: - ret = qemuDomainHostdevDefPostParse(dev->data.hostdev, parseFlags); - break; - - case VIR_DOMAIN_DEVICE_TPM: - ret = qemuDomainTPMDefPostParse(dev->data.tpm, def); - break; - - case VIR_DOMAIN_DEVICE_MEMORY: - ret = qemuDomainMemoryDefPostParse(dev->data.memory, def->os.arch, - parseFlags); - break; - - case VIR_DOMAIN_DEVICE_PSTORE: - ret = qemuDomainPstoreDefPostParse(dev->data.pstore, def, driver); - break; - - case VIR_DOMAIN_DEVICE_IOMMU: - ret = qemuDomainIOMMUDefPostParse(dev->data.iommu, def, - qemuCaps, parseFlags); - break; - - case VIR_DOMAIN_DEVICE_LEASE: - case VIR_DOMAIN_DEVICE_FS: - case VIR_DOMAIN_DEVICE_INPUT: - case VIR_DOMAIN_DEVICE_SOUND: - case VIR_DOMAIN_DEVICE_WATCHDOG: - case VIR_DOMAIN_DEVICE_GRAPHICS: - case VIR_DOMAIN_DEVICE_HUB: - case VIR_DOMAIN_DEVICE_REDIRDEV: - case VIR_DOMAIN_DEVICE_SMARTCARD: - case VIR_DOMAIN_DEVICE_MEMBALLOON: - case VIR_DOMAIN_DEVICE_NVRAM: - case VIR_DOMAIN_DEVICE_RNG: - case VIR_DOMAIN_DEVICE_AUDIO: - case VIR_DOMAIN_DEVICE_CRYPTO: - ret = 0; - break; - - case VIR_DOMAIN_DEVICE_NONE: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("unexpected VIR_DOMAIN_DEVICE_NONE")); - break; - - case VIR_DOMAIN_DEVICE_LAST: - default: - virReportEnumRangeError(virDomainDeviceType, dev->type); - break; - } - - return ret; -} - - static int qemuDomainDefAssignAddresses(virDomainDef *def, unsigned int parseFlags G_GNUC_UNUSED, @@ -6630,31 +4767,6 @@ qemuDomainDefAssignAddresses(virDomainDef *def, } -static int -qemuDomainPostParseDataAlloc(const virDomainDef *def, - unsigned int parseFlags G_GNUC_UNUSED, - void *opaque, - void **parseOpaque) -{ - virQEMUDriver *driver = opaque; - - if (!(*parseOpaque = virQEMUCapsCacheLookup(driver->qemuCapsCache, - def->emulator))) - return 1; - - return 0; -} - - -static void -qemuDomainPostParseDataFree(void *parseOpaque) -{ - virQEMUCaps *qemuCaps = parseOpaque; - - virObjectUnref(qemuCaps); -} - - virDomainDefParserConfig virQEMUDriverDomainDefParserConfig = { .domainPostParseBasicCallback = qemuDomainDefPostParseBasic, .domainPostParseDataAlloc = qemuDomainPostParseDataAlloc, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 047a11b7fe..1ae421e5f2 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -780,6 +780,9 @@ void qemuDomainCleanupRun(virQEMUDriver *driver, void qemuDomainObjPrivateDataClear(qemuDomainObjPrivate *priv); +int qemuStorageSourcePrivateDataAssignSecinfo(qemuDomainSecretInfo **secinfo, + char **alias); + extern virDomainXMLPrivateDataCallbacks virQEMUDriverPrivateDataCallbacks; extern virXMLNamespace virQEMUDriverDomainXMLNamespace; extern virDomainDefParserConfig virQEMUDriverDomainDefParserConfig; @@ -849,6 +852,11 @@ int qemuDomainGetSCSIControllerModel(const virDomainDef *def, const virDomainControllerDef *cont, virQEMUCaps *qemuCaps); +int qemuDomainDefAddDefaultAudioBackend(virQEMUDriver *driver, + virDomainDef *def); + +virDomainPanicModel qemuDomainDefaultPanicModel(const virDomainDef *def); + void qemuDomainUpdateCurrentMemorySize(virDomainObj *vm); unsigned long long qemuDomainGetMemLockLimitBytes(virDomainDef *def); @@ -938,8 +946,12 @@ int qemuDomainSecretPrepare(virQEMUDriver *driver, virDomainObj *vm) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuDomainDeviceDiskDefPostParse(virDomainDiskDef *disk, - unsigned int parseFlags); +void +qemuDomainChrDefDropDefaultPath(virDomainChrDef *chr, + virQEMUDriver *driver); + +int +qemuDomainNVDimmAlignSizePseries(virDomainMemoryDef *mem); int qemuDomainPrepareChannel(virDomainChrDef *chr, const char *domainChannelTargetDir) diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c new file mode 100644 index 0000000000..11134fb030 --- /dev/null +++ b/src/qemu/qemu_postparse.c @@ -0,0 +1,1925 @@ +/* + * qemu_postparse.c: QEMU domain PostParse functions + * + * Copyright (C) 2006-2024 Red Hat, Inc. + * Copyright (C) 2006 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <config.h> + +#include "qemu_postparse.h" +#include "qemu_alias.h" +#include "qemu_block.h" +#include "qemu_domain.h" +#include "qemu_firmware.h" +#include "qemu_security.h" +#include "qemu_validate.h" +#include "domain_conf.h" +#include "viralloc.h" +#include "virlog.h" + +#define QEMU_QXL_VGAMEM_DEFAULT 16 * 1024 + +#define VIR_FROM_THIS VIR_FROM_QEMU + +VIR_LOG_INIT("qemu.qemu_postparse"); + + +/** + * qemuDomainDefaultNetModel: + * @def: domain definition + * @qemuCaps: qemu capabilities + * + * Returns the default network model for a given domain. Note that if @qemuCaps + * is NULL this function may return NULL if the default model depends on the + * capabilities. + */ +static int +qemuDomainDefaultNetModel(const virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + /* When there are no backwards compatibility concerns getting in + * the way, virtio is a good default */ + if (ARCH_IS_S390(def->os.arch) || + qemuDomainIsLoongArchVirt(def) || + qemuDomainIsRISCVVirt(def)) { + return VIR_DOMAIN_NET_MODEL_VIRTIO; + } + + if (ARCH_IS_ARM(def->os.arch)) { + if (STREQ(def->os.machine, "versatilepb")) + return VIR_DOMAIN_NET_MODEL_SMC91C111; + + if (qemuDomainIsARMVirt(def)) + return VIR_DOMAIN_NET_MODEL_VIRTIO; + + /* Incomplete. vexpress (and a few others) use this, but not all + * arm boards */ + return VIR_DOMAIN_NET_MODEL_LAN9118; + } + + /* In all other cases the model depends on the capabilities. If they were + * not provided don't report any default. */ + if (!qemuCaps) + return VIR_DOMAIN_NET_MODEL_UNKNOWN; + + /* Try several network devices in turn; each of these devices is + * less likely be supported out-of-the-box by the guest operating + * system than the previous one */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_RTL8139)) + return VIR_DOMAIN_NET_MODEL_RTL8139; + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_E1000)) + return VIR_DOMAIN_NET_MODEL_E1000; + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_NET)) + return VIR_DOMAIN_NET_MODEL_VIRTIO; + + /* We've had no luck detecting support for any network device, + * but we have to return something: might as well be rtl8139 */ + return VIR_DOMAIN_NET_MODEL_RTL8139; +} + + +static int +qemuDomainDeviceNetDefPostParse(virDomainNetDef *net, + const virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + if (net->type == VIR_DOMAIN_NET_TYPE_VDPA && + !virDomainNetGetModelString(net)) { + net->model = VIR_DOMAIN_NET_MODEL_VIRTIO; + } else if (net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && + !virDomainNetGetModelString(net) && + virDomainNetResolveActualType(net) != VIR_DOMAIN_NET_TYPE_HOSTDEV) { + net->model = qemuDomainDefaultNetModel(def, qemuCaps); + } + + if (net->type == VIR_DOMAIN_NET_TYPE_USER && + net->backend.type == VIR_DOMAIN_NET_BACKEND_DEFAULT) { + virDomainCapsDeviceNet netCaps = { }; + + virQEMUCapsFillDomainDeviceNetCaps(qemuCaps, &netCaps); + + if (!VIR_DOMAIN_CAPS_ENUM_IS_SET(netCaps.backendType, VIR_DOMAIN_NET_BACKEND_DEFAULT) && + VIR_DOMAIN_CAPS_ENUM_IS_SET(netCaps.backendType, VIR_DOMAIN_NET_BACKEND_PASST)) { + net->backend.type = VIR_DOMAIN_NET_BACKEND_PASST; + } + } + + return 0; +} + + +/** + * qemuDomainDeviceDiskDefPostParseRestoreSecAlias: + * + * Re-generate aliases for objects related to the storage source if they + * were not stored in the status XML by an older libvirt. + * + * Note that qemuCaps should be always present for a status XML. + */ +static int +qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDomainDiskDef *disk, + unsigned int parseFlags) +{ + qemuDomainStorageSourcePrivate *priv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src); + bool restoreAuthSecret = false; + bool restoreEncSecret = false; + g_autofree char *authalias = NULL; + g_autofree char *encalias = NULL; + + if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) || + virStorageSourceIsEmpty(disk->src)) + return 0; + + /* network storage authentication secret */ + if (disk->src->auth && + (!priv || !priv->secinfo)) { + + /* only RBD and iSCSI (with capability) were supporting authentication + * using secret object at the time we did not format the alias into the + * status XML */ + if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_NETWORK && + (disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD || + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI)) + restoreAuthSecret = true; + } + + /* disk encryption secret */ + if (disk->src->encryption && + disk->src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS && + (!priv || !priv->encinfo)) + restoreEncSecret = true; + + if (!restoreAuthSecret && !restoreEncSecret) + return 0; + + if (!priv) { + if (!(disk->src->privateData = qemuDomainStorageSourcePrivateNew())) + return -1; + + priv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src); + } + + if (restoreAuthSecret) { + authalias = g_strdup_printf("%s-secret0", disk->info.alias); + + if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->secinfo, &authalias) < 0) + return -1; + } + + if (restoreEncSecret) { + if (!priv->encinfo) { + priv->enccount = 1; + priv->encinfo = g_new0(qemuDomainSecretInfo *, 1); + } + + encalias = g_strdup_printf("%s-luks-secret0", disk->info.alias); + + if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->encinfo[0], &encalias) < 0) + return -1; + } + + return 0; +} + + +int +qemuDomainDeviceDiskDefPostParse(virDomainDiskDef *disk, + unsigned int parseFlags) +{ + virStorageSource *n; + + /* set default disk types and drivers */ + if (!virDomainDiskGetDriver(disk)) + virDomainDiskSetDriver(disk, "qemu"); + + /* default disk format for drives */ + if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && + virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_VOLUME) + virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); + + /* default disk format for mirrored drive */ + if (disk->mirror && + disk->mirror->format == VIR_STORAGE_FILE_NONE) + disk->mirror->format = VIR_STORAGE_FILE_RAW; + + /* default disk encryption engine */ + for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) { + if (n->encryption && n->encryption->engine == VIR_STORAGE_ENCRYPTION_ENGINE_DEFAULT) + n->encryption->engine = VIR_STORAGE_ENCRYPTION_ENGINE_QEMU; + } + + if (qemuDomainDeviceDiskDefPostParseRestoreSecAlias(disk, parseFlags) < 0) + return -1; + + /* regenerate TLS alias for old status XMLs */ + if (parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS && + disk->src->haveTLS == VIR_TRISTATE_BOOL_YES && + !disk->src->tlsAlias && + !(disk->src->tlsAlias = qemuAliasTLSObjFromSrcAlias(disk->info.alias))) + return -1; + + return 0; +} + + +static int +qemuDomainDefaultVideoDevice(const virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + if (ARCH_IS_PPC64(def->os.arch)) + return VIR_DOMAIN_VIDEO_TYPE_VGA; + if (qemuDomainIsARMVirt(def) || + qemuDomainIsLoongArchVirt(def) || + qemuDomainIsRISCVVirt(def) || + ARCH_IS_S390(def->os.arch)) { + return VIR_DOMAIN_VIDEO_TYPE_VIRTIO; + } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_CIRRUS_VGA)) + return VIR_DOMAIN_VIDEO_TYPE_CIRRUS; + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VGA)) + return VIR_DOMAIN_VIDEO_TYPE_VGA; + return VIR_DOMAIN_VIDEO_TYPE_DEFAULT; +} + + +static int +qemuDomainDeviceVideoDefPostParse(virDomainVideoDef *video, + const virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + if (video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) + video->type = qemuDomainDefaultVideoDevice(def, qemuCaps); + + if (video->type == VIR_DOMAIN_VIDEO_TYPE_QXL && + !video->vgamem) { + video->vgamem = QEMU_QXL_VGAMEM_DEFAULT; + } + + return 0; +} + + +static int +qemuDomainDevicePanicDefPostParse(virDomainPanicDef *panic, + const virDomainDef *def) +{ + if (panic->model == VIR_DOMAIN_PANIC_MODEL_DEFAULT) + panic->model = qemuDomainDefaultPanicModel(def); + + return 0; +} + + +#define QEMU_USB_XHCI_MAXPORTS 15 + +static int +qemuDomainControllerDefPostParse(virDomainControllerDef *cont, + const virDomainDef *def, + virQEMUCaps *qemuCaps, + unsigned int parseFlags) +{ + switch (cont->type) { + case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: + /* Set the default SCSI controller model if not already set */ + cont->model = qemuDomainGetSCSIControllerModel(def, cont, qemuCaps); + + if (cont->model < 0) + return -1; + break; + + case VIR_DOMAIN_CONTROLLER_TYPE_USB: + if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT && qemuCaps) { + /* Pick a suitable default model for the USB controller if none + * has been selected by the user and we have the qemuCaps for + * figuring out which controllers are supported. + * + * We rely on device availability instead of setting the model + * unconditionally because, for some machine types, there's a + * chance we will get away with using the legacy USB controller + * when the relevant device is not available. + * + * See qemuBuildControllersCommandLine() */ + + /* Default USB controller is piix3-uhci if available. Fall back to + * 'pci-ohci' otherwise which is the default for non-x86 machines + * which honour -usb */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI)) + cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI; + else if (!ARCH_IS_X86(def->os.arch) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI)) + cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; + + if (ARCH_IS_S390(def->os.arch)) { + if (cont->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + /* set the default USB model to none for s390 unless an + * address is found */ + cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE; + } + } else if (ARCH_IS_PPC64(def->os.arch)) { + /* To not break migration we need to set default USB controller + * for ppc64 to pci-ohci if we cannot change ABI of the VM. + * The nec-usb-xhci or qemu-xhci controller is used as default + * only for newly defined domains or devices. */ + if ((parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) { + cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI; + } else if ((parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI)) { + cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI; + } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI)) { + cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; + } else { + /* Explicitly fallback to legacy USB controller for PPC64. */ + cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT; + } + } else if (def->os.arch == VIR_ARCH_AARCH64) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) + cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI; + else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI)) + cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI; + } else if (ARCH_IS_LOONGARCH(def->os.arch)) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) + cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI; + } + } + /* forbid usb model 'qusb1' and 'qusb2' in this kind of hyperviosr */ + if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB1 || + cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("USB controller model type 'qusb1' or 'qusb2' is not supported in %1$s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + } + if ((cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI || + cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI) && + cont->opts.usbopts.ports > QEMU_USB_XHCI_MAXPORTS) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("'%1$s' controller only supports up to '%2$u' ports"), + virDomainControllerModelUSBTypeToString(cont->model), + QEMU_USB_XHCI_MAXPORTS); + return -1; + } + break; + + case VIR_DOMAIN_CONTROLLER_TYPE_PCI: + + /* pSeries guests can have multiple pci-root controllers, + * but other machine types only support a single one */ + if (!qemuDomainIsPSeries(def) && + (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT || + cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) && + cont->idx != 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("pci-root and pcie-root controllers should have index 0")); + return -1; + } + + if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS && + !qemuDomainIsI440FX(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("pci-expander-bus controllers are only supported on 440fx-based machinetypes")); + return -1; + } + if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS && + !(qemuDomainIsQ35(def) || qemuDomainIsARMVirt(def))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("pcie-expander-bus controllers are not supported with this machine type")); + return -1; + } + + /* if a PCI expander bus or pci-root on Pseries has a NUMA node + * set, make sure that NUMA node is configured in the guest + * <cpu><numa> array. NUMA cell id's in this array are numbered + * from 0 .. size-1. + */ + if (cont->opts.pciopts.numaNode >= 0 && + cont->opts.pciopts.numaNode >= + (int)virDomainNumaGetNodeCount(def->numa)) { + virReportError(VIR_ERR_XML_ERROR, + _("%1$s with index %2$d is configured for a NUMA node (%3$d) not present in the domain's <cpu><numa> array (%4$zu)"), + virDomainControllerModelPCITypeToString(cont->model), + cont->idx, cont->opts.pciopts.numaNode, + virDomainNumaGetNodeCount(def->numa)); + return -1; + } + break; + + case VIR_DOMAIN_CONTROLLER_TYPE_SATA: + case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: + case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + case VIR_DOMAIN_CONTROLLER_TYPE_IDE: + case VIR_DOMAIN_CONTROLLER_TYPE_FDC: + case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + break; + } + + return 0; +} + + +static int +qemuDomainShmemDefPostParse(virDomainShmemDef *shm) +{ + /* This was the default since the introduction of this device. */ + if (shm->model != VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_DOORBELL && !shm->size) + shm->size = 4 << 20; + + /* Nothing more to check/change for IVSHMEM */ + if (shm->model == VIR_DOMAIN_SHMEM_MODEL_IVSHMEM) + return 0; + + if (!shm->server.enabled) { + if (shm->model == VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_DOORBELL) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("shmem model '%1$s' is supported only with server option enabled"), + virDomainShmemModelTypeToString(shm->model)); + return -1; + } + + if (shm->msi.enabled) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("shmem model '%1$s' doesn't support msi"), + virDomainShmemModelTypeToString(shm->model)); + } + } else { + if (shm->model == VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_PLAIN) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("shmem model '%1$s' is supported only with server option disabled"), + virDomainShmemModelTypeToString(shm->model)); + return -1; + } + + if (shm->size) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("shmem model '%1$s' does not support size setting"), + virDomainShmemModelTypeToString(shm->model)); + return -1; + } + shm->msi.enabled = true; + if (!shm->msi.ioeventfd) + shm->msi.ioeventfd = VIR_TRISTATE_SWITCH_ON; + } + + return 0; +} + + +static int +qemuDomainChrDefPostParse(virDomainChrDef *chr, + const virDomainDef *def, + virQEMUDriver *driver, + unsigned int parseFlags) +{ + /* Historically, isa-serial and the default matched, so in order to + * maintain backwards compatibility we map them here. The actual default + * will be picked below based on the architecture and machine type. */ + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA) { + chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE; + } + + /* Set the default serial type */ + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE) { + if (ARCH_IS_X86(def->os.arch)) { + chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA; + } else if (qemuDomainIsPSeries(def)) { + chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO; + } else if (qemuDomainIsARMVirt(def) || + qemuDomainIsLoongArchVirt(def) || + qemuDomainIsRISCVVirt(def)) { + chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM; + } else if (ARCH_IS_S390(def->os.arch)) { + chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP; + } + } + + /* Set the default target model */ + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE) { + switch ((virDomainChrSerialTargetType)chr->targetType) { + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA: + chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL; + break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB: + chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL; + break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI: + chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL; + break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO: + chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY; + break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM: + if (qemuDomainIsARMVirt(def)) { + chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011; + } else if (qemuDomainIsLoongArchVirt(def) || + qemuDomainIsRISCVVirt(def)) { + chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A; + } + break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP: + chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE; + break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA_DEBUG: + chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_DEBUGCON; + break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE: + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST: + /* Nothing to do */ + break; + } + } + + /* clear auto generated unix socket path for inactive definitions */ + if (parseFlags & VIR_DOMAIN_DEF_PARSE_INACTIVE) { + qemuDomainChrDefDropDefaultPath(chr, driver); + + /* For UNIX chardev if no path is provided we generate one. + * This also implies that the mode is 'bind'. */ + if (chr->source && + chr->source->type == VIR_DOMAIN_CHR_TYPE_UNIX && + !chr->source->data.nix.path) { + chr->source->data.nix.listen = true; + } + } + + return 0; +} + + +static int +qemuDomainVsockDefPostParse(virDomainVsockDef *vsock) +{ + if (vsock->model == VIR_DOMAIN_VSOCK_MODEL_DEFAULT) + vsock->model = VIR_DOMAIN_VSOCK_MODEL_VIRTIO; + + return 0; +} + + +/** + * qemuDomainDeviceHostdevDefPostParseRestoreSecAlias: + * + * Re-generate aliases for objects related to the storage source if they + * were not stored in the status XML by an older libvirt. + * + * Note that qemuCaps should be always present for a status XML. + */ +static int +qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(virDomainHostdevDef *hostdev, + unsigned int parseFlags) +{ + qemuDomainStorageSourcePrivate *priv; + virDomainHostdevSubsysSCSI *scsisrc = &hostdev->source.subsys.u.scsi; + virDomainHostdevSubsysSCSIiSCSI *iscsisrc = &scsisrc->u.iscsi; + g_autofree char *authalias = NULL; + + if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS)) + return 0; + + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || + hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI || + scsisrc->protocol != VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI || + !iscsisrc->src->auth) + return 0; + + if (!(priv = qemuDomainStorageSourcePrivateFetch(iscsisrc->src))) + return -1; + + if (priv->secinfo) + return 0; + + authalias = g_strdup_printf("%s-secret0", hostdev->info->alias); + + if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->secinfo, &authalias) < 0) + return -1; + + return 0; +} + + +/** + * qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias: + * + * Re-generate backend alias if it wasn't stored in the status XML by an older + * libvirtd. + * + * Note that qemuCaps should be always present for a status XML. + */ +static int +qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(virDomainHostdevDef *hostdev, + unsigned int parseFlags) +{ + virDomainHostdevSubsysSCSI *scsisrc = &hostdev->source.subsys.u.scsi; + virStorageSource *src; + + if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS)) + return 0; + + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || + hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) + return 0; + + switch (scsisrc->protocol) { + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: + if (!scsisrc->u.host.src) + scsisrc->u.host.src = virStorageSourceNew(); + + src = scsisrc->u.host.src; + break; + + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI: + src = scsisrc->u.iscsi.src; + break; + + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST: + default: + virReportEnumRangeError(virDomainHostdevSCSIProtocolType, scsisrc->protocol); + return -1; + } + + if (!qemuBlockStorageSourceGetStorageNodename(src)) + qemuBlockStorageSourceSetStorageNodename(src, g_strdup_printf("libvirt-%s-backend", hostdev->info->alias)); + + return 0; +} + + +static int +qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDev *mdevsrc) +{ + /* QEMU 2.12 added support for vfio-pci display type, we default to + * 'display=off' to stay safe from future changes */ + if (mdevsrc->model == VIR_MDEV_MODEL_TYPE_VFIO_PCI && + mdevsrc->display == VIR_TRISTATE_SWITCH_ABSENT) + mdevsrc->display = VIR_TRISTATE_SWITCH_OFF; + + return 0; +} + + +static int +qemuDomainHostdevDefPostParse(virDomainHostdevDef *hostdev, + unsigned int parseFlags) +{ + virDomainHostdevSubsys *subsys = &hostdev->source.subsys; + + if (qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(hostdev, parseFlags) < 0) + return -1; + + if (qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(hostdev, parseFlags) < 0) + return -1; + + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV && + qemuDomainHostdevDefMdevPostParse(&subsys->u.mdev) < 0) + return -1; + + return 0; +} + + +static int +qemuDomainTPMDefPostParse(virDomainTPMDef *tpm, + const virDomainDef *def) +{ + if (tpm->model == VIR_DOMAIN_TPM_MODEL_DEFAULT) { + if (ARCH_IS_PPC64(def->os.arch)) + tpm->model = VIR_DOMAIN_TPM_MODEL_SPAPR; + else + tpm->model = VIR_DOMAIN_TPM_MODEL_TIS; + } + + /* TPM 1.2 and 2 are not compatible, so we choose a specific version here */ + if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR && + tpm->data.emulator.version == VIR_DOMAIN_TPM_VERSION_DEFAULT) { + /* tpm-tis on x86 defaults to TPM 1.2 to preserve the + * historical behavior, but in all other scenarios we want + * TPM 2.0 instead */ + if (tpm->model == VIR_DOMAIN_TPM_MODEL_TIS && + ARCH_IS_X86(def->os.arch)) { + tpm->data.emulator.version = VIR_DOMAIN_TPM_VERSION_1_2; + } else { + tpm->data.emulator.version = VIR_DOMAIN_TPM_VERSION_2_0; + } + } + + return 0; +} + + +static int +qemuDomainMemoryDefPostParse(virDomainMemoryDef *mem, virArch arch, + unsigned int parseFlags) +{ + /* Memory alignment can't be done for migration or snapshot + * scenarios. This logic was defined by commit c7d7ba85a624. + * + * There is no easy way to replicate at this point the same conditions + * used to call qemuDomainAlignMemorySizes(), which means checking if + * we're not migrating and not in a snapshot. + * + * We can use the PARSE_ABI_UPDATE flag, which is more strict - + * existing guests will not activate the flag to avoid breaking + * boot ABI. This means that any alignment done here will be replicated + * later on by qemuDomainAlignMemorySizes() to contemplate existing + * guests as well. */ + if (parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE) { + if (ARCH_IS_PPC64(arch)) { + unsigned long long ppc64MemModuleAlign = 256 * 1024; + + if (mem->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) { + if (qemuDomainNVDimmAlignSizePseries(mem) < 0) + return -1; + } else { + mem->size = VIR_ROUND_UP(mem->size, ppc64MemModuleAlign); + } + } + } + + return 0; +} + + +static int +qemuDomainPstoreDefPostParse(virDomainPstoreDef *pstore, + const virDomainDef *def, + virQEMUDriver *driver) +{ + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + + switch (pstore->backend) { + case VIR_DOMAIN_PSTORE_BACKEND_ACPI_ERST: + if (!pstore->path) + pstore->path = g_strdup_printf("%s/%s_PSTORE.raw", + cfg->nvramDir, def->name); + break; + + case VIR_DOMAIN_PSTORE_BACKEND_LAST: + break; + } + + return 0; +} + + +static int +qemuDomainIOMMUDefPostParse(virDomainIOMMUDef *iommu, + const virDomainDef *def, + virQEMUCaps *qemuCaps, + unsigned int parseFlags) +{ + /* In case domain has huge number of vCPUS and Extended Interrupt Mode + * (EIM) is not explicitly turned off, let's enable it. If we didn't then + * guest will have troubles with interrupts. */ + if (parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE && + ARCH_IS_X86(def->os.arch) && + virDomainDefGetVcpusMax(def) > QEMU_MAX_VCPUS_WITHOUT_EIM && + qemuDomainIsQ35(def) && + iommu && iommu->model == VIR_DOMAIN_IOMMU_MODEL_INTEL) { + + /* eim requires intremap. */ + if (iommu->intremap == VIR_TRISTATE_SWITCH_ABSENT && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_INTREMAP)) { + iommu->intremap = VIR_TRISTATE_SWITCH_ON; + } + + if (iommu->eim == VIR_TRISTATE_SWITCH_ABSENT && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_EIM)) { + iommu->eim = VIR_TRISTATE_SWITCH_ON; + } + } + + return 0; +} + + +int +qemuDomainDeviceDefPostParse(virDomainDeviceDef *dev, + const virDomainDef *def, + unsigned int parseFlags, + void *opaque, + void *parseOpaque) +{ + virQEMUDriver *driver = opaque; + /* Note that qemuCaps may be NULL when this function is called. This + * function shall not fail in that case. It will be re-run on VM startup + * with the capabilities populated. */ + virQEMUCaps *qemuCaps = parseOpaque; + int ret = -1; + + switch (dev->type) { + case VIR_DOMAIN_DEVICE_NET: + ret = qemuDomainDeviceNetDefPostParse(dev->data.net, def, qemuCaps); + break; + + case VIR_DOMAIN_DEVICE_DISK: + ret = qemuDomainDeviceDiskDefPostParse(dev->data.disk, parseFlags); + break; + + case VIR_DOMAIN_DEVICE_VIDEO: + ret = qemuDomainDeviceVideoDefPostParse(dev->data.video, def, qemuCaps); + break; + + case VIR_DOMAIN_DEVICE_PANIC: + ret = qemuDomainDevicePanicDefPostParse(dev->data.panic, def); + break; + + case VIR_DOMAIN_DEVICE_CONTROLLER: + ret = qemuDomainControllerDefPostParse(dev->data.controller, def, + qemuCaps, parseFlags); + break; + + case VIR_DOMAIN_DEVICE_SHMEM: + ret = qemuDomainShmemDefPostParse(dev->data.shmem); + break; + + case VIR_DOMAIN_DEVICE_CHR: + ret = qemuDomainChrDefPostParse(dev->data.chr, def, driver, parseFlags); + break; + + case VIR_DOMAIN_DEVICE_VSOCK: + ret = qemuDomainVsockDefPostParse(dev->data.vsock); + break; + + case VIR_DOMAIN_DEVICE_HOSTDEV: + ret = qemuDomainHostdevDefPostParse(dev->data.hostdev, parseFlags); + break; + + case VIR_DOMAIN_DEVICE_TPM: + ret = qemuDomainTPMDefPostParse(dev->data.tpm, def); + break; + + case VIR_DOMAIN_DEVICE_MEMORY: + ret = qemuDomainMemoryDefPostParse(dev->data.memory, def->os.arch, + parseFlags); + break; + + case VIR_DOMAIN_DEVICE_PSTORE: + ret = qemuDomainPstoreDefPostParse(dev->data.pstore, def, driver); + break; + + case VIR_DOMAIN_DEVICE_IOMMU: + ret = qemuDomainIOMMUDefPostParse(dev->data.iommu, def, + qemuCaps, parseFlags); + break; + + case VIR_DOMAIN_DEVICE_LEASE: + case VIR_DOMAIN_DEVICE_FS: + case VIR_DOMAIN_DEVICE_INPUT: + case VIR_DOMAIN_DEVICE_SOUND: + case VIR_DOMAIN_DEVICE_WATCHDOG: + case VIR_DOMAIN_DEVICE_GRAPHICS: + case VIR_DOMAIN_DEVICE_HUB: + case VIR_DOMAIN_DEVICE_REDIRDEV: + case VIR_DOMAIN_DEVICE_SMARTCARD: + case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: + case VIR_DOMAIN_DEVICE_RNG: + case VIR_DOMAIN_DEVICE_AUDIO: + case VIR_DOMAIN_DEVICE_CRYPTO: + ret = 0; + break; + + case VIR_DOMAIN_DEVICE_NONE: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unexpected VIR_DOMAIN_DEVICE_NONE")); + break; + + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportEnumRangeError(virDomainDeviceType, dev->type); + break; + } + + return ret; +} + + +int +qemuDomainDefPostParseBasic(virDomainDef *def, + void *opaque G_GNUC_UNUSED) +{ + virQEMUDriver *driver = opaque; + + /* check for emulator and create a default one if needed */ + if (!def->emulator) { + if (!(def->emulator = virQEMUCapsGetDefaultEmulator( + driver->hostarch, def->os.arch))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("No emulator found for arch '%1$s'"), + virArchToString(def->os.arch)); + return 1; + } + } + + return 0; +} + + +static int +qemuCanonicalizeMachine(virDomainDef *def, virQEMUCaps *qemuCaps) +{ + const char *canon; + + if (!(canon = virQEMUCapsGetCanonicalMachine(qemuCaps, def->virtType, + def->os.machine))) + return 0; + + if (STRNEQ(canon, def->os.machine)) { + char *tmp; + tmp = g_strdup(canon); + VIR_FREE(def->os.machine); + def->os.machine = tmp; + } + + return 0; +} + + +static int +qemuDomainDefMachinePostParse(virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + if (!def->os.machine) { + const char *machine = virQEMUCapsGetPreferredMachine(qemuCaps, + def->virtType); + if (!machine) { + virReportError(VIR_ERR_INVALID_ARG, + _("could not get preferred machine for %1$s type=%2$s"), + def->emulator, + virDomainVirtTypeToString(def->virtType)); + return -1; + } + + def->os.machine = g_strdup(machine); + } + + if (qemuCanonicalizeMachine(def, qemuCaps) < 0) + return -1; + + return 0; +} + + +/** + * qemuDomainDefACPIPostParse: + * @def: domain definition + * @qemuCaps: qemu capabilities object + * + * Fixup the use of ACPI flag on certain architectures that never supported it + * and users for some reason used it, which would break migration to newer + * libvirt versions which check whether given machine type supports ACPI. + * + * The fixup is done in post-parse as it's hard to update the ABI stability + * check on source of the migration. + */ +static void +qemuDomainDefACPIPostParse(virDomainDef *def, + virQEMUCaps *qemuCaps, + unsigned int parseFlags) +{ + /* Only cases when ACPI is enabled need to be fixed up */ + if (def->features[VIR_DOMAIN_FEATURE_ACPI] != VIR_TRISTATE_SWITCH_ON) + return; + + /* Strip the <acpi/> feature only for non-fresh configs, in order to still + * produce an error if the feature is present in a newly defined one. + * + * The use of the VIR_DOMAIN_DEF_PARSE_ABI_UPDATE looks counter-intuitive, + * but it's used only in qemuDomainCreateXML/qemuDomainDefineXMLFlags APIs + * */ + if (parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE) + return; + + /* This fixup is applicable _only_ on architectures which were present as of + * libvirt-9.2 and *never* supported ACPI. The fixup is currently done only + * for existing users of s390(x) to fix migration for configs which had + * <acpi/> despite being ignored. + */ + if (def->os.arch != VIR_ARCH_S390 && + def->os.arch != VIR_ARCH_S390X) + return; + + /* To be sure, we only strip ACPI if given machine type doesn't support it */ + if (virQEMUCapsMachineSupportsACPI(qemuCaps, def->virtType, def->os.machine) != VIR_TRISTATE_BOOL_NO) + return; + + def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ABSENT; +} + + +static int +qemuDomainDefBootPostParse(virDomainDef *def, + virQEMUDriver *driver, + unsigned int parseFlags) +{ + bool abiUpdate = !!(parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE); + + /* If we're loading an existing configuration from disk, we + * should try as hard as possible to preserve historical + * behavior. In particular, firmware autoselection being enabled + * could never have resulted, before libvirt 9.2.0, in anything + * but a raw firmware image being selected. + * + * In order to ensure that existing domains keep working even if + * a firmware descriptor for a build with a different format is + * given higher priority, explicitly add this requirement to the + * definition before performing firmware selection */ + if (!abiUpdate && def->os.firmware) { + if (!def->os.loader) + def->os.loader = virDomainLoaderDefNew(); + if (!def->os.loader->format) + def->os.loader->format = VIR_STORAGE_FILE_RAW; + } + + /* Firmware selection can fail for a number of reasons, but the + * most likely one is that the requested configuration contains + * mistakes or includes constraints that are impossible to + * satisfy on the current system. + * + * If that happens, we have to react differently based on the + * situation: if we're defining a new domain or updating its ABI, + * we should let the user know immediately so that they can + * change the requested configuration, hopefully into one that we + * can work with; if we're loading the configuration of an + * existing domain from disk, however, we absolutely cannot error + * out here, or the domain will disappear. + * + * To handle the second case gracefully, we clear any reported + * errors and continue as if nothing had happened. When it's time + * to start the domain, qemuFirmwareFillDomain() will be run + * again, fail in the same way, and at that point we'll have a + * chance to inform the user of any issues */ + if (qemuFirmwareFillDomain(driver, def, abiUpdate) < 0) { + if (abiUpdate) { + return -1; + } else { + virResetLastError(); + return 0; + } + } + + return 0; +} + + +static int +qemuDomainDefAddImplicitInputDevice(virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + if (virQEMUCapsSupportsI8042(qemuCaps, def) && + def->features[VIR_DOMAIN_FEATURE_PS2] != VIR_TRISTATE_SWITCH_OFF) { + if (virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_MOUSE, + VIR_DOMAIN_INPUT_BUS_PS2) < 0) + return -1; + + if (virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + VIR_DOMAIN_INPUT_BUS_PS2) < 0) + return -1; + } + + return 0; +} + + +static int +qemuDomainDefSetDefaultCPU(virDomainDef *def, + virArch hostarch, + virQEMUCaps *qemuCaps) +{ + const char *model; + + if (def->cpu && + (def->cpu->mode != VIR_CPU_MODE_CUSTOM || + def->cpu->model)) + return 0; + + if (!virCPUArchIsSupported(def->os.arch)) + return 0; + + /* Default CPU model info from QEMU is usable for TCG only except for + * x86, s390, and ppc64. */ + if (!ARCH_IS_X86(def->os.arch) && + !ARCH_IS_S390(def->os.arch) && + !ARCH_IS_PPC64(def->os.arch) && + def->virtType != VIR_DOMAIN_VIRT_QEMU) + return 0; + + model = virQEMUCapsGetMachineDefaultCPU(qemuCaps, def->os.machine, def->virtType); + if (!model) { + VIR_DEBUG("Unknown default CPU model for domain '%s'", def->name); + return 0; + } + + if (STREQ(model, "host") && def->virtType != VIR_DOMAIN_VIRT_KVM) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("QEMU reports invalid default CPU model \"host\" for non-kvm domain virt type")); + return -1; + } + + if (!def->cpu) + def->cpu = virCPUDefNew(); + + def->cpu->type = VIR_CPU_TYPE_GUEST; + + if (STREQ(model, "host")) { + if (ARCH_IS_S390(def->os.arch) && + virQEMUCapsIsCPUModeSupported(qemuCaps, hostarch, def->virtType, + VIR_CPU_MODE_HOST_MODEL, + def->os.machine)) { + def->cpu->mode = VIR_CPU_MODE_HOST_MODEL; + } else { + def->cpu->mode = VIR_CPU_MODE_HOST_PASSTHROUGH; + } + + VIR_DEBUG("Setting default CPU mode for domain '%s' to %s", + def->name, virCPUModeTypeToString(def->cpu->mode)); + } else { + /* We need to turn off all CPU checks when the domain is started + * because the default CPU (e.g., qemu64) may not be runnable on any + * host. QEMU will just disable the unavailable features and we will + * update the CPU definition accordingly and set check to FULL when + * starting the domain. */ + def->cpu->check = VIR_CPU_CHECK_NONE; + def->cpu->mode = VIR_CPU_MODE_CUSTOM; + def->cpu->match = VIR_CPU_MATCH_EXACT; + def->cpu->fallback = VIR_CPU_FALLBACK_FORBID; + def->cpu->model = g_strdup(model); + + VIR_DEBUG("Setting default CPU model for domain '%s' to %s", + def->name, model); + } + + return 0; +} + + +static int +qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, + virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + bool addDefaultUSB = false; + int usbModel = -1; /* "default for machinetype" */ + int pciRoot; /* index within def->controllers */ + bool addImplicitSATA = false; + bool addPCIRoot = false; + bool addPCIeRoot = false; + bool addDefaultMemballoon = false; + bool addDefaultUSBKBD = false; + bool addDefaultUSBMouse = false; + bool addPanicDevice = false; + bool addITCOWatchdog = false; + bool addIOMMU = false; + + /* add implicit input devices */ + if (qemuDomainDefAddImplicitInputDevice(def, qemuCaps) < 0) + return -1; + + /* Add implicit PCI root controller if the machine has one */ + switch (def->os.arch) { + case VIR_ARCH_I686: + case VIR_ARCH_X86_64: + addDefaultMemballoon = true; + + if (STREQ(def->os.machine, "isapc")) { + break; + } + + addDefaultUSB = true; + + if (qemuDomainIsQ35(def)) { + addPCIeRoot = true; + addImplicitSATA = true; + addITCOWatchdog = true; + + if (virDomainDefGetVcpusMax(def) > QEMU_MAX_VCPUS_WITHOUT_EIM) { + addIOMMU = true; + } + + /* Prefer adding a USB3 controller if supported, fall back + * to USB2 if there is no USB3 available, and if that's + * unavailable don't add anything. + */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) + usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI; + else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI)) + usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI; + else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_USB_EHCI1)) + usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1; + else + addDefaultUSB = false; + break; + } + if (qemuDomainIsI440FX(def)) + addPCIRoot = true; + break; + + case VIR_ARCH_ARMV6L: + case VIR_ARCH_ARMV7L: + case VIR_ARCH_ARMV7B: + case VIR_ARCH_AARCH64: + if (STREQ(def->os.machine, "versatilepb")) + addPCIRoot = true; + + /* Add default USB for the two machine types which historically + * supported -usb */ + if (STREQ(def->os.machine, "versatilepb") || + STRPREFIX(def->os.machine, "realview")) { + addDefaultUSB = true; + usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; + } + + if (qemuDomainIsARMVirt(def)) + addPCIeRoot = true; + + break; + + case VIR_ARCH_PPC64: + case VIR_ARCH_PPC64LE: + addPCIRoot = true; + addDefaultUSB = true; + addDefaultUSBKBD = true; + addDefaultUSBMouse = true; + addDefaultMemballoon = true; + /* For pSeries guests, the firmware provides the same + * functionality as the pvpanic device, so automatically + * add the definition if not already present */ + if (qemuDomainIsPSeries(def)) + addPanicDevice = true; + break; + + case VIR_ARCH_ALPHA: + case VIR_ARCH_PPC: + case VIR_ARCH_PPCEMB: + case VIR_ARCH_SH4: + case VIR_ARCH_SH4EB: + addDefaultUSB = true; + addDefaultMemballoon = true; + addPCIRoot = true; + break; + + case VIR_ARCH_RISCV32: + case VIR_ARCH_RISCV64: + addDefaultMemballoon = true; + if (qemuDomainIsRISCVVirt(def)) + addPCIeRoot = true; + break; + + case VIR_ARCH_S390: + case VIR_ARCH_S390X: + addDefaultMemballoon = true; + addPanicDevice = true; + addPCIRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_ZPCI); + break; + + case VIR_ARCH_SPARC64: + addDefaultUSB = true; + addDefaultMemballoon = true; + addPCIRoot = true; + break; + + case VIR_ARCH_MIPS: + case VIR_ARCH_MIPSEL: + case VIR_ARCH_MIPS64: + case VIR_ARCH_MIPS64EL: + addDefaultUSB = true; + addDefaultMemballoon = true; + if (qemuDomainIsMipsMalta(def)) + addPCIRoot = true; + break; + + case VIR_ARCH_LOONGARCH64: + addPCIeRoot = true; + break; + + case VIR_ARCH_CRIS: + case VIR_ARCH_ITANIUM: + case VIR_ARCH_LM32: + case VIR_ARCH_M68K: + case VIR_ARCH_MICROBLAZE: + case VIR_ARCH_MICROBLAZEEL: + case VIR_ARCH_OR32: + case VIR_ARCH_PARISC: + case VIR_ARCH_PARISC64: + case VIR_ARCH_PPCLE: + case VIR_ARCH_SPARC: + case VIR_ARCH_UNICORE32: + case VIR_ARCH_XTENSA: + case VIR_ARCH_XTENSAEB: + case VIR_ARCH_NONE: + case VIR_ARCH_LAST: + default: + break; + } + + if (addDefaultUSB && + virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0) < 0 && + virDomainDefAddUSBController(def, 0, usbModel) < 0) + return -1; + + if (addImplicitSATA && + virDomainDefMaybeAddController( + def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, 0, -1) < 0) + return -1; + + pciRoot = virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0); + + /* NB: any machine that sets addPCIRoot to true must also return + * true from the function qemuDomainSupportsPCI(). + */ + if (addPCIRoot) { + if (pciRoot >= 0) { + if (def->controllers[pciRoot]->model != VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) { + virReportError(VIR_ERR_XML_ERROR, + _("The PCI controller with index='0' must be model='pci-root' for this machine type, but model='%1$s' was found instead"), + virDomainControllerModelPCITypeToString(def->controllers[pciRoot]->model)); + return -1; + } + } else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0, + VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT)) { + return -1; + } + } + + /* When a machine has a pcie-root, make sure that there is always + * a dmi-to-pci-bridge controller added as bus 1, and a pci-bridge + * as bus 2, so that standard PCI devices can be connected + * + * NB: any machine that sets addPCIeRoot to true must also return + * true from the function qemuDomainSupportsPCI(). + */ + if (addPCIeRoot) { + if (pciRoot >= 0) { + if (def->controllers[pciRoot]->model != VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) { + virReportError(VIR_ERR_XML_ERROR, + _("The PCI controller with index='0' must be model='pcie-root' for this machine type, but model='%1$s' was found instead"), + virDomainControllerModelPCITypeToString(def->controllers[pciRoot]->model)); + return -1; + } + } else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0, + VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT)) { + return -1; + } + } + + if (addDefaultMemballoon && !def->memballoon) { + virDomainMemballoonDef *memballoon; + memballoon = g_new0(virDomainMemballoonDef, 1); + + memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO; + def->memballoon = memballoon; + } + + if (addDefaultUSBMouse) { + bool hasUSBTablet = false; + size_t j; + + for (j = 0; j < def->ninputs; j++) { + if (def->inputs[j]->type == VIR_DOMAIN_INPUT_TYPE_TABLET && + def->inputs[j]->bus == VIR_DOMAIN_INPUT_BUS_USB) { + hasUSBTablet = true; + break; + } + } + + /* Historically, we have automatically added USB keyboard and + * mouse to some guests. While the former device is generally + * safe to have, adding the latter is undesiderable if a USB + * tablet is already present in the guest */ + if (hasUSBTablet) + addDefaultUSBMouse = false; + } + + if (addDefaultUSBKBD && + def->ngraphics > 0 && + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + VIR_DOMAIN_INPUT_BUS_USB) < 0) + return -1; + + if (addDefaultUSBMouse && + def->ngraphics > 0 && + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_MOUSE, + VIR_DOMAIN_INPUT_BUS_USB) < 0) + return -1; + + if (addPanicDevice) { + virDomainPanicModel defaultModel = qemuDomainDefaultPanicModel(def); + size_t j; + + for (j = 0; j < def->npanics; j++) { + if (def->panics[j]->model == VIR_DOMAIN_PANIC_MODEL_DEFAULT || + def->panics[j]->model == defaultModel) + break; + } + + if (j == def->npanics) { + virDomainPanicDef *panic = g_new0(virDomainPanicDef, 1); + + VIR_APPEND_ELEMENT_COPY(def->panics, def->npanics, panic); + } + } + + if (addITCOWatchdog) { + size_t i = 0; + + for (i = 0; i < def->nwatchdogs; i++) { + if (def->watchdogs[i]->model == VIR_DOMAIN_WATCHDOG_MODEL_ITCO) + break; + } + + if (i == def->nwatchdogs) { + virDomainWatchdogDef *watchdog = g_new0(virDomainWatchdogDef, 1); + + watchdog->model = VIR_DOMAIN_WATCHDOG_MODEL_ITCO; + if (def->nwatchdogs) + watchdog->action = def->watchdogs[0]->action; + else + watchdog->action = VIR_DOMAIN_WATCHDOG_ACTION_RESET; + + VIR_APPEND_ELEMENT(def->watchdogs, def->nwatchdogs, watchdog); + } + } + + if (addIOMMU && !def->iommu && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_INTEL_IOMMU) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_INTREMAP) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_EIM)) { + g_autoptr(virDomainIOMMUDef) iommu = NULL; + + iommu = virDomainIOMMUDefNew(); + iommu->model = VIR_DOMAIN_IOMMU_MODEL_INTEL; + /* eim requires intremap. */ + iommu->intremap = VIR_TRISTATE_SWITCH_ON; + iommu->eim = VIR_TRISTATE_SWITCH_ON; + + def->iommu = g_steal_pointer(&iommu); + } + + if (qemuDomainDefAddDefaultAudioBackend(driver, def) < 0) + return -1; + + return 0; +} + + +/** + * qemuDomainDefEnableDefaultFeatures: + * @def: domain definition + * @qemuCaps: QEMU capabilities + * + * Make sure that features that should be enabled by default are actually + * enabled and configure default values related to those features. + */ +static void +qemuDomainDefEnableDefaultFeatures(virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + /* The virt machine type always uses GIC: if the relevant information + * was not included in the domain XML, we need to choose a suitable + * GIC version ourselves */ + if ((def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ABSENT && + qemuDomainIsARMVirt(def)) || + (def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ON && + def->gic_version == VIR_GIC_VERSION_NONE)) { + virGICVersion version; + + VIR_DEBUG("Looking for usable GIC version in domain capabilities"); + for (version = VIR_GIC_VERSION_LAST - 1; + version > VIR_GIC_VERSION_NONE; + version--) { + + /* We want to use the highest available GIC version for guests; + * however, the emulated GICv3 is currently lacking a MSI controller, + * making it unsuitable for the pure PCIe topology we aim for. + * + * For that reason, we skip this step entirely for TCG guests, + * and rely on the code below to pick the default version, GICv2, + * which supports all the features we need. + * + * See https://bugzilla.redhat.com/show_bug.cgi?id=1414081 */ + if (version == VIR_GIC_VERSION_3 && + def->virtType == VIR_DOMAIN_VIRT_QEMU) { + continue; + } + + if (virQEMUCapsSupportsGICVersion(qemuCaps, + def->virtType, + version)) { + VIR_DEBUG("Using GIC version %s", + virGICVersionTypeToString(version)); + def->gic_version = version; + break; + } + } + + /* Use the default GIC version (GICv2) as a last-ditch attempt + * if no match could be found above */ + if (def->gic_version == VIR_GIC_VERSION_NONE) { + VIR_DEBUG("Using GIC version 2 (default)"); + def->gic_version = VIR_GIC_VERSION_2; + } + + /* Even if we haven't found a usable GIC version in the domain + * capabilities, we still want to enable this */ + def->features[VIR_DOMAIN_FEATURE_GIC] = VIR_TRISTATE_SWITCH_ON; + } +} + + +static int +qemuDomainRecheckInternalPaths(virDomainDef *def, + virQEMUDriverConfig *cfg, + unsigned int flags) +{ + size_t i = 0; + size_t j = 0; + + for (i = 0; i < def->ngraphics; ++i) { + virDomainGraphicsDef *graphics = def->graphics[i]; + + for (j = 0; j < graphics->nListens; ++j) { + virDomainGraphicsListenDef *glisten = &graphics->listens[j]; + + /* This will happen only if we parse XML from old libvirts where + * unix socket was available only for VNC graphics. In this + * particular case we should follow the behavior and if we remove + * the auto-generated socket based on config option from qemu.conf + * we need to change the listen type to address. */ + if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + glisten->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET && + glisten->socket && + !glisten->autoGenerated && + STRPREFIX(glisten->socket, cfg->libDir)) { + if (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) { + VIR_FREE(glisten->socket); + glisten->type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS; + } else { + glisten->fromConfig = true; + } + } + } + } + + return 0; +} + + +static int +qemuDomainDefVcpusPostParse(virDomainDef *def) +{ + unsigned int maxvcpus = virDomainDefGetVcpusMax(def); + virDomainVcpuDef *vcpu; + virDomainVcpuDef *prevvcpu; + size_t i; + bool has_order = false; + + /* vcpu 0 needs to be present, first, and non-hotpluggable */ + vcpu = virDomainDefGetVcpu(def, 0); + if (!vcpu->online) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vcpu 0 can't be offline")); + return -1; + } + if (vcpu->hotpluggable == VIR_TRISTATE_BOOL_YES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vcpu0 can't be hotpluggable")); + return -1; + } + if (vcpu->order != 0 && vcpu->order != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vcpu0 must be enabled first")); + return -1; + } + + if (vcpu->order != 0) + has_order = true; + + prevvcpu = vcpu; + + /* all online vcpus or non online vcpu need to have order set */ + for (i = 1; i < maxvcpus; i++) { + vcpu = virDomainDefGetVcpu(def, i); + + if (vcpu->online && + (vcpu->order != 0) != has_order) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("all vcpus must have either set or unset order")); + return -1; + } + + /* few conditions for non-hotpluggable (thus online) vcpus */ + if (vcpu->hotpluggable == VIR_TRISTATE_BOOL_NO) { + /* they can be ordered only at the beginning */ + if (prevvcpu->hotpluggable == VIR_TRISTATE_BOOL_YES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("online non-hotpluggable vcpus need to be ordered prior to hotplugable vcpus")); + return -1; + } + + /* they need to be in order (qemu doesn't support any order yet). + * Also note that multiple vcpus may share order on some platforms */ + if (prevvcpu->order > vcpu->order) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("online non-hotpluggable vcpus must be ordered in ascending order")); + return -1; + } + } + + prevvcpu = vcpu; + } + + return 0; +} + + +static int +qemuDomainDefCPUPostParse(virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + virCPUFeatureDef *sveFeature = NULL; + bool sveVectorLengthsProvided = false; + size_t i; + + if (!def->cpu) + return 0; + + for (i = 0; i < def->cpu->nfeatures; i++) { + virCPUFeatureDef *feature = &def->cpu->features[i]; + + if (STREQ(feature->name, "sve")) { + sveFeature = feature; + } else if (STRPREFIX(feature->name, "sve")) { + sveVectorLengthsProvided = true; + } + } + + if (sveVectorLengthsProvided) { + if (sveFeature) { + if (sveFeature->policy == VIR_CPU_FEATURE_DISABLE || + sveFeature->policy == VIR_CPU_FEATURE_FORBID) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("SVE disabled, but SVE vector lengths provided")); + return -1; + } else { + sveFeature->policy = VIR_CPU_FEATURE_REQUIRE; + } + } else { + VIR_RESIZE_N(def->cpu->features, def->cpu->nfeatures_max, + def->cpu->nfeatures, 1); + + def->cpu->features[def->cpu->nfeatures].name = g_strdup("sve"); + def->cpu->features[def->cpu->nfeatures].policy = VIR_CPU_FEATURE_REQUIRE; + + def->cpu->nfeatures++; + } + } + + /* Running domains were either started before QEMU_CAPS_CPU_MIGRATABLE was + * introduced and thus we can't rely on it or they already have the + * migratable default set. */ + if (def->id == -1 && + qemuCaps && + def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH && + def->cpu->migratable == VIR_TRISTATE_SWITCH_ABSENT) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MIGRATABLE)) + def->cpu->migratable = VIR_TRISTATE_SWITCH_ON; + else if (ARCH_IS_X86(def->os.arch)) + def->cpu->migratable = VIR_TRISTATE_SWITCH_OFF; + } + + /* Nothing to be done if only CPU topology is specified. */ + if (def->cpu->mode == VIR_CPU_MODE_CUSTOM && + !def->cpu->model) + return 0; + + if (def->cpu->check != VIR_CPU_CHECK_DEFAULT) + return 0; + + switch ((virCPUMode) def->cpu->mode) { + case VIR_CPU_MODE_HOST_PASSTHROUGH: + case VIR_CPU_MODE_MAXIMUM: + def->cpu->check = VIR_CPU_CHECK_NONE; + break; + + case VIR_CPU_MODE_HOST_MODEL: + def->cpu->check = VIR_CPU_CHECK_PARTIAL; + break; + + case VIR_CPU_MODE_CUSTOM: + /* Custom CPUs in TCG mode are not compared to host CPU by default. */ + if (def->virtType == VIR_DOMAIN_VIRT_QEMU) + def->cpu->check = VIR_CPU_CHECK_NONE; + else + def->cpu->check = VIR_CPU_CHECK_PARTIAL; + break; + + case VIR_CPU_MODE_LAST: + break; + } + + return 0; +} + + +static int +qemuDomainDefTsegPostParse(virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + if (def->features[VIR_DOMAIN_FEATURE_SMM] != VIR_TRISTATE_SWITCH_ON) + return 0; + + if (!def->tseg_specified) + return 0; + + if (!qemuDomainIsQ35(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("SMM TSEG is only supported with q35 machine type")); + return -1; + } + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting TSEG size is not supported with this QEMU binary")); + return -1; + } + + if (def->tseg_size & ((1 << 20) - 1)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("SMM TSEG size must be divisible by 1 MiB")); + return -1; + } + + return 0; +} + + +static int +qemuDomainDefNumaAutoAdd(virDomainDef *def, + unsigned int parseFlags) +{ + bool abiUpdate = !!(parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE); + unsigned long long nodeMem; + size_t i; + + if (!abiUpdate || + !virDomainDefHasMemoryHotplug(def) || + virDomainNumaGetNodeCount(def->numa) > 0) { + return 0; + } + + nodeMem = virDomainDefGetMemoryTotal(def); + + if (!def->numa) + def->numa = virDomainNumaNew(); + + virDomainNumaSetNodeCount(def->numa, 1); + + for (i = 0; i < def->nmems; i++) { + virDomainMemoryDef *mem = def->mems[i]; + + if (mem->size > nodeMem) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Total size of memory devices exceeds the total memory size")); + return -1; + } + + nodeMem -= mem->size; + + switch (mem->model) { + case VIR_DOMAIN_MEMORY_MODEL_DIMM: + case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: + if (mem->targetNode == -1) + mem->targetNode = 0; + break; + + case VIR_DOMAIN_MEMORY_MODEL_NONE: + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: + case VIR_DOMAIN_MEMORY_MODEL_LAST: + break; + } + } + + virDomainNumaSetNodeMemorySize(def->numa, 0, nodeMem); + + return 0; +} + + +static int +qemuDomainDefNumaCPUsPostParse(virDomainDef *def, + virQEMUCaps *qemuCaps, + unsigned int parseFlags) +{ + if (qemuDomainDefNumaAutoAdd(def, parseFlags) < 0) + return -1; + + return qemuDomainDefNumaCPUsRectify(def, qemuCaps); +} + + +int +qemuDomainDefPostParse(virDomainDef *def, + unsigned int parseFlags, + void *opaque, + void *parseOpaque) +{ + virQEMUDriver *driver = opaque; + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + virQEMUCaps *qemuCaps = parseOpaque; + + /* Note that qemuCaps may be NULL when this function is called. This + * function shall not fail in that case. It will be re-run on VM startup + * with the capabilities populated. + */ + if (!qemuCaps) + return 1; + + if (qemuDomainDefMachinePostParse(def, qemuCaps) < 0) + return -1; + + qemuDomainDefACPIPostParse(def, qemuCaps, parseFlags); + + if (qemuDomainDefBootPostParse(def, driver, parseFlags) < 0) + return -1; + + if (qemuDomainDefAddDefaultDevices(driver, def, qemuCaps) < 0) + return -1; + + if (qemuDomainDefSetDefaultCPU(def, driver->hostarch, qemuCaps) < 0) + return -1; + + qemuDomainDefEnableDefaultFeatures(def, qemuCaps); + + if (qemuDomainRecheckInternalPaths(def, cfg, parseFlags) < 0) + return -1; + + if (qemuSecurityVerify(driver->securityManager, def) < 0) + return -1; + + if (qemuDomainDefVcpusPostParse(def) < 0) + return -1; + + if (qemuDomainDefCPUPostParse(def, qemuCaps) < 0) + return -1; + + if (qemuDomainDefTsegPostParse(def, qemuCaps) < 0) + return -1; + + if (qemuDomainDefNumaCPUsPostParse(def, qemuCaps, parseFlags) < 0) + return -1; + + return 0; +} + + +int +qemuDomainPostParseDataAlloc(const virDomainDef *def, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque, + void **parseOpaque) +{ + virQEMUDriver *driver = opaque; + + if (!(*parseOpaque = virQEMUCapsCacheLookup(driver->qemuCapsCache, + def->emulator))) + return 1; + + return 0; +} + + +void +qemuDomainPostParseDataFree(void *parseOpaque) +{ + virQEMUCaps *qemuCaps = parseOpaque; + + virObjectUnref(qemuCaps); +} diff --git a/src/qemu/qemu_postparse.h b/src/qemu/qemu_postparse.h new file mode 100644 index 0000000000..ac69c14604 --- /dev/null +++ b/src/qemu/qemu_postparse.h @@ -0,0 +1,54 @@ +/* + * qemu_postparse.h: QEMU domain PostParse functions + * + * Copyright (C) 2006-2024 Red Hat, Inc. + * Copyright (C) 2006 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#pragma once + +#include "virconftypes.h" + +int +qemuDomainDeviceDiskDefPostParse(virDomainDiskDef *disk, + unsigned int parseFlags); + +int +qemuDomainDeviceDefPostParse(virDomainDeviceDef *dev, + const virDomainDef *def, + unsigned int parseFlags, + void *opaque, + void *parseOpaque); + +int +qemuDomainDefPostParseBasic(virDomainDef *def, + void *opaque); + +int +qemuDomainDefPostParse(virDomainDef *def, + unsigned int parseFlags, + void *opaque, + void *parseOpaque); + +int +qemuDomainPostParseDataAlloc(const virDomainDef *def, + unsigned int parseFlags, + void *opaque, + void **parseOpaque); + +void +qemuDomainPostParseDataFree(void *parseOpaque); diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 7ffa445c37..ac4d87b527 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -27,6 +27,7 @@ #include "qemu/qemu_monitor_json.h" #include "qemu/qemu_backup.h" #include "qemu/qemu_checkpoint.h" +#include "qemu/qemu_postparse.h" #include "qemu/qemu_validate.h" #define LIBVIRT_SNAPSHOT_CONF_PRIV_H_ALLOW -- 2.45.2

2 1

[PATCH v1 0/5] Allow Guest CPU Model with Deprecated Features Disabled
by Collin Walling 12 Nov '24

12 Nov '24

Add support for libvirt to query and cache an array of deprecated CPU features (aka CPU properties) for the host-model. This data is queried via a full query-cpu-model-expansion and cached in the QEMU capabilities file. This model expansion will depend on the availability of the "deprecated-props" field resulting from a query-cpu-model-expansion command. Currently, only s390x supports this field. The purpose of these patches is to make it easy for users to create guests with a CPU model that will be compatible & migratable with future hardware. An updated host CPU model with deprecated features paired with the policy "disable" may be visable via an update to the virsh domcapabilities command with the --disable-deprecated-features flag. An example is shown below. Note: other CPU model queries (e.g. baseline and comparison) currently do not consider deprecated features, as their outputs do not consider feature policy. If implementation is desired, it will require a discussion on how these commands should report policies. Examples: virsh domcapabilities --disable-deprecated-features e.g. output (trimmed): <mode name='host-model' supported='yes'> <model fallback='forbid'>z14.2-base</model> <feature policy='require' name='aen'/> <feature policy='require' name='cmmnt'/> <feature policy='require' name='aefsi'/> <feature policy='require' name='diag318'/> <feature policy='require' name='mepoch'/> <feature policy='require' name='msa8'/> <feature policy='require' name='msa7'/> <feature policy='require' name='msa6'/> <feature policy='require' name='msa5'/> <feature policy='require' name='msa4'/> <feature policy='require' name='msa3'/> <feature policy='require' name='msa2'/> <feature policy='require' name='msa1'/> <feature policy='require' name='sthyi'/> <feature policy='require' name='edat'/> <feature policy='require' name='ri'/> <feature policy='require' name='edat2'/> <feature policy='require' name='etoken'/> <feature policy='require' name='vx'/> <feature policy='require' name='ipter'/> <feature policy='require' name='mepochptff'/> <feature policy='require' name='ap'/> <feature policy='require' name='vxeh'/> <feature policy='require' name='vxpd'/> <feature policy='require' name='esop'/> <feature policy='require' name='apqi'/> <feature policy='require' name='apft'/> <feature policy='require' name='els'/> <feature policy='require' name='iep'/> <feature policy='require' name='apqci'/> <feature policy='disable' name='cte'/> <feature policy='require' name='ais'/> <feature policy='disable' name='bpb'/> <feature policy='require' name='ctop'/> <feature policy='require' name='gs'/> <feature policy='require' name='ppa15'/> <feature policy='require' name='zpci'/> <feature policy='require' name='sea_esop2'/> <feature policy='disable' name='te'/> <feature policy='require' name='cmm'/> <feature policy='disable' name='csske'/> </mode> A domain may be defined with a new <cpu> XML attribute, deprecated_features='on|off': <cpu mode='host-model' check='partial' deprecated_features='off'/> e.g. after guest has started (trimmed): <cpu mode='custom' match='exact' check='partial' deprecated_features='off'> <model fallback='forbid'>z14.2-base</model> <feature policy='require' name='aen'/> <feature policy='require' name='cmmnt'/> <feature policy='require' name='aefsi'/> <feature policy='require' name='diag318'/> <feature policy='require' name='mepoch'/> <feature policy='require' name='msa8'/> <feature policy='require' name='msa7'/> <feature policy='require' name='msa6'/> <feature policy='require' name='msa5'/> <feature policy='require' name='msa4'/> <feature policy='require' name='msa3'/> <feature policy='require' name='msa2'/> <feature policy='require' name='msa1'/> <feature policy='require' name='sthyi'/> <feature policy='require' name='edat'/> <feature policy='require' name='ri'/> <feature policy='require' name='edat2'/> <feature policy='require' name='etoken'/> <feature policy='require' name='vx'/> <feature policy='require' name='ipter'/> <feature policy='require' name='mepochptff'/> <feature policy='require' name='ap'/> <feature policy='require' name='vxeh'/> <feature policy='require' name='vxpd'/> <feature policy='require' name='esop'/> <feature policy='require' name='apqi'/> <feature policy='require' name='apft'/> <feature policy='require' name='els'/> <feature policy='require' name='iep'/> <feature policy='require' name='apqci'/> <feature policy='disable' name='cte'/> <feature policy='require' name='ais'/> <feature policy='disable' name='bpb'/> <feature policy='require' name='ctop'/> <feature policy='require' name='gs'/> <feature policy='require' name='ppa15'/> <feature policy='require' name='zpci'/> <feature policy='require' name='sea_esop2'/> <feature policy='disable' name='te'/> <feature policy='require' name='cmm'/> <feature policy='disable' name='csske'/> </cpu> Collin Walling (5): qemuMonitorJSONGetCPUModelExpansion: refactor parsing functions qemu: parse deprecated-props from query-cpu-model-expansion response qemu_capabilities: query deprecated features for host-model virsh: add --disable-deprecated-features flag to domcapabilities conf: add deprecated_features attribute docs/manpages/virsh.rst | 6 + include/libvirt/libvirt-domain.h | 12 + src/conf/cpu_conf.c | 10 + src/conf/cpu_conf.h | 1 + src/conf/schemas/cputypes.rng | 12 + src/libvirt-domain.c | 2 +- src/qemu/qemu_capabilities.c | 89 +++++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_driver.c | 8 +- src/qemu/qemu_monitor.c | 10 + src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 64 +++- src/qemu/qemu_process.c | 4 + .../caps_9.1.0_s390x.replies | 348 +++++++++++++++++- .../qemucapabilitiesdata/caps_9.1.0_s390x.xml | 13 + .../caps_9.2.0_s390x.replies | 348 +++++++++++++++++- .../qemucapabilitiesdata/caps_9.2.0_s390x.xml | 13 + tools/virsh-host.c | 9 +- 18 files changed, 940 insertions(+), 14 deletions(-) -- 2.45.1

1 5

[PATCH] Drop unused function declarations
by Michal Privoznik 12 Nov '24

12 Nov '24

When moving function and/or renaming them sometimes corresponding change to corresponding header file is not done. This leaves us with functions that are declared in header files, but nowhere implemented. Drop such declarations. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- These were identified by a bash oneliner which basically tried to list every "function" in every header file (function was matched as '\w\+(') and for every function from the list, git grep was done to see if it lives in a .c file. It's nowhere exhaustive or perfect, but if found at least something. src/ch/ch_monitor.h | 4 ---- src/conf/device_conf.h | 1 - src/conf/virinterfaceobj.h | 3 --- src/conf/virstorageobj.h | 3 --- src/libxl/libxl_domain.h | 3 --- src/logging/log_handler.h | 2 -- src/lxc/lxc_cgroup.h | 1 - src/lxc/lxc_hostdev.h | 6 ------ src/lxc/lxc_monitor.h | 3 --- src/lxc/lxc_process.h | 9 --------- src/qemu/qemu_command.h | 3 --- src/qemu/qemu_domain.h | 12 ------------ src/qemu/qemu_monitor.h | 4 ---- src/qemu/qemu_monitor_json.h | 29 ----------------------------- src/qemu/qemu_process.h | 3 --- src/rpc/virnetlibsshsession.h | 1 - src/rpc/virnetserverclient.h | 2 -- src/util/virmdev.h | 3 --- src/util/virnetdev.h | 10 ---------- src/vz/vz_utils.h | 8 -------- tests/testutilsqemu.h | 3 --- 21 files changed, 113 deletions(-) diff --git a/src/ch/ch_monitor.h b/src/ch/ch_monitor.h index b35f5ea027..9ec58e5b20 100644 --- a/src/ch/ch_monitor.h +++ b/src/ch/ch_monitor.h @@ -118,10 +118,6 @@ int virCHMonitorSaveVM(virCHMonitor *mon, const char *to); int virCHMonitorGetInfo(virCHMonitor *mon, virJSONValue **info); -void virCHMonitorCPUInfoFree(virCHMonitorCPUInfo *cpus); -int virCHMonitorGetCPUInfo(virCHMonitor *mon, - virCHMonitorCPUInfo **vcpus, - size_t maxvcpus); size_t virCHMonitorGetThreadInfo(virCHMonitor *mon, bool refresh, virCHMonitorThreadInfo **threads); int virCHMonitorGetIOThreads(virCHMonitor *mon, diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 2d674ecd85..2d97410f6e 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -193,7 +193,6 @@ int virDeviceHostdevPCIDriverInfoParseXML(xmlNodePtr node, int virDeviceHostdevPCIDriverInfoFormat(virBuffer *buf, const virDeviceHostdevPCIDriverInfo *driver); -void virDeviceHostdevPCIDriverInfoPostParse(virDeviceHostdevPCIDriverInfo *driver); void virDeviceHostdevPCIDriverInfoClear(virDeviceHostdevPCIDriverInfo *driver); void virDomainDeviceInfoClear(virDomainDeviceInfo *info); diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h index 5927484167..c59dac28d3 100644 --- a/src/conf/virinterfaceobj.h +++ b/src/conf/virinterfaceobj.h @@ -51,9 +51,6 @@ virInterfaceObj * virInterfaceObjListFindByName(virInterfaceObjList *interfaces, const char *name); -void -virInterfaceObjFree(virInterfaceObj *obj); - virInterfaceObjList * virInterfaceObjListClone(virInterfaceObjList *interfaces); diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h index d9dae9ceb9..e1eabfdb3a 100644 --- a/src/conf/virstorageobj.h +++ b/src/conf/virstorageobj.h @@ -229,9 +229,6 @@ virStoragePoolObjGetNames(virStoragePoolObjList *pools, char **const names, int maxnames); -void -virStoragePoolObjFree(virStoragePoolObj *obj); - typedef void (*virStoragePoolObjListIterator)(virStoragePoolObj *obj, const void *opaque); diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 94b693e477..a35d121323 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -46,9 +46,6 @@ extern virDomainDefParserConfig libxlDomainDefParserConfig; extern virXMLNamespace libxlDriverDomainXMLNamespace; extern const struct libxl_event_hooks ev_hooks; -int -libxlDomainObjPrivateInitCtx(virDomainObj *vm); - int libxlDomainJobGetTimeElapsed(virDomainJobObj *job, unsigned long long *timeElapsed); diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h index 97dad27eda..38c300289e 100644 --- a/src/logging/log_handler.h +++ b/src/logging/log_handler.h @@ -67,8 +67,6 @@ virLogHandler *virLogHandlerNewPostExecRestart(virJSONValue *child, virLogHandlerShutdownInhibitor inhibitor, void *opaque); -void virLogHandlerFree(virLogHandler *handler); - int virLogHandlerDomainOpenLogFile(virLogHandler *handler, const char *driver, const unsigned char *domuuid, diff --git a/src/lxc/lxc_cgroup.h b/src/lxc/lxc_cgroup.h index 64d0c51175..83f342c08c 100644 --- a/src/lxc/lxc_cgroup.h +++ b/src/lxc/lxc_cgroup.h @@ -29,7 +29,6 @@ virCgroup *virLXCCgroupCreate(virDomainDef *def, pid_t initpid, size_t nnicindexes, int *nicindexes); -virCgroup *virLXCCgroupJoin(virDomainDef *def); int virLXCCgroupSetup(virDomainDef *def, virCgroup *cgroup, virBitmap *nodemask); diff --git a/src/lxc/lxc_hostdev.h b/src/lxc/lxc_hostdev.h index 34b813e3e9..4aa124c660 100644 --- a/src/lxc/lxc_hostdev.h +++ b/src/lxc/lxc_hostdev.h @@ -26,12 +26,6 @@ int virLXCUpdateActiveUSBHostdevs(virLXCDriver *driver, virDomainDef *def); -int virLXCFindHostdevUSBDevice(virDomainHostdevDef *hostdev, - bool mandatory, - virUSBDevice **usb); -int virLXCPrepareHostdevUSBDevices(virLXCDriver *driver, - const char *name, - virUSBDeviceList *list); int virLXCPrepareHostDevices(virLXCDriver *driver, virDomainDef *def); void virLXCDomainReAttachHostDevices(virLXCDriver *driver, diff --git a/src/lxc/lxc_monitor.h b/src/lxc/lxc_monitor.h index 5b5954f8e9..0a10768452 100644 --- a/src/lxc/lxc_monitor.h +++ b/src/lxc/lxc_monitor.h @@ -53,6 +53,3 @@ virLXCMonitor *virLXCMonitorNew(virDomainObj *vm, virLXCMonitorCallbacks *cb); void virLXCMonitorClose(virLXCMonitor *mon); - -void virLXCMonitorLock(virLXCMonitor *mon); -void virLXCMonitorUnlock(virLXCMonitor *mon); diff --git a/src/lxc/lxc_process.h b/src/lxc/lxc_process.h index 4b84e31fef..95eacdd1e5 100644 --- a/src/lxc/lxc_process.h +++ b/src/lxc/lxc_process.h @@ -33,15 +33,6 @@ int virLXCProcessStop(virLXCDriver *driver, virDomainShutoffReason reason, unsigned int cleanupFlags); -void virLXCProcessAutoDestroyRun(virLXCDriver *driver, - virConnectPtr conn); -void virLXCProcessAutoDestroyShutdown(virLXCDriver *driver); -int virLXCProcessAutoDestroyAdd(virLXCDriver *driver, - virDomainObj *vm, - virConnectPtr conn); -int virLXCProcessAutoDestroyRemove(virLXCDriver *driver, - virDomainObj *vm); - void virLXCProcessAutostartAll(virLXCDriver *driver); int virLXCProcessReconnectAll(virLXCDriver *driver, virDomainObjList *doms); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index fb4551a7d0..76c514b5f7 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -93,7 +93,6 @@ qemuBuildNicDevProps(virDomainDef *def, virDomainNetDef *net, virQEMUCaps *qemuCaps); -char *qemuDeviceDriveHostAlias(virDomainDiskDef *disk); bool qemuDiskBusIsSD(int bus); int @@ -208,8 +207,6 @@ qemuBuildRedirdevDevProps(const virDomainDef *def, virJSONValue * qemuBuildZPCIDevProps(virDomainDeviceInfo *dev); -int qemuNetworkPrepareDevices(virDomainDef *def); - bool qemuDiskConfigBlkdeviotuneEnabled(const virDomainDiskDef *disk); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index a19314b48b..047a11b7fe 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -588,8 +588,6 @@ virDomainObj *qemuDomainObjFromDomain(virDomainPtr domain); qemuDomainSaveCookie *qemuDomainSaveCookieNew(virDomainObj *vm); -void qemuDomainEventFlush(int timer, void *opaque); - qemuMonitor *qemuDomainGetMonitor(virDomainObj *vm) ATTRIBUTE_NONNULL(1); void qemuDomainObjEnterMonitor(virDomainObj *obj) @@ -645,9 +643,6 @@ void qemuDomainObjTaint(virQEMUDriver *driver, virDomainTaintFlags taint, qemuLogContext *logCtxt); -char **qemuDomainObjGetTainting(virQEMUDriver *driver, - virDomainObj *obj); - void qemuDomainObjCheckTaint(virQEMUDriver *driver, virDomainObj *obj, qemuLogContext *logCtxt, @@ -716,10 +711,6 @@ int qemuDomainCheckDiskStartupPolicy(virQEMUDriver *driver, size_t diskIndex, bool cold_boot); -int qemuDomainCheckDiskPresence(virQEMUDriver *driver, - virDomainObj *vm, - unsigned int flags); - int qemuDomainStorageSourceValidateDepth(virStorageSource *src, int add, const char *diskdst); @@ -947,9 +938,6 @@ int qemuDomainSecretPrepare(virQEMUDriver *driver, virDomainObj *vm) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk, - virQEMUCaps *qemuCaps); - int qemuDomainDeviceDiskDefPostParse(virDomainDiskDef *disk, unsigned int parseFlags); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 4341519cfe..035c9a7e3c 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -939,10 +939,6 @@ void qemuMonitorChardevInfoFree(void *data); int qemuMonitorGetChardevInfo(qemuMonitor *mon, GHashTable **retinfo); -int qemuMonitorAttachPCIDiskController(qemuMonitor *mon, - const char *bus, - virPCIDeviceAddress *guestAddr); - int qemuMonitorAddDeviceProps(qemuMonitor *mon, virJSONValue **props); diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 10491b809b..ab3c2cb7c8 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -175,10 +175,6 @@ qemuMonitorJSONMigrate(qemuMonitor *mon, int qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon, char ***blockers); -int -qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitor *mon, - bool *spice_migrated); - int qemuMonitorJSONMigrateCancel(qemuMonitor *mon); @@ -208,26 +204,6 @@ qemuMonitorJSONGraphicsRelocate(qemuMonitor *mon, int tlsPort, const char *tlsSubject); -int -qemuMonitorJSONAddPCIHostDevice(qemuMonitor *mon, - virPCIDeviceAddress *hostAddr, - virPCIDeviceAddress *guestAddr); - -int -qemuMonitorJSONAddPCIDisk(qemuMonitor *mon, - const char *path, - const char *bus, - virPCIDeviceAddress *guestAddr); - -int -qemuMonitorJSONAddPCINetwork(qemuMonitor *mon, - const char *nicstr, - virPCIDeviceAddress *guestAddr); - -int -qemuMonitorJSONRemovePCIDevice(qemuMonitor *mon, - virPCIDeviceAddress *guestAddr); - int qemuMonitorJSONAddFileHandleToSet(qemuMonitor *mon, int fd, @@ -268,11 +244,6 @@ int qemuMonitorJSONGetChardevInfo(qemuMonitor *mon, GHashTable *info); -int -qemuMonitorJSONAttachPCIDiskController(qemuMonitor *mon, - const char *bus, - virPCIDeviceAddress *guestAddr); - int qemuMonitorJSONAddDeviceProps(qemuMonitor *mon, virJSONValue **props); diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 878c522d82..12781673c5 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -189,9 +189,6 @@ void qemuProcessShutdownOrReboot(virDomainObj *vm); void qemuProcessAutoDestroy(virDomainObj *dom, virConnectPtr conn); -int qemuProcessSetSchedParams(int id, pid_t pid, size_t nsp, - virDomainThreadSchedParam *sp); - virDomainDiskDef *qemuProcessFindDomainDiskByAliasOrQOM(virDomainObj *vm, const char *alias, const char *qomid); diff --git a/src/rpc/virnetlibsshsession.h b/src/rpc/virnetlibsshsession.h index 7f94fd15dc..949680035c 100644 --- a/src/rpc/virnetlibsshsession.h +++ b/src/rpc/virnetlibsshsession.h @@ -26,7 +26,6 @@ typedef struct _virNetLibsshSession virNetLibsshSession; virNetLibsshSession *virNetLibsshSessionNew(const char *username); -void virNetLibsshSessionFree(virNetLibsshSession *sess); typedef enum { VIR_NET_LIBSSH_HOSTKEY_VERIFY_NORMAL, diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h index 2ae6c85b20..0a1ddd6f28 100644 --- a/src/rpc/virnetserverclient.h +++ b/src/rpc/virnetserverclient.h @@ -152,8 +152,6 @@ int virNetServerClientInit(virNetServerClient *client); int virNetServerClientInitKeepAlive(virNetServerClient *client, int interval, unsigned int count); -bool virNetServerClientCheckKeepAlive(virNetServerClient *client, - virNetMessage *msg); int virNetServerClientStartKeepAlive(virNetServerClient *client); const char *virNetServerClientLocalAddrStringSASL(virNetServerClient *client); diff --git a/src/util/virmdev.h b/src/util/virmdev.h index e8e69040e5..75853bc0ff 100644 --- a/src/util/virmdev.h +++ b/src/util/virmdev.h @@ -72,9 +72,6 @@ typedef int (*virMediatedDeviceCallback)(virMediatedDevice *dev, virMediatedDevice * virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model); -virMediatedDevice * -virMediatedDeviceCopy(virMediatedDevice *dev); - void virMediatedDeviceFree(virMediatedDevice *dev); diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index c287a7b272..99fe761c1d 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -185,16 +185,6 @@ int virNetDevGetMAC(const char *ifname, virMacAddr *macaddr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; -int virNetDevReplaceMacAddress(const char *linkdev, - const virMacAddr *macaddress, - const char *stateDir) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - G_GNUC_WARN_UNUSED_RESULT; - -int virNetDevRestoreMacAddress(const char *linkdev, - const char *stateDir) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; - int virNetDevSetCoalesce(const char *ifname, virNetDevCoalesce *coalesce, bool update) diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index 7a797953a5..a7003a5370 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -39,14 +39,6 @@ #define IS_CT(def) (def->os.type == VIR_DOMAIN_OSTYPE_EXE) -#define vzDomNotFoundError(domain) \ - do { \ - char uuidstr[VIR_UUID_STRING_BUFLEN]; \ - virUUIDFormat(domain->uuid, uuidstr); \ - virReportError(VIR_ERR_NO_DOMAIN, \ - _("no domain with matching uuid '%1$s'"), uuidstr); \ - } while (0) - #define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "host-routed" #define VIRTUOZZO_VER_7 ((unsigned long)7000000) diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 90632031ff..74e307d653 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -126,9 +126,6 @@ typedef struct _testQemuInfo testQemuInfo; void testQemuInfoFree(testQemuInfo *info); G_DEFINE_AUTOPTR_CLEANUP_FUNC(testQemuInfo, testQemuInfoFree); -virDomainXMLOption *testQemuXMLConfInit(void); - - virQEMUCaps *qemuTestParseCapabilitiesArch(virArch arch, const char *capsFile); virCPUDef *qemuTestGetCPUDef(qemuTestCPUDef d); -- 2.45.2

2 1

[PATCH] virnetserverclient.h: Fix typo in comment of virNetServerClientPrivPreExecRestart()
by Michal Privoznik 12 Nov '24

12 Nov '24

The function the comment is referring to is virNetServerClientPrivNew() not virNetServerClintPrivNew(). The latter doesn't even exist. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/rpc/virnetserverclient.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h index 0d585eb2ce..2ae6c85b20 100644 --- a/src/rpc/virnetserverclient.h +++ b/src/rpc/virnetserverclient.h @@ -48,7 +48,7 @@ typedef int (*virNetServerClientFilterFunc)(virNetServerClient *client, void *opaque); /* - * @data: value allocated by virNetServerClintPrivNew(PostExecRestart) callback + * @data: value allocated by virNetServerClientPrivNew(PostExecRestart) callback */ typedef virJSONValue *(*virNetServerClientPrivPreExecRestart)(virNetServerClient *client, void *data); -- 2.45.2

2 1

[PATCH v3] qemu_hotplug: Do not report unknown error when hot-unplugging non-existing device
by Martin Kletzander 12 Nov '24

12 Nov '24

When qemuDomainDeleteDevice() gets "DeviceNotFound" error it is a special case as we're trying to remove a device which does not exists any more. Such occasion is indicated by the return value -2. Callers of the aforementioned function ought to base their behaviour on the return value. However not all callers take as much care for the return value as one could realistically anticipate. Follow the usual direction of removing possible backend object (in case of character devices), remove the device from its XML without waiting for the device removal from QEMU (since it is already not there) and basically follow the same algorithm as there is when the device was removed, skipping over the wait for the device removal. The overall return value also needs to be adjusted since qemuDomainDeleteDevice() does not set an error on the -2 return value and would otherwise trigger an unknown error being reported to the user or management application. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v3: - Skip qemuDomainWaitForDeviceRemoval() when the vCPU does not exist, as written in the commit message - Do all the other necessary things when the vCPU is missing v2: - Adjust for -2 return value in callers src/qemu/qemu_hotplug.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 8361d3d9c1b7..bddd553c88a5 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -6090,8 +6090,12 @@ qemuDomainDetachDeviceChr(virQEMUDriver *driver, if (rc < 0) goto cleanup; } else { - if (qemuDomainDeleteDevice(vm, tmpChr->info.alias) < 0) + ret = qemuDomainDeleteDevice(vm, tmpChr->info.alias); + if (ret < 0) { + if (ret == -2) + ret = qemuDomainRemoveChrDevice(driver, vm, tmpChr, true); goto cleanup; + } } if (guestfwd) { @@ -6595,18 +6599,20 @@ qemuDomainHotplugDelVcpu(virQEMUDriver *driver, qemuDomainMarkDeviceAliasForRemoval(vm, vcpupriv->alias); - if (qemuDomainDeleteDevice(vm, vcpupriv->alias) < 0) { - if (virDomainObjIsActive(vm)) - virDomainAuditVcpu(vm, oldvcpus, oldvcpus - nvcpus, "update", false); - goto cleanup; - } - - if ((rc = qemuDomainWaitForDeviceRemoval(vm)) <= 0) { - if (rc == 0) - virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s", - _("vcpu unplug request timed out. Unplug result must be manually inspected in the domain")); - - goto cleanup; + rc = qemuDomainDeleteDevice(vm, vcpupriv->alias); + if (rc < 0) { + if (rc != -2) { + if (virDomainObjIsActive(vm)) + virDomainAuditVcpu(vm, oldvcpus, oldvcpus - nvcpus, "update", false); + goto cleanup; + } + } else { + if ((rc = qemuDomainWaitForDeviceRemoval(vm)) <= 0) { + if (rc == 0) + virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s", + _("vcpu unplug request timed out. Unplug result must be manually inspected in the domain")); + goto cleanup; + } } if (qemuDomainRemoveVcpu(vm, vcpu) < 0) -- 2.47.0

2 1

[PATCH v2] qemu_hotplug: Do not report unknown error when hot-unplugging non-existing device
by Martin Kletzander 12 Nov '24

12 Nov '24

When qemuDomainDeleteDevice() gets "DeviceNotFound" error it is a special case as we're trying to remove a device which does not exists any more. Such occasion is indicated by the return value -2. Callers of the aforementioned function ought to base their behaviour on the return value. However not all callers take as much care for the return value as one could realistically anticipate. Follow the usual direction of removing possible backend object (in case of character devices), remove the device from its XML without waiting for the device removal from QEMU (since it is already not there) and basically follow the same algorithm as there is when the device was removed, skipping over the wait for the device removal. The overall return value also needs to be adjusted since qemuDomainDeleteDevice() does not set an error on the -2 return value and would otherwise trigger an unknown error being reported to the user or management application. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_hotplug.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 8361d3d9c1b7..1b6ecb1cd1f9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -6090,8 +6090,12 @@ qemuDomainDetachDeviceChr(virQEMUDriver *driver, if (rc < 0) goto cleanup; } else { - if (qemuDomainDeleteDevice(vm, tmpChr->info.alias) < 0) + ret = qemuDomainDeleteDevice(vm, tmpChr->info.alias); + if (ret < 0) { + if (ret == -2) + ret = qemuDomainRemoveChrDevice(driver, vm, tmpChr, true); goto cleanup; + } } if (guestfwd) { @@ -6595,18 +6599,19 @@ qemuDomainHotplugDelVcpu(virQEMUDriver *driver, qemuDomainMarkDeviceAliasForRemoval(vm, vcpupriv->alias); - if (qemuDomainDeleteDevice(vm, vcpupriv->alias) < 0) { - if (virDomainObjIsActive(vm)) + rc = qemuDomainDeleteDevice(vm, vcpupriv->alias); + if (rc < 0) { + if (rc == -1 && virDomainObjIsActive(vm)) virDomainAuditVcpu(vm, oldvcpus, oldvcpus - nvcpus, "update", false); goto cleanup; - } - - if ((rc = qemuDomainWaitForDeviceRemoval(vm)) <= 0) { - if (rc == 0) - virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s", - _("vcpu unplug request timed out. Unplug result must be manually inspected in the domain")); + } else { + if ((rc = qemuDomainWaitForDeviceRemoval(vm)) <= 0) { + if (rc == 0) + virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s", + _("vcpu unplug request timed out. Unplug result must be manually inspected in the domain")); - goto cleanup; + goto cleanup; + } } if (qemuDomainRemoveVcpu(vm, vcpu) < 0) -- 2.47.0

2 2

[PATCH] security_apparmor: store dynamically generated rules
by Georgia Garcia 12 Nov '24

12 Nov '24

Some rules are generated dynamically during boot and added to the AppArmor policy. An example of that is macvtap devices that call the AppArmorSetFDLabel hook to add a rule for the tap device path. Since this information is dynamic, it is not available in the xml config, therefore whenever a "Restore" hook is called, the entire profile is regenerated by virt-aa-helper based only the information from the VM definition, so the dynamic information is lost. This patch stores the dynamically generated rules while the domain is running and reloads them whenever there's a restore operation. Note that there are no hooks for restoring FD labels, so that information is not removed from the set of rules while the domain is running. Closes: https://gitlab.com/libvirt/libvirt/-/issues/692 Signed-off-by: Georgia Garcia <georgia.garcia(a)canonical.com> --- src/security/security_apparmor.c | 208 +++++++++++++++++++++++++++++-- 1 file changed, 200 insertions(+), 8 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 07e95ec81d..ae5815fb0d 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -60,6 +60,24 @@ struct SDPDOP { virDomainDef *def; }; +typedef struct _virSecurityAppArmorLabel virSecurityAppArmorLabel; +struct _virSecurityAppArmorLabel { + GPtrArray *paths; + char *name; +}; + +typedef struct _virSecurityAppArmorLabelList virSecurityAppArmorLabelList; +struct _virSecurityAppArmorLabelList { + GPtrArray *labels; + virMutex lock; +}; + +virSecurityAppArmorLabelList *labelList = NULL; + +static int AppArmorRestorePolicy(virSecurityManager *mgr, + virDomainDef *def, + char *seclabel); + /* * profile_status returns '-2' on error, '-1' if not loaded, '0' if loaded * @@ -273,6 +291,119 @@ reload_profile(virSecurityManager *mgr, secdef->imagelabel); return -1; } + if (!append) { + if (AppArmorRestorePolicy(mgr, def, secdef->imagelabel) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot restore rules from AppArmor profile \'%1$s\'"), + secdef->imagelabel); + return -1; + } + } + + } + return 0; +} + +static int +AppArmorInitLabelList(void) +{ + if (labelList) + return 0; + + labelList = g_new0(virSecurityAppArmorLabelList, 1); + labelList->labels = g_ptr_array_new(); + if (virMutexInit(&labelList->lock) < 0) { + virReportSystemError(errno, "%s", + _("Failed to initialize AppArmor mutex")); + return -1; + } + return 0; +} + +static void +AppArmorFreeLabelList(void) +{ + size_t i; + if (!labelList) + return; + + VIR_WITH_MUTEX_LOCK_GUARD(&labelList->lock) { + for (i = 0; i < labelList->labels->len; i++) { + virSecurityAppArmorLabel *label = g_ptr_array_index(labelList->labels, i); + g_ptr_array_free(label->paths, TRUE); + g_free(label->name); + } + g_ptr_array_free(labelList->labels, TRUE); + } + virMutexDestroy(&labelList->lock); + g_free(labelList); + labelList = NULL; +} + +static int +AppArmorAppendPathToLabelList(char *seclabel, + const char *path) +{ + size_t i; + char *new; + + if (!path) + return 0; + + if (!labelList) { + if (AppArmorInitLabelList() < 0) + return -1; + } + + VIR_WITH_MUTEX_LOCK_GUARD(&labelList->lock) { + for (i = 0; i < labelList->labels->len; i++) { + virSecurityAppArmorLabel *label = g_ptr_array_index(labelList->labels, i); + if (STREQ(seclabel, label->name)) { + new = g_strdup(path); + g_ptr_array_add(label->paths, new); + } + } + } + return 0; +} + +static int +AppArmorLoadStoredPath(virSecurityAppArmorLabel *label, + virSecurityManager *mgr, + virDomainDef *def, + char *seclabel) +{ + size_t i; + for (i = 0; i < label->paths->len; i++) { + if (load_profile(mgr, seclabel, def, g_ptr_array_index(label->paths, i), true) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot update AppArmor profile \'%1$s\' \'%2$s\'"), + seclabel, (char *)g_ptr_array_index(label->paths, i)); + return -1; + } + } + return 0; +} + +static int +AppArmorRestorePolicy(virSecurityManager *mgr, + virDomainDef *def, + char *seclabel) +{ + size_t i; + + if (!labelList) { + return 0; + } + + VIR_WITH_MUTEX_LOCK_GUARD(&labelList->lock) { + for (i = 0; i < labelList->labels->len; i++) { + virSecurityAppArmorLabel *label = g_ptr_array_index(labelList->labels, i); + if (STREQ(seclabel, label->name)) { + if (AppArmorLoadStoredPath(label, mgr, def, seclabel) < 0) + return -1; + } + } } return 0; } @@ -330,12 +461,13 @@ AppArmorSecurityManagerProbe(const char *virtDriver G_GNUC_UNUSED) static int AppArmorSecurityManagerOpen(virSecurityManager *mgr G_GNUC_UNUSED) { - return 0; + return AppArmorInitLabelList(); } static int AppArmorSecurityManagerClose(virSecurityManager *mgr G_GNUC_UNUSED) { + AppArmorFreeLabelList(); return 0; } @@ -364,6 +496,7 @@ AppArmorGenSecurityLabel(virSecurityManager *mgr G_GNUC_UNUSED, g_autofree char *profile_name = NULL; virSecurityLabelDef *secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); + virSecurityAppArmorLabel *label; if (!secdef) return 0; @@ -404,6 +537,18 @@ AppArmorGenSecurityLabel(virSecurityManager *mgr G_GNUC_UNUSED, goto err; } + if (!labelList) { + if (AppArmorInitLabelList() < 0) + goto err; + } + + label = g_new0(virSecurityAppArmorLabel, 1); + label->paths = g_ptr_array_new(); + label->name = g_strdup(profile_name); + VIR_WITH_MUTEX_LOCK_GUARD(&labelList->lock) { + g_ptr_array_add(labelList->labels, label); + } + return 0; err: @@ -421,6 +566,7 @@ AppArmorSetSecurityAllLabel(virSecurityManager *mgr, bool chardevStdioLogd G_GNUC_UNUSED, bool migrated G_GNUC_UNUSED) { + int rc; virSecurityLabelDef *secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); if (!secdef || !secdef->relabel) @@ -428,8 +574,15 @@ AppArmorSetSecurityAllLabel(virSecurityManager *mgr, /* Reload the profile if incomingPath is specified. Note that GenSecurityLabel() will have already been run. */ - if (incomingPath) - return reload_profile(mgr, def, incomingPath, true); + if (incomingPath) { + rc = reload_profile(mgr, def, incomingPath, true); + if (AppArmorAppendPathToLabelList(secdef->imagelabel, incomingPath) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Could not store path")); + return -1; + } + return rc; + } return 0; } @@ -495,6 +648,7 @@ AppArmorRestoreSecurityAllLabel(virSecurityManager *mgr G_GNUC_UNUSED, bool migrated G_GNUC_UNUSED, bool chardevStdioLogd G_GNUC_UNUSED) { + size_t i; int rc = 0; virSecurityLabelDef *secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); @@ -508,6 +662,21 @@ AppArmorRestoreSecurityAllLabel(virSecurityManager *mgr G_GNUC_UNUSED, _("could not remove profile for \'%1$s\'"), secdef->label); } + if (labelList) { + VIR_WITH_MUTEX_LOCK_GUARD(&labelList->lock) { + for (i = 0; i < labelList->labels->len; i++) { + virSecurityAppArmorLabel *label; + label = g_ptr_array_index(labelList->labels, i); + if (STREQ(secdef->label, label->name)) { + g_free(label->name); + g_ptr_array_free(label->paths, TRUE); + g_ptr_array_remove_index(labelList->labels, i); + break; + } + } + } + } + } return rc; } @@ -1082,15 +1251,26 @@ AppArmorSetPathLabel(virSecurityManager *mgr, { int rc = -1; char *full_path = NULL; + virSecurityLabelDef *secdef; + + secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); if (allowSubtree) { full_path = g_strdup_printf("%s/{,**}", path); - rc = reload_profile(mgr, def, full_path, true); - VIR_FREE(full_path); } else { - rc = reload_profile(mgr, def, path, true); + full_path = g_strdup(path); + } + + rc = reload_profile(mgr, def, full_path, true); + if (rc == 0) { + if (AppArmorAppendPathToLabelList(secdef->imagelabel, full_path) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Could not store path")); + rc = -1; + } } + VIR_FREE(full_path); return rc; } @@ -1107,6 +1287,7 @@ AppArmorSetFDLabel(virSecurityManager *mgr, virDomainDef *def, int fd) { + int rc = 0; char *proc = NULL; char *fd_path = NULL; @@ -1121,10 +1302,21 @@ AppArmorSetFDLabel(virSecurityManager *mgr, if (virFileResolveLink(proc, &fd_path) < 0) { /* it's a deleted file, presumably. Ignore? */ VIR_WARN("could not find path for descriptor %s, skipping", proc); - return 0; + goto err; } - return reload_profile(mgr, def, fd_path, true); + rc = reload_profile(mgr, def, fd_path, true); + if (rc == 0) { + if (AppArmorAppendPathToLabelList(secdef->imagelabel, fd_path) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Could not store path")); + rc = -1; + } + } + g_free(fd_path); + err: + g_free(proc); + return rc; } static char * -- 2.34.1

2 2

[PATCH] docs: Add Sys::Async::Virt to apps.html
by Martin Kletzander 12 Nov '24

12 Nov '24

As requested on the libvirt users list I am adding this mention to the apps page. Reported-by: Erik Huelsmann <ehuels(a)gmail.com> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/apps.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/apps.rst b/docs/apps.rst index 443c888c4d5d..b2168f9599bb 100644 --- a/docs/apps.rst +++ b/docs/apps.rst @@ -206,6 +206,11 @@ Libraries Allows using simple ruby objects to manipulate hypervisors, guests, storage, network etc. It is based on top of the `native ruby bindings <https://ruby.libvirt.org/>`__. +`Perl Async bindings <https://github.com/ehuelsmann/perl-sys-async-virt#readme>`__ + Perl `Sys::Async::Virt library <https://metacpan.org/pod/Sys::Async::Virt>`__ + supporting the asynchronous paradigm introduced by `Future::AsyncAwait + <https://metacpan.org/pod/Future::AsyncAwait>`__ that tries to stay close to + the `Sys::Virt API <https://metacpan.org/pod/Sys::Virt>`__. LiveCD / Appliances ------------------- -- 2.47.0

2 1

[PATCH v2] docs: Recommend virtio instead of virtio-(non-)transitional
by Andrea Bolognani 12 Nov '24

12 Nov '24

When virtio-(non-)transitional models were introduced, the documentation was updated to include them; at the same time, language was introduced indicating that using the existing virtio model is no longer recommended. This is unnecessarily harsh, and has resulted in people incorrectly believing (through no fault of their own) that the virtio model has been deprecated. In reality, it's perfectly fine to use the virtio model as the stress-free option that, while often not producing the ideal PCI topology, will generally get the job done and work reliably across libvirt versions and machine types. Tweak the documentation so that it hopefully carries the desired message across. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/formatdomain.rst | 55 ++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index c50744b57b..75dff5a153 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2756,8 +2756,8 @@ paravirtualized driver is specified via the ``disk`` element. ``model`` Indicates the emulated device model of the disk. Typically this is indicated solely by the ``bus`` property but for ``bus`` "virtio" the - model can be specified further with "virtio-transitional", - "virtio-non-transitional", or "virtio". See `Virtio transitional devices`_ + model can be specified further with "virtio", "virtio-transitional" or + "virtio-non-transitional". See `virtio device models`_ for more details. :since:`Since 5.2.0` ``rawio`` Indicates whether the disk needs rawio capability. Valid settings are @@ -3680,9 +3680,8 @@ A directory on the host that can be accessed directly from the guest. info <https://lists.gnu.org/archive/html/qemu-devel/2010-09/msg00121.html>`__ :since:`Since 5.2.0`, the filesystem element has an optional attribute - ``model`` with supported values "virtio-transitional", - "virtio-non-transitional", or "virtio". See `Virtio transitional devices`_ - for more details. + ``model`` with supported values "virtio", "virtio-transitional" or + "virtio-non-transitional". See `virtio device models`_ for more details. The filesystem element has optional attributes ``fmode`` and ``dmode``. These two attributes control the creation mode for files and directories @@ -3910,11 +3909,20 @@ Note: In general you should leave this option alone, unless you are very certain you know what you are doing. -Virtio transitional devices -~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Virtio device models +~~~~~~~~~~~~~~~~~~~~ + +Virtio devices come in several variants, some of which are only applicable to +certain machine types or scenarios. The variant can be chosen via the ``model`` +attribute, which supports the following values: -:since:`Since 5.2.0`, some of QEMU's virtio devices, when used with PCI/PCIe -machine types, accept the following ``model`` values: +``virtio`` + This is the recommended choice in the absence of guest OS specific + constraints, as it will will generally work correctly across a large range + of architectures, machine types and libvirt versions. + +:since:`Since 5.2.0`, the following values can additionally be used with machine +types based on PCI (either conventional PCI or PCI Express): ``virtio-transitional`` This device can work both with virtio 0.9 and virtio 1.0 guest drivers, so @@ -3926,12 +3934,6 @@ machine types, accept the following ``model`` values: necessary. libvirt will plug the device into either a PCI Express slot or a conventional PCI slot based on the machine type, resulting in a more optimized PCI topology. -``virtio`` - This device will work like a ``virtio-non-transitional`` device when plugged - into a PCI Express slot, and like a ``virtio-transitional`` device otherwise; - libvirt will pick one or the other based on the machine type. This is the - best choice when compatibility with libvirt versions older than 5.2.0 is - necessary, but it's otherwise not recommended to use it. While the information outlined above applies to most virtio devices, there are a few exceptions: @@ -3992,14 +3994,14 @@ specific features, such as: The ``virtio-serial`` controller has two additional optional attributes ``ports`` and ``vectors``, which control how many devices can be connected through the controller. :since:`Since 5.2.0`, it supports an optional - attribute ``model`` which can be 'virtio', 'virtio-transitional', or - 'virtio-non-transitional'. See `Virtio transitional devices`_ for more details. + attribute ``model`` which can be 'virtio', 'virtio-transitional' or + 'virtio-non-transitional'. See `virtio device models`_ for more details. ``scsi`` A ``scsi`` controller has an optional attribute ``model``, which is one of 'auto', 'buslogic', 'ibmvscsi', 'lsilogic', 'lsisas1068', 'lsisas1078', 'virtio-scsi', 'vmpvscsi', 'virtio-transitional', 'virtio-non-transitional', 'ncr53c90' (as builtin implicit controller only), 'am53c974', 'dc390'. - See `Virtio transitional devices`_ for more details. + See `virtio device models`_ for more details. ``usb`` A ``usb`` controller has an optional attribute ``model``, which is one of "piix3-uhci", "piix4-uhci", "ehci", "ich9-ehci1", "ich9-uhci1", "ich9-uhci2", @@ -4452,9 +4454,8 @@ or: :since:`since 2.5.0` For SCSI devices, user is responsible to make sure the device is not used by host. This ``type`` passes all LUNs presented by a single HBA to the guest. :since:`Since 5.2.0`, the ``model`` attribute - can be specified further with "virtio-transitional", - "virtio-non-transitional", or "virtio". `Virtio transitional devices`_ - for more details. + can be specified further with "virtio", "virtio-transitional" or + "virtio-non-transitional". See `virtio device models`_ for more details. ``mdev`` For mediated devices ( :since:`Since 3.2.0` ) the ``model`` attribute specifies the device API which determines how the host's vfio driver will @@ -6300,8 +6301,8 @@ value 'all' which when enabled grabs all input devices instead of just one, change the grab key combination. ``input`` type ``evdev`` is currently supported only on linux devices. (KVM only) :since:`Since 5.2.0`, the ``input`` element accepts a -``model`` attribute which has the values 'virtio', 'virtio-transitional' and -'virtio-non-transitional'. See `Virtio transitional devices`_ for more details. +``model`` attribute which has the values 'virtio', 'virtio-transitional' or +'virtio-non-transitional'. See `virtio device models`_ for more details. The subelement ``driver`` can be used to tune the virtio options of the device: `Virtio-related options`_ can also be set. ( :since:`Since 3.5.0` ) @@ -7982,7 +7983,7 @@ Example: manually added device with static PCI slot 2 requested - 'virtio-non-transitional' :since:`Since 5.2.0` - 'xen' - default with Xen - See `Virtio transitional devices`_ for more details. + See `virtio device models`_ for more details. ``autodeflate`` The optional ``autodeflate`` attribute allows to enable/disable (values @@ -8048,7 +8049,7 @@ Example: usage of the RNG device: - 'virtio-transitional' :since:`Since 5.2.0` - 'virtio-non-transitional' :since:`Since 5.2.0` - See `Virtio transitional devices`_ for more details. + See `virtio device models`_ for more details. ``rate`` The optional ``rate`` element allows limiting the rate at which entropy can @@ -8673,8 +8674,8 @@ Vsock ~~~~~ A vsock host/guest interface. The ``model`` attribute defaults to ``virtio``. -:since:`Since 5.2.0` ``model`` can also be 'virtio-transitional' and -'virtio-non-transitional', see `Virtio transitional devices`_ for more details. +:since:`Since 5.2.0` ``model`` can also be 'virtio-transitional' or +'virtio-non-transitional', see `virtio device models`_ for more details. The optional attribute ``address`` of the ``cid`` element specifies the CID assigned to the guest. If the attribute ``auto`` is set to ``yes``, libvirt will assign a free CID automatically on domain startup. :since:`Since 4.4.0` -- 2.47.0

3 4

[PATCH] ci: Update with newer lcitool
by Martin Kletzander 12 Nov '24

12 Nov '24

This switches to newer freebsd 14.1 and implements the new RUN_PIPELINE behaviour introduced by Daniel. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- As far as I understand this does not need any change in the CI/CD settings in gitlab, but I do not have access to those. ci/cirrus/freebsd-14.vars | 2 +- ci/gitlab.yml | 13 +++++++--- ci/gitlab/build-templates.yml | 46 ++++++++++++++++++++++++++--------- ci/gitlab/builds.yml | 2 +- ci/gitlab/sanity-checks.yml | 8 ++++-- 5 files changed, 51 insertions(+), 20 deletions(-) diff --git a/ci/cirrus/freebsd-14.vars b/ci/cirrus/freebsd-14.vars index fbcd6130956f..3002987cbdd8 100644 --- a/ci/cirrus/freebsd-14.vars +++ b/ci/cirrus/freebsd-14.vars @@ -10,7 +10,7 @@ CROSS_PKGS='' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' -PIP3='/usr/local/bin/pip-3.8' +PIP3='/usr/local/bin/pip' PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 7bb68b848c73..0daab1267668 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -11,8 +11,11 @@ # - RUN_PIPELINE - force creation of a CI pipeline when # pushing to a branch in a forked repository. Official # CI pipelines are triggered when merge requests are -# created/updated. Setting this variable to a non-empty -# value allows CI testing prior to opening a merge request. +# created/updated. Setting this variable allows CI +# testing prior to opening a merge request. A value +# of "0" will create the pipeline but leave all jobs +# to be manually started, while "1" will immediately +# run all default jobs. # # - RUN_PIPELINE_UPSTREAM_ENV - same semantics as RUN_PIPELINE, # but uses the CI environment (containers) from the upstream project @@ -38,11 +41,13 @@ # # Aliases can be set for common usage # -# $ git config --local alias.push-ci "push -o ci.variable=RUN_PIPELINE=1" +# $ git config --local alias.push-ci "push -o ci.variable=RUN_PIPELINE=0" +# $ git config --local alias.push-ci-now "push -o ci.variable=RUN_PIPELINE=1" # # Allowing the less verbose invocation # -# $ git push-ci +# $ git push-ci (create pipeline but don't start jobs) +# $ git push-ci-now (create pipeline and start default jobs) # # Pipeline variables can also be set in the repository # pipeline config globally, or set against scheduled pipelines diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index b1e41b0783d9..5ba91ffc673d 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -47,19 +47,27 @@ when: on_success # forks: pushes to a branch when a pipeline run in upstream env is explicitly requested - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "0"' when: manual allow_failure: true - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1" && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1"' when: on_success # forks: pushes to branches with pipeline requested - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "0"' + when: manual + allow_failure: true + variables: + IMAGE: $TARGET_BASE_IMAGE + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1" && $JOB_OPTIONAL' when: manual allow_failure: true variables: IMAGE: $TARGET_BASE_IMAGE - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1"' when: on_success variables: IMAGE: $TARGET_BASE_IMAGE @@ -183,19 +191,27 @@ when: on_success # forks: pushes to a branch when a pipeline run in upstream env is explicitly requested - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "0"' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1" && $JOB_OPTIONAL' when: manual allow_failure: true - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1"' when: on_success # forks: pushes to branches with pipeline requested - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "0"' when: manual allow_failure: true variables: IMAGE: $TARGET_BASE_IMAGE - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1" && $JOB_OPTIONAL' + when: manual + allow_failure: true + variables: + IMAGE: $TARGET_BASE_IMAGE + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1"' when: on_success variables: IMAGE: $TARGET_BASE_IMAGE @@ -302,15 +318,21 @@ when: on_success # forks: pushes to branches with pipeline requested (including pipeline in upstream environment) - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "0"' when: manual allow_failure: true - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1" && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1"' when: on_success - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "0"' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1" && $JOB_OPTIONAL' when: manual allow_failure: true - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1"' when: on_success # upstream+forks: Run pipelines on MR, web, api & scheduled diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index c24421378c51..3e7f36802e15 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -617,7 +617,7 @@ x86_64-freebsd-14: allow_failure: exit_codes: 3 variables: - CIRRUS_VM_IMAGE_NAME: freebsd-14-0 + CIRRUS_VM_IMAGE_NAME: freebsd-14-1 CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_INSTANCE_TYPE: freebsd_instance INSTALL_COMMAND: pkg install -y diff --git a/ci/gitlab/sanity-checks.yml b/ci/gitlab/sanity-checks.yml index d2b1768e266d..b568015db930 100644 --- a/ci/gitlab/sanity-checks.yml +++ b/ci/gitlab/sanity-checks.yml @@ -18,9 +18,13 @@ check-dco: when: on_success # forks: pushes to branches with pipeline requested (including upstream env pipelines) - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE == "0"' + when: manual + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE == "1"' when: on_success - - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV' + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV == "0"' + when: manual + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV == "1"' when: on_success # upstream+forks: that's all folks -- 2.47.0

2 1

[PATCH 0/2] disk hotplug support for test hypervisor
by John Levon 12 Nov '24

12 Nov '24

John Levon (2): test_driver: provide basic disk hotplug support test_driver: provide basic disk hotunplug support src/test/test_driver.c | 276 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 273 insertions(+), 3 deletions(-) -- 2.34.1

2 6

[PATCH 0/2] ch_monitor: Two simple improvements
by Michal Privoznik 11 Nov '24

11 Nov '24

I've noticed these why reviewing some other CH patches on the list. Michal Prívozník (2): ch_monitor: Avoid possible double free in virCHMonitorClose() ch_monitor: Report OS error when removing socket fails src/ch/ch_monitor.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.45.2

2 3

[PATCH v2 0/4] Full boot order support on s390x
by Boris Fiuczynski 11 Nov '24

11 Nov '24

This series adds on s390x full boot order support which has been introduced recently in QEMU with the PR https://lore.kernel.org/qemu-devel/20241023131710.906748-1-thuth@redhat.com/ Changes in v2: - fixed up patch 2 with Peter's feedback - added RBs given - added NEWS update The replies and xml files are removed from patch 2 in this series and are available in https://gitlab.com/fiuczy/libvirt/-/commits/fullbootorder Boris Fiuczynski (4): qemu: capabilities: Add QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM tests: add capabilities for QEMU 9.2.0 on s390x qemu: command: add multi boot device support on s390x NEWS: qemu: add multi boot device support on s390x NEWS.rst | 16 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 36 +- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_hotplug.c | 6 +- tests/domaincapsdata/qemu_9.2.0.s390x.xml | 311 + .../caps_5.2.0_s390x.replies | 321 +- .../caps_6.0.0_s390x.replies | 321 +- .../caps_8.1.0_s390x.replies | 321 +- .../caps_8.2.0_s390x.replies | 321 +- .../caps_9.1.0_s390x.replies | 321 +- .../caps_9.2.0_s390x.replies | 36741 ++++++++++++++++ .../qemucapabilitiesdata/caps_9.2.0_s390x.xml | 3752 ++ .../machine-loadparm-hostdev.s390x-9.1.0.args | 33 + .../machine-loadparm-hostdev.s390x-9.1.0.xml | 33 + ...machine-loadparm-hostdev.s390x-latest.args | 4 +- ...-multiple-disks-nets-s390.s390x-9.1.0.args | 40 + ...m-multiple-disks-nets-s390.s390x-9.1.0.xml | 51 + ...multiple-disks-nets-s390.s390x-latest.args | 8 +- ...machine-loadparm-net-s390.s390x-9.1.0.args | 34 + .../machine-loadparm-net-s390.s390x-9.1.0.xml | 32 + ...achine-loadparm-net-s390.s390x-latest.args | 4 +- .../machine-loadparm-s390.s390x-9.1.0.args | 34 + .../machine-loadparm-s390.s390x-9.1.0.xml | 33 + .../machine-loadparm-s390.s390x-latest.args | 4 +- tests/qemuxmlconftest.c | 4 + 27 files changed, 42676 insertions(+), 120 deletions(-) create mode 100644 tests/domaincapsdata/qemu_9.2.0.s390x.xml create mode 100644 tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml create mode 100644 tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.args create mode 100644 tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-9.1.0.args create mode 100644 tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-9.1.0.args create mode 100644 tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/machine-loadparm-s390.s390x-9.1.0.args create mode 100644 tests/qemuxmlconfdata/machine-loadparm-s390.s390x-9.1.0.xml -- 2.45.0

3 11

[PATCH 00/13] qemu: NVRAM template handling fixes and support for block device backed NVRAM
by Peter Krempa 11 Nov '24

11 Nov '24

This patch fixes a few quirks regarding block device use for NVRAM backing and introduces support for populating the block device from template. Peter Krempa (13): qemuPrepareNVRAM: Don't attempt to create NVRAM on block device qemuFirmwareEnsureNVRAM: Don't try to setup non-local nvram qemu: Install backing store terminators for 'pflash' blockdevs conf: domain: Clarify nvram/loader format logic docs: formatdomain: Clarify that NVRAM template is also being autoselected firmware: Add 'templateFormat' XML attribute and plumb it in conf: domain: Output 'format' attribute of '<nvram>' also for' raw images conf: Always format firmware image format qemuPrepareNVRAM: Refuse conversion of NVRAM backing file format qemuFirmwareMatchDomain: Don't base firmware selection on nvram image format conf: Remove nonsensical requirement of nvram format matching firmware format qemu: process: Extract setup of file-backed nvram from template qemu: process: Introduce setup of block-device backed NVRAM docs/formatdomain.rst | 22 +-- src/conf/domain_conf.c | 62 +++++---- src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 17 ++- src/qemu/qemu_domain.c | 2 + src/qemu/qemu_firmware.c | 47 ++++--- src/qemu/qemu_process.c | 127 +++++++++++++++--- .../aarch64-virt-graphics.aarch64-latest.xml | 4 +- ...ch64-virt-headless-mmio.aarch64-latest.xml | 4 +- .../aarch64-virt-headless.aarch64-latest.xml | 4 +- ...ware-auto-bios-stateless.x86_64-latest.xml | 2 +- .../firmware-auto-bios.x86_64-latest.xml | 2 +- ...efi-aarch64.aarch64-latest.abi-update.args | 4 +- ...-efi-aarch64.aarch64-latest.abi-update.xml | 2 +- ...rmware-auto-efi-aarch64.aarch64-latest.xml | 4 +- ...e-auto-efi-enrolled-keys.x86_64-latest.xml | 4 +- ...loader-qcow2-nvram-path.x86_64-latest.args | 4 +- ...-loader-qcow2-nvram-path.x86_64-latest.xml | 2 +- ...efi-format-loader-qcow2.x86_64-latest.args | 4 +- ...-efi-format-loader-qcow2.x86_64-latest.xml | 2 +- ...t-loader-raw.aarch64-latest.abi-update.xml | 4 +- ...o-efi-format-loader-raw.aarch64-latest.xml | 4 +- ...uto-efi-format-mismatch.x86_64-latest.args | 37 +++++ ...auto-efi-format-mismatch.x86_64-latest.err | 1 - ...auto-efi-format-mismatch.x86_64-latest.xml | 41 ++++++ .../firmware-auto-efi-format-mismatch.xml | 4 +- ...nvram-qcow2-network-nbd.x86_64-latest.args | 6 +- ...-nvram-qcow2-network-nbd.x86_64-latest.xml | 2 +- ...uto-efi-format-nvram-qcow2-network-nbd.xml | 2 +- ...format-nvram-qcow2-path.x86_64-latest.args | 4 +- ...-format-nvram-qcow2-path.x86_64-latest.xml | 2 +- ...-efi-format-nvram-qcow2.x86_64-latest.args | 4 +- ...o-efi-format-nvram-qcow2.x86_64-latest.xml | 2 +- ...auto-efi-loader-insecure.x86_64-latest.xml | 4 +- ...-loader-path-nonstandard.x86_64-latest.xml | 2 +- ...are-auto-efi-loader-path.x86_64-latest.xml | 4 +- ...oader-secure.x86_64-latest.abi-update.args | 4 +- ...loader-secure.x86_64-latest.abi-update.xml | 2 +- ...e-auto-efi-loader-secure.x86_64-latest.xml | 4 +- ...ngarch64.loongarch64-latest.abi-update.xml | 4 +- ...uto-efi-loongarch64.loongarch64-latest.xml | 4 +- ...uto-efi-no-enrolled-keys.x86_64-latest.xml | 4 +- ...ware-auto-efi-no-secboot.x86_64-latest.xml | 4 +- ...ware-auto-efi-nvram-file.x86_64-latest.xml | 4 +- ...-efi-nvram-network-iscsi.x86_64-latest.xml | 4 +- ...to-efi-nvram-network-nbd.x86_64-latest.xml | 4 +- ...ware-auto-efi-nvram-path.x86_64-latest.xml | 4 +- ...ram-template-nonstandard.x86_64-latest.xml | 2 +- ...-auto-efi-nvram-template.x86_64-latest.xml | 4 +- ...efi-riscv64.riscv64-latest.abi-update.args | 4 +- ...-efi-riscv64.riscv64-latest.abi-update.xml | 2 +- ...mware-auto-efi-rw-pflash.x86_64-latest.xml | 2 +- .../firmware-auto-efi-rw.x86_64-latest.xml | 2 +- ...irmware-auto-efi-secboot.x86_64-latest.xml | 4 +- ...irmware-auto-efi-smm-off.x86_64-latest.xml | 4 +- ...mware-auto-efi-stateless.x86_64-latest.xml | 2 +- ...are-auto-efi.x86_64-latest.abi-update.args | 4 +- ...ware-auto-efi.x86_64-latest.abi-update.xml | 2 +- .../firmware-auto-efi.x86_64-latest.xml | 4 +- ...re-manual-bios-stateless.x86_64-latest.xml | 2 +- .../firmware-manual-bios.x86_64-latest.xml | 2 +- ...fi-aarch64-legacy-paths.aarch64-latest.xml | 4 +- ...manual-efi-acpi-aarch64.aarch64-latest.xml | 4 +- ...ware-manual-efi-acpi-q35.x86_64-latest.xml | 4 +- ...ware-manual-efi-features.x86_64-latest.xml | 4 +- ...-loader-path-nonstandard.x86_64-latest.xml | 4 +- ...manual-efi-loader-secure.x86_64-latest.xml | 4 +- ...rolled-keys-legacy-paths.x86_64-latest.xml | 4 +- ...ual-efi-no-enrolled-keys.x86_64-latest.xml | 4 +- ...-no-secboot-legacy-paths.x86_64-latest.xml | 4 +- ...re-manual-efi-no-secboot.x86_64-latest.xml | 4 +- ...nual-efi-noacpi-aarch64.aarch64-latest.xml | 4 +- ...re-manual-efi-nvram-file.x86_64-latest.xml | 4 +- ...-efi-nvram-network-iscsi.x86_64-latest.xml | 4 +- ...al-efi-nvram-network-nbd.x86_64-latest.xml | 4 +- ...ram-template-nonstandard.x86_64-latest.xml | 4 +- ...anual-efi-nvram-template.x86_64-latest.xml | 4 +- ...e-manual-efi-rw-implicit.x86_64-latest.xml | 2 +- ...nual-efi-rw-legacy-paths.x86_64-latest.xml | 2 +- ...nual-efi-rw-modern-paths.x86_64-latest.xml | 2 +- .../firmware-manual-efi-rw.x86_64-latest.xml | 2 +- ...efi-secboot-legacy-paths.x86_64-latest.xml | 4 +- ...mware-manual-efi-secboot.x86_64-latest.xml | 4 +- ...are-manual-efi-stateless.x86_64-latest.xml | 2 +- .../firmware-manual-efi.x86_64-latest.xml | 4 +- ...f-aarch64-virt-headless.aarch64-latest.xml | 4 +- .../hvf-x86_64-q35-headless.x86_64-latest.xml | 4 +- .../pvpanic-pci-aarch64.aarch64-latest.xml | 4 +- ...-pci-no-address-aarch64.aarch64-latest.xml | 4 +- .../virtio-iommu-aarch64.aarch64-latest.xml | 4 +- tests/qemuxmlconftest.c | 2 +- .../test-disk-positional-parms-full.xml | 2 +- .../test-disk-positional-parms-partial.xml | 2 +- tests/xlconfigdata/test-disk-qed.xml | 2 +- .../xlconfigdata/test-fullvirt-acpi-slic.xml | 2 +- tests/xlconfigdata/test-fullvirt-cpuid.xml | 2 +- ...ullvirt-direct-kernel-boot-bogus-extra.xml | 2 +- ...test-fullvirt-direct-kernel-boot-extra.xml | 2 +- .../test-fullvirt-direct-kernel-boot.xml | 2 +- .../xlconfigdata/test-fullvirt-hpet-timer.xml | 2 +- .../test-fullvirt-hypervisor-features.xml | 2 +- .../test-fullvirt-multi-timer.xml | 2 +- .../test-fullvirt-multiserial.xml | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 +- .../test-fullvirt-nestedhvm-disabled.xml | 2 +- .../xlconfigdata/test-fullvirt-nestedhvm.xml | 2 +- tests/xlconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xlconfigdata/test-fullvirt-ovmf.xml | 2 +- .../test-fullvirt-ovswitch-tagged.xml | 2 +- .../test-fullvirt-ovswitch-trunked.xml | 2 +- tests/xlconfigdata/test-fullvirt-pci.xml | 2 +- .../xlconfigdata/test-fullvirt-tsc-timer.xml | 2 +- tests/xlconfigdata/test-fullvirt-type.xml | 2 +- tests/xlconfigdata/test-fullvirt-vnuma.xml | 2 +- tests/xlconfigdata/test-net-fakemodel.xml | 2 +- tests/xlconfigdata/test-new-disk.xml | 2 +- tests/xlconfigdata/test-qemu-passthrough.xml | 2 +- .../test-rbd-multihost-noauth.xml | 2 +- tests/xlconfigdata/test-spice-features.xml | 2 +- tests/xlconfigdata/test-spice.xml | 2 +- tests/xlconfigdata/test-vif-multi-ip.xml | 2 +- tests/xlconfigdata/test-vif-rate.xml | 2 +- tests/xlconfigdata/test-vif-typename.xml | 2 +- tests/xmconfigdata/test-escape-paths.xml | 2 +- .../test-fullvirt-default-feature.xml | 2 +- .../xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- .../test-fullvirt-force-nohpet.xml | 2 +- .../xmconfigdata/test-fullvirt-localtime.xml | 2 +- .../test-fullvirt-net-netfront.xml | 2 +- .../xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-nohap.xml | 2 +- .../test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-file.xml | 2 +- .../test-fullvirt-serial-null.xml | 2 +- .../test-fullvirt-serial-pipe.xml | 2 +- .../xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- .../test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- .../xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- .../xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- .../test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- .../xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-pci-dev-syntax.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- 148 files changed, 481 insertions(+), 266 deletions(-) create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.args delete mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.xml -- 2.47.0

3 16

[PATCH 0/3] Do not try hot(un)plugging platform char devices
by Martin Kletzander 11 Nov '24

11 Nov '24

Just don't. Martin Kletzander (3): qemu: Expose qemuChrIsPlatformDevice outside from qemu_command qemu_hotplug: Report better error message for platform serial devices qemu_hotplug: Do not report error for hot-unplugging non-existing device src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 5 +++++ src/qemu/qemu_hotplug.c | 13 +++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) -- 2.47.0

2 7

[PATCH v2 00/16] hw/microblaze: Allow running cross-endian vCPUs
by Philippe Mathieu-Daudé 08 Nov '24

08 Nov '24

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

2 21

[PATCH] virnetdevopenvswitch: Warn on unsupported QoS settings
by Michal Privoznik 07 Nov '24

07 Nov '24

Let me preface this with stating the obvious: documentation on QoS in OVS is very sparse. This is all based on my observation and OVS codebase analysis. For the following QoS setting: <bandwidth> <inbound average="512" peak="1024" burst="32"/> </bandwidth> the following QoS setting is generated into OVS (NB, our XML values are in KiB/s, OVS has them in bits/s): # ovs-vsctl list qos _uuid : a087226b-2da6-4575-ad4c-bf570cb812a9 external_ids : {ifname=vnet1, vm-id="7714e6b5-4885-4140-bc59-2f77cc99b3b5"} other_config : {burst="262144", max-rate="8192000", min-rate="4096000"} queues : {0=655bf3a7-e530-4516-9caf-ec9555dfbd4c} type : linux-htb from which the following topology is generated: # for i in qdisc class; do tc -s -d -g $i show dev vnet1; done qdisc htb 1: root refcnt 2 r2q 10 default 0x1 direct_packets_stat 0 ver 3.17 direct_qlen 1000 Sent 2186 bytes 16 pkt (dropped 0, overlimits 0 requeues 0) backlog 0b 0p requeues 0 +---(1:fffe) htb rate 8192Kbit ceil 8192Kbit linklayer ethernet burst 1499b/1mpu 60b cburst 1499b/1mpu 60b level 7 | Sent 2186 bytes 16 pkt (dropped 0, overlimits 0 requeues 0) | backlog 0b 0p requeues 0 | +---(1:1) htb prio 0 quantum 51200 rate 4096Kbit ceil 8192Kbit linklayer ethernet burst 32Kb/1mpu 60b cburst 32Kb/1mpu 60b level 0 Sent 2186 bytes 16 pkt (dropped 0, overlimits 0 requeues 0) backlog 0b 0p requeues 0 Long story short, the default class (1:) for an OVS interface has average and peak set exactly as requested. But since it's nested under another class (1:fffe), it can borrow unused bandwidth. And the parent is set to have rate = ceil = peak from our XML. From [1]: htb_tc_install() calls htb_parse_qdisc_details__() which sets: 'hc->min_rate = hc->max_rate;' and then calls htb_setup_class_(..., tc_make_handle(1, 0xfffe), tc_make_handle(1, 0), &hc); to set up the top parent class. In other words - the interface is set up to so that it can always consume 'peak' bandwidth and there is no way for us to set it up differently. It's too late to deny setting 'peak' different to 'average' at XML validation phase so do the next best thing - throw a warning, just like we do in case <bandwidth/> is set for an unsupported <interface/> type. 1: https://github.com/openvswitch/ovs/blob/main/lib/netdev-linux.c#L5039 Resolves: https://issues.redhat.com/browse/RHEL-53963 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetdevopenvswitch.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index e23f4c83b6..598cfa0031 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -945,6 +945,10 @@ virNetDevOpenvswitchInterfaceSetQos(const char *ifname, } if (tx && tx->average) { + if (tx->peak && tx->peak != tx->average) { + VIR_WARN("Setting different 'peak' value than 'average' for QoS for OVS interface %s is unsupported", + ifname); + } if (virNetDevOpenvswitchInterfaceSetTxQos(ifname, tx, vmuuid) < 0) return -1; } else { @@ -954,6 +958,10 @@ virNetDevOpenvswitchInterfaceSetQos(const char *ifname, } if (rx) { + if (rx->peak && tx->peak != rx->average) { + VIR_WARN("Setting different 'peak' value than 'average' for QoS for OVS interface %s is unsupported", + ifname); + } if (virNetDevOpenvswitchInterfaceSetRxQos(ifname, rx) < 0) return -1; } else { -- 2.45.2

2 1

[PATCH] docs: Soften language around use of virtio model name
by Andrea Bolognani 07 Nov '24

07 Nov '24

When virtio-(non-)transitional models were introduced, the documentation was updated to include them; at the same time, language was introduced indicating that using the existing virtio model is no longer recommended. This is unnecessarily harsh, and has resulted in people incorrectly believing (through no fault of their own) that the virtio model has been deprecated. In reality, it's perfectly fine to use the virtio model as the stress-free option that, while often not producing the ideal PCI topology, will generally get the job done and work reliably across libvirt versions and machine types. Tweak the documentation so that it hopefully carries the desired message across. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/formatdomain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index c50744b57b..b404ea8773 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3931,7 +3931,7 @@ machine types, accept the following ``model`` values: into a PCI Express slot, and like a ``virtio-transitional`` device otherwise; libvirt will pick one or the other based on the machine type. This is the best choice when compatibility with libvirt versions older than 5.2.0 is - necessary, but it's otherwise not recommended to use it. + necessary or if you're unsure which of the other two options to pick. While the information outlined above applies to most virtio devices, there are a few exceptions: -- 2.47.0

2 2

[PATCH v3 0/7] introduce job-change qmp command
by Vladimir Sementsov-Ogievskiy 07 Nov '24

07 Nov '24

Hi all! Here is new job-change command - a replacement for (becoming deprecated) block-job-change, as a first step of my "[RFC 00/15] block job API" v3: 01: add a-b by Markus 03: add a-b by Markus, s/9.1/9.2/ in QAPI 05: update commit message, s/9.1/9.2/ in QAPI 06: update commit message (and subject!), s/9.1/9.2/ in deprecated.rst Vladimir Sementsov-Ogievskiy (7): qapi: rename BlockJobChangeOptions to JobChangeOptions blockjob: block_job_change_locked(): check job type qapi: block-job-change: make copy-mode parameter optional blockjob: move change action implementation to job from block-job qapi: add job-change qapi/block-core: deprecate block-job-change iotests/mirror-change-copy-mode: switch to job-change command block/mirror.c | 13 +++++--- blockdev.c | 4 +-- blockjob.c | 20 ------------ docs/about/deprecated.rst | 5 +++ include/block/blockjob.h | 11 ------- include/block/blockjob_int.h | 7 ----- include/qemu/job.h | 12 +++++++ job-qmp.c | 15 +++++++++ job.c | 23 ++++++++++++++ qapi/block-core.json | 31 ++++++++++++++----- .../tests/mirror-change-copy-mode | 2 +- 11 files changed, 90 insertions(+), 53 deletions(-) -- 2.34.1

3 12

[PATCH 0/3] qemu_domain: Automagically add IOMMU if needed
by Michal Privoznik 07 Nov '24

07 Nov '24

*** BLURB HERE *** Michal Prívozník (3): libvirt_private.syms: Export virDomainIOMMUDefNew() qemu: Turn EIM IOMMU on automagically qemu_domain: Automagically add IOMMU if needed src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 56 ++++++++++++++++++- src/qemu/qemu_validate.c | 1 - src/qemu/qemu_validate.h | 2 + ...-eim-autoadd.x86_64-latest.abi-update.args | 34 +++++++++++ ...u-eim-autoadd.x86_64-latest.abi-update.xml | 37 ++++++++++++ .../intel-iommu-eim-autoadd.xml | 34 +++++++++++ tests/qemuxmlconftest.c | 1 + 8 files changed, 164 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxmlconfdata/intel-iommu-eim-autoadd.x86_64-latest.abi-update.args create mode 100644 tests/qemuxmlconfdata/intel-iommu-eim-autoadd.x86_64-latest.abi-update.xml create mode 100644 tests/qemuxmlconfdata/intel-iommu-eim-autoadd.xml -- 2.45.2

2 4

[libvirt PATCH 0/3] coverity fixes
by Ján Tomko 06 Nov '24

06 Nov '24

Ján Tomko (3): qemu: chardev: avoid impossible overflow util: json: check return value of virJSONValueFromJsonC ch: check return value of virJSONValueArrayAppend src/ch/ch_monitor.c | 3 ++- src/qemu/qemu_chardev.c | 2 +- src/util/virjson.c | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) -- 2.47.0

2 4

[PATCH v5 0/6] Add TPM emulator <source type='file/dir' path='..'/>
by marcandre.lureau＠redhat.com 05 Nov '24

05 Nov '24

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, When swtpm capabilities reports "nvram-backend-dir", it can accepts a single file or block device where TPM state will be stored. --tpmstate must be backend-uri=file://. v5: - fix indentation - update doc about state sharing/locking - add r-b from Stefan v4: - add "qemu: explicit swtpm state locking" - add r-b from Stefan, first patch only atm v3: - changed to <source type='file/dir' path='..'/> v2: - add <source dir='..'/> support as well (Daniel) Related: https://issues.redhat.com/browse/CNV-35250 Marc-André Lureau (6): util: check swtpm nvram-backend-{dir,file} capabilities tpm: rename 'storagepath' to 'source_path' schema: add TPM emulator <source type='file' path='..'> schema: add TPM emulator <source type='dir' path='..'> qemu_tpm: handle file/block storage source qemu: explicit swtpm state locking docs/formatdomain.rst | 22 ++++ src/conf/domain_conf.c | 31 ++++- src/conf/domain_conf.h | 12 +- src/conf/schemas/domaincommon.rng | 26 ++++ src/qemu/qemu_tpm.c | 114 +++++++++++++----- src/security/security_selinux.c | 6 +- src/util/virtpm.c | 3 + src/util/virtpm.h | 3 + .../qemuxmlconfdata/tpm-emulator-tpm2-enc.xml | 1 + tests/qemuxmlconfdata/tpm-emulator-tpm2.xml | 1 + tests/testutilsqemu.c | 1 + 11 files changed, 187 insertions(+), 33 deletions(-) -- 2.47.0

4 10

[libvirt PATCH] docs: fix since tag for TPM with custom path
by Ján Tomko 05 Nov '24

05 Nov '24

The feature was pushed after the 10.9.0 release. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Fixes: 579fd44612d044981a5b81a70b03d4a8c0d8930e --- Pushed as trivial. docs/formatdomain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 34552a5597..c50744b57b 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -8205,7 +8205,7 @@ Example: usage of the TPM Emulator ``path`` The path to the TPM state storage. - :since:`Since v10.9.0` + :since:`Since v10.10.0` ``persistent_state`` The ``persistent_state`` attribute indicates whether 'swtpm' TPM state is -- 2.46.1

1 0

[libvirt PATCH] docs: formatdomain: fix XML snippets
by Ján Tomko 05 Nov '24

05 Nov '24

Fix indentation, missing slashes for unpaired tags and missing angle brackets. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. docs/formatdomain.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 2437b5f419..34552a5597 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -4401,9 +4401,9 @@ or: </source> </hostdev> <hostdev mode='subsystem' type='mdev' model='vfio-ccw'> - <source> - <address uuid='9063cba3-ecef-47b6-abcf-3fef4fdcad85'/> - </source> + <source> + <address uuid='9063cba3-ecef-47b6-abcf-3fef4fdcad85'/> + </source> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> </hostdev> </devices> @@ -5668,7 +5668,7 @@ Setting NIC driver-specific options <host csum='off' gso='off' tso4='off' tso6='off' ecn='off' ufo='off' mrg_rxbuf='off'/> <guest csum='off' tso4='off' tso6='off' ecn='off' ufo='off'/> </driver> - </interface> + </interface> </devices> ... @@ -6412,7 +6412,7 @@ interaction with the admin. :: <graphics type='vnc' ...> - <audio id='1'> + <audio id='1'/> </graphics> Where ``1`` is an id of the audio device (See `Audio backends`_). If no @@ -6569,7 +6569,7 @@ interaction with the admin. :: <graphics type='dbus' ...> - <audio id='1'> + <audio id='1'/> </graphics> Where ``1`` is an id of the audio device (See `Audio backends`_). @@ -7480,7 +7480,7 @@ backend using the ``<audio>`` sub-element: ... <devices> <sound model='ich7'> - <audio id='1'> + <audio id='1'/> </sound> </devices> ... @@ -8975,7 +8975,7 @@ attributes and elements with ``type='sev'`` but differs in others. Example confi <guestVisibleWorkarounds>...</guestVisibleWorkarounds> <idBlock>...</idBlock> <idAuth>...</idAuth> - <hostData>.../hostData> + <hostData>...</hostData> </launchSecurity> ... </domain> -- 2.47.0

1 0

[PATCH v2] network: add rule to nftables backend that zeroes checksum of DHCP responses
by Laine Stump 05 Nov '24

05 Nov '24

Many long years ago (April 2010), soon after "vhost" in-kernel packet processing was added to the virtio-net driver, people running RHEL5 virtual machines with a virtio-net interface connected via a libvirt virtual network noticed that when vhost packet processing was enabled, their VMs could no longer get an IP address via DHCP - the guest was ignoring the DHCP response packets sent by the host. (I've been informed by danpb that the same issue had been encountered, and "fixed" even earlier than that, in 2006, with Xen as the hypervisor.) The "gory details" of the 2010 discussion are chronicled here: https://lists.isc.org/pipermail/dhcp-hackers/2010-April/001835.html but basically it was because the checksum of packets wasn't being fully computed on the host side (because QEMU on the host and the NIC driver in the guest had agreed between themselves to turn off checksums because they were unnecessary due to the "link" between the two being entirely in local memory and not a physical cable), but 1) a partial checksum had been put into the packets at some point by "someone" 2) the "don't use checksums" info was known by the guest kernel, which would properly ignore the "bad" checksum), and 3) the packets were being read by the dhclient application on the guest side with a "raw" socket (thus bypassing the guest kernel UDP processing that would have known the checksum was irrelevant)), The "fix" for this ended up being two-tiered: 1) The ISC DHCP package (which contains the aforementioned dhclient program) made a fix to their dhclient code which caused it to accept packets anyway even if they didn't have a proper checksum (NB: that's not a full explanation, and possibly not accurate). This fixed the problem for guests with an updated dhclient. Here is the code with the fix to ISC DHCP: https://github.com/isc-projects/dhcp/blob/master/common/packet.c#L365 This fixed the issue for any new/updated guests that had the fixed dhclient, but it didn't solve the problem for existing/old guest images that didn't/couldn't get their dhclient updated. This brings us to: 2) iptables added a new "CHECKSUM" target and "--checksum-fill" action: http://patchwork.ozlabs.org/patch/58525/ and libvirt added an iptables rule for each virtual network to match DHCP response packets and perform --checksum-fill. This way by the time dhclient on the guest reads the raw packet, the checksum would be corrected, and the packet would be accepted. This was pushed upstream in libvirt commit v0.8.2-142-gfd5b15ff1a. The word at the time from those more knowledgeable than me was that the bad checksum problem was really specific to ISC's dhclient running on Linux, and so once their fix was in use everywhere dhclient was used, bad checksums would be a thing of the past and the --checksum-fill iptables rules would no longer be needed (but would otherwise be harmless if they were still there). (Plot twist: the dhclient code in fix (1) above apparently is on a Linux-only code path - this is very important later!) Based on this information (and also due to the opinion that fixing it by having iptables modify the packet checksum was really the wrong way to permanently fix things, i.e. an "ugly hack"), the nftables developers made the decision to not implement an equivalent to --checksum-fill in nftables. As a result, when I wrote the nftables firewall backend for libvirt virtual networks earlier this year, it didn't add in any rule to "fix" broken UDP checksums (since there was apparently no equivalent in nftables and, after all, that was fixed somewhere else 14 years ago, right???) But last week, when Rich Jones was doing routine testing using a Fedora 40 host (the first Fedora release to use the nftables backend of libvirt's network driver by default) and a FreeBSD guest, for "some strange reason", the FreeBSD guest was unable to get an IP address from DHCP!! https://www.spinics.net/linux/fedora/libvirt-users/msg14356.html A few quick tests proved that it was the same old "bad checksum" problem from 2010 come back to haunt us - it wasn't a Linux-only issue after all. Phil Sutter and Eric Garver (nftables people) pointed out that, while nftables doesn't have an action that will *compute* the checksum of a packet, it *does* have an action that will set the checksum to 0, and suggested we try adding a "zero the checksum" rule for dhcp response packets to our nftables ruleset. (Why? Because a checksum value of 0 in a IPv4 UDP packet is defined by RFC768 to mean "no checksum generated", implying "checksum not needed"). It turns out that this works - dhclient properly recognizes that a 0 checksum means "don't bother with the checksum", and accepts the packet as valid. So to once again fix this timeless bug, this patch adds such a checksum zeroing rule to the nftables rules setup for each virtual network. This has been verified (on a Fedora 40 host) to fix DHCP with FreeBSD guests, while not breaking it for Fedora or Windows (10) guests. Fixes: b89c4991daa0ee9371f10937fab3b03c5ffdabc6 Reported-by: Rich Jones <rjones(a)redhat.com> Fix-Suggested-by: Eric Garver <egarver(a)redhat.com> Fix-Suggested-by: Phil Sutter <psutter(a)redhat.com> Signed-off-by: Laine Stump <laine(a)redhat.com> Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com> --- (NB: jdenemar reminded me this is a bugfix, so we don't need to rush to get it pushed before he freezes for the RC1 snapshot. I'm happy with it as is though, if anyone is awake early enough and wants to push it before he snapshots RC1. Otherwise I'll just push it later and it will be in RC2) Changes from V1: * informational errors/omissions in commit log message fixed src/network/network_nftables.c | 69 +++++++++++++++++++ tests/networkxml2firewalldata/base.nftables | 14 ++++ .../forward-dev-linux.nftables | 16 +++++ .../isolated-linux.nftables | 16 +++++ .../nat-default-linux.nftables | 16 +++++ .../nat-ipv6-linux.nftables | 16 +++++ .../nat-ipv6-masquerade-linux.nftables | 16 +++++ .../nat-many-ips-linux.nftables | 16 +++++ .../nat-port-range-ipv6-linux.nftables | 16 +++++ .../nat-port-range-linux.nftables | 16 +++++ .../nat-tftp-linux.nftables | 16 +++++ .../route-default-linux.nftables | 16 +++++ 12 files changed, 243 insertions(+) diff --git a/src/network/network_nftables.c b/src/network/network_nftables.c index f8b5ab665d..5523207269 100644 --- a/src/network/network_nftables.c +++ b/src/network/network_nftables.c @@ -51,6 +51,7 @@ VIR_LOG_INIT("network.nftables"); #define VIR_NFTABLES_FWD_OUT_CHAIN "guest_output" #define VIR_NFTABLES_FWD_X_CHAIN "guest_cross" #define VIR_NFTABLES_NAT_POSTROUTE_CHAIN "guest_nat" +#define VIR_NFTABLES_MANGLE_POSTROUTE_CHAIN "postroute_mangle" /* we must avoid using the standard "filter" table as used by * iptables, as any subsequent attempts to use iptables commands will @@ -106,6 +107,10 @@ nftablesGlobalChain nftablesChains[] = { /* chains for NAT rules */ {NULL, VIR_NFTABLES_NAT_POSTROUTE_CHAIN, "{ type nat hook postrouting priority 100; policy accept; }"}, + + /* chain for "mangle" rules that modify packets (e.g. 0 out UDP checksums) */ + {NULL, VIR_NFTABLES_MANGLE_POSTROUTE_CHAIN, "{ type filter hook postrouting priority 0; policy accept; }"}, + }; @@ -644,6 +649,44 @@ nftablesAddDontMasquerade(virFirewall *fw, } +/** + * nftablesAddOutputFixUdpChecksum: + * + * Add a rule to @fw that will 0 out the checksum of udp packets + * output from @iface with destination port @port. + + * Zeroing the checksum of a UDP packet tells the receiving end "you + * don't need to validate the checksum", which is useful in cases + * where the host (sender) thinks that packet checksums will be + * computed elsewhere (and so leaves a partially computed checksum in + * the packet header) while the guest (receiver) thinks that the + * checksum has already been fully computed; in the meantime none of + * the code in between has actually finished computing the + * checksum. + * + * An example of this is DHCP response packets from host to + * guest. If the checksum of each of these packets isn't zeroed, then + * many guests (e.g. FreeBSD) will drop them with reason BAD CHECKSUM; + * if the packets arrive at those guests with a checksum of 0, they + * will happily accept the packet. + */ +static void +nftablesAddOutputFixUdpChecksum(virFirewall *fw, + const char *iface, + int port) +{ + g_autofree char *portstr = g_strdup_printf("%d", port); + + virFirewallAddCmd(fw, VIR_FIREWALL_LAYER_IPV4, + "insert", "rule", "ip", + VIR_NFTABLES_PRIVATE_TABLE, + VIR_NFTABLES_MANGLE_POSTROUTE_CHAIN, + "oif", iface, "udp", "dport", portstr, + "counter", "udp", "checksum", "set", "0", + NULL); +} + + static const char networkLocalMulticastIPv4[] = "224.0.0.0/24"; static const char networkLocalMulticastIPv6[] = "ff02::/16"; static const char networkLocalBroadcast[] = "255.255.255.255/32"; @@ -901,6 +944,30 @@ nftablesAddGeneralFirewallRules(virFirewall *fw, } +static void +nftablesAddChecksumFirewallRules(virFirewall *fw, + virNetworkDef *def) +{ + size_t i; + virNetworkIPDef *ipv4def; + + /* Look for the first IPv4 address that has dhcp or tftpboot + * defined. We support dhcp config on 1 IPv4 interface only. + */ + for (i = 0; (ipv4def = virNetworkDefGetIPByIndex(def, AF_INET, i)); i++) { + if (ipv4def->nranges || ipv4def->nhosts) + break; + } + + /* If we are doing local DHCP service on this network, add a rule + * that will fixup the checksum of DHCP response packets back to + * the guests. + */ + if (ipv4def) + nftablesAddOutputFixUdpChecksum(fw, def->bridge, 68); +} + + static int nftablesAddIPSpecificFirewallRules(virFirewall *fw, virNetworkDef *def, @@ -952,6 +1019,8 @@ nftablesAddFirewallRules(virNetworkDef *def, virFirewall **fwRemoval) return -1; } + nftablesAddChecksumFirewallRules(fw, def); + if (virFirewallApply(fw) < 0) return -1; diff --git a/tests/networkxml2firewalldata/base.nftables b/tests/networkxml2firewalldata/base.nftables index a064318739..6371fc12dd 100644 --- a/tests/networkxml2firewalldata/base.nftables +++ b/tests/networkxml2firewalldata/base.nftables @@ -68,6 +68,13 @@ libvirt_network \ guest_nat \ '{ type nat hook postrouting priority 100; policy accept; }' nft \ +add \ +chain \ +ip \ +libvirt_network \ +postroute_mangle \ +'{ type filter hook postrouting priority 0; policy accept; }' +nft \ list \ table \ ip6 \ @@ -136,3 +143,10 @@ ip6 \ libvirt_network \ guest_nat \ '{ type nat hook postrouting priority 100; policy accept; }' +nft \ +add \ +chain \ +ip6 \ +libvirt_network \ +postroute_mangle \ +'{ type filter hook postrouting priority 0; policy accept; }' diff --git a/tests/networkxml2firewalldata/forward-dev-linux.nftables b/tests/networkxml2firewalldata/forward-dev-linux.nftables index 8badb74beb..9dea1a88a4 100644 --- a/tests/networkxml2firewalldata/forward-dev-linux.nftables +++ b/tests/networkxml2firewalldata/forward-dev-linux.nftables @@ -156,3 +156,19 @@ daddr \ 224.0.0.0/24 \ counter \ return +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/isolated-linux.nftables b/tests/networkxml2firewalldata/isolated-linux.nftables index d1b4dac178..67ee0a2bf5 100644 --- a/tests/networkxml2firewalldata/isolated-linux.nftables +++ b/tests/networkxml2firewalldata/isolated-linux.nftables @@ -62,3 +62,19 @@ oif \ virbr0 \ counter \ accept +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-default-linux.nftables b/tests/networkxml2firewalldata/nat-default-linux.nftables index 28508292f9..951a5a6d60 100644 --- a/tests/networkxml2firewalldata/nat-default-linux.nftables +++ b/tests/networkxml2firewalldata/nat-default-linux.nftables @@ -142,3 +142,19 @@ daddr \ 224.0.0.0/24 \ counter \ return +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-ipv6-linux.nftables b/tests/networkxml2firewalldata/nat-ipv6-linux.nftables index d8a9ba706d..617ed8b753 100644 --- a/tests/networkxml2firewalldata/nat-ipv6-linux.nftables +++ b/tests/networkxml2firewalldata/nat-ipv6-linux.nftables @@ -200,3 +200,19 @@ oif \ virbr0 \ counter \ accept +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables b/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables index a7f09cda59..a710d0e296 100644 --- a/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables +++ b/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables @@ -272,3 +272,19 @@ daddr \ ff02::/16 \ counter \ return +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-many-ips-linux.nftables b/tests/networkxml2firewalldata/nat-many-ips-linux.nftables index b826fe6134..0be5fb7e65 100644 --- a/tests/networkxml2firewalldata/nat-many-ips-linux.nftables +++ b/tests/networkxml2firewalldata/nat-many-ips-linux.nftables @@ -366,3 +366,19 @@ daddr \ 224.0.0.0/24 \ counter \ return +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables b/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables index ceaed6fa40..7574356855 100644 --- a/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables +++ b/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables @@ -384,3 +384,19 @@ daddr \ ff02::/16 \ counter \ return +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-port-range-linux.nftables b/tests/networkxml2firewalldata/nat-port-range-linux.nftables index 1dc37a26ec..127536e4db 100644 --- a/tests/networkxml2firewalldata/nat-port-range-linux.nftables +++ b/tests/networkxml2firewalldata/nat-port-range-linux.nftables @@ -312,3 +312,19 @@ oif \ virbr0 \ counter \ accept +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-tftp-linux.nftables b/tests/networkxml2firewalldata/nat-tftp-linux.nftables index 28508292f9..951a5a6d60 100644 --- a/tests/networkxml2firewalldata/nat-tftp-linux.nftables +++ b/tests/networkxml2firewalldata/nat-tftp-linux.nftables @@ -142,3 +142,19 @@ daddr \ 224.0.0.0/24 \ counter \ return +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/route-default-linux.nftables b/tests/networkxml2firewalldata/route-default-linux.nftables index 282c9542a5..be9c4f5439 100644 --- a/tests/networkxml2firewalldata/route-default-linux.nftables +++ b/tests/networkxml2firewalldata/route-default-linux.nftables @@ -56,3 +56,19 @@ oif \ virbr0 \ counter \ accept +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 -- 2.47.0

4 28

[PATCH] qemu: Report supported panic device models in domcapabilities
by Martin Kletzander 05 Nov '24

05 Nov '24

Domain capabilities include information about support for various devices and models. Panic devices are not included in the output which means that management applications need to include the logic for choosing the right device model or request a default model and try defining such a domain. Add reporting of panic device models into the domain capabilities based on the logic in qemuValidateDomainDefPanic() and also report whether panic devices are supported based on whether at least one model is supported. That way consumers of the domain capability XML can differentiate between libvirt not reporting the panic device models or no model being supported. Resolves: https://issues.redhat.com/browse/RHEL-65187 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/formatdomaincaps.rst | 24 ++++++++++++++ src/conf/domain_capabilities.c | 13 ++++++++ src/conf/domain_capabilities.h | 8 +++++ src/qemu/qemu_capabilities.c | 31 +++++++++++++++++++ src/qemu/qemu_capabilities.h | 4 +++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 6 ++++ .../qemu_5.2.0-tcg-virt.riscv64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 6 ++++ .../qemu_5.2.0-virt.aarch64.xml | 1 + .../qemu_5.2.0-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 5 +++ tests/domaincapsdata/qemu_5.2.0.s390x.xml | 5 +++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 6 ++++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 7 +++++ .../qemu_6.0.0-virt.aarch64.xml | 5 +++ tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 5 +++ tests/domaincapsdata/qemu_6.0.0.s390x.xml | 5 +++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 7 +++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 7 +++++ .../qemu_6.2.0-virt.aarch64.xml | 5 +++ tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 5 +++ tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 6 ++++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 7 +++++ .../qemu_7.0.0-hvf.aarch64+hvf.xml | 5 +++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 7 +++++ .../qemu_7.0.0-virt.aarch64.xml | 5 +++ tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 5 +++ tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 6 ++++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 7 +++++ tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 6 ++++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 7 +++++ .../qemu_7.2.0-hvf.x86_64+hvf.xml | 7 +++++ .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 7 +++++ .../qemu_7.2.0-tcg.x86_64+hvf.xml | 7 +++++ .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 7 +++++ tests/domaincapsdata/qemu_7.2.0.ppc.xml | 5 +++ tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 7 +++++ .../qemu_8.0.0-tcg-virt.riscv64.xml | 5 +++ .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 7 +++++ .../qemu_8.0.0-virt.riscv64.xml | 5 +++ tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 7 +++++ tests/domaincapsdata/qemu_8.1.0.s390x.xml | 5 +++ tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 7 +++++ .../qemu_8.2.0-tcg-virt.loongarch64.xml | 5 +++ .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 7 +++++ .../qemu_8.2.0-virt.aarch64.xml | 5 +++ .../qemu_8.2.0-virt.loongarch64.xml | 5 +++ tests/domaincapsdata/qemu_8.2.0.aarch64.xml | 5 +++ tests/domaincapsdata/qemu_8.2.0.armv7l.xml | 5 +++ tests/domaincapsdata/qemu_8.2.0.s390x.xml | 5 +++ tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 7 +++++ tests/domaincapsdata/qemu_9.0.0.sparc.xml | 1 + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 7 +++++ .../qemu_9.1.0-tcg-virt.riscv64.xml | 5 +++ .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 7 +++++ .../qemu_9.1.0-virt.riscv64.xml | 5 +++ tests/domaincapsdata/qemu_9.1.0.s390x.xml | 5 +++ tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 7 +++++ .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 7 +++++ tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 7 +++++ 77 files changed, 502 insertions(+) diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index 5309c6c2513f..886a9f71e123 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -671,6 +671,30 @@ Interface device corresponds to `network interface ``backendType`` Options for the ``type`` attribute of the ``<backend/>`` element +Panic device +^^^^^^^^^^^^ + +Interface device corresponds to `panic device +<formatdomain.html#panic-device>`__ (``<panic/>``) in domain XML. + +:: + + <domainCapabilities> + ... + <devices> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + </enum> + </panic> + ... + </devices> + </domainCapabilities> + +``model`` + Options for the ``model`` attribute of the ``<panic/>`` element + Features ~~~~~~~~ diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index cf40d798e51b..5f70a48cec80 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -669,6 +669,18 @@ virDomainCapsDeviceNetFormat(virBuffer *buf, } +static void +virDomainCapsDevicePanicFormat(virBuffer *buf, + const virDomainCapsDevicePanic *panic) +{ + FORMAT_PROLOGUE(panic); + + ENUM_PROCESS(panic, model, virDomainPanicModelTypeToString); + + FORMAT_EPILOGUE(panic); +} + + /** * virDomainCapsFeatureGICFormat: * @buf: target buffer @@ -850,6 +862,7 @@ virDomainCapsFormat(const virDomainCaps *caps) virDomainCapsDeviceChannelFormat(&buf, &caps->channel); virDomainCapsDeviceCryptoFormat(&buf, &caps->crypto); virDomainCapsDeviceNetFormat(&buf, &caps->net); + virDomainCapsDevicePanicFormat(&buf, &caps->panic); virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</devices>\n"); diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index a706ab337ec2..ef0804686046 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -257,6 +257,13 @@ struct _virDomainCapsDeviceNet { virDomainCapsEnum backendType; /* virDomainNetBackendType */ }; +STATIC_ASSERT_ENUM(VIR_DOMAIN_PANIC_MODEL_LAST); +typedef struct _virDomainCapsDevicePanic virDomainCapsDevicePanic; +struct _virDomainCapsDevicePanic { + virTristateBool supported; + virDomainCapsEnum model; /* virDomainPanicModel */ +}; + typedef enum { VIR_DOMAIN_CAPS_FEATURE_IOTHREADS = 0, VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO, @@ -295,6 +302,7 @@ struct _virDomainCaps { virDomainCapsDeviceChannel channel; virDomainCapsDeviceCrypto crypto; virDomainCapsDeviceNet net; + virDomainCapsDevicePanic panic; /* add new domain devices here */ virDomainCapsFeatureGIC gic; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9322ae9ae6c8..38fdade255fe 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6639,6 +6639,35 @@ virQEMUCapsFillDomainDeviceNetCaps(virQEMUCaps *qemuCaps, } +void +virQEMUCapsFillDomainDevicePanicCaps(virQEMUCaps *qemuCaps, + const char *machine, + virDomainCapsDevicePanic *panic) +{ + panic->model.report = true; + + if (ARCH_IS_S390(qemuCaps->arch)) + VIR_DOMAIN_CAPS_ENUM_SET(panic->model, VIR_DOMAIN_PANIC_MODEL_S390); + + if (ARCH_IS_X86(qemuCaps->arch)) + VIR_DOMAIN_CAPS_ENUM_SET(panic->model, VIR_DOMAIN_PANIC_MODEL_HYPERV); + + if (qemuDomainMachineIsPSeries(machine, qemuCaps->arch)) + VIR_DOMAIN_CAPS_ENUM_SET(panic->model, VIR_DOMAIN_PANIC_MODEL_PSERIES); + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_PANIC)) + VIR_DOMAIN_CAPS_ENUM_SET(panic->model, VIR_DOMAIN_PANIC_MODEL_ISA); + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_PANIC_PCI)) + VIR_DOMAIN_CAPS_ENUM_SET(panic->model, VIR_DOMAIN_PANIC_MODEL_PVPANIC); + + if (panic->model.values) + panic->supported = VIR_TRISTATE_BOOL_YES; + else + panic->supported = VIR_TRISTATE_BOOL_NO; +} + + /** * virQEMUCapsSupportsGICVersion: * @qemuCaps: QEMU capabilities @@ -6817,6 +6846,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virDomainCapsDeviceCrypto *crypto = &domCaps->crypto; virDomainCapsLaunchSecurity *launchSecurity = &domCaps->launchSecurity; virDomainCapsDeviceNet *net = &domCaps->net; + virDomainCapsDevicePanic *panic = &domCaps->panic; virQEMUCapsFillDomainFeaturesFromQEMUCaps(qemuCaps, domCaps); @@ -6859,6 +6889,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virQEMUCapsFillDomainDeviceCryptoCaps(qemuCaps, crypto); virQEMUCapsFillDomainLaunchSecurity(qemuCaps, launchSecurity); virQEMUCapsFillDomainDeviceNetCaps(qemuCaps, net); + virQEMUCapsFillDomainDevicePanicCaps(qemuCaps, domCaps->machine, panic); return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 54c7e30903ca..261abcc1b473 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -892,6 +892,10 @@ void virQEMUCapsFillDomainLaunchSecurity(virQEMUCaps *qemuCaps, void virQEMUCapsFillDomainDeviceNetCaps(virQEMUCaps *qemuCaps, virDomainCapsDeviceNet *net); +void virQEMUCapsFillDomainDevicePanicCaps(virQEMUCaps *qemuCaps, + const char *machine, + virDomainCapsDevicePanic *panic); + bool virQEMUCapsGuestIsNative(virArch host, virArch guest); diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 81bf0ceb0048..5579ad3fc21b 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -536,6 +536,12 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml index eaed71b4ee4b..ac2805919031 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml @@ -146,6 +146,7 @@ <value>default</value> </enum> </interface> + <panic supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index 054bf4a88bdc..a111a8d75162 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -804,6 +804,12 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml index 00f434b7d729..4708b32b896e 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -200,6 +200,7 @@ <value>default</value> </enum> </interface> + <panic supported='no'/> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml index 14d936ea4b0d..d636e5686a6d 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml @@ -149,6 +149,7 @@ <value>default</value> </enum> </interface> + <panic supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml index 00f434b7d729..4708b32b896e 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -200,6 +200,7 @@ <value>default</value> </enum> </interface> + <panic supported='no'/> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml index 3413138fba84..a6daef9798a7 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -166,6 +166,11 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pseries</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml index 34234a7a2cb4..b64f90872344 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -266,6 +266,11 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>s390</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index f298829e3463..8882b9c8a792 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -536,6 +536,12 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index c738f2f9ed95..b0a4bce914a0 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -546,6 +546,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index bb1c66cdbfb5..334a52317932 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -837,6 +837,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml index 9f07b6417836..74f3a04bb053 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -202,6 +202,11 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml index 9f07b6417836..74f3a04bb053 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -202,6 +202,11 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml index 7b3d1ab4929b..0db677999091 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -267,6 +267,11 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>s390</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 1efa0578bd2d..30e5686593b8 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -546,6 +546,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index fe22898504ad..777b7c5198d2 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -548,6 +548,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 11ef8be5e3f6..6c58d132d9bf 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -838,6 +838,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 43ed790a205f..68b0a658dd8d 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -548,6 +548,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index a7240ff9a701..4a055e19ecf9 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -547,6 +547,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 40a69c1ce4c5..91dbb8ff7853 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -838,6 +838,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml index ea9a62d78922..051d2782b612 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -209,6 +209,11 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml index ea9a62d78922..051d2782b612 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -209,6 +209,11 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml index 84f2f31e444c..39b07955dd84 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -165,6 +165,12 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pseries</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index 1452c4ddd163..466be5c7a0df 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -547,6 +547,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml b/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml index 32eee7ea3b25..bf130dde1075 100644 --- a/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml @@ -167,6 +167,11 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index c118289a42db..637579d6ec02 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -548,6 +548,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 89b5758040b7..1ed0cef05b31 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -832,6 +832,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml index 1e0fca49889d..4c49343c438e 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -208,6 +208,11 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml index 1e0fca49889d..4c49343c438e 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -208,6 +208,11 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml index 9c31ff40dc8d..52c73d10a4ab 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -170,6 +170,12 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pseries</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 935cdcadfd70..acde0c66d9a3 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -548,6 +548,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 58a39ed39c32..591e15ab24ab 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -515,6 +515,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index 387195c12ac5..52086550dbab 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -780,6 +780,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml index 3028db7af4af..ca0bc6f0b5af 100644 --- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml @@ -163,6 +163,12 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pseries</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 5082cc119f94..1170d8ed2caa 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -515,6 +515,13 @@ <value>default</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml index 091735d83b2a..75b2f1102d1a 100644 --- a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml @@ -175,6 +175,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index bf6b22a6ad8f..653a7a7bacc3 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -522,6 +522,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index 6cc40ab932ae..779bdddad660 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -663,6 +663,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index 6cc40ab932ae..779bdddad660 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -663,6 +663,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.ppc.xml b/tests/domaincapsdata/qemu_7.2.0.ppc.xml index 416ebc6f7647..c6ef37b1afad 100644 --- a/tests/domaincapsdata/qemu_7.2.0.ppc.xml +++ b/tests/domaincapsdata/qemu_7.2.0.ppc.xml @@ -150,6 +150,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index 3c698aea3377..72d4e7be3984 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -522,6 +522,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index c5c1b0fa692b..3ba9419ede2b 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -563,6 +563,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml index af787b8b244e..7a9da4fe4fb2 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml @@ -153,6 +153,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index 971d3398ce3e..e5ef1673c367 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -714,6 +714,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml index 0e3e9b817fdf..258df5b1342b 100644 --- a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml @@ -156,6 +156,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 34341b85595e..9b935c0a6bdd 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -563,6 +563,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml index 5ad09e197c21..18d26fbae6a0 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -648,6 +648,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml index a24986f04cd7..6e6a5a8b6c3b 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -723,6 +723,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml index 3564f74cad02..2ca3b1d2ae20 100644 --- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml @@ -417,6 +417,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>s390</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index c93e05ec60f8..8880cc4bba94 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -648,6 +648,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml index fda177a385ae..2cffb87550c2 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -650,6 +650,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml index 3917ce6138c6..c9f01904cdc0 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml @@ -157,6 +157,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml index 694d55f5d8e9..5a7042c7ba95 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -715,6 +715,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml index 1d1af1a2ac4b..224c61916896 100644 --- a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml @@ -215,6 +215,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml index edddb6d8e721..ed3637eaec0a 100644 --- a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml @@ -161,6 +161,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml index 1d1af1a2ac4b..224c61916896 100644 --- a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml @@ -215,6 +215,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml index fb0f7665bc5d..7182dca796f2 100644 --- a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml +++ b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml @@ -167,6 +167,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.s390x.xml b/tests/domaincapsdata/qemu_8.2.0.s390x.xml index bcd3f685035f..57ac07c1532f 100644 --- a/tests/domaincapsdata/qemu_8.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.2.0.s390x.xml @@ -417,6 +417,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>s390</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 35badddb3d3b..9b18209a23b3 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -650,6 +650,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index 01e31c538f4c..024375a3548f 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -650,6 +650,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index 6449ffefb224..f379930ff7c3 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -691,6 +691,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.sparc.xml b/tests/domaincapsdata/qemu_9.0.0.sparc.xml index ab5c3dc4e9ba..e48cdd0ae587 100644 --- a/tests/domaincapsdata/qemu_9.0.0.sparc.xml +++ b/tests/domaincapsdata/qemu_9.0.0.sparc.xml @@ -129,6 +129,7 @@ <value>passt</value> </enum> </interface> + <panic supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 3f3f25cf239f..42d38288929c 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -650,6 +650,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index 6dd5dcd7a5b1..945e783a25e5 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -681,6 +681,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml index 0ae1d0b614fe..b4327bf8783b 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml @@ -180,6 +180,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index 739af1fa3558..9ad8eca8452e 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -710,6 +710,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml index d3b3971127e3..73e5ba1bc376 100644 --- a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml @@ -169,6 +169,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.s390x.xml b/tests/domaincapsdata/qemu_9.1.0.s390x.xml index 2df3dab0173b..be46cfe6ba43 100644 --- a/tests/domaincapsdata/qemu_9.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_9.1.0.s390x.xml @@ -285,6 +285,11 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>s390</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index 46a54d8c5369..0a131bb15180 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -681,6 +681,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index deff784eeb20..64c841667244 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -681,6 +681,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index 40da25e78bfd..8a4fc13443db 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -710,6 +710,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 393d24c2baa9..00f3b78e7e5e 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -681,6 +681,13 @@ <value>passt</value> </enum> </interface> + <panic supported='yes'> + <enum name='model'> + <value>isa</value> + <value>hyperv</value> + <value>pvpanic</value> + </enum> + </panic> </devices> <features> <gic supported='no'/> -- 2.47.0

2 1

Re: [PATCH RFC v4 11/17] qemu: block: Support block disk along with throttle filters
by Peter Krempa 04 Nov '24

04 Nov '24

On Mon, Nov 04, 2024 at 12:39:24 +0000, Edward Arulanadam wrote: > Hello Team, > > Originator of this libvirt change, Daniel Wu, will not be able to continue contributing to this requested change in libvirt. Another member in our team, Harikumar (harirajkumar), will continue working on this change request and implement any review comment that may come in. We are awaiting feedback review to get this change incorporated in libvirt and adopted in our Cloud solution. > > Could you please help with the review I think at this point the best course of actions will be if Harikumar adopts the patches, rebases them to the current tree as they no longer apply cleanly and posts another version. That way a discussion will be more natural and also it's less likely that any replies will break threads (as e.g. your email does). [1] https://www.libvirt.org/hacking.html#preparing-patches

1 0

[PATCH] spec: Fix attributes for some qemu dirs in %{_rundir}
by Jiri Denemark 04 Nov '24

04 Nov '24

The recent attempt to fix the attributes used wrong mode for some directories used by the QEMU driver. Only dbus and swtpm directories use 770, all other directories are created with 755. Fixes: 961fb8944d0c2d7d5cc0783888a20317e725a248 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 69693f4851..901ed9c464 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2275,10 +2275,10 @@ exit 0 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu -%ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/ +%ghost %dir %attr(0755, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/ %ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/dbus/ -%ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/passt/ -%ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/slirp/ +%ghost %dir %attr(0755, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/passt/ +%ghost %dir %attr(0755, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/slirp/ %ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/swtpm/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/checkpoint/ -- 2.47.0

2 1

Re: [PATCH RFC v4 11/17] qemu: block: Support block disk along with throttle filters
by Edward Arulanadam 04 Nov '24

04 Nov '24

Hello Team, Originator of this libvirt change, Daniel Wu, will not be able to continue contributing to this requested change in libvirt. Another member in our team, Harikumar (harirajkumar), will continue working on this change request and implement any review comment that may come in. We are awaiting feedback review to get this change incorporated in libvirt and adopted in our Cloud solution. Could you please help with the review Thanks and Regards, Edward Arulanandam Senior Development Manager, IBM Cloud Storage

1 0

[libvirt PATCH] json: do not call json_tokener_free with NULL
by Ján Tomko 04 Nov '24

04 Nov '24

Add an error message for the rare case if json_tokener_new fails (allocation failure) and guard any use of json_tokener_free where tok might be NULL (this was possible in libvirt-nss when the json file could not be opened). https://gitlab.com/libvirt/libvirt/-/issues/581 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Reported-by: Simon Pilkington --- src/util/virjson.c | 8 +++++++- tools/nss/libvirt_nss_leases.c | 7 ++++++- tools/nss/libvirt_nss_macs.c | 7 ++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/util/virjson.c b/src/util/virjson.c index 4a95e84f5b..18a4585e7b 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1462,6 +1462,11 @@ virJSONValueFromString(const char *jsonstring) VIR_DEBUG("string=%s", jsonstring); tok = json_tokener_new(); + if (!tok) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create JSON tokener")); + return NULL; + } json_tokener_set_flags(tok, jsonflags); jobj = json_tokener_parse_ex(tok, jsonstring, strlen(jsonstring)); jerr = json_tokener_get_error(tok); @@ -1475,7 +1480,8 @@ virJSONValueFromString(const char *jsonstring) cleanup: json_object_put(jobj); - json_tokener_free(tok); + if (tok) + json_tokener_free(tok); return ret; } diff --git a/tools/nss/libvirt_nss_leases.c b/tools/nss/libvirt_nss_leases.c index 01e965c4a1..aea81bb56e 100644 --- a/tools/nss/libvirt_nss_leases.c +++ b/tools/nss/libvirt_nss_leases.c @@ -272,6 +272,10 @@ findLeases(const char *file, } tok = json_tokener_new(); + if (!tok) { + ERROR("failed to create JSON tokener"); + goto cleanup; + } json_tokener_set_flags(tok, jsonflags); do { @@ -301,7 +305,8 @@ findLeases(const char *file, cleanup: json_object_put(jobj); - json_tokener_free(tok); + if (tok) + json_tokener_free(tok); if (ret != 0) { free(*addrs); *addrs = NULL; diff --git a/tools/nss/libvirt_nss_macs.c b/tools/nss/libvirt_nss_macs.c index 430023abec..23229a18f3 100644 --- a/tools/nss/libvirt_nss_macs.c +++ b/tools/nss/libvirt_nss_macs.c @@ -134,6 +134,10 @@ findMACs(const char *file, } tok = json_tokener_new(); + if (!tok) { + ERROR("failed to create JSON tokener"); + goto cleanup; + } json_tokener_set_flags(tok, jsonflags); do { @@ -162,7 +166,8 @@ findMACs(const char *file, cleanup: json_object_put(jobj); - json_tokener_free(tok); + if (tok) + json_tokener_free(tok); if (ret != 0) { for (i = 0; i < *nmacs; i++) { char *mac = (*macs)[i]; -- 2.47.0

3 2

Release of libvirt-10.9.0
by Jiri Denemark 01 Nov '24

01 Nov '24

The 10.9.0 release of both libvirt and libvirt-python is tagged and signed tarballs are available at https://download.libvirt.org/ https://download.libvirt.org/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing feedback. Your work is greatly appreciated. * New features * qemu: zero block detection for non-shared-storage migration Users can now request that all-zero blocks are not transferred when migrating non-shared disk data without actually enabling zero detection on the disk itself. This allows sparsifying images during migration where the source has no access to the allocation state of blocks at the cost of CPU overhead. This feature is available via the ``--migrate-disks-detect-zeroes`` option for ``virsh migrate`` or ``VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES`` migration parameter. See the documentation for caveats. * Improvements * qemu: internal snapshot improvements The qemu internal snapshot handling code was updated to use modern commands which avoid the problems the old ones had, preventing use of internal snapshots on VMs with UEFI NVRAM. Internal snapshots of VMs using UEFI are now possible provided that the NVRAM is in ``qcow2`` format. The new code also allows better control when deleting snapshots. To prevent possible regressions no strict checking is done, but in case inconsistent state is encountered a log message is added:: warning : qemuSnapshotActiveInternalDeleteGetDevices:3841 : inconsistent internal snapshot state (deletion): VM='snap' snapshot='1727959843' missing='vda ' unexpected='' extra='' Users are encouraged to report any occurence of the above message along with steps they took to the upstream tracker. * qemu: improve documentation of image format settings The documentation of the various ``*_image_format`` settings in ``qemu.conf`` imply they can only be used to control compression of the image. The documentation has been improved to clarify the settings describe the representation of guest memory blocks on disk, which includes compression among other possible layouts. * Report CPU model blockers in domain capabilities When a CPU model is reported as usable='no' an additional ``<blockers model='...'>`` element is added for that CPU model listing features required by the CPU model, but not supported on the host. Enjoy. Jirka

1 0

[PATCH] qemu: Fix maximum physical address size in baseline CPU
by Jiri Denemark 31 Oct '24

31 Oct '24

We should include maximum physical address size in the CPU definition created by virConnectBaselineHypervisorCPU only if we know the value for all input CPUs. Otherwise we would create a CPU definition that is not usable on all hosts from which we gathered the CPU info. https://issues.redhat.com/browse/RHEL-24850 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 72211da137..72a9542c0b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11914,10 +11914,12 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, goto cleanup; for (i = 0; i < ncpus; i++) { - if (!cpus[i]->addr || cpus[i]->addr->limit == 0) + if (!cpus[i]->addr || cpus[i]->addr->limit == 0) { + physAddrSize = 0; continue; + } - if (physAddrSize == 0 || cpus[i]->addr->limit < physAddrSize) + if (i == 0 || cpus[i]->addr->limit < physAddrSize) physAddrSize = cpus[i]->addr->limit; } -- 2.47.0

2 1

[Call for Presentations] FOSDEM 2025: Virt & IaaS devroom
by Kashyap Chamarthy 31 Oct '24

31 Oct '24

(Cross-posted to KVM, Rust-VMM, QEMU, and libvirt lists.) Hi, The CFP for the 'Virt & IaaS' (Infrastructure as a Service) 2025 "devroom" is out[+]. - Where? — Brussels, Belgium - When? — 02 Feb (Sunday) 2025 - Talk submission deadline — 01 Dec 2024 (The CFP submission on the FOSDEM list[+] says 08 Dec 2024 is the submission deadline in its intro paragraph. But I clarified it with Piotr Kliczewski, the deddline is *01* Dec 2024 and _not_ 08th Dec; I updated it below.) ======================================================================== This devroom is a collaborative effort, and is organized by dedicated folks from projects such as OpenStack, Xen Project, KubeVirt, QEMU, KVM, and Foreman. We invite everyone involved in these fields to submit your proposals by December *1st* 2024. Important Dates --------------- Submission deadline: 1st December 2024 Acceptance notifications: 10th December 2024 Final schedule announcement: 15th December 2024 Devroom: 2nd February 2025 About the Devroom ----------------- The Virtualization & IaaS devroom will feature session topics such as open source hypervisors or virtual machine managers such as Xen Project, KVM, bhyve and VirtualBox as well as Infrastructure-as-a-Service projects such as KubeVirt, Apache CloudStack, OpenStack, QEMU and OpenNebula. This devroom will host presentations that focus on topics of shared interest, such as KVM; libvirt; shared storage; virtualized networking; cloud security; clustering and high availability; interfacing with multiple hypervisors; hyperconverged deployments; and scaling across hundreds or thousands of servers. Presentations in this devroom will be aimed at developers working on these platforms who are looking to collaborate and improve shared infrastructure or solve common problems. We seek topics that encourage dialog between projects and continued work post-FOSDEM. Submit Your Proposal -------------------- All submissions must be made via the Pretalx event planning site[1]. It is a new submission system so you will need to create an account. If you submitted proposals for FOSDEM in previous years, you won’t be able to use your existing account. During submission please make sure to select Virtualization and Cloud infrastructure from the Track list. Please provide a meaningful abstract and description of your proposed session. Submission Guidelines --------------------- We expect more proposals than we can possibly accept, so it is vitally important that you submit your proposal on or before the deadline. Late submissions are unlikely to be considered. All presentation slots are 30 minutes, with 20 minutes planned for presentations, and 10 minutes for Q&A. All presentations will be recorded and made available under Creative Commons licenses. In the Submission notes field, please indicate that you agree that your presentation will be licensed under the CC-By-SA-4.0 or CC-By-4.0 license and that you agree to have your presentation recorded. For example: "If my presentation is accepted for FOSDEM, I hereby agree to license all recordings, slides, and other associated materials under the Creative Commons Attribution Share-Alike 4.0 International License. Sincerely, <NAME>." In the Submission notes field, please also confirm that if your talk is accepted, you will be able to attend FOSDEM and deliver your presentation. We will not consider proposals from prospective speakers who are unsure whether they will be able to secure funds for travel and lodging to attend FOSDEM. (Sadly, we are not able to offer travel funding for prospective speakers.) Code of Conduct --------------- Following the release of the updated code of conduct for FOSDEM[3], we'd like to remind all speakers and attendees that all of the presentations and discussions in our devroom are held under the guidelines set in the CoC and we expect attendees, speakers, and volunteers to follow the CoC at all times. If you submit a proposal and it is accepted, you will be required to confirm that you accept the FOSDEM CoC. If you have any questions about the CoC or wish to have one of the devroom organizers review your presentation slides or any other content for CoC compliance, please email us and we will do our best to assist you. Questions? ---------- If you have any questions about this devroom, please send your questions to our devroom mailing list. You can also subscribe to the list to receive updates about important dates, session announcements, and to connect with other attendees. See you all at FOSDEM! [1] https://fosdem.org/submit [2] virtualization-devroom-manager at fosdem.org [3] https://fosdem.org/2025/practical/conduct/ ======================================================================== [+] https://lists.fosdem.org/pipermail/fosdem/2024q4/003574.html -- /kashyap

1 0

[PATCH] spec: Fix attributes for ghosts directories in %{_rundir}
by Jiri Denemark 31 Oct '24

31 Oct '24

Directories which we dynamically create in %{_rundir} with non-default attributes (i.e., the owner differs from root:root and/or mode is not 755) fail RPM verification. We should properly declare the expected ownership and mode in the specfile. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index d54d2a1e3e..69693f4851 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2038,7 +2038,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %dir %{_datadir}/libvirt/ %ghost %dir %{_rundir}/libvirt/ -%ghost %dir %{_rundir}/libvirt/common/ +%ghost %dir %attr(0700, root, root) %{_rundir}/libvirt/common/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/ @@ -2124,7 +2124,7 @@ exit 0 %{_unitdir}/virtinterfaced-ro.socket %{_unitdir}/virtinterfaced-admin.socket %attr(0755, root, root) %{_sbindir}/virtinterfaced -%ghost %dir %{_rundir}/libvirt/interface/ +%ghost %dir %attr(0700, root, root) %{_rundir}/libvirt/interface/ %{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so %{_mandir}/man8/virtinterfaced.8* @@ -2166,7 +2166,7 @@ exit 0 %{_unitdir}/virtnodedevd-ro.socket %{_unitdir}/virtnodedevd-admin.socket %attr(0755, root, root) %{_sbindir}/virtnodedevd -%ghost %dir %{_rundir}/libvirt/nodedev/ +%ghost %dir %attr(0700, root, root) %{_rundir}/libvirt/nodedev/ %{_libdir}/libvirt/connection-driver/libvirt_driver_nodedev.so %{_mandir}/man8/virtnodedevd.8* @@ -2181,8 +2181,8 @@ exit 0 %attr(0755, root, root) %{_sbindir}/virtnwfilterd %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ %ghost %dir %{_rundir}/libvirt/network/ -%ghost %dir %{_rundir}/libvirt/nwfilter-binding/ -%ghost %dir %{_rundir}/libvirt/nwfilter/ +%ghost %dir %attr(0700, root, root) %{_rundir}/libvirt/nwfilter-binding/ +%ghost %dir %attr(0700, root, root) %{_rundir}/libvirt/nwfilter/ %{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so %{_mandir}/man8/virtnwfilterd.8* @@ -2196,7 +2196,7 @@ exit 0 %{_unitdir}/virtsecretd-admin.socket %attr(0755, root, root) %{_sbindir}/virtsecretd %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/secrets/ -%ghost %dir %{_rundir}/libvirt/secrets/ +%ghost %dir %attr(0700, root, root) %{_rundir}/libvirt/secrets/ %{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so %{_mandir}/man8/virtsecretd.8* @@ -2275,11 +2275,11 @@ exit 0 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu -%ghost %dir %{_rundir}/libvirt/qemu/ -%ghost %dir %{_rundir}/libvirt/qemu/dbus/ -%ghost %dir %{_rundir}/libvirt/qemu/passt/ -%ghost %dir %{_rundir}/libvirt/qemu/slirp/ -%ghost %dir %{_rundir}/libvirt/qemu/swtpm/ +%ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/ +%ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/dbus/ +%ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/passt/ +%ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/slirp/ +%ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/swtpm/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/checkpoint/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/dump/ -- 2.47.0

2 1

Entering freeze for libvirt-10.9.0
by Jiri Denemark 30 Oct '24

30 Oct '24

I have just tagged v10.9.0-rc1 in the repository and pushed signed tarballs to https://download.libvirt.org/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 1

[PATCH] docs: domain: Be more upfront about 'sgio' not being actually supported
by Peter Krempa 30 Oct '24

30 Oct '24

The support for the 'sgio' attribute for SCSI-backed devices was dropped as there wasn't really ever any upstream support for it. The docs do state that support for this depends on the hypervisor itself, but we can be more clear that there is no hypervisor which does support it. There is also a suggestion to use 'sgio' instead of 'rawio' as being more "secure" but since it no longer works drop this suggestion. Resolves: https://issues.redhat.com/browse/RHEL-65268 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/formatdomain.rst | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 3253a28e5a..d16e00661a 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2767,14 +2767,13 @@ paravirtualized driver is specified via the ``disk`` element. per-process basis). This attribute is only valid when device is "lun". NB, ``rawio`` intends to confine the capability per-device, however, current QEMU implementation gives the domain process broader capability than that - (per-process basis, affects all the domain disks). To confine the - capability as much as possible for QEMU driver as this stage, ``sgio`` is - recommended, it's more secure than ``rawio``. :since:`Since 0.9.10` + (per-process basis, affects all the domain disks). :since:`Since 0.9.10` ``sgio`` If supported by the hypervisor and OS, indicates whether unprivileged SG_IO commands are filtered for the disk. Valid settings are "filtered" or "unfiltered" where the default is "filtered". Only available when the - ``device`` is 'lun'. :since:`Since 1.0.2` + ``device`` is 'lun'. The attribute exists :since:`Since 1.0.2`, although + currently it's no longer supported by any hypervisor. ``snapshot`` Indicates the default behavior of the disk during disk snapshots: ``internal`` requires a file format such as qcow2 that can store both @@ -4346,7 +4345,7 @@ or: ... <devices> - <hostdev mode='subsystem' type='scsi' sgio='filtered' rawio='yes'> + <hostdev mode='subsystem' type='scsi' rawio='yes'> <source> <adapter name='scsi_host0'/> <address bus='0' target='0' unit='0'/> @@ -4436,14 +4435,19 @@ or: ``display`` attribute to be set to ``on``. ``scsi`` For SCSI devices, user is responsible to make sure the device is not used - by host. If supported by the hypervisor and OS, the optional ``sgio`` ( - :since:`since 1.0.6` ) attribute indicates whether unprivileged SG_IO - commands are filtered for the disk. Valid settings are "filtered" or - "unfiltered", where the default is "filtered". The optional ``rawio`` ( - :since:`since 1.2.9` ) attribute indicates whether the lun needs the rawio - capability. Valid settings are "yes" or "no". See the rawio description - within the `Hard drives, floppy disks, CDROMs`_ section. If a disk lun in the domain - already has the rawio capability, then this setting not required. + by host. + + If supported by the hypervisor and OS, the optional ``sgio`` ( + :since:`since 1.0.6`, but currently no longer supported by any hypervisor + driver ) attribute indicates whether unprivileged SG_IO commands are + filtered for the disk. Valid settings are "filtered" or + "unfiltered", where the default is "filtered". + + The optional ``rawio`` (:since:`since 1.2.9` ) attribute indicates whether + the lun needs the rawio capability. Valid settings are "yes" or "no". + See the rawio description within the `Hard drives, floppy disks, CDROMs`_ + section. If a disk lun in the domain already has the rawio capability, + then this setting not required. ``scsi_host`` :since:`since 2.5.0` For SCSI devices, user is responsible to make sure the device is not used by host. This ``type`` passes all LUNs presented by -- 2.47.0

2 1

[PATCH] Revert "network: add rule to nftables backend that zeroes checksum of DHCP responses"
by Laine Stump 30 Oct '24

30 Oct '24

This reverts commit 42ab0148dd11727f7e3fd31dce4485469af290d5. This patch was supposed to fix the checksum of dhcp response packets by setting it to 0 (because having a non-0 but incorrect checksum was causing the packets to be droppe on FreeBSD guests). Early testing was positive, but after the patch was pushed upstream and more people could test it, it turned out that while it fixed the dhcp checksum problem for virtio-net interfaces on FreeBSD and OpenBSD, it also *broke* dhcp checksums for the e1000 emulated NIC on *all* guests (but not e1000e). So we're reverting this fix and looking for something more universal to be included in the next release. Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/network/network_nftables.c | 69 ------------------- tests/networkxml2firewalldata/base.nftables | 14 ---- .../forward-dev-linux.nftables | 16 ----- .../isolated-linux.nftables | 16 ----- .../nat-default-linux.nftables | 16 ----- .../nat-ipv6-linux.nftables | 16 ----- .../nat-ipv6-masquerade-linux.nftables | 16 ----- .../nat-many-ips-linux.nftables | 16 ----- .../nat-port-range-ipv6-linux.nftables | 16 ----- .../nat-port-range-linux.nftables | 16 ----- .../nat-tftp-linux.nftables | 16 ----- .../route-default-linux.nftables | 16 ----- 12 files changed, 243 deletions(-) diff --git a/src/network/network_nftables.c b/src/network/network_nftables.c index 5523207269..f8b5ab665d 100644 --- a/src/network/network_nftables.c +++ b/src/network/network_nftables.c @@ -51,7 +51,6 @@ VIR_LOG_INIT("network.nftables"); #define VIR_NFTABLES_FWD_OUT_CHAIN "guest_output" #define VIR_NFTABLES_FWD_X_CHAIN "guest_cross" #define VIR_NFTABLES_NAT_POSTROUTE_CHAIN "guest_nat" -#define VIR_NFTABLES_MANGLE_POSTROUTE_CHAIN "postroute_mangle" /* we must avoid using the standard "filter" table as used by * iptables, as any subsequent attempts to use iptables commands will @@ -107,10 +106,6 @@ nftablesGlobalChain nftablesChains[] = { /* chains for NAT rules */ {NULL, VIR_NFTABLES_NAT_POSTROUTE_CHAIN, "{ type nat hook postrouting priority 100; policy accept; }"}, - - /* chain for "mangle" rules that modify packets (e.g. 0 out UDP checksums) */ - {NULL, VIR_NFTABLES_MANGLE_POSTROUTE_CHAIN, "{ type filter hook postrouting priority 0; policy accept; }"}, - }; @@ -649,44 +644,6 @@ nftablesAddDontMasquerade(virFirewall *fw, } -/** - * nftablesAddOutputFixUdpChecksum: - * - * Add a rule to @fw that will 0 out the checksum of udp packets - * output from @iface with destination port @port. - - * Zeroing the checksum of a UDP packet tells the receiving end "you - * don't need to validate the checksum", which is useful in cases - * where the host (sender) thinks that packet checksums will be - * computed elsewhere (and so leaves a partially computed checksum in - * the packet header) while the guest (receiver) thinks that the - * checksum has already been fully computed; in the meantime none of - * the code in between has actually finished computing the - * checksum. - * - * An example of this is DHCP response packets from host to - * guest. If the checksum of each of these packets isn't zeroed, then - * many guests (e.g. FreeBSD) will drop them with reason BAD CHECKSUM; - * if the packets arrive at those guests with a checksum of 0, they - * will happily accept the packet. - */ -static void -nftablesAddOutputFixUdpChecksum(virFirewall *fw, - const char *iface, - int port) -{ - g_autofree char *portstr = g_strdup_printf("%d", port); - - virFirewallAddCmd(fw, VIR_FIREWALL_LAYER_IPV4, - "insert", "rule", "ip", - VIR_NFTABLES_PRIVATE_TABLE, - VIR_NFTABLES_MANGLE_POSTROUTE_CHAIN, - "oif", iface, "udp", "dport", portstr, - "counter", "udp", "checksum", "set", "0", - NULL); -} - - static const char networkLocalMulticastIPv4[] = "224.0.0.0/24"; static const char networkLocalMulticastIPv6[] = "ff02::/16"; static const char networkLocalBroadcast[] = "255.255.255.255/32"; @@ -944,30 +901,6 @@ nftablesAddGeneralFirewallRules(virFirewall *fw, } -static void -nftablesAddChecksumFirewallRules(virFirewall *fw, - virNetworkDef *def) -{ - size_t i; - virNetworkIPDef *ipv4def; - - /* Look for the first IPv4 address that has dhcp or tftpboot - * defined. We support dhcp config on 1 IPv4 interface only. - */ - for (i = 0; (ipv4def = virNetworkDefGetIPByIndex(def, AF_INET, i)); i++) { - if (ipv4def->nranges || ipv4def->nhosts) - break; - } - - /* If we are doing local DHCP service on this network, add a rule - * that will fixup the checksum of DHCP response packets back to - * the guests. - */ - if (ipv4def) - nftablesAddOutputFixUdpChecksum(fw, def->bridge, 68); -} - - static int nftablesAddIPSpecificFirewallRules(virFirewall *fw, virNetworkDef *def, @@ -1019,8 +952,6 @@ nftablesAddFirewallRules(virNetworkDef *def, virFirewall **fwRemoval) return -1; } - nftablesAddChecksumFirewallRules(fw, def); - if (virFirewallApply(fw) < 0) return -1; diff --git a/tests/networkxml2firewalldata/base.nftables b/tests/networkxml2firewalldata/base.nftables index 6371fc12dd..a064318739 100644 --- a/tests/networkxml2firewalldata/base.nftables +++ b/tests/networkxml2firewalldata/base.nftables @@ -68,13 +68,6 @@ libvirt_network \ guest_nat \ '{ type nat hook postrouting priority 100; policy accept; }' nft \ -add \ -chain \ -ip \ -libvirt_network \ -postroute_mangle \ -'{ type filter hook postrouting priority 0; policy accept; }' -nft \ list \ table \ ip6 \ @@ -143,10 +136,3 @@ ip6 \ libvirt_network \ guest_nat \ '{ type nat hook postrouting priority 100; policy accept; }' -nft \ -add \ -chain \ -ip6 \ -libvirt_network \ -postroute_mangle \ -'{ type filter hook postrouting priority 0; policy accept; }' diff --git a/tests/networkxml2firewalldata/forward-dev-linux.nftables b/tests/networkxml2firewalldata/forward-dev-linux.nftables index 9dea1a88a4..8badb74beb 100644 --- a/tests/networkxml2firewalldata/forward-dev-linux.nftables +++ b/tests/networkxml2firewalldata/forward-dev-linux.nftables @@ -156,19 +156,3 @@ daddr \ 224.0.0.0/24 \ counter \ return -nft \ --ae insert \ -rule \ -ip \ -libvirt_network \ -postroute_mangle \ -oif \ -virbr0 \ -udp \ -dport \ -68 \ -counter \ -udp \ -checksum \ -set \ -0 diff --git a/tests/networkxml2firewalldata/isolated-linux.nftables b/tests/networkxml2firewalldata/isolated-linux.nftables index 67ee0a2bf5..d1b4dac178 100644 --- a/tests/networkxml2firewalldata/isolated-linux.nftables +++ b/tests/networkxml2firewalldata/isolated-linux.nftables @@ -62,19 +62,3 @@ oif \ virbr0 \ counter \ accept -nft \ --ae insert \ -rule \ -ip \ -libvirt_network \ -postroute_mangle \ -oif \ -virbr0 \ -udp \ -dport \ -68 \ -counter \ -udp \ -checksum \ -set \ -0 diff --git a/tests/networkxml2firewalldata/nat-default-linux.nftables b/tests/networkxml2firewalldata/nat-default-linux.nftables index 951a5a6d60..28508292f9 100644 --- a/tests/networkxml2firewalldata/nat-default-linux.nftables +++ b/tests/networkxml2firewalldata/nat-default-linux.nftables @@ -142,19 +142,3 @@ daddr \ 224.0.0.0/24 \ counter \ return -nft \ --ae insert \ -rule \ -ip \ -libvirt_network \ -postroute_mangle \ -oif \ -virbr0 \ -udp \ -dport \ -68 \ -counter \ -udp \ -checksum \ -set \ -0 diff --git a/tests/networkxml2firewalldata/nat-ipv6-linux.nftables b/tests/networkxml2firewalldata/nat-ipv6-linux.nftables index 617ed8b753..d8a9ba706d 100644 --- a/tests/networkxml2firewalldata/nat-ipv6-linux.nftables +++ b/tests/networkxml2firewalldata/nat-ipv6-linux.nftables @@ -200,19 +200,3 @@ oif \ virbr0 \ counter \ accept -nft \ --ae insert \ -rule \ -ip \ -libvirt_network \ -postroute_mangle \ -oif \ -virbr0 \ -udp \ -dport \ -68 \ -counter \ -udp \ -checksum \ -set \ -0 diff --git a/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables b/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables index a710d0e296..a7f09cda59 100644 --- a/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables +++ b/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables @@ -272,19 +272,3 @@ daddr \ ff02::/16 \ counter \ return -nft \ --ae insert \ -rule \ -ip \ -libvirt_network \ -postroute_mangle \ -oif \ -virbr0 \ -udp \ -dport \ -68 \ -counter \ -udp \ -checksum \ -set \ -0 diff --git a/tests/networkxml2firewalldata/nat-many-ips-linux.nftables b/tests/networkxml2firewalldata/nat-many-ips-linux.nftables index 0be5fb7e65..b826fe6134 100644 --- a/tests/networkxml2firewalldata/nat-many-ips-linux.nftables +++ b/tests/networkxml2firewalldata/nat-many-ips-linux.nftables @@ -366,19 +366,3 @@ daddr \ 224.0.0.0/24 \ counter \ return -nft \ --ae insert \ -rule \ -ip \ -libvirt_network \ -postroute_mangle \ -oif \ -virbr0 \ -udp \ -dport \ -68 \ -counter \ -udp \ -checksum \ -set \ -0 diff --git a/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables b/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables index 7574356855..ceaed6fa40 100644 --- a/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables +++ b/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables @@ -384,19 +384,3 @@ daddr \ ff02::/16 \ counter \ return -nft \ --ae insert \ -rule \ -ip \ -libvirt_network \ -postroute_mangle \ -oif \ -virbr0 \ -udp \ -dport \ -68 \ -counter \ -udp \ -checksum \ -set \ -0 diff --git a/tests/networkxml2firewalldata/nat-port-range-linux.nftables b/tests/networkxml2firewalldata/nat-port-range-linux.nftables index 127536e4db..1dc37a26ec 100644 --- a/tests/networkxml2firewalldata/nat-port-range-linux.nftables +++ b/tests/networkxml2firewalldata/nat-port-range-linux.nftables @@ -312,19 +312,3 @@ oif \ virbr0 \ counter \ accept -nft \ --ae insert \ -rule \ -ip \ -libvirt_network \ -postroute_mangle \ -oif \ -virbr0 \ -udp \ -dport \ -68 \ -counter \ -udp \ -checksum \ -set \ -0 diff --git a/tests/networkxml2firewalldata/nat-tftp-linux.nftables b/tests/networkxml2firewalldata/nat-tftp-linux.nftables index 951a5a6d60..28508292f9 100644 --- a/tests/networkxml2firewalldata/nat-tftp-linux.nftables +++ b/tests/networkxml2firewalldata/nat-tftp-linux.nftables @@ -142,19 +142,3 @@ daddr \ 224.0.0.0/24 \ counter \ return -nft \ --ae insert \ -rule \ -ip \ -libvirt_network \ -postroute_mangle \ -oif \ -virbr0 \ -udp \ -dport \ -68 \ -counter \ -udp \ -checksum \ -set \ -0 diff --git a/tests/networkxml2firewalldata/route-default-linux.nftables b/tests/networkxml2firewalldata/route-default-linux.nftables index be9c4f5439..282c9542a5 100644 --- a/tests/networkxml2firewalldata/route-default-linux.nftables +++ b/tests/networkxml2firewalldata/route-default-linux.nftables @@ -56,19 +56,3 @@ oif \ virbr0 \ counter \ accept -nft \ --ae insert \ -rule \ -ip \ -libvirt_network \ -postroute_mangle \ -oif \ -virbr0 \ -udp \ -dport \ -68 \ -counter \ -udp \ -checksum \ -set \ -0 -- 2.47.0

2 1

[PATCH 0/2] Cleanups of improper use of memory allocation APIs
by Peter Krempa 29 Oct '24

29 Oct '24

Peter Krempa (2): Replace improper use of g_malloc(0) with g_new0 virstring: Use 'g_new0' instead of improper use of 'g_malloc0_n' build-aux/syntax-check.mk | 4 ++-- src/util/virpcivpd.c | 6 +++--- src/util/virstring.c | 4 +--- tools/wireshark/src/packet-libvirt.c | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) -- 2.47.0

2 3

[PATCH] virJSONValueFromString: Prefix error message from 'json-c'
by Peter Krempa 25 Oct '24

25 Oct '24

The error message from 'json-c' was passed along without any libvirt string which makes it hard to find in the source and isn't exactly clear when present in logs: libvirtd[843]: internal error : invalid utf-8 string Prefix the message with 'failed to parse JSON'. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virjson.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virjson.c b/src/util/virjson.c index 42018a98b4..4a95e84f5b 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1467,7 +1467,8 @@ virJSONValueFromString(const char *jsonstring) jerr = json_tokener_get_error(tok); if (jerr != json_tokener_success) { virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", json_tokener_error_desc(jerr)); + _("failed to parse JSON: %1$s"), + json_tokener_error_desc(jerr)); goto cleanup; } ret = virJSONValueFromJsonC(jobj); -- 2.47.0

2 1

[PATCH 0/2] finalize 'reconnect' deprecation
by Daniil Tatianin 25 Oct '24

25 Oct '24

We've deprecated the 'reconnect' property in c8e2b6b4d7e, but all the tests, as well as the stream netdev were still left using it. This series finalizes the deprecation and replaces all local usage and docs metions of 'reconnect' with 'reconnect-ms'. Daniil Tatianin (2): net/stream: deprecate 'reconnect' in favor of 'reconnect-ms' chardev: finalize 'reconnect' deprecation docs/COLO-FT.txt | 4 +-- docs/about/deprecated.rst | 10 ++++++++ docs/system/ppc/powernv.rst | 2 +- net/stream.c | 34 +++++++++++++++++--------- qapi/net.json | 13 +++++++++- qemu-options.hx | 46 +++++++++++++++++------------------ tests/qtest/ipmi-bt-test.c | 2 +- tests/qtest/netdev-socket.c | 2 +- tests/qtest/vhost-user-test.c | 2 +- tests/unit/test-char.c | 8 +++--- 10 files changed, 77 insertions(+), 46 deletions(-) -- 2.34.1

2 3

[PATCH v1] tests: add capabilities for QEMU 9.1.0 on s390x
by Shalini Chellathurai Saroja 25 Oct '24

25 Oct '24

Let us introduce the xml and reply files for QEMU 9.1.0 on s390x. Signed-off-by: Shalini Chellathurai Saroja <shalini(a)linux.ibm.com> Reviewed-by:Boris Fiuczynski <fiuczy(a)linux.ibm.com> The replies and xml files are removed from this patch and is available in https://gitlab.com/shalinichellathurai/libvirt/-/commit/9352fc34fcdb9921eaf… --- tests/domaincapsdata/qemu_9.1.0.s390x.xml | 306 + .../caps_9.1.0_s390x.replies | 36291 ++++++++++++++++ .../qemucapabilitiesdata/caps_9.1.0_s390x.xml | 3748 ++ tests/qemuhotplugtest.c | 8 - .../console-sclp.s390x-latest.args | 5 +- .../console-virtio-ccw.s390x-latest.args | 5 +- ...default-video-type-s390x.s390x-latest.args | 2 +- .../disk-virtio-ccw-many.s390x-latest.args | 20 +- .../disk-virtio-ccw.s390x-latest.args | 10 +- .../disk-virtio-s390-zpci.s390x-latest.args | 5 +- .../fs9p-ccw.s390x-latest.args | 5 +- ...tdev-scsi-vhost-scsi-ccw.s390x-latest.args | 5 +- ...vfio-zpci-ccw-memballoon.s390x-latest.args | 2 +- .../input-virtio-ccw.s390x-latest.args | 5 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 10 +- .../launch-security-s390-pv.s390x-latest.args | 7 +- ...chine-aeskeywrap-off-cap.s390x-latest.args | 5 +- ...hine-aeskeywrap-off-caps.s390x-latest.args | 5 +- ...achine-aeskeywrap-on-cap.s390x-latest.args | 5 +- ...chine-aeskeywrap-on-caps.s390x-latest.args | 5 +- ...chine-deakeywrap-off-cap.s390x-latest.args | 5 +- ...hine-deakeywrap-off-caps.s390x-latest.args | 5 +- ...achine-deakeywrap-on-cap.s390x-latest.args | 5 +- ...chine-deakeywrap-on-caps.s390x-latest.args | 5 +- ...achine-keywrap-none-caps.s390x-latest.args | 5 +- .../machine-keywrap-none.s390x-latest.args | 5 +- ...multiple-disks-nets-s390.s390x-latest.args | 10 +- .../machine-loadparm-s390.s390x-latest.args | 5 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 2 +- .../s390-defaultconsole.s390x-latest.args | 2 +- .../s390-panic.s390x-latest.args | 2 +- .../vhost-user-fs-ccw.s390x-latest.args | 5 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 5 +- .../vhost-vsock-ccw-iommu.s390x-latest.args | 5 +- .../vhost-vsock-ccw.s390x-latest.args | 5 +- ...ideo-virtio-gpu-ccw-auto.s390x-latest.args | 5 +- .../video-virtio-gpu-ccw.s390x-latest.args | 5 +- .../virtio-rng-ccw.s390x-latest.args | 5 +- .../watchdog-diag288.s390x-latest.args | 5 +- 39 files changed, 40423 insertions(+), 122 deletions(-) create mode 100644 tests/domaincapsdata/qemu_9.1.0.s390x.xml create mode 100644 tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml diff --git a/tests/domaincapsdata/qemu_9.1.0.s390x.xml b/tests/domaincapsdata/qemu_9.1.0.s390x.xml new file mode 100644 index 0000000000..cd896ceffd --- /dev/null +++ b/tests/domaincapsdata/qemu_9.1.0.s390x.xml @@ -0,0 +1,306 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-s390x</path> + <domain>kvm</domain> + <machine>s390-ccw-virtio-9.1</machine> + <arch>s390x</arch> + <vcpu max='248'/> + <iothreads supported='yes'/> + <os supported='yes'> + <enum name='firmware'/> + <loader supported='yes'> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> + <enum name='type'> + <value>rom</value> + <value>pflash</value> + </enum> + <enum name='readonly'> + <value>yes</value> + <value>no</value> + </enum> + <enum name='secure'> + <value>no</value> + </enum> + </loader> + </os> + <cpu> + <mode name='host-passthrough' supported='yes'> + <enum name='hostPassthroughMigratable'> + <value>off</value> + </enum> + </mode> + <mode name='maximum' supported='yes'> + <enum name='maximumMigratable'> + <value>on</value> + <value>off</value> + </enum> + </mode> + <mode name='host-model' supported='yes'> + <model fallback='forbid'>gen16a-base</model> + <feature policy='require' name='nnpa'/> + <feature policy='require' name='aen'/> + <feature policy='require' name='cmmnt'/> + <feature policy='require' name='vxpdeh'/> + <feature policy='require' name='aefsi'/> + <feature policy='require' name='diag318'/> + <feature policy='require' name='csske'/> + <feature policy='require' name='mepoch'/> + <feature policy='require' name='msa9'/> + <feature policy='require' name='msa8'/> + <feature policy='require' name='msa7'/> + <feature policy='require' name='msa6'/> + <feature policy='require' name='msa5'/> + <feature policy='require' name='msa4'/> + <feature policy='require' name='msa3'/> + <feature policy='require' name='msa2'/> + <feature policy='require' name='msa1'/> + <feature policy='require' name='sthyi'/> + <feature policy='require' name='edat'/> + <feature policy='require' name='ri'/> + <feature policy='require' name='deflate'/> + <feature policy='require' name='edat2'/> + <feature policy='require' name='etoken'/> + <feature policy='require' name='vx'/> + <feature policy='require' name='ipter'/> + <feature policy='require' name='pai'/> + <feature policy='require' name='paie'/> + <feature policy='require' name='mepochptff'/> + <feature policy='require' name='ap'/> + <feature policy='require' name='vxeh'/> + <feature policy='require' name='vxpd'/> + <feature policy='require' name='esop'/> + <feature policy='require' name='msa9_pckmo'/> + <feature policy='require' name='vxeh2'/> + <feature policy='require' name='esort'/> + <feature policy='require' name='appv'/> + <feature policy='require' name='apqi'/> + <feature policy='require' name='apft'/> + <feature policy='require' name='els'/> + <feature policy='require' name='iep'/> + <feature policy='require' name='appvi'/> + <feature policy='require' name='apqci'/> + <feature policy='require' name='cte'/> + <feature policy='require' name='ais'/> + <feature policy='require' name='bpb'/> + <feature policy='require' name='ctop'/> + <feature policy='require' name='gs'/> + <feature policy='require' name='ppa15'/> + <feature policy='require' name='zpci'/> + <feature policy='require' name='rdp'/> + <feature policy='require' name='sea_esop2'/> + <feature policy='require' name='beareh'/> + <feature policy='require' name='te'/> + <feature policy='require' name='cmm'/> + <feature policy='require' name='vxpdeh2'/> + </mode> + <mode name='custom' supported='yes'> + <model usable='yes' vendor='IBM'>z13</model> + <model usable='yes' vendor='IBM'>z990.3</model> + <model usable='yes' vendor='IBM'>z13-base</model> + <model usable='yes' vendor='IBM'>z990.2</model> + <model usable='yes' vendor='IBM'>z196.2-base</model> + <model usable='yes' vendor='IBM'>z14</model> + <model usable='yes' vendor='IBM'>z14.2-base</model> + <model usable='yes' vendor='IBM'>z990.4</model> + <model usable='yes' vendor='IBM'>z196</model> + <model usable='yes' vendor='IBM'>z10BC.2-base</model> + <model usable='yes' vendor='IBM'>z114-base</model> + <model usable='yes' vendor='IBM'>gen16b</model> + <model usable='yes' vendor='IBM'>z890.3-base</model> + <model usable='yes' vendor='IBM'>gen16a</model> + <model usable='yes' vendor='IBM'>z990.5</model> + <model usable='yes' vendor='IBM'>z196.2</model> + <model usable='yes' vendor='IBM'>zEC12</model> + <model usable='yes' vendor='IBM'>zEC12.2</model> + <model usable='yes' vendor='IBM'>z9EC.2</model> + <model usable='yes' vendor='IBM'>z9BC</model> + <model usable='yes' vendor='IBM'>z9EC.3-base</model> + <model usable='yes' vendor='IBM'>z800-base</model> + <model usable='yes' vendor='IBM'>z14ZR1-base</model> + <model usable='yes' vendor='IBM'>z890</model> + <model usable='yes' vendor='IBM'>z990.4-base</model> + <model usable='yes' vendor='IBM'>z9EC.3</model> + <model usable='yes' vendor='IBM'>z13.2</model> + <model usable='yes' vendor='IBM'>z10BC.2</model> + <model usable='yes' vendor='IBM'>gen15a-base</model> + <model usable='yes' vendor='IBM'>z14.2</model> + <model usable='yes' vendor='IBM'>zBC12-base</model> + <model usable='yes' vendor='IBM'>gen16a-base</model> + <model usable='yes' vendor='IBM'>z900.3</model> + <model usable='yes' vendor='IBM'>z196-base</model> + <model usable='yes' vendor='IBM'>z990</model> + <model usable='yes' vendor='IBM'>z14-base</model> + <model usable='yes' vendor='IBM'>z900.2</model> + <model usable='yes' vendor='IBM'>z800</model> + <model usable='yes' vendor='IBM'>z10EC</model> + <model usable='yes' vendor='IBM'>z10EC.2</model> + <model usable='yes' vendor='IBM'>z14ZR1</model> + <model usable='yes' vendor='IBM'>z900</model> + <model usable='yes' vendor='IBM'>z10EC.2-base</model> + <model usable='yes' vendor='IBM'>z900.2-base</model> + <model usable='yes' vendor='IBM'>z900-base</model> + <model usable='yes' vendor='IBM'>z10EC.3</model> + <model usable='yes' vendor='IBM'>z990.5-base</model> + <model usable='yes' vendor='unknown'>max</model> + <model usable='yes' vendor='IBM'>gen15b</model> + <model usable='yes' vendor='IBM'>z9BC.2-base</model> + <model usable='yes' vendor='IBM'>gen15a</model> + <model usable='yes' vendor='IBM'>z990.2-base</model> + <model usable='yes' vendor='IBM'>z10EC-base</model> + <model usable='yes' vendor='IBM'>gen16b-base</model> + <model usable='yes' vendor='IBM'>z114</model> + <model usable='yes' vendor='IBM'>z9EC-base</model> + <model usable='yes' vendor='IBM'>z13s</model> + <model usable='yes' vendor='unknown'>qemu</model> + <model usable='yes' vendor='IBM'>gen15b-base</model> + <model usable='yes' vendor='IBM'>zEC12-base</model> + <model usable='yes' vendor='IBM'>z890.3</model> + <model usable='yes' vendor='IBM'>z10EC.3-base</model> + <model usable='yes' vendor='IBM'>z890.2-base</model> + <model usable='yes' vendor='IBM'>z890.2</model> + <model usable='yes' vendor='IBM'>z10BC-base</model> + <model usable='yes' vendor='IBM'>zEC12.2-base</model> + <model usable='yes' vendor='IBM'>z890-base</model> + <model usable='yes' vendor='IBM'>z9BC-base</model> + <model usable='yes' vendor='IBM'>z10BC</model> + <model usable='yes' vendor='IBM'>z9EC</model> + <model usable='yes' vendor='IBM'>z9EC.2-base</model> + <model usable='yes' vendor='IBM'>z900.3-base</model> + <model usable='yes' vendor='IBM'>z13.2-base</model> + <model usable='yes' vendor='IBM'>z990.3-base</model> + <model usable='yes' vendor='IBM'>z13s-base</model> + <model usable='yes' vendor='IBM'>zBC12</model> + <model usable='yes' vendor='IBM'>z990-base</model> + <model usable='yes' vendor='IBM'>z9BC.2</model> + </mode> + </cpu> + <memoryBacking supported='yes'> + <enum name='sourceType'> + <value>file</value> + <value>anonymous</value> + <value>memfd</value> + </enum> + </memoryBacking> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + <value>floppy</value> + <value>lun</value> + </enum> + <enum name='bus'> + <value>fdc</value> + <value>scsi</value> + <value>virtio</value> + <value>usb</value> + </enum> + <enum name='model'> + <value>virtio</value> + <value>virtio-transitional</value> + <value>virtio-non-transitional</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + <value>egl-headless</value> + <value>dbus</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>virtio</value> + <value>none</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <enum name='startupPolicy'> + <value>default</value> + <value>mandatory</value> + <value>requisite</value> + <value>optional</value> + </enum> + <enum name='subsysType'> + <value>usb</value> + <value>pci</value> + <value>scsi</value> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>default</value> + <value>vfio</value> + </enum> + </hostdev> + <rng supported='yes'> + <enum name='model'> + <value>virtio</value> + <value>virtio-transitional</value> + <value>virtio-non-transitional</value> + </enum> + <enum name='backendModel'> + <value>random</value> + <value>egd</value> + <value>builtin</value> + </enum> + </rng> + <filesystem supported='yes'> + <enum name='driverType'> + <value>path</value> + <value>handle</value> + <value>virtiofs</value> + </enum> + </filesystem> + <tpm supported='no'/> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> + <crypto supported='yes'> + <enum name='model'> + <value>virtio</value> + </enum> + <enum name='type'> + <value>qemu</value> + </enum> + <enum name='backendModel'> + <value>builtin</value> + <value>lkcf</value> + </enum> + </crypto> + <interface supported='yes'> + <enum name='backendType'> + <value>default</value> + <value>passt</value> + </enum> + </interface> + </devices> + <features> + <gic supported='no'/> + <vmcoreinfo supported='no'/> + <genid supported='no'/> + <backingStoreInput supported='yes'/> + <backup supported='yes'/> + <async-teardown supported='yes'/> + <s390-pv supported='yes'/> + <ps2 supported='no'/> + <sev supported='no'/> + <sgx supported='no'/> + <launchSecurity supported='yes'> + <enum name='sectype'> + <value>s390-pv</value> + </enum> + </launchSecurity> + </features> +</domainCapabilities> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies new file mode 100644 index 0000000000..4e54acb5b1 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies @@ -0,0 +1,36291 @@ [...] diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml new file mode 100644 index 0000000000..50e9a60a1f --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -0,0 +1,3748 @@ [...] diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index f707121c47..d2a1f5acf1 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -643,40 +643,33 @@ mymain(void) "chardev-remove", QMP_OK, "query-fdsets", "{\"return\": []}"); DO_TEST_ATTACH("s390x", "base-ccw-live", "ccw-virtio", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); DO_TEST_DETACH("s390x", "base-ccw-live", "ccw-virtio", false, false, "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK, - "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); DO_TEST_ATTACH("s390x", "base-ccw-live-with-ccw-virtio", "ccw-virtio-2", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); DO_TEST_DETACH("s390x", "base-ccw-live-with-ccw-virtio", "ccw-virtio-2", false, false, "device_del", QMP_DEVICE_DELETED("virtio-disk0") QMP_OK, - "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); DO_TEST_ATTACH("s390x", "base-ccw-live-with-ccw-virtio", "ccw-virtio-2-explicit", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); DO_TEST_DETACH("s390x", "base-ccw-live-with-ccw-virtio", "ccw-virtio-2-explicit", false, false, "device_del", QMP_DEVICE_DELETED("virtio-disk0") QMP_OK, - "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); /* Attach a second device, then detach the first one. Then attach the first one again. */ DO_TEST_ATTACH("s390x", "base-ccw-live-with-ccw-virtio", "ccw-virtio-2-explicit", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); @@ -685,7 +678,6 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK); DO_TEST_ATTACH("s390x", "base-ccw-live-with-2-ccw-virtio", "ccw-virtio-1-reverse", false, false, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); diff --git a/tests/qemuxmlconfdata/console-sclp.s390x-latest.args b/tests/qemuxmlconfdata/console-sclp.s390x-latest.args index 3e0456b4a2..09c0df6954 100644 --- a/tests/qemuxmlconfdata/console-sclp.s390x-latest.args +++ b/tests/qemuxmlconfdata/console-sclp.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -chardev pty,id=charconsole0 \ -device '{"driver":"sclpconsole","chardev":"charconsole0","id":"console0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args index 7077028dbd..547243529a 100644 --- a/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=on \ -device '{"driver":"virtio-serial-ccw","id":"virtio-serial0","devno":"fe.0.0001"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -chardev pty,id=charconsole0 \ -device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args index b3f55e8a21..1c1a1066e4 100644 --- a/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-s/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-default-video-type-s/master-key.aes"}' \ -machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ --cpu gen15a-base,aen=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,deflate=on,etoken=on,vx=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on \ +-cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,appv=on,apqi=on,apft=on,els=on,iep=on,appvi=on,apqci=on,cte=on,ais=on,bpb=on,ctop=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ -m size=1048576k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":1073741824}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args b/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args index 47f485bab0..6c32bd7af6 100644 --- a/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args +++ b/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args @@ -26,18 +26,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw","file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"0.0.0007","drive":"libvirt-4-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest4","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-3-format","id":"virtio-disk1"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0001","drive":"libvirt-2-format","id":"virtio-disk2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.2.f00f","drive":"libvirt-1-format","id":"virtio-disk3"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-4-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"0.0.0007","drive":"libvirt-4-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest4","node-name":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-3-storage","id":"virtio-disk1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0001","drive":"libvirt-2-storage","id":"virtio-disk2"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.2.f00f","drive":"libvirt-1-storage","id":"virtio-disk3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.000a"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args index 5456a25c8f..546637a943 100644 --- a/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args @@ -26,12 +26,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"0.0.0007","drive":"libvirt-1-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-2-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"0.0.0007","drive":"libvirt-1-storage","id":"virtio-disk1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.000a"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args b/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args index 3a8bf53390..ee4f86ce61 100644 --- a/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args +++ b/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args @@ -26,10 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"zpci","uid":25,"fid":31,"target":"virtio-disk0","id":"zpci25"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args b/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args index 2fb3203b9c..c7353dd8e4 100644 --- a/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \ -device '{"driver":"virtio-9p-ccw","id":"fs0","fsdev":"fsdev-fs0","mount_tag":"/import/from/host","devno":"fe.0.0001"}' \ -fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,path=/export/to/guest2 \ diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args index 1668c6634d..bce866221a 100644 --- a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -no-shutdown \ -boot strict=on \ -device '{"driver":"virtio-scsi-ccw","id":"scsi0","devno":"fe.0.0001"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vhost-scsi-ccw","wwpn":"naa.5123456789abcde0","vhostfd":"3","id":"hostdev0","devno":"fe.0.0002"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0003"}' \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args index 69f2679f6f..d69ebfc8fd 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args +++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-KVMGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-KVMGuest1/master-key.aes"}' \ -machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ --cpu gen15a-base,aen=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,deflate=on,etoken=on,vx=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on \ +-cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,appv=on,apqi=on,apft=on,els=on,iep=on,appvi=on,apqci=on,cte=on,ais=on,bpb=on,ctop=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args index 7cf73299f6..fc32804695 100644 --- a/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -device '{"driver":"virtio-keyboard-ccw","id":"input0","devno":"fe.0.0002"}' \ -device '{"driver":"virtio-mouse-ccw","id":"input1","devno":"fe.0.0003"}' \ -device '{"driver":"virtio-tablet-ccw","id":"input2","devno":"fe.0.0004"}' \ diff --git a/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args index ed7971d632..953edb5445 100644 --- a/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -29,12 +29,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=on \ -device '{"driver":"virtio-scsi-ccw","iothread":"iothread2","id":"scsi0","devno":"fe.0.0001"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-ccw","iothread":"iothread1","devno":"fe.0.0000","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":2,"lun":0,"device_id":"drive-scsi0-0-2-0","drive":"libvirt-1-format","id":"scsi0-0-2-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","iothread":"iothread1","devno":"fe.0.0000","drive":"libvirt-2-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":2,"lun":0,"device_id":"drive-scsi0-0-2-0","drive":"libvirt-1-storage","id":"scsi0-0-2-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.000a"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args index 5c042913a1..4f052238e9 100644 --- a/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args +++ b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram,confidential-guest-support=lsec0 \ -accel kvm \ --cpu gen15a-base,aen=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,deflate=on,etoken=on,vx=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on \ +-cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,appv=on,apqi=on,apft=on,els=on,iep=on,appvi=on,apqci=on,cte=on,ais=on,bpb=on,ctop=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ -overcommit mem-lock=off \ @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \ -object '{"qom-type":"s390-pv-guest","id":"lsec0"}' \ diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args b/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args index de274c6336..3c17b8cb3b 100644 --- a/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args index de274c6336..3c17b8cb3b 100644 --- a/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args b/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args index fb9b8fdc7a..583885e470 100644 --- a/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args index fb9b8fdc7a..583885e470 100644 --- a/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args b/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args index 4ffb2f3609..6270b7e43a 100644 --- a/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args index 4ffb2f3609..6270b7e43a 100644 --- a/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args b/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args index bb79e9e886..c0104970b5 100644 --- a/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args index bb79e9e886..c0104970b5 100644 --- a/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args index 516768833a..10594504bc 100644 --- a/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args b/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args index 516768833a..10594504bc 100644 --- a/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args index 1e651e7870..411b62f3ee 100644 --- a/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args @@ -26,12 +26,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0002","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0003","drive":"libvirt-1-format","id":"virtio-disk1","bootindex":3}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0002","drive":"libvirt-2-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0003","drive":"libvirt-1-storage","id":"virtio-disk1","bootindex":3}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-ccw","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:54","bootindex":2,"devno":"fe.0.0000"}' \ -netdev '{"type":"user","id":"hostnet1"}' \ diff --git a/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args index b11d958117..896fc1e578 100644 --- a/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args index 14954d02a2..a6d8ba5952 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ --cpu gen15a-base,aen=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,deflate=on,etoken=on,vx=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on \ +-cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,appv=on,apqi=on,apft=on,els=on,iep=on,appvi=on,apqci=on,cte=on,ais=on,bpb=on,ctop=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ -m size=262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args b/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args index 09eff14e46..e56d48ac36 100644 --- a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ --cpu gen15a-base,aen=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,deflate=on,etoken=on,vx=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on \ +-cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,appv=on,apqi=on,apft=on,els=on,iep=on,appvi=on,apqci=on,cte=on,ais=on,bpb=on,ctop=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ -m size=262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/s390-panic.s390x-latest.args b/tests/qemuxmlconfdata/s390-panic.s390x-latest.args index e020a9f467..c5e4c9245e 100644 --- a/tests/qemuxmlconfdata/s390-panic.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-panic.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ --cpu gen15a-base,aen=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,deflate=on,etoken=on,vx=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on \ +-cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,appv=on,apqi=on,apft=on,els=on,iep=on,appvi=on,apqci=on,cte=on,ais=on,bpb=on,ctop=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ -m size=262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args b/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args index f7bc39111f..72ca38c305 100644 --- a/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -chardev socket,id=chr-vu-fs0,path=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/fs0-fs.sock \ -device '{"driver":"vhost-user-fs-ccw","id":"fs0","chardev":"chr-vu-fs0","tag":"mount_tag","devno":"fe.0.0001"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args index 928686ebac..ed9714cec7 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args index 4fec97f50e..f7c7371648 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args index 9d2cd4e125..f56ba3b919 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args index fbb07325b1..935aa07144 100644 --- a/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args @@ -25,9 +25,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=audio1 \ -device '{"driver":"virtio-gpu-ccw","id":"video0","max_outputs":1,"devno":"fe.0.0001"}' \ diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args index 4e186b3452..1da8f0ab68 100644 --- a/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args @@ -25,9 +25,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=audio1 \ -device '{"driver":"virtio-gpu-ccw","id":"video0","max_outputs":1,"devno":"fe.0.0002"}' \ diff --git a/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args b/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args index 69bdfc8ac3..fe120c9b9c 100644 --- a/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=on \ -device '{"driver":"virtio-serial-ccw","id":"virtio-serial0","devno":"fe.0.0001"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -chardev pty,id=charconsole0 \ -device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args b/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args index bc848b8e82..f4f9ec15fb 100644 --- a/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args +++ b/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"diag288","id":"watchdog0"}' \ -watchdog-action inject-nmi \ -- 2.44.0

3 3

SEV start VM help
by 435285706＠qq.com 25 Oct '24

25 Oct '24

Hi, I'm new to libvirt. I recently tried to start a sev vm with secret injection, and the documentation on this is very good, could you provide me with the steps to start a VM with libvirt's SEV, or documentation on this, thank you very much!

1 0

[PATCH (RFC and a half?)] network: add rule to nftables backend that zeroes checksum of DHCP responses
by Laine Stump 24 Oct '24

24 Oct '24

Many long years ago (April 2010), soon after "vhost" in-kernel packet processing was added to the virtio-net driver, people running RHEL5 virtual machines with a virtio-net interface connected via a libvirt virtual network noticed that when vhost packet processing was enabled, their VMs could no longer get an IP address via DHCP - the guest was ignoring the DHCP response packets sent by the host. The (as danpb calls them) "gory details" of this are chronicled here: https://lists.isc.org/pipermail/dhcp-hackers/2010-April/001835.html but basically it was because the checksum of packets wasn't being fully computed on the host side (because the host had checksum offloading enabled and thought that it would be taken care of later, e.g. with NIC hardware), while these packets going from a tap device to a virtio-net NIC in a guest wouldn't get that service, and the packets would arrive with a "bad checksum". The "fix" for this ended up being that iptables added a new "--checksum-fill" action, and libvirt added an iptables rule for each virtual network to match DHCP response packets and perform --checksum-fill. In the meantime, the ISC DHCP package (which contains the dhclient program that had been rejecting the bad checksum packets) made a separate fix to their dhclient which caused it to accept packets anyway even if they didn't have a proper checksum (NB: that's not a full explanation, and possibly not accurate). The word at the time from those "in the know" was that the bad checksum problem was really specific to ISC's dhclient, and so once their fix was in use everywhere dhclient was used, the problem would be a thing of the past and the checksum fixup iptables rules would no longer be needed (but would otherwise be harmless if it was still there). Based on this information (and also due to the opinion that fixing the problem by having iptables modify the packet checksum was the wrong way to fix things), the nftables developers made the decision to not implement an equivalent to --checksum-fill in nftables. As a result, when I wrote the nftables firewall backend for libvirt virtual networks, it didn't add in any rule to "fix" broken UDP checksums (after all, that was fixed somewhere else 14 years ago, right???) Cut to last week, when Rich Jones was doing routine testing using Fedora 40 (the first Fedora release to use the nftables backend of libvirt's network driver by default) and a FreeBSD guest - for "some strange reason", the FreeBSD guest was unable to get an IP address from DHCP!! https://www.spinics.net/linux/fedora/libvirt-users/msg14356.html A few quick tests proved that it was the same old "bad checksum" problem from 2010 come back to haunt us. After some discussion with Phil Sutter and Eric Garver (nftables people), they suggested that, while nftables doesn't have an action that will *compute* the checksum of a packet, it *does* have an action that will set the checksum to 0, and that maybe we should try that. Then Phil tried it himself by manually adding such a rule to a running system, and verified that it did fix the issue at least for FreeBSD guests. So over the weekend I came up with a patch to add a checksum 0 rule to the rules setup for each virtual network. This is that patch. I have so far verified that this patch enables FreeBSD to receive the DHCP response and get an IP address, and that it hasn't *broken* this functionality for a random old Fedora image I had (Fedora 27!?!?! I really need to update my test images!!). Before pushing it I would like to verify that zeroing the checksum of DHCP response packets doesn't break any other guest, so I would appreciate the help of anyone who could build and install libvirt with this patch and let me know of both successes and failures of any guest to acquire an IP address with DHCP. Once I've received enough positive reports (and 0 negative reports!) then we can think about pushing this patch (and also backporting it downstream to Fedora 40) Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/network/network_nftables.c | 69 +++++++++++++++++++ .../forward-dev-linux.nftables | 16 +++++ .../isolated-linux.nftables | 16 +++++ .../nat-default-linux.nftables | 16 +++++ .../nat-ipv6-linux.nftables | 16 +++++ .../nat-ipv6-masquerade-linux.nftables | 16 +++++ .../nat-many-ips-linux.nftables | 16 +++++ .../nat-port-range-ipv6-linux.nftables | 16 +++++ .../nat-port-range-linux.nftables | 16 +++++ .../nat-tftp-linux.nftables | 16 +++++ .../route-default-linux.nftables | 16 +++++ 11 files changed, 229 insertions(+) diff --git a/src/network/network_nftables.c b/src/network/network_nftables.c index f8b5ab665d..5523207269 100644 --- a/src/network/network_nftables.c +++ b/src/network/network_nftables.c @@ -51,6 +51,7 @@ VIR_LOG_INIT("network.nftables"); #define VIR_NFTABLES_FWD_OUT_CHAIN "guest_output" #define VIR_NFTABLES_FWD_X_CHAIN "guest_cross" #define VIR_NFTABLES_NAT_POSTROUTE_CHAIN "guest_nat" +#define VIR_NFTABLES_MANGLE_POSTROUTE_CHAIN "postroute_mangle" /* we must avoid using the standard "filter" table as used by * iptables, as any subsequent attempts to use iptables commands will @@ -106,6 +107,10 @@ nftablesGlobalChain nftablesChains[] = { /* chains for NAT rules */ {NULL, VIR_NFTABLES_NAT_POSTROUTE_CHAIN, "{ type nat hook postrouting priority 100; policy accept; }"}, + + /* chain for "mangle" rules that modify packets (e.g. 0 out UDP checksums) */ + {NULL, VIR_NFTABLES_MANGLE_POSTROUTE_CHAIN, "{ type filter hook postrouting priority 0; policy accept; }"}, + }; @@ -644,6 +649,44 @@ nftablesAddDontMasquerade(virFirewall *fw, } +/** + * nftablesAddOutputFixUdpChecksum: + * + * Add a rule to @fw that will 0 out the checksum of udp packets + * output from @iface with destination port @port. + + * Zeroing the checksum of a UDP packet tells the receiving end "you + * don't need to validate the checksum", which is useful in cases + * where the host (sender) thinks that packet checksums will be + * computed elsewhere (and so leaves a partially computed checksum in + * the packet header) while the guest (receiver) thinks that the + * checksum has already been fully computed; in the meantime none of + * the code in between has actually finished computing the + * checksum. + * + * An example of this is DHCP response packets from host to + * guest. If the checksum of each of these packets isn't zeroed, then + * many guests (e.g. FreeBSD) will drop them with reason BAD CHECKSUM; + * if the packets arrive at those guests with a checksum of 0, they + * will happily accept the packet. + */ +static void +nftablesAddOutputFixUdpChecksum(virFirewall *fw, + const char *iface, + int port) +{ + g_autofree char *portstr = g_strdup_printf("%d", port); + + virFirewallAddCmd(fw, VIR_FIREWALL_LAYER_IPV4, + "insert", "rule", "ip", + VIR_NFTABLES_PRIVATE_TABLE, + VIR_NFTABLES_MANGLE_POSTROUTE_CHAIN, + "oif", iface, "udp", "dport", portstr, + "counter", "udp", "checksum", "set", "0", + NULL); +} + + static const char networkLocalMulticastIPv4[] = "224.0.0.0/24"; static const char networkLocalMulticastIPv6[] = "ff02::/16"; static const char networkLocalBroadcast[] = "255.255.255.255/32"; @@ -901,6 +944,30 @@ nftablesAddGeneralFirewallRules(virFirewall *fw, } +static void +nftablesAddChecksumFirewallRules(virFirewall *fw, + virNetworkDef *def) +{ + size_t i; + virNetworkIPDef *ipv4def; + + /* Look for the first IPv4 address that has dhcp or tftpboot + * defined. We support dhcp config on 1 IPv4 interface only. + */ + for (i = 0; (ipv4def = virNetworkDefGetIPByIndex(def, AF_INET, i)); i++) { + if (ipv4def->nranges || ipv4def->nhosts) + break; + } + + /* If we are doing local DHCP service on this network, add a rule + * that will fixup the checksum of DHCP response packets back to + * the guests. + */ + if (ipv4def) + nftablesAddOutputFixUdpChecksum(fw, def->bridge, 68); +} + + static int nftablesAddIPSpecificFirewallRules(virFirewall *fw, virNetworkDef *def, @@ -952,6 +1019,8 @@ nftablesAddFirewallRules(virNetworkDef *def, virFirewall **fwRemoval) return -1; } + nftablesAddChecksumFirewallRules(fw, def); + if (virFirewallApply(fw) < 0) return -1; diff --git a/tests/networkxml2firewalldata/forward-dev-linux.nftables b/tests/networkxml2firewalldata/forward-dev-linux.nftables index 8badb74beb..9dea1a88a4 100644 --- a/tests/networkxml2firewalldata/forward-dev-linux.nftables +++ b/tests/networkxml2firewalldata/forward-dev-linux.nftables @@ -156,3 +156,19 @@ daddr \ 224.0.0.0/24 \ counter \ return +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/isolated-linux.nftables b/tests/networkxml2firewalldata/isolated-linux.nftables index d1b4dac178..67ee0a2bf5 100644 --- a/tests/networkxml2firewalldata/isolated-linux.nftables +++ b/tests/networkxml2firewalldata/isolated-linux.nftables @@ -62,3 +62,19 @@ oif \ virbr0 \ counter \ accept +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-default-linux.nftables b/tests/networkxml2firewalldata/nat-default-linux.nftables index 28508292f9..951a5a6d60 100644 --- a/tests/networkxml2firewalldata/nat-default-linux.nftables +++ b/tests/networkxml2firewalldata/nat-default-linux.nftables @@ -142,3 +142,19 @@ daddr \ 224.0.0.0/24 \ counter \ return +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-ipv6-linux.nftables b/tests/networkxml2firewalldata/nat-ipv6-linux.nftables index d8a9ba706d..617ed8b753 100644 --- a/tests/networkxml2firewalldata/nat-ipv6-linux.nftables +++ b/tests/networkxml2firewalldata/nat-ipv6-linux.nftables @@ -200,3 +200,19 @@ oif \ virbr0 \ counter \ accept +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables b/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables index a7f09cda59..a710d0e296 100644 --- a/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables +++ b/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables @@ -272,3 +272,19 @@ daddr \ ff02::/16 \ counter \ return +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-many-ips-linux.nftables b/tests/networkxml2firewalldata/nat-many-ips-linux.nftables index b826fe6134..0be5fb7e65 100644 --- a/tests/networkxml2firewalldata/nat-many-ips-linux.nftables +++ b/tests/networkxml2firewalldata/nat-many-ips-linux.nftables @@ -366,3 +366,19 @@ daddr \ 224.0.0.0/24 \ counter \ return +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables b/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables index ceaed6fa40..7574356855 100644 --- a/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables +++ b/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables @@ -384,3 +384,19 @@ daddr \ ff02::/16 \ counter \ return +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-port-range-linux.nftables b/tests/networkxml2firewalldata/nat-port-range-linux.nftables index 1dc37a26ec..127536e4db 100644 --- a/tests/networkxml2firewalldata/nat-port-range-linux.nftables +++ b/tests/networkxml2firewalldata/nat-port-range-linux.nftables @@ -312,3 +312,19 @@ oif \ virbr0 \ counter \ accept +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/nat-tftp-linux.nftables b/tests/networkxml2firewalldata/nat-tftp-linux.nftables index 28508292f9..951a5a6d60 100644 --- a/tests/networkxml2firewalldata/nat-tftp-linux.nftables +++ b/tests/networkxml2firewalldata/nat-tftp-linux.nftables @@ -142,3 +142,19 @@ daddr \ 224.0.0.0/24 \ counter \ return +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 diff --git a/tests/networkxml2firewalldata/route-default-linux.nftables b/tests/networkxml2firewalldata/route-default-linux.nftables index 282c9542a5..be9c4f5439 100644 --- a/tests/networkxml2firewalldata/route-default-linux.nftables +++ b/tests/networkxml2firewalldata/route-default-linux.nftables @@ -56,3 +56,19 @@ oif \ virbr0 \ counter \ accept +nft \ +-ae insert \ +rule \ +ip \ +libvirt_network \ +postroute_mangle \ +oif \ +virbr0 \ +udp \ +dport \ +68 \ +counter \ +udp \ +checksum \ +set \ +0 -- 2.47.0

3 7

[PATCH v2 0/4] Report CPU model blockers in domain capabilities
by Jiri Denemark 24 Oct '24

24 Oct '24

Version 2: - avoid adding the same blocker more than once for each model Jiri Denemark (4): util: Introduce virStringListRemoveDuplicates domain_capabilities: Sort CPU models domain_capabilities: Report CPU blockers NEWS: Report CPU model blockers in domain capabilities NEWS.rst | 6 + docs/formatdomaincaps.rst | 56 +- src/conf/domain_capabilities.c | 49 ++ src/conf/domain_capabilities.h | 2 + src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 1 + src/util/virstring.c | 29 + src/util/virstring.h | 2 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 394 ++++++++-- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 649 +++++++++++++++-- .../qemu_5.2.0-virt.aarch64.xml | 56 +- tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 56 +- tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_5.2.0.s390x.xml | 122 ++-- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 394 ++++++++-- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 404 +++++++++-- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 681 +++++++++++++++-- .../qemu_6.0.0-virt.aarch64.xml | 56 +- tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 56 +- tests/domaincapsdata/qemu_6.0.0.s390x.xml | 122 ++-- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 404 +++++++++-- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 405 +++++++++-- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 682 ++++++++++++++++-- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 405 +++++++++-- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 404 +++++++++-- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 680 +++++++++++++++-- .../qemu_6.2.0-virt.aarch64.xml | 58 +- tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 58 +- tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 404 +++++++++-- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 404 +++++++++-- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 673 +++++++++++++++-- .../qemu_7.0.0-virt.aarch64.xml | 58 +- tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 58 +- tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 404 +++++++++-- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 368 ++++++++-- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 619 ++++++++++++++-- tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 368 ++++++++-- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 368 ++++++++-- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 511 +++++++++++-- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 511 +++++++++++-- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 368 ++++++++-- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 410 +++++++++-- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 559 ++++++++++++-- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 410 +++++++++-- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 496 +++++++++++-- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 570 +++++++++++++-- tests/domaincapsdata/qemu_8.1.0.s390x.xml | 282 ++++++-- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 496 +++++++++++-- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 496 +++++++++++-- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 562 +++++++++++++-- .../qemu_8.2.0-virt.aarch64.xml | 72 +- tests/domaincapsdata/qemu_8.2.0.aarch64.xml | 72 +- tests/domaincapsdata/qemu_8.2.0.s390x.xml | 280 +++++-- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 496 +++++++++++-- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 496 +++++++++++-- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 536 ++++++++++++-- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 496 +++++++++++-- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 524 ++++++++++++-- .../qemu_9.1.0-tcg-virt.riscv64.xml | 16 +- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 557 ++++++++++++-- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 524 ++++++++++++-- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 524 ++++++++++++-- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 557 ++++++++++++-- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 524 ++++++++++++-- 67 files changed, 18573 insertions(+), 2745 deletions(-) -- 2.47.0

3 6

[PATCH 0/2] network: avoid logging unnecessary and misleading errors when failing to unset a zone
by Laine Stump 24 Oct '24

24 Oct '24

While testing a recent patch that unsets the zone of bridge interfaces when a virtual network is stopped, a side effect was noticed: when firewalld reloaded its rules, this would result in an error log from libvirt complaining about attempting to unset the zone of an interface that wasn't in any zone. The two patches here fix that from different angles: * The first modifies the call to unsetZone so that it puts any error message returned from firewalld to libvirt into a virError object rather than logging it; this virError object is then silently discarded. * The second avoids even calling firewalld to unset the zone if it's just going to immediately be set again. This avoids an error message that would be logged directly by firewalld even if libvirt didn't log the message it received from firewalld. The combination of these two patches eliminate all misleading log messages about failed attempts to unset a zone. Laine Stump (2): network: ignore/don't log errors when unsetting firewalld zone network: don't unset the firewalld zone if it's going to be immediately re-set src/network/bridge_driver.c | 8 +++---- src/network/bridge_driver_linux.c | 10 +++++---- src/network/bridge_driver_nop.c | 4 +++- src/network/bridge_driver_platform.h | 3 ++- src/util/virfirewalld.c | 33 ++++++++++++++++++---------- src/util/virfirewalld.h | 2 +- 6 files changed, 38 insertions(+), 22 deletions(-) -- 2.47.0

2 3

[PATCH v2 00/20] maintainer updates (testing, gdbstub, plugins)
by Alex Bennée 23 Oct '24

23 Oct '24

This is an aggregation of three of my maintainer trees which you can also get from their respective branches (testing/next, gdbstub/next and plugins/next). I didn't include the plugins on the last post as I hadn't had a chance to do my sweep through patches before travelling. I've also updated MAINTAINERS to point at my next trees. For testing we have mostly tweaks and cleanups. I've included some tracepoints tweaks for cpu_loop_exit_atomic purely as there was no where else to but it. There are also some cleanups to the tsan support from Pierrick. The mipsel tweaks have already been applied directly to the tree. For gdbstub more cleanups as well as fixing some gdbstub breakage of the untested aarch64-be linux-user target. I've added a very basic some test to prevent silly regressions in the future. For plugins again more cleanups. The GDB trigger patch will probably not get merged and should be considered an experimental hack for now. The following still need review: plugins: add ability to register a GDB triggered callback tests/tcg: enable basic testing for aarch64_be-linux-user config/targets: update aarch64_be-linux-user gdb XML list MAINTAINERS: mention my gdbstub/next tree gitlab: make check-[dco|patch] a little more verbose scripts/ci: remove architecture checks for build-environment updates MAINTAINERS: mention my testing/next tree tests/docker: add NOFETCH env variable for testing MAINTAINERS: mention my plugins/next tree Alex Bennée (10): tests/docker: add NOFETCH env variable for testing MAINTAINERS: mention my testing/next tree scripts/ci: remove architecture checks for build-environment updates accel/tcg: add tracepoints for cpu_loop_exit_atomic gitlab: make check-[dco|patch] a little more verbose MAINTAINERS: mention my gdbstub/next tree config/targets: update aarch64_be-linux-user gdb XML list tests/tcg: enable basic testing for aarch64_be-linux-user MAINTAINERS: mention my plugins/next tree plugins: add ability to register a GDB triggered callback Gustavo Romero (2): tests/tcg/aarch64: Use raw strings for regexes in test-mte.py testing: Enhance gdb probe script Ilya Leoshkevich (2): tests/docker: Fix microblaze atomics tests/tcg/x86_64: Add cross-modifying code test Pierrick Bouvier (6): meson: hide tsan related warnings docs/devel: update tsan build documentation dockerfiles: fix default targets for debian-loongarch-cross meson: build contrib/plugins with meson contrib/plugins: remove Makefile for contrib/plugins plugins: fix qemu_plugin_reset MAINTAINERS | 3 + docs/devel/testing/main.rst | 26 +++++- configure | 23 ++--- Makefile | 10 --- configs/targets/aarch64_be-linux-user.mak | 2 +- meson.build | 14 ++- include/qemu/plugin-event.h | 1 + include/qemu/qemu-plugin.h | 16 ++++ plugins/plugin.h | 9 ++ accel/tcg/plugin-gen.c | 4 + accel/tcg/user-exec.c | 2 +- plugins/api.c | 18 ++++ plugins/core.c | 37 ++++++++ tests/tcg/aarch64_be/hello.c | 35 ++++++++ tests/tcg/plugins/mem.c | 11 ++- tests/tcg/x86_64/cross-modifying-code.c | 80 +++++++++++++++++ accel/tcg/ldst_atomicity.c.inc | 9 ++ .gitlab-ci.d/check-dco.py | 9 +- .gitlab-ci.d/check-patch.py | 9 +- accel/tcg/trace-events | 12 +++ contrib/plugins/Makefile | 87 ------------------- contrib/plugins/meson.build | 23 +++++ plugins/qemu-plugins.symbols | 1 + scripts/ci/setup/ubuntu/build-environment.yml | 2 - scripts/probe-gdb-support.py | 75 ++++++++-------- tests/docker/Makefile.include | 5 +- .../dockerfiles/debian-loongarch-cross.docker | 4 +- .../build-toolchain.sh | 8 ++ .../dockerfiles/debian-toolchain.docker | 7 ++ tests/tcg/Makefile.target | 7 +- tests/tcg/aarch64/gdbstub/test-mte.py | 4 +- tests/tcg/aarch64_be/Makefile.target | 17 ++++ tests/tcg/x86_64/Makefile.target | 4 + 33 files changed, 397 insertions(+), 177 deletions(-) create mode 100644 tests/tcg/aarch64_be/hello.c create mode 100644 tests/tcg/x86_64/cross-modifying-code.c delete mode 100644 contrib/plugins/Makefile create mode 100644 contrib/plugins/meson.build create mode 100644 tests/tcg/aarch64_be/Makefile.target -- 2.39.5

6 41

[PATCH v2 0/4] multiple memory backend support for CPR Live Updates
by mgalaxy＠akamai.com 23 Oct '24

23 Oct '24

From: Michael Galaxy <mgalaxy(a)akamai.com> CPR-based support for whole-hypervisor kexec-based live updates is now finally merged into QEMU. In support of this, we need NUMA to be supported in these kinds of environments. To do this we use a technology called PMEM (persistent memory) in Linux, which underpins the ability for CPR Live Updates to work so that QEMU memory can remain in RAM and be recovered after a kexec operationg has completed. Our systems are highly NUMA-aware, and so this patch series enables NUMA awareness for live updates. Further, we make a small change that allows live migrations to work between *non* PMEM-based systems and PMEM-based systems (and vice-versa). This allows for seemless upgrades from non-live-compatible systems to live-update-compatible sytems without any downtime. Michael Galaxy (4): qemu.conf changes to support multiple memory backend Support live migration between file-backed memory and anonymous memory. Update unit test to support multiple memory backends Update documentation to reflect memory_backing_dir change in qemu.conf NEWS.rst | 7 ++ docs/kbase/virtiofs.rst | 2 + src/qemu/qemu.conf.in | 2 + src/qemu/qemu_command.c | 8 ++- src/qemu/qemu_conf.c | 141 +++++++++++++++++++++++++++++++++++----- src/qemu/qemu_conf.h | 14 ++-- src/qemu/qemu_domain.c | 24 +++++-- src/qemu/qemu_driver.c | 29 +++++---- src/qemu/qemu_hotplug.c | 6 +- src/qemu/qemu_process.c | 44 +++++++------ src/qemu/qemu_process.h | 7 +- tests/testutilsqemu.c | 5 +- 12 files changed, 221 insertions(+), 68 deletions(-) -- 2.34.1

3 26

[PATCH v3 00/18] maintainer updates (testing, gdbstub, plugins) pre-PR
by Alex Bennée 23 Oct '24

23 Oct '24

This is an aggregation of three of my maintainer trees which you can also get from their respective branches (testing/next, gdbstub/next and plugins/next). It is now ready for a pull request. Since last post: - added r-b tags - some minor typo fixes - dropped meson plugin contrib build and gdb hook changes The last thing that still needs review: gitlab: make check-[dco|patch] a little more verbose Alex Bennée (9): tests/docker: add NOFETCH env variable for testing MAINTAINERS: mention my testing/next tree scripts/ci: remove architecture checks for build-environment updates accel/tcg: add tracepoints for cpu_loop_exit_atomic gitlab: make check-[dco|patch] a little more verbose MAINTAINERS: mention my gdbstub/next tree config/targets: update aarch64_be-linux-user gdb XML list tests/tcg: enable basic testing for aarch64_be-linux-user MAINTAINERS: mention my plugins/next tree Gustavo Romero (2): tests/tcg/aarch64: Use raw strings for regexes in test-mte.py testing: Enhance gdb probe script Ilya Leoshkevich (2): tests/docker: Fix microblaze atomics tests/tcg/x86_64: Add cross-modifying code test Pierrick Bouvier (5): meson: hide tsan related warnings docs/devel: update tsan build documentation dockerfiles: fix default targets for debian-loongarch-cross contrib/plugins: remove Makefile for contrib/plugins plugins: fix qemu_plugin_reset MAINTAINERS | 3 + docs/devel/testing/main.rst | 26 +++++- configure | 23 ++--- Makefile | 10 --- configs/targets/aarch64_be-linux-user.mak | 2 +- meson.build | 10 ++- accel/tcg/plugin-gen.c | 4 + accel/tcg/user-exec.c | 2 +- tests/tcg/aarch64_be/hello.c | 35 ++++++++ tests/tcg/x86_64/cross-modifying-code.c | 80 +++++++++++++++++ accel/tcg/ldst_atomicity.c.inc | 9 ++ .gitlab-ci.d/check-dco.py | 5 +- .gitlab-ci.d/check-patch.py | 5 +- accel/tcg/trace-events | 12 +++ contrib/plugins/Makefile | 87 ------------------- scripts/ci/setup/ubuntu/build-environment.yml | 2 - scripts/probe-gdb-support.py | 75 ++++++++-------- tests/docker/Makefile.include | 5 +- .../dockerfiles/debian-loongarch-cross.docker | 4 +- .../build-toolchain.sh | 8 ++ .../dockerfiles/debian-toolchain.docker | 7 ++ tests/tcg/Makefile.target | 7 +- tests/tcg/aarch64/gdbstub/test-mte.py | 4 +- tests/tcg/aarch64_be/Makefile.target | 17 ++++ tests/tcg/x86_64/Makefile.target | 4 + 25 files changed, 273 insertions(+), 173 deletions(-) create mode 100644 tests/tcg/aarch64_be/hello.c create mode 100644 tests/tcg/x86_64/cross-modifying-code.c delete mode 100644 contrib/plugins/Makefile create mode 100644 tests/tcg/aarch64_be/Makefile.target -- 2.39.5

2 19

[PATCH 0/9] qemu: Change CPU comparison algorithm for future models
by Jiri Denemark 23 Oct '24

23 Oct '24

When starting a domain we check whether the guest CPU definition is compatible with the host (i.e., when the host supports all features required both explicitly and by the specified CPU model) as long as check == 'partial', which is the default. We are doing so by checking our definition of the CPU model in the CPU map amending it with explicitly mentioned features and comparing it to features QEMU would enabled when started with -cpu host. But since our CPU model definitions often slightly differ from QEMU we may be checking features which are not actually needed and on the other hand not checking something that is part of the CPU model in QEMU. This patch changes the algorithm for CPU models added in the future (changing it for existing models could cause them to suddenly become incompatible with the host and domains using them would fail to start). The new algorithm uses information we probe from QEMU about features that block each model from being directly usable. If all those features are explicitly disabled in the CPU definition we consider the base model compatible with the host. Then we only need to check that all explicitly required features are supported by QEMU on the host to get the result for the whole CPU definition. After this we only use the model definitions (for newly added models) from CPU map for creating a CPU definition for host-model. Jiri Denemark (9): cpu_x86: Introduce <check> element for CPU models cpu_map: Use compat partial check for all x86 CPU models cpu: Introduce virCPUGetCheckMode qemu: Use g_autoptr in qemuConnectCompareHypervisorCPU qemu: Use virCPUCompare in qemuConnectCompareHypervisorCPU directly qemu: Separate partial CPU check into a function cpu: Introduce virCPUCompareUnusable qemu_capabilities: Introduce virQEMUCapsGetCPUBlockers qemu: Change CPU comparison algorithm for future models src/cpu/cpu.c | 104 ++++++++++++++++++ src/cpu/cpu.h | 17 +++ src/cpu/cpu_x86.c | 67 +++++++++++ src/cpu_map/x86_486.xml | 1 + src/cpu_map/x86_Broadwell-IBRS.xml | 1 + src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 1 + src/cpu_map/x86_Broadwell-noTSX.xml | 1 + src/cpu_map/x86_Broadwell.xml | 1 + src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 1 + src/cpu_map/x86_Cascadelake-Server.xml | 1 + src/cpu_map/x86_Conroe.xml | 1 + src/cpu_map/x86_Cooperlake.xml | 1 + src/cpu_map/x86_Dhyana.xml | 1 + src/cpu_map/x86_EPYC-Genoa.xml | 1 + src/cpu_map/x86_EPYC-IBPB.xml | 1 + src/cpu_map/x86_EPYC-Milan.xml | 1 + src/cpu_map/x86_EPYC-Rome.xml | 1 + src/cpu_map/x86_EPYC.xml | 1 + src/cpu_map/x86_GraniteRapids.xml | 1 + src/cpu_map/x86_Haswell-IBRS.xml | 1 + src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 1 + src/cpu_map/x86_Haswell-noTSX.xml | 1 + src/cpu_map/x86_Haswell.xml | 1 + src/cpu_map/x86_Icelake-Client-noTSX.xml | 1 + src/cpu_map/x86_Icelake-Client.xml | 1 + src/cpu_map/x86_Icelake-Server-noTSX.xml | 1 + src/cpu_map/x86_Icelake-Server.xml | 1 + src/cpu_map/x86_IvyBridge-IBRS.xml | 1 + src/cpu_map/x86_IvyBridge.xml | 1 + src/cpu_map/x86_Nehalem-IBRS.xml | 1 + src/cpu_map/x86_Nehalem.xml | 1 + src/cpu_map/x86_Opteron_G1.xml | 1 + src/cpu_map/x86_Opteron_G2.xml | 1 + src/cpu_map/x86_Opteron_G3.xml | 1 + src/cpu_map/x86_Opteron_G4.xml | 1 + src/cpu_map/x86_Opteron_G5.xml | 1 + src/cpu_map/x86_Penryn.xml | 1 + src/cpu_map/x86_SandyBridge-IBRS.xml | 1 + src/cpu_map/x86_SandyBridge.xml | 1 + src/cpu_map/x86_SapphireRapids.xml | 1 + src/cpu_map/x86_SierraForest.xml | 1 + src/cpu_map/x86_Skylake-Client-IBRS.xml | 1 + src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 1 + src/cpu_map/x86_Skylake-Client.xml | 1 + src/cpu_map/x86_Skylake-Server-IBRS.xml | 1 + src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 1 + src/cpu_map/x86_Skylake-Server.xml | 1 + src/cpu_map/x86_Snowridge.xml | 1 + src/cpu_map/x86_Westmere-IBRS.xml | 1 + src/cpu_map/x86_Westmere.xml | 1 + src/cpu_map/x86_athlon.xml | 1 + src/cpu_map/x86_core2duo.xml | 1 + src/cpu_map/x86_coreduo.xml | 1 + src/cpu_map/x86_cpu64-rhel5.xml | 1 + src/cpu_map/x86_cpu64-rhel6.xml | 1 + src/cpu_map/x86_kvm32.xml | 1 + src/cpu_map/x86_kvm64.xml | 1 + src/cpu_map/x86_n270.xml | 1 + src/cpu_map/x86_pentium.xml | 1 + src/cpu_map/x86_pentium2.xml | 1 + src/cpu_map/x86_pentium3.xml | 1 + src/cpu_map/x86_pentiumpro.xml | 1 + src/cpu_map/x86_phenom.xml | 1 + src/cpu_map/x86_qemu32.xml | 1 + src/cpu_map/x86_qemu64.xml | 1 + src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 38 +++++++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_domain.c | 65 +++++++++++ src/qemu/qemu_domain.h | 7 ++ src/qemu/qemu_driver.c | 45 ++++---- src/qemu/qemu_process.c | 7 +- 72 files changed, 390 insertions(+), 28 deletions(-) -- 2.47.0

2 10

[PATCH] ci: Move definition of exit codes allowed to fail for cirrus jobs
by Peter Krempa 23 Oct '24

23 Oct '24

Update with latest lcitool. Update the build templates to move the definition of exit codes which are allowed to fail for cirrus jobs for cases when we run out of CI minutes. The previous location was overridden with the per-job 'allow_failure' value and thus didn't apply. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Based on: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/510 example run: https://gitlab.com/libvirt/libvirt/-/pipelines/1508364775 ci/gitlab/build-templates.yml | 2 -- ci/gitlab/builds.yml | 9 ++++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index 31a901e47c..b1e41b0783 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -282,8 +282,6 @@ image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:latest interruptible: true needs: [] - allow_failure: - exit_codes: 3 script: - set -o allexport - source ci/cirrus/$NAME.vars diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 771fa67501..c24421378c 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -599,7 +599,8 @@ mingw64-fedora-rawhide: x86_64-freebsd-13: extends: .cirrus_build_job needs: [] - allow_failure: false + allow_failure: + exit_codes: 3 variables: CIRRUS_VM_IMAGE_NAME: freebsd-13-3 CIRRUS_VM_IMAGE_SELECTOR: image_family @@ -613,7 +614,8 @@ x86_64-freebsd-13: x86_64-freebsd-14: extends: .cirrus_build_job needs: [] - allow_failure: false + allow_failure: + exit_codes: 3 variables: CIRRUS_VM_IMAGE_NAME: freebsd-14-0 CIRRUS_VM_IMAGE_SELECTOR: image_family @@ -627,7 +629,8 @@ x86_64-freebsd-14: aarch64-macos-14: extends: .cirrus_build_job needs: [] - allow_failure: false + allow_failure: + exit_codes: 3 variables: CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma CIRRUS_VM_IMAGE_SELECTOR: image -- 2.47.0

2 1

[PATCH v2 0/6] ch: handle events from cloud-hypervisor
by Purna Pavan Chandra Aekkaladevi 23 Oct '24

23 Oct '24

changes from v1->v2: * Rebase on latest master * Use /* */ for comments * Remove fifo file if already exists * Address other comments from Praveen Paladugu cloud-hypervisor raises various events, including VM lifecylce operations such as boot, shutdown, pause, resume, etc. Libvirt will now read these events and take the necessary actions, such as correctly updating the domain state. A FIFO file is passed to `--event-monitor` option of cloud-hypervisor. Libvirt creates a new thread that acts as the reader of the fifo file and continuously monitors for new events. Currently, shutdown events are handled by updating the domain state appropriately. Purna Pavan Chandra Aekkaladevi (6): utils: Implement virFileIsNamedPipe ch: pass --event-monitor option to cloud-hypervisor ch: start a new thread for handling ch events ch: events: Read and parse cloud-hypervisor events ch: events: facilitate lifecycle events handling NEWS: Mention event handling support in ch driver NEWS.rst | 7 + po/POTFILES | 1 + src/ch/ch_events.c | 349 +++++++++++++++++++++++++++++++++++++++ src/ch/ch_events.h | 54 ++++++ src/ch/ch_monitor.c | 52 +++++- src/ch/ch_monitor.h | 11 ++ src/ch/meson.build | 2 + src/libvirt_private.syms | 1 + src/util/virfile.c | 8 + src/util/virfile.h | 1 + 10 files changed, 479 insertions(+), 7 deletions(-) create mode 100644 src/ch/ch_events.c create mode 100644 src/ch/ch_events.h -- 2.34.1

2 10

[PATCH (pushed)] ci: Regenerate with latest lcitool to pick up 'cirrus-ci' out of credit detection
by Peter Krempa 22 Oct '24

22 Oct '24

Allow the cirrus jobs to fail on return code '3' which is emitted if we've run out of credits. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as CI fix. ci/gitlab/build-templates.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index b1e41b0783..31a901e47c 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -282,6 +282,8 @@ image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:latest interruptible: true needs: [] + allow_failure: + exit_codes: 3 script: - set -o allexport - source ci/cirrus/$NAME.vars -- 2.47.0

1 0

[PATCH v2 0/3] util/xml: make xml parser error reporting less terrible
by Daniel P. Berrangé 22 Oct '24

22 Oct '24

libxml2 has terrible error reporting when failing to open files, which has led to significant wasted time on wild goose chases. This improves it by taking libxml2 out of the business of opening & reading files. Daniel P. Berrangé (3): util/xml: fix extraction of XML context util/xml: don't assume libxml2 has the filename of the document util/xml: open XML files before calling libxml2 src/util/virxml.c | 29 +++++++++++++------ .../broken-xml-invalid.x86_64-latest.err | 4 +-- .../nonexistent-file.x86_64-latest.err | 2 +- 3 files changed, 23 insertions(+), 12 deletions(-) -- 2.46.0

3 7

[PATCH] docs: permit a user's chosen identity with SoB
by Daniel P. Berrangé 22 Oct '24

22 Oct '24

The docs for submitting a patch describe using your "Legal Name" with the Signed-off-by line. In recent times, there's been a general push back[1] against the notion that use of Signed-off-by in a project automatically requires / implies the use of legal ("real") names and greater awareness of the downsides. Full discussion of the problems of such policies is beyond the scope of this commit message, but at a high level they are liable to marginalize, disadvantage, and potentially result in harm, to contributors. TL;DR: there are compelling reasons for a person to choose distinct identities in different contexts & a decision to override that choice should not be taken lightly. A number of key projects have responded to the issues raised by making it clear that a contributor is free to determine the identity used in SoB lines: * Linux has clarified[2] that they merely expect use of the contributor's "known identity", removing the previous explicit rejection of pseudonyms. * CNCF has clarified[3] that the real name is simply the identity the contributor chooses to use in the context of the community and does not have to be a legal name, nor birth name, nor appear on any government ID. Since we have no intention of ever routinely checking any form of ID documents for contributors[4], realistically we have no way of knowing anything about the name they are using, except through chance, or through the contributor volunteering the information. IOW, we almost certainly already have people using pseudonyms for contributions. This proposes to accept that reality and eliminate unnecessary friction, by following Linux & the CNCF in merely asking that a contributors' commonly known identity, of their choosing, be used with the SoB line. [1] Raised in many contexts at many times, but a decent overall summary can be read at https://drewdevault.com/2023/10/31/On-real-names.html [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… [3] https://github.com/cncf/foundation/blob/659fd32c86dc/dco-guidelines.md [4] Excluding the rare GPG key signing parties for regular maintainers Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/governance.rst | 6 +++--- docs/hacking.rst | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/docs/governance.rst b/docs/governance.rst index 44dd54d4a0..04bb739237 100644 --- a/docs/governance.rst +++ b/docs/governance.rst @@ -112,9 +112,9 @@ There are no special requirements to becoming a contributor other than having the interest and ability to provide a contribution. The libvirt project **does not require** any *"Contributor License Agreement"* to be signed prior to engagement with the community. However for contributing patches, providing a -'Signed-off-by' line with the author's legal name and e-mail address to -demonstrate agreement and compliance with the `Developer Certificate of -Origin <https://developercertificate.org/>`__ is required. +'Signed-off-by' line with the author's chosen name and e-mail address to +demonstrate agreement and compliance with the `Developer Certificate +of Origin <hacking.html#developer-certificate-of-origin>`__ is required. In making a non-patch contribution to the project, the community member is implicitly stating that they accept the terms of the license under which the diff --git a/docs/hacking.rst b/docs/hacking.rst index c2e79e4501..825b8b83d2 100644 --- a/docs/hacking.rst +++ b/docs/hacking.rst @@ -83,9 +83,12 @@ Contributors to libvirt projects **must** assert that they are in compliance with the `Developer Certificate of Origin 1.1 <https://developercertificate.org/>`__. This is achieved by adding a "Signed-off-by" line containing the contributor's name -and e-mail to every commit message. The presence of this line -attests that the contributor has read the above lined DCO and -agrees with its statements. +and e-mail to every commit message. The name should be the identity +the contributor has chosen to be known as in the context of the +community. It does not need to be a legal name, nor match any +formal ID documents, but should not be anonymous, nor misrepresent +who you are. The presence of this line attests that the contributor +has read the above linked DCO and agrees with its statements. Further reading =============== -- 2.46.0

2 1

[PATCH v3 00/10] swtpm: Add support for profiles
by Stefan Berger 22 Oct '24

22 Oct '24

Upcoming libtpms v0.10 and swtpm v0.10 will have TPM profile support that allows to restrict a TPM's provided set of crypto algorithms and commands and through which backwards compatibility and migration from newer versions of libtpms to older ones (up to libtpms v0.9) is supported. For the latter to work it is necessary that the user chooses the right ('null') profile. This series adds support for passing a profile choice to swtpm_setup by setting it in the domain XML using the <profile/> XML node. An optional attribute 'remove_disabled' can be set in this node and accepts two values: "check": test a few crypto algorithms (tdes, camellia, unpadded encryption, and others) for whether they are currently disabled due to FIPS mode on the host and remove these algorithms in the 'custom' profile if they are disabled; "fips-host": do not test but remove all the possibly disabled crypto algorithms (from list above) Also extend the documentation but point the user to swtpm and libtpms documentation for further details. Follow Deniel's suggestions there's now a PR for swtpm_setup to support searching for profiles though a configurable local directory, distro directory and if no profile could be found there (with appended ".json" suffix) it will fall back to try to use a built-in profile by the provided name: https://github.com/stefanberger/swtpm/pull/918 Stefan v3: - 2/10: Adjustments to due rebase - Applied Marc-André's R-b tags - 10/10: Read back profile name from swtpm and adjust it in emulator defs Stefan Berger (10): conf: Move TPM emulator parameters into own struct qemu: Pass virQEMUDriverConfig rather than some of its fields util: Add parsing support for swtpm_setup's cmdarg-profile capability conf: Define enum virDomainTPMProfileRemoveDisabled schema: Extend schema for TPM emulator profile node conf: Add support for profile parameter on TPM emulator in domain XML docs: Add documentation for the TPM backend profile node qemu: Extend swtpm_setup command line to set a profile by its name qemu: Move adding of keys to swtpm command line into own function qemu: Read the profile name after creation of TPM instance docs/formatdomain.rst | 30 +++ src/conf/domain_conf.c | 43 +++++ src/conf/domain_conf.h | 35 ++-- src/conf/domain_validate.c | 7 + src/conf/schemas/domaincommon.rng | 25 +++ src/conf/virconftypes.h | 2 + src/qemu/qemu_extdevice.c | 5 +- src/qemu/qemu_tpm.c | 310 ++++++++++++++++++++---------- src/qemu/qemu_tpm.h | 3 +- src/util/virtpm.c | 2 + src/util/virtpm.h | 2 + tests/testutilsqemu.c | 1 + 12 files changed, 355 insertions(+), 110 deletions(-) -- 2.47.0

3 13

Help with setting up libvirt for development.
by validsudoku＠gmail.com 22 Oct '24

22 Oct '24

Hi, pardon my ignorance. I'm trying to add some changes to the libvirt codebase (https://gitlab.com/libvirt/libvirt) I've successfully built it with `meson setup /build` and a `compile_commands.json` was generated in the build folder. But vscode keeps showing that there are errors from trying to find certain files and identifiers. I have also copied the `compile_commands.json` to the root of the project with no success. I'm new to working on a large C codebase, as i'm mainly into Go. I have also installed the `meson.build` extension as prescribed in https://mesonbuild.com/IDE-integration.html, is there anything i'm missing?

2 1

[PATCH] spec: Drop nwfilter dependency in libvirt-daemon-xen
by Jim Fehlig 22 Oct '24

22 Oct '24

The libvirt xen driver does not support nwfilters. In fact, since commit d721b6840f, the driver rejects VM configuration referencing nwfilters. Drop the needless nwfilter dependency from libvirt-daemon-xen. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- libvirt.spec.in | 1 - 1 file changed, 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f26de04553..d54d2a1e3e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -993,7 +993,6 @@ Requires: libvirt-daemon-driver-libxl = %{version}-%{release} Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} -Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: xen -- 2.43.0

2 1

Re: [PATCH v4 3/6] schema: add TPM emulator <source type='file' path='..'>
by Stefan Berger 22 Oct '24

22 Oct '24

> > Learn to parse a file path for the TPM state. > > Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> > --- > docs/formatdomain.rst | 19 ++++++++++++++ > src/conf/domain_conf.c | 28 +++++++++++++++++++++ > src/conf/domain_conf.h | 9 +++++++ > src/conf/schemas/domaincommon.rng | 14 +++++++++++ > tests/qemuxmlconfdata/tpm-emulator-tpm2.xml | 1 + > 5 files changed, 71 insertions(+) > > diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst > index e6f09a728f..d4feb4421c 100644 > --- a/docs/formatdomain.rst > +++ b/docs/formatdomain.rst > @@ -8174,6 +8174,25 @@ Example: usage of the TPM Emulator > The default version used depends on the combination of hypervisor, > guest > architecture, TPM model and backend. > > +``source`` > + The ``source`` element specifies the location of the TPM state > storage . This > + element only works with the ``emulator`` backend. > + > + If not specified, the storage configuration is left to libvirt > discretion. IMO it would be good to mention that it is up to the user to prevent files being used by multiple VMs, especially if locking cannot be used. > + > + This element requires that swtpm v0.7 or later is installed. > + > + The following attributes are supported: > + > + ``type`` > + The type of storage. It's possible to provide "file" to utilize a > single > + file or block device where the TPM state will be stored. > + > + ``path`` > + The path to the TPM state storage. > + > + :since:`Since v10.8.0` > + > ``persistent_state`` > The ``persistent_state`` attribute indicates whether 'swtpm' TPM > state is > kept or not when a transient domain is powered off or undefined. This > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c > index 284a3815b3..9dd8b6b55d 100644 > --- a/src/conf/domain_conf.c > +++ b/src/conf/domain_conf.c > @@ -1322,6 +1322,12 @@ VIR_ENUM_IMPL(virDomainTPMVersion, > "2.0", > ); > > +VIR_ENUM_IMPL(virDomainTPMSourceType, > + VIR_DOMAIN_TPM_SOURCE_TYPE_LAST, > + "default", > + "file", > +); > + > VIR_ENUM_IMPL(virDomainTPMPcrBank, > VIR_DOMAIN_TPM_PCR_BANK_LAST, > "sha1", > @@ -10784,6 +10790,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, > int nbackends; > int nnodes; > size_t i; > + xmlNodePtr source_node = NULL; > g_autofree char *path = NULL; > g_autofree char *secretuuid = NULL; > g_autofree char *persistent_state = NULL; > @@ -10857,6 +10864,22 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, > def->data.emulator.hassecretuuid = true; > } > > + source_node = virXPathNode("./backend/source", ctxt); > + if (source_node) { > + if (virXMLPropEnum(source_node, "type", > + virDomainTPMSourceTypeTypeFromString, > + VIR_XML_PROP_NONZERO, > + &def->data.emulator.source_type) < 0) > + goto error; > + path = virXMLPropString(source_node, "path"); > + if (!path) { > + virReportError(VIR_ERR_XML_ERROR, "%s", > + _("missing TPM source path")); > + goto error; > + } > + def->data.emulator.source_path = g_steal_pointer(&path); > + } > + > persistent_state = virXMLPropString(backends[0], > "persistent_state"); > if (persistent_state) { > if (virStringParseYesNo(persistent_state, > @@ -25070,6 +25093,11 @@ virDomainTPMDefFormat(virBuffer *buf, > > virXMLFormatElement(&backendChildBuf, "active_pcr_banks", > NULL, &activePcrBanksBuf); > } > + if (def->data.emulator.source_type != > VIR_DOMAIN_TPM_SOURCE_TYPE_DEFAULT) { > + virBufferAsprintf(&backendChildBuf, "<source type='%s'", > + > virDomainTPMSourceTypeTypeToString(def->data.emulator.source_type)); > + virBufferEscapeString(&backendChildBuf, " path='%s'/>\n", > def->data.emulator.source_path); > + } > break; > case VIR_DOMAIN_TPM_TYPE_EXTERNAL: > if (def->data.external.source->type == VIR_DOMAIN_CHR_TYPE_UNIX) { > diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h > index 6b27322e3e..7a70f68177 100644 > --- a/src/conf/domain_conf.h > +++ b/src/conf/domain_conf.h > @@ -1463,6 +1463,13 @@ typedef enum { > VIR_DOMAIN_TPM_PCR_BANK_LAST > } virDomainPcrBank; > > +typedef enum { > + VIR_DOMAIN_TPM_SOURCE_TYPE_DEFAULT = 0, > + VIR_DOMAIN_TPM_SOURCE_TYPE_FILE, > + > + VIR_DOMAIN_TPM_SOURCE_TYPE_LAST > +} virDomainTPMSourceType; > + > #define VIR_DOMAIN_TPM_DEFAULT_DEVICE "/dev/tpm0" > > struct _virDomainTPMDef { > @@ -1478,6 +1485,7 @@ struct _virDomainTPMDef { > struct { > virDomainTPMVersion version; > virDomainChrSourceDef *source; > + virDomainTPMSourceType source_type; > char *source_path; > char *logfile; > unsigned int debug; > @@ -4277,6 +4285,7 @@ VIR_ENUM_DECL(virDomainRNGBackend); > VIR_ENUM_DECL(virDomainTPMModel); > VIR_ENUM_DECL(virDomainTPMBackend); > VIR_ENUM_DECL(virDomainTPMVersion); > +VIR_ENUM_DECL(virDomainTPMSourceType); > VIR_ENUM_DECL(virDomainTPMPcrBank); > VIR_ENUM_DECL(virDomainMemoryModel); > VIR_ENUM_DECL(virDomainMemoryBackingModel); > diff --git a/src/conf/schemas/domaincommon.rng > b/src/conf/schemas/domaincommon.rng > index efb5f00d77..72c8b6c694 100644 > --- a/src/conf/schemas/domaincommon.rng > +++ b/src/conf/schemas/domaincommon.rng > @@ -5923,6 +5923,7 @@ > <interleave> > <ref name="tpm-backend-emulator-encryption"/> > <ref name="tpm-backend-emulator-active-pcr-banks"/> > + <ref name="tpm-backend-emulator-source"/> > </interleave> > <optional> > <attribute name="persistent_state"> > @@ -5981,6 +5982,19 @@ > </optional> > </define> > > + <define name="tpm-backend-emulator-source"> > + <optional> > + <element name="source"> > + <attribute name="type"> > + <value>file</value> > + </attribute> > + <attribute name="path"> > + <ref name="filePath"/> Should probably be absFilePath? With this nit: Reviewed-by: Stefan Berger <stefanb(a)linux.ibm.com> > + </attribute> > + </element> > + </optional> > + </define> > + > <define name="tpm-backend-emulator-encryption"> > <optional> > <element name="encryption"> > diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml > b/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml > index 8a613db456..3d6300f544 100644 > --- a/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml > +++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml > @@ -34,6 +34,7 @@ > <sha256/> > <sha512/> > </active_pcr_banks> > + <source type='file' path='/path/to/state'/> > </backend> > </tpm> > <audio id='1' type='none'/> > -- > 2.47.0

1 0

[PATCH v4 0/6] Add TPM emulator <source type='file/dir' path='..'/>
by marcandre.lureau＠redhat.com 22 Oct '24

22 Oct '24

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, When swtpm capabilities reports "nvram-backend-dir", it can accepts a single file or block device where TPM state will be stored. --tpmstate must be backend-uri=file://. v4: - add "qemu: explicit swtpm state locking" - add r-b from Stefan, first patch only atm v3: - changed to <source type='file/dir' path='..'/> v2: - add <source dir='..'/> support as well (Daniel) Related: https://issues.redhat.com/browse/CNV-35250 Marc-André Lureau (6): util: check swtpm nvram-backend-{dir,file} capabilities tpm: rename 'storagepath' to 'source_path' schema: add TPM emulator <source type='file' path='..'> schema: add TPM emulator <source type='dir' path='..'> qemu_tpm: handle file/block storage source qemu: explicit swtpm state locking docs/formatdomain.rst | 20 +++ src/conf/domain_conf.c | 31 ++++- src/conf/domain_conf.h | 12 +- src/conf/schemas/domaincommon.rng | 26 ++++ src/qemu/qemu_tpm.c | 115 +++++++++++++----- src/security/security_selinux.c | 6 +- src/util/virtpm.c | 3 + src/util/virtpm.h | 3 + .../qemuxmlconfdata/tpm-emulator-tpm2-enc.xml | 1 + tests/qemuxmlconfdata/tpm-emulator-tpm2.xml | 1 + tests/testutilsqemu.c | 1 + 11 files changed, 186 insertions(+), 33 deletions(-) -- 2.47.0

2 9

[PATCH v3 0/5] Add TPM emulator <source type='file/dir' path='..'/>
by marcandre.lureau＠redhat.com 21 Oct '24

21 Oct '24

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, When swtpm capabilities reports "nvram-backend-dir", it can accepts a single file or block device where TPM state will be stored. --tpmstate must be backend-uri=file://. v3: - changed to <source type='file/dir' path='..'/> v2: - add <source dir='..'/> support as well (Daniel) Related: https://issues.redhat.com/browse/CNV-35250 Marc-André Lureau (5): util: check swtpm nvram-backend-{dir,file} capabilities tpm: rename 'storagepath' to 'source_path' schema: add TPM emulator <source type='file' path='..'> schema: add TPM emulator <source type='dir' path='..'> qemu_tpm: handle file/block storage source docs/formatdomain.rst | 20 ++++ src/conf/domain_conf.c | 31 ++++- src/conf/domain_conf.h | 12 +- src/conf/schemas/domaincommon.rng | 26 +++++ src/qemu/qemu_tpm.c | 110 +++++++++++++----- src/security/security_selinux.c | 4 +- src/util/virtpm.c | 2 + src/util/virtpm.h | 2 + .../qemuxmlconfdata/tpm-emulator-tpm2-enc.xml | 1 + tests/qemuxmlconfdata/tpm-emulator-tpm2.xml | 1 + 10 files changed, 176 insertions(+), 33 deletions(-) -- 2.45.2.827.g557ae147e6

4 21

[PATCH 0/3] Report CPU model blockers in domain capabilities
by Jiri Denemark 21 Oct '24

21 Oct '24

Jiri Denemark (3): domain_capabilities: Sort CPU models domain_capabilities: Report CPU blockers NEWS: Report CPU model blockers in domain capabilities NEWS.rst | 6 + docs/formatdomaincaps.rst | 56 +- src/conf/domain_capabilities.c | 48 ++ src/conf/domain_capabilities.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 430 +++++++++-- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 649 +++++++++++++++-- .../qemu_5.2.0-virt.aarch64.xml | 56 +- tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 56 +- tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_5.2.0.s390x.xml | 122 ++-- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 430 +++++++++-- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 681 +++++++++++++++-- .../qemu_6.0.0-virt.aarch64.xml | 56 +- tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 56 +- tests/domaincapsdata/qemu_6.0.0.s390x.xml | 122 ++-- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 442 ++++++++++-- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 682 ++++++++++++++++-- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 442 ++++++++++-- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 680 +++++++++++++++-- .../qemu_6.2.0-virt.aarch64.xml | 58 +- tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 58 +- tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 673 +++++++++++++++-- .../qemu_7.0.0-virt.aarch64.xml | 58 +- tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 58 +- tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 403 +++++++++-- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 619 ++++++++++++++-- tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 403 +++++++++-- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 403 +++++++++-- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 511 +++++++++++-- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 511 +++++++++++-- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 403 +++++++++-- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 451 ++++++++++-- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 559 ++++++++++++-- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 451 ++++++++++-- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 570 +++++++++++++-- tests/domaincapsdata/qemu_8.1.0.s390x.xml | 282 ++++++-- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 562 +++++++++++++-- .../qemu_8.2.0-virt.aarch64.xml | 72 +- tests/domaincapsdata/qemu_8.2.0.aarch64.xml | 72 +- tests/domaincapsdata/qemu_8.2.0.s390x.xml | 280 +++++-- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 536 ++++++++++++-- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 576 +++++++++++++-- .../qemu_9.1.0-tcg-virt.riscv64.xml | 16 +- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 557 ++++++++++++-- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 576 +++++++++++++-- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 576 +++++++++++++-- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 557 ++++++++++++-- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 576 +++++++++++++-- 65 files changed, 19644 insertions(+), 2745 deletions(-) -- 2.47.0

2 4

[PATCH v2 0/2] qemu: Don't complain when <transient/> disk overlay is left behind
by Peter Krempa 18 Oct '24

18 Oct '24

v2: - remove the overlay unconditionally - document the overlay filename template Peter Krempa (2): qemu: snapshot: Delete leftover overlay files for <transient/> disks docs: formatdomain: Document the temporary file for transient disks docs/formatdomain.rst | 7 +++++++ src/qemu/qemu_snapshot.c | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) -- 2.47.0

2 3

[PATCH] rpm: Require dmidecode on more architectures
by Andrea Bolognani 18 Oct '24

18 Oct '24

It's not only used on x86_64 these days. See virSysinfoRead(). Technically we should include loongarch64 in the list as well, but Fedora hasn't been bootstrapped on the architecture yet, and when the time comes several more changes are going to be necessary anyway. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c3dc6e21c0..f26de04553 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -19,7 +19,7 @@ %define arches_x86 %{ix86} x86_64 %define arches_systemtap_64bit %{arches_64bit} -%define arches_dmidecode %{arches_x86} +%define arches_dmidecode %{arches_x86} aarch64 riscv64 %define arches_xen %{arches_x86} aarch64 %if 0%{?fedora} %define arches_xen x86_64 aarch64 -- 2.46.2

2 1

Plans for 10.9.0 release (freeze on Friday 25 Oct)
by Jiri Denemark 18 Oct '24

18 Oct '24

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

1 0

[PATCH] qemu: Give the users possibility to overwrite temp files for <transient\> disk
by Peter Krempa 18 Oct '24

18 Oct '24

Normally when starting up a VM with a transient disk, if the file libvirt would use as the temp overlay for the original disk image exists libvirt will not touch it and fail startup. This is done in order to avoid any potential removal of user files if they manage to create a colliding filename. In case when the user doesn't want the above behaviour this patch' introduces a 'overwriteTemp' attribute for the '<transient/>' element which allows users to opt into simply removing the file before the next start. Closes: https://gitlab.com/libvirt/libvirt/-/issues/684 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/formatdomain.rst | 7 +++++++ src/conf/domain_conf.c | 7 +++++++ src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 5 +++++ src/qemu/qemu_snapshot.c | 17 +++++++++++++---- .../disk-transient.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/disk-transient.xml | 2 +- 7 files changed, 35 insertions(+), 6 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index e6f09a728f..ab2fccdd97 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3479,6 +3479,13 @@ paravirtualized driver is specified via the ``disk`` element. ``shareBacking`` attribute should be set to ``yes``. Note that hypervisor drivers may need to hotplug such disk and thus it works only with configurations supporting hotplug. :since:`Since 7.4.0` + + Hypervisors may need to store a temporary file containing the data written + by the domain while running, which may be stored in the same location + as the original source of the disk. Note that in some cases the temporary + file can't be cleaned up (e.g. when the domain is not shutdown before the host). + An optional attribute ``overwriteTemp`` set to ``yes`` (:since:`Since 10.10`) + indicates that the hypervisor may overwrite the file rather than fail startup. ``serial`` If present, this specify serial number of virtual hard drive. For example, it may look like ``<serial>WD-WMAP9A966149</serial>``. Not supported for diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6d7dee7956..359591d8f7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8240,6 +8240,11 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, VIR_XML_PROP_NONE, &def->transientShareBacking) < 0) return NULL; + + if (virXMLPropTristateBool(transientNode, "overwriteTemp", + VIR_XML_PROP_NONE, + &def->transientOverwriteTemp) < 0) + return NULL; } if (virDomainDiskDefIotuneParse(def, ctxt) < 0) @@ -23233,6 +23238,8 @@ virDomainDiskDefFormat(virBuffer *buf, virBufferAddLit(&childBuf, "<transient"); if (def->transientShareBacking == VIR_TRISTATE_BOOL_YES) virBufferAddLit(&childBuf, " shareBacking='yes'"); + if (def->transientOverwriteTemp == VIR_TRISTATE_BOOL_YES) + virBufferAddLit(&childBuf, " overwriteTemp='yes'"); virBufferAddLit(&childBuf, "/>\n"); } virBufferEscapeString(&childBuf, "<serial>%s</serial>\n", def->serial); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a15af4fae3..169c626584 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -569,6 +569,7 @@ struct _virDomainDiskDef { virDomainStartupPolicy startupPolicy; bool transient; virTristateBool transientShareBacking; + virTristateBool transientOverwriteTemp; virDomainDeviceInfo info; virTristateBool rawio; virDomainDeviceSGIO sgio; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index efb5f00d77..cd87e83410 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -1618,6 +1618,11 @@ <ref name='virYesNo'/> </attribute> </optional> + <optional> + <attribute name="overwriteTemp"> + <ref name='virYesNo'/> + </attribute> + </optional> <empty/> </element> </optional> diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 1187ebf276..b8ca045900 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1287,10 +1287,19 @@ qemuSnapshotGetTransientDiskDef(virDomainDiskDef *domdisk, domdisk->src->path, suffix); if (virFileExists(snapdisk->src->path)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("Overlay file '%1$s' for transient disk '%2$s' already exists"), - snapdisk->src->path, domdisk->dst); - return NULL; + if (domdisk->transientOverwriteTemp == VIR_TRISTATE_BOOL_YES) { + if (unlink(snapdisk->src->path) != 0) { + virReportSystemError(errno, + _("Failed to delete overlay file '%1$s' for transient disk '%2$s'"), + snapdisk->src->path, domdisk->dst); + return NULL; + } + } else { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("Overlay file '%1$s' for transient disk '%2$s' already exists"), + snapdisk->src->path, domdisk->dst); + return NULL; + } } return g_steal_pointer(&snapdisk); diff --git a/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml index aab5894447..5f8f15f714 100644 --- a/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml @@ -21,7 +21,7 @@ <driver name='qemu' type='qcow2' cache='none'/> <source file='/tmp/QEMUGuest2.img'/> <target dev='vda' bus='virtio'/> - <transient shareBacking='yes'/> + <transient shareBacking='yes' overwriteTemp='yes'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </disk> <disk type='file' device='disk'> diff --git a/tests/qemuxmlconfdata/disk-transient.xml b/tests/qemuxmlconfdata/disk-transient.xml index edd65a0da0..722f1f9a92 100644 --- a/tests/qemuxmlconfdata/disk-transient.xml +++ b/tests/qemuxmlconfdata/disk-transient.xml @@ -18,7 +18,7 @@ <driver name='qemu' type='qcow2' cache='none'/> <source file='/tmp/QEMUGuest2.img'/> <target dev='vda' bus='virtio'/> - <transient shareBacking='yes'/> + <transient shareBacking='yes' overwriteTemp='yes'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> -- 2.47.0

2 3

[PATCH] NEWS: Fix naming of DISK_DETECT_ZEROES migration parameter
by Michal Privoznik 17 Oct '24

17 Oct '24

There's a typo in NEWS.rst where VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES has the _ZEROES suffix duplicated referring to a non-existent migration parameter. Drop the suffix. Fixes: 2e29ab3269701535f71cf56cc51165e7eeb1e49f Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Merged as trivial. NEWS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index f9a0d11896..56adf8df8b 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -25,7 +25,7 @@ v10.9.0 (unreleased) has no access to the allocation state of blocks at the cost of CPU overhead. This feature is available via the ``--migrate-disks-detect-zeroes`` option - for ``virsh migrate`` or ``VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES_ZEROES`` + for ``virsh migrate`` or ``VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES`` migration parameter. See the documentation for caveats. * **Improvements** -- 2.45.2

1 0

[PATCH 0/4] virbitmap: Fix buffer overflow when shrinking a bitmap and copying it
by Peter Krempa 17 Oct '24

17 Oct '24

See patches for rationale. Peter Krempa (4): virBitmapNewCopy: Honor sizes of either bitmap when doing memcpy() virbitmap: Extract and reuse buffer size calculation into a function util: virbitmap: Extract clearing of unused bits at the end of the last unit util: bitmap: Rewrite virBitmapShrink using new helpers src/util/virbitmap.c | 84 +++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 44 deletions(-) -- 2.47.0

2 5

[PATCH 0/2] Hyper-V feature fixes
by Martin Kletzander 17 Oct '24

17 Oct '24

I wrote so many good commit messages today, leave me alone. Martin Kletzander (2): qemu: Add more translations to virQEMUCapsCPUFeatureTranslationTable qemu: Do not hardcode Hyper-V feature names on command line src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_command.c | 22 +++++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-) -- 2.47.0

2 4

[PATCH] ci: refresh with 'lcitool manifest'
by Daniel P. Berrangé 16 Oct '24

16 Oct '24

Major changes: * macOS 13 is removed. Cirrus CI now only supports a single version, macOS 14, so there is no addition of macOS 15 possible. * The polkit lcitool mapping is renamed to pkcheck * The polkit package is renamed on Debian & Ubuntu Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- ci/buildenv/debian-12-cross-aarch64.sh | 2 +- ci/buildenv/debian-12-cross-armv6l.sh | 2 +- ci/buildenv/debian-12-cross-armv7l.sh | 2 +- ci/buildenv/debian-12-cross-i686.sh | 2 +- ci/buildenv/debian-12-cross-mips64el.sh | 2 +- ci/buildenv/debian-12-cross-mipsel.sh | 2 +- ci/buildenv/debian-12-cross-ppc64le.sh | 2 +- ci/buildenv/debian-12-cross-s390x.sh | 2 +- ci/buildenv/debian-12.sh | 2 +- ci/buildenv/debian-sid-cross-aarch64.sh | 2 +- ci/buildenv/debian-sid-cross-armv6l.sh | 2 +- ci/buildenv/debian-sid-cross-armv7l.sh | 2 +- ci/buildenv/debian-sid-cross-i686.sh | 2 +- ci/buildenv/debian-sid-cross-mips64el.sh | 2 +- ci/buildenv/debian-sid-cross-ppc64le.sh | 2 +- ci/buildenv/debian-sid-cross-s390x.sh | 2 +- ci/buildenv/debian-sid.sh | 2 +- ci/buildenv/opensuse-leap-15.sh | 1 + ci/buildenv/ubuntu-2204.sh | 2 +- ci/buildenv/ubuntu-2404.sh | 2 +- ci/cirrus/macos-13.vars | 16 ---------------- .../debian-12-cross-aarch64.Dockerfile | 2 +- .../debian-12-cross-armv6l.Dockerfile | 2 +- .../debian-12-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-12-cross-i686.Dockerfile | 2 +- .../debian-12-cross-mips64el.Dockerfile | 2 +- .../debian-12-cross-mipsel.Dockerfile | 2 +- .../debian-12-cross-ppc64le.Dockerfile | 2 +- ci/containers/debian-12-cross-s390x.Dockerfile | 2 +- ci/containers/debian-12.Dockerfile | 2 +- .../debian-sid-cross-aarch64.Dockerfile | 2 +- .../debian-sid-cross-armv6l.Dockerfile | 2 +- .../debian-sid-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-sid-cross-i686.Dockerfile | 2 +- .../debian-sid-cross-mips64el.Dockerfile | 2 +- .../debian-sid-cross-ppc64le.Dockerfile | 2 +- .../debian-sid-cross-s390x.Dockerfile | 2 +- ci/containers/debian-sid.Dockerfile | 2 +- ci/containers/opensuse-leap-15.Dockerfile | 1 + ci/containers/ubuntu-2204.Dockerfile | 2 +- ci/containers/ubuntu-2404.Dockerfile | 2 +- ci/gitlab/builds.yml | 18 +----------------- ci/lcitool/projects/libvirt.yml | 2 +- ci/manifest.yml | 7 ------- 44 files changed, 42 insertions(+), 79 deletions(-) delete mode 100644 ci/cirrus/macos-13.vars diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-12-cross-aarch64.sh index 93288ae46f..b4a056d940 100644 --- a/ci/buildenv/debian-12-cross-aarch64.sh +++ b/ci/buildenv/debian-12-cross-aarch64.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-12-cross-armv6l.sh index 37e743478d..07ffb3da37 100644 --- a/ci/buildenv/debian-12-cross-armv6l.sh +++ b/ci/buildenv/debian-12-cross-armv6l.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-12-cross-armv7l.sh index 1b8e4f7019..6f88f6cc06 100644 --- a/ci/buildenv/debian-12-cross-armv7l.sh +++ b/ci/buildenv/debian-12-cross-armv7l.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh index 060b6ea75e..5da816d086 100644 --- a/ci/buildenv/debian-12-cross-i686.sh +++ b/ci/buildenv/debian-12-cross-i686.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh index 6da5920d1d..09c445758c 100644 --- a/ci/buildenv/debian-12-cross-mips64el.sh +++ b/ci/buildenv/debian-12-cross-mips64el.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh index 5ad809c625..a762d1e3b8 100644 --- a/ci/buildenv/debian-12-cross-mipsel.sh +++ b/ci/buildenv/debian-12-cross-mipsel.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-12-cross-ppc64le.sh index eca66706fc..fe7b672799 100644 --- a/ci/buildenv/debian-12-cross-ppc64le.sh +++ b/ci/buildenv/debian-12-cross-ppc64le.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh index 65dc4ce545..1ca0768d14 100644 --- a/ci/buildenv/debian-12-cross-s390x.sh +++ b/ci/buildenv/debian-12-cross-s390x.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh index d06f33af12..fcd5291f22 100644 --- a/ci/buildenv/debian-12.sh +++ b/ci/buildenv/debian-12.sh @@ -74,7 +74,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh index 93288ae46f..b4a056d940 100644 --- a/ci/buildenv/debian-sid-cross-aarch64.sh +++ b/ci/buildenv/debian-sid-cross-aarch64.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh index f19ec82093..53d2d79b38 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh index 4ebf3126e3..4e60877e77 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh index 43c02e784e..98e08b2397 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh index 6da5920d1d..09c445758c 100644 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ b/ci/buildenv/debian-sid-cross-mips64el.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh index eca66706fc..fe7b672799 100644 --- a/ci/buildenv/debian-sid-cross-ppc64le.sh +++ b/ci/buildenv/debian-sid-cross-ppc64le.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh index 65dc4ce545..1ca0768d14 100644 --- a/ci/buildenv/debian-sid-cross-s390x.sh +++ b/ci/buildenv/debian-sid-cross-s390x.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh index d06f33af12..fcd5291f22 100644 --- a/ci/buildenv/debian-sid.sh +++ b/ci/buildenv/debian-sid.sh @@ -74,7 +74,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-15.sh index 2a1c1e2314..add707c752 100644 --- a/ci/buildenv/opensuse-leap-15.sh +++ b/ci/buildenv/opensuse-leap-15.sh @@ -6,6 +6,7 @@ function install_buildenv() { zypper update -y + zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports… zypper install -y \ audit-devel \ augeas \ diff --git a/ci/buildenv/ubuntu-2204.sh b/ci/buildenv/ubuntu-2204.sh index 95762d663c..e581ce6012 100644 --- a/ci/buildenv/ubuntu-2204.sh +++ b/ci/buildenv/ubuntu-2204.sh @@ -75,7 +75,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/ubuntu-2404.sh b/ci/buildenv/ubuntu-2404.sh index 5ce8e74a91..8e459cbb25 100644 --- a/ci/buildenv/ubuntu-2404.sh +++ b/ci/buildenv/ubuntu-2404.sh @@ -75,7 +75,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-13.vars deleted file mode 100644 index d23fe3cd47..0000000000 --- a/ci/cirrus/macos-13.vars +++ /dev/null @@ -1,16 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -CCACHE='/opt/homebrew/bin/ccache' -CPAN_PKGS='' -CROSS_PKGS='' -MAKE='/opt/homebrew/bin/gmake' -NINJA='/opt/homebrew/bin/ninja' -PACKAGING_COMMAND='brew' -PIP3='/opt/homebrew/bin/pip3' -PKGS='augeas bash-completion black ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep json-c libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline' -PYPI_PKGS='pytest' -PYTHON='/opt/homebrew/bin/python3' diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-12-cross-aarch64.Dockerfile index e57cbffaec..f4d587177b 100644 --- a/ci/containers/debian-12-cross-aarch64.Dockerfile +++ b/ci/containers/debian-12-cross-aarch64.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-12-cross-armv6l.Dockerfile index 9572f4d28f..d8f2a3bc42 100644 --- a/ci/containers/debian-12-cross-armv6l.Dockerfile +++ b/ci/containers/debian-12-cross-armv6l.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-12-cross-armv7l.Dockerfile index e29eea8a6b..1abfb79931 100644 --- a/ci/containers/debian-12-cross-armv7l.Dockerfile +++ b/ci/containers/debian-12-cross-armv7l.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-12-cross-i686.Dockerfile index 39f5e9ef8d..5681121d80 100644 --- a/ci/containers/debian-12-cross-i686.Dockerfile +++ b/ci/containers/debian-12-cross-i686.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile index af15c9c76a..a4f2aabe10 100644 --- a/ci/containers/debian-12-cross-mips64el.Dockerfile +++ b/ci/containers/debian-12-cross-mips64el.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile index 63caa15b20..a3f0652818 100644 --- a/ci/containers/debian-12-cross-mipsel.Dockerfile +++ b/ci/containers/debian-12-cross-mipsel.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-12-cross-ppc64le.Dockerfile index 6c6e747120..caf8229a8e 100644 --- a/ci/containers/debian-12-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-12-cross-s390x.Dockerfile index 4e124ca26a..c4f8479c13 100644 --- a/ci/containers/debian-12-cross-s390x.Dockerfile +++ b/ci/containers/debian-12-cross-s390x.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile index 682f8217f4..3e6d0597e2 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-12.Dockerfile @@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 1932a7cfbe..3a06f01c5c 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index bd7b1a12a3..fdf129aa04 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index a0ee83d25b..8dbb705d69 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index b2f96a6c03..f856306a62 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index bcb24e13ff..468c5fbc3e 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 66180dcb1e..37c256fe1e 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 5f9fbc8ffd..232a8d7844 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 87aee59bbd..febd286d86 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile index 38160bf7dc..952799aede 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-15.Dockerfile @@ -7,6 +7,7 @@ FROM registry.opensuse.org/opensuse/leap:15.6 RUN zypper update -y && \ + zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports… && \ zypper install -y \ audit-devel \ augeas \ diff --git a/ci/containers/ubuntu-2204.Dockerfile b/ci/containers/ubuntu-2204.Dockerfile index 18555693d1..dc69a7d4df 100644 --- a/ci/containers/ubuntu-2204.Dockerfile +++ b/ci/containers/ubuntu-2204.Dockerfile @@ -77,7 +77,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/ubuntu-2404.Dockerfile b/ci/containers/ubuntu-2404.Dockerfile index b2f461b629..ecccfc637a 100644 --- a/ci/containers/ubuntu-2404.Dockerfile +++ b/ci/containers/ubuntu-2404.Dockerfile @@ -77,7 +77,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 214119b902..771fa67501 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -624,28 +624,12 @@ x86_64-freebsd-14: UPGRADE_COMMAND: pkg upgrade -y -aarch64-macos-13: - extends: .cirrus_build_job - needs: [] - allow_failure: false - variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest - CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_INSTANCE_TYPE: macos_instance - INSTALL_COMMAND: brew install - NAME: macos-13 - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - UPDATE_COMMAND: brew update - UPGRADE_COMMAND: brew upgrade - - aarch64-macos-14: extends: .cirrus_build_job needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_INSTANCE_TYPE: macos_instance INSTALL_COMMAND: brew install diff --git a/ci/lcitool/projects/libvirt.yml b/ci/lcitool/projects/libvirt.yml index 9f8fc06ce4..aa0dc5924a 100644 --- a/ci/lcitool/projects/libvirt.yml +++ b/ci/lcitool/projects/libvirt.yml @@ -63,8 +63,8 @@ packages: - numad - openwsman - perl + - pkcheck - pkg-config - - polkit - portablexdr - python3 - python3-docutils diff --git a/ci/manifest.yml b/ci/manifest.yml index 647510ed2f..43b9995717 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -203,13 +203,6 @@ targets: variables: RPM: skip - macos-13: - jobs: - - arch: aarch64 - variables: - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - macos-14: jobs: - arch: aarch64 -- 2.46.0

2 1

[PATCH v2] lxc: fix variable storage order before call
by Adam Julis 16 Oct '24

16 Oct '24

virDomainConfNWFilterInstantiate() was called without updated net->ifname, it caused in some cases throwing error message. If function failed, change is reverted. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/658 Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- src/lxc/lxc_process.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 205ab96ebb..0233d17f4e 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -271,6 +271,7 @@ virLXCProcessSetupInterfaceTap(virDomainDef *vm, { g_autofree char *parentVeth = NULL; g_autofree char *containerVeth = NULL; + g_autofree char *backupIfname = NULL; const virNetDevVPortProfile *vport = virDomainNetGetActualVirtPortProfile(net); VIR_DEBUG("calling vethCreate()"); @@ -315,14 +316,17 @@ virLXCProcessSetupInterfaceTap(virDomainDef *vm, return NULL; } - if (net->filter && - virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) - return NULL; - - /* success is guaranteed, so update the interface object */ - g_free(net->ifname); + /* success almost guaranteed, next function needs updated net->ifname */ + backupIfname = g_steal_pointer(net->ifname); net->ifname = g_steal_pointer(&parentVeth); + if (net->filter && + virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) { + g_free(net->ifname); + net->ifname = g_steal_pointer(&backupIfname); + return NULL; + } + return g_steal_pointer(&containerVeth); } -- 2.45.2

2 1

[PATCH 0/3] Do not relabel existing device files on hotplug
by Martin Kletzander 16 Oct '24

16 Oct '24

When hotplugging a /dev device that already exists in the process namespace we reset all the permissions, labels etc. to the same state as the parent namespace. Then, when we are trying to label the device for qemu we find out there are label-remembering attributes with a positive reference count and because we are trying to set a different label (the device now has the label of the original device from the parent namespace) we refuse to reset it. Not only the hotplug fails (purposefully not questioning the usability of hotplugging the same device for a second time) but it also resets the labels to something we do not want. Now the quiestion is: What does this patchset do? You can have a guess. Martin Kletzander (3): qemu_namespace: Rename variable qemu_namespace: Properly report new files qemu_namespace: Only replicate labels on created files src/qemu/qemu_namespace.c | 64 +++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 30 deletions(-) -- 2.47.0

2 8

[PATCH 00/10] qemu: Prepare for 'qemu-9.2' and add qemu-9.2 (dev cycle) capabilities
by Peter Krempa 16 Oct '24

16 Oct '24

Adapt to deprecation of 'gluster' replacement of 'reconnect' by 'reconnect-ms' and add qemu-9.2 caps. See individual patches for details. Peter Krempa (10): qemublocktest: Convert all 'gluster' instances to 'nbd' in 'xml2json' cases qemublocktest: Mark gluster cases in XML->json->XML tests as deprecated qemublocktest: Mark 'gluster' case in image creation test as deprecated qemuxmlconftest: Use only 'nfs' protocol in 'disk-network-nfs' qemuxml(conf|active)test: Use 'nbd' instead of 'gluster' in 'disk-backing-chains-(no)index' cases qemuxmlconftest: Pin 'disk-network-gluster' case to qemu-9.1 qemu: capabilities: Introduce QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS qemu: chardev: Use 'reconnect-ms' instead of deprecated 'reconnect' qemuxmlconftest: Add '9.1.0' versions of test cases for 'reconnect' option of chardevs tests: qemucapabilities: Add test data for the qemu-9.2 dev cycle src/qemu/qemu_block.c | 2 +- src/qemu/qemu_block.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_chardev.c | 20 +- src/qemu/qemu_chardev.h | 1 + src/qemu/qemu_command.c | 12 +- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_hotplug.c | 19 +- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 305 + .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 301 + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 305 + tests/qemublocktest.c | 16 +- ...le-backing_basic-aio_io_uring-srconly.json | 19 +- .../file-backing_basic-aio_io_uring.json | 17 +- .../file-backing_basic-aio_io_uring.xml | 2 +- ...ile-backing_basic-aio_threads-srconly.json | 19 +- .../file-backing_basic-aio_threads.json | 17 +- .../file-backing_basic-aio_threads.xml | 2 +- ...acking_basic-cache-directsync-srconly.json | 19 +- .../file-backing_basic-cache-directsync.json | 17 +- .../file-backing_basic-cache-directsync.xml | 2 +- ...file-backing_basic-cache-none-srconly.json | 19 +- .../file-backing_basic-cache-none.json | 17 +- .../file-backing_basic-cache-none.xml | 2 +- ...le-backing_basic-cache-unsafe-srconly.json | 19 +- .../file-backing_basic-cache-unsafe.json | 17 +- .../file-backing_basic-cache-unsafe.xml | 2 +- ...backing_basic-cache-writeback-srconly.json | 19 +- .../file-backing_basic-cache-writeback.json | 17 +- .../file-backing_basic-cache-writeback.xml | 2 +- ...king_basic-cache-writethrough-srconly.json | 19 +- ...file-backing_basic-cache-writethrough.json | 17 +- .../file-backing_basic-cache-writethrough.xml | 2 +- .../file-backing_basic-detect-srconly.json | 19 +- .../xml2json/file-backing_basic-detect.json | 17 +- .../xml2json/file-backing_basic-detect.xml | 2 +- ...le-backing_basic-unmap-detect-srconly.json | 19 +- .../file-backing_basic-unmap-detect.json | 17 +- .../file-backing_basic-unmap-detect.xml | 2 +- ...le-backing_basic-unmap-ignore-srconly.json | 19 +- .../file-backing_basic-unmap-ignore.json | 17 +- .../file-backing_basic-unmap-ignore.xml | 2 +- .../file-backing_basic-unmap-srconly.json | 19 +- .../xml2json/file-backing_basic-unmap.json | 17 +- .../xml2json/file-backing_basic-unmap.xml | 2 +- .../caps_9.2.0_x86_64.replies | 44205 ++++++++++++++++ .../caps_9.2.0_x86_64.xml | 3970 ++ tests/qemumonitorjsontest.c | 2 +- ...king-chains-index-active.x86_64-latest.xml | 4 +- ...ng-chains-index-inactive.x86_64-latest.xml | 4 +- .../chardev-backends-json.x86_64-9.1.0.args | 79 + .../chardev-backends-json.x86_64-9.1.0.xml | 149 + .../chardev-backends-json.x86_64-latest.args | 6 +- .../chardev-backends.x86_64-9.1.0.args | 79 + .../chardev-backends.x86_64-9.1.0.xml | 149 + .../chardev-backends.x86_64-latest.args | 6 +- .../chardev-reconnect.x86_64-9.1.0.args | 46 + .../chardev-reconnect.x86_64-9.1.0.xml | 72 + .../chardev-reconnect.x86_64-latest.args | 10 +- ...isk-backing-chains-index.x86_64-latest.xml | 4 +- .../disk-backing-chains-index.xml | 4 +- ...-backing-chains-noindex.x86_64-latest.args | 4 +- ...k-backing-chains-noindex.x86_64-latest.xml | 4 +- .../disk-backing-chains-noindex.xml | 4 +- ...=> disk-network-gluster.x86_64-9.1.0.args} | 2 +- ... => disk-network-gluster.x86_64-9.1.0.xml} | 2 +- .../qemuxmlconfdata/disk-network-gluster.xml | 2 +- .../disk-network-nfs.x86_64-latest.args | 2 +- .../disk-network-nfs.x86_64-latest.xml | 4 +- tests/qemuxmlconfdata/disk-network-nfs.xml | 4 +- .../disk-vhostuser-numa.x86_64-latest.args | 2 +- .../disk-vhostuser.x86_64-latest.args | 2 +- .../net-vhostuser-multiq.x86_64-latest.args | 4 +- tests/qemuxmlconftest.c | 8 +- 75 files changed, 49938 insertions(+), 301 deletions(-) create mode 100644 tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_9.2.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml create mode 100644 tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args create mode 100644 tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args create mode 100644 tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.args create mode 100644 tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.xml rename tests/qemuxmlconfdata/{disk-network-gluster.x86_64-latest.args => disk-network-gluster.x86_64-9.1.0.args} (96%) rename tests/qemuxmlconfdata/{disk-network-gluster.x86_64-latest.xml => disk-network-gluster.x86_64-9.1.0.xml} (97%) -- 2.46.2

2 11

[PATCH] apparmor: Allow running i686 VMs on Debian 12
by Andrea Bolognani 16 Oct '24

16 Oct '24

In Debian 12, the qemu-system-i386 binary in /usr/bin is a wrapper script, with the actual executable living in /usr/libexec instead. This makes it impossible to run i686 VMs when AppArmor is enabled. Allow running the actual binary. https://bugs.debian.org/1030926 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/security/apparmor/libvirt-qemu.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/security/apparmor/libvirt-qemu.in b/src/security/apparmor/libvirt-qemu.in index 8f17256554..694da26dea 100644 --- a/src/security/apparmor/libvirt-qemu.in +++ b/src/security/apparmor/libvirt-qemu.in @@ -172,6 +172,9 @@ /usr/bin/qemu-system-xtensaeb rmix, /usr/bin/qemu-unicore32 rmix, /usr/bin/qemu-x86_64 rmix, + # Debian 12 has a wrapper script in /usr/bin while the actual + # binary lives in /usr/libexec (Debian: #1030926) + /usr/libexec/qemu-system-i386 rmix, # for Debian/Ubuntu qemu-block-extra / RPMs qemu-block-* (LP: #1554761) /usr/{lib,lib64}/qemu/*.so mr, /usr/lib/(a){multiarch}/qemu/*.so mr, -- 2.46.2

2 1

[PATCH 0/5] ci: various CI fixes
by Daniel P. Berrangé 15 Oct '24

15 Oct '24

This fixes various issues with CI across multiple platforms, debian, Fedora and macOS. Daniel P. Berrangé (5): meson: unconditionally enable polkit on non-Windows ci: drop polkit from build deps tests: stop stubbing libselinux APIs for purpose of data overrides wireshark: drop gmodule.h include to avoid glib warnings ci: update macOS versions under test ci/buildenv/almalinux-9.sh | 1 - ci/buildenv/alpine-319.sh | 1 - ci/buildenv/alpine-edge.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-39.sh | 1 - ci/buildenv/fedora-40-cross-mingw32.sh | 1 - ci/buildenv/fedora-40-cross-mingw64.sh | 1 - ci/buildenv/fedora-40.sh | 1 - ci/buildenv/fedora-rawhide-cross-mingw32.sh | 1 - ci/buildenv/fedora-rawhide-cross-mingw64.sh | 1 - ci/buildenv/fedora-rawhide.sh | 1 - ci/buildenv/opensuse-leap-15.sh | 2 +- ci/buildenv/opensuse-tumbleweed.sh | 1 - ci/buildenv/ubuntu-2204.sh | 1 - ci/buildenv/ubuntu-2404.sh | 1 - ci/cirrus/build.yml | 2 ++ ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-14.vars | 2 +- ci/cirrus/macos-13.vars | 16 ------------ ci/containers/almalinux-9.Dockerfile | 1 - ci/containers/alpine-319.Dockerfile | 1 - ci/containers/alpine-edge.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-39.Dockerfile | 1 - .../fedora-40-cross-mingw32.Dockerfile | 1 - .../fedora-40-cross-mingw64.Dockerfile | 1 - ci/containers/fedora-40.Dockerfile | 1 - .../fedora-rawhide-cross-mingw32.Dockerfile | 1 - .../fedora-rawhide-cross-mingw64.Dockerfile | 1 - ci/containers/fedora-rawhide.Dockerfile | 1 - ci/containers/opensuse-leap-15.Dockerfile | 2 +- ci/containers/opensuse-tumbleweed.Dockerfile | 1 - ci/containers/ubuntu-2204.Dockerfile | 1 - ci/containers/ubuntu-2404.Dockerfile | 1 - ci/gitlab/builds.yml | 12 +++++---- ci/lcitool/projects/libvirt.yml | 1 - ci/manifest.yml | 9 ++++--- meson.build | 5 ---- tests/securityselinuxhelper.c | 25 ------------------- tests/securityselinuxlabeltest.c | 5 +++- tests/securityselinuxtest.c | 2 +- tests/viridentitytest.c | 4 +-- tools/wireshark/src/plugin.c | 2 -- 95 files changed, 25 insertions(+), 146 deletions(-) delete mode 100644 ci/cirrus/macos-13.vars -- 2.46.0

2 15

[libvirt ci] Why no artifacts for macOS & FreeBSD?
by Richard W.M. Jones 14 Oct '24

14 Oct '24

[I couldn't find out where to send questions / bugs related to libvirt CI, so here I am ...] https://gitlab.com/nbdkit/libnbd/-/pipelines/1493147187 It would be much easier to fix the above pipeline (which doesn't reproduce locally) if I could download artifacts for the failing builds. However we don't seem to have them for macOS and FreeBSD. They work fine for Linux. Why, and can they be generated somehow? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com nbdkit - Flexible, fast NBD server with plugins https://gitlab.com/nbdkit/nbdkit

2 4

[PATCH v2 00/13] Implement support for QCOW2 data files
by Nikolai Barybin 14 Oct '24

14 Oct '24

Hello everyone! With help of Peter's review and after researching Cole's patches I've come up with the second version. Changes since last revision: - properly taken in account (while probing disk chain) usecase when we have data-file as part of some backing image - added proper integration with security drivers instead of call to chown - data-file is added to qemu cmdline as a reference to blockdev - added XML formatiing and parsing - added basic tests to qemublocktest Nikolai Barybin (13): conf: add data-file feature and related fields to virStorageSource storage file: add getDataFile function to FileTypeInfo storage file: add qcow2 data-file path parsing from header storage file: fill in src->dataFileStore during file probe security: DAC: handle qcow2 data-file on image label set/restore security: selinux: handle qcow2 data-file on image label set/restore security: apparmor: handle qcow2 data-file qemu: put data-file path to VM's cgroup and namespace qemu: factor out qemuDomainPrepareStorageSource() qemu: enable basic qcow2 data-file feature support conf: schemas: add data-file store to domain rng schema conf: implement XML parsing/formatingo for dataFileStore tests: add qcow2 data-file basic tests to qemublocktest src/conf/domain_conf.c | 98 +++++++++++++++++++ src/conf/domain_conf.h | 13 +++ src/conf/schemas/domaincommon.rng | 15 +++ src/conf/storage_source_conf.c | 11 +++ src/conf/storage_source_conf.h | 5 + src/qemu/qemu_block.c | 7 ++ src/qemu/qemu_cgroup.c | 4 + src/qemu/qemu_command.c | 5 + src/qemu/qemu_domain.c | 50 +++++++--- src/qemu/qemu_namespace.c | 5 + src/security/security_dac.c | 26 ++++- src/security/security_selinux.c | 20 +++- src/security/virt-aa-helper.c | 4 + src/storage_file/storage_file_probe.c | 85 ++++++++++++---- src/storage_file/storage_source.c | 28 ++++++ src/storage_file/storage_source.h | 3 + tests/qemublocktest.c | 78 +++++++++------ ...backing-with-data-file-noopts-srconly.json | 27 +++++ ...e-qcow2-backing-with-data-file-noopts.json | 41 ++++++++ ...le-qcow2-backing-with-data-file-noopts.xml | 35 +++++++ .../file-qcow2-data-file-noopts-srconly.json | 18 ++++ .../xml2json/file-qcow2-data-file-noopts.json | 27 +++++ .../xml2json/file-qcow2-data-file-noopts.xml | 24 +++++ 23 files changed, 558 insertions(+), 71 deletions(-) create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-with-data-file-noopts-srconly.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-with-data-file-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-with-data-file-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-data-file-noopts-srconly.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-data-file-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-data-file-noopts.xml -- 2.43.5

2 26

[PATCH] qemu: migration: Fix blockdev config with VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES
by Peter Krempa 14 Oct '24

14 Oct '24

The idea of migration with VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES populated is to sparsify the image. The QEMU NBD client as it was configured in commit 621f879adf98e2c93ac5c8c869733a57f06cd9aa would signal to the destination to do thick allocation of holes which would result in a non-sparse image for any backend except a qcow2 image which I used to test it. Switch to VIR_DOMAIN_DISK_DETECT_ZEROES_UNMAP and VIR_DOMAIN_DISK_DISCARD_UNMAP which tells the NBD client (and that in turn the NBD server) to preserve the sparse blocks it detected from the image. Fixes: 621f879adf98e2c93ac5c8c869733a57f06cd9aa Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_migration.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 179e9d7c83..832b2946e0 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1092,8 +1092,14 @@ qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(virDomainDiskDef *disk, copysrc->protocol = VIR_STORAGE_NET_PROTOCOL_NBD; copysrc->format = VIR_STORAGE_FILE_RAW; - if (detect_zeroes) - copysrc->detect_zeroes = VIR_DOMAIN_DISK_DETECT_ZEROES_ON; + if (detect_zeroes) { + /* We need to use both VIR_DOMAIN_DISK_DETECT_ZEROES_UNMAP and + * VIR_DOMAIN_DISK_DISCARD_UNMAP as the qemu NBD client otherwise singals + * to the server to fully allocate the zero blocks + */ + copysrc->detect_zeroes = VIR_DOMAIN_DISK_DETECT_ZEROES_UNMAP; + copysrc->discard = VIR_DOMAIN_DISK_DISCARD_UNMAP; + } copysrc->backingStore = virStorageSourceNew(); -- 2.46.2

2 1

Re: [PATCH RFC v4 11/17] qemu: block: Support block disk along with throttle filters
by Peter Krempa 14 Oct '24

14 Oct '24

On Mon, Sep 30, 2024 at 10:14:59 +0000, Edward Arulanadam wrote: > Dear All, > > My sincere apologies on reaching out regarding this change as I know, someone would be reviewing the change and provide review comments as per the community guidelines. Since this change is very critical for us to move forward, may I request for a review and let us know if this is good now. Hi, when this last iteration was posted I got a note (off-list) from the author stating that they might not be able to continue work on that series. Are you going to pick up the work on that series? If so make sure to configure your mail client to avoid breaking threads (as you did with this mail). I'll use the existing convention of using 'reply-all' to the patches so you might not get CC'd for the postings which are already on-list. If that's a problem please re-post the series (obviously keeping authorship intact). I'm keeping it on my to-do list but due to personal reasons I'm really backlogged in reviews so please be patient.

1 1

[PATCH] qemu: snapshot: Remove dead code in 'qemuSnapshotDeleteBlockJobRunning'
by Peter Krempa 14 Oct '24

14 Oct '24

'qemuSnapshotDeleteBlockJobIsRunning' returns only 0 and 1. Convert it to bool and remove the dead code handling -1 return in the caller. Closes: https://gitlab.com/libvirt/libvirt/-/issues/682 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_snapshot.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 77ff842fab..1187ebf276 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -3303,7 +3303,7 @@ qemuSnapshotDeleteUpdateDisks(void *payload, /* Deleting external snapshot is started by running qemu block-commit job. * We need to wait for all block-commit jobs to be 'ready' or 'pending' to * continue with external snapshot deletion. */ -static int +static bool qemuSnapshotDeleteBlockJobIsRunning(qemuBlockjobState state) { switch (state) { @@ -3311,7 +3311,7 @@ qemuSnapshotDeleteBlockJobIsRunning(qemuBlockjobState state) case QEMU_BLOCKJOB_STATE_RUNNING: case QEMU_BLOCKJOB_STATE_ABORTING: case QEMU_BLOCKJOB_STATE_PIVOTING: - return 1; + return true; case QEMU_BLOCKJOB_STATE_COMPLETED: case QEMU_BLOCKJOB_STATE_FAILED: @@ -3323,7 +3323,7 @@ qemuSnapshotDeleteBlockJobIsRunning(qemuBlockjobState state) break; } - return 0; + return false; } @@ -3359,18 +3359,14 @@ static int qemuSnapshotDeleteBlockJobRunning(virDomainObj *vm, qemuBlockJobData *job) { - int rc; qemuBlockJobUpdate(vm, job, VIR_ASYNC_JOB_SNAPSHOT); - while ((rc = qemuSnapshotDeleteBlockJobIsRunning(job->state)) > 0) { + while (qemuSnapshotDeleteBlockJobIsRunning(job->state)) { if (qemuDomainObjWait(vm) < 0) return -1; qemuBlockJobUpdate(vm, job, VIR_ASYNC_JOB_SNAPSHOT); } - if (rc < 0) - return -1; - return 0; } -- 2.46.2

2 1

[PATCH] docs: Document watchdog action=dump slightly more
by Martin Kletzander 12 Oct '24

12 Oct '24

With watchdog action=dump the actual watchdog action is set to pause and the daemon then proceeds to dump the process. After that the domain is resumed. That was the case since the feature was added. However the resuming of the domain might be unexpected, especially when compared to HW watchdog, which will never run the guest from the point where it got interrupted. Document the pre-existing behaviour, since any change might be unexpected as well. Change of behaviour would require new options like dump+reset, dump+pause, etc. That option is still possible, but orthogonal to this change. Resolves: https://issues.redhat.com/browse/RHEL-753 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/formatdomain.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 4336cff3ac05..e6f09a728f0f 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -7914,7 +7914,8 @@ southbridge, which is used with the q35 machine type. :since:`Since 9.1.0` - 'poweroff' - forcefully power off the guest - 'pause' - pause the guest - 'none' - do nothing - - 'dump' - automatically dump the guest :since:`Since 0.8.7` + - 'dump' - automatically dump the guest, beware that after the + dump the guest will be resumed :since:`Since 0.8.7` - 'inject-nmi' - inject a non-maskable interrupt into the guest :since:`Since 1.2.17` -- 2.46.2

3 2

[PATCH] ch: Enable a logfile for ch guests
by Praveen K Paladugu 11 Oct '24

11 Oct '24

Create a logfile to capture output from cloud-hypervisor whenever a guest is started. Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com> --- src/ch/ch_monitor.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 3e49902791..7421a550b6 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -541,6 +541,9 @@ virCHMonitorNew(virDomainObj *vm, virCHDriverConfig *cfg) g_autoptr(virCHMonitor) mon = NULL; g_autoptr(virCommand) cmd = NULL; const char *socketdir = cfg->stateDir; + const char *logdir = cfg->logDir; + g_autofree char *logfile = NULL; + int socket_fd = 0; if (virCHMonitorInitialize() < 0) @@ -564,6 +567,14 @@ virCHMonitorNew(virDomainObj *vm, virCHDriverConfig *cfg) return NULL; } + logfile = g_strdup_printf("%s/%s.log", logdir, vm->def->name); + if (g_mkdir_with_parents(logdir, 0777) < 0) { + virReportSystemError(errno, + _("Cannot create log directory '%1$s'"), + logdir); + return NULL; + } + if (g_mkdir_with_parents(cfg->saveDir, 0777) < 0) { virReportSystemError(errno, _("Cannot create save directory '%1$s'"), @@ -583,6 +594,9 @@ virCHMonitorNew(virDomainObj *vm, virCHDriverConfig *cfg) virCommandAddArg(cmd, "--api-socket"); virCommandAddArgFormat(cmd, "fd=%d", socket_fd); + virCommandAddArg(cmd, "-v"); + virCommandAddArg(cmd, "--log-file"); + virCommandAddArgFormat(cmd, "%s", logfile); virCommandPassFD(cmd, socket_fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); /* launch Cloud-Hypervisor socket */ -- 2.44.0

1 0

[PATCH] util: Rename variable "major" in virIsDevMapperDevice
by Jiri Denemark 11 Oct '24

11 Oct '24

major() is a macro defined in sys/sysmacros.h so luckily the code works, but it's very confusing. Let's rename the local variable to make the difference between it and the macro more obvious. And while touching the line we can also initialize it to make sure "clever" analyzers do not think it may be used uninitialized. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/util/virdevmapper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index 70ce0f0c23..d0eae671ab 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -321,14 +321,14 @@ bool virIsDevMapperDevice(const char *dev_name) { struct stat buf; - unsigned int major; + unsigned int maj = 0; - if (virDevMapperGetMajor(&major) < 0) + if (virDevMapperGetMajor(&maj) < 0) return false; if (!stat(dev_name, &buf) && S_ISBLK(buf.st_mode) && - major(buf.st_rdev) == major) + major(buf.st_rdev) == maj) return true; return false; -- 2.47.0

2 1

[libvirt PATCH] Remove pointless bool conversions
by Ján Tomko 11 Oct '24

11 Oct '24

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_process.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 8 ++++---- src/qemu/qemu_process.c | 2 +- tools/virsh-snapshot.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 0f129ec69c..c0122eb295 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -855,7 +855,7 @@ libxlDomainCleanup(libxlDriverPrivate *driver, priv->deathW = NULL; } - if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) + if (g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) driver->inhibitCallback(false, driver->inhibitOpaque); /* Release auto-allocated graphics ports */ diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 205ab96ebb..dc6f4fc03c 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -203,7 +203,7 @@ static void virLXCProcessCleanup(virLXCDriver *driver, vm->pid = 0; vm->def->id = -1; - if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) + if (g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) driver->inhibitCallback(false, driver->inhibitOpaque); virLXCDomainReAttachHostDevices(driver, vm->def); diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 26072ec26e..e65dbb93d9 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -588,7 +588,7 @@ virNWFilterSnoopReqPut(virNWFilterSnoopReq *req) if (!req) return; - if (!!g_atomic_int_dec_and_test(&req->refctr)) { + if (g_atomic_int_dec_and_test(&req->refctr)) { /* * delete the request: * - if we don't find req on the global list anymore @@ -743,7 +743,7 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReq *req, skip_instantiate: g_free(ipl); - ignore_value(!!g_atomic_int_dec_and_test(&virNWFilterSnoopState.nLeases)); + ignore_value(g_atomic_int_dec_and_test(&virNWFilterSnoopState.nLeases)); return ret; } @@ -1004,7 +1004,7 @@ static void virNWFilterDHCPDecodeWorker(void *jobdata, void *opaque) _("Instantiation of rules failed on interface '%1$s'"), req->binding->portdevname); } - ignore_value(!!g_atomic_int_dec_and_test(job->qCtr)); + ignore_value(g_atomic_int_dec_and_test(job->qCtr)); } /* @@ -1388,7 +1388,7 @@ virNWFilterDHCPSnoopThread(void *req0) pcap_close(pcapConf[i].handle); } - ignore_value(!!g_atomic_int_dec_and_test(&virNWFilterSnoopState.nThreads)); + ignore_value(g_atomic_int_dec_and_test(&virNWFilterSnoopState.nThreads)); return; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a00066e88e..f85e164c10 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8743,7 +8743,7 @@ void qemuProcessStop(virQEMUDriver *driver, if (priv->eventThread) g_object_unref(g_steal_pointer(&priv->eventThread)); - if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) + if (g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) driver->inhibitCallback(false, driver->inhibitOpaque); /* Clear network bandwidth */ diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 8b6a950a01..e0be8e7582 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -780,8 +780,8 @@ virshSnapshotFilter(vshControl *ctl, virDomainSnapshotPtr snapshot, return -1; } if (STREQ(state, "disk-snapshot")) { - return !!((flags & VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY) && - (flags & VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL)); + return (flags & VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY) && + (flags & VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL); } if (!(flags & VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL)) -- 2.47.0

2 1

[PATCH] network: inhibit idle timeout of daemon if there are any active networks
by Laine Stump 11 Oct '24

11 Oct '24

When the daemons were split out from the monolithic libvirtd, the network driver didn't implement "inhibit idle timeout if there are any active objects" as was done for other drivers, so virtnetworkd would always exit after 120 seconds of no incoming connections. This didn't every cause any visible problem, although it did mean that anytime a network API was called after an idle time > 120 seconds, that the restarting virtnetworkd would flush and reload all the iptables/nftables rules for any active networks. This patch replicates what is done in the QEMU driver - an nactive is added to the network driver object, along with an inhibitCallback; the latter is passed into networkStateInitialize when the driver is loaded, and the former is incremented for each already-active network, then incremented/decremented each time a network is started or stopped. If nactive transitions from 0 to 1 or 1 to 0, inhibitCallback is called, and it "does the right stuff" to prevent/enable the idle timeout. Signed-off-by: Laine Stump <laine(a)redhat.com> --- I had made this patch as a part of a larger series that will require it, but haven't sent that yet and keep being annoyed when virtnetworkd exits out from under a gdb session, so I decided it has enough general usefulness to send by itself. src/network/bridge_driver.c | 20 +++++++++++++++++--- src/network/bridge_driver_conf.h | 9 ++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 74ba59b4e9..6a48516fdf 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -501,9 +501,13 @@ networkUpdateState(virNetworkObj *obj, return -1; } - if (virNetworkObjIsActive(obj)) + if (virNetworkObjIsActive(obj)) { virNetworkObjPortForEach(obj, networkUpdatePort, obj); + if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback) + driver->inhibitCallback(true, driver->inhibitOpaque); + } + /* Try and read dnsmasq pids of both active and inactive networks, just in * case a network became inactive and we need to clean up. */ if (def->ips && (def->nips > 0)) { @@ -617,8 +621,8 @@ static virDrvStateInitResult networkStateInitialize(bool privileged, const char *root, bool monolithic G_GNUC_UNUSED, - virStateInhibitCallback callback G_GNUC_UNUSED, - void *opaque G_GNUC_UNUSED) + virStateInhibitCallback callback, + void *opaque) { virNetworkDriverConfig *cfg; bool autostart = true; @@ -640,6 +644,9 @@ networkStateInitialize(bool privileged, goto error; } + network_driver->inhibitCallback = callback; + network_driver->inhibitOpaque = opaque; + network_driver->privileged = privileged; if (!(network_driver->xmlopt = networkDnsmasqCreateXMLConf())) @@ -2427,6 +2434,9 @@ networkStartNetwork(virNetworkDriverState *driver, obj, network_driver->xmlopt) < 0) goto cleanup; + if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback) + driver->inhibitCallback(true, driver->inhibitOpaque); + virNetworkObjSetActive(obj, true); VIR_INFO("Network '%s' started up", def->name); ret = 0; @@ -2500,6 +2510,10 @@ networkShutdownNetwork(virNetworkDriverState *driver, VIR_HOOK_SUBOP_END); virNetworkObjSetActive(obj, false); + + if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback) + driver->inhibitCallback(false, driver->inhibitOpaque); + virNetworkObjUnsetDefTransient(obj); return ret; } diff --git a/src/network/bridge_driver_conf.h b/src/network/bridge_driver_conf.h index 8f221f391e..1beed01efb 100644 --- a/src/network/bridge_driver_conf.h +++ b/src/network/bridge_driver_conf.h @@ -21,7 +21,7 @@ #pragma once -#include "internal.h" +#include "libvirt_internal.h" #include "virthread.h" #include "virdnsmasq.h" #include "virnetworkobj.h" @@ -49,6 +49,13 @@ typedef struct _virNetworkDriverState virNetworkDriverState; struct _virNetworkDriverState { virMutex lock; + /* Atomic inc/dec only */ + unsigned int nactive; + + /* Immutable pointers. Caller must provide locking */ + virStateInhibitCallback inhibitCallback; + void *inhibitOpaque; + /* Read-only */ bool privileged; -- 2.46.1

4 4