From: "Daniel P. Berrange" <berrange(a)redhat.com>
The qemu monitor does not require qemu_conf.h, and the
qemu capabilities code actually wants bitmap.h
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 2 +-
src/qemu/qemu_monitor.c | 1 -
src/qemu/qemu_monitor.h | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ef7f266..bf72511 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -32,8 +32,8 @@
#include "nodeinfo.h"
#include "cpu/cpu.h"
#include "domain_conf.h"
-#include "qemu_conf.h"
#include "command.h"
+#include "bitmap.h"
#include "virnodesuspend.h"
#include <sys/stat.h>
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index f45a225..510d323 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -31,7 +31,6 @@
#include "qemu_monitor.h"
#include "qemu_monitor_text.h"
#include "qemu_monitor_json.h"
-#include "qemu_conf.h"
#include "virterror_internal.h"
#include "memory.h"
#include "logging.h"
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 8453e44..e3933a9 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -29,7 +29,6 @@
# include "qemu_capabilities.h"
# include "domain_conf.h"
-# include "qemu_conf.h"
# include "bitmap.h"
# include "virhash.h"
# include "json.h"
--
1.7.11.4