diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2012-06-21 11:43:59 +0000 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2012-06-21 11:43:59 +0000 |
| commit | b41f67197208e7b72ba2207473a74b89a821190a (patch) | |
| tree | 6866bf59bf89f88c60d97927f635d42b9041013f /hw | |
| parent | 93bfef4c6e4b23caea9d51e1099d06433d8835a4 (diff) | |
| download | hqemu-b41f67197208e7b72ba2207473a74b89a821190a.zip hqemu-b41f67197208e7b72ba2207473a74b89a821190a.tar.gz | |
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.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xen_backend.c | 6 | ||||
| -rw-r--r-- | hw/xen_console.c | 5 | ||||
| -rw-r--r-- | hw/xen_disk.c | 6 | ||||
| -rw-r--r-- | hw/xen_nic.c | 7 | ||||
| -rw-r--r-- | hw/xenfb.c | 13 |
5 files changed, 12 insertions, 25 deletions
diff --git a/hw/xen_backend.c b/hw/xen_backend.c index 66cb144..f83a1e1 100644 --- a/hw/xen_backend.c +++ b/hw/xen_backend.c @@ -34,15 +34,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 3794b19..9426d73 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; diff --git a/hw/xen_disk.c b/hw/xen_disk.c index fb68ed9..e6bb2f2 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -35,14 +35,10 @@ #include <sys/mman.h> #include <sys/uio.h> -#include <xs.h> -#include <xenctrl.h> -#include <xen/io/xenbus.h> - #include "hw.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 9a59bda..98db9bb 100644 --- a/hw/xen_nic.c +++ b/hw/xen_nic.c @@ -35,11 +35,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" @@ -47,6 +42,8 @@ #include "qemu-char.h" #include "xen_backend.h" +#include <xen/io/netif.h> + /* ------------------------------------------------------------- */ struct XenNetDev { @@ -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 |
