From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Mon, 2 Jun 2008 16:16:00 +0000 (+0100)
Subject: Sort out includes for xen_blktap.c
X-Git-Tag: xen-3.3.0-rc1~115
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=377798de1c8fb542ddae0ce54615258268d11259;p=qemu-xen-4.0-testing.git

Sort out includes for xen_blktap.c
---

diff --git a/hw/xen_blktap.c b/hw/xen_blktap.c
index 5420da24..d307d6e2 100644
--- a/hw/xen_blktap.c
+++ b/hw/xen_blktap.c
@@ -32,10 +32,9 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "vl.h"
-#include "blktaplib.h"
 #include "xen_blktap.h"
 #include "block_int.h"
+#include "qemu-char.h"
 
 #define MSG_SIZE 4096
 
diff --git a/hw/xen_blktap.h b/hw/xen_blktap.h
index 0fb4bb3f..81f735f0 100644
--- a/hw/xen_blktap.h
+++ b/hw/xen_blktap.h
@@ -12,6 +12,7 @@
 #include <syslog.h>
 #include <stdio.h>
 
+#include "hw.h"
 #include "block_int.h"
 
 /* Things disks need to know about, these should probably be in a higher-level
diff --git a/xen-config-host.h b/xen-config-host.h
index 9fe82892..b7a7c9ba 100644
--- a/xen-config-host.h
+++ b/xen-config-host.h
@@ -6,6 +6,7 @@ extern int domid;
 #define bool xen_bool
 #include "xenctrl.h"
 #include "xs.h"
+#include "blktaplib.h"
 #undef bool
 
 extern int xc_handle;