From: Tiejun Chen <tiejun.chen@intel.com>
Date: Mon, 29 Jun 2015 06:51:36 +0000 (+0800)
Subject: tools/libxc: check to set args.mmio_size before call xc_hvm_build
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2977
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a9d44224ed3970eab86b41c20bee7a804edc5129;p=xen.git

tools/libxc: check to set args.mmio_size before call xc_hvm_build

After commit 5dff8e9eedc7, "libxc/libxl: fill xc_hvm_build_args in
libxl" is introduced, we won't check to set args.mmio_size inside
xc_hvm_build as before. So instead, we need to do this before call
that.

CC: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: Ian Campbell <ian.campbell@citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
---

diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c
index 003ea06252..7343e87ebe 100644
--- a/tools/libxc/xc_hvm_build_x86.c
+++ b/tools/libxc/xc_hvm_build_x86.c
@@ -754,6 +754,8 @@ int xc_hvm_build_target_mem(xc_interface *xch,
     args.mem_size = (uint64_t)memsize << 20;
     args.mem_target = (uint64_t)target << 20;
     args.image_file_name = image_name;
+    if ( args.mmio_size == 0 )
+        args.mmio_size = HVM_BELOW_4G_MMIO_LENGTH;
 
     return xc_hvm_build(xch, domid, &args);
 }