From patchwork Thu Aug 24 10:14:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 9919729 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 AFB0060353 for ; Thu, 24 Aug 2017 10:17:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A178C28B66 for ; Thu, 24 Aug 2017 10:17:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94FD828BD3; Thu, 24 Aug 2017 10:17:08 +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 8ED8328B66 for ; Thu, 24 Aug 2017 10:17:07 +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 1dkpAJ-0002kx-Q1; Thu, 24 Aug 2017 10:15:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dkpAI-0002kW-1r for xen-devel@lists.xen.org; Thu, 24 Aug 2017 10:15:06 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 68/A4-01996-927AE995; Thu, 24 Aug 2017 10:15:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRWlGSWpSXmKPExsUSuHLSYl2N5fM iDY4dMbRY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDPe3zQvWMxV8Xz1dpYGxibOLkYuDhaBT0wS 3w7MZe5i5OCQEMiUWDYvDMIUkXjyPw2kREjgIJPErJOL2LsYOTnYBJQk9h48zgiSEBGYyChx8 PQ9RpAEs4CCxIvnW5lAbGEBb4kDk66DNbAIqEpM6VzIBmLzChhLPF7QDxaXEJCX6N+xHKyeU8 BE4tzC/WC2EFDN9m/XWSYw8i5gZFjFqF6cWlSWWqRropdUlJmeUZKbmJmja2hgqpebWlycmJ6 ak5hUrJecn7uJERgKDECwg/FWn/MhRkkOJiVR3ifS8yKF+JLyUyozEosz4otKc1KLDzHKcHAo SfDOWgqUEyxKTU+tSMvMAQYlTFqCg0dJhPcwSJq3uCAxtzgzHSJ1ilFRSpx3LUhCACSRUZoH1 waLhEuMslLCvIxAhwjxFKQW5WaWoMq/YhTnYFQS5r0GMoUnM68EbvoroMVMQIsnnZgDsrgkES El1cDo+sRxX5aD3dRnjEoLRCdVfr+/ZsXF3Ufvcfm+NJWRPrCrf5WUSvJeMZvtd3xDLxc7fjh +wf5H4AZztt4tizJOmvib9Qkv3uo6+4r8nzXC3nPFCjPbSzUYXqkVHwo+e/ffetnzmqUJmgs9 JnYIBfzfPsWgXUEl/2LS7G0XRA4Lz30u8u+RFucFJZbijERDLeai4kQAzjBg638CAAA= X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-7.tower-206.messagelabs.com!1503569704!105765533!1 X-Originating-IP: [81.169.146.163] 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 12696 invoked from network); 24 Aug 2017 10:15:04 -0000 Received: from mo4-p00-ob.smtp.rzone.de (HELO mo4-p00-ob.smtp.rzone.de) (81.169.146.163) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 24 Aug 2017 10:15:04 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1503569704; s=domk; d=aepfle.de; h=References:In-Reply-To:Date:Subject:Cc:To:From; bh=dA3QyoNKyE6FtSu4+zWQQ35RE9laB0lWKk/1UJ7g+jM=; b=HTb2xCmWWYO958rgT0osV0USlYq6HudR5Y99UTWN0B/CX2g3SeRW+Z3dfIfV9vNtCY T87Knzqj1CI4uQCVSpsANtEwIM56lFE/tibDRGePqpvzmiC8qIdbH9tjHkET+pfTEN0h jZ4TcONumikTnTk77gQykruAlB+IYBNnegUtE= X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+yackYocTD1iAi8x+OWi/zfN1cLnAYQz4mzReZKAqPT2tb6Nx5EL7HQvAw3tBGHnS2eB9 X-RZG-CLASS-ID: mo00 Received: from sender ([2001:a61:3430:dff:75aa:c36f:225e:fcee]) by smtp.strato.de (RZmta 41.4 AUTH) with ESMTPSA id q03d67t7OAF0AJV (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, 24 Aug 2017 12:15:00 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xen.org, Andrew Cooper , Ian Jackson , Wei Liu Date: Thu, 24 Aug 2017 12:14:41 +0200 Message-Id: <20170824101443.31345-2-olaf@aepfle.de> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170824101443.31345-1-olaf@aepfle.de> References: <20170824101443.31345-1-olaf@aepfle.de> Cc: Olaf Hering Subject: [Xen-devel] [PATCH v3 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