From patchwork Tue Jul 17 16:00:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 171490 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8E6242C00B0 for ; Wed, 18 Jul 2012 02:55:29 +1000 (EST) Received: from localhost ([::1]:60669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrB3X-00056o-Nf for incoming@patchwork.ozlabs.org; Tue, 17 Jul 2012 12:55:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrADO-0007cg-Ax for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrADH-0005y3-EM for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28401) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrADH-0005xr-5X for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:27 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6HG1PP6027437 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 Jul 2012 12:01:25 -0400 Received: from dhcp-5-188.str.redhat.com (vpn1-6-35.ams2.redhat.com [10.36.6.35]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q6HG0dqv007516; Tue, 17 Jul 2012 12:01:24 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Tue, 17 Jul 2012 18:00:25 +0200 Message-Id: <1342540838-9027-29-git-send-email-kwolf@redhat.com> In-Reply-To: <1342540838-9027-1-git-send-email-kwolf@redhat.com> References: <1342540838-9027-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 28/41] qtest: Test we don't put hard disk info into CMOS for a CD-ROM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- tests/hd-geo-test.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index 5d9d2e4..9a31e85 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -369,6 +369,27 @@ static void test_ide_device_user_chst(void) test_ide_drive_user("ide-hd", true); } +/* + * Test case: IDE devices (if=ide), but use index=0 for CD-ROM + */ +static void test_ide_drive_cd_0(void) +{ + char *argv[256]; + int argc, ide_idx; + Backend i; + + argc = setup_common(argv, ARRAY_SIZE(argv)); + for (i = 0; i <= backend_empty; i++) { + ide_idx = backend_empty - i; + cur_ide[ide_idx] = &hd_chst[i][mbr_blank]; + argc = setup_ide(argc, argv, ARRAY_SIZE(argv), + ide_idx, NULL, i, mbr_blank, ""); + } + qtest_start(g_strjoinv(" ", argv)); + test_cmos(); + qtest_quit(global_qtest); +} + int main(int argc, char **argv) { Backend i; @@ -390,6 +411,7 @@ int main(int argc, char **argv) qtest_add_func("hd-geo/ide/drive/mbr/chs", test_ide_drive_mbr_chs); qtest_add_func("hd-geo/ide/drive/user/chs", test_ide_drive_user_chs); qtest_add_func("hd-geo/ide/drive/user/chst", test_ide_drive_user_chst); + qtest_add_func("hd-geo/ide/drive/cd_0", test_ide_drive_cd_0); qtest_add_func("hd-geo/ide/device/mbr/blank", test_ide_device_mbr_blank); qtest_add_func("hd-geo/ide/device/mbr/lba", test_ide_device_mbr_lba); qtest_add_func("hd-geo/ide/device/mbr/chs", test_ide_device_mbr_chs);