[Qemu-devel] [PATCH v6 11/13] tests: remove "0.15" prefix for test-qmp-cmds

Peter Xu posted 13 patches 7 years, 2 months ago
There is a newer version of this series
[Qemu-devel] [PATCH v6 11/13] tests: remove "0.15" prefix for test-qmp-cmds
Posted by Peter Xu 7 years, 2 months ago
The "0.15" prefix seems useless.  Remove them.

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 tests/test-qmp-cmds.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c
index ba41a6161e..989819b26d 100644
--- a/tests/test-qmp-cmds.c
+++ b/tests/test-qmp-cmds.c
@@ -286,11 +286,11 @@ int main(int argc, char **argv)
 {
     g_test_init(&argc, &argv, NULL);
 
-    g_test_add_func("/0.15/dispatch_cmd", test_dispatch_cmd);
-    g_test_add_func("/0.15/dispatch_cmd_failure", test_dispatch_cmd_failure);
-    g_test_add_func("/0.15/dispatch_cmd_io", test_dispatch_cmd_io);
-    g_test_add_func("/0.15/dealloc_types", test_dealloc_types);
-    g_test_add_func("/0.15/dealloc_partial", test_dealloc_partial);
+    g_test_add_func("/dispatch_cmd", test_dispatch_cmd);
+    g_test_add_func("/dispatch_cmd_failure", test_dispatch_cmd_failure);
+    g_test_add_func("/dispatch_cmd_io", test_dispatch_cmd_io);
+    g_test_add_func("/dealloc_types", test_dealloc_types);
+    g_test_add_func("/dealloc_partial", test_dealloc_partial);
 
     test_qmp_init_marshal(&qmp_commands);
     g_test_run();
-- 
2.17.1


Re: [Qemu-devel] [PATCH v6 11/13] tests: remove "0.15" prefix for test-qmp-cmds
Posted by Thomas Huth 7 years, 2 months ago
On 08/15/2018 03:37 PM, Peter Xu wrote:
> The "0.15" prefix seems useless.  Remove them.
> 
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>  tests/test-qmp-cmds.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c
> index ba41a6161e..989819b26d 100644
> --- a/tests/test-qmp-cmds.c
> +++ b/tests/test-qmp-cmds.c
> @@ -286,11 +286,11 @@ int main(int argc, char **argv)
>  {
>      g_test_init(&argc, &argv, NULL);
>  
> -    g_test_add_func("/0.15/dispatch_cmd", test_dispatch_cmd);
> -    g_test_add_func("/0.15/dispatch_cmd_failure", test_dispatch_cmd_failure);
> -    g_test_add_func("/0.15/dispatch_cmd_io", test_dispatch_cmd_io);
> -    g_test_add_func("/0.15/dealloc_types", test_dealloc_types);
> -    g_test_add_func("/0.15/dealloc_partial", test_dealloc_partial);
> +    g_test_add_func("/dispatch_cmd", test_dispatch_cmd);
> +    g_test_add_func("/dispatch_cmd_failure", test_dispatch_cmd_failure);
> +    g_test_add_func("/dispatch_cmd_io", test_dispatch_cmd_io);
> +    g_test_add_func("/dealloc_types", test_dealloc_types);
> +    g_test_add_func("/dealloc_partial", test_dealloc_partial);

Most other tests use a common prefix, so maybe rather replace the "0.15"
with "qmp-cmd" here? E.g.:

 g_test_add_func("/qmp-cmd/dispatch_cmd", test_dispatch_cmd);

?

 Thomas

Re: [Qemu-devel] [PATCH v6 11/13] tests: remove "0.15" prefix for test-qmp-cmds
Posted by Peter Xu 7 years, 2 months ago
On Wed, Aug 15, 2018 at 03:48:57PM +0200, Thomas Huth wrote:
> On 08/15/2018 03:37 PM, Peter Xu wrote:
> > The "0.15" prefix seems useless.  Remove them.
> > 
> > Signed-off-by: Peter Xu <peterx@redhat.com>
> > ---
> >  tests/test-qmp-cmds.c | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> > 
> > diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c
> > index ba41a6161e..989819b26d 100644
> > --- a/tests/test-qmp-cmds.c
> > +++ b/tests/test-qmp-cmds.c
> > @@ -286,11 +286,11 @@ int main(int argc, char **argv)
> >  {
> >      g_test_init(&argc, &argv, NULL);
> >  
> > -    g_test_add_func("/0.15/dispatch_cmd", test_dispatch_cmd);
> > -    g_test_add_func("/0.15/dispatch_cmd_failure", test_dispatch_cmd_failure);
> > -    g_test_add_func("/0.15/dispatch_cmd_io", test_dispatch_cmd_io);
> > -    g_test_add_func("/0.15/dealloc_types", test_dealloc_types);
> > -    g_test_add_func("/0.15/dealloc_partial", test_dealloc_partial);
> > +    g_test_add_func("/dispatch_cmd", test_dispatch_cmd);
> > +    g_test_add_func("/dispatch_cmd_failure", test_dispatch_cmd_failure);
> > +    g_test_add_func("/dispatch_cmd_io", test_dispatch_cmd_io);
> > +    g_test_add_func("/dealloc_types", test_dealloc_types);
> > +    g_test_add_func("/dealloc_partial", test_dealloc_partial);
> 
> Most other tests use a common prefix, so maybe rather replace the "0.15"
> with "qmp-cmd" here? E.g.:
> 
>  g_test_add_func("/qmp-cmd/dispatch_cmd", test_dispatch_cmd);
> 
> ?

I'll drop this patch due to a dup in master.  That one has "/qmp"
prefix.  Thanks Thomas.

-- 
Peter Xu

Re: [Qemu-devel] [PATCH v6 11/13] tests: remove "0.15" prefix for test-qmp-cmds
Posted by Marc-André Lureau 7 years, 2 months ago
On Wed, Aug 15, 2018 at 3:37 PM, Peter Xu <peterx@redhat.com> wrote:
> The "0.15" prefix seems useless.  Remove them.
>
> Signed-off-by: Peter Xu <peterx@redhat.com>

I sent a similar patch long ago, and it is finally queued by Markus!
:) "tests: change /0.15/* tests to /qmp/*"

> ---
>  tests/test-qmp-cmds.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c
> index ba41a6161e..989819b26d 100644
> --- a/tests/test-qmp-cmds.c
> +++ b/tests/test-qmp-cmds.c
> @@ -286,11 +286,11 @@ int main(int argc, char **argv)
>  {
>      g_test_init(&argc, &argv, NULL);
>
> -    g_test_add_func("/0.15/dispatch_cmd", test_dispatch_cmd);
> -    g_test_add_func("/0.15/dispatch_cmd_failure", test_dispatch_cmd_failure);
> -    g_test_add_func("/0.15/dispatch_cmd_io", test_dispatch_cmd_io);
> -    g_test_add_func("/0.15/dealloc_types", test_dealloc_types);
> -    g_test_add_func("/0.15/dealloc_partial", test_dealloc_partial);
> +    g_test_add_func("/dispatch_cmd", test_dispatch_cmd);
> +    g_test_add_func("/dispatch_cmd_failure", test_dispatch_cmd_failure);
> +    g_test_add_func("/dispatch_cmd_io", test_dispatch_cmd_io);
> +    g_test_add_func("/dealloc_types", test_dealloc_types);
> +    g_test_add_func("/dealloc_partial", test_dealloc_partial);
>
>      test_qmp_init_marshal(&qmp_commands);
>      g_test_run();
> --
> 2.17.1
>

Re: [Qemu-devel] [PATCH v6 11/13] tests: remove "0.15" prefix for test-qmp-cmds
Posted by Peter Xu 7 years, 2 months ago
On Wed, Aug 15, 2018 at 08:11:22PM +0200, Marc-André Lureau wrote:
> On Wed, Aug 15, 2018 at 3:37 PM, Peter Xu <peterx@redhat.com> wrote:
> > The "0.15" prefix seems useless.  Remove them.
> >
> > Signed-off-by: Peter Xu <peterx@redhat.com>
> 
> I sent a similar patch long ago, and it is finally queued by Markus!
> :) "tests: change /0.15/* tests to /qmp/*"

Oh! I guess I rebased to a not-the-latest master tree due to some
unknown reason...

Thanks for mentioning.  I'll drop this patch in my next post (and I'll
also modify the next patch to match the names).

Regards,

-- 
Peter Xu

Re: [Qemu-devel] [PATCH v6 11/13] tests: remove "0.15" prefix for test-qmp-cmds
Posted by Markus Armbruster 7 years, 2 months ago
Peter Xu <peterx@redhat.com> writes:

> On Wed, Aug 15, 2018 at 08:11:22PM +0200, Marc-André Lureau wrote:
>> On Wed, Aug 15, 2018 at 3:37 PM, Peter Xu <peterx@redhat.com> wrote:
>> > The "0.15" prefix seems useless.  Remove them.
>> >
>> > Signed-off-by: Peter Xu <peterx@redhat.com>
>> 
>> I sent a similar patch long ago, and it is finally queued by Markus!
>> :) "tests: change /0.15/* tests to /qmp/*"
>
> Oh! I guess I rebased to a not-the-latest master tree due to some
> unknown reason...

I think you simply sent your patch before my pull request went through.

> Thanks for mentioning.  I'll drop this patch in my next post (and I'll
> also modify the next patch to match the names).

Thanks!