| Message ID | 1388994073-3130-1-git-send-email-keweihk@gmail.com |
|---|---|
| State | New |
| Headers | show |
Sorry, I don't know something wrong happened to my git or gmail, My patch v4 doesn't use the new title, The two patch v4 are same at all, reviewers just review the first patch_v4. Regard Kewei 2014/1/6 Kewei Yu <keweihk@gmail.com> > 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 <keweihk@gmail.com> > --- > 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); > > -- > 1.7.1 > >
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);
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 <keweihk@gmail.com> --- 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(-)