diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2016-01-15 13:23:39 +0000 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2016-01-26 17:19:28 +0000 |
| commit | c1345a88785b50ba2bf5e87b83c7e22f6b4ec83d (patch) | |
| tree | b33273e1cc6b0ed2fbcc10525e46f539525e3b74 /hw/char | |
| parent | a2db2a1edd06a50b8a862c654cf993368cf9f1d9 (diff) | |
xen: Switch to libxengnttab interface for compat shims.
In Xen 4.7 we are refactoring parts libxenctrl into a number of
separate libraries which will provide backward and forward API and ABI
compatiblity.
One such library will be libxengnttab which provides access to grant
tables.
In preparation for this switch the compatibility layer in xen_common.h
(which support building with older versions of Xen) to use what will
be the new library API. This means that the gnttab shim will disappear
for versions of Xen which include libxengnttab.
To simplify things for the <= 4.0.0 support we wrap the int fd in a
malloc(sizeof int) such that the handle is always a pointer. This
leads to less typedef headaches and the need for
XC_HANDLER_INITIAL_VALUE etc for these interfaces.
Note that this patch does not add any support for actually using
libxengnttab, it just adjusts the existing shims.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'hw/char')
| -rw-r--r-- | hw/char/xen_console.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index 63ade331f7..ac1b324432 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -233,7 +233,7 @@ static int con_initialise(struct XenDevice *xendev) PROT_READ|PROT_WRITE, con->ring_ref); } else { - con->sring = xc_gnttab_map_grant_ref(xendev->gnttabdev, con->xendev.dom, + con->sring = xengnttab_map_grant_ref(xendev->gnttabdev, con->xendev.dom, con->ring_ref, PROT_READ|PROT_WRITE); } @@ -275,7 +275,7 @@ static void con_disconnect(struct XenDevice *xendev) if (!xendev->dev) { munmap(con->sring, XC_PAGE_SIZE); } else { - xc_gnttab_munmap(xendev->gnttabdev, con->sring, 1); + xengnttab_unmap(xendev->gnttabdev, con->sring, 1); } con->sring = NULL; } |