From patchwork Fri Sep 1 16:08: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: 9934773 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 4AF0660216 for ; Fri, 1 Sep 2017 16:11:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FB761FFF9 for ; Fri, 1 Sep 2017 16:11:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DDCF27EE2; Fri, 1 Sep 2017 16:11:14 +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 C12781FFF9 for ; Fri, 1 Sep 2017 16:11:12 +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 1dnoVB-0004WG-B5; Fri, 01 Sep 2017 16:09:01 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnoVA-0004Vc-M6 for xen-devel@lists.xen.org; Fri, 01 Sep 2017 16:09:00 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id D7/C2-03093-C1689A95; Fri, 01 Sep 2017 16:09:00 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsUSuHLSQl3ptpW RBlveK1ss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBk/fvSzFJzmqlj3r4etgXEZZxcjFweLwCcm icPHXjB1MXJwSAjkSpw/WAJhikg8+Z8GUiIkcJBJ4uWcIyxdjJwcbAJKEnsPHmcESYgITGSUO Hj6HiNIgllAQeLF861MILawgLfElZ0/wWwWAVWJ3zfamUFsXgEjiR3r/7OD2BIC8hLnHtxmBl nGKWAsMX2LNUhYCKjk07qDLBMYeRcwMqxi1ChOLSpLLdI1NNBLKspMzyjJTczMAfLM9HJTi4s T01NzEpOK9ZLzczcxAoOBAQh2MB5/H3eIUZKDSUmUt9p/RaQQX1J+SmVGYnFGfFFpTmrxIUYZ Dg4lCd4NLSsjhQSLUtNTK9Iyc4BhCZOW4OBREuF91QyU5i0uSMwtzkyHSJ1iVJQS530I0icAk sgozYNrg8XCJUZZKWFeRqBDhHgKUotyM0tQ5V8xinMwKgnzloNM4cnMK4Gb/gpoMRPQ4n+fV4 AsLklESEk1MLrxfjvVk8LKxCxxKiWL133LFNbUbocjXlYyRzVdJTzmvW9c1/SY+6yOwAd1TzG G5uY9ojcmrdor9jz2S/AKHyWOXK/7BvyTxL2lm/7lLHPbVxRqUGZgqP1YeP2miZa3n4VbLszO fnZgYfqCM7FX9mQ5NK3OLv18VVLn69cEztM7szO8LbaeUmIpzkg01GIuKk4EAPz2+IGAAgAA X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-3.tower-27.messagelabs.com!1504282139!114311204!1 X-Originating-IP: [81.169.146.161] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE2MSA9PiA1ODk3MjY=\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE2MSA9PiA1ODk3MjY=\n,UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7265 invoked from network); 1 Sep 2017 16:08:59 -0000 Received: from mo4-p00-ob.smtp.rzone.de (HELO mo4-p00-ob.smtp.rzone.de) (81.169.146.161) by server-3.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 1 Sep 2017 16:08:59 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1504282139; s=domk; d=aepfle.de; h=References:In-Reply-To:Date:Subject:Cc:To:From; bh=6jbF4mxc6WzxOEI4lE4YgzzQPQZPHCwZuL8QYdOgXmY=; b=FxUPWz76xzcXpyM9ANm65EOpsqT7lwPZ6cRoqM5i8Uuhcj4vyV2nt3iXJlAXb5tT0w 3i2VuEyA0asTH0KnzoeVjwuccKGfWDOvctl+lOf12AmQjU8f9OgjPfWRh4bnRaGiA8+5 h5lj8wEXV9myZ+AhNOjTkYQVNuu2eaEy7MZk0= X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+yackYocTD1iAi8x+OWi/zfN1cLnAYQ78zGVeNvMqDZ9FAQjKEjEEJqcyOcu050Z/v+PVvA== X-RZG-CLASS-ID: mo00 Received: from sender ([2001:a61:10da:65ff:c0dd:e8ad:2be6:d9e2]) by smtp.strato.de (RZmta 41.4 AUTH) with ESMTPSA id q03d67t81G8okrl (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); Fri, 1 Sep 2017 18:08:50 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xen.org, Andrew Cooper , Ian Jackson , Wei Liu Date: Fri, 1 Sep 2017 18:08:41 +0200 Message-Id: <20170901160843.9057-2-olaf@aepfle.de> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170901160843.9057-1-olaf@aepfle.de> References: <20170901160843.9057-1-olaf@aepfle.de> Cc: Olaf Hering Subject: [Xen-devel] [PATCH v9 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