External/libvirt
1
0
Fork 0
Code

qemuBuildMemoryBackendProps: Move @prealloc setting to backend agnostic part

Browse Source 
All three memory backends (-file, -ram and -memfd) have .prealloc
attribute. Since we are setting it only for -file, the
corresponding code lives only under if() that handles that
specific backend. But in near future we will want to set the
attribute for other backends too. Therefore, move the
corresponding code outside of the if().

This causes some .argv files to be changed, but the only change
happening there is move of the attribute (best viewed with:
'git show --color-words=.').

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Michal Privoznik 2020-05-25 14:35:25 +02:00
parent bfb1ab1df1
commit eda5cc7a62
19 changed files with 90 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_command.c
View File

@ -3109,13 +3109,11 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
if (mem->nvdimmPath) { if (mem->nvdimmPath) {
memPath = g_strdup(mem->nvdimmPath); memPath = g_strdup(mem->nvdimmPath);
if (!priv->memPrealloc) prealloc = true;
prealloc = true;
} else if (useHugepage) { } else if (useHugepage) {
if (qemuGetDomainHupageMemPath(priv->driver, def, pagesize, &memPath) < 0) if (qemuGetDomainHupageMemPath(priv->driver, def, pagesize, &memPath) < 0)
return -1; return -1;
if (!priv->memPrealloc) prealloc = true;
prealloc = true;
} else { } else {
/* We can have both pagesize and mem source. If that's the case, /* We can have both pagesize and mem source. If that's the case,
* prefer hugepages as those are more specific. */ * prefer hugepages as those are more specific. */
@ -3124,7 +3122,6 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
} }
if (virJSONValueObjectAdd(props, if (virJSONValueObjectAdd(props,
"B:prealloc", prealloc,
"s:mem-path", memPath, "s:mem-path", memPath,
NULL) < 0) NULL) < 0)
return -1; return -1;
@ -3149,6 +3146,10 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
backendType = "memory-backend-ram"; backendType = "memory-backend-ram";
} }
if (!priv->memPrealloc &&
virJSONValueObjectAdd(props, "B:prealloc", prealloc, NULL) < 0)
return -1;
if (virJSONValueObjectAdd(props, "U:size", mem->size * 1024, NULL) < 0) if (virJSONValueObjectAdd(props, "U:size", mem->size * 1024, NULL) < 0)
return -1; return -1;

30
tests/qemuxml2argvdata/hugepages-memaccess.args
View File

@ -14,25 +14,25 @@ QEMU_AUDIO_DRV=none \
-m size=4194304k,slots=16,maxmem=8388608k \ -m size=4194304k,slots=16,maxmem=8388608k \
-realtime mlock=off \ -realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \ -smp 4,sockets=4,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,prealloc=yes,\ -object memory-backend-file,id=ram-node0,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,size=1073741824,\ mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,prealloc=yes,\
host-nodes=0-3,policy=bind \ size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,prealloc=yes,\ -object memory-backend-file,id=ram-node1,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=1073741824,\ mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
host-nodes=0-3,policy=bind \ size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,prealloc=yes,\ -object memory-backend-file,id=ram-node2,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,size=1073741824,\ mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,prealloc=yes,\
host-nodes=0-3,policy=bind \ size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=2,cpus=2,memdev=ram-node2 \ -numa node,nodeid=2,cpus=2,memdev=ram-node2 \
-object memory-backend-file,id=ram-node3,prealloc=yes,\ -object memory-backend-file,id=ram-node3,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,size=1073741824,\ mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,prealloc=yes,\
host-nodes=3,policy=bind \ size=1073741824,host-nodes=3,policy=bind \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \ -numa node,nodeid=3,cpus=3,memdev=ram-node3 \
-object memory-backend-file,id=memdimm0,prealloc=yes,\ -object memory-backend-file,id=memdimm0,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=536870912,\ mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
host-nodes=0-3,policy=bind \ size=536870912,host-nodes=0-3,policy=bind \
-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ -device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \

12
tests/qemuxml2argvdata/hugepages-memaccess2.args
View File

@ -18,9 +18,9 @@ QEMU_AUDIO_DRV=none \
mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=no,\ mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=no,\
size=1073741824,host-nodes=0-3,policy=bind \ size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,prealloc=yes,\ -object memory-backend-file,id=ram-node1,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=1073741824,\ mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
host-nodes=0-3,policy=bind \ size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,\ -object memory-backend-file,id=ram-node2,\
mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node2,share=no,\ mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node2,share=no,\
@ -30,9 +30,9 @@ size=1073741824,host-nodes=0-3,policy=bind \
mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3,share=no,\ mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3,share=no,\
size=1073741824,host-nodes=3,policy=bind \ size=1073741824,host-nodes=3,policy=bind \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \ -numa node,nodeid=3,cpus=3,memdev=ram-node3 \
-object memory-backend-file,id=memdimm0,prealloc=yes,\ -object memory-backend-file,id=memdimm0,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=536870912,\ mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
host-nodes=0-3,policy=bind \ size=536870912,host-nodes=0-3,policy=bind \
-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ -device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \

5
tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
View File

@ -16,8 +16,9 @@ QEMU_AUDIO_DRV=none \
-smp 2,sockets=2,cores=1,threads=1 \ -smp 2,sockets=2,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=268435456 \ -object memory-backend-ram,id=ram-node0,size=268435456 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,prealloc=yes,\ -object memory-backend-file,id=ram-node1,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu,size=805306368 \ mem-path=/dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu,prealloc=yes,\
size=805306368 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-display none \ -display none \

20
tests/qemuxml2argvdata/hugepages-numa-nodeset.args
View File

@ -14,17 +14,21 @@ QEMU_AUDIO_DRV=none \
-m 4096 \ -m 4096 \
-realtime mlock=off \ -realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \ -smp 4,sockets=4,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,prealloc=yes,\ -object memory-backend-file,id=ram-node0,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824 \ mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
size=1073741824 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,prealloc=yes,\ -object memory-backend-file,id=ram-node1,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,size=1073741824 \ mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
size=1073741824 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,prealloc=yes,\ -object memory-backend-file,id=ram-node2,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824 \ mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
size=1073741824 \
-numa node,nodeid=2,cpus=2,memdev=ram-node2 \ -numa node,nodeid=2,cpus=2,memdev=ram-node2 \
-object memory-backend-file,id=ram-node3,prealloc=yes,\ -object memory-backend-file,id=ram-node3,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824 \ mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
size=1073741824 \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \ -numa node,nodeid=3,cpus=3,memdev=ram-node3 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \

9
tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
View File

@ -17,11 +17,12 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-m size=1048576k,slots=16,maxmem=1099511627776k \ -m size=1048576k,slots=16,maxmem=1099511627776k \
-overcommit mem-lock=off \ -overcommit mem-lock=off \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,prealloc=yes,\ -object memory-backend-file,id=ram-node0,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=1073741824 \ mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
size=1073741824 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\ -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=yes,\
share=yes,size=536870912 \ prealloc=yes,size=536870912 \
-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \

24
tests/qemuxml2argvdata/hugepages-shared.args
View File

@ -14,21 +14,21 @@ QEMU_AUDIO_DRV=none \
-m 4096 \ -m 4096 \
-realtime mlock=off \ -realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \ -smp 4,sockets=4,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,prealloc=yes,\ -object memory-backend-file,id=ram-node0,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\ mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
host-nodes=0-3,policy=bind \ size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,prealloc=yes,\ -object memory-backend-file,id=ram-node1,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=1073741824,\ mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
host-nodes=0-3,policy=bind \ size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,prealloc=yes,\ -object memory-backend-file,id=ram-node2,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,size=1073741824,\ mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,prealloc=yes,\
host-nodes=0-3,policy=bind \ size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=2,cpus=2,memdev=ram-node2 \ -numa node,nodeid=2,cpus=2,memdev=ram-node2 \
-object memory-backend-file,id=ram-node3,prealloc=yes,\ -object memory-backend-file,id=ram-node3,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\ mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
host-nodes=3,policy=bind \ size=1073741824,host-nodes=3,policy=bind \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \ -numa node,nodeid=3,cpus=3,memdev=ram-node3 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \

6
tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
View File

@ -15,9 +15,9 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \ -realtime mlock=off \
-smp 2,sockets=2,cores=1,threads=1 \ -smp 2,sockets=2,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=214 \ -numa node,nodeid=0,cpus=0-1,mem=214 \
-object memory-backend-file,id=memdimm0,prealloc=yes,\ -object memory-backend-file,id=memdimm0,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,size=536870912,\ mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
host-nodes=1-3,policy=bind \ size=536870912,host-nodes=1-3,policy=bind \
-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ -device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
-object memory-backend-ram,id=memdimm2,size=536870912 \ -object memory-backend-ram,id=memdimm2,size=536870912 \
-device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2 \ -device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2 \

6
tests/qemuxml2argvdata/memory-hotplug-dimm.args
View File

@ -17,9 +17,9 @@ QEMU_AUDIO_DRV=none \
-numa node,nodeid=0,cpus=0-1,mem=214 \ -numa node,nodeid=0,cpus=0-1,mem=214 \
-object memory-backend-ram,id=memdimm0,size=536870912 \ -object memory-backend-ram,id=memdimm0,size=536870912 \
-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ -device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
-object memory-backend-file,id=memdimm1,prealloc=yes,\ -object memory-backend-file,id=memdimm1,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,size=536870912,\ mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
host-nodes=1-3,policy=bind \ size=536870912,host-nodes=1-3,policy=bind \
-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ -device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \

4
tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
View File

@ -19,8 +19,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=224395264 \ -object memory-backend-ram,id=ram-node0,size=224395264 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\ -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\
share=no,size=536870912 \ prealloc=yes,size=536870912 \
-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \

4
tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
View File

@ -19,8 +19,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=224395264 \ -object memory-backend-ram,id=ram-node0,size=224395264 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\ -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\
share=no,size=536870912,align=2097152 \ prealloc=yes,size=536870912,align=2097152 \
-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \

4
tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
View File

@ -19,8 +19,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=224395264 \ -object memory-backend-ram,id=ram-node0,size=224395264 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\ -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\
share=no,size=536870912 \ prealloc=yes,size=536870912 \
-device nvdimm,node=0,label-size=131072,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -device nvdimm,node=0,label-size=131072,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \

4
tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
View File

@ -19,8 +19,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=224395264 \ -object memory-backend-ram,id=ram-node0,size=224395264 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\ -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\
share=no,size=536870912,pmem=yes \ prealloc=yes,size=536870912,pmem=yes \
-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \

2
tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
View File

@ -18,7 +18,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-overcommit mem-lock=off \ -overcommit mem-lock=off \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=1024 \ -numa node,nodeid=0,cpus=0-1,mem=1024 \
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\ -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=yes,\
size=537001984 \ size=537001984 \
-device nvdimm,node=0,label-size=131072,\ -device nvdimm,node=0,label-size=131072,\
uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \

4
tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
View File

@ -19,8 +19,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=224395264 \ -object memory-backend-ram,id=ram-node0,size=224395264 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\ -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\
share=no,size=536870912 \ prealloc=yes,size=536870912 \
-device nvdimm,node=0,unarmed=on,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -device nvdimm,node=0,unarmed=on,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \ -display none \

2
tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
View File

@ -19,7 +19,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=1073741824 \ -object memory-backend-ram,id=ram-node0,size=1073741824 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\ -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=yes,\
size=536870912 \ size=536870912 \
-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \

4
tests/qemuxml2argvdata/pages-dimm-discard.args
View File

@ -15,8 +15,8 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \ -realtime mlock=off \
-smp 2,sockets=2,cores=1,threads=1 \ -smp 2,sockets=2,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=1024 \ -numa node,nodeid=0,cpus=0-1,mem=1024 \
-object memory-backend-file,id=memdimm0,prealloc=yes,\ -object memory-backend-file,id=memdimm0,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,\ mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,prealloc=yes,size=1073741824,\
host-nodes=1-3,policy=bind \ host-nodes=1-3,policy=bind \
-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ -device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
-object memory-backend-file,id=memdimm1,\ -object memory-backend-file,id=memdimm1,\

16
tests/qemuxml2argvdata/user-aliases.args
View File

@ -16,17 +16,17 @@ file=/tmp/lib/domain--1-gentoo/master-key.aes \
-m 4096 \ -m 4096 \
-realtime mlock=off \ -realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \ -smp 4,sockets=4,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,prealloc=yes,\ -object memory-backend-file,id=ram-node0,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,size=1073741824 \ mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=yes,size=1073741824 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,prealloc=yes,\ -object memory-backend-file,id=ram-node1,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,size=1073741824 \ mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=yes,size=1073741824 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,prealloc=yes,\ -object memory-backend-file,id=ram-node2,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,size=1073741824 \ mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=yes,size=1073741824 \
-numa node,nodeid=2,cpus=2,memdev=ram-node2 \ -numa node,nodeid=2,cpus=2,memdev=ram-node2 \
-object memory-backend-file,id=ram-node3,prealloc=yes,\ -object memory-backend-file,id=ram-node3,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,size=1073741824 \ mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=yes,size=1073741824 \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \ -numa node,nodeid=3,cpus=3,memdev=ram-node3 \
-uuid a75aca4b-a02f-2bcb-4a91-c93cd848c34b \ -uuid a75aca4b-a02f-2bcb-4a91-c93cd848c34b \
-no-user-config \ -no-user-config \

5
tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
View File

@ -17,8 +17,9 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-m 2048 \ -m 2048 \
-overcommit mem-lock=off \ -overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \ -smp 2,sockets=2,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,prealloc=yes,\ -object memory-backend-file,id=ram-node0,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-guest,share=yes,size=2147483648 \ mem-path=/dev/hugepages2M/libvirt/qemu/-1-guest,share=yes,prealloc=yes,\
size=2147483648 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \ -display none \