diff options
| author | Andres Lagar-Cavilla <andres@lagarcavilla.org> | 2012-11-12 17:03:20 +0000 |
|---|---|---|
| committer | Andres Lagar-Cavilla <andres@lagarcavilla.org> | 2012-11-12 17:03:20 +0000 |
| commit | 38ede5d03b3cf5e929302fc539c00756e432fb8d (patch) | |
| tree | 8c49ae02d17d098a9f43e7790b4da03f27a1c415 /xen/include/public/domctl.h | |
| parent | a5bf5e04494fe280813c0b8e912b8d7856499f93 (diff) | |
| download | xen-38ede5d03b3cf5e929302fc539c00756e432fb8d.tar.gz xen-38ede5d03b3cf5e929302fc539c00756e432fb8d.tar.bz2 xen-38ede5d03b3cf5e929302fc539c00756e432fb8d.zip | |
tools: Synchronize privcmd header constants
Since Linux's git commit ceb90fa0a8008059ecbbf9114cb89dc71a730bb6,
the privcmd.h interface between Linux and libxc specifies two new
constants, PRIVCMD_MMAPBATCH_MFN_ERROR and
PRIVCMD_MMAPBATCH_PAGED_ERROR. These constants represent the error
codes encoded in the top nibble of an mfn slot passed to the legacy
MMAPBATCH ioctl.
In particular, libxenctrl checks for the equivalent of the latter
constant when dealing with paged out frames that might be the target
of a foreign map.
Previously, the relevant constant was defined in the domctl hypervisor
interface header (XEN_DOMCTL_PFINFO_PAGEDTAB). Because this
top-nibble encoding is a contract between the dom0 kernel and libxc,
a domctl.h definition is misplaced.
- Sync the privcmd.h header to that now available in upstream Linux
- Update libxc appropriately
- Remove the unnecessary constant in domctl.h
Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
Acked-by: Ian Campbell <ian.campbelL@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'xen/include/public/domctl.h')
| -rw-r--r-- | xen/include/public/domctl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index f2409ec76c..7c0f23df2e 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -136,7 +136,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_getmemlist_t); #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ -#define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) struct xen_domctl_getpageframeinfo { |