From: Jan Beulich Date: Fri, 3 Sep 2021 13:10:24 +0000 (+0200) Subject: tools/libs: ROUNDUP() related adjustments X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~241 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5325b3eaf6a9d8600bf9e9e7428b5c336fd43c84;p=xen.git tools/libs: ROUNDUP() related adjustments For one xc_private.h needlessly repeats xen-tools/libs.h's definition. And then there are two suspicious uses (resulting from the inconsistency with the respective 2nd parameter of DIV_ROUNDUP()): While the one in tools/console/daemon/io.c - as per the code comment - intentionally uses 8 as the second argument (meaning to align to a multiple of 256), the one in alloc_magic_pages_hvm() pretty certainly does not: There the goal is to align to a uint64_t boundary, for the following module struct to end up aligned. Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross Acked-by: Ian Jackson --- diff --git a/tools/libs/ctrl/xc_private.h b/tools/libs/ctrl/xc_private.h index 3e299b943f..2e483590e6 100644 --- a/tools/libs/ctrl/xc_private.h +++ b/tools/libs/ctrl/xc_private.h @@ -63,8 +63,6 @@ struct iovec { #include #endif -#define ROUNDUP(_x,_w) (((unsigned long)(_x)+(1UL<<(_w))-1) & ~((1UL<<(_w))-1)) - #define DECLARE_DOMCTL struct xen_domctl domctl #define DECLARE_SYSCTL struct xen_sysctl sysctl #define DECLARE_PHYSDEV_OP struct physdev_op physdev_op diff --git a/tools/libs/guest/xg_dom_x86.c b/tools/libs/guest/xg_dom_x86.c index d2eb89ce01..b6e75afba2 100644 --- a/tools/libs/guest/xg_dom_x86.c +++ b/tools/libs/guest/xg_dom_x86.c @@ -678,7 +678,7 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) { if ( dom->cmdline ) { - dom->cmdline_size = ROUNDUP(strlen(dom->cmdline) + 1, 8); + dom->cmdline_size = ROUNDUP(strlen(dom->cmdline) + 1, 3); start_info_size += dom->cmdline_size; } }