xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-24 12:09:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: Use iothreads during iotest 223

Browse Source 
Doing so catches the bugs we just fixed with NBD not properly using
correct contexts.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190920220729.31801-1-eblake@redhat.com>
This commit is contained in:
Eric Blake 2019-09-20 17:07:29 -05:00
parent 61bc846d8c
commit 506902c6fa
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/qemu-iotests/223
View File

@ -2,7 +2,7 @@
# #
# Test reading dirty bitmap over NBD # Test reading dirty bitmap over NBD
# #
# Copyright (C) 2018 Red Hat, Inc. # Copyright (C) 2018-2019 Red Hat, Inc.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -109,7 +109,7 @@ echo
echo "=== End dirty bitmaps, and start serving image over NBD ===" echo "=== End dirty bitmaps, and start serving image over NBD ==="
echo echo
_launch_qemu 2> >(_filter_nbd) _launch_qemu -object iothread,id=io0 2> >(_filter_nbd)
# Intentionally provoke some errors as well, to check error handling # Intentionally provoke some errors as well, to check error handling
silent= silent=
@ -117,6 +117,8 @@ _send_qemu_cmd $QEMU_HANDLE '{"execute":"qmp_capabilities"}' "return"
_send_qemu_cmd $QEMU_HANDLE '{"execute":"blockdev-add", _send_qemu_cmd $QEMU_HANDLE '{"execute":"blockdev-add",
"arguments":{"driver":"qcow2", "node-name":"n", "arguments":{"driver":"qcow2", "node-name":"n",
"file":{"driver":"file", "filename":"'"$TEST_IMG"'"}}}' "return" "file":{"driver":"file", "filename":"'"$TEST_IMG"'"}}}' "return"
_send_qemu_cmd $QEMU_HANDLE '{"execute":"x-blockdev-set-iothread",
"arguments":{"node-name":"n", "iothread":"io0"}}' "return"
_send_qemu_cmd $QEMU_HANDLE '{"execute":"block-dirty-bitmap-disable", _send_qemu_cmd $QEMU_HANDLE '{"execute":"block-dirty-bitmap-disable",
"arguments":{"node":"n", "name":"b"}}' "return" "arguments":{"node":"n", "name":"b"}}' "return"
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",

1
tests/qemu-iotests/223.out
View File

@ -27,6 +27,7 @@ wrote 2097152/2097152 bytes at offset 2097152
{"return": {}} {"return": {}}
{"return": {}} {"return": {}}
{"return": {}} {"return": {}}
{"return": {}}
{"error": {"class": "GenericError", "desc": "NBD server not running"}} {"error": {"class": "GenericError", "desc": "NBD server not running"}}
{"return": {}} {"return": {}}
{"error": {"class": "GenericError", "desc": "NBD server already running"}} {"error": {"class": "GenericError", "desc": "NBD server already running"}}