Patchwork [0/7] qapi: add commands to remove the need (v2)

login
register
mail settings
Submitter Luiz Capitulino
Date Aug. 13, 2012, 7:18 p.m.
Message ID <20120813161833.72e1609e@doriath.home>
Download mbox | patch
Permalink /patch/177030/
State New
Headers show

Comments

Luiz Capitulino - Aug. 13, 2012, 7:18 p.m.
On Mon, 13 Aug 2012 14:16:58 -0300
Luiz Capitulino <lcapitulino@redhat.com> wrote:

> On Fri, 10 Aug 2012 11:04:08 -0500
> Anthony Liguori <aliguori@us.ibm.com> wrote:
> 
> > This series implements the necessary commands to implements danpb's idea to
> > remove -help parsing in libvirt.  We would introduce all of these commands in
> > 1.2 and then change the -help output starting in 1.3.
> 
> Applied to the qmp branch, thanks.

Hmm, this series broke ppc-softmmu for me:

In file included from /home/lcapitulino/work/src/qmp-unstable/target-ppc/translate_init.c:30:0,
                 from /home/lcapitulino/work/src/qmp-unstable/target-ppc/translate.c:9404:
../qmp-commands.h:23:1: error: unknown type name ‘QDict’
../qmp-commands.h:23:68: error: unknown type name ‘QObject’

But it's not its fault. The problem here is probably a patch in my error
series that is doing header cleanup and qmp-commands.h was probably relying
on qapi-types.h (or some of its include files) including qdict.h.

I'm going to include the following patch in my pull request:

Subject: [PATCH 36/48] scripts: qapi-commands.py: qmp-commands.h: include
 qdict.h

qmp-commands.h declares several functions that have arguments of
type QDict. However, qdict.h is not included. This will cause a
build breakage when a file includes qmp-commands.h but doesn't
include qdict.h.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 scripts/qapi-commands.py | 1 +
 1 file changed, 1 insertion(+)
Anthony Liguori - Aug. 13, 2012, 7:37 p.m.
Luiz Capitulino <lcapitulino@redhat.com> writes:

> On Mon, 13 Aug 2012 14:16:58 -0300
> Luiz Capitulino <lcapitulino@redhat.com> wrote:
>
>> On Fri, 10 Aug 2012 11:04:08 -0500
>> Anthony Liguori <aliguori@us.ibm.com> wrote:
>> 
>> > This series implements the necessary commands to implements danpb's idea to
>> > remove -help parsing in libvirt.  We would introduce all of these commands in
>> > 1.2 and then change the -help output starting in 1.3.
>> 
>> Applied to the qmp branch, thanks.
>
> Hmm, this series broke ppc-softmmu for me:

Curious, I'll look into that.  Thanks

Regards,

Anthony Liguori

>
> In file included from /home/lcapitulino/work/src/qmp-unstable/target-ppc/translate_init.c:30:0,
>                  from /home/lcapitulino/work/src/qmp-unstable/target-ppc/translate.c:9404:
> ../qmp-commands.h:23:1: error: unknown type name ‘QDict’
> ../qmp-commands.h:23:68: error: unknown type name ‘QObject’
>
> But it's not its fault. The problem here is probably a patch in my error
> series that is doing header cleanup and qmp-commands.h was probably relying
> on qapi-types.h (or some of its include files) including qdict.h.
>
> I'm going to include the following patch in my pull request:
>
> Subject: [PATCH 36/48] scripts: qapi-commands.py: qmp-commands.h: include
>  qdict.h
>
> qmp-commands.h declares several functions that have arguments of
> type QDict. However, qdict.h is not included. This will cause a
> build breakage when a file includes qmp-commands.h but doesn't
> include qdict.h.
>
> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
> ---
>  scripts/qapi-commands.py | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
> index 9eed40e..3c4678d 100644
> --- a/scripts/qapi-commands.py
> +++ b/scripts/qapi-commands.py
> @@ -342,6 +342,7 @@ def gen_command_decl_prologue(header, guard, prefix=""):
>  #define %(guard)s
>  
>  #include "%(prefix)sqapi-types.h"
> +#include "qdict.h"
>  #include "error.h"
>  
>  ''',
> -- 
> 1.7.11.2.249.g31c7954.dirty

Patch

diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 9eed40e..3c4678d 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -342,6 +342,7 @@  def gen_command_decl_prologue(header, guard, prefix=""):
 #define %(guard)s
 
 #include "%(prefix)sqapi-types.h"
+#include "qdict.h"
 #include "error.h"
 
 ''',