From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W00lB-0001au-Dl for qemu-devel@nongnu.org; Sun, 05 Jan 2014 22:21:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W00l0-00043R-6m for qemu-devel@nongnu.org; Sun, 05 Jan 2014 22:21:49 -0500 Message-ID: <52CA213B.4000601@suse.de> Date: Mon, 06 Jan 2014 04:21:31 +0100 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1388629202-29482-1-git-send-email-keweihk@gmail.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 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: Peter Crosthwaite , Kewei Yu Cc: Kevin Wolf , Paolo Bonzini , qemu-trivial , "qemu-devel@nongnu.org Developers" , Stefan Hajnoczi Am 06.01.2014 04:13, schrieb Peter Crosthwaite: > Hi Kewei, >=20 > On Mon, Jan 6, 2014 at 12:22 PM, Kewei Yu wrote: >> Ping. >> >=20 > Paolo's latest query on the other thread is still an open question. > Does simply substituting "-display none" for "-vnc none" resolve the > problem? If not why not? Assuming Paolo is right about -display none implying -vnc none: Does *dropping* "-vnc none" resolve the problem? :) Cheers, Andreas >=20 > Regards, > Peter >=20 >> Faithfully yours >> Kewei Yu >> >> >> 2014/1/2 Kewei Yu >>> >>> 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. >>> >>> 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;" >>> --- >>> >>> tests/fdc-test.c | 5 +---- >>> tests/ide-test.c | 3 --- >>> tests/libqtest.c | 8 ++++++++ >>> 3 files changed, 9 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 =3D 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 =3D 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=3D%s,if=3Dide,serial=3D%s,cache=3Dwriteback " >>> "-global ide-hd.ver=3D%s", >>> tmp_path, "testdisk", "version"); >>> @@ -410,7 +409,6 @@ static void test_identify(void) >>> int ret; >>> >>> ide_test_start( >>> - "-vnc none " >>> "-drive file=3D%s,if=3Dide,serial=3D%s,cache=3Dwriteback " >>> "-global ide-hd.ver=3D%s", >>> tmp_path, "testdisk", "version"); >>> @@ -455,7 +453,6 @@ static void test_flush(void) >>> uint8_t data; >>> >>> ide_test_start( >>> - "-vnc none " >>> "-drive file=3Dblkdebug::%s,if=3Dide,cache=3Dwriteback", >>> tmp_path); >>> >>> diff --git a/tests/libqtest.c b/tests/libqtest.c >>> index 359d571..921391c 100644 >>> --- a/tests/libqtest.c >>> +++ b/tests/libqtest.c >>> @@ -35,6 +35,12 @@ >>> >>> #define MAX_IRQ 256 >>> >>> +#ifdef CONFIG_VNC >>> +static const char *qtest_vnc_param =3D "-vnc none "; >>> +#else >>> +static const char *qtest_vnc_param =3D NULL; >>> +#endif >>> + >>> QTestState *global_qtest; >>> >>> struct QTestState >>> @@ -136,8 +142,10 @@ QTestState *qtest_init(const char *extra_args) >>> "-pidfile %s " >>> "-machine accel=3Dqtest " >>> "-display none " >>> + "%s" >>> "%s", qemu_binary, s->socket_path, >>> s->qmp_socket_path, pid_file, >>> + qtest_vnc_param ?: "", >>> extra_args ?: ""); >>> execlp("/bin/sh", "sh", "-c", command, NULL); >>> exit(1); >>> -- >>> 1.7.1 >>> >> --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg