From patchwork Fri Jun 25 13:17:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12345043 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4C17C2B9F4 for ; Fri, 25 Jun 2021 13:18:16 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5DE2261965 for ; Fri, 25 Jun 2021 13:18:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DE2261965 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.147182.271119 (Exim 4.92) (envelope-from ) id 1lwlii-00070i-MN; Fri, 25 Jun 2021 13:18:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 147182.271119; Fri, 25 Jun 2021 13:18:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lwlii-00070b-JB; Fri, 25 Jun 2021 13:18:08 +0000 Received: by outflank-mailman (input) for mailman id 147182; Fri, 25 Jun 2021 13:18:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lwlih-00070V-PT for xen-devel@lists.xenproject.org; Fri, 25 Jun 2021 13:18:07 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.109.102]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 69681104-e8f7-4c5d-b555-e3c8c279dfcd; Fri, 25 Jun 2021 13:18:06 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2104.outbound.protection.outlook.com [104.47.17.104]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-37-KqQchVhzMAOVMuuGLRSrHg-2; Fri, 25 Jun 2021 15:18:03 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB4384.eurprd04.prod.outlook.com (2603:10a6:803:6f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19; Fri, 25 Jun 2021 13:18:01 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::99d3:99cd:8adf:3eea]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::99d3:99cd:8adf:3eea%5]) with mapi id 15.20.4264.020; Fri, 25 Jun 2021 13:18:01 +0000 Received: from [10.156.60.236] (37.24.206.209) by FR2P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.8 via Frontend Transport; Fri, 25 Jun 2021 13:18:00 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 69681104-e8f7-4c5d-b555-e3c8c279dfcd DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1624627085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WeQBwOgFXz1U60UH22PesVSYD2OW+F4k/D3F8uvruuE=; b=eg5wtkpQPFBx06fcBrkFJ01lF04gvcDZoaUs9wYLfgNroC4ru8jFeRSCsKJCjGR74jwigN YpHMW5Ny0kiad9vV3eIo6tONH8padz/c5S0Lk/nojkH8MZNK7+ftxWlxRTYqPoU2ZHXO/O WyfZ2uxa5SvaC54VWbUpTzSYiII8Sss= X-MC-Unique: KqQchVhzMAOVMuuGLRSrHg-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dseunScbm2NtiRmMFfxv7+JtHsjbkdtXWGzJ0kBVUZa8HdcrkuV9cS3MvJpdqoMXQ7FKcZvd2roi9Kvfam8gnhsigbjvY3Exc3MzxRXYsBAHK3QSVbt5JaqFTIgIIQofiBTvTOjh3z+xmgHSB3/2h9qFvjiFzHS+9v7pcgtmUiIOf5dG6HsAV11PwZ1Ta7twR23LleaabRMymirVbRFBkEnp+ZUgi68UI9O6AWZafmrM8TmpmJG+YZTM+ijipAeeTM4DhOw3Yoc4SoA5CfxKvnoXtlKbCQquEgoSKKXuhq4EWMXjn5CRfZ/KWXb0MVXzbfSK3FafQVIhwhCy5i2Z6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WeQBwOgFXz1U60UH22PesVSYD2OW+F4k/D3F8uvruuE=; b=D79moY8/s1aYZe0Ko9ixZb0D36RXv+ExIhaiyTbz0AYy2GbuGRQ5a3IegVRr/0T51TiPpiPl/Ddo6C0dHdfTbntBzxCGx0h2dYa8FbHmEZ+Cv3ZJsqoCMHToJlvJjcSXu+68YF4Xj1QDK+vk+XkZODsg6qTQBoTn7nrgynJlXVH453GIXUZ4ciwr1izeFgViSUJUPP2TKBJuYByyeOhydT+LqKWQeab3m6Wqo9Aj//Tdgk00JL6MKMJZgYSgC2gFqTwM7dvyCZlIL99JKFbFd2OlCZTsGbzV3X8/Zvi6JdvCOwPevfXVCmvAmKgBv7/i+g4wk3XVokTFqNv716Ggyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: recoil.org; dkim=none (message not signed) header.d=none;recoil.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 01/12] libxc: split xc_logdirty_control() from xc_shadow_control() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Juergen Gross , George Dunlap , Ian Jackson , Marek Marczykowski , Christian Lindig , David Scott References: <912fa390-f9e9-198a-9aee-39fdb9a28fcc@suse.com> Message-ID: Date: Fri, 25 Jun 2021 15:17:58 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 In-Reply-To: <912fa390-f9e9-198a-9aee-39fdb9a28fcc@suse.com> Content-Language: en-US X-Originating-IP: [37.24.206.209] X-ClientProxiedBy: FR2P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::19) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e92da259-073f-45a1-d9b7-08d937dba846 X-MS-TrafficTypeDiagnostic: VI1PR04MB4384: X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:534; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: It0xrBrFKURpFyrZyygOFZ2nDK2PLUEiY1ql+UpoXtcXZDpSaCuakctF3scLM0XaP9NZDZ0+U2pw4zwsjHQbIc5A1no+/OgZlgcRVWUnWHgORbrODSfvx/e58cGESLhpheA1LDJ83Cegbu+RDuK/uAxK+pe2DqXdRCv+uUe0DGd0k1XfsTDNRHFwaFBD53w6dPAwDcgoiApw/VlUlb8MfcDAVIMYS+HXk0fN47VOqyoHSjDWh5UUe12DjWj9T/zbnBfYmmk7cjYEc4bIaign6Lkd/prxVNLdsS8k1cXLbw7h8M204Dipy9cpT0ac4j3rnjfdOzhEuJyAljAl63EB87LIO5Clv4lmWKI66R5qu7ky8uHBUOp6IItcx8/XpitjbbSJBh0HwCmsU3/67SYeOjGZfhqB5KmJn/Nf3sBqkE+7w1GDBPeR6MqwVsFrUrLHI+R1JFTgUJDyXI3U2LgFErJTDFFbatWk9cdWM6+BPtDhd3NbtdwUMGzlS5Ja1bdEoR0Q5Xn/NeHc8dHb5Ot5CuHsjNkvaChJxUYlwgZazNjvpCeWRWrgbw5goDuC3WzAZnZnwYeajeVfOltuKVi7Viq1xw3r/smga9AtUwf+7wqlFWSt78FywTXsHED05A00e6C3pGKcO9eLv6PfnC6d1qcwcYkLrlEIcDvsUOCTFetSsmPTBmxOltuSjb5R8zdP X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(39850400004)(396003)(346002)(376002)(136003)(366004)(54906003)(83380400001)(316002)(16576012)(2616005)(956004)(186003)(6916009)(26005)(8676002)(66556008)(66946007)(4326008)(16526019)(66476007)(8936002)(478600001)(5660300002)(6486002)(36756003)(38100700002)(2906002)(86362001)(31696002)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?gV7frtyKI6Yj/wiUcgtscl0Nz4cN?= =?utf-8?q?G9stOjYOOKtXmV1f30pxxU+NK0kU0raU/AgOO6SwlPmv2mEJwaZCNSW7bl46twp9F?= =?utf-8?q?2L7nhvGF+r4qGoaPr8mBJ41HD/bE3Os6ikxzMyFatXqg6HhMOoFZ01gi/zO7aLj8c?= =?utf-8?q?7UteJyBOUFA3Hxv41/987BV5CRKOsQlcND2g7QERkYRdsl3gXyAG48ShH3iqDzi9W?= =?utf-8?q?1Nv5qEX2aq/n3TNOE0kwVuNTlAHPFVnHQHz8eNhzwE984eQtnayjZZJrHexWxLXye?= =?utf-8?q?FWRhz9UN3gIJUPPuqp+eSpbkkNpXBNfHN7wQs37rnYN5YmJbF0nQtAv/u/58/Cheq?= =?utf-8?q?zdNJFq9At1M5A5KV41wfZ7fzP4L22aiEsxA4J7WEs5beNQ5F3+3CZXC7M2c7R3aOv?= =?utf-8?q?1uk/fV4ujT34V727lTRFd4jzufneHoabgl8Ns48dCCqF9Xb7dPq46i8AGFBOBpaQe?= =?utf-8?q?95DA17lIkA7E6rfihoxBLuPbDE1C+glG4JQuB5XXzuMOQzHGtoeSSnzeYBe72Lox7?= =?utf-8?q?572rxxiY+V+WyQfiRyBBzm5H6/nRxkDcrWB4MXGH22ebhqk1gCdHTO2i+qJ4EsiAc?= =?utf-8?q?2jDt+6JRJd06pvv4ywBTqNsiuuqcbgEMMpd2UcNbJoZ/UbPwEn72tGBvLESQ/kjN2?= =?utf-8?q?bHDQu3MDQE8kDW7H1v4TDFFK2IMAqTIDQ34cqw0o3HKGJLcCXRT02OS/ZbxjVXpAp?= =?utf-8?q?8O6i8ZCaWnZfJNjGeZ6BezAp+JWbj+asHoTihIw408mUiI1Psdg9qrDOdwylpKtTu?= =?utf-8?q?jD1l06oruYK0ZUocNYb8TYzYf121dKZ+AntwBTf4Q+qqCkoKc/Y2uCxlQohXPUIkI?= =?utf-8?q?BWgG1gYhP7wUvRJMaEZCCk71/W84sTXjS15L7NHd6E9pxyck/NQGwGjBR7b7vQNWF?= =?utf-8?q?6xuAA4e0lABuCMfm0NfT1b8vde8jcFBcq0sSXxetr7Lbe1blNJsekwgEm/RHv5VOU?= =?utf-8?q?/HgP9BG3HqGoVAryvjxhm4FgwZkRbZsNFKVLYEO290vHPJcvZ+TjVP1k6wSqw86Ht?= =?utf-8?q?FJniRwNY2oixB25f10yohftgE/58nHsFA6brhGJ+FZzuGSfh1h4aHqEqGyWuqrjBt?= =?utf-8?q?VFigqRX3MjLs7D3NQZOMwF7F/7uySVnSiHY7rp9y3Zpnuy67ZTqSAcyZgx8w2OXgF?= =?utf-8?q?JrEf4X1AkZl7+AzpraDW7S2jQ96P8r8Dub6hsQxc23waNRLBHFFIGGhst3eOmmmo8?= =?utf-8?q?ARGthH0SiQDEZozQybDDp/U4RXGKGzJm/Sdm+xccDfmWRSBhPeMcjvzvzH8DOV98B?= =?utf-8?q?AjRQYtmyScclWGRw?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e92da259-073f-45a1-d9b7-08d937dba846 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2021 13:18:01.1716 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LAqQKHfSf7xa/wgithWnWfYS/uMF8U/kxZMYnGIdD0mUoEjVz1QdxEsHY2TnGhC6qWzrGqDw08GhIuZ7nkVNoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4384 For log-dirty operations a 64-bit field is being truncated to become an "int" return value. Seeing the large number of arguments the present function takes, reduce its set of parameters to that needed for all operations not involving the log-dirty bitmap, while introducing a new wrapper for the log-dirty bitmap operations. This new function in turn doesn't need an "mb" parameter, but has a 64-bit return type. (Using the return value in favor of a pointer-type parameter is left as is, to disturb callers as little as possible.) While altering xc_shadow_control() anyway, also adjust the types of the last two of the remaining parameters. Signed-off-by: Jan Beulich Acked-by: Christian Lindig > Signed-off-by: Jan Beulich > --- I wonder whether we shouldn't take the opportunity and also rename xc_shadow_control() to, say, xc_paging_control(), matching the layer above the HAP/shadow distinction in the hypervisor. --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -885,11 +885,15 @@ typedef struct xen_domctl_shadow_op_stat int xc_shadow_control(xc_interface *xch, uint32_t domid, unsigned int sop, - xc_hypercall_buffer_t *dirty_bitmap, - unsigned long pages, - unsigned long *mb, - uint32_t mode, - xc_shadow_op_stats_t *stats); + unsigned int *mb, + unsigned int mode); +long long xc_logdirty_control(xc_interface *xch, + uint32_t domid, + unsigned int sop, + xc_hypercall_buffer_t *dirty_bitmap, + unsigned long pages, + unsigned int mode, + xc_shadow_op_stats_t *stats); int xc_sched_credit_domain_set(xc_interface *xch, uint32_t domid, --- a/tools/libs/ctrl/xc_domain.c +++ b/tools/libs/ctrl/xc_domain.c @@ -650,25 +650,48 @@ int xc_watchdog(xc_interface *xch, int xc_shadow_control(xc_interface *xch, uint32_t domid, unsigned int sop, - xc_hypercall_buffer_t *dirty_bitmap, - unsigned long pages, - unsigned long *mb, - uint32_t mode, - xc_shadow_op_stats_t *stats) + unsigned int *mb, + unsigned int mode) { int rc; DECLARE_DOMCTL; - DECLARE_HYPERCALL_BUFFER_ARGUMENT(dirty_bitmap); memset(&domctl, 0, sizeof(domctl)); domctl.cmd = XEN_DOMCTL_shadow_op; domctl.domain = domid; domctl.u.shadow_op.op = sop; - domctl.u.shadow_op.pages = pages; domctl.u.shadow_op.mb = mb ? *mb : 0; domctl.u.shadow_op.mode = mode; - if (dirty_bitmap != NULL) + + rc = do_domctl(xch, &domctl); + + if ( mb ) + *mb = domctl.u.shadow_op.mb; + + return rc; +} + +long long xc_logdirty_control(xc_interface *xch, + uint32_t domid, + unsigned int sop, + xc_hypercall_buffer_t *dirty_bitmap, + unsigned long pages, + unsigned int mode, + xc_shadow_op_stats_t *stats) +{ + int rc; + DECLARE_DOMCTL; + DECLARE_HYPERCALL_BUFFER_ARGUMENT(dirty_bitmap); + + memset(&domctl, 0, sizeof(domctl)); + + domctl.cmd = XEN_DOMCTL_shadow_op; + domctl.domain = domid; + domctl.u.shadow_op.op = sop; + domctl.u.shadow_op.pages = pages; + domctl.u.shadow_op.mode = mode; + if ( dirty_bitmap ) set_xen_guest_handle(domctl.u.shadow_op.dirty_bitmap, dirty_bitmap); @@ -678,9 +701,6 @@ int xc_shadow_control(xc_interface *xch, memcpy(stats, &domctl.u.shadow_op.stats, sizeof(xc_shadow_op_stats_t)); - if ( mb ) - *mb = domctl.u.shadow_op.mb; - return (rc == 0) ? domctl.u.shadow_op.pages : rc; } --- a/tools/libs/guest/xg_sr_restore.c +++ b/tools/libs/guest/xg_sr_restore.c @@ -459,10 +459,10 @@ static int send_checkpoint_dirty_pfn_lis DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, &ctx->restore.dirty_bitmap_hbuf); - if ( xc_shadow_control( + if ( xc_logdirty_control( xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_CLEAN, HYPERCALL_BUFFER(dirty_bitmap), ctx->restore.p2m_size, - NULL, 0, &stats) != ctx->restore.p2m_size ) + 0, &stats) != ctx->restore.p2m_size ) { PERROR("Failed to retrieve logdirty bitmap"); goto err; --- a/tools/libs/guest/xg_sr_save.c +++ b/tools/libs/guest/xg_sr_save.c @@ -428,18 +428,18 @@ static int enable_logdirty(struct xc_sr_ /* This juggling is required if logdirty is enabled for VRAM tracking. */ rc = xc_shadow_control(xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY, - NULL, 0, NULL, 0, NULL); + NULL, 0); if ( rc < 0 ) { on1 = errno; rc = xc_shadow_control(xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_OFF, - NULL, 0, NULL, 0, NULL); + NULL, 0); if ( rc < 0 ) off = errno; else { rc = xc_shadow_control(xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY, - NULL, 0, NULL, 0, NULL); + NULL, 0); if ( rc < 0 ) on2 = errno; } @@ -556,10 +556,10 @@ static int send_memory_live(struct xc_sr if ( policy_decision != XGS_POLICY_CONTINUE_PRECOPY ) break; - if ( xc_shadow_control( + if ( xc_logdirty_control( xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_CLEAN, &ctx->save.dirty_bitmap_hbuf, ctx->save.p2m_size, - NULL, 0, &stats) != ctx->save.p2m_size ) + 0, &stats) != ctx->save.p2m_size ) { PERROR("Failed to retrieve logdirty bitmap"); rc = -1; @@ -653,10 +653,10 @@ static int suspend_and_send_dirty(struct if ( rc ) goto out; - if ( xc_shadow_control( + if ( xc_logdirty_control( xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_CLEAN, HYPERCALL_BUFFER(dirty_bitmap), ctx->save.p2m_size, - NULL, XEN_DOMCTL_SHADOW_LOGDIRTY_FINAL, &stats) != + XEN_DOMCTL_SHADOW_LOGDIRTY_FINAL, &stats) != ctx->save.p2m_size ) { PERROR("Failed to retrieve logdirty bitmap"); @@ -716,10 +716,10 @@ static int verify_frames(struct xc_sr_co if ( rc ) goto out; - if ( xc_shadow_control( + if ( xc_logdirty_control( xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_PEEK, &ctx->save.dirty_bitmap_hbuf, ctx->save.p2m_size, - NULL, 0, &stats) != ctx->save.p2m_size ) + 0, &stats) != ctx->save.p2m_size ) { PERROR("Failed to retrieve logdirty bitmap"); rc = -1; @@ -834,7 +834,7 @@ static void cleanup(struct xc_sr_context xc_shadow_control(xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_OFF, - NULL, 0, NULL, 0, NULL); + NULL, 0); if ( ctx->save.ops.cleanup(ctx) ) PERROR("Failed to clean up"); --- a/tools/libs/light/libxl_colo_restore.c +++ b/tools/libs/light/libxl_colo_restore.c @@ -62,7 +62,7 @@ static void colo_enable_logdirty(libxl__ /* we need to know which pages are dirty to restore the guest */ if (xc_shadow_control(CTX->xch, domid, XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY, - NULL, 0, NULL, 0, NULL) < 0) { + NULL, 0) < 0) { LOGD(ERROR, domid, "cannot enable secondary vm's logdirty"); lds->callback(egc, lds, ERROR_FAIL); return; @@ -90,7 +90,7 @@ static void colo_disable_logdirty(libxl_ /* we need to know which pages are dirty to restore the guest */ if (xc_shadow_control(CTX->xch, domid, XEN_DOMCTL_SHADOW_OP_OFF, - NULL, 0, NULL, 0, NULL) < 0) + NULL, 0) < 0) LOGD(WARN, domid, "cannot disable secondary vm's logdirty"); if (crs->hvm) { --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -529,10 +529,10 @@ int libxl__arch_domain_create(libxl__gc xc_domain_set_time_offset(ctx->xch, domid, rtc_timeoffset); if (d_config->b_info.type != LIBXL_DOMAIN_TYPE_PV) { - unsigned long shadow = DIV_ROUNDUP(d_config->b_info.shadow_memkb, - 1024); + unsigned int shadow = DIV_ROUNDUP(d_config->b_info.shadow_memkb, + 1024); xc_shadow_control(ctx->xch, domid, XEN_DOMCTL_SHADOW_OP_SET_ALLOCATION, - NULL, 0, &shadow, 0, NULL); + &shadow, 0); } if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -997,13 +997,13 @@ CAMLprim value stub_shadow_allocation_ge { CAMLparam2(xch, domid); CAMLlocal1(mb); - unsigned long c_mb; + unsigned int c_mb; int ret; caml_enter_blocking_section(); ret = xc_shadow_control(_H(xch), _D(domid), XEN_DOMCTL_SHADOW_OP_GET_ALLOCATION, - NULL, 0, &c_mb, 0, NULL); + &c_mb, 0); caml_leave_blocking_section(); if (ret != 0) failwith_xc(_H(xch)); @@ -1016,14 +1016,14 @@ CAMLprim value stub_shadow_allocation_se value mb) { CAMLparam3(xch, domid, mb); - unsigned long c_mb; + unsigned int c_mb; int ret; c_mb = Int_val(mb); caml_enter_blocking_section(); ret = xc_shadow_control(_H(xch), _D(domid), XEN_DOMCTL_SHADOW_OP_SET_ALLOCATION, - NULL, 0, &c_mb, 0, NULL); + &c_mb, 0); caml_leave_blocking_section(); if (ret != 0) failwith_xc(_H(xch)); --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1192,8 +1192,7 @@ static PyObject *pyxc_shadow_control(PyO &dom, &op) ) return NULL; - if ( xc_shadow_control(xc->xc_handle, dom, op, NULL, 0, NULL, 0, NULL) - < 0 ) + if ( xc_shadow_control(xc->xc_handle, dom, op, NULL, 0) < 0 ) return pyxc_error_to_exception(xc->xc_handle); Py_INCREF(zero); @@ -1208,7 +1207,7 @@ static PyObject *pyxc_shadow_mem_control int op; uint32_t dom; int mbarg = -1; - unsigned long mb; + unsigned int mb; static char *kwd_list[] = { "dom", "mb", NULL }; @@ -1223,7 +1222,7 @@ static PyObject *pyxc_shadow_mem_control mb = mbarg; op = XEN_DOMCTL_SHADOW_OP_SET_ALLOCATION; } - if ( xc_shadow_control(xc->xc_handle, dom, op, NULL, 0, &mb, 0, NULL) < 0 ) + if ( xc_shadow_control(xc->xc_handle, dom, op, &mb, 0) < 0 ) return pyxc_error_to_exception(xc->xc_handle); mbarg = mb;