openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: capabilities: update qemu-5.0.0 capabilities for ppc64 

Update ppc64 capabilities to pick up the new NVDIMM capability
support for ppc64.

Since the ppc64 capabilities weren't updated for some time, the
bulk of the changes here are related to the blockdev support
(see commit c6a9e54ce3 for info) that we are picking up just
now.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2020-03-23 16:40:46 -03:00 committed by Michal Privoznik
parent 75c386985e
commit 1d5f16ba81
13 changed files with 11124 additions and 9976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/domaincapsdata/qemu_5.0.0.ppc64.xml
View File

@ -108,7 +108,7 @@
<gic supported='no'/>
<vmcoreinfo supported='no'/>
<genid supported='no'/>
<backingStoreInput supported='no'/>
<backingStoreInput supported='yes'/>
<backup supported='no'/>
<sev supported='no'/>
</features>

19709
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
View File

File diff suppressed because it is too large Load Diff

1298
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
View File

File diff suppressed because it is too large Load Diff

2
tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
View File

@ -30,6 +30,4 @@ file=/tmp/lib/domain--1-default-video-type-p/master-key.aes \
-device usb-mouse,id=input1,bus=usb.0,port=2 \
-vnc 127.0.0.1:0 \
-device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on

10
tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args
View File

@ -27,13 +27,13 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-no-shutdown \
-boot strict=on \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
"file":"libvirt-1-storage"}' \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on

10
tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
View File

@ -27,13 +27,13 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-no-shutdown \
-boot strict=on \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
"file":"libvirt-1-storage"}' \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on

10
tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
View File

@ -27,13 +27,13 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-no-shutdown \
-boot strict=on \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
"file":"libvirt-1-storage"}' \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on

10
tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args
View File

@ -27,13 +27,13 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-no-shutdown \
-boot strict=on \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
"file":"libvirt-1-storage"}' \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on

10
tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args
View File

@ -27,13 +27,13 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-no-shutdown \
-boot strict=on \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
"file":"libvirt-1-storage"}' \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on

10
tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args
View File

@ -27,13 +27,13 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-no-shutdown \
-boot strict=on \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
"file":"libvirt-1-storage"}' \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on

10
tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
View File

@ -27,9 +27,11 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-boot strict=on \
-device qemu-xhci,p2=15,p3=15,id=usb,bus=pci.0,addr=0x2 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
-drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
"file":"libvirt-1-storage"}' \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-netdev user,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:a2:44:92,bus=pci.0,\
@ -46,6 +48,4 @@ id=channel0,name=org.qemu.guest_agent.0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \
-object rng-random,id=objrng0,filename=/dev/urandom \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x6 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on

10
tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
View File

@ -28,9 +28,11 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-boot strict=on \
-device qemu-xhci,p2=15,p3=15,id=usb,bus=pci.0,addr=0x2 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
-drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
"file":"libvirt-1-storage"}' \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-netdev user,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.0,\
@ -43,6 +45,4 @@ id=channel0,name=org.qemu.guest_agent.0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \
-object rng-random,id=objrng0,filename=/dev/urandom \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x6 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on

9
tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
View File

@ -29,9 +29,12 @@ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-device spapr-vscsi,id=scsi0,reg=0x00002000 \
-device spapr-vscsi,id=scsi1,reg=0x00003000 \
-drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi1-0-0-0 \
-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img",\
"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 scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,\
device_id=drive-scsi1-0-0-0,drive=drive-scsi1-0-0-0,id=scsi1-0-0-0,bootindex=1 \
device_id=drive-scsi1-0-0-0,drive=libvirt-1-format,id=scsi1-0-0-0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-chardev pty,id=charserial1 \
@ -40,6 +43,4 @@ device_id=drive-scsi1-0-0-0,drive=drive-scsi1-0-0-0,id=scsi1-0-0-0,bootindex=1 \
-chardev socket,id=chrtpm,path=/dev/test \
-device tpm-spapr,tpmdev=tpm-tpm0,id=tpm0,reg=0x00005000 \
-global spapr-nvram.reg=0x4000 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on