From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmkJr-0002yr-36 for qemu-devel@nongnu.org; Thu, 05 Jul 2012 07:34:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmkJp-0006n4-Cf for qemu-devel@nongnu.org; Thu, 05 Jul 2012 07:33:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42377) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmkJp-0006lA-1T for qemu-devel@nongnu.org; Thu, 05 Jul 2012 07:33:57 -0400 Message-ID: <4FF57B9E.1080505@redhat.com> Date: Thu, 05 Jul 2012 13:33:50 +0200 From: Kevin Wolf MIME-Version: 1.0 References: <1340984094-5451-1-git-send-email-armbru@redhat.com> <1340984094-5451-23-git-send-email-armbru@redhat.com> In-Reply-To: <1340984094-5451-23-git-send-email-armbru@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 22/32] qtest: Cover qdev properties for disk geometry List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: pbonzini@redhat.com, aliguori@us.ibm.com, qemu-devel@nongnu.org, stefanha@linux.vnet.ibm.com Am 29.06.2012 17:34, schrieb Markus Armbruster: > Signed-off-by: Markus Armbruster > --- > 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 0ab573c..02eb5c2 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); > qtest_start(g_strjoinv(" ", argv)); > test_cmos(); > qtest_quit(global_qtest); I've spent more time parsing this test code than I needed for the review for most patches that touch actual code... Maybe an explicit if (dev && !trans) would help somewhat. don't know. Kevin