[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2] fix QEMU build on Xen/ARM
From: |
Don Slutz |
Subject: |
Re: [Qemu-devel] [PATCH v2] fix QEMU build on Xen/ARM |
Date: |
Fri, 23 Jan 2015 13:36:32 -0500 |
User-agent: |
Mozilla/5.0 (X11; Linux i686 on x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 |
On 01/23/15 07:19, Stefano Stabellini wrote:
> 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 <address@hidden>
>
> ---
>
I have tested this on x86_64 with a xen that has
HVM_PARAM_VMPORT_REGS_PFN defined.
And the change looks good to me, so
Reviewed-by: Don Slutz <address@hidden>
-Don Slutz
> Changes in v2:
> - properly handle return codes and set *vmport_regs_pfn before returning.
>
> 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;
> }
>