Files
Costin Lupu 0dbb4be739 tools/libs/foreignmemory: Fix PAGE_SIZE redefinition error
If PAGE_SIZE is already defined in the system (e.g. in /usr/include/limits.h
header) then gcc will trigger a redefinition error because of -Werror. This
patch replaces usage of PAGE_* macros with XC_PAGE_* macros in order to avoid
confusion between control domain page granularity (PAGE_* definitions) and
guest domain page granularity.

The exception is in osdep_xenforeignmemory_map() where we need the system page
size to check whether the PFN array should be allocated with mmap() or with
dynamic allocation.

Signed-off-by: Costin Lupu <costin.lupu@cs.pub.ro>
Reviewed-by: Julien Grall <jgrall@amazon.com>
Acked-by: Ian Jackson <iwj@xenproject.org>
2021-07-09 16:00:02 +01:00

93 lines
2.5 KiB
C

#ifndef XENFOREIGNMEMORY_PRIVATE_H
#define XENFOREIGNMEMORY_PRIVATE_H
#include <xenctrl.h>
#include <xentoollog.h>
#include <xenforeignmemory.h>
#include <xentoolcore_internal.h>
#include <xen/xen.h>
#include <xen/sys/privcmd.h>
struct xenforeignmemory_handle {
xentoollog_logger *logger, *logger_tofree;
unsigned flags;
int fd;
Xentoolcore__Active_Handle tc_ah;
int unimpl_errno;
};
int osdep_xenforeignmemory_open(xenforeignmemory_handle *fmem);
int osdep_xenforeignmemory_close(xenforeignmemory_handle *fmem);
void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,
uint32_t dom, void *addr,
int prot, int flags, size_t num,
const xen_pfn_t arr[/*num*/], int err[/*num*/]);
int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
void *addr, size_t num);
#if defined(__sun__)
/* Strictly compat for those two only only */
void *osdep_map_foreign_batch(xenforeignmemory_handle *fmem, uint32_t dom,
void *addr, int prot, int flags,
xen_pfn_t *arr, int num);
#endif
struct xenforeignmemory_resource_handle {
domid_t domid;
unsigned int type;
unsigned int id;
unsigned long frame;
unsigned long nr_frames;
void *addr;
int prot;
int flags;
};
#if defined(__sun__) || defined(__MINIOS__)
static inline int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,
domid_t domid)
{
errno = EOPNOTSUPP;
return -1;
}
static inline int osdep_xenforeignmemory_map_resource(
xenforeignmemory_handle *fmem, xenforeignmemory_resource_handle *fres)
{
errno = EOPNOTSUPP;
return -1;
}
static inline int osdep_xenforeignmemory_unmap_resource(
xenforeignmemory_handle *fmem, xenforeignmemory_resource_handle *fres)
{
return 0;
}
#else
int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,
domid_t domid);
int osdep_xenforeignmemory_map_resource(
xenforeignmemory_handle *fmem, xenforeignmemory_resource_handle *fres);
int osdep_xenforeignmemory_unmap_resource(
xenforeignmemory_handle *fmem, xenforeignmemory_resource_handle *fres);
#endif
#define PERROR(_f...) \
xtl_log(fmem->logger, XTL_ERROR, errno, "xenforeignmemory", _f)
#endif
/*
* Local variables:
* mode: C
* c-file-style: "BSD"
* c-basic-offset: 4
* tab-width: 4
* indent-tabs-mode: nil
* End:
*/