9:03 a.m.
Now we have everything prepared for generating the command line.
The device alias prefix was chosen to be 'virtiopmem'.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1735375
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_alias.c | 44 ++++++----
src/qemu/qemu_command.c | 82 ++++++++++---------
...ory-hotplug-virtio-pmem.x86_64-latest.args | 45 ++++++++++
tests/qemuxml2argvtest.c | 1 +
4 files changed, 120 insertions(+), 52 deletions(-)
create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 931dbd4e84..68d4a7b480 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -466,6 +466,28 @@ qemuAssignDeviceRNGAlias(virDomainDefPtr def,
}
+static int
+qemuDeviceMemoryGetAliasID(virDomainDefPtr def,
+ virDomainMemoryDefPtr mem,
+ bool oldAlias,
+ const char *prefix)
+{
+ size_t i;
+ int maxidx = 0;
+
+ if (!oldAlias)
+ return mem->info.addr.dimm.slot;
+
+ for (i = 0; i < def->nmems; i++) {
+ int idx;
+ if ((idx = qemuDomainDeviceAliasIndex(&def->mems[i]->info, prefix))
>= maxidx)
+ maxidx = idx + 1;
+ }
+
+ return maxidx;
+}
+
+
/**
* qemuAssignDeviceMemoryAlias:
* @def: domain definition. Necessary only if @oldAlias is true.
@@ -483,10 +505,8 @@ qemuAssignDeviceMemoryAlias(virDomainDefPtr def,
virDomainMemoryDefPtr mem,
bool oldAlias)
{
- size_t i;
- int maxidx = 0;
- int idx;
const char *prefix = NULL;
+ int idx = 0;
if (mem->info.alias)
return 0;
@@ -494,26 +514,22 @@ qemuAssignDeviceMemoryAlias(virDomainDefPtr def,
switch (mem->model) {
case VIR_DOMAIN_MEMORY_MODEL_DIMM:
prefix = "dimm";
+ idx = qemuDeviceMemoryGetAliasID(def, mem, oldAlias, prefix);
break;
case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
prefix = "nvdimm";
+ idx = qemuDeviceMemoryGetAliasID(def, mem, oldAlias, prefix);
break;
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO:
+ prefix = "virtiopmem";
+ idx = qemuDeviceMemoryGetAliasID(def, mem, true, prefix);
+ break;
case VIR_DOMAIN_MEMORY_MODEL_NONE:
case VIR_DOMAIN_MEMORY_MODEL_LAST:
break;
}
- if (oldAlias) {
- for (i = 0; i < def->nmems; i++) {
- if ((idx = qemuDomainDeviceAliasIndex(&def->mems[i]->info, prefix))
>= maxidx)
- maxidx = idx + 1;
- }
- } else {
- maxidx = mem->info.addr.dimm.slot;
- }
-
- mem->info.alias = g_strdup_printf("%s%d", prefix, maxidx);
+ mem->info.alias = g_strdup_printf("%s%d", prefix, idx);
return 0;
}
@@ -688,7 +704,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
return -1;
}
for (i = 0; i < def->nmems; i++) {
- if (qemuAssignDeviceMemoryAlias(NULL, def->mems[i], false) < 0)
+ if (qemuAssignDeviceMemoryAlias(def, def->mems[i], false) < 0)
return -1;
}
if (def->vsock) {
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index ae1b7bc81b..1ee5110b44 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2940,7 +2940,8 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
virDomainMemoryAccess memAccess = mem->access;
size_t i;
g_autofree char *memPath = NULL;
- bool prealloc = false;
+ bool wantPrealloc = false;
+ bool allowPrealloc = !priv->memPrealloc;
virBitmapPtr nodemask = NULL;
int rc;
g_autoptr(virJSONValue) props = NULL;
@@ -2974,6 +2975,11 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
nvdimmPmem = mem->s.nvdimm.pmem;
break;
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO:
+ nvdimmPath = mem->s.virtio.path;
+ /* virtio-pmem doesn't need prealloc, it's very likely exposing a real
+ * device and thus there's nothing to prealloc */
+ allowPrealloc = false;
+ break;
case VIR_DOMAIN_MEMORY_MODEL_NONE:
case VIR_DOMAIN_MEMORY_MODEL_LAST:
break;
@@ -3003,7 +3009,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
discard = def->mem.discard;
if (def->mem.allocation == VIR_DOMAIN_MEMORY_ALLOCATION_IMMEDIATE)
- prealloc = true;
+ wantPrealloc = true;
if (virDomainNumatuneGetMode(def->numa, mem->targetNode, &mode) < 0
&&
virDomainNumatuneGetMode(def->numa, -1, &mode) < 0)
@@ -3078,7 +3084,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
return -1;
}
- prealloc = true;
+ wantPrealloc = true;
}
if (qemuBuildMemoryBackendPropsShare(props, memAccess) < 0)
@@ -3089,11 +3095,11 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
if (nvdimmPath) {
memPath = g_strdup(nvdimmPath);
- prealloc = true;
+ wantPrealloc = true;
} else if (useHugepage) {
if (qemuGetDomainHupageMemPath(priv->driver, def, pagesize, &memPath)
< 0)
return -1;
- prealloc = true;
+ wantPrealloc = true;
} else {
/* We can have both pagesize and mem source. If that's the case,
* prefer hugepages as those are more specific. */
@@ -3126,8 +3132,8 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
backendType = "memory-backend-ram";
}
- if (!priv->memPrealloc &&
- virJSONValueObjectAdd(props, "B:prealloc", prealloc, NULL) < 0)
+ if (allowPrealloc &&
+ virJSONValueObjectAdd(props, "B:prealloc", wantPrealloc, NULL) < 0)
return -1;
if (virJSONValueObjectAdd(props, "U:size", mem->size * 1024, NULL) <
0)
@@ -3282,7 +3288,7 @@ qemuBuildMemoryDeviceStr(const virDomainDef *def,
virQEMUCapsPtr qemuCaps)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
- const char *device;
+ const char *device = NULL;
if (!mem->info.alias) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -3291,46 +3297,46 @@ qemuBuildMemoryDeviceStr(const virDomainDef *def,
}
switch (mem->model) {
- case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
case VIR_DOMAIN_MEMORY_MODEL_DIMM:
-
- if (mem->model == VIR_DOMAIN_MEMORY_MODEL_DIMM)
- device = "pc-dimm";
- else
- device = "nvdimm";
-
- virBufferAsprintf(&buf, "%s,", device);
-
- if (mem->targetNode >= 0)
- virBufferAsprintf(&buf, "node=%d,", mem->targetNode);
-
- if (mem->labelsize)
- virBufferAsprintf(&buf, "label-size=%llu,", mem->labelsize *
1024);
-
- if (virUUIDIsValid(mem->uuid)) {
- char uuidstr[VIR_UUID_STRING_BUFLEN];
-
- virUUIDFormat(mem->uuid, uuidstr);
- virBufferAsprintf(&buf, "uuid=%s,", uuidstr);
- }
-
- if (mem->readonly) {
- virBufferAddLit(&buf, "unarmed=on,");
- }
-
- virBufferAsprintf(&buf, "memdev=mem%s,id=%s",
- mem->info.alias, mem->info.alias);
-
- qemuBuildDeviceAddressStr(&buf, def, &mem->info, qemuCaps);
+ device = "pc-dimm";
+ break;
+ case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+ device = "nvdimm";
break;
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO:
+ device = "virtio-pmem-pci";
+
case VIR_DOMAIN_MEMORY_MODEL_NONE:
case VIR_DOMAIN_MEMORY_MODEL_LAST:
break;
+ }
+
+ virBufferAsprintf(&buf, "%s,", device);
+
+ if (mem->targetNode >= 0)
+ virBufferAsprintf(&buf, "node=%d,", mem->targetNode);
+
+ if (mem->labelsize)
+ virBufferAsprintf(&buf, "label-size=%llu,", mem->labelsize *
1024);
+
+ if (virUUIDIsValid(mem->uuid)) {
+ char uuidstr[VIR_UUID_STRING_BUFLEN];
+ virUUIDFormat(mem->uuid, uuidstr);
+ virBufferAsprintf(&buf, "uuid=%s,", uuidstr);
}
+ if (mem->readonly) {
+ virBufferAddLit(&buf, "unarmed=on,");
+ }
+
+ virBufferAsprintf(&buf, "memdev=mem%s,id=%s",
+ mem->info.alias, mem->info.alias);
+
+ qemuBuildDeviceAddressStr(&buf, def, &mem->info, qemuCaps);
+
+
return virBufferContentAndReset(&buf);
}
diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
new file mode 100644
index 0000000000..e2f5097424
--- /dev/null
+++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
@@ -0,0 +1,45 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+-machine pc,accel=kvm,usb=off,dump-guest-core=off \
+-cpu qemu64 \
+-m size=2095104k,slots=16,maxmem=1099511627776k \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,dies=1,cores=1,threads=1 \
+-object memory-backend-ram,id=ram-node0,size=2145386496 \
+-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
+-object memory-backend-file,id=memvirtiopmem0,mem-path=/tmp/virtio_pmem,\
+share=yes,size=536870912 \
+-device virtio-pmem-pci,memdev=memvirtiopmem0,id=virtiopmem0,bus=pci.0,\
+addr=0x5 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\
+"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
+"file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 42d147243e..ba904149e8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3012,6 +3012,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-pmem");
DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-readonly");
DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-nvdimm-ppc64",
"ppc64");
+ DO_TEST_CAPS_LATEST("memory-hotplug-virtio-pmem");
DO_TEST("machine-aeskeywrap-on-caps",
QEMU_CAPS_AES_KEY_WRAP,
--
2.26.2