From patchwork Sat Aug 26 10:33:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 9923407 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 C5774602BD for ; Sat, 26 Aug 2017 10:36:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C615E285A7 for ; Sat, 26 Aug 2017 10:36:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA445285C5; Sat, 26 Aug 2017 10:36:09 +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 646C3285A7 for ; Sat, 26 Aug 2017 10:36:09 +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 1dlYPX-00064e-Uc; Sat, 26 Aug 2017 10:33:51 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dlYPV-000647-SF for xen-devel@lists.xen.org; Sat, 26 Aug 2017 10:33:49 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id 7A/79-03612-D8E41A95; Sat, 26 Aug 2017 10:33:49 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsUSuHLSIt0ev4W RBu8fa1gs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBk/fvSzFJzmqlj3r4etgXEZZxcjFweLwCcm ibVNa1m7GDk4JAQyJZbNC4MwRSSe/E8DKRESOMgkMfF2B1AJJwebgJLE3oPHGUESIgITGSUOn r7HCJJgFlCQePF8KxOILSzgLTFn2m0WEJtFQFVizrYDYDavgLHEzfmbwGokBOQl+ncsB7M5BU wkthybCbZACKimff5S5gmMvAsYGVYxqhenFpWlFuma6yUVZaZnlOQmZuboGhqY6eWmFhcnpqf mJCYV6yXn525iBAYDAxDsYJx52f8QoyQHk5Ior4PGwkghvqT8lMqMxOKM+KLSnNTiQ4wyHBxK ErxPfYFygkWp6akVaZk5wLCESUtw8CiJ8O4BSfMWFyTmFmemQ6ROMSpKifMuAUkIgCQySvPg2 mCxcIlRVkqYlxHoECGegtSi3MwSVPlXjOIcjErCvAdApvBk5pXATX8FtJgJaLGiINjikkSElF QD496OyM26hZ+jDA09t313yT45yfXBXZWf6R9rDrqret71YuM7c1SmWr7tZ01yQn3o7wmlVm9 nNTdzeLMpWN+3SNn+8WpZ3emNV/srDrt/5T2l8kNInOH3qRm3RT0Wnl8huO/eESYTvRchuwU3 7yhoPeZyq2OXzY66n0E8TY/WP1R7+TXExSVmsxJLcUaioRZzUXEiADfhMFaAAgAA X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-4.tower-21.messagelabs.com!1503743628!73496320!1 X-Originating-IP: [81.169.146.162] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE2MiA9PiA1ODg3NDY=\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE2MiA9PiA1ODg3NDY=\n,UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18203 invoked from network); 26 Aug 2017 10:33:48 -0000 Received: from mo4-p00-ob.smtp.rzone.de (HELO mo4-p00-ob.smtp.rzone.de) (81.169.146.162) by server-4.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 26 Aug 2017 10:33:48 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1503743628; s=domk; d=aepfle.de; h=References:In-Reply-To:Date:Subject:Cc:To:From; bh=6jbF4mxc6WzxOEI4lE4YgzzQPQZPHCwZuL8QYdOgXmY=; b=RhXojvxwAT3ZqveQz9ot+vkuq+K0WYGDVxUDT8Li1+Q54SiVEsxxdwQrVrxavX69CC NBhHaqSgpnAZVVcFOTFO+mYKlcsdO32QvM3XlVA0/rQw+uO70UElyb+N3lQWO/2kQofr goW9tGrWI0iFNnQZjdKxouOa26Bj1eIkxjgqQ= 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 L0adebt7QAXdT9Y (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); Sat, 26 Aug 2017 12:33:39 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xen.org, Andrew Cooper , Ian Jackson , Wei Liu Date: Sat, 26 Aug 2017 12:33:30 +0200 Message-Id: <20170826103332.24570-2-olaf@aepfle.de> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170826103332.24570-1-olaf@aepfle.de> References: <20170826103332.24570-1-olaf@aepfle.de> Cc: Olaf Hering Subject: [Xen-devel] [PATCH v6 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