From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9R4-0004rf-52 for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:09:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc9R2-0004Mm-Hl for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:09:37 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:57133) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9R2-0004M8-9O for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:09:36 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so9212149pbb.4 for ; Tue, 05 Jun 2012 23:09:35 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 6 Jun 2012 08:09:23 +0200 Message-Id: <1338962963-21277-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1338962963-21277-1-git-send-email-pbonzini@redhat.com> References: <1338962922-21130-1-git-send-email-pbonzini@redhat.com> <1338962963-21277-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] qmp: do not include monitor.h from qapi-types-core.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com 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 --- hmp.c | 1 + qapi/qapi-types-core.h | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hmp.c b/hmp.c index bb0952e..7be673e 100644 --- a/hmp.c +++ b/hmp.c @@ -16,6 +16,7 @@ #include "hmp.h" #include "qemu-timer.h" #include "qmp-commands.h" +#include "monitor.h" static void hmp_handle_error(Monitor *mon, Error **errp) { 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" #endif -- 1.7.10.1