From nobody Sun Apr 28 08:26:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569338712; cv=none; d=zoho.com; s=zohoarc; b=K1LlM297lRxPQ7+dH5ldocaMXQV7FoyechVtMxcFRwUiBFDzfOZD1QY8LlBK9mTSGNQOttQETZSU4RfINE9ApyCcOUr4DLQts6NzNY4xGuMI/3XXu+J3NEGKgQeKAn0T7wZag/9ArJQon7pQj2GNueYGXt5qZQmAGOhp2JacXmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569338712; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ReKShk64dvYUW4ktAsTagKR1JX26YFouT9SkmCgrnNI=; b=RBToutY2F4REix10qmrVL9rMtRg7VhRPX8AeqSIsRZpy52jmyc8C8c4LsPPlRD6mfNTQk00qOeccSx2wRK42pwI8EnbGVz725jOwu/1J7YWvgR+eavWan54mfARHB14rbyet8m4Lsi2GG2oNzaEzxaDQP5pCeTQE6+8zcT2akUA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 156933871286889.02392819232466; Tue, 24 Sep 2019 08:25:12 -0700 (PDT) Received: from localhost ([::1]:47104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCmgZ-0001rz-Uk for importer@patchew.org; Tue, 24 Sep 2019 11:25:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41177) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iClun-0004iE-Kn for qemu-devel@nongnu.org; Tue, 24 Sep 2019 10:35:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iClul-0004eg-Ol for qemu-devel@nongnu.org; Tue, 24 Sep 2019 10:35:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56734) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iClua-0004Yr-4D; Tue, 24 Sep 2019 10:35:29 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4C15C8AC6F9; Tue, 24 Sep 2019 14:35:26 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-249.phx2.redhat.com [10.3.116.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFDB360852; Tue, 24 Sep 2019 14:35:25 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Subject: [PATCH 1/2] tests: Make iotest 223 easier to edit Date: Tue, 24 Sep 2019 09:35:21 -0500 Message-Id: <20190924143522.22902-2-eblake@redhat.com> In-Reply-To: <20190924143522.22902-1-eblake@redhat.com> References: <20190924143522.22902-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Tue, 24 Sep 2019 14:35:26 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nsoffer@redhat.com, Kevin Wolf , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Log the QMP input to qemu, not just the QMP output. Signed-off-by: Eric Blake --- tests/qemu-iotests/223 | 48 +++++++++++++++++++++----------------- tests/qemu-iotests/223.out | 40 +++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223 index 2ba3d8124b4f..2bcf922df8c4 100755 --- a/tests/qemu-iotests/223 +++ b/tests/qemu-iotests/223 @@ -58,6 +58,12 @@ run_qemu() | _filter_actual_image_size } +qemu_cmd() +{ + echo " $1" | _filter_testdir + _send_qemu_cmd $QEMU_HANDLE "$@" +} + echo echo "=3D=3D=3D Create partially sparse image, then add dirty bitmaps =3D= =3D=3D" echo @@ -110,39 +116,39 @@ echo "=3D=3D=3D End dirty bitmaps, and start serving = image over NBD =3D=3D=3D" echo _launch_qemu -object iothread,id=3Dio0 2> >(_filter_nbd) - -# Intentionally provoke some errors as well, to check error handling silent=3D -_send_qemu_cmd $QEMU_HANDLE '{"execute":"qmp_capabilities"}' "return" -_send_qemu_cmd $QEMU_HANDLE '{"execute":"blockdev-add", + +# Intentionally provoke some errors as well, to check error handling +qemu_cmd '{"execute":"qmp_capabilities"}' "return" +qemu_cmd '{"execute":"blockdev-add", "arguments":{"driver":"qcow2", "node-name":"n", "file":{"driver":"file", "filename":"'"$TEST_IMG"'"}}}' "return" -_send_qemu_cmd $QEMU_HANDLE '{"execute":"x-blockdev-set-iothread", +qemu_cmd '{"execute":"x-blockdev-set-iothread", "arguments":{"node-name":"n", "iothread":"io0"}}' "return" -_send_qemu_cmd $QEMU_HANDLE '{"execute":"block-dirty-bitmap-disable", +qemu_cmd '{"execute":"block-dirty-bitmap-disable", "arguments":{"node":"n", "name":"b"}}' "return" -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", +qemu_cmd '{"execute":"nbd-server-add", "arguments":{"device":"n"}}' "error" # Attempt add without server -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start", +qemu_cmd '{"execute":"nbd-server-start", "arguments":{"addr":{"type":"unix", "data":{"path":"'"$TEST_DIR/nbd"'"}}}}' "return" -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start", +qemu_cmd '{"execute":"nbd-server-start", "arguments":{"addr":{"type":"unix", "data":{"path":"'"$TEST_DIR/nbd"1'"}}}}' "error" # Attempt second serv= er $QEMU_NBD_PROG -L -k "$TEST_DIR/nbd" -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", +qemu_cmd '{"execute":"nbd-server-add", "arguments":{"device":"n", "bitmap":"b"}}' "return" -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", +qemu_cmd '{"execute":"nbd-server-add", "arguments":{"device":"nosuch"}}' "error" # Attempt to export missing no= de -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", +qemu_cmd '{"execute":"nbd-server-add", "arguments":{"device":"n"}}' "error" # Attempt to export same name twice -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", +qemu_cmd '{"execute":"nbd-server-add", "arguments":{"device":"n", "name":"n2", "bitmap":"b2"}}' "error" # enabled vs. read-only -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", +qemu_cmd '{"execute":"nbd-server-add", "arguments":{"device":"n", "name":"n2", "bitmap":"b3"}}' "error" # Missing bitmap -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", +qemu_cmd '{"execute":"nbd-server-add", "arguments":{"device":"n", "name":"n2", "writable":true, "bitmap":"b2"}}' "return" $QEMU_NBD_PROG -L -k "$TEST_DIR/nbd" @@ -172,15 +178,15 @@ echo echo "=3D=3D=3D End qemu NBD server =3D=3D=3D" echo -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-remove", +qemu_cmd '{"execute":"nbd-server-remove", "arguments":{"name":"n"}}' "return" -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-remove", +qemu_cmd '{"execute":"nbd-server-remove", "arguments":{"name":"n2"}}' "return" -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-remove", +qemu_cmd '{"execute":"nbd-server-remove", "arguments":{"name":"n2"}}' "error" # Attempt duplicate clean -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-stop"}' "return" -_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-stop"}' "error" # Again -_send_qemu_cmd $QEMU_HANDLE '{"execute":"quit"}' "return" +qemu_cmd '{"execute":"nbd-server-stop"}' "return" +qemu_cmd '{"execute":"nbd-server-stop"}' "error" # Again +qemu_cmd '{"execute":"quit"}' "return" wait=3Dyes _cleanup_qemu echo diff --git a/tests/qemu-iotests/223.out b/tests/qemu-iotests/223.out index 23b34fcd202e..8895ea838cbb 100644 --- a/tests/qemu-iotests/223.out +++ b/tests/qemu-iotests/223.out @@ -24,19 +24,50 @@ wrote 2097152/2097152 bytes at offset 2097152 =3D=3D=3D End dirty bitmaps, and start serving image over NBD =3D=3D=3D + {"execute":"qmp_capabilities"} {"return": {}} + {"execute":"blockdev-add", + "arguments":{"driver":"qcow2", "node-name":"n", + "file":{"driver":"file", "filename":"TEST_DIR/t.qcow2"}}} {"return": {}} + {"execute":"x-blockdev-set-iothread", + "arguments":{"node-name":"n", "iothread":"io0"}} {"return": {}} + {"execute":"block-dirty-bitmap-disable", + "arguments":{"node":"n", "name":"b"}} {"return": {}} + {"execute":"nbd-server-add", + "arguments":{"device":"n"}} {"error": {"class": "GenericError", "desc": "NBD server not running"}} + {"execute":"nbd-server-start", + "arguments":{"addr":{"type":"unix", + "data":{"path":"TEST_DIR/nbd"}}}} {"return": {}} + {"execute":"nbd-server-start", + "arguments":{"addr":{"type":"unix", + "data":{"path":"TEST_DIR/nbd1"}}}} {"error": {"class": "GenericError", "desc": "NBD server already running"}} exports available: 0 + {"execute":"nbd-server-add", + "arguments":{"device":"n", "bitmap":"b"}} {"return": {}} + {"execute":"nbd-server-add", + "arguments":{"device":"nosuch"}} {"error": {"class": "GenericError", "desc": "Cannot find device=3Dnosuch n= or node_name=3Dnosuch"}} + {"execute":"nbd-server-add", + "arguments":{"device":"n"}} {"error": {"class": "GenericError", "desc": "NBD server already has export= named 'n'"}} + {"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", + "bitmap":"b2"}} {"error": {"class": "GenericError", "desc": "Enabled bitmap 'b2' incompati= ble with readonly export"}} + {"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", + "bitmap":"b3"}} {"error": {"class": "GenericError", "desc": "Bitmap 'b3' is not found"}} + {"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", "writable":true, + "bitmap":"b2"}} {"return": {}} exports available: 2 export: 'n' @@ -84,11 +115,20 @@ read 2097152/2097152 bytes at offset 2097152 =3D=3D=3D End qemu NBD server =3D=3D=3D + {"execute":"nbd-server-remove", + "arguments":{"name":"n"}} {"return": {}} + {"execute":"nbd-server-remove", + "arguments":{"name":"n2"}} {"return": {}} + {"execute":"nbd-server-remove", + "arguments":{"name":"n2"}} {"error": {"class": "GenericError", "desc": "Export 'n2' is not found"}} + {"execute":"nbd-server-stop"} {"return": {}} + {"execute":"nbd-server-stop"} {"error": {"class": "GenericError", "desc": "NBD server not running"}} + {"execute":"quit"} {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} --=20 2.21.0 From nobody Sun Apr 28 08:26:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569339962; cv=none; d=zoho.com; s=zohoarc; b=i8UTGLfH1RUtDvCy0Y6hVVs0wQ1YsNIjMN+8QpSRu30JOiL8avrttprc6wZDefBtpALVOsu1OX/tntMgj4U/2NxfTC7cCUZl1TGwPi2eK4bAwLP1B6Xzb+de8eZn244TrwUSZ2qWljQUTPunMGeCoR57ILnZBoZAI2EG0/qxo1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569339962; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=COamdKzL2LoRm9nEJE5OuxjwguejRbk3DUOSr4P/0vE=; b=Yy8uoWiaCUVHwoQjqGt0be67DnDqrTFh/Ee9xxbidg+Tv1qEclW29WWuE85A6EfrI8QFCnNIXjjCx/WHwLR1UZRwet5XW62BdvIkkVGuLhDOMk6jHGVKxsAeIm+zar4WznyxnMPPZkE8ky7TFNyhmVHj0h/xkMO1v2nPpnd31pQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569339962216254.79428675342945; Tue, 24 Sep 2019 08:46:02 -0700 (PDT) Received: from localhost ([::1]:47382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCn0q-000669-9z for importer@patchew.org; Tue, 24 Sep 2019 11:46:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41155) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iClul-0004gY-Jf for qemu-devel@nongnu.org; Tue, 24 Sep 2019 10:35:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCluj-0004dF-D9 for qemu-devel@nongnu.org; Tue, 24 Sep 2019 10:35:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42584) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iClua-0004ZK-W4; Tue, 24 Sep 2019 10:35:30 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E7F8A800DF2; Tue, 24 Sep 2019 14:35:26 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-249.phx2.redhat.com [10.3.116.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 785F060852; Tue, 24 Sep 2019 14:35:26 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Subject: [PATCH 2/2] tests: More iotest 223 improvements Date: Tue, 24 Sep 2019 09:35:22 -0500 Message-Id: <20190924143522.22902-3-eblake@redhat.com> In-Reply-To: <20190924143522.22902-1-eblake@redhat.com> References: <20190924143522.22902-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Tue, 24 Sep 2019 14:35:26 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nsoffer@redhat.com, Kevin Wolf , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Run the test twice, once without iothreads, and again with, for more coverage of both setups. Suggested-by: Nir Soffer Signed-off-by: Eric Blake --- tests/qemu-iotests/223 | 66 +++++++++++++++++++++++++ tests/qemu-iotests/223.out | 98 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223 index 2bcf922df8c4..2aa428d406f5 100755 --- a/tests/qemu-iotests/223 +++ b/tests/qemu-iotests/223 @@ -123,6 +123,72 @@ qemu_cmd '{"execute":"qmp_capabilities"}' "return" qemu_cmd '{"execute":"blockdev-add", "arguments":{"driver":"qcow2", "node-name":"n", "file":{"driver":"file", "filename":"'"$TEST_IMG"'"}}}' "return" +qemu_cmd '{"execute":"block-dirty-bitmap-disable", + "arguments":{"node":"n", "name":"b"}}' "return" +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"n"}}' "error" # Attempt add without server +qemu_cmd '{"execute":"nbd-server-start", + "arguments":{"addr":{"type":"unix", + "data":{"path":"'"$TEST_DIR/nbd"'"}}}}' "return" +qemu_cmd '{"execute":"nbd-server-start", + "arguments":{"addr":{"type":"unix", + "data":{"path":"'"$TEST_DIR/nbd"1'"}}}}' "error" # Attempt second serv= er +$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd" +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"n", "bitmap":"b"}}' "return" +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"nosuch"}}' "error" # Attempt to export missing no= de +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"n"}}' "error" # Attempt to export same name twice +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", + "bitmap":"b2"}}' "error" # enabled vs. read-only +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", + "bitmap":"b3"}}' "error" # Missing bitmap +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", "writable":true, + "bitmap":"b2"}}' "return" +$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd" + +echo +echo "=3D=3D=3D Contrast normal status to large granularity dirty-bitmap = =3D=3D=3D" +echo + +QEMU_IO_OPTIONS=3D$QEMU_IO_OPTIONS_NO_FMT +IMG=3D"driver=3Dnbd,export=3Dn,server.type=3Dunix,server.path=3D$TEST_DIR/= nbd" +$QEMU_IO -r -c 'r -P 0x22 512 512' -c 'r -P 0 512k 512k' -c 'r -P 0x11 1m = 1m' \ + -c 'r -P 0x33 2m 2m' --image-opts "$IMG" | _filter_qemu_io +$QEMU_IMG map --output=3Djson --image-opts \ + "$IMG" | _filter_qemu_img_map +$QEMU_IMG map --output=3Djson --image-opts \ + "$IMG,x-dirty-bitmap=3Dqemu:dirty-bitmap:b" | _filter_qemu_img_map + +echo +echo "=3D=3D=3D Contrast to small granularity dirty-bitmap =3D=3D=3D" +echo + +IMG=3D"driver=3Dnbd,export=3Dn2,server.type=3Dunix,server.path=3D$TEST_DIR= /nbd" +$QEMU_IMG map --output=3Djson --image-opts \ + "$IMG,x-dirty-bitmap=3Dqemu:dirty-bitmap:b2" | _filter_qemu_img_map + +echo +echo "=3D=3D=3D End qemu NBD server =3D=3D=3D" +echo + +qemu_cmd '{"execute":"nbd-server-remove", + "arguments":{"name":"n"}}' "return" +qemu_cmd '{"execute":"nbd-server-remove", + "arguments":{"name":"n2"}}' "return" +qemu_cmd '{"execute":"nbd-server-remove", + "arguments":{"name":"n2"}}' "error" # Attempt duplicate clean +qemu_cmd '{"execute":"nbd-server-stop"}' "return" +qemu_cmd '{"execute":"nbd-server-stop"}' "error" # Again + +echo +echo "=3D=3D=3D Repeat, but using iothreads =3D=3D=3D" +echo + qemu_cmd '{"execute":"x-blockdev-set-iothread", "arguments":{"node-name":"n", "iothread":"io0"}}' "return" qemu_cmd '{"execute":"block-dirty-bitmap-disable", diff --git a/tests/qemu-iotests/223.out b/tests/qemu-iotests/223.out index 8895ea838cbb..9dcab03ef9c8 100644 --- a/tests/qemu-iotests/223.out +++ b/tests/qemu-iotests/223.out @@ -30,6 +30,104 @@ wrote 2097152/2097152 bytes at offset 2097152 "arguments":{"driver":"qcow2", "node-name":"n", "file":{"driver":"file", "filename":"TEST_DIR/t.qcow2"}}} {"return": {}} + {"execute":"block-dirty-bitmap-disable", + "arguments":{"node":"n", "name":"b"}} +{"return": {}} + {"execute":"nbd-server-add", + "arguments":{"device":"n"}} +{"error": {"class": "GenericError", "desc": "NBD server not running"}} + {"execute":"nbd-server-start", + "arguments":{"addr":{"type":"unix", + "data":{"path":"TEST_DIR/nbd"}}}} +{"return": {}} + {"execute":"nbd-server-start", + "arguments":{"addr":{"type":"unix", + "data":{"path":"TEST_DIR/nbd1"}}}} +{"error": {"class": "GenericError", "desc": "NBD server already running"}} +exports available: 0 + {"execute":"nbd-server-add", + "arguments":{"device":"n", "bitmap":"b"}} +{"return": {}} + {"execute":"nbd-server-add", + "arguments":{"device":"nosuch"}} +{"error": {"class": "GenericError", "desc": "Cannot find device=3Dnosuch n= or node_name=3Dnosuch"}} + {"execute":"nbd-server-add", + "arguments":{"device":"n"}} +{"error": {"class": "GenericError", "desc": "NBD server already has export= named 'n'"}} + {"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", + "bitmap":"b2"}} +{"error": {"class": "GenericError", "desc": "Enabled bitmap 'b2' incompati= ble with readonly export"}} + {"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", + "bitmap":"b3"}} +{"error": {"class": "GenericError", "desc": "Bitmap 'b3' is not found"}} + {"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", "writable":true, + "bitmap":"b2"}} +{"return": {}} +exports available: 2 + export: 'n' + size: 4194304 + flags: 0x58f ( readonly flush fua df multi cache ) + min block: 1 + opt block: 4096 + max block: 33554432 + available meta contexts: 2 + base:allocation + qemu:dirty-bitmap:b + export: 'n2' + size: 4194304 + flags: 0xced ( flush fua trim zeroes df cache fast-zero ) + min block: 1 + opt block: 4096 + max block: 33554432 + available meta contexts: 2 + base:allocation + qemu:dirty-bitmap:b2 + +=3D=3D=3D Contrast normal status to large granularity dirty-bitmap =3D=3D= =3D + +read 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 524288/524288 bytes at offset 524288 +512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 1048576/1048576 bytes at offset 1048576 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 2097152/2097152 bytes at offset 2097152 +2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "o= ffset": OFFSET}, +{ "start": 4096, "length": 1044480, "depth": 0, "zero": true, "data": fals= e, "offset": OFFSET}, +{ "start": 1048576, "length": 3145728, "depth": 0, "zero": false, "data": = true, "offset": OFFSET}] +[{ "start": 0, "length": 65536, "depth": 0, "zero": false, "data": false}, +{ "start": 65536, "length": 2031616, "depth": 0, "zero": false, "data": tr= ue, "offset": OFFSET}, +{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": = false}] + +=3D=3D=3D Contrast to small granularity dirty-bitmap =3D=3D=3D + +[{ "start": 0, "length": 512, "depth": 0, "zero": false, "data": true, "of= fset": OFFSET}, +{ "start": 512, "length": 512, "depth": 0, "zero": false, "data": false}, +{ "start": 1024, "length": 2096128, "depth": 0, "zero": false, "data": tru= e, "offset": OFFSET}, +{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": = false}] + +=3D=3D=3D End qemu NBD server =3D=3D=3D + + {"execute":"nbd-server-remove", + "arguments":{"name":"n"}} +{"return": {}} + {"execute":"nbd-server-remove", + "arguments":{"name":"n2"}} +{"return": {}} + {"execute":"nbd-server-remove", + "arguments":{"name":"n2"}} +{"error": {"class": "GenericError", "desc": "Export 'n2' is not found"}} + {"execute":"nbd-server-stop"} +{"return": {}} + {"execute":"nbd-server-stop"} +{"error": {"class": "GenericError", "desc": "NBD server not running"}} + +=3D=3D=3D Repeat, but using iothreads =3D=3D=3D + {"execute":"x-blockdev-set-iothread", "arguments":{"node-name":"n", "iothread":"io0"}} {"return": {}} --=20 2.21.0