[libvirt] [PATCHv6 7/7] Add tests for blkdeviotune

[Eric Blake]

On 11/24/2011 06:37 AM, Eric Blake wrote:
> On 11/24/2011 01:31 AM, Daniel Veillard wrote:
>>>      DO_TEST("usb-redir");
>>> +    DO_TEST("blkdeviotune");
>>>
>>>      /* These tests generate different XML */
>>>      DO_TEST_DIFFERENT("balloon-device-auto");
>>
>>   ACK, but I would suggest to extend this (or augment the test) to
>> list 2 <disk> with iotune,
> 
> Good idea, especially since it probably would have let me catch the ctxt
> handling bug in 3/7.
> 

Yep - squashing this in will expose the flaw in 3/7.


diff --git i/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
w/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
index 9615290..314c1ac 100644
--- i/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
+++ w/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
@@ -3,5 +3,8 @@ pc -m 214 -smp 1 -name QEMUGuest1 -nographic -nodefaults \
 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
 -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,cache=off,\
 bps=5000,iops=6000 -device \
-ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
+-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-1,cache=off,\
+bps_rd=5000,bps_wr=5000,iops=7000 -device \
+ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
+-usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git i/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml
w/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml
index 48553e4..7b6ec8f 100644
--- i/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml
+++ w/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml
@@ -24,6 +24,17 @@
       </iotune>
       <address type='drive' controller='0' bus='0' unit='0'/>
     </disk>
+    <disk type='block' device='disk'>
+      <driver name='qemu' type='qcow2' cache='none'/>
+      <source dev='/dev/HostVG/QEMUGuest2'/>
+      <target dev='hdb' bus='ide'/>
+      <iotune>
+        <read_bytes_sec>5000</read_bytes_sec>
+        <write_bytes_sec>5000</write_bytes_sec>
+        <total_iops_sec>7000</total_iops_sec>
+      </iotune>
+      <address type='drive' controller='0' bus='0' unit='1'/>
+    </disk>
     <controller type='ide' index='0'/>
     <memballoon model='virtio'/>
   </devices>

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 620 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20111124/14bd090d/attachment-0001.sig>