[Qemu-devel] [PULL 0/1] Xen tree 2015-01-26

[Qemu-devel] [PULL 0/1] Xen tree 2015-01-26

[Stefano Stabellini]

The following changes since commit b3a4755a67a52aa7297eb8927b482d09dabdefec:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150122-1' into staging (2015-01-22 12:14:19 +0000)

are available in the git repository at:


  git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-2015-01-26

for you to fetch changes up to d01a5a3fe19645f3cdea1566f0e518ea2152a029:

  fix QEMU build on Xen/ARM (2015-01-26 11:56:33 +0000)

----------------------------------------------------------------
Stefano Stabellini (1):
      fix QEMU build on Xen/ARM

 include/hw/xen/xen_common.h |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

[Qemu-devel] [PULL 1/1] fix QEMU build on Xen/ARM

[Stefano Stabellini]

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>
---
 include/hw/xen/xen_common.h |   13 +++++++++----
 1 file 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;
 }
-- 
1.7.10.4

Re: [Qemu-devel] [PULL 0/1] Xen tree 2015-01-26

[Peter Maydell]

On 26 January 2015 at 12:00, Stefano Stabellini
<stefano.stabellini@eu.citrix.com> wrote:
> The following changes since commit b3a4755a67a52aa7297eb8927b482d09dabdefec:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150122-1' into staging (2015-01-22 12:14:19 +0000)
>
> are available in the git repository at:
>
>
>   git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-2015-01-26
>
> for you to fetch changes up to d01a5a3fe19645f3cdea1566f0e518ea2152a029:
>
>   fix QEMU build on Xen/ARM (2015-01-26 11:56:33 +0000)
>
> ----------------------------------------------------------------
> Stefano Stabellini (1):
>       fix QEMU build on Xen/ARM

Applied, thanks.

-- PMM