From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrADF-0007bY-6L for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrAD6-0005tB-8j for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60015) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrAD6-0005st-0G for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:16 -0400 From: Kevin Wolf Date: Tue, 17 Jul 2012 18:00:18 +0200 Message-Id: <1342540838-9027-22-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 21/41] qtest: Cover qdev properties for disk geometry 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 | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index cc447a2..a47b945 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -321,13 +321,15 @@ 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(",cyls=%d,heads=%d,secs=%d%s", + opts = g_strdup_printf("%s,cyls=%d,heads=%d,secs=%d%s", + dev && !trans ? dev : "", expected_chst.cyls, expected_chst.heads, expected_chst.secs, trans ? ",trans=lba" : ""); cur_ide[0] = &expected_chst; argc = setup_ide(argc, argv, ARRAY_SIZE(argv), - 0, dev, backend_small, mbr_chs, opts); + 0, dev && !trans ? opts : NULL, backend_small, mbr_chs, + dev && !trans ? "" : opts); g_free(opts); qtest_start(g_strjoinv(" ", argv)); test_cmos(); -- 1.7.6.5