From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeaAo-0008Ok-Pg for qemu-devel@nongnu.org; Tue, 12 Jun 2012 19:06:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SeaAn-0004FA-0W for qemu-devel@nongnu.org; Tue, 12 Jun 2012 19:06:54 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41393 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeaAm-0004Em-QA for qemu-devel@nongnu.org; Tue, 12 Jun 2012 19:06:52 -0400 Message-ID: <4FD7CB85.1060405@suse.de> Date: Wed, 13 Jun 2012 01:06:45 +0200 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= 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: quoted-printable 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: Paolo Bonzini , qemu-devel@nongnu.org, lcapitulino@redhat.com 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 >> --- >> 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" >=20 > Middle mode generates signatures that contain a 'Monitor *'.=20 > qmp-commands.h includes qmp-types which only includes qmp-types-core.h >=20 > Without having a #include "monitor.h" here, qmp-commands.h is relying o= n > 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 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg