From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 10 Sep 2021 14:41:43 +0000 (+0200)
Subject: qemu: Wire up <memory/> offline update
X-Git-Tag: v7.9.0-rc1~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99e4ae2b022290efad5819982a8cca99955264e7;p=thirdparty%2Flibvirt.git

qemu: Wire up <memory/> offline update

Updating offline XML of <memory/> devices might come handy when
dealing with virtio-mem devices. But it's implemented to just
replace one virDomainMemoryDef with another so it can be used to
change almost anything.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3d0ad3870f..15c74cf773 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7653,6 +7653,7 @@ qemuDomainUpdateDeviceConfig(virDomainDef *vmdef,
     virDomainDiskDef *newDisk;
     virDomainGraphicsDef *newGraphics;
     virDomainNetDef *net;
+    virDomainMemoryDef *mem;
     virDomainDeviceDef oldDev = { .type = dev->type };
     int pos;
 
@@ -7715,6 +7716,23 @@ qemuDomainUpdateDeviceConfig(virDomainDef *vmdef,
         dev->data.net = NULL;
         break;
 
+    case VIR_DOMAIN_DEVICE_MEMORY:
+        mem = virDomainMemoryFindByDeviceInfo(vmdef, &dev->data.memory->info, &pos);
+        if (!mem) {
+            virReportError(VIR_ERR_INVALID_ARG, "%s", _("memory not found"));
+            return -1;
+        }
+
+        oldDev.data.memory = mem;
+        if (virDomainDefCompatibleDevice(vmdef, dev, &oldDev,
+                                         VIR_DOMAIN_DEVICE_ACTION_UPDATE,
+                                         false) < 0)
+            return -1;
+
+        virDomainMemoryDefFree(vmdef->mems[pos]);
+        vmdef->mems[pos] = g_steal_pointer(&dev->data.memory);
+        break;
+
     case VIR_DOMAIN_DEVICE_FS:
     case VIR_DOMAIN_DEVICE_INPUT:
     case VIR_DOMAIN_DEVICE_SOUND:
@@ -7731,7 +7749,6 @@ qemuDomainUpdateDeviceConfig(virDomainDef *vmdef,
     case VIR_DOMAIN_DEVICE_CONTROLLER:
     case VIR_DOMAIN_DEVICE_REDIRDEV:
     case VIR_DOMAIN_DEVICE_CHR:
-    case VIR_DOMAIN_DEVICE_MEMORY:
     case VIR_DOMAIN_DEVICE_NONE:
     case VIR_DOMAIN_DEVICE_TPM:
     case VIR_DOMAIN_DEVICE_PANIC: