Am 07.06.2012 06:55, schrieb Anthony Liguori: > On 06/07/2012 10:02 AM, Paolo Bonzini wrote: >> The comment is stale, monitor.h is not needed anymore (only qerror.h >> is, because it contains the schema for errors). >> >> Signed-off-by: Paolo Bonzini<pbonz...@redhat.com> >> --- >> qapi/qapi-types-core.h | 4 +--- >> 1 files changed, 1 insertions(+), 3 deletions(-) >> >> diff --git a/qapi/qapi-types-core.h b/qapi/qapi-types-core.h >> index 27e6be0..f781fc3 100644 >> --- a/qapi/qapi-types-core.h >> +++ b/qapi/qapi-types-core.h >> @@ -16,8 +16,6 @@ >> >> #include "qemu-common.h" >> #include "error.h" >> - >> -/* FIXME this is temporary until we remove middle mode */ >> -#include "monitor.h" >> +#include "qerror.h" > > Middle mode generates signatures that contain a 'Monitor *'. > qmp-commands.h includes qmp-types which only includes qmp-types-core.h > > Without having a #include "monitor.h" here, qmp-commands.h is relying on > something else including monitor.h before including qmp-commands.h [snip]
Similar situation with some block types - they're being used in one of these core QAPI files but my CPU-as-a-device branch no longer compiles since somehow the appropriate block header is no longer being included. Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
