[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 19/29] qtest: Cover qdev properties for disk geom
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 19/29] qtest: Cover qdev properties for disk geometry |
Date: |
Tue, 10 Jul 2012 11:12:45 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
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
- [Qemu-devel] [PATCH v3 03/29] vvfat: Do not clobber the user's geometry, (continued)
- [Qemu-devel] [PATCH v3 03/29] vvfat: Do not clobber the user's geometry, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 07/29] hd-geometry: Unnest conditional in hd_geometry_guess(), Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 14/29] qdev: Introduce block geometry properties, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 15/29] hd-geometry: Switch to uint32_t to match BlockConf, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 12/29] ide pc: Cut out the block layer geometry middleman, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 21/29] qdev: New property type chs-translation, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 13/29] blockdev: Save geometry in DriveInfo, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 18/29] ide: qdev properties for disk geometry, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 16/29] scsi-hd: qdev properties for disk geometry, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 17/29] virtio-blk: qdev properties for disk geometry, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 19/29] qtest: Cover qdev properties for disk geometry,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 29/29] Relax IDE CHS limits from 16383, 16, 63 to 65535, 16, 255, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 27/29] hd-geometry: Compute BIOS CHS translation in one place, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 05/29] hd-geometry: Move disk geometry guessing back from block.c, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 23/29] qtest: Cover qdev property for BIOS CHS translation, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 24/29] block: Geometry and translation hints are now useless, purge them, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 22/29] ide: qdev property for BIOS CHS translation, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 28/29] blockdev: Drop redundant CHS validation for if=ide, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 26/29] qtest: Test we don't put hard disk info into CMOS for a CD-ROM, Markus Armbruster, 2012/07/10