diff options
| author |   Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com> | 2012-09-04 16:30:55 +0200 |
|---|---|---|
| committer |   Eric Blake <eblake@redhat.com> | 2012-09-04 09:14:36 -0600 |
| commit | 72f1f2206e96a3f1621a6772a2b9d0a740d86da1 (patch) | |
| tree | 21c8e6786f76c0536a07168db5677f13a702cb1b /tests | |
| parent | qemu: Fix reboot with guest agent (diff) | |
| download | libvirt-72f1f2206e96a3f1621a6772a2b9d0a740d86da1.tar.gz libvirt-72f1f2206e96a3f1621a6772a2b9d0a740d86da1.tar.bz2 libvirt-72f1f2206e96a3f1621a6772a2b9d0a740d86da1.zip | |
Rename iolimit to blockio.
After discussion with DB we decided to rename the new iolimit
element as it creates the impression it would be there to
limit (i.e. throttle) I/O instead of specifying immutable
characteristics of a block device.
This is also backed by the fact that the term I/O Limits has
vanished from newer storage admin documentation.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemuhelptest.c | 8 | ||||
| -rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args (renamed from tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.args) | 0 | ||||
| -rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml (renamed from tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.xml) | 2 | ||||
| -rw-r--r-- | tests/qemuxml2argvtest.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index a391edde7..0d884f4d0 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -541,7 +541,7 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_CPU_HOST, - QEMU_CAPS_IOLIMITS); + QEMU_CAPS_BLOCKIO); DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -609,7 +609,7 @@ mymain(void) QEMU_CAPS_DRIVE_COPY_ON_READ, QEMU_CAPS_CPU_HOST, QEMU_CAPS_SCSI_CD, - QEMU_CAPS_IOLIMITS); + QEMU_CAPS_BLOCKIO); DO_TEST("qemu-1.0", 1000000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -682,7 +682,7 @@ mymain(void) QEMU_CAPS_SCSI_CD, QEMU_CAPS_IDE_CD, QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_IOLIMITS); + QEMU_CAPS_BLOCKIO); DO_TEST("qemu-1.1.0", 1001000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -763,7 +763,7 @@ mymain(void) QEMU_CAPS_NETDEV_BRIDGE, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, - QEMU_CAPS_IOLIMITS); + QEMU_CAPS_BLOCKIO); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args index 5fb136753..5fb136753 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml index 440984b0e..52c9704cd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml @@ -23,7 +23,7 @@ <source file='/tmp/idedisk.img'/> <target dev='hdc' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='2'/> - <iolimits logical_block_size='512' physical_block_size='512'/> + <blockio logical_block_size='512' physical_block_size='512'/> </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c65595704..47c3f6c53 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -793,9 +793,9 @@ mymain(void) QEMU_CAPS_IDE_CD); DO_TEST("disk-geometry", QEMU_CAPS_DRIVE); - DO_TEST("disk-iolimits", + DO_TEST("disk-blockio", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_IDE_CD, QEMU_CAPS_IOLIMITS); + QEMU_CAPS_IDE_CD, QEMU_CAPS_BLOCKIO); VIR_FREE(driver.stateDir); virCapabilitiesFree(driver.caps); |