From nobody Sun Oct 26 07:56: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