From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sn2aQ-0000Ea-4l for qemu-devel@nongnu.org; Fri, 06 Jul 2012 03:04:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sn2aM-00053C-Sg for qemu-devel@nongnu.org; Fri, 06 Jul 2012 03:04:17 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:50664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sn2aM-00052P-LK for qemu-devel@nongnu.org; Fri, 06 Jul 2012 03:04:14 -0400 From: Markus Armbruster Date: Fri, 6 Jul 2012 08:58:04 +0200 Message-Id: <1341557890-17464-27-git-send-email-armbru@redhat.com> In-Reply-To: <1341557890-17464-1-git-send-email-armbru@redhat.com> References: <1341557890-17464-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 26/32] qtest: Cover qdev property for BIOS CHS translation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, blauwirbel@gmail.com, stefanha@linux.vnet.ibm.com, pbonzini@redhat.com Signed-off-by: Markus Armbruster --- 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