From eb0e4b9804ce634386c4de4b2708af0ad01edaa1 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 10 Jul 2012 11:12:45 +0200 Subject: qtest: Cover qdev properties for disk geometry Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- tests/hd-geo-test.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index cc447a26bd..a47b94507f 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(); -- cgit v1.2.1