diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-26 13:11:16 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-26 13:11:16 +0000 |
| commit | 074092d074f7a55378659223cf54ca06f6d0fbde (patch) | |
| tree | ff42391a4f74498c5cd3330a8d0900a65e284f76 /include/hw | |
| parent | 0c28d0d07fbcd7aa44d231241d444d00882256e2 (diff) | |
| parent | d01a5a3fe19645f3cdea1566f0e518ea2152a029 (diff) | |
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>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/xen/xen_common.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 519696f255..38f29fb098 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -168,14 +168,19 @@ void xen_shutdown_fatal_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); #ifdef HVM_PARAM_VMPORT_REGS_PFN 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, - vmport_regs_pfn); + int rc; + 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 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; } |