[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 37/38] iotests: More options for VM.add_drive()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v4 37/38] iotests: More options for VM.add_drive() |
Date: |
Mon, 20 Jul 2015 19:46:04 +0200 |
This patch allows specifying the interface to be used for the drive, and
makes specifying a path optional (if the path is None, the "file" option
will be omitted, thus creating an empty drive).
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/qemu-iotests/iotests.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 8615b10..09d25db 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -117,13 +117,16 @@ class VM(object):
self._args.append('-monitor')
self._args.append(args)
- def add_drive(self, path, opts=''):
+ def add_drive(self, path, opts='', interface='virtio'):
'''Add a virtio-blk drive to the VM'''
- options = ['if=virtio',
+ options = ['if=%s' % interface,
'format=%s' % imgfmt,
'cache=%s' % cachemode,
- 'file=%s' % path,
'id=drive%d' % self._num_drives]
+
+ if path is not None:
+ options.append('file=%s' % path)
+
if opts:
options.append(opts)
--
2.4.6
- [Qemu-devel] [PATCH v4 21/38] block: Prepare for NULL BDS, (continued)
- [Qemu-devel] [PATCH v4 21/38] block: Prepare for NULL BDS, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 23/38] blockdev: Pull out blockdev option extraction, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 24/38] blockdev: Allow more options for BB-less BDS tree, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 25/38] block: Add blk_remove_bs(), Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 27/38] blockdev: Add blockdev-close-tray, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 26/38] blockdev: Add blockdev-open-tray, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 29/38] blockdev: Add blockdev-insert-medium, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 28/38] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 35/38] blockdev: read-only-mode for blockdev-change-medium, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 33/38] qmp: Introduce blockdev-change-medium, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 37/38] iotests: More options for VM.add_drive(),
Max Reitz <=
- [Qemu-devel] [PATCH v4 34/38] hmp: Use blockdev-change-medium for change command, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 30/38] blockdev: Implement eject with basic operations, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 32/38] block: Inquire tray state before tray-moved events, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 19/38] block: Prepare remaining BB functions for NULL BDS, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 36/38] hmp: Add read-only-mode option to change command, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 31/38] blockdev: Implement change with basic operations, Max Reitz, 2015/07/20
- [Qemu-devel] [PATCH v4 38/38] iotests: Add test for change-related QMP commands, Max Reitz, 2015/07/20