External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuxml2argv: Add test for disk type='volume' with iSCSI pools

Browse Source 
Tweak the existing file so that it can be tested for command line
corectness.
This commit is contained in:
Peter Krempa 2013-11-21 11:04:50 +01:00
parent 9f9906727b
commit 7e831969c0
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args Normal file
View File

@ -0,0 +1,10 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \
file=/some/block/device/unit:0:0:1,if=none,media=cdrom,id=drive-ide0-0-1 -device \
ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 -drive \
file=iscsi://iscsi.example.com:3260/demo-target/2,if=none,media=cdrom,id=drive-ide0-0-2 \
-device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 -drive \
file=/tmp/idedisk.img,if=none,id=drive-ide0-0-3 -device \
ide-drive,bus=ide.0,unit=3,drive=drive-ide0-0-3,id=ide0-0-3 -device \
virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

4
tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml
View File

@ -15,7 +15,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu</emulator> <emulator>/usr/bin/qemu</emulator>
<disk type='volume' device='cdrom'> <disk type='volume' device='cdrom'>
<source pool='blk-pool0' volume='blk-pool0-vol0' mode='host' startupPolicy='optional'> <source pool='pool-iscsi-auth' volume='unit:0:0:1' mode='host'>
<seclabel model='selinux' relabel='yes'> <seclabel model='selinux' relabel='yes'>
<label>system_u:system_r:public_content_t:s0</label> <label>system_u:system_r:public_content_t:s0</label>
</seclabel> </seclabel>
@ -25,7 +25,7 @@
<address type='drive' controller='0' bus='0' target='0' unit='1'/> <address type='drive' controller='0' bus='0' target='0' unit='1'/>
</disk> </disk>
<disk type='volume' device='cdrom'> <disk type='volume' device='cdrom'>
<source pool='blk-pool0' volume='blk-pool0-vol1' mode='direct' startupPolicy='optional'> <source pool='pool-iscsi' volume='unit:0:0:2' mode='direct'>
<seclabel model='selinux' relabel='yes'> <seclabel model='selinux' relabel='yes'>
<label>system_u:system_r:public_content_t:s0</label> <label>system_u:system_r:public_content_t:s0</label>
</seclabel> </seclabel>

2
tests/qemuxml2argvtest.c
View File

@ -793,6 +793,8 @@ mymain(void)
QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT); QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
DO_TEST("disk-source-pool", DO_TEST("disk-source-pool",
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
DO_TEST("disk-source-pool-mode",
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
DO_TEST("disk-ioeventfd", DO_TEST("disk-ioeventfd",
QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_IOEVENTFD,
QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_DEVICE,