| Message ID | 1343424728-22461-16-git-send-email-lcapitulino@redhat.com |
|---|---|
| State | New |
| Headers | show |
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?
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.
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.
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
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(+)