On Wed, Oct 26, 2016 at 12:51:34 +0200, Martin Kletzander wrote:
> Signed-off-by: Martin Kletzander <mkletzan@xxxxxxxxxx>
> ---
> src/qemu/qemu_capabilities.c | 5 ++
> src/qemu/qemu_capabilities.h | 4 ++
> .../caps_2.6.0-gicv2.aarch64.xml | 2 +
> .../caps_2.6.0-gicv3.aarch64.xml | 2 +
> tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 2 +
> tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +
> tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +
> .../qemuxml2argv-shmem-plain-doorbell.args | 43 ++++++++++++++
> .../qemuxml2argv-shmem-plain-doorbell.xml | 58 +++++++++++++++++++
> .../qemuxml2xmlout-shmem-plain-doorbell.xml | 67 ++++++++++++++++++++++
> tests/qemuxml2xmltest.c | 1 +
> 11 files changed, 188 insertions(+)
> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args
> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml
> create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem-plain-doorbell.xml
>
[...]
The capability stuff is ok.
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args b/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args
> new file mode 100644
> index 000000000000..7abc7f8c4be5
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args
> @@ -0,0 +1,43 @@
> +LC_ALL=C \
> +PATH=/bin \
> +HOME=/home/test \
> +USER=test \
> +LOGNAME=test \
> +QEMU_AUDIO_DRV=none \
> +/usr/bin/qemu \
> +-name QEMUGuest1 \
> +-S \
> +-M pc \
> +-m 214 \
> +-smp 1,sockets=1,cores=1,threads=1 \
> +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
> +-nographic \
> +-nodefaults \
> +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
> +-no-acpi \
> +-boot c \
> +-usb \
> +-object memory-backend-file,id=shmmem-shmem0,mem-path=/dev/shm/shmem0,\
> +size=4194304 \
> +-device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x3 \
> +-object memory-backend-file,id=shmmem-shmem1,mem-path=/dev/shm/shmem1,\
> +size=134217728 \
> +-device ivshmem-plain,id=shmem1,memdev=shmmem-shmem1,bus=pci.0,addr=0x5 \
> +-object memory-backend-file,id=shmmem-shmem2,mem-path=/dev/shm/shmem2,\
> +size=268435456 \
> +-device ivshmem-plain,id=shmem2,memdev=shmmem-shmem2,bus=pci.0,addr=0x4 \
> +-device ivshmem-doorbell,id=shmem3,chardev=charshmem3,ioeventfd=on,bus=pci.0,\
> +addr=0x6 \
> +-chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \
> +-device ivshmem-doorbell,id=shmem4,chardev=charshmem4,ioeventfd=on,bus=pci.0,\
> +addr=0x7 \
> +-chardev socket,id=charshmem4,path=/tmp/shmem4-sock \
> +-device ivshmem-doorbell,id=shmem5,chardev=charshmem5,ioeventfd=off,bus=pci.0,\
> +addr=0x8 \
> +-chardev socket,id=charshmem5,path=/tmp/shmem5-sock \
> +-device ivshmem-doorbell,id=shmem6,chardev=charshmem6,vectors=16,ioeventfd=on,\
> +bus=pci.0,addr=0x9 \
> +-chardev socket,id=charshmem6,path=/tmp/shmem6-sock \
> +-device ivshmem-doorbell,id=shmem7,chardev=charshmem7,vectors=32,ioeventfd=on,\
> +bus=pci.0,addr=0xa \
> +-chardev socket,id=charshmem7,path=/tmp/shmem7-sock
This file is unused since you didn't register the test to
tests/qemuxml2argvtest.c. Also at this point it won't work. I presume
this belongs to a different commit
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml b/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml
> new file mode 100644
> index 000000000000..454437cbdb39
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml
> @@ -0,0 +1,58 @@
> +<domain type='qemu'>
> + <name>QEMUGuest1</name>
> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> + <memory unit='KiB'>219136</memory>
> + <currentMemory unit='KiB'>219136</currentMemory>
> + <vcpu placement='static'>1</vcpu>
> + <os>
> + <type arch='i686' machine='pc'>hvm</type>
> + <boot dev='hd'/>
> + </os>
> + <clock offset='utc'/>
> + <on_poweroff>destroy</on_poweroff>
> + <on_reboot>restart</on_reboot>
> + <on_crash>destroy</on_crash>
> + <devices>
> + <emulator>/usr/bin/qemu</emulator>
> + <controller type='usb' index='0'/>
> + <controller type='pci' index='0' model='pci-root'/>
> + <input type='mouse' bus='ps2'/>
> + <input type='keyboard' bus='ps2'/>
> + <memballoon model='none'/>
> + <shmem name='shmem0'>
> + <model type='ivshmem-plain'/>
> + </shmem>
> + <shmem name='shmem1'>
> + <model type='ivshmem-plain'/>
> + <size unit='M'>128</size>
> + </shmem>
> + <shmem name='shmem2'>
> + <model type='ivshmem-plain'/>
> + <size unit='M'>256</size>
> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
> + </shmem>
> + <shmem name='shmem3'>
> + <model type='ivshmem-doorbell'/>
> + <server/>
> + </shmem>
> + <shmem name='shmem4'>
> + <model type='ivshmem-doorbell'/>
> + <server path='/tmp/shmem4-sock'/>
> + </shmem>
> + <shmem name='shmem5'>
> + <model type='ivshmem-doorbell'/>
> + <server path='/tmp/shmem5-sock'/>
> + <msi ioeventfd='off'/>
> + </shmem>
> + <shmem name='shmem6'>
> + <model type='ivshmem-doorbell'/>
> + <server path='/tmp/shmem6-sock'/>
> + <msi vectors='16'/>
> + </shmem>
> + <shmem name='shmem7'>
> + <model type='ivshmem-doorbell'/>
> + <server path='/tmp/shmem7-sock'/>
> + <msi vectors='32' ioeventfd='on'/>
> + </shmem>
> + </devices>
> +</domain>
> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem-plain-doorbell.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem-plain-doorbell.xml
> new file mode 100644
> index 000000000000..ab9c69bfccd4
> --- /dev/null
> +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem-plain-doorbell.xml
> @@ -0,0 +1,67 @@
> +<domain type='qemu'>
> + <name>QEMUGuest1</name>
> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> + <memory unit='KiB'>219136</memory>
> + <currentMemory unit='KiB'>219136</currentMemory>
> + <vcpu placement='static'>1</vcpu>
> + <os>
> + <type arch='i686' machine='pc'>hvm</type>
> + <boot dev='hd'/>
> + </os>
> + <clock offset='utc'/>
> + <on_poweroff>destroy</on_poweroff>
> + <on_reboot>restart</on_reboot>
> + <on_crash>destroy</on_crash>
> + <devices>
> + <emulator>/usr/bin/qemu</emulator>
> + <controller type='usb' index='0'>
> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
> + </controller>
> + <controller type='pci' index='0' model='pci-root'/>
> + <input type='mouse' bus='ps2'/>
> + <input type='keyboard' bus='ps2'/>
> + <memballoon model='none'/>
> + <shmem name='shmem0'>
> + <model type='ivshmem-plain'/>
> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
> + </shmem>
> + <shmem name='shmem1'>
> + <model type='ivshmem-plain'/>
> + <size unit='M'>128</size>
> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
> + </shmem>
> + <shmem name='shmem2'>
> + <model type='ivshmem-plain'/>
> + <size unit='M'>256</size>
> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
> + </shmem>
> + <shmem name='shmem3'>
> + <model type='ivshmem-doorbell'/>
> + <server/>
> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
> + </shmem>
> + <shmem name='shmem4'>
> + <model type='ivshmem-doorbell'/>
> + <server path='/tmp/shmem4-sock'/>
> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
> + </shmem>
> + <shmem name='shmem5'>
> + <model type='ivshmem-doorbell'/>
> + <server path='/tmp/shmem5-sock'/>
> + <msi ioeventfd='off'/>
> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
> + </shmem>
> + <shmem name='shmem6'>
> + <model type='ivshmem-doorbell'/>
> + <server path='/tmp/shmem6-sock'/>
> + <msi vectors='16'/>
> + <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
> + </shmem>
> + <shmem name='shmem7'>
> + <model type='ivshmem-doorbell'/>
> + <server path='/tmp/shmem7-sock'/>
> + <msi vectors='32' ioeventfd='on'/>
> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
> + </shmem>
> + </devices>
> +</domain>
> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
> index 496ed130f838..8a2b5ff842fc 100644
> --- a/tests/qemuxml2xmltest.c
> +++ b/tests/qemuxml2xmltest.c
> @@ -822,6 +822,7 @@ mymain(void)
> DO_TEST("tap-vhost", NONE);
> DO_TEST("tap-vhost-incorrect", NONE);
> DO_TEST("shmem", NONE);
> + DO_TEST("shmem-plain-doorbell", NONE);
> DO_TEST("smbios", NONE);
> DO_TEST("smbios-multiple-type2", NONE);
These tests look like they belong to the previous patch.
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list