Commit 074092d0 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0c28d0d0 d01a5a3f

include/hw/xen/xen_common.h

+9 −4
Original line number Diff line number Diff line
@@ -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;

}