Patchwork [01/17] build: do not rely on indirect inclusion of qemu-config.h

login
register
mail settings
Submitter Paolo Bonzini
Date Sept. 25, 2012, 12:55 p.m.
Message ID <1348577763-12920-2-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/186815/
State New
Headers show

Comments

Paolo Bonzini - Sept. 25, 2012, 12:55 p.m.
Some files in the block layer rely on qemu-char.h including qemu-config.h,
but the block layer does not need qemu-char.h at all.  Clean this up.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block/blkdebug.c | 1 +
 block/iscsi.c    | 1 +
 qemu-config.h    | 1 +
 3 file modificati, 3 inserzioni(+)

Patch

diff --git a/block/blkdebug.c b/block/blkdebug.c
index 59dcea0..213789b 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -23,6 +23,7 @@ 
  */
 
 #include "qemu-common.h"
+#include "qemu-config.h"
 #include "block_int.h"
 #include "module.h"
 
diff --git a/block/iscsi.c b/block/iscsi.c
index 0b96165..cf133d5 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -27,6 +27,7 @@ 
 #include <poll.h>
 #include <arpa/inet.h>
 #include "qemu-common.h"
+#include "qemu-config.h"
 #include "qemu-error.h"
 #include "block_int.h"
 #include "trace.h"
diff --git a/qemu-config.h b/qemu-config.h
index 5557562..daf1539 100644
--- a/qemu-config.h
+++ b/qemu-config.h
@@ -2,6 +2,7 @@ 
 #define QEMU_CONFIG_H
 
 #include "error.h"
+#include "qemu-option.h"
 
 extern QemuOptsList qemu_fsdev_opts;
 extern QemuOptsList qemu_virtfs_opts;