aboutsummaryrefslogtreecommitdiff
path: root/include/hw/xen
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2015-01-23 12:09:47 +0000
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2015-01-26 11:56:33 +0000
commitd01a5a3fe19645f3cdea1566f0e518ea2152a029 (patch)
treebea63f565be8cb06ec264e346f44da3cfbd0cb09 /include/hw/xen
parentb3a4755a67a52aa7297eb8927b482d09dabdefec (diff)
downloadqemu-d01a5a3fe19645f3cdea1566f0e518ea2152a029.zip
qemu-d01a5a3fe19645f3cdea1566f0e518ea2152a029.tar.gz
qemu-d01a5a3fe19645f3cdea1566f0e518ea2152a029.tar.bz2
fix QEMU build on Xen/ARM
xen_get_vmport_regs_pfn should take a xen_pfn_t argument, not an unsigned long argument (in fact xen_pfn_t is defined as uint64_t on ARM). Also use xc_hvm_param_get instead of the deprecated xc_get_hvm_param. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Reviewed-by: Don Slutz <dslutz@verizon.com>
Diffstat (limited to 'include/hw/xen')
-rw-r--r--include/hw/xen/xen_common.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 519696f..38f29fb 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;
}