summary refs log tree commit diff stats
path: root/hw/xen_console.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-06-26 15:05:45 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-06-26 15:05:45 -0500
commit3978f4612e7aa90469f6b1e0a04524833e77fbc6 (patch)
treef8e7cae29d2cbebf78018554c5388afd3c41160a /hw/xen_console.c
parent7a542b67b32742ff5fe286f819df891d1df7bf56 (diff)
parente108a3c110506faf3ef43448be3e0d39ef0ead8f (diff)
downloadfocaccia-qemu-3978f4612e7aa90469f6b1e0a04524833e77fbc6.tar.gz
focaccia-qemu-3978f4612e7aa90469f6b1e0a04524833e77fbc6.zip
Merge remote-tracking branch 'sstabellini/compile-xs' into staging
* sstabellini/compile-xs:
  xenstore: Use <xenstore.h>
  xen: Reorganize includes of Xen headers.
Diffstat (limited to 'hw/xen_console.c')
-rw-r--r--hw/xen_console.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/xen_console.c b/hw/xen_console.c
index 3794b1972d..9426d7374f 100644
--- a/hw/xen_console.c
+++ b/hw/xen_console.c
@@ -28,14 +28,13 @@
 #include <termios.h>
 #include <stdarg.h>
 #include <sys/mman.h>
-#include <xs.h>
-#include <xen/io/console.h>
-#include <xenctrl.h>
 
 #include "hw.h"
 #include "qemu-char.h"
 #include "xen_backend.h"
 
+#include <xen/io/console.h>
+
 struct buffer {
     uint8_t *data;
     size_t consumed;