mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
qemu: ppc64: Support memory hotplug without NUMA enabled
ppc64 guests don't require adding a NUMA node for hotplug memory to work. Lift the requirement and add test cases.
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
LC_ALL=C \
|
||||
PATH=/bin \
|
||||
HOME=/home/test \
|
||||
USER=test \
|
||||
LOGNAME=test \
|
||||
QEMU_AUDIO_DRV=none \
|
||||
/usr/bin/qemu-system-ppc64 \
|
||||
-name QEMUGuest1 \
|
||||
-S \
|
||||
-M pseries \
|
||||
-m size=1310720k,slots=16,maxmem=4194304k \
|
||||
-smp 1 \
|
||||
-object memory-backend-ram,id=memdimm0,size=536870912 \
|
||||
-device pc-dimm,memdev=memdimm0,id=dimm0 \
|
||||
-object memory-backend-ram,id=memdimm1,size=536870912 \
|
||||
-device pc-dimm,memdev=memdimm1,id=dimm1 \
|
||||
-uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \
|
||||
-nographic \
|
||||
-nodefaults \
|
||||
-monitor unix:/tmp/test-monitor,server,nowait \
|
||||
-no-acpi \
|
||||
-boot c \
|
||||
-kernel /media/ram/uImage \
|
||||
-initrd /media/ram/ramdisk \
|
||||
-append 'root=/dev/ram rw console=ttyS0,115200' \
|
||||
-usb \
|
||||
-serial pty \
|
||||
-device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x2
|
||||
@@ -0,0 +1,38 @@
|
||||
<domain type='kvm'>
|
||||
<name>QEMUGuest1</name>
|
||||
<uuid>49545eb3-75e1-2d0a-acdd-f0294406c99e</uuid>
|
||||
<maxMemory slots='16' unit='KiB'>4194304</maxMemory>
|
||||
<memory unit='KiB'>2097152</memory>
|
||||
<currentMemory unit='KiB'>2097152</currentMemory>
|
||||
<vcpu placement='static'>1</vcpu>
|
||||
<os>
|
||||
<type arch='ppc64' machine='pseries'>hvm</type>
|
||||
<kernel>/media/ram/uImage</kernel>
|
||||
<initrd>/media/ram/ramdisk</initrd>
|
||||
<cmdline>root=/dev/ram rw console=ttyS0,115200</cmdline>
|
||||
</os>
|
||||
<clock offset='utc'/>
|
||||
<on_poweroff>destroy</on_poweroff>
|
||||
<on_reboot>restart</on_reboot>
|
||||
<on_crash>destroy</on_crash>
|
||||
<devices>
|
||||
<emulator>/usr/bin/qemu-system-ppc64</emulator>
|
||||
<serial type='pty'>
|
||||
<target port='0'/>
|
||||
</serial>
|
||||
<console type='pty'>
|
||||
<target type='serial' port='0'/>
|
||||
</console>
|
||||
<memballoon model='virtio'/>
|
||||
<memory model='dimm'>
|
||||
<target>
|
||||
<size unit='KiB'>523264</size>
|
||||
</target>
|
||||
</memory>
|
||||
<memory model='dimm'>
|
||||
<target>
|
||||
<size unit='KiB'>524287</size>
|
||||
</target>
|
||||
</memory>
|
||||
</devices>
|
||||
</domain>
|
||||
@@ -1651,6 +1651,8 @@ mymain(void)
|
||||
QEMU_CAPS_DEVICE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);
|
||||
DO_TEST("memory-hotplug-dimm-addr", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA,
|
||||
QEMU_CAPS_DEVICE, QEMU_CAPS_OBJECT_MEMORY_FILE);
|
||||
DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA,
|
||||
QEMU_CAPS_DEVICE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);
|
||||
|
||||
DO_TEST("machine-aeskeywrap-on-caps",
|
||||
QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP,
|
||||
|
||||
Reference in New Issue
Block a user