dec64939c6
- arm/virt: Fix vcpu hotplug idx_from_topo_ids - Revert patches related to the vSVA - sync some bugfix patches from upstream - add generic vDPA device support Signed-off-by: yezengruan <yezengruan@huawei.com> (cherry picked from commit b99dbfd9847104300672fb4f559f1c2abba8aa33)
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From b1201fb95d14f5564d4df28ab53d16676d335934 Mon Sep 17 00:00:00 2001
|
|
From: jianchunfu <jianchunfu_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 23 Nov 2022 10:57:07 +0800
|
|
Subject: [PATCH 05/29] hw/mem/nvdimm: fix error message for 'unarmed' flag
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
In the ACPI specification [1], the 'unarmed' bit is set when a device
|
|
cannot accept a persistent write. This means that when a memdev is
|
|
read-only, the 'unarmed' flag must be turned on. The logic is correct,
|
|
just changing the error message.
|
|
[1] ACPI NFIT NVDIMM Region Mapping Structure "NVDIMM State Flags" Bit 3
|
|
|
|
Fixes: dbd730e859 ("nvdimm: check -object memory-backend-file, readonly=on option")
|
|
Signed-off-by: Julia Suvorova <jusual@redhat.com>
|
|
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Reviewed-by: Pankaj Gupta <pankaj.gupta@amd.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Acked-by: David Hildenbrand <david@redhat.com>
|
|
Signed-off-by: jianchunfu <jianchunfu_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/mem/nvdimm.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
|
|
index 7397b67156..8df1d7e088 100644
|
|
--- a/hw/mem/nvdimm.c
|
|
+++ b/hw/mem/nvdimm.c
|
|
@@ -149,7 +149,7 @@ static void nvdimm_prepare_memory_region(NVDIMMDevice *nvdimm, Error **errp)
|
|
if (!nvdimm->unarmed && memory_region_is_rom(mr)) {
|
|
HostMemoryBackend *hostmem = dimm->hostmem;
|
|
|
|
- error_setg(errp, "'unarmed' property must be off since memdev %s "
|
|
+ error_setg(errp, "'unarmed' property must be 'on' since memdev %s "
|
|
"is read-only",
|
|
object_get_canonical_path_component(OBJECT(hostmem)));
|
|
return;
|
|
--
|
|
2.27.0
|
|
|