From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9QN-00049H-DU for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:08:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc9QL-0004I0-9J for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:08:54 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:47489) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9QK-0004Hc-Ve for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:08:53 -0400 Received: by pbbro12 with SMTP id ro12so9211233pbb.4 for ; Tue, 05 Jun 2012 23:08:51 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 6 Jun 2012 08:08:42 +0200 Message-Id: <1338962922-21130-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 0/2] Clean up includes of monitor.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com There is no reason why QAPI clients should use monitor.h at all, qerror.h suffices. qmp-commands.h uses the Monitor typedef, but it is only included from files that already get the typedef from qemu-common.h. Paolo Bonzini (2): kvm: add missing include files qmp: do not include monitor.h from qapi-types-core.h hmp.c | 1 + kvm-all.c | 2 ++ qapi/qapi-types-core.h | 4 +--- 3 files changed, 4 insertions(+), 3 deletions(-) -- 1.7.10.1 >>From 669822329cc01dd8e55e0e080aae20bee4878dd4 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 11 May 2012 14:36:34 +0200 Subject: [PATCH 1/2] kvm: add missing include files These are included via monitor.h right now, add them explicitly. Signed-off-by: Paolo Bonzini --- kvm-all.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kvm-all.c b/kvm-all.c index 489ee53..831651d 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -22,6 +22,8 @@ #include "qemu-common.h" #include "qemu-barrier.h" +#include "qemu-option.h" +#include "qemu-config.h" #include "sysemu.h" #include "hw/hw.h" #include "hw/msi.h" -- 1.7.10.1 >>From 64cda12bfeb007b180e3328b757818f88c5d7302 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 11 May 2012 14:34:32 +0200 Subject: [PATCH 2/2] qmp: do not include monitor.h from qapi-types-core.h 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