[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 36/37] iotests: More options for VM.add_drive()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 36/37] iotests: More options for VM.add_drive() |
Date: |
Mon, 9 Feb 2015 12:11:36 -0500 |
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 241b5ee..5191a65 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -94,13 +94,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.1.0
- [Qemu-devel] [PATCH v2 19/37] block: Add blk_insert_bs(), (continued)
- [Qemu-devel] [PATCH v2 19/37] block: Add blk_insert_bs(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 21/37] blockdev: Do not create BDS for empty drive, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 24/37] block: Add blk_remove_bs(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 22/37] blockdev: Pull out blockdev option extraction, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 34/37] blockdev: read-only-mode for blockdev-change-medium, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 27/37] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 33/37] hmp: Use blockdev-change-medium for change command, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 36/37] iotests: More options for VM.add_drive(),
Max Reitz <=
- [Qemu-devel] [PATCH v2 31/37] block: Inquire tray state before tray-moved events, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 32/37] qmp: Introduce blockdev-change-medium, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 35/37] hmp: Add read-only-mode option to change command, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 37/37] iotests: Add test for change-related QMP commands, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 23/37] blockdev: Allow more options for BB-less BDS tree, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 28/37] blockdev: Add blockdev-insert-medium, Max Reitz, 2015/02/09