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>
This commit is contained in:
Anthony PERARD 2012-06-21 11:43:59 +00:00 committed by Stefano Stabellini
parent 93bfef4c6e
commit b41f671972
5 changed files with 12 additions and 25 deletions

View File

@ -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 */

View File

@ -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;

View File

@ -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"
/* ------------------------------------------------------------- */

View File

@ -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 {

View File

@ -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