From: Boris Fiuczynski Date: Tue, 18 Mar 2025 13:48:50 +0000 (+0100) Subject: qemu_domain_address: fix CCW virtio-mem hotplug X-Git-Tag: v11.2.0-rc1~101 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ef080d6d94643fffc413127bff2b2b008a11b27;p=thirdparty%2Flibvirt.git qemu_domain_address: fix CCW virtio-mem hotplug Since commit f23f8ff91a virtio-mem supports also CCW. When hotplugging a virtio-mem device with a CCW address results in a PCI device getting attached. The method qemuDomainAssignMemoryDeviceSlot is only considering PCI as address type and overwriting the CCW address. Adding support for address type CCW. Signed-off-by: Boris Fiuczynski Reviewed-by: Ján Tomko Signed-off-by: Ján Tomko --- diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index d38983bf63..5b94c27679 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -3067,6 +3067,7 @@ qemuDomainAssignMemoryDeviceSlot(virDomainObj *vm, virDomainMemoryDef *mem) { g_autoptr(virBitmap) slotmap = NULL; + bool releaseaddr = false; virDomainDeviceDef dev = {.type = VIR_DOMAIN_DEVICE_MEMORY, .data.memory = mem}; switch (mem->model) { @@ -3080,7 +3081,7 @@ qemuDomainAssignMemoryDeviceSlot(virDomainObj *vm, case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: - return qemuDomainEnsurePCIAddress(vm, &dev); + return qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev); break; case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: