External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-04-26 15:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: command: Switch to bytes when formatting size for memory backends

Browse Source 
QEMU's command line visitor as well as the JSON interface take bytes by
default for memory object sizes. Convert mebibytes to bytes so that we
can later refactor the existing code for hotplug purposes.
This commit is contained in:
Peter Krempa 2015-01-15 17:31:31 +01:00
parent a47174c508
commit b50b4ef30c
7 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_command.c
View File

@ -4650,7 +4650,7 @@ qemuBuildMemoryBackendStr(unsigned long long size,
virBufferAsprintf(&buf, "memory-backend-ram,id=%s%zu", aliasPrefix, id); virBufferAsprintf(&buf, "memory-backend-ram,id=%s%zu", aliasPrefix, id);
} }
virBufferAsprintf(&buf, ",size=%lluM", size / 1024); virBufferAsprintf(&buf, ",size=%llu", size * 1024);
if (userNodeset) { if (userNodeset) {
if (!(nodemask = virBitmapFormat(userNodeset))) if (!(nodemask = virBitmapFormat(userNodeset)))

12
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args
View File

@ -1,16 +1,20 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
/usr/bin/qemu -S -M pc -m 4096 -smp 4 \ /usr/bin/qemu -S -M pc -m 4096 -smp 4 \
-object memory-backend-file,id=ram-node0,prealloc=yes,\ -object memory-backend-file,id=ram-node0,prealloc=yes,\
mem-path=/dev/hugepages1G/libvirt/qemu,size=1024M,host-nodes=0-3,policy=bind \ mem-path=/dev/hugepages1G/libvirt/qemu,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,prealloc=yes,\
mem-path=/dev/hugepages2M/libvirt/qemu,size=1024M,host-nodes=0-3,policy=bind \ mem-path=/dev/hugepages2M/libvirt/qemu,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,prealloc=yes,\
mem-path=/dev/hugepages1G/libvirt/qemu,size=1024M,host-nodes=0-3,policy=bind \ mem-path=/dev/hugepages1G/libvirt/qemu,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,prealloc=yes,\
mem-path=/dev/hugepages1G/libvirt/qemu,size=1024M,host-nodes=3,policy=bind \ mem-path=/dev/hugepages1G/libvirt/qemu,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 \
-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args
View File

@ -1,10 +1,10 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
/usr/bin/qemu -S -M pc -m 1024 -smp 2 \ /usr/bin/qemu -S -M pc -m 1024 -smp 2 \
-object memory-backend-file,id=ram-node0,prealloc=yes,\ -object memory-backend-file,id=ram-node0,prealloc=yes,\
mem-path=/dev/hugepages2M/libvirt/qemu,size=256M \ mem-path=/dev/hugepages2M/libvirt/qemu,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,prealloc=yes,\
mem-path=/dev/hugepages2M/libvirt/qemu,size=768M \ mem-path=/dev/hugepages2M/libvirt/qemu,size=805306368 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
-usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args
View File

@ -2,7 +2,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
/usr/bin/qemu -S -M pc -m 1024 -smp 2 \ /usr/bin/qemu -S -M pc -m 1024 -smp 2 \
-numa node,nodeid=0,cpus=0,mem=256 \ -numa node,nodeid=0,cpus=0,mem=256 \
-object memory-backend-file,id=ram-node1,prealloc=yes,\ -object memory-backend-file,id=ram-node1,prealloc=yes,\
mem-path=/dev/hugepages1G/libvirt/qemu,size=768M \ mem-path=/dev/hugepages1G/libvirt/qemu,size=805306368 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none

14
tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
View File

@ -1,18 +1,20 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
/usr/bin/qemu -S -M pc -m 4096 -smp 4 \ /usr/bin/qemu -S -M pc -m 4096 -smp 4 \
-object memory-backend-file,id=ram-node0,prealloc=yes,\ -object memory-backend-file,id=ram-node0,prealloc=yes,\
mem-path=/dev/hugepages1G/libvirt/qemu,size=1024M,host-nodes=0-3,policy=bind \ mem-path=/dev/hugepages1G/libvirt/qemu,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,prealloc=yes,\
mem-path=/dev/hugepages2M/libvirt/qemu,share=yes,size=1024M,host-nodes=0-3,\ mem-path=/dev/hugepages2M/libvirt/qemu,share=yes,size=1073741824,\
policy=bind \ 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,prealloc=yes,\
mem-path=/dev/hugepages1G/libvirt/qemu,share=no,size=1024M,host-nodes=0-3,\ mem-path=/dev/hugepages1G/libvirt/qemu,share=no,size=1073741824,\
policy=bind \ 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,prealloc=yes,\
mem-path=/dev/hugepages1G/libvirt/qemu,size=1024M,host-nodes=3,policy=bind \ mem-path=/dev/hugepages1G/libvirt/qemu,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 \
-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none

3
tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args
View File

@ -1,6 +1,7 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
/usr/bin/kvm -S -M pc -m 64 -smp 2 \ /usr/bin/kvm -S -M pc -m 64 -smp 2 \
-object memory-backend-ram,id=ram-node0,size=32M,host-nodes=3,policy=preferred \ -object memory-backend-ram,id=ram-node0,size=33554432,host-nodes=3,\
policy=preferred \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-numa node,nodeid=1,cpus=1,mem=32 \ -numa node,nodeid=1,cpus=1,mem=32 \
-nographic -monitor unix:/tmp/test-monitor,server,nowait \ -nographic -monitor unix:/tmp/test-monitor,server,nowait \

8
tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args
View File

@ -1,10 +1,12 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
/usr/bin/kvm -S -M pc -m 24104 -smp 32 \ /usr/bin/kvm -S -M pc -m 24104 -smp 32 \
-object memory-backend-ram,id=ram-node0,size=20M,host-nodes=3,policy=preferred \ -object memory-backend-ram,id=ram-node0,size=20971520,host-nodes=3,\
policy=preferred \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-ram,id=ram-node1,size=645M,host-nodes=0-7,policy=bind \ -object memory-backend-ram,id=ram-node1,size=676331520,host-nodes=0-7,\
policy=bind \
-numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \ -numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \
-object memory-backend-ram,id=ram-node2,size=23440M,\ -object memory-backend-ram,id=ram-node2,size=24578621440,\
host-nodes=1-2,host-nodes=5,host-nodes=7,policy=bind \ host-nodes=1-2,host-nodes=5,host-nodes=7,policy=bind \
-numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \ -numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \
-nographic -monitor unix:/tmp/test-monitor,server,nowait \ -nographic -monitor unix:/tmp/test-monitor,server,nowait \