From: Richard Henderson <richard.henderson@linaro.org>
Date: Mon, 20 Jul 2020 09:25:36 +0000 (+0100)
Subject: hw/arm/virt: Disable memory hotplug when MTE is enabled
X-Git-Tag: v5.1.0-rc1~8^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=19bd6aafbd184be963d2b7c24874e3252a7088b7;p=users%2Fdwmw2%2Fqemu.git

hw/arm/virt: Disable memory hotplug when MTE is enabled

When MTE is enabled, tag memory must exist for all RAM.

It might be possible to simultaneously hot plug tag memory
alongside the corresponding normal memory, but for now just
disable hotplug.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20200713213341.590275-4-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index a7f3d442db..ecfee362a1 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2194,6 +2194,11 @@ static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
         return;
     }
 
+    if (vms->mte) {
+        error_setg(errp, "memory hotplug is not enabled: MTE is enabled");
+        return;
+    }
+
     if (is_nvdimm && !ms->nvdimms_state->is_enabled) {
         error_setg(errp, "nvdimm is not enabled: add 'nvdimm=on' to '-M'");
         return;