2015-06-24 16:09:57 +00:00
|
|
|
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
|
|
|
|
|
/usr/bin/qemu-system-x86_64 \
|
|
|
|
|
-S \
|
|
|
|
|
-M pc-i440fx-2.3 \
|
qemuBuildMemoryBackendStr: Honour passed @pagesize
So far the argument has not much meaning and was practically ignored.
This is not good since when doing memory hotplug, the size of desired
hugepage backing is passed in that argument. Taking closer look at the
tests I'm fixing reveals the bug. For instance, while the following is
in the test:
<memory model='dimm'>
<source>
<nodemask>1-3</nodemask>
<pagesize unit='KiB'>4096</pagesize>
</source>
<target>
<size unit='KiB'>524287</size>
<node>0</node>
</target>
<address type='dimm' slot='0' base='0x100000000'/>
</memory>
the generated commandline corresponding to this XML was:
-object memory-backend-ram,id=memdimm0,size=536870912,\
host-nodes=1-3,policy=bind
Have you noticed? Yes, memory-backend-ram! Nothing can be further away
from the right answer. The hugepage backing is requested in the XML
and we happily ignore it. This is just not right. It's
memory-backend-file which should have been used:
-object memory-backend-file,id=memdimm0,prealloc=yes,\
mem-path=/dev/hugepages4M/libvirt/qemu,size=536870912,\
host-nodes=1-3,policy=bind
The problem is, that @pagesize passed to qemuBuildMemoryBackendStr
(where this part of commandline is built) was ignored. The hugepage to
back memory was searched only and only by NUMA nodes pinning. This
works only for regular guest NUMA nodes.
Then, I'm changing the hugepages size in the test XMLs too. This is
simply because in the test suite we create dummy mount points just for
2M and 1G hugepages. And in the test 4M was requested. I'm sticking to
2M, but 1G should just work too.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2015-06-25 15:27:29 +00:00
|
|
|
-m size=1048576k,slots=16,maxmem=1099511627776k \
|
2015-06-24 16:09:57 +00:00
|
|
|
-smp 2 \
|
|
|
|
|
-object memory-backend-file,id=ram-node0,prealloc=yes,\
|
|
|
|
|
mem-path=/dev/hugepages2M/libvirt/qemu,size=1073741824 \
|
|
|
|
|
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
|
qemuBuildMemoryBackendStr: Honour passed @pagesize
So far the argument has not much meaning and was practically ignored.
This is not good since when doing memory hotplug, the size of desired
hugepage backing is passed in that argument. Taking closer look at the
tests I'm fixing reveals the bug. For instance, while the following is
in the test:
<memory model='dimm'>
<source>
<nodemask>1-3</nodemask>
<pagesize unit='KiB'>4096</pagesize>
</source>
<target>
<size unit='KiB'>524287</size>
<node>0</node>
</target>
<address type='dimm' slot='0' base='0x100000000'/>
</memory>
the generated commandline corresponding to this XML was:
-object memory-backend-ram,id=memdimm0,size=536870912,\
host-nodes=1-3,policy=bind
Have you noticed? Yes, memory-backend-ram! Nothing can be further away
from the right answer. The hugepage backing is requested in the XML
and we happily ignore it. This is just not right. It's
memory-backend-file which should have been used:
-object memory-backend-file,id=memdimm0,prealloc=yes,\
mem-path=/dev/hugepages4M/libvirt/qemu,size=536870912,\
host-nodes=1-3,policy=bind
The problem is, that @pagesize passed to qemuBuildMemoryBackendStr
(where this part of commandline is built) was ignored. The hugepage to
back memory was searched only and only by NUMA nodes pinning. This
works only for regular guest NUMA nodes.
Then, I'm changing the hugepages size in the test XMLs too. This is
simply because in the test suite we create dummy mount points just for
2M and 1G hugepages. And in the test 4M was requested. I'm sticking to
2M, but 1G should just work too.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2015-06-25 15:27:29 +00:00
|
|
|
-object memory-backend-file,id=memdimm0,prealloc=yes,\
|
|
|
|
|
mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=1-3,policy=bind \
|
|
|
|
|
-device pc-dimm,node=0,memdev=memdimm0,id=dimm0 \
|
2015-06-24 16:09:57 +00:00
|
|
|
-nodefaults \
|
|
|
|
|
-monitor unix:/tmp/test-monitor,server,nowait \
|
|
|
|
|
-rtc base=utc,driftfix=slew \
|
|
|
|
|
-no-kvm-pit-reinjection \
|
|
|
|
|
-global PIIX4_PM.disable_s3=1 \
|
|
|
|
|
-global PIIX4_PM.disable_s4=1 \
|
|
|
|
|
-boot c \
|
|
|
|
|
-device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x6.0x7 \
|
|
|
|
|
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x6 \
|
|
|
|
|
-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x6.0x1 \
|
|
|
|
|
-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x6.0x2 \
|
|
|
|
|
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x5 \
|
|
|
|
|
-drive file=/var/lib/libvirt/images/fedora.qcow2,if=none,id=drive-virtio-disk0 \
|
|
|
|
|
-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk0,id=virtio-disk0 \
|
|
|
|
|
-drive if=none,media=cdrom,id=drive-ide0-0-0 \
|
|
|
|
|
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
|
|
|
|
|
-serial pty \
|
|
|
|
|
-chardev socket,id=charchannel0,\
|
|
|
|
|
path=/var/lib/libvirt/qemu/channel/target/fedora.org.qemu.guest_agent.0,server,nowait \
|
|
|
|
|
-device virtserialport,bus=virtio-serial0.0,nr=1,\
|
|
|
|
|
chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 \
|
|
|
|
|
-chardev spicevmc,id=charchannel1,name=vdagent \
|
|
|
|
|
-device virtserialport,bus=virtio-serial0.0,nr=2,\
|
|
|
|
|
chardev=charchannel1,id=channel1,name=com.redhat.spice.0 \
|
|
|
|
|
-device usb-tablet,id=input0 \
|
|
|
|
|
-spice port=0 \
|
|
|
|
|
-vga qxl \
|
|
|
|
|
-global qxl-vga.ram_size=67108864 \
|
|
|
|
|
-global qxl-vga.vram_size=67108864 \
|
|
|
|
|
-device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
|
|
|
|
|
-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
|
|
|
|
|
-chardev spicevmc,id=charredir0,name=usbredir \
|
|
|
|
|
-device usb-redir,chardev=charredir0,id=redir0 \
|
|
|
|
|
-chardev spicevmc,id=charredir1,name=usbredir \
|
|
|
|
|
-device usb-redir,chardev=charredir1,id=redir1 \
|
|
|
|
|
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x8
|