iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status()
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>
This commit is contained in:
parent
5bd04f613a
commit
f874e7fa3b
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user