qapi: Enforce naming rules

[PATCH 21/28] tests-qmp-cmds: Drop unused and incorrect qmp_TestIfCmd()

Posted by Markus Armbruster 4 years, 10 months ago

Commit 967c885108 "qapi: add 'if' to top-level expressions" added
command TestIfCmd with an 'if' condition.  It also added the
qmp_TestIfCmd() to go with it, guarded by the corresponding #if.
Commit ccadd6bcba "qapi: Add 'if' to implicit struct members" changed
the command, but not the function.  Compiles only because we don't
satisfy the #if.  Instead of fixing the function, simply drop it.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 tests/unit/test-qmp-cmds.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/unit/test-qmp-cmds.c b/tests/unit/test-qmp-cmds.c
index 266db074b4..99973dde7c 100644
--- a/tests/unit/test-qmp-cmds.c
+++ b/tests/unit/test-qmp-cmds.c
@@ -13,13 +13,6 @@
 
 static QmpCommandList qmp_commands;
 
-#if defined(TEST_IF_STRUCT) && defined(TEST_IF_CMD)
-UserDefThree *qmp_TestIfCmd(TestIfStruct *foo, Error **errp)
-{
-    return NULL;
-}
-#endif
-
 UserDefThree *qmp_TestCmdReturnDefThree(Error **errp)
 {
     return NULL;
-- 
2.26.3

Re: [PATCH 21/28] tests-qmp-cmds: Drop unused and incorrect qmp_TestIfCmd()

Posted by Eric Blake 4 years, 10 months ago

On 3/23/21 4:40 AM, Markus Armbruster wrote:
> Commit 967c885108 "qapi: add 'if' to top-level expressions" added
> command TestIfCmd with an 'if' condition.  It also added the
> qmp_TestIfCmd() to go with it, guarded by the corresponding #if.
> Commit ccadd6bcba "qapi: Add 'if' to implicit struct members" changed
> the command, but not the function.  Compiles only because we don't
> satisfy the #if.  Instead of fixing the function, simply drop it.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  tests/unit/test-qmp-cmds.c | 7 -------
>  1 file changed, 7 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/tests/unit/test-qmp-cmds.c b/tests/unit/test-qmp-cmds.c
> index 266db074b4..99973dde7c 100644
> --- a/tests/unit/test-qmp-cmds.c
> +++ b/tests/unit/test-qmp-cmds.c
> @@ -13,13 +13,6 @@
>  
>  static QmpCommandList qmp_commands;
>  
> -#if defined(TEST_IF_STRUCT) && defined(TEST_IF_CMD)
> -UserDefThree *qmp_TestIfCmd(TestIfStruct *foo, Error **errp)
> -{
> -    return NULL;
> -}
> -#endif
> -
>  UserDefThree *qmp_TestCmdReturnDefThree(Error **errp)
>  {
>      return NULL;
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org