58 lines
2.3 KiB
Diff
58 lines
2.3 KiB
Diff
From f63d6889b34af9b0b7808566945d6e1720d7c1fd Mon Sep 17 00:00:00 2001
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Wed, 8 Jul 2020 09:13:42 +0200
|
|
Subject: [PATCH 4/6] qemuBuildMemoryBackendProps: Use boolean type for 'pmem'
|
|
property
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Commit 82576d8f35e used a string "on" to enable the 'pmem' property.
|
|
This is okay for the command line visitor, but the property is declared
|
|
as boolean in qemu and thus it will not work when using QMP.
|
|
|
|
Modify the type to boolean. This changes the command line, but
|
|
fortunately the command line visitor in qemu parses both 'yes' and 'on'
|
|
as true for the property.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1854684
|
|
|
|
cherry pick from: e95da4e5bf53ff977f440903df9f7343f2fb6f0e
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
---
|
|
src/qemu/qemu_command.c | 2 +-
|
|
tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
index 2f0e919..014a0e4 100644
|
|
--- a/src/qemu/qemu_command.c
|
|
+++ b/src/qemu/qemu_command.c
|
|
@@ -3523,7 +3523,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
|
|
"with this QEMU binary"));
|
|
return -1;
|
|
}
|
|
- if (virJSONValueObjectAdd(props, "s:pmem", "on", NULL) < 0)
|
|
+ if (virJSONValueObjectAdd(props, "b:pmem", true, NULL) < 0)
|
|
return -1;
|
|
}
|
|
|
|
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
|
|
index 5dfba9b..00a78ba 100644
|
|
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
|
|
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
|
|
@@ -19,7 +19,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
|
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
|
|
-numa node,nodeid=0,cpus=0-1,mem=214 \
|
|
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
|
|
-share=no,size=536870912,pmem=on \
|
|
+share=no,size=536870912,pmem=yes \
|
|
-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \
|
|
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
|
-display none \
|
|
--
|
|
1.8.3.1
|
|
|