* [Qemu-devel] [PATCH v4 1/1] qtest: Fix the bug about disable vnc causes "make check" fail
@ 2014-01-06 6:05 Kewei Yu
2014-01-07 14:41 ` Paolo Bonzini
0 siblings, 1 reply; 5+ messages in thread
From: Kewei Yu @ 2014-01-06 6:05 UTC (permalink / raw)
To: qemu-devel, kwolf; +Cc: pbonzini, peter.crosthwaite, afaerber
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH v4 1/1] qtest: Fix the bug about disable vnc causes "make check" fail
@ 2014-01-06 7:41 Kewei Yu
2014-01-06 7:57 ` Kewei Yu
0 siblings, 1 reply; 5+ messages in thread
From: Kewei Yu @ 2014-01-06 7:41 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, peter.crosthwaite, stefanha
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v4 1/1] qtest: Fix the bug about disable vnc causes "make check" fail
2014-01-06 7:41 Kewei Yu
@ 2014-01-06 7:57 ` Kewei Yu
0 siblings, 0 replies; 5+ messages in thread
From: Kewei Yu @ 2014-01-06 7:57 UTC (permalink / raw)
To: qemu-devel@nongnu.org Developers
Cc: Kevin Wolf, Peter Crosthwaite, Stefan Hajnoczi
[-- Attachment #1: Type: text/plain, Size: 2578 bytes --]
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
>
>
[-- Attachment #2: Type: text/html, Size: 3731 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v4 1/1] qtest: Fix the bug about disable vnc causes "make check" fail
2014-01-06 6:05 [Qemu-devel] [PATCH v4 1/1] qtest: Fix the bug about disable vnc causes "make check" fail Kewei Yu
@ 2014-01-07 14:41 ` Paolo Bonzini
2014-01-07 17:00 ` Kevin Wolf
0 siblings, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2014-01-07 14:41 UTC (permalink / raw)
To: Kewei Yu; +Cc: kwolf, peter.crosthwaite, qemu-devel, afaerber
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 <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);
>
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v4 1/1] qtest: Fix the bug about disable vnc causes "make check" fail
2014-01-07 14:41 ` Paolo Bonzini
@ 2014-01-07 17:00 ` Kevin Wolf
0 siblings, 0 replies; 5+ messages in thread
From: Kevin Wolf @ 2014-01-07 17:00 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: peter.crosthwaite, Kewei Yu, qemu-devel, afaerber
Am 07.01.2014 um 15:41 hat Paolo Bonzini geschrieben:
> 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 <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.
>
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-01-07 17:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-06 6:05 [Qemu-devel] [PATCH v4 1/1] qtest: Fix the bug about disable vnc causes "make check" fail Kewei Yu
2014-01-07 14:41 ` Paolo Bonzini
2014-01-07 17:00 ` Kevin Wolf
-- strict thread matches above, loose matches on Subject: below --
2014-01-06 7:41 Kewei Yu
2014-01-06 7:57 ` Kewei Yu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).