From nobody Tue Feb 10 17:08:30 2026 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; 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 1501080061839400.7014203851314; Wed, 26 Jul 2017 07:41:01 -0700 (PDT) Received: from localhost ([::1]:38551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daNUg-0006hM-6Z for importer@patchew.org; Wed, 26 Jul 2017 10:40:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daNQe-0003XP-Mh for qemu-devel@nongnu.org; Wed, 26 Jul 2017 10:36:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daNQa-0002OY-PS for qemu-devel@nongnu.org; Wed, 26 Jul 2017 10:36:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58318) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1daNQa-0002Nj-JM for qemu-devel@nongnu.org; Wed, 26 Jul 2017 10:36:44 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9105BC04B952; Wed, 26 Jul 2017 14:36:43 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-204-88.brq.redhat.com [10.40.204.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91694779EA; Wed, 26 Jul 2017 14:36:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9105BC04B952 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=ldoktor@redhat.com From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= To: qemu-devel@nongnu.org Date: Wed, 26 Jul 2017 16:35:32 +0200 Message-Id: <20170726143543.2530-4-ldoktor@redhat.com> In-Reply-To: <20170726143543.2530-1-ldoktor@redhat.com> References: <20170726143543.2530-1-ldoktor@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 26 Jul 2017 14:36:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 03/14] qemu-iotests: Fix reference output for 186 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: ldoktor@redhat.com, Kevin Wolf , famz@redhat.com, ehabkost@redhat.com, apahim@redhat.com, f4bug@amsat.org, armbru@redhat.com, mreitz@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Kevin Wolf Commits 70f17a1 ('error: Revert unwanted change of warning messages') and e1824e5 ('qemu-iotests: Test 'info block'') had a semantic merge conflict, which results in failure for qemu-iotests case 186. Fix the reference output to consider the changes of 70f17a1. Signed-off-by: Kevin Wolf Message-id: 1500973176-29235-1-git-send-email-kwolf@redhat.com Reviewed-by: Markus Armbruster Reviewed-by: Stefan Hajnoczi Signed-off-by: Max Reitz --- tests/qemu-iotests/186.out | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out index b963b12..b8bf9a2 100644 --- a/tests/qemu-iotests/186.out +++ b/tests/qemu-iotests/186.out @@ -442,7 +442,7 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only) Cache mode: writeback (qemu) quit =20 -warning: qemu-system-x86_64: -drive if=3Dscsi,driver=3Dnull-co: bus=3D0,un= it=3D0 is deprecated with this machine type +qemu-system-x86_64: -drive if=3Dscsi,driver=3Dnull-co: warning: bus=3D0,un= it=3D0 is deprecated with this machine type Testing: -drive if=3Dscsi,driver=3Dnull-co QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block @@ -451,7 +451,7 @@ scsi0-hd0 (NODE_NAME): null-co:// (null-co) Cache mode: writeback (qemu) quit =20 -warning: qemu-system-x86_64: -drive if=3Dscsi,media=3Dcdrom: bus=3D0,unit= =3D0 is deprecated with this machine type +qemu-system-x86_64: -drive if=3Dscsi,media=3Dcdrom: warning: bus=3D0,unit= =3D0 is deprecated with this machine type Testing: -drive if=3Dscsi,media=3Dcdrom QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block @@ -460,7 +460,7 @@ scsi0-cd0: [not inserted] Removable device: not locked, tray closed (qemu) quit =20 -warning: qemu-system-x86_64: -drive if=3Dscsi,driver=3Dnull-co,media=3Dcdr= om: bus=3D0,unit=3D0 is deprecated with this machine type +qemu-system-x86_64: -drive if=3Dscsi,driver=3Dnull-co,media=3Dcdrom: warni= ng: bus=3D0,unit=3D0 is deprecated with this machine type Testing: -drive if=3Dscsi,driver=3Dnull-co,media=3Dcdrom QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block --=20 2.9.4