From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Xqk-0006s1-VE for qemu-devel@nongnu.org; Tue, 07 Jan 2014 09:41:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0Xqb-0006tE-31 for qemu-devel@nongnu.org; Tue, 07 Jan 2014 09:41:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51988) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Xqa-0006rq-PI for qemu-devel@nongnu.org; Tue, 07 Jan 2014 09:41:36 -0500 Message-ID: <52CC121B.1010001@redhat.com> Date: Tue, 07 Jan 2014 15:41:31 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1388988324-25281-1-git-send-email-keweihk@gmail.com> In-Reply-To: <1388988324-25281-1-git-send-email-keweihk@gmail.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 1/1] qtest: Fix the bug about disable vnc causes "make check" fail List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kewei Yu Cc: kwolf@redhat.com, peter.crosthwaite@xilinx.com, qemu-devel@nongnu.org, afaerber@suse.de Il 06/01/2014 07:05, Kewei Yu ha scritto: > When we disable vnc from "./configure", QEMU can't use the vnc option. > So qtest can't use the "vnc -none ", otherwise "make check" fails. > If QEMU uses "-display none", "-vnc none" is excrescent, So we just need to drop it. > > Signed-off-by: Kewei Yu > --- > v2: Consolidate VNC macro's #ifdef'ery to one central point (tests/libqtest.c). > v3: Fix the spelling and terminology error: "s/disabling/disable; s/the\ qemu/QEMU; s/hangs/fails;" > v4: If QEMU uses "-display none", "-vnc none" is excrescent, So we just need to drop it. > --- > tests/fdc-test.c | 5 +---- > tests/ide-test.c | 3 --- > 2 files changed, 1 insertions(+), 7 deletions(-) > > diff --git a/tests/fdc-test.c b/tests/fdc-test.c > index 38b5b17..37096dc 100644 > --- a/tests/fdc-test.c > +++ b/tests/fdc-test.c > @@ -518,7 +518,6 @@ static void fuzz_registers(void) > int main(int argc, char **argv) > { > const char *arch = qtest_get_arch(); > - char *cmdline; > int fd; > int ret; > > @@ -538,9 +537,7 @@ int main(int argc, char **argv) > /* Run the tests */ > g_test_init(&argc, &argv, NULL); > > - cmdline = g_strdup_printf("-vnc none "); > - > - qtest_start(cmdline); > + qtest_start(NULL); > qtest_irq_intercept_in(global_qtest, "ioapic"); > qtest_add_func("/fdc/cmos", test_cmos); > qtest_add_func("/fdc/no_media_on_start", test_no_media_on_start); > diff --git a/tests/ide-test.c b/tests/ide-test.c > index d5cec5a..4a0d97f 100644 > --- a/tests/ide-test.c > +++ b/tests/ide-test.c > @@ -380,7 +380,6 @@ static void test_bmdma_no_busmaster(void) > static void test_bmdma_setup(void) > { > ide_test_start( > - "-vnc none " > "-drive file=%s,if=ide,serial=%s,cache=writeback " > "-global ide-hd.ver=%s", > tmp_path, "testdisk", "version"); > @@ -410,7 +409,6 @@ static void test_identify(void) > int ret; > > ide_test_start( > - "-vnc none " > "-drive file=%s,if=ide,serial=%s,cache=writeback " > "-global ide-hd.ver=%s", > tmp_path, "testdisk", "version"); > @@ -455,7 +453,6 @@ static void test_flush(void) > uint8_t data; > > ide_test_start( > - "-vnc none " > "-drive file=blkdebug::%s,if=ide,cache=writeback", > tmp_path); > > Reviewed-by: Paolo Bonzini