Skip to contentSkip to conversation

hw/mem/nvdimm: fix error message for 'unarmed' flag

PATCH In review Julia Suvorova 2 participants 2 messages Oct 24, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 hw/mem/nvdimm: fix error message for 'unarmed' flag

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")

---
v2:
* enquote 'on' [Philippe]

 hw/mem/nvdimm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/mem/nvdimm.c +1 -1
index 7c7d777781..31080c22c9 100644
@@ -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;
Signature · 1 line
2.37.3
#1 lore raw
Quoted 25 lines · Julia Suvorova

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")

---
v2:
* enquote 'on' [Philippe]

  hw/mem/nvdimm.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
hw/mem/nvdimm.c +0 -0
index 7c7d777781..31080c22c9 100644

hw/mem/nvdimm.c static void nvdimm_prepare_memory_region(NVDIMMDevice *nvdimm, Error **errp) · line 155

Quoted 8 lines
hw/mem/nvdimm.c +1 -1
@@ -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;

Thanks, queued to

https://github.com/davidhildenbrand/qemu.git mem-next

Signature · 3 lines
Thanks,

David / dhildenb