From patchwork Thu Aug 31 09:37:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 9931669 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E5F6C60362 for ; Thu, 31 Aug 2017 09:40:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7B2D288D0 for ; Thu, 31 Aug 2017 09:40:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC9C6288D4; Thu, 31 Aug 2017 09:40:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EBA25288D3 for ; Thu, 31 Aug 2017 09:40:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnLvX-00079L-8v; Thu, 31 Aug 2017 09:38:19 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnLvW-00077D-3D for xen-devel@lists.xen.org; Thu, 31 Aug 2017 09:38:18 +0000 Received: from [193.109.254.147] by server-5.bemta-6.messagelabs.com id 58/8A-03454-909D7A95; Thu, 31 Aug 2017 09:38:17 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsUSuHLSDV2Om8s jDd4cNbZY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDN+/OhnKTjNVbHuXw9bA+Myzi5GLg4WgU9M EjsffGPsYuTgkBAIlVh+xRbCFJF48j8NpERI4CSTRO+lQ0xdjJwcbAJKEnsPHmcESYgITGSUO Hj6HiNIgllAQeLF861gRcIC3hLbjuxgBhnEIqAqcfhDPkiYV8BY4tPkLWAlEgLyEuce3GYGsT kFTCR+3X/PAmILAdU8W3CefQIj7wJGhlWMGsWpRWWpRbrGxnpJRZnpGSW5iZk5uoYGZnq5qcX FiempOYlJxXrJ+bmbGIHBwAAEOxh3rg88xCjJwaQkyht2YXmkEF9SfkplRmJxRnxRaU5q8SFG GQ4OJQneT9eBcoJFqempFWmZOcCwhElLcPAoifCuAknzFhck5hZnpkOkTjEqSonzpoEkBEASG aV5cG2wWLjEKCslzMsIdIgQT0FqUW5mCar8K0ZxDkYlYd4vIFN4MvNK4Ka/AlrMBLQ41mspyO KSRISUVAOjjt3LcEVPsa6SCq20nw7i3zoEKh8obXjgMak13axG31vtnO9VhbJNhz6fM5cqzrs WseyQV+gp2Y41Xoc23pe69ttpHSeffo5yivDva8cS+dL6/FOfHrDsd715+vu/UxG1Trb++gGW 8ybwCtx9aPJzjSGT3/olldf4F87+M+nLwhOXTGX3PJFQYinOSDTUYi4qTgQA//4c7YACAAA= X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-14.tower-27.messagelabs.com!1504172296!101893486!1 X-Originating-IP: [81.169.146.216] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14788 invoked from network); 31 Aug 2017 09:38:16 -0000 Received: from mo4-p00-ob.smtp.rzone.de (HELO mo4-p00-ob.smtp.rzone.de) (81.169.146.216) by server-14.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 31 Aug 2017 09:38:16 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1504172296; s=domk; d=aepfle.de; h=References:In-Reply-To:Date:Subject:Cc:To:From; bh=6jbF4mxc6WzxOEI4lE4YgzzQPQZPHCwZuL8QYdOgXmY=; b=jTHdaaxx81Vjp+L7wM6BeFGqkxEs/Ip8cNeJqbgt+Kty5tBYxXWdOrAjIZi3d0gZJu rsSe8Huxa7m4SI5S6qz3XQrojySFmRrXeBhTQO0Ln0sFHRUXMZusVuhj2VpBaCKa6LJV MTtMugvnrs0TjVAiwuievIGNTTSN54EPMrY30= X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+yackYocTD1iAi8x+OWi5z/J1IL7CYRxLEwpkY2XtLzyRUcY= X-RZG-CLASS-ID: mo00 Received: from sender (nat.nue.novell.com [IPv6:2620:113:80c0:5::2222]) by smtp.strato.de (RZmta 41.4 AUTH) with ESMTPSA id t0b90bt7V9c9UjJ (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Thu, 31 Aug 2017 11:38:09 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xen.org, Andrew Cooper , Ian Jackson , Wei Liu Date: Thu, 31 Aug 2017 11:37:58 +0200 Message-Id: <20170831093800.23943-2-olaf@aepfle.de> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170831093800.23943-1-olaf@aepfle.de> References: <20170831093800.23943-1-olaf@aepfle.de> Cc: Olaf Hering Subject: [Xen-devel] [PATCH v7 1/3] tools/libxc: move SUPERPAGE macros to common header X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The macros SUPERPAGE_2MB_SHIFT and SUPERPAGE_1GB_SHIFT will be used by other code in libxc. Move the macros to a header file. Signed-off-by: Olaf Hering Acked-by: Wei Liu --- tools/libxc/xc_dom_x86.c | 5 ----- tools/libxc/xc_private.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index cb68efcbd3..5aff5cad58 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -43,11 +43,6 @@ #define SUPERPAGE_BATCH_SIZE 512 -#define SUPERPAGE_2MB_SHIFT 9 -#define SUPERPAGE_2MB_NR_PFNS (1UL << SUPERPAGE_2MB_SHIFT) -#define SUPERPAGE_1GB_SHIFT 18 -#define SUPERPAGE_1GB_NR_PFNS (1UL << SUPERPAGE_1GB_SHIFT) - #define X86_CR0_PE 0x01 #define X86_CR0_ET 0x10 diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index 1c27b0fded..d581f850b0 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -66,6 +66,11 @@ struct iovec { #define DECLARE_FLASK_OP struct xen_flask_op op #define DECLARE_PLATFORM_OP struct xen_platform_op platform_op +#define SUPERPAGE_2MB_SHIFT 9 +#define SUPERPAGE_2MB_NR_PFNS (1UL << SUPERPAGE_2MB_SHIFT) +#define SUPERPAGE_1GB_SHIFT 18 +#define SUPERPAGE_1GB_NR_PFNS (1UL << SUPERPAGE_1GB_SHIFT) + #undef PAGE_SHIFT #undef PAGE_SIZE #undef PAGE_MASK