On 09/06/2016 08:58 AM, Eric Farman wrote:
> The qemuxml2argv test was cloned from hostdev-scsi-virtio-scsi
>
> Signed-off-by: Eric Farman <[email protected]>
> Reviewed-by: Boris Fiuczynski <[email protected]>
> ---
> .../qemuxml2argv-hostdev-scsi-vhost-scsi.args | 24 ++++++++++++++++
> .../qemuxml2argv-hostdev-scsi-vhost-scsi.xml | 33
> ++++++++++++++++++++++
> tests/qemuxml2argvmock.c | 12 ++++++++
> tests/qemuxml2argvtest.c | 3 ++
> 4 files changed, 72 insertions(+)
> create mode 100644
> tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.args
> create mode 100644
> tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.xml
>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.args
> b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.args
> new file mode 100644
> index 0000000..5cd2939
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.args
> @@ -0,0 +1,24 @@
> +LC_ALL=C \
> +PATH=/bin \
> +HOME=/home/test \
> +USER=test \
> +LOGNAME=test \
> +QEMU_AUDIO_DRV=none \
> +/usr/bin/qemu \
> +-name QEMUGuest2 \
> +-S \
> +-M pc \
> +-m 214 \
> +-smp 1,sockets=1,cores=1,threads=1 \
> +-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
> +-nographic \
> +-nodefaults \
> +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \
> +-no-acpi \
> +-boot c \
> +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
> +-usb \
> +-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
> +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
> +-device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0 \
> +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.xml
> b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.xml
> new file mode 100644
> index 0000000..5b7cc02
This hunk would be with the qemu command line patch
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.xml
> @@ -0,0 +1,33 @@
> +<domain type='qemu'>
> + <name>QEMUGuest2</name>
> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid>
> + <memory unit='KiB'>219100</memory>
> + <currentMemory unit='KiB'>219100</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>
> + <disk type='block' device='disk'>
> + <source dev='/dev/HostVG/QEMUGuest2'/>
> + <target dev='hda' bus='ide'/>
> + <address type='drive' controller='0' bus='0' target='0' unit='0'/>
> + </disk>
> + <controller type='scsi' index='0' model='virtio-scsi'/>
> + <controller type='usb' index='0'/>
> + <controller type='ide' index='0'/>
> + <controller type='pci' index='0' model='pci-root'/>
> + <input type='mouse' bus='ps2'/>
> + <input type='keyboard' bus='ps2'/>
> + <hostdev mode='subsystem' type='scsi_host'>
> + <source protocol='vhost' wwpn='naa.5123456789abcde0'/>
> + </hostdev>
> + <memballoon model='virtio'/>
> + </devices>
> +</domain>
This hunk would be with the domain xml patch (along with the dataout file)
> diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c
> index 78a224b..568dcc0 100644
> --- a/tests/qemuxml2argvmock.c
> +++ b/tests/qemuxml2argvmock.c
> @@ -107,6 +107,18 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix
> ATTRIBUTE_UNUSED,
> }
>
> int
> +virSCSIOpenVhost(int *vhostfd,
> + size_t *vhostfdSize)
> +{
> + size_t i;
> +
> + for (i = 0; i < *vhostfdSize; i++)
> + vhostfd[i] = STDERR_FILENO + 1 + i;
> +
> + return 0;
> +}
> +
> +int
I think this hunk belongs with the code that added the function...
> virNetDevTapCreate(char **ifname,
> const char *tunpath ATTRIBUTE_UNUSED,
> int *tapfd,
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index 39abe72..99c0465 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -1783,6 +1783,9 @@ mymain(void)
> DO_TEST("hostdev-scsi-virtio-iscsi-auth",
> QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
Interesting and existing - QEMU_CAPS_VIRTIO_SCSI listed twice... That's
a separate patch though - I'll send that soon.
> QEMU_CAPS_DEVICE_SCSI_GENERIC);
> + DO_TEST("hostdev-scsi-vhost-scsi",
> + QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI,
> + QEMU_CAPS_DEVICE_SCSI_GENERIC);
This hunk would go with the qemu command line patch...
John
>
> DO_TEST("mlock-on", QEMU_CAPS_REALTIME_MLOCK);
> DO_TEST_FAILURE("mlock-on", NONE);
>
--
libvir-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/libvir-list
