[PATCH v2][4.15] libxl/Arm: correct xc_shadow_control() invocation to fix build

Jan Beulich posted 1 patch 1 year, 6 months ago
Failed in applying to current master (apply log)
[PATCH v2][4.15] libxl/Arm: correct xc_shadow_control() invocation to fix build
Posted by Jan Beulich 1 year, 6 months ago
The backport didn't adapt to the earlier function prototype taking more
(unused here) arguments.

Fixes: c5215044578e ("xen/arm, libxl: Implement XEN_DOMCTL_shadow_op for Arm")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
Also applicable to 4.14 and 4.13.
---
v2: Correct oversights.

--- a/tools/libs/light/libxl_arm.c
+++ b/tools/libs/light/libxl_arm.c
@@ -132,7 +132,7 @@ int libxl__arch_domain_create(libxl__gc *gc,
                               uint32_t domid)
 {
     libxl_ctx *ctx = libxl__gc_owner(gc);
-    unsigned int shadow_mb = DIV_ROUNDUP(d_config->b_info.shadow_memkb, 1024);
+    unsigned long shadow_mb = DIV_ROUNDUP(d_config->b_info.shadow_memkb, 1024);
 
     int r = xc_shadow_control(ctx->xch, domid,
                               XEN_DOMCTL_SHADOW_OP_SET_ALLOCATION,
-                              &shadow_mb, 0);
+                              NULL, 0, &shadow_mb, 0, NULL);
     if (r) {
         LOGED(ERROR, domid,
-              "Failed to set %u MiB shadow allocation", shadow_mb);
+              "Failed to set %lu MiB shadow allocation", shadow_mb);
         return ERROR_FAIL;
     }
RE: [PATCH v2][4.15] libxl/Arm: correct xc_shadow_control() invocation to fix build
Posted by Henry Wang 1 year, 6 months ago
Hi Jan,

> -----Original Message-----
> From: Jan Beulich <jbeulich@suse.com>
> Subject: [PATCH v2][4.15] libxl/Arm: correct xc_shadow_control() invocation
> to fix build
> 
> The backport didn't adapt to the earlier function prototype taking more
> (unused here) arguments.
> 
> Fixes: c5215044578e ("xen/arm, libxl: Implement XEN_DOMCTL_shadow_op
> for Arm")
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Reviewed-by: Henry Wang <Henry.Wang@arm.com>

Kind regards,
Henry
 
Re: [PATCH v2][4.15] libxl/Arm: correct xc_shadow_control() invocation to fix build
Posted by Anthony PERARD 1 year, 6 months ago
On Wed, Oct 12, 2022 at 01:16:47PM +0000, Henry Wang wrote:
> Hi Jan,
> 
> > -----Original Message-----
> > From: Jan Beulich <jbeulich@suse.com>
> > Subject: [PATCH v2][4.15] libxl/Arm: correct xc_shadow_control() invocation
> > to fix build
> > 
> > The backport didn't adapt to the earlier function prototype taking more
> > (unused here) arguments.
> > 
> > Fixes: c5215044578e ("xen/arm, libxl: Implement XEN_DOMCTL_shadow_op
> > for Arm")
> > Signed-off-by: Jan Beulich <jbeulich@suse.com>
> 
> Reviewed-by: Henry Wang <Henry.Wang@arm.com>

Acked-by: Anthony PERARD <anthony.perard@citrix.com>

Thanks,

-- 
Anthony PERARD