diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-06-28 18:15:44 +0100 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-06-28 18:15:44 +0100 |
commit | 7e9ee87b3ec2158a9ac4e0dda838f177dcde92dd (patch) | |
tree | 20487bcaf18e1034fafbf5fb952f9918993e297f /tools/libxc/xenctrl.h | |
parent | 98883d0bb77a84111d2f5a52b3e5870d9e7054a0 (diff) | |
download | xen-7e9ee87b3ec2158a9ac4e0dda838f177dcde92dd.tar.gz xen-7e9ee87b3ec2158a9ac4e0dda838f177dcde92dd.tar.bz2 xen-7e9ee87b3ec2158a9ac4e0dda838f177dcde92dd.zip |
libxc: Squash xc_e820.h (and delete) into xenctrl.h
.. as there is no need to keep that internal header file anymore.
We export two functions xc_domain_[set|get]_memory_map which
depend on the 'struct e820entry' defined in 'xc_e820.h'.
We move the contents of the 'xc_e820.h' to the 'xenctrl.h' fixing
compiler errors when applications outside the Xen tree are trying
to compile against the libraries.
Tested-by: Daniel Castro <evil.dani@gmail.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxc/xenctrl.h')
-rw-r--r-- | tools/libxc/xenctrl.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 49447e63d9..5d12503aee 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -967,7 +967,22 @@ int xc_domain_set_memmap_limit(xc_interface *xch, unsigned long map_limitkb); #if defined(__i386__) || defined(__x86_64__) -#include "xc_e820.h" +/* + * PC BIOS standard E820 types and structure. + */ +#define E820_RAM 1 +#define E820_RESERVED 2 +#define E820_ACPI 3 +#define E820_NVS 4 +#define E820_UNUSABLE 5 + +#define E820MAX (128) + +struct e820entry { + uint64_t addr; + uint64_t size; + uint32_t type; +} __attribute__((packed)); int xc_domain_set_memory_map(xc_interface *xch, uint32_t domid, struct e820entry entries[], |