2013/12/31 Peter Crosthwaite <peter.crosthwa...@xilinx.com> > On Tue, Dec 31, 2013 at 2:42 PM, Kewei Yu <kewe...@gmail.com> wrote: > > When we disabling vnc from "./configure", the qemu can't use the vnc > option. > > "disable", -"the", "QEMU", > Do you mean "s/disabling/disable; s/the\ qemu/QEMU"?
> > > So qtest can't use the "vnc -none ", otherwise "make check" will hang. > > > > Curious, why exactly does make check hang? Shouldn't it just fail with > an error result in this case? > Yeah, there is an error result "VNC support is disabled". > > > Signed-off-by: Kewei Yu <kewe...@gmail.com> > > --- > > v2: Consolidate VNC macro's #ifdef'ery to one central point > (tests/libqtest.c). > > > > 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 = 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); > > > > 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 = "-vnc none "; > > +#else > > +static const char *qtest_vnc_param = NULL; > > +#endif > > + > > QTestState *global_qtest; > > > > struct QTestState > > @@ -136,8 +142,10 @@ QTestState *qtest_init(const char *extra_args) > > "-pidfile %s " > > "-machine accel=qtest " > > "-display none " > > + "%s" > > "%s", qemu_binary, s->socket_path, > > s->qmp_socket_path, pid_file, > > + qtest_vnc_param ?: "", > > I do vaguely remember someone going to efforts to remove uses of "? : > foo" (with the blank true value). I'm not clear the sentence's meaning. > > Regards, > Peter > > > extra_args ?: ""); > > execlp("/bin/sh", "sh", "-c", command, NULL); > > exit(1); > > -- > > 1.7.1 > > > > > Thanks Kewei