From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrADJ-0007cK-P2 for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrADD-0005wK-He for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46469) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrADD-0005wA-9r for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:23 -0400 From: Kevin Wolf Date: Tue, 17 Jul 2012 18:00:22 +0200 Message-Id: <1342540838-9027-26-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> Subject: [Qemu-devel] [PATCH 25/41] qtest: Cover qdev property for BIOS CHS translation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- tests/hd-geo-test.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index a47b945..5d9d2e4 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -321,15 +321,16 @@ static void test_ide_drive_user(const char *dev, bool trans) const CHST expected_chst = { secs / (4 * 32) , 4, 32, trans }; argc = setup_common(argv, ARRAY_SIZE(argv)); - opts = g_strdup_printf("%s,cyls=%d,heads=%d,secs=%d%s", - dev && !trans ? dev : "", + opts = g_strdup_printf("%s,%s%scyls=%d,heads=%d,secs=%d", + dev ?: "", + trans && dev ? "bios-chs-" : "", + trans ? "trans=lba," : "", expected_chst.cyls, expected_chst.heads, - expected_chst.secs, - trans ? ",trans=lba" : ""); + expected_chst.secs); cur_ide[0] = &expected_chst; argc = setup_ide(argc, argv, ARRAY_SIZE(argv), - 0, dev && !trans ? opts : NULL, backend_small, mbr_chs, - dev && !trans ? "" : opts); + 0, dev ? opts : NULL, backend_small, mbr_chs, + dev ? "" : opts); g_free(opts); qtest_start(g_strjoinv(" ", argv)); test_cmos(); -- 1.7.6.5