xen: Reorganize includes of Xen headers.

Because xs.h will be remove in future release of Xen, this patch removes the
extra includes of this headers.

Also, it removes the extra includes of xenctrl.h and xen/io/xenbus.h as there
already are in xen_common.h.

upstream-commit: b41f67197208e7b72ba2207473a74b89a821190a

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/hw/xen_backend.c b/hw/xen_backend.c
index 555da411f3ab236b0f87ab32a5c8e405c36904ed..e1f44ce10d765cd79b667b4687bf63a4b8f0b6b0 100644 (file)
--- a/hw/xen_backend.c
+++ b/hw/xen_backend.c
@@ -31,15 +31,13 @@
 #include <sys/mman.h>
 #include <sys/signal.h>
 
-#include <xs.h>
-#include <xenctrl.h>
-#include <xen/grant_table.h>
-
 #include "hw.h"
 #include "qemu-char.h"
 #include "qemu-log.h"
 #include "xen_backend.h"
 
+#include <xen/grant_table.h>
+
 /* ------------------------------------------------------------- */
 
 /* public */

diff --git a/hw/xen_console.c b/hw/xen_console.c
index 3794b1972de5fbeb1c0162a89bcf57b80e555e1a..9426d7374f5864ae3ae8f02847d0508fb758bc8c 100644 (file)
--- 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;

diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index 88544b143e149f0b1479c99fd24b0358f5a9e7fd..a402ac8e5f4da3004ae9384b0305a22cc26fa40a 100644 (file)
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -32,15 +32,11 @@
 #include <sys/mman.h>
 #include <sys/uio.h>
 
-#include <xs.h>
-#include <xenctrl.h>
-#include <xen/io/xenbus.h>
-
 #include "hw.h"
 #include "block_int.h"
 #include "qemu-char.h"
-#include "xen_blkif.h"
 #include "xen_backend.h"
+#include "xen_blkif.h"
 #include "blockdev.h"
 
 /* ------------------------------------------------------------- */

diff --git a/hw/xen_nic.c b/hw/xen_nic.c
index ef2a2d6997d9f6fca47f7298df2d4b05da28a76a..f41809e77844ed86bfd6f0d0a3aa05bfb6a515e5 100644 (file)
--- a/hw/xen_nic.c
+++ b/hw/xen_nic.c
@@ -32,11 +32,6 @@
 #include <sys/mman.h>
 #include <sys/wait.h>
 
-#include <xs.h>
-#include <xenctrl.h>
-#include <xen/io/xenbus.h>
-#include <xen/io/netif.h>
-
 #include "hw.h"
 #include "net.h"
 #include "net/checksum.h"
@@ -44,6 +39,8 @@
 #include "qemu-char.h"
 #include "xen_backend.h"
 
+#include <xen/io/netif.h>
+
 /* ------------------------------------------------------------- */
 
 struct XenNetDev {

diff --git a/hw/xenfb.c b/hw/xenfb.c
index 1bcf171b014af6f7f7116bba52b413e436b6f17b..338800a4d9d7384d11e53e32aa82f99913dd4d07 100644 (file)
--- a/hw/xenfb.c
+++ b/hw/xenfb.c
@@ -35,19 +35,16 @@
 #include <string.h>
 #include <time.h>
 
-#include <xs.h>
-#include <xenctrl.h>
-#include <xen/event_channel.h>
-#include <xen/io/xenbus.h>
-#include <xen/io/fbif.h>
-#include <xen/io/kbdif.h>
-#include <xen/io/protocols.h>
-
 #include "hw.h"
 #include "console.h"
 #include "qemu-char.h"
 #include "xen_backend.h"
 
+#include <xen/event_channel.h>
+#include <xen/io/fbif.h>
+#include <xen/io/kbdif.h>
+#include <xen/io/protocols.h>
+
 #ifndef BTN_LEFT
 #define BTN_LEFT 0x110 /* from <linux/input.h> */
 #endif