[Qemu-devel] [PATCH 0/2] Clean up includes of monitor.h

[Qemu-devel] [PATCH 0/2] Clean up includes of monitor.h

[Paolo Bonzini]

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 <pbonzini@redhat.com>
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 <pbonzini@redhat.com>
---
 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 <pbonzini@redhat.com>
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 <pbonzini@redhat.com>
---
 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

[Qemu-devel] [PATCH 1/2] kvm: add missing include files

[Paolo Bonzini]

These are included via monitor.h right now, add them explicitly.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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

[Qemu-devel] [PATCH 2/2] qmp: do not include monitor.h from qapi-types-core.h

[Paolo Bonzini]

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 <pbonzini@redhat.com>
---
 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

Re: [Qemu-devel] [PATCH 0/2] Clean up includes of monitor.h

[Luiz Capitulino]

On Wed,  6 Jun 2012 08:08:42 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

> 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.

Could you please rebase it on top of the qmp queue?

 git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

I think you're going to get a few build errors there.