ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/sstabellini/xen-2015-01-26' into staging 

* remotes/sstabellini/xen-2015-01-26:
  fix QEMU build on Xen/ARM

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-01-26 13:11:16 +00:00
parent 0c28d0d07f d01a5a3fe1
commit 074092d074
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/hw/xen/xen_common.h
View File

@ -168,14 +168,19 @@ void xen_shutdown_fatal_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
#ifdef HVM_PARAM_VMPORT_REGS_PFN #ifdef HVM_PARAM_VMPORT_REGS_PFN
static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom, static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom,
unsigned long *vmport_regs_pfn) xen_pfn_t *vmport_regs_pfn)
{ {
return xc_get_hvm_param(xc, dom, HVM_PARAM_VMPORT_REGS_PFN, int rc;
vmport_regs_pfn); uint64_t value;
rc = xc_hvm_param_get(xc, dom, HVM_PARAM_VMPORT_REGS_PFN, &value);
if (rc >= 0) {
*vmport_regs_pfn = (xen_pfn_t) value;
}
return rc;
} }
#else #else
static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom, static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom,
unsigned long *vmport_regs_pfn) xen_pfn_t *vmport_regs_pfn)
{ {
return -ENOSYS; return -ENOSYS;
} }