diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-26 17:25:11 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-26 17:25:11 +0000 |
| commit | 39c36a0573d9307d68c0c3336b48e6351ffabc06 (patch) | |
| tree | e17594e5f0fbd715a59e04de90066bcddfe361a4 /include/hw/xen/xen_backend.h | |
| parent | ba3fb2f023254ab853df278e1719fc55938e1c16 (diff) | |
| parent | 64a7ad6fe3d8500119d83e0af830e0e45e83499a (diff) | |
| download | focaccia-qemu-39c36a0573d9307d68c0c3336b48e6351ffabc06.tar.gz focaccia-qemu-39c36a0573d9307d68c0c3336b48e6351ffabc06.zip | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160126-2' into staging
Xen 2016/01/26 with Signed-off-by lines.
# gpg: Signature made Tue 26 Jan 2016 17:20:12 GMT using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
* remotes/sstabellini/tags/xen-20160126-2:
xen: make it possible to build without the Xen PV domain builder
xen: domainbuild: reopen libxenctrl interface after forking for domain watcher.
xen: Use stable library interfaces when they are available.
xen: Switch uses of xc_map_foreign_{pages,bulk} to use libxenforeignmemory API.
xen: Switch uses of xc_map_foreign_range into xc_map_foreign_pages
xen: Switch to libxengnttab interface for compat shims.
xen: Switch to libxenevtchn interface for compat shims.
xen_console: correctly cleanup primary console on teardown.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/xen/xen_backend.h')
| -rw-r--r-- | include/hw/xen/xen_backend.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h index 3b4125e39f..e0d52ee44f 100644 --- a/include/hw/xen/xen_backend.h +++ b/include/hw/xen/xen_backend.h @@ -46,8 +46,8 @@ struct XenDevice { int remote_port; int local_port; - XenEvtchn evtchndev; - XenGnttab gnttabdev; + xenevtchn_handle *evtchndev; + xengnttab_handle *gnttabdev; struct XenDevOps *ops; QTAILQ_ENTRY(XenDevice) next; @@ -57,6 +57,7 @@ struct XenDevice { /* variables */ extern XenXC xen_xc; +extern xenforeignmemory_handle *xen_fmem; extern struct xs_handle *xenstore; extern const char *xen_protocol; |