qemu: command: Validate that memory devices slot ID is in range

slot id, if specified, has to be less than the slots count.

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index ba15dc9f1132f22662b2900cc6c48e97529ab30d..21daf18c6b85e95be66b7bdca27c9aac806c2106 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4946,6 +4946,7 @@ qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem,
 
 char *
 qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem,
+                         virDomainDefPtr def,
                          virQEMUCapsPtr qemuCaps)
 {
     virBuffer buf = VIR_BUFFER_INITIALIZER;
@@ -4972,6 +4973,14 @@ qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem,
             return NULL;
         }
 
+        if (mem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM &&
+            mem->info.addr.dimm.slot >= def->mem.memory_slots) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("memory device slot '%u' exceeds slots count '%u'"),
+                           mem->info.addr.dimm.slot, def->mem.memory_slots);
+            return NULL;
+        }
+
         virBufferAsprintf(&buf, "pc-dimm,node=%d,memdev=mem%s,id=%s",
                           mem->targetNode, mem->info.alias, mem->info.alias);
 
@@ -8821,7 +8830,7 @@ qemuBuildCommandLine(virConnectPtr conn,
                                                           qemuCaps, cfg)))
                 goto error;
 
-            if (!(dimmStr = qemuBuildMemoryDeviceStr(def->mems[i], qemuCaps))) {
+            if (!(dimmStr = qemuBuildMemoryDeviceStr(def->mems[i], def, qemuCaps))) {
                 VIR_FREE(backStr);
                 goto error;
             }

diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index a29db41d1ec5504199cc7f332f25bb991af3143e..675eb6240102477f35c1f766f400b96251632367 100644 (file)
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -175,6 +175,7 @@ int qemuBuildMemoryBackendStr(unsigned long long size,
                               bool force);
 
 char *qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem,
+                               virDomainDefPtr def,
                                virQEMUCapsPtr qemuCaps);
 
 /* Legacy, pre device support */

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 58224bfc49691beb521fbb969176dd1f25f944cb..ba92320512cd83105825a9d1fe37a1776e18cf8d 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1736,7 +1736,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver,
     if (virAsprintf(&objalias, "mem%s", mem->info.alias) < 0)
         goto cleanup;
 
-    if (!(devstr = qemuBuildMemoryDeviceStr(mem, priv->qemuCaps)))
+    if (!(devstr = qemuBuildMemoryDeviceStr(mem, vm->def, priv->qemuCaps)))
         goto cleanup;
 
     qemuDomainMemoryDeviceAlignSize(mem);