mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
Julien Grall
3a98c1a4ce
Commit0dbb4be739add the inclusion of xenctrl.h from private.h and wreck the build in an interesting way: In file included from xen/stubdom/include/xen/domctl.h:39:0, from xen/tools/include/xenctrl.h:36, from private.h:4, from minios.c:29: xen/include/public/memory.h:407:5: error: expected specifier-qualifier-list before ‘XEN_GUEST_HANDLE_64’ XEN_GUEST_HANDLE_64(const_uint8) buffer; ^~~~~~~~~~~~~~~~~~~ This is happening because xenctrl.h defines __XEN_TOOLS__ and therefore the public headers will start to expose the non-stable ABI. However, xen.h has already been included by a mini-OS header before hand. So there is a mismatch in the way the headers are included. For now solve it in a very simple (and gross) way by including xenctrl.h before the mini-os headers. Fixes:0dbb4be739("tools/libs/foreignmemory: Fix PAGE_SIZE redefinition error") Signed-off-by: Julien Grall <jgrall@amazon.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
78 lines
2.1 KiB
C
78 lines
2.1 KiB
C
/*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation;
|
|
* version 2.1 of the License.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Split out from xc_minios.c
|
|
*
|
|
* Copyright 2007-2008 Samuel Thibault <samuel.thibault@eu.citrix.com>.
|
|
*/
|
|
|
|
/*
|
|
* xenctrl.h currently defines __XEN_TOOLS__ which affects what is
|
|
* exposed by Xen headers. As the define needs to be set consistently,
|
|
* we want to include xenctrl.h before the mini-os headers (they include
|
|
* public headers).
|
|
*/
|
|
#include <xenctrl.h>
|
|
|
|
#include <mini-os/types.h>
|
|
#include <mini-os/os.h>
|
|
#include <mini-os/mm.h>
|
|
#include <mini-os/lib.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <sys/mman.h>
|
|
|
|
#include "private.h"
|
|
|
|
int osdep_xenforeignmemory_open(xenforeignmemory_handle *fmem)
|
|
{
|
|
/* No fd required */
|
|
return 0;
|
|
}
|
|
|
|
int osdep_xenforeignmemory_close(xenforeignmemory_handle *fmem)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
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*/])
|
|
{
|
|
unsigned long pt_prot = 0;
|
|
if (prot & PROT_READ)
|
|
pt_prot = L1_PROT_RO;
|
|
if (prot & PROT_WRITE)
|
|
pt_prot = L1_PROT;
|
|
return map_frames_ex(arr, num, 1, 0, 1, dom, err, pt_prot);
|
|
}
|
|
|
|
int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
|
|
void *addr, size_t num)
|
|
{
|
|
return munmap(addr, num << XC_PAGE_SHIFT);
|
|
}
|
|
|
|
/*
|
|
* Local variables:
|
|
* mode: C
|
|
* c-file-style: "BSD"
|
|
* c-basic-offset: 4
|
|
* tab-width: 4
|
|
* indent-tabs-mode: nil
|
|
* End:
|
|
*/
|