OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5bd04f6
)
iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status()
author
Vladimir Sementsov-Ogievskiy
<vsementsov@virtuozzo.com>
Mon, 30 Nov 2020 13:40:20 +0000
(16:40 +0300)
committer
Eric Blake
<eblake@redhat.com>
Thu, 21 Jan 2021 02:24:51 +0000
(20:24 -0600)
Just drop code duplication.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <
20201130134024
.19212-5-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
tests/qemu-iotests/iotests.py
patch
|
blob
|
history
diff --git
a/tests/qemu-iotests/iotests.py
b/tests/qemu-iotests/iotests.py
index
ea5c3c5
..
2e89c0a
100644
(file)
--- a/
tests/qemu-iotests/iotests.py
+++ b/
tests/qemu-iotests/iotests.py
@@
-188,14
+188,7
@@
def img_info_log(filename, filter_path=None, imgopts=False, extra_args=()):
def qemu_io(*args):
'''Run qemu-io and return the stdout data'''
args = qemu_io_args + list(args)
- subp = subprocess.Popen(args, stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT,
- universal_newlines=True)
- output = subp.communicate()[0]
- if subp.returncode < 0:
- sys.stderr.write('qemu-io received signal %i: %s\n'
- % (-subp.returncode, ' '.join(args)))
- return output
+ return qemu_tool_pipe_and_status('qemu-io', args)[0]
def qemu_io_log(*args):
result = qemu_io(*args)