From nobody Sat Oct 25 21:30:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521730122728656.3572808691948; Thu, 22 Mar 2018 07:48:42 -0700 (PDT) Received: from localhost ([::1]:32964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez1W6-0004dz-R1 for importer@patchew.org; Thu, 22 Mar 2018 10:48:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez1Ue-0003wt-KY for qemu-devel@nongnu.org; Thu, 22 Mar 2018 10:47:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ez1UX-0007K4-8h for qemu-devel@nongnu.org; Thu, 22 Mar 2018 10:47:03 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:38286) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ez1UW-0006yZ-PQ for qemu-devel@nongnu.org; Thu, 22 Mar 2018 10:46:57 -0400 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1ez1Tw-00070l-Mv; Thu, 22 Mar 2018 15:46:20 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1ez1Th-0002cY-AW; Thu, 22 Mar 2018 16:46:05 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=0Qyx5U0CQ25gaeDTJOi4QD2Kgi0Cg0aLqAUVWXfK6Kk=; b=qv9xzx7KrkoTgG5lSeFVKVTXUiXuTCNp0t5eQmF4qYdWccev5QZjL/15uT+qvrpFbj2fLJ26e4WI7MbK5Ds1NJcMjnhyeVuo0ie8lVSQ5funBJD5bQ+Boj4C6CLhHqLek0lDu7sdsD2V3iG7pnWIpjcWkYfpVwTX6Di0FaEVrUHP+U7HCWcdxq54SsJqHIHmSMbm0BHXBA8OKb9T2+4Y4y30pLanQHmExVcByFyJlgkqfKAKjIRdb3LExUgz/sinwXXHT+pnj8SCI+KwlDhCwHxHb8jq1qnveptdSIPsw4BY1Td2z7NYBxWsKwtGens0HQ4jFx4g/fM5lVZuqlLo0A==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 22 Mar 2018 16:45:50 +0200 Message-Id: <662d2860f0b334049730c0c9fe6d556ad30d63da.1521729843.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH for-2.12 v4 1/2] iotests: Update 051 and 186 after commit 1454509726719e0933c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alberto Garcia , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" SCSI controllers are no longer created automatically for -drive if=3Dscsi, so this patch updates the tests that relied on that. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake Cc: Thomas Huth --- tests/qemu-iotests/051.pc.out | 20 -------------------- tests/qemu-iotests/186 | 4 ---- tests/qemu-iotests/186.out | 28 ---------------------------- 3 files changed, 52 deletions(-) diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out index 830c11880a..b01f9a90d7 100644 --- a/tests/qemu-iotests/051.pc.out +++ b/tests/qemu-iotests/051.pc.out @@ -117,20 +117,10 @@ Testing: -drive if=3Dide,media=3Dcdrom QEMU X.Y.Z monitor - type 'help' for more information (qemu) quit =20 -Testing: -drive if=3Dscsi,media=3Dcdrom -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive if=3Dscsi,media=3Dcdrom: warning: bus=3D0,unit=3D= 0 is deprecated with this machine type -quit - Testing: -drive if=3Dide QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs med= ia, but drive is empty =20 -Testing: -drive if=3Dscsi -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive if=3Dscsi: warning: bus=3D0,unit=3D0 is deprecate= d with this machine type -QEMU_PROG: -drive if=3Dscsi: Device needs media, but drive is empty - Testing: -drive if=3Dvirtio QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -drive if=3Dvirtio: Device needs media, but drive is emp= ty @@ -170,20 +160,10 @@ Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dide,medi= a=3Dcdrom,readonly=3Don QEMU X.Y.Z monitor - type 'help' for more information (qemu) quit =20 -Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dscsi,media=3Dcdrom,readonly= =3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dscsi,media=3Dcdrom,r= eadonly=3Don: warning: bus=3D0,unit=3D0 is deprecated with this machine type -quit - Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dide,readonly=3Don QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is re= ad-only =20 -Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dscsi,readonly=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,if=3Dscsi,readonly=3Don: = warning: bus=3D0,unit=3D0 is deprecated with this machine type -quit - Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dvirtio,readonly=3Don QEMU X.Y.Z monitor - type 'help' for more information (qemu) quit diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 index 44cc01ed87..9687243d34 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -133,10 +133,6 @@ check_info_block -drive if=3Dide,driver=3Dnull-co check_info_block -drive if=3Dide,media=3Dcdrom check_info_block -drive if=3Dide,driver=3Dnull-co,media=3Dcdrom =20 -check_info_block -drive if=3Dscsi,driver=3Dnull-co -check_info_block -drive if=3Dscsi,media=3Dcdrom -check_info_block -drive if=3Dscsi,driver=3Dnull-co,media=3Dcdrom - check_info_block -drive if=3Dvirtio,driver=3Dnull-co =20 check_info_block -drive if=3Dpflash,driver=3Dnull-co,size=3D1M diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out index c8377fe146..ec75c0fc60 100644 --- a/tests/qemu-iotests/186.out +++ b/tests/qemu-iotests/186.out @@ -442,34 +442,6 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only) Cache mode: writeback (qemu) quit =20 -Testing: -drive if=3Dscsi,driver=3Dnull-co -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive if=3Dscsi,driver=3Dnull-co: warning: bus=3D0,unit= =3D0 is deprecated with this machine type -info block -scsi0-hd0 (NODE_NAME): null-co:// (null-co) - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0] - Cache mode: writeback -(qemu) quit - -Testing: -drive if=3Dscsi,media=3Dcdrom -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive if=3Dscsi,media=3Dcdrom: warning: bus=3D0,unit=3D= 0 is deprecated with this machine type -info block -scsi0-cd0: [not inserted] - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0] - Removable device: not locked, tray closed -(qemu) quit - -Testing: -drive if=3Dscsi,driver=3Dnull-co,media=3Dcdrom -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive if=3Dscsi,driver=3Dnull-co,media=3Dcdrom: warning= : bus=3D0,unit=3D0 is deprecated with this machine type -info block -scsi0-cd0 (NODE_NAME): null-co:// (null-co, read-only) - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0] - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit - Testing: -drive if=3Dvirtio,driver=3Dnull-co QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block --=20 2.11.0 From nobody Sat Oct 25 21:30:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521730241661943.0037517043093; Thu, 22 Mar 2018 07:50:41 -0700 (PDT) Received: from localhost ([::1]:32980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez1Y8-0006Lp-Fj for importer@patchew.org; Thu, 22 Mar 2018 10:50:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez1Ua-0003wX-Fs for qemu-devel@nongnu.org; Thu, 22 Mar 2018 10:47:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ez1UX-0007Jz-84 for qemu-devel@nongnu.org; Thu, 22 Mar 2018 10:47:00 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:38303) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ez1UW-00070R-PN for qemu-devel@nongnu.org; Thu, 22 Mar 2018 10:46:57 -0400 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1ez1Ty-00070o-NI; Thu, 22 Mar 2018 15:46:22 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1ez1Tj-0002cb-EU; Thu, 22 Mar 2018 16:46:07 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=3m23MIyoOamp4XoAYqRRVbd5l+1skOyQrXFdHOV3eiA=; b=dlulRLj0Hp2wDe1ln9cl4b5CoM6IVCxsyEDqc6nmMpBydQ0N54Eo9Hf1v3a5vJvw3fuh2pJgBY5eii7CPsO9vJ2xxbS4PDZAwXi7IKBw11Rl9yeTv0GWwhXOMqtuu6ljMQ2c9AUHsBniBukG9DkExPyTd1kr3T+7rwabmmgBjy4kZz5zbo4ElNRG61IJxfBiMD80tIcMtFJbpgnufhu2Z5f0uJDmQrjtexJIbz5DTAZ6RZm7jwj7/15HnMkDG95z7J92JsnwRiLZWnwsAU7SH8LdcsUT+5zjK0QNU91dYnl3u2La7yXxgMmDW4RB/ysbcAAZSKDTaBRIJzvgDxZ5gg==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 22 Mar 2018 16:45:51 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH for-2.12 v4 2/2] iotests: Update 186 after commit ac64273c66ab136c44043259162 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alberto Garcia , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Commit ac64273c66ab136c44 modified the output of iotest 186, changing the QOM path of floppy drives from /machine/unattached/device[17] to /machine/unattached/device[13]. Instead of updating the test output to reflect this change, this patch adds a new filter that hides all QOM paths from the 'Attached to:' line of the 'info block' command. Signed-off-by: Alberto Garcia Cc: Philippe Mathieu-Daud=C3=A9 --- tests/qemu-iotests/186 | 2 +- tests/qemu-iotests/186.out | 56 ++++++++++++++++++++----------------= ---- tests/qemu-iotests/common.filter | 5 ++++ 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 index 9687243d34..0aa4395a57 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -64,7 +64,7 @@ function check_info_block() { echo "info block" | do_run_qemu "$@" | _filter_win32 | _filter_hmp | _filter_qemu | - _filter_generated_node_ids + _filter_generated_node_ids | _filter_qom_path } =20 =20 diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out index ec75c0fc60..716b01ac3d 100644 --- a/tests/qemu-iotests/186.out +++ b/tests/qemu-iotests/186.out @@ -7,7 +7,7 @@ Testing: -device floppy QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block /machine/peripheral-anon/device[1]: [not inserted] - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Removable device: not locked, tray closed (qemu) quit =20 @@ -23,7 +23,7 @@ Testing: -device ide-cd QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block /machine/peripheral-anon/device[1]: [not inserted] - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Removable device: not locked, tray closed (qemu) quit =20 @@ -39,7 +39,7 @@ Testing: -device scsi-cd QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block /machine/peripheral-anon/device[1]: [not inserted] - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Removable device: not locked, tray closed (qemu) quit =20 @@ -58,7 +58,7 @@ Testing: -blockdev driver=3Dnull-co,node-name=3Dnull -dev= ice ide-hd,drive=3Dnull QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block null: null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Cache mode: writeback (qemu) quit =20 @@ -74,7 +74,7 @@ Testing: -blockdev driver=3Dnull-co,node-name=3Dnull -dev= ice scsi-hd,drive=3Dnull QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block null: null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Cache mode: writeback (qemu) quit =20 @@ -90,7 +90,7 @@ Testing: -blockdev driver=3Dnull-co,node-name=3Dnull -dev= ice virtio-blk-pci,drive=3Dnu QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block null: null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1]/virtio-backend + Attached to: PATH Cache mode: writeback (qemu) quit =20 @@ -98,7 +98,7 @@ Testing: -blockdev driver=3Dnull-co,node-name=3Dnull -dev= ice virtio-blk-pci,drive=3Dnu QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block null: null-co:// (null-co) - Attached to: /machine/peripheral/qdev_id/virtio-backend + Attached to: PATH Cache mode: writeback (qemu) quit =20 @@ -106,7 +106,7 @@ Testing: -blockdev driver=3Dnull-co,node-name=3Dnull -d= evice floppy,drive=3Dnull QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block null: null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Removable device: not locked, tray closed Cache mode: writeback (qemu) quit @@ -124,7 +124,7 @@ Testing: -blockdev driver=3Dnull-co,node-name=3Dnull -d= evice ide-cd,drive=3Dnull QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block null: null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Removable device: not locked, tray closed Cache mode: writeback (qemu) quit @@ -142,7 +142,7 @@ Testing: -blockdev driver=3Dnull-co,node-name=3Dnull -d= evice scsi-cd,drive=3Dnull QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block null: null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Removable device: not locked, tray closed Cache mode: writeback (qemu) quit @@ -191,7 +191,7 @@ none0 (null): null-co:// (null-co) Cache mode: writeback =20 null: null-co:// (null-co) - Attached to: /machine/peripheral/qdev_id/virtio-backend + Attached to: PATH Cache mode: writeback (qemu) quit =20 @@ -241,7 +241,7 @@ Testing: -drive if=3Dnone,driver=3Dnull-co,node-name=3D= null -device ide-hd,drive=3Dnone0 QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block none0 (null): null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Cache mode: writeback (qemu) quit =20 @@ -257,7 +257,7 @@ Testing: -drive if=3Dnone,driver=3Dnull-co,node-name=3D= null -device scsi-hd,drive=3Dnone QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block none0 (null): null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Cache mode: writeback (qemu) quit =20 @@ -273,7 +273,7 @@ Testing: -drive if=3Dnone,driver=3Dnull-co,node-name=3D= null -device virtio-blk-pci,dri QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block none0 (null): null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1]/virtio-backend + Attached to: PATH Cache mode: writeback (qemu) quit =20 @@ -281,7 +281,7 @@ Testing: -drive if=3Dnone,driver=3Dnull-co,node-name=3D= null -device virtio-blk-pci,dri QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block none0 (null): null-co:// (null-co) - Attached to: /machine/peripheral/qdev_id/virtio-backend + Attached to: PATH Cache mode: writeback (qemu) quit =20 @@ -289,7 +289,7 @@ Testing: -drive if=3Dnone,driver=3Dnull-co,node-name=3D= null -device floppy,drive=3Dnone0 QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block none0 (null): null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Removable device: not locked, tray closed Cache mode: writeback (qemu) quit @@ -307,7 +307,7 @@ Testing: -drive if=3Dnone,driver=3Dnull-co,node-name=3D= null -device ide-cd,drive=3Dnone0 QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block none0 (null): null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Removable device: not locked, tray closed Cache mode: writeback (qemu) quit @@ -325,7 +325,7 @@ Testing: -drive if=3Dnone,driver=3Dnull-co,node-name=3D= null -device scsi-cd,drive=3Dnone QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block none0 (null): null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Removable device: not locked, tray closed Cache mode: writeback (qemu) quit @@ -353,7 +353,7 @@ Testing: -drive if=3Dnone -device floppy,drive=3Dnone0 QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block none0: [not inserted] - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Removable device: not locked, tray closed (qemu) quit =20 @@ -369,7 +369,7 @@ Testing: -drive if=3Dnone -device ide-cd,drive=3Dnone0 QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block none0: [not inserted] - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Removable device: not locked, tray closed (qemu) quit =20 @@ -385,7 +385,7 @@ Testing: -drive if=3Dnone -device scsi-cd,drive=3Dnone0 QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block none0: [not inserted] - Attached to: /machine/peripheral-anon/device[1] + Attached to: PATH Removable device: not locked, tray closed (qemu) quit =20 @@ -404,7 +404,7 @@ Testing: -drive if=3Dfloppy QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block floppy0: [not inserted] - Attached to: /machine/unattached/device[17] + Attached to: PATH Removable device: not locked, tray closed (qemu) quit =20 @@ -412,7 +412,7 @@ Testing: -drive if=3Dfloppy,driver=3Dnull-co QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block floppy0 (NODE_NAME): null-co:// (null-co) - Attached to: /machine/unattached/device[17] + Attached to: PATH Removable device: not locked, tray closed Cache mode: writeback (qemu) quit @@ -421,7 +421,7 @@ Testing: -drive if=3Dide,driver=3Dnull-co QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block ide0-hd0 (NODE_NAME): null-co:// (null-co) - Attached to: /machine/unattached/device[18] + Attached to: PATH Cache mode: writeback (qemu) quit =20 @@ -429,7 +429,7 @@ Testing: -drive if=3Dide,media=3Dcdrom QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block ide0-cd0: [not inserted] - Attached to: /machine/unattached/device[18] + Attached to: PATH Removable device: not locked, tray closed (qemu) quit =20 @@ -437,7 +437,7 @@ Testing: -drive if=3Dide,driver=3Dnull-co,media=3Dcdrom QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only) - Attached to: /machine/unattached/device[18] + Attached to: PATH Removable device: not locked, tray closed Cache mode: writeback (qemu) quit @@ -446,7 +446,7 @@ Testing: -drive if=3Dvirtio,driver=3Dnull-co QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block virtio0 (NODE_NAME): null-co:// (null-co) - Attached to: /machine/peripheral-anon/device[1]/virtio-backend + Attached to: PATH Cache mode: writeback (qemu) quit =20 @@ -454,7 +454,7 @@ Testing: -drive if=3Dpflash,driver=3Dnull-co,size=3D1M QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block pflash0 (NODE_NAME): json:{"driver": "null-co", "size": "1M"} (null-co) - Attached to: /machine/unattached/device[2] + Attached to: PATH Cache mode: writeback (qemu) quit =20 diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.f= ilter index cb2be23340..c5f4bcf578 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -32,6 +32,11 @@ _filter_generated_node_ids() sed -re 's/\#block[0-9]{3,}/NODE_NAME/' } =20 +_filter_qom_path() +{ + sed -e 's#\(Attached to: *\) /.*#\1 PATH#' +} + # replace occurrences of the actual TEST_DIR value with TEST_DIR _filter_testdir() { --=20 2.11.0