From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScVNc-0001jW-Pq for qemu-devel@nongnu.org; Thu, 07 Jun 2012 01:35:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ScVNb-0006YG-3J for qemu-devel@nongnu.org; Thu, 07 Jun 2012 01:35:32 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:32778) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScVNa-0006Y8-QS for qemu-devel@nongnu.org; Thu, 07 Jun 2012 01:35:31 -0400 Received: by pbbro12 with SMTP id ro12so598839pbb.4 for ; Wed, 06 Jun 2012 22:35:28 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <4FD03D9B.60402@redhat.com> Date: Thu, 07 Jun 2012 07:35:23 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1339034542-8960-1-git-send-email-pbonzini@redhat.com> <1339034542-8960-4-git-send-email-pbonzini@redhat.com> <4FD03443.9000805@redhat.com> In-Reply-To: <4FD03443.9000805@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 3/3] qmp: do not include monitor.h from qapi-types-core.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, lcapitulino@redhat.com Il 07/06/2012 06:55, Anthony Liguori ha scritto: > 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 >> --- >> 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 Everything should be including qemu-common.h that has the "typedef struct Monitor Monitor". Note that this is not really just a cleanup. Right now I cannot include qapi-types.h from block_int.h, because monitor.h depends on block_int.h. Paolo