* Re: [Qemu-devel] [PATCH v3 1/1] qtest: Fix the bug about disable vnc causes "make check" fail
@ 2014-01-06 3:13 ` Peter Crosthwaite
0 siblings, 0 replies; 10+ messages in thread
From: Peter Crosthwaite @ 2014-01-06 3:13 UTC (permalink / raw)
To: Kewei Yu, Paolo Bonzini, Andreas Färber
Cc: Kevin Wolf, qemu-trivial, qemu-devel@nongnu.org Developers,
Stefan Hajnoczi
Hi Kewei,
On Mon, Jan 6, 2014 at 12:22 PM, Kewei Yu <keweihk@gmail.com> wrote:
> Ping.
>
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?
Regards,
Peter
> Faithfully yours
> Kewei Yu
>
>
> 2014/1/2 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.
>>
>> 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;"
>> ---
>>
>> 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 ?: "",
>> extra_args ?: "");
>> execlp("/bin/sh", "sh", "-c", command, NULL);
>> exit(1);
>> --
>> 1.7.1
>>
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Qemu-trivial] [Qemu-devel] [PATCH v3 1/1] qtest: Fix the bug about disable vnc causes "make check" fail
2014-01-06 3:13 ` Peter Crosthwaite
@ 2014-01-06 3:21 ` Andreas Färber
-1 siblings, 0 replies; 10+ messages in thread
From: Andreas Färber @ 2014-01-06 3:21 UTC (permalink / raw)
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,
>
> On Mon, Jan 6, 2014 at 12:22 PM, Kewei Yu <keweihk@gmail.com> wrote:
>> Ping.
>>
>
> 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
>
> Regards,
> Peter
>
>> Faithfully yours
>> Kewei Yu
>>
>>
>> 2014/1/2 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.
>>>
>>> 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;"
>>> ---
>>>
>>> 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 ?: "",
>>> extra_args ?: "");
>>> execlp("/bin/sh", "sh", "-c", command, NULL);
>>> exit(1);
>>> --
>>> 1.7.1
>>>
>>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [PATCH v3 1/1] qtest: Fix the bug about disable vnc causes "make check" fail
@ 2014-01-06 3:21 ` Andreas Färber
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Färber @ 2014-01-06 3:21 UTC (permalink / raw)
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,
>
> On Mon, Jan 6, 2014 at 12:22 PM, Kewei Yu <keweihk@gmail.com> wrote:
>> Ping.
>>
>
> 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
>
> Regards,
> Peter
>
>> Faithfully yours
>> Kewei Yu
>>
>>
>> 2014/1/2 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.
>>>
>>> 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;"
>>> ---
>>>
>>> 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 ?: "",
>>> extra_args ?: "");
>>> execlp("/bin/sh", "sh", "-c", command, NULL);
>>> exit(1);
>>> --
>>> 1.7.1
>>>
>>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-trivial] [Qemu-devel] [PATCH v3 1/1] qtest: Fix the bug about disable vnc causes "make check" fail
2014-01-06 3:13 ` Peter Crosthwaite
@ 2014-01-06 3:26 ` Kewei Yu
-1 siblings, 0 replies; 10+ messages in thread
From: Kewei Yu @ 2014-01-06 3:26 UTC (permalink / raw)
To: Peter Crosthwaite
Cc: Kevin Wolf, qemu-trivial, qemu-devel@nongnu.org Developers,
Stefan Hajnoczi, Paolo Bonzini, Andreas Färber
[-- Attachment #1: Type: text/plain, Size: 4027 bytes --]
OK, I'm viewing the code about the two parameters.
Thanks for your reply.
Faithfully yours
Kewei Yu
2014/1/6 Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> Hi Kewei,
>
> On Mon, Jan 6, 2014 at 12:22 PM, Kewei Yu <keweihk@gmail.com> wrote:
> > Ping.
> >
>
> 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?
>
> Regards,
> Peter
>
> > Faithfully yours
> > Kewei Yu
> >
> >
> > 2014/1/2 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.
> >>
> >> 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;"
> >> ---
> >>
> >> 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 ?: "",
> >> extra_args ?: "");
> >> execlp("/bin/sh", "sh", "-c", command, NULL);
> >> exit(1);
> >> --
> >> 1.7.1
> >>
> >
>
[-- Attachment #2: Type: text/html, Size: 6705 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [PATCH v3 1/1] qtest: Fix the bug about disable vnc causes "make check" fail
@ 2014-01-06 3:26 ` Kewei Yu
0 siblings, 0 replies; 10+ messages in thread
From: Kewei Yu @ 2014-01-06 3:26 UTC (permalink / raw)
To: Peter Crosthwaite
Cc: Kevin Wolf, qemu-trivial, qemu-devel@nongnu.org Developers,
Stefan Hajnoczi, Paolo Bonzini, Andreas Färber
[-- Attachment #1: Type: text/plain, Size: 4027 bytes --]
OK, I'm viewing the code about the two parameters.
Thanks for your reply.
Faithfully yours
Kewei Yu
2014/1/6 Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> Hi Kewei,
>
> On Mon, Jan 6, 2014 at 12:22 PM, Kewei Yu <keweihk@gmail.com> wrote:
> > Ping.
> >
>
> 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?
>
> Regards,
> Peter
>
> > Faithfully yours
> > Kewei Yu
> >
> >
> > 2014/1/2 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.
> >>
> >> 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;"
> >> ---
> >>
> >> 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 ?: "",
> >> extra_args ?: "");
> >> execlp("/bin/sh", "sh", "-c", command, NULL);
> >> exit(1);
> >> --
> >> 1.7.1
> >>
> >
>
[-- Attachment #2: Type: text/html, Size: 6705 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread