All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] tests: Remove unneeded "-vnc none" option
@ 2016-10-24 16:25 Eduardo Habkost
  2016-10-24 17:40 ` John Snow
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Eduardo Habkost @ 2016-10-24 16:25 UTC (permalink / raw)
  To: qemu-devel, Michael S. Tsirkin; +Cc: Corey Minyard, Kevin Wolf, John Snow

Some tests use the "-vnc none" option without any clear reason,
making those tests break when --disable-vnc is specified on
./configure.  Remove the unnecessary option.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 tests/ide-test.c      | 1 -
 tests/ipmi-bt-test.c  | 2 +-
 tests/ipmi-kcs-test.c | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/ide-test.c b/tests/ide-test.c
index a8a4081..3fbcb75 100644
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -582,7 +582,6 @@ static void test_retry_flush(const char *machine)
     prepare_blkdebug_script(debug_path, "flush_to_disk");
 
     ide_test_start(
-        "-vnc none "
         "-drive file=blkdebug:%s:%s,if=ide,cache=writeback,format=raw,"
         "rerror=stop,werror=stop",
         debug_path, tmp_path);
diff --git a/tests/ipmi-bt-test.c b/tests/ipmi-bt-test.c
index be9005e..ad1e97e 100644
--- a/tests/ipmi-bt-test.c
+++ b/tests/ipmi-bt-test.c
@@ -415,7 +415,7 @@ int main(int argc, char **argv)
     /* Run the tests */
     g_test_init(&argc, &argv, NULL);
 
-    cmdline = g_strdup_printf("-vnc none"
+    cmdline = g_strdup_printf(
           " -chardev socket,id=ipmi0,host=localhost,port=%d,reconnect=10"
           " -device ipmi-bmc-extern,chardev=ipmi0,id=bmc0"
           " -device isa-ipmi-bt,bmc=bmc0", emu_port);
diff --git a/tests/ipmi-kcs-test.c b/tests/ipmi-kcs-test.c
index 3750389..9cf0b34 100644
--- a/tests/ipmi-kcs-test.c
+++ b/tests/ipmi-kcs-test.c
@@ -276,7 +276,7 @@ int main(int argc, char **argv)
     /* Run the tests */
     g_test_init(&argc, &argv, NULL);
 
-    cmdline = g_strdup_printf("-vnc none -device ipmi-bmc-sim,id=bmc0"
+    cmdline = g_strdup_printf("-device ipmi-bmc-sim,id=bmc0"
                               " -device isa-ipmi-kcs,bmc=bmc0");
     qtest_start(cmdline);
     qtest_irq_intercept_in(global_qtest, "ioapic");
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Qemu-devel] [PATCH] tests: Remove unneeded "-vnc none" option
  2016-10-24 16:25 [Qemu-devel] [PATCH] tests: Remove unneeded "-vnc none" option Eduardo Habkost
@ 2016-10-24 17:40 ` John Snow
  2016-10-24 18:50 ` Corey Minyard
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: John Snow @ 2016-10-24 17:40 UTC (permalink / raw)
  To: Eduardo Habkost, qemu-devel, Michael S. Tsirkin; +Cc: Kevin Wolf, Corey Minyard



On 10/24/2016 12:25 PM, Eduardo Habkost wrote:
> Some tests use the "-vnc none" option without any clear reason,
> making those tests break when --disable-vnc is specified on
> ./configure.  Remove the unnecessary option.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  tests/ide-test.c      | 1 -
>  tests/ipmi-bt-test.c  | 2 +-
>  tests/ipmi-kcs-test.c | 2 +-
>  3 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/tests/ide-test.c b/tests/ide-test.c
> index a8a4081..3fbcb75 100644
> --- a/tests/ide-test.c
> +++ b/tests/ide-test.c
> @@ -582,7 +582,6 @@ static void test_retry_flush(const char *machine)
>      prepare_blkdebug_script(debug_path, "flush_to_disk");
>
>      ide_test_start(
> -        "-vnc none "
>          "-drive file=blkdebug:%s:%s,if=ide,cache=writeback,format=raw,"
>          "rerror=stop,werror=stop",
>          debug_path, tmp_path);

Reviewed-by: John Snow <jsnow@redhat.com>

> diff --git a/tests/ipmi-bt-test.c b/tests/ipmi-bt-test.c
> index be9005e..ad1e97e 100644
> --- a/tests/ipmi-bt-test.c
> +++ b/tests/ipmi-bt-test.c
> @@ -415,7 +415,7 @@ int main(int argc, char **argv)
>      /* Run the tests */
>      g_test_init(&argc, &argv, NULL);
>
> -    cmdline = g_strdup_printf("-vnc none"
> +    cmdline = g_strdup_printf(
>            " -chardev socket,id=ipmi0,host=localhost,port=%d,reconnect=10"
>            " -device ipmi-bmc-extern,chardev=ipmi0,id=bmc0"
>            " -device isa-ipmi-bt,bmc=bmc0", emu_port);
> diff --git a/tests/ipmi-kcs-test.c b/tests/ipmi-kcs-test.c
> index 3750389..9cf0b34 100644
> --- a/tests/ipmi-kcs-test.c
> +++ b/tests/ipmi-kcs-test.c
> @@ -276,7 +276,7 @@ int main(int argc, char **argv)
>      /* Run the tests */
>      g_test_init(&argc, &argv, NULL);
>
> -    cmdline = g_strdup_printf("-vnc none -device ipmi-bmc-sim,id=bmc0"
> +    cmdline = g_strdup_printf("-device ipmi-bmc-sim,id=bmc0"
>                                " -device isa-ipmi-kcs,bmc=bmc0");
>      qtest_start(cmdline);
>      qtest_irq_intercept_in(global_qtest, "ioapic");
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Qemu-devel] [PATCH] tests: Remove unneeded "-vnc none" option
  2016-10-24 16:25 [Qemu-devel] [PATCH] tests: Remove unneeded "-vnc none" option Eduardo Habkost
  2016-10-24 17:40 ` John Snow
@ 2016-10-24 18:50 ` Corey Minyard
  2016-10-28  1:23 ` Michael S. Tsirkin
  2016-10-31 14:19 ` Kevin Wolf
  3 siblings, 0 replies; 6+ messages in thread
From: Corey Minyard @ 2016-10-24 18:50 UTC (permalink / raw)
  To: Eduardo Habkost, qemu-devel, Michael S. Tsirkin; +Cc: Kevin Wolf, John Snow

On 10/24/2016 11:25 AM, Eduardo Habkost wrote:
> Some tests use the "-vnc none" option without any clear reason,
> making those tests break when --disable-vnc is specified on
> ./configure.  Remove the unnecessary option.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>   tests/ide-test.c      | 1 -
>   tests/ipmi-bt-test.c  | 2 +-
>   tests/ipmi-kcs-test.c | 2 +-
>   3 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/tests/ide-test.c b/tests/ide-test.c
> index a8a4081..3fbcb75 100644
> --- a/tests/ide-test.c
> +++ b/tests/ide-test.c
> @@ -582,7 +582,6 @@ static void test_retry_flush(const char *machine)
>       prepare_blkdebug_script(debug_path, "flush_to_disk");
>   
>       ide_test_start(
> -        "-vnc none "
>           "-drive file=blkdebug:%s:%s,if=ide,cache=writeback,format=raw,"
>           "rerror=stop,werror=stop",
>           debug_path, tmp_path);
> diff --git a/tests/ipmi-bt-test.c b/tests/ipmi-bt-test.c
> index be9005e..ad1e97e 100644
> --- a/tests/ipmi-bt-test.c
> +++ b/tests/ipmi-bt-test.c
> @@ -415,7 +415,7 @@ int main(int argc, char **argv)
>       /* Run the tests */
>       g_test_init(&argc, &argv, NULL);
>   
> -    cmdline = g_strdup_printf("-vnc none"
> +    cmdline = g_strdup_printf(
>             " -chardev socket,id=ipmi0,host=localhost,port=%d,reconnect=10"
>             " -device ipmi-bmc-extern,chardev=ipmi0,id=bmc0"
>             " -device isa-ipmi-bt,bmc=bmc0", emu_port);
> diff --git a/tests/ipmi-kcs-test.c b/tests/ipmi-kcs-test.c
> index 3750389..9cf0b34 100644
> --- a/tests/ipmi-kcs-test.c
> +++ b/tests/ipmi-kcs-test.c
> @@ -276,7 +276,7 @@ int main(int argc, char **argv)
>       /* Run the tests */
>       g_test_init(&argc, &argv, NULL);
>   
> -    cmdline = g_strdup_printf("-vnc none -device ipmi-bmc-sim,id=bmc0"
> +    cmdline = g_strdup_printf("-device ipmi-bmc-sim,id=bmc0"
>                                 " -device isa-ipmi-kcs,bmc=bmc0");

Tested-by: Corey Minyard <cminyard@mvista.com>

>       qtest_start(cmdline);
>       qtest_irq_intercept_in(global_qtest, "ioapic");

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Qemu-devel] [PATCH] tests: Remove unneeded "-vnc none" option
  2016-10-24 16:25 [Qemu-devel] [PATCH] tests: Remove unneeded "-vnc none" option Eduardo Habkost
  2016-10-24 17:40 ` John Snow
  2016-10-24 18:50 ` Corey Minyard
@ 2016-10-28  1:23 ` Michael S. Tsirkin
  2016-10-31 14:19 ` Kevin Wolf
  3 siblings, 0 replies; 6+ messages in thread
From: Michael S. Tsirkin @ 2016-10-28  1:23 UTC (permalink / raw)
  To: Eduardo Habkost; +Cc: qemu-devel, Corey Minyard, Kevin Wolf, John Snow

On Mon, Oct 24, 2016 at 02:25:49PM -0200, Eduardo Habkost wrote:
> Some tests use the "-vnc none" option without any clear reason,
> making those tests break when --disable-vnc is specified on
> ./configure.  Remove the unnecessary option.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

FWIW

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  tests/ide-test.c      | 1 -
>  tests/ipmi-bt-test.c  | 2 +-
>  tests/ipmi-kcs-test.c | 2 +-
>  3 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/ide-test.c b/tests/ide-test.c
> index a8a4081..3fbcb75 100644
> --- a/tests/ide-test.c
> +++ b/tests/ide-test.c
> @@ -582,7 +582,6 @@ static void test_retry_flush(const char *machine)
>      prepare_blkdebug_script(debug_path, "flush_to_disk");
>  
>      ide_test_start(
> -        "-vnc none "
>          "-drive file=blkdebug:%s:%s,if=ide,cache=writeback,format=raw,"
>          "rerror=stop,werror=stop",
>          debug_path, tmp_path);
> diff --git a/tests/ipmi-bt-test.c b/tests/ipmi-bt-test.c
> index be9005e..ad1e97e 100644
> --- a/tests/ipmi-bt-test.c
> +++ b/tests/ipmi-bt-test.c
> @@ -415,7 +415,7 @@ int main(int argc, char **argv)
>      /* Run the tests */
>      g_test_init(&argc, &argv, NULL);
>  
> -    cmdline = g_strdup_printf("-vnc none"
> +    cmdline = g_strdup_printf(
>            " -chardev socket,id=ipmi0,host=localhost,port=%d,reconnect=10"
>            " -device ipmi-bmc-extern,chardev=ipmi0,id=bmc0"
>            " -device isa-ipmi-bt,bmc=bmc0", emu_port);
> diff --git a/tests/ipmi-kcs-test.c b/tests/ipmi-kcs-test.c
> index 3750389..9cf0b34 100644
> --- a/tests/ipmi-kcs-test.c
> +++ b/tests/ipmi-kcs-test.c
> @@ -276,7 +276,7 @@ int main(int argc, char **argv)
>      /* Run the tests */
>      g_test_init(&argc, &argv, NULL);
>  
> -    cmdline = g_strdup_printf("-vnc none -device ipmi-bmc-sim,id=bmc0"
> +    cmdline = g_strdup_printf("-device ipmi-bmc-sim,id=bmc0"
>                                " -device isa-ipmi-kcs,bmc=bmc0");
>      qtest_start(cmdline);
>      qtest_irq_intercept_in(global_qtest, "ioapic");
> -- 
> 2.7.4

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Qemu-devel] [PATCH] tests: Remove unneeded "-vnc none" option
  2016-10-24 16:25 [Qemu-devel] [PATCH] tests: Remove unneeded "-vnc none" option Eduardo Habkost
                   ` (2 preceding siblings ...)
  2016-10-28  1:23 ` Michael S. Tsirkin
@ 2016-10-31 14:19 ` Kevin Wolf
  2016-10-31 14:36   ` Eduardo Habkost
  3 siblings, 1 reply; 6+ messages in thread
From: Kevin Wolf @ 2016-10-31 14:19 UTC (permalink / raw)
  To: Eduardo Habkost; +Cc: qemu-devel, Michael S. Tsirkin, Corey Minyard, John Snow

Am 24.10.2016 um 18:25 hat Eduardo Habkost geschrieben:
> Some tests use the "-vnc none" option without any clear reason,
> making those tests break when --disable-vnc is specified on
> ./configure.  Remove the unnecessary option.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Acked-by: Kevin Wolf <kwolf@redhat.com>

Who is supposed to merge this?

Kevin

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Qemu-devel] [PATCH] tests: Remove unneeded "-vnc none" option
  2016-10-31 14:19 ` Kevin Wolf
@ 2016-10-31 14:36   ` Eduardo Habkost
  0 siblings, 0 replies; 6+ messages in thread
From: Eduardo Habkost @ 2016-10-31 14:36 UTC (permalink / raw)
  To: Kevin Wolf; +Cc: qemu-devel, Michael S. Tsirkin, Corey Minyard, John Snow

On Mon, Oct 31, 2016 at 03:19:10PM +0100, Kevin Wolf wrote:
> Am 24.10.2016 um 18:25 hat Eduardo Habkost geschrieben:
> > Some tests use the "-vnc none" option without any clear reason,
> > making those tests break when --disable-vnc is specified on
> > ./configure.  Remove the unnecessary option.
> > 
> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> 
> Acked-by: Kevin Wolf <kwolf@redhat.com>
> 
> Who is supposed to merge this?

I will do it.

-- 
Eduardo

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-10-31 14:36 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-24 16:25 [Qemu-devel] [PATCH] tests: Remove unneeded "-vnc none" option Eduardo Habkost
2016-10-24 17:40 ` John Snow
2016-10-24 18:50 ` Corey Minyard
2016-10-28  1:23 ` Michael S. Tsirkin
2016-10-31 14:19 ` Kevin Wolf
2016-10-31 14:36   ` Eduardo Habkost

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.