From nobody Mon Feb 9 07:55:07 2026 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; dkim=fail; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564703270; cv=none; d=zoho.com; s=zohoarc; b=TTUiPKm5HdScJAIQVWUTbUlQ/VWhK3+ZB7Fj3p/9XvWmDhuAAavengW9brFO8bZqRIXfidC3NC10Qjg6FQzxJNA3jMt0wLuLxAWEVNEjp7LOUc/TVqaJQoBKCHRnckvMA8wRuiXJLREz9E3isYCAstNAJpphDO2bDnr0HxVEwOM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564703270; 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=KdKcJ85/JvrdjzDPkuDe3haP60+QMnxCxAmkdd7Z4Xg=; b=cVesRjH1MFmLthkQLBvCkJoWIf55muWSLZBJrXurbi9mvQXlCf/dez2giwyvtWjOvhcfJ1LAAc4OfEocSzW5QI7WIJclueqKZvbnXDqCynKzvnXJ0Ad8ntN0pwvZ+HIGiwy6QpFPnG+NMWakGVIs87Fw0ZihRQ4UMVMydhpyGHo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 1564703270212171.90733220575316; Thu, 1 Aug 2019 16:47:50 -0700 (PDT) Received: from localhost ([::1]:59782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1htKnP-0007Qh-LG for importer@patchew.org; Thu, 01 Aug 2019 19:47:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33022) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1htKie-0007nT-P8 for qemu-devel@nongnu.org; Thu, 01 Aug 2019 19:42:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1htKic-0003lI-O2 for qemu-devel@nongnu.org; Thu, 01 Aug 2019 19:42:48 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:34310) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1htKic-0003jk-BD; Thu, 01 Aug 2019 19:42:46 -0400 Received: by mail-pf1-x442.google.com with SMTP id b13so34953891pfo.1; Thu, 01 Aug 2019 16:42:46 -0700 (PDT) Received: from localhost.localdomain ([2402:3a80:572:3de5:765:cb16:92cd:ee3e]) by smtp.gmail.com with ESMTPSA id g18sm117975426pgm.9.2019.08.01.16.42.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 16:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KdKcJ85/JvrdjzDPkuDe3haP60+QMnxCxAmkdd7Z4Xg=; b=rWFxTYh+mUPpUwWPos880JAOyCw/0DB1o3S6LEWEv27BeEFgrd2QVqO0UKEHIRWRm4 EPSdILIJyddmS+U3efKLy60+rMNWaFtTja/SvGdJG+XaXDQAjQiX5o6liPAbMHl7qX9A PAb3Xj+rAwKTCnyfCNfLbAk6vv2ufLLSSp3QvSEMhnc4SHGGAIyZPCb2eMgxveBEMLer /b/tRfivW1mxqj8853ZuKw+KnhJXIKYUnvYsbSdiX1sjNRfywfWEQwNc15Kec5y6lA5c VnT+7EHB+pyjoUeT3gcuu+uupJLMOLvqCm814qGOxuBIftFy+7bejQDAzXhT5VIzo1RI ScDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KdKcJ85/JvrdjzDPkuDe3haP60+QMnxCxAmkdd7Z4Xg=; b=oRUdlzcUWy1VUV78b0NRt36EYRUtDrSRAclN2l4W2D57+GpAZXX59Bj7BLoMlj7EMV iI7RvO2ZITLVqz0yjULeNG5XOcI3uwKmH9oUxbwaHVcp/hCZSqj6Gjqu3puF57l4uZkm roE7SjXV7HdzKrPd4W8ckzD/u35zF6MsPd+ihnJqcM3Rrsz2OFHBFwAyuDYMMOcnjmd4 fZVL+GPfTXJbh5Tmy3nCFNYWdJxzO/wHe7Ckvl+PJ5/abLnj0tPVW3Z57RZFZEuhY6Dt rEDtsDI5Gl1hy+1MQ17HdxWLcqJ65YkpLju3RE1qsF+YUUHCb+Rnus/vWLAm3xMTtud6 eHpw== X-Gm-Message-State: APjAAAWPU09E4XrizrT7R0swc8QnadeGEAHSbJ3LAfauCxCXG9gsSyoG cuw7rXEajecVgGfYq16UKs39ahWFo5E+Pw== X-Google-Smtp-Source: APXvYqwLmGhwlZWR5uxO+4D2TyFq7jo+mNVf+Vfn/YeY5hGZyrzquTsJXFVNdC02oV/xecJNBR8sIw== X-Received: by 2002:a62:640c:: with SMTP id y12mr55392875pfb.166.1564702964831; Thu, 01 Aug 2019 16:42:44 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Fri, 2 Aug 2019 05:10:29 +0530 Message-Id: <20190801234031.29561-16-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190801234031.29561-1-mehta.aaru20@gmail.com> References: <20190801234031.29561-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::442 Subject: [Qemu-devel] [PATCH v9 15/17] tests/qemu-iotests: use AIOMODE with various tests 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: Kevin Wolf , Maxim Levitsky , Sergio Lopez , qemu-block@nongnu.org, Markus Armbruster , Max Reitz , saket.sinha89@gmail.com, Stefan Hajnoczi , Paolo Bonzini , Fam Zheng , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Aarushi Mehta Reviewed-by: Stefan Hajnoczi --- tests/qemu-iotests/028 | 3 ++- tests/qemu-iotests/058 | 2 +- tests/qemu-iotests/089 | 4 ++-- tests/qemu-iotests/091 | 7 ++++--- tests/qemu-iotests/109 | 3 ++- tests/qemu-iotests/147 | 5 +++-- tests/qemu-iotests/181 | 10 +++++----- tests/qemu-iotests/183 | 7 ++++--- tests/qemu-iotests/185 | 17 ++++++++++++----- tests/qemu-iotests/200 | 3 ++- tests/qemu-iotests/201 | 10 +++++----- 11 files changed, 42 insertions(+), 29 deletions(-) diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index 01f495912f..59e7b670ed 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -108,7 +108,8 @@ echo block-backup echo =20 qemu_comm_method=3D"monitor" -_launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk +_launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D${AIOM= ODE},\ +id=3Ddisk h=3D$QEMU_HANDLE QEMU_COMM_TIMEOUT=3D1 =20 diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 index 8c3212a72f..38d1ed90c0 100755 --- a/tests/qemu-iotests/058 +++ b/tests/qemu-iotests/058 @@ -64,7 +64,7 @@ nbd_snapshot_img=3D"nbd:unix:$nbd_unix_socket" converted_image=3D$TEST_IMG.converted =20 # Use -f raw instead of -f $IMGFMT for the NBD connection -QEMU_IO_NBD=3D"$QEMU_IO -f raw --cache=3D$CACHEMODE" +QEMU_IO_NBD=3D"$QEMU_IO -f raw --cache=3D$CACHEMODE --aio=3D$AIOMODE" =20 echo echo "=3D=3D preparing image =3D=3D" diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 index ad029f1f09..059ad75e28 100755 --- a/tests/qemu-iotests/089 +++ b/tests/qemu-iotests/089 @@ -64,7 +64,7 @@ $QEMU_IO -c 'write -P 42 0 512' -c 'write -P 23 512 512' \ =20 $QEMU_IMG convert -f raw -O $IMGFMT "$TEST_IMG.base" "$TEST_IMG" =20 -$QEMU_IO_PROG --cache $CACHEMODE \ +$QEMU_IO_PROG --cache $CACHEMODE --aio $AIOMODE \ -c 'read -P 42 0 512' -c 'read -P 23 512 512' \ -c 'read -P 66 1024 512' "json:{ \"driver\": \"$IMGFMT\", @@ -111,7 +111,7 @@ $QEMU_IO -c 'write -P 42 0x38000 512' "$TEST_IMG" | _fi= lter_qemu_io =20 # The "image.filename" part tests whether "a": { "b": "c" } and "a.b": "c"= do # the same (which they should). -$QEMU_IO_PROG --cache $CACHEMODE \ +$QEMU_IO_PROG --cache $CACHEMODE --aio $AIOMODE \ -c 'read -P 42 0x38000 512' "json:{ \"driver\": \"$IMGFMT\", \"file\": { diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index d62ef18a02..78741d3fe7 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -60,14 +60,15 @@ echo =3D=3D=3D Starting QEMU VM1 =3D=3D=3D echo =20 qemu_comm_method=3D"monitor" -_launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk +_launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D${AIOM= ODE},\ + id=3Ddisk h1=3D$QEMU_HANDLE =20 echo echo =3D=3D=3D Starting QEMU VM2 =3D=3D=3D echo -_launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk \ - -incoming "exec: cat '${MIG_FIFO}'" +_launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D${AIOM= ODE},\ + id=3Ddisk -incoming "exec: cat '${MIG_FIFO}'" h2=3D$QEMU_HANDLE =20 echo diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109 index 9897ceb6cd..451709689a 100755 --- a/tests/qemu-iotests/109 +++ b/tests/qemu-iotests/109 @@ -52,7 +52,8 @@ run_qemu() local qmp_format=3D"$3" local qmp_event=3D"$4" =20 - _launch_qemu -drive file=3D"${source_img}",format=3Draw,cache=3D${CACH= EMODE},id=3Dsrc + _launch_qemu -drive file=3D"${source_img}",format=3Draw,cache=3D${CACH= EMODE},\ + aio=3D${AIOMODE},id=3Dsrc _send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" "retur= n" =20 _send_qemu_cmd $QEMU_HANDLE \ diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 index 2d84fddb01..632973b23c 100755 --- a/tests/qemu-iotests/147 +++ b/tests/qemu-iotests/147 @@ -24,7 +24,7 @@ import socket import stat import time import iotests -from iotests import cachemode, imgfmt, qemu_img, qemu_nbd, qemu_nbd_early_= pipe +from iotests import cachemode, aiomode, imgfmt, qemu_img, qemu_nbd, qemu_n= bd_early_pipe =20 NBD_PORT_START =3D 32768 NBD_PORT_END =3D NBD_PORT_START + 1024 @@ -134,7 +134,8 @@ class BuiltinNBD(NBDBlockdevAddBase): self.server.add_drive_raw('if=3Dnone,id=3Dnbd-export,' + 'file=3D%s,' % test_img + 'format=3D%s,' % imgfmt + - 'cache=3D%s' % cachemode) + 'cache=3D%s' % cachemode + + 'aio=3D%s' % aiomode) self.server.launch() =20 def tearDown(self): diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index e317e63422..547c1b47b0 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -58,21 +58,21 @@ qemu_comm_method=3D"monitor" =20 if [ "$IMGOPTSSYNTAX" =3D "true" ]; then _launch_qemu \ - -drive "${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk + -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk else _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},driver=3D$IMGFMT,= id=3Ddisk + -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,dr= iver=3D$IMGFMT,id=3Ddisk fi src=3D$QEMU_HANDLE =20 if [ "$IMGOPTSSYNTAX" =3D "true" ]; then _launch_qemu \ - -drive "${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk \ + -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk= \ -incoming "unix:${MIG_SOCKET}" else _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},driver=3D$IMGFMT,= id=3Ddisk \ - -incoming "unix:${MIG_SOCKET}" + -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,dr= iver=3D$IMGFMT,\ + id=3Ddisk -incoming "unix:${MIG_SOCKET}" fi dest=3D$QEMU_HANDLE =20 diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index fbe5a99beb..b16db9466d 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -56,13 +56,14 @@ echo qemu_comm_method=3D"qmp" =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,driver=3D$IMGFMT,id=3Dd= isk + -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,aio=3D$AIOMODE,\ + driver=3D$IMGFMT,id=3Ddisk src=3D$QEMU_HANDLE _send_qemu_cmd $src "{ 'execute': 'qmp_capabilities' }" 'return' =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}.dest",cache=3D$CACHEMODE,driver=3D$IMGFMT,i= d=3Ddisk \ - -incoming "unix:${MIG_SOCKET}" + -drive file=3D"${TEST_IMG}.dest",cache=3D$CACHEMODE,aio=3D$AIOMODE,\ + driver=3D$IMGFMT,id=3Ddisk -incoming "unix:${MIG_SOCKET}" dest=3D$QEMU_HANDLE _send_qemu_cmd $dest "{ 'execute': 'qmp_capabilities' }" 'return' =20 diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 index 454ff600cc..1c74a0ef5a 100755 --- a/tests/qemu-iotests/185 +++ b/tests/qemu-iotests/185 @@ -54,7 +54,8 @@ echo qemu_comm_method=3D"qmp" =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}.base",cache=3D$CACHEMODE,driver=3D$IMGFMT,i= d=3Ddisk + -drive file=3D"${TEST_IMG}.base",cache=3D$CACHEMODE,aio=3D$AIOMODE,\ + driver=3D$IMGFMT,id=3Ddisk h=3D$QEMU_HANDLE _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' =20 @@ -125,7 +126,8 @@ echo =3D=3D=3D Start active commit job and exit qemu = =3D=3D=3D echo =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,driver=3D$IMGFMT,id=3Dd= isk + -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,aio=3D$AIOMODE,driver= =3D$IMGFMT,\ + id=3Ddisk h=3D$QEMU_HANDLE _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' =20 @@ -147,7 +149,8 @@ echo =3D=3D=3D Start mirror job and exit qemu =3D=3D=3D echo =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,driver=3D$IMGFMT,id=3Dd= isk + -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,aio=3D$AIOMODE,driver= =3D$IMGFMT,\ + id=3Ddisk h=3D$QEMU_HANDLE _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' =20 @@ -172,7 +175,9 @@ echo =3D=3D=3D Start backup job and exit qemu =3D=3D=3D echo =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,driver=3D$IMGFMT,id=3Dd= isk + _launch_qemu \ + -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,aio=3D$AIOMODE,driver= =3D$IMGFMT,\ + id=3Ddisk h=3D$QEMU_HANDLE _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' =20 @@ -196,7 +201,9 @@ echo =3D=3D=3D Start streaming job and exit qemu =3D=3D= =3D echo =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,driver=3D$IMGFMT,id=3Dd= isk + _launch_qemu \ + -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,aio=3D$AIOMODE,driver= =3D$IMGFMT,\ + id=3Ddisk h=3D$QEMU_HANDLE _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' =20 diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 index 72d431f251..b554dd947b 100755 --- a/tests/qemu-iotests/200 +++ b/tests/qemu-iotests/200 @@ -66,7 +66,8 @@ echo =3D=3D=3D Starting QEMU VM =3D=3D=3D echo qemu_comm_method=3D"qmp" _launch_qemu -object iothread,id=3Diothread0 $virtio_scsi \ - -drive file=3D"${TEST_IMG}",media=3Ddisk,if=3Dnone,cache=3D$C= ACHEMODE,id=3Ddrive_sysdisk,format=3D$IMGFMT \ + -drive file=3D"${TEST_IMG}",media=3Ddisk,if=3Dnone,cache=3D$C= ACHEMODE,\ + aio=3D$AIOMODE,id=3Ddrive_sysdisk,format=3D$IMGFMT \ -device scsi-hd,drive=3Ddrive_sysdisk,bus=3Dscsi0.0,id=3Dsysd= isk,bootindex=3D0 h1=3D$QEMU_HANDLE =20 diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201 index 7abf740fe4..48837c4f30 100755 --- a/tests/qemu-iotests/201 +++ b/tests/qemu-iotests/201 @@ -58,21 +58,21 @@ qemu_comm_method=3D"monitor" =20 if [ "$IMGOPTSSYNTAX" =3D "true" ]; then _launch_qemu \ - -drive "${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk + -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk else _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},driver=3D$IMGFMT,= id=3Ddisk + -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,dr= iver=3D$IMGFMT,id=3Ddisk fi src=3D$QEMU_HANDLE =20 if [ "$IMGOPTSSYNTAX" =3D "true" ]; then _launch_qemu \ - -drive "${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk \ + -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk= \ -incoming "unix:${MIG_SOCKET}" else _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},driver=3D$IMGFMT,= id=3Ddisk \ - -incoming "unix:${MIG_SOCKET}" + -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,dr= iver=3D$IMGFMT,\ + id=3Ddisk -incoming "unix:${MIG_SOCKET}" fi dest=3D$QEMU_HANDLE =20 --=20 2.21.0