xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-02-08 05:07:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sstabellini/compile-xs' into staging

Browse Source 
* sstabellini/compile-xs:
  xenstore: Use <xenstore.h>
  xen: Reorganize includes of Xen headers.
This commit is contained in:
Anthony Liguori 2012-06-26 15:05:45 -05:00
commit 3978f4612e
7 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -1388,7 +1388,7 @@ EOF
elif (
cat > $TMPC <<EOF
#include <xenctrl.h>
#include <xs.h>
#include <xenstore.h>
#include <stdint.h>
#include <xen/hvm/hvm_info_table.h>
#if !defined(HVM_MAX_VCPUS)

6
hw/xen_backend.c
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 */

6
hw/xen_common.h
View File

@ -7,7 +7,11 @@
#include <inttypes.h>
#include <xenctrl.h>
#include <xs.h>
#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
# include <xs.h>
#else
# include <xenstore.h>
#endif
#include <xen/io/xenbus.h>
#include "hw.h"

5
hw/xen_console.c
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;

6
hw/xen_disk.c
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"
/* ------------------------------------------------------------- */

7
hw/xen_nic.c
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 {

13
hw/xenfb.c
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