From patchwork Wed Oct 11 14:21:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 9999771 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 C25816037F for ; Wed, 11 Oct 2017 14:24:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0FE02897D for ; Wed, 11 Oct 2017 14:24:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5CD528A59; Wed, 11 Oct 2017 14:24:01 +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 C66162897D for ; Wed, 11 Oct 2017 14:24:00 +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 1e2HtE-0005Nd-AW; Wed, 11 Oct 2017 14:21:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2HtD-0005Mh-7J for xen-devel@lists.xen.org; Wed, 11 Oct 2017 14:21:39 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id EE/84-28075-2F82ED95; Wed, 11 Oct 2017 14:21:38 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsUSuHLSIt2PGvc iDXYct7RY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDN+/OhnKTjNVbHuXw9bA+Myzi5GLg4WgU9M Erc+LWHpYuTkkBAolNi3cwpzFyMHkC0i8eR/GkhYSOAkk8TLu3EgNpuAksTeg8cZQXpFBCYyS hw8fY8RJMEsoCDx4vlWJhBbWMBH4srL42A2i4CqxJtLf9hAbF4BY4njDSuZIHbJS7xfcJ8RZB engInEgk8+ELuMJbomfmWdwMi7gJFhFaNGcWpRWWqRrpGRXlJRZnpGSW5iZo6uoYGxXm5qcXF iempOYlKxXnJ+7iZGYDDUMzAw7mCcesLvEKMkB5OSKO/153cjhfiS8lMqMxKLM+KLSnNSiw8x ynBwKEnwtqvfixQSLEpNT61Iy8wBhiVMWoKDR0mE9zBImre4IDG3ODMdInWKUZej4+bdP0xCL Hn5ealS4rxnQIoEQIoySvPgRsBi5BKjrJQwLyMDA4MQT0FqUW5mCar8K0ZxDkYlYV45YMQJ8W TmlcBtegV0BBPQEaJpd0COKElESEk1MOrP9U1qv6JrsPzf2dvna0JeNM0LMctNOPqxttvizs2 Dv6SXHDp9dZ9zH/dzPs0FnPJWztyxkTItd54l3zkb+CF0d2zZ3MNcM7TLSp43Tj95IE+1OHX2 HPkXOyZbOuscsuS16hJoFLxlp/w+deHm2LtL5oXPNPrss+ntZLbwIJUrOQ99prXMea/EUpyRa KjFXFScCADa2pi+jAIAAA== X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-5.tower-31.messagelabs.com!1507731697!106579825!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 6906 invoked from network); 11 Oct 2017 14:21:37 -0000 Received: from mo4-p00-ob.smtp.rzone.de (HELO mo4-p00-ob.smtp.rzone.de) (81.169.146.162) by server-5.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 11 Oct 2017 14:21:37 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1507731697; s=domk; d=aepfle.de; h=References:In-Reply-To:Date:Subject:Cc:To:From; bh=6jbF4mxc6WzxOEI4lE4YgzzQPQZPHCwZuL8QYdOgXmY=; b=qk1d4Q3jSJm4zePdagfvzcDSc6M5oIrq3ldK4j7IXuU3RQtukDeS4kJzdzDhNM3yVf piEthGdghm947fvAUNavioFFjLA8NmonKKaZnM6W55vmgDrUW9WgxdvNgEDA/vA5dvt1 vLwNe/VWUUSpztbgyEHxJ5JlZGU6PsEKcw5nM= X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QDiZbDmui9LcK/RdXt7GAQpV1nK0XLk0Fbzd1FwkwtpDETnMYPl+awhe1GfLaCoLDva5dK X-RZG-CLASS-ID: mo00 Received: from sender ([2001:a61:3425:72ff:16fc:b7d5:a2e5:4df1]) by smtp.strato.de (RZmta 42.5 AUTH) with ESMTPSA id g0af76t9BELV1mU (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Wed, 11 Oct 2017 16:21:31 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xen.org, Andrew Cooper , Ian Jackson , Wei Liu Date: Wed, 11 Oct 2017 16:21:22 +0200 Message-Id: <20171011142124.22052-2-olaf@aepfle.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171011142124.22052-1-olaf@aepfle.de> References: <20171011142124.22052-1-olaf@aepfle.de> Cc: Olaf Hering Subject: [Xen-devel] [PATCH v10 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