Patchwork [15/27] block: block_int: include qerror.h

login
register
mail settings
Submitter Luiz Capitulino
Date July 27, 2012, 9:31 p.m.
Message ID <1343424728-22461-16-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/173808/
State New
Headers show

Comments

Luiz Capitulino - July 27, 2012, 9:31 p.m.
Several block/ files are relying on qerror.h being provided by
qapi-types.h. However, qapi-types.h won't provide it anymore.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 block_int.h | 1 +
 1 file changed, 1 insertion(+)
Markus Armbruster - Aug. 1, 2012, 12:42 p.m.
Luiz Capitulino <lcapitulino@redhat.com> writes:

> Several block/ files are relying on qerror.h being provided by
> qapi-types.h. However, qapi-types.h won't provide it anymore.

Squash it into commit that makes qapi-types.h no longer provide it?
Luiz Capitulino - Aug. 1, 2012, 1:58 p.m.
On Wed, 01 Aug 2012 14:42:02 +0200
Markus Armbruster <armbru@redhat.com> wrote:

> Luiz Capitulino <lcapitulino@redhat.com> writes:
> 
> > Several block/ files are relying on qerror.h being provided by
> > qapi-types.h. However, qapi-types.h won't provide it anymore.
> 
> Squash it into commit that makes qapi-types.h no longer provide it?

As block_int.h and hmp.h (next commit) depend on different header files,
I think it's better to keep them on different commits.
Markus Armbruster - Aug. 2, 2012, 3:59 p.m.
Luiz Capitulino <lcapitulino@redhat.com> writes:

> On Wed, 01 Aug 2012 14:42:02 +0200
> Markus Armbruster <armbru@redhat.com> wrote:
>
>> Luiz Capitulino <lcapitulino@redhat.com> writes:
>> 
>> > Several block/ files are relying on qerror.h being provided by
>> > qapi-types.h. However, qapi-types.h won't provide it anymore.
>> 
>> Squash it into commit that makes qapi-types.h no longer provide it?
>
> As block_int.h and hmp.h (next commit) depend on different header files,
> I think it's better to keep them on different commits.

I disagree, but I won't insist.

Patch

diff --git a/block_int.h b/block_int.h
index d72317f..00892e8 100644
--- a/block_int.h
+++ b/block_int.h
@@ -30,6 +30,7 @@ 
 #include "qemu-coroutine.h"
 #include "qemu-timer.h"
 #include "qapi-types.h"
+#include "qerror.h"
 
 #define BLOCK_FLAG_ENCRYPT	1
 #define BLOCK_FLAG_COMPAT6	4