summaryrefslogtreecommitdiffstats
path: root/hw/xen_backend.h
diff options
context:
space:
mode:
authorAnthony Liguori2011-05-12 15:06:06 +0200
committerAnthony Liguori2011-05-12 15:06:06 +0200
commit89bb563f6912b3f538d6bdf5833881ed7cdbd923 (patch)
tree601d288a7cac548a018cd5f6bcb1c09af032ee9a /hw/xen_backend.h
parentusb-linux: Add missing break statement (diff)
parentxen: Add Xen hypercall for sleep state in the cmos_s3 callback. (diff)
downloadqemu-89bb563f6912b3f538d6bdf5833881ed7cdbd923.tar.gz
qemu-89bb563f6912b3f538d6bdf5833881ed7cdbd923.tar.xz
qemu-89bb563f6912b3f538d6bdf5833881ed7cdbd923.zip
Merge remote-tracking branch 'agraf/xen-next' into staging
Diffstat (limited to 'hw/xen_backend.h')
-rw-r--r--hw/xen_backend.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/xen_backend.h b/hw/xen_backend.h
index 1b428e3bf4..6401c85a7e 100644
--- a/hw/xen_backend.h
+++ b/hw/xen_backend.h
@@ -45,8 +45,8 @@ struct XenDevice {
int remote_port;
int local_port;
- int evtchndev;
- int gnttabdev;
+ XenEvtchn evtchndev;
+ XenGnttab gnttabdev;
struct XenDevOps *ops;
QTAILQ_ENTRY(XenDevice) next;
@@ -55,7 +55,7 @@ struct XenDevice {
/* ------------------------------------------------------------- */
/* variables */
-extern int xen_xc;
+extern XenXC xen_xc;
extern struct xs_handle *xenstore;
extern const char *xen_protocol;