diff options
| author | Markus Armbruster <armbru@redhat.com> | 2012-07-10 11:12:45 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-07-17 16:48:31 +0200 |
| commit | eb0e4b9804ce634386c4de4b2708af0ad01edaa1 (patch) | |
| tree | a4c9dc75128d26c385e33476d483747e0ad6af33 | |
| parent | ba801960db1c08035f7e1772bd482aa80d909a35 (diff) | |
| download | qemu-eb0e4b9804ce634386c4de4b2708af0ad01edaa1.zip qemu-eb0e4b9804ce634386c4de4b2708af0ad01edaa1.tar.gz qemu-eb0e4b9804ce634386c4de4b2708af0ad01edaa1.tar.bz2 | |
qtest: Cover qdev properties for disk geometry
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | 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(); |