diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2011-05-24 17:19:50 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2011-05-24 17:20:35 -0400 |
| commit | 07ed9a3f076e1ca7723f3e57b45a785eb4a5cf11 (patch) | |
| tree | 03f2a433946cdcfb34076ce1526bc0447b42c30a | |
| parent | fa1837987827ae1b67daaf3759c6dc339856cb58 (diff) | |
Drop xen_common.h.
| -rw-r--r-- | src/track.c | 2 | ||||
| -rw-r--r-- | src/xen_backend.h | 9 | ||||
| -rw-r--r-- | src/xen_common.h | 32 |
3 files changed, 9 insertions, 34 deletions
diff --git a/src/track.c b/src/track.c index 05a9931..66c6a2b 100644 --- a/src/track.c +++ b/src/track.c @@ -29,9 +29,9 @@ #include <xcb/xcb.h> #include <xcb/xproto.h> +#include <xs.h> #include "libvchan.h" #include "comm-structs.h" -#include "xen_common.h" /* XXX */ #define LINPICKER_VPORT 6000 diff --git a/src/xen_backend.h b/src/xen_backend.h index 283ad77..6d3ceda 100644 --- a/src/xen_backend.h +++ b/src/xen_backend.h @@ -1,7 +1,14 @@ #ifndef QEMU_HW_XEN_BACKEND_H #define QEMU_HW_XEN_BACKEND_H 1 -#include "xen_common.h" +#include <stddef.h> +#include <inttypes.h> + +#include <xenctrl.h> +#include <xs.h> +#include <xen/io/xenbus.h> + +#include "sys-queue.h" /* BSD list implementation */ /* ------------------------------------------------------------- */ diff --git a/src/xen_common.h b/src/xen_common.h deleted file mode 100644 index 904f785..0000000 --- a/src/xen_common.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef QEMU_HW_XEN_COMMON_H -#define QEMU_HW_XEN_COMMON_H 1 - -#include <stddef.h> -#include <inttypes.h> - -#include <xenctrl.h> -#include <xs.h> -#include <xen/io/xenbus.h> - -#include "sys-queue.h" /* BSD list implementation */ - -/* - * tweaks needed to build with different xen versions - * 0x00030205 -> 3.1.0 - * 0x00030207 -> 3.2.0 - * 0x00030208 -> unstable - */ -#include <xen/xen-compat.h> -#if __XEN_LATEST_INTERFACE_VERSION__ < 0x00030205 -# define evtchn_port_or_error_t int -#endif -#if __XEN_LATEST_INTERFACE_VERSION__ < 0x00030207 -# define xc_map_foreign_pages xc_map_foreign_batch -#endif -#if __XEN_LATEST_INTERFACE_VERSION__ < 0x00030208 -# define xen_mb() mb() -# define xen_rmb() rmb() -# define xen_wmb() wmb() -#endif - -#endif /* QEMU_HW_XEN_COMMON_H */ |