From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arianna Avanzini Subject: [PATCH v3 5/5] tools, libxl: handle the iomem parameter with the memory_mapping hcall Date: Sat, 15 Mar 2014 21:11:26 +0100 Message-ID: <1394914286-29713-6-git-send-email-avanzini.arianna@gmail.com> References: <1394914286-29713-1-git-send-email-avanzini.arianna@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1394914286-29713-1-git-send-email-avanzini.arianna@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Ian.Campbell@eu.citrix.com, paolo.valente@unimore.it, keir@xen.org, stefano.stabellini@eu.citrix.com, Ian.Jackson@eu.citrix.com, dario.faggioli@citrix.com, tim@xen.org, julien.grall@citrix.com, etrudeau@broadcom.com, JBeulich@suse.com, avanzini.arianna@gmail.com, viktor.kleinik@globallogic.com List-Id: xen-devel@lists.xenproject.org Currently, the configuration-parsing code concerning the handling of the iomem parameter only invokes the XEN_DOMCTL_iomem_permission hypercall. This commit lets the XEN_DOMCTL_memory_mapping hypercall be invoked after XEN_DOMCTL_iomem_permission when the iomem parameter is parsed from a domU configuration file, so that the address range can be mapped to the address space of the domU. The hypercall is invoked only in case of ARM or x86 HVM guests. Signed-off-by: Arianna Avanzini Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Ian Campbell Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Eric Trudeau Cc: Viktor Kleinik --- v3: - Add ifdefs to let the hypercall be called only by ARM or x86 HVM guests, with a whitelist approach. - Remove the NOTE comment. v2: - Add a comment explaining outstanding issues. --- tools/libxl/libxl_create.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index d015cf4..dda4df3 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1107,7 +1107,24 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to iomem range %"PRIx64"-%"PRIx64, domid, io->start, io->start + io->number - 1); ret = ERROR_FAIL; + continue; } +#if defined(__x86_32__) || defined(__x86_64__) + if (b_info->type != LIBXL_DOMAIN_TYPE_HVM) + continue; +#endif /* __x86_32__ || __x86_64__ */ +#if defined(__arm__) || defined(__x86_32__) || defined(__x86_64__) + ret = xc_domain_memory_mapping(CTX->xch, domid, + io->gfn, io->start, + io->number, 1); + if (ret < 0) { + LOGE(ERROR, + "failed to map to dom%d iomem range %"PRIx64"-%"PRIx64 + " to guest address %"PRIx64, + domid, io->start, io->start + io->number - 1, io->gfn); + ret = ERROR_FAIL; + } +#endif /* __arm__ || __x86_32__ || __x86_64__ */ } switch (d_config->c_info.type) { -- 1.9.0