From patchwork Tue Feb 16 13:02:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 8325261 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3B6B49F399 for ; Tue, 16 Feb 2016 13:05:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C84220160 for ; Tue, 16 Feb 2016 13:05:55 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 985C6201C7 for ; Tue, 16 Feb 2016 13:05:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aVfHE-0002ap-1o; Tue, 16 Feb 2016 13:02:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aVfHB-0002aD-LT for xen-devel@lists.xen.org; Tue, 16 Feb 2016 13:02:45 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 6B/A5-25438-4FD13C65; Tue, 16 Feb 2016 13:02:44 +0000 X-Env-Sender: jgross@suse.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1455627764!24237563!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35272 invoked from network); 16 Feb 2016 13:02:44 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-15.tower-27.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 16 Feb 2016 13:02:44 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 42093AC47; Tue, 16 Feb 2016 13:02:43 +0000 (UTC) From: Juergen Gross To: keir@xen.org, Ian.Campbell@citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, david.vrabel@citrix.com, jbeulich@suse.com, xen-devel@lists.xen.org Date: Tue, 16 Feb 2016 14:02:40 +0100 Message-Id: <1455627760-19917-1-git-send-email-jgross@suse.com> X-Mailer: git-send-email 2.6.2 Cc: Juergen Gross Subject: [Xen-devel] [PATCH] xen: make some constants usable for assembler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some constants defined in xen/include/public/xen.h are not usable in assembler sources as they are either defined with "U" or "UL" suffixes or they are inside #ifndef __ASSEMBLY__ areas. Change this as grub2 could make use of those definitions. Signed-off-by: Juergen Gross --- xen/include/public/xen.h | 58 ++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 7b629b1..e29a12a 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -52,6 +52,19 @@ DEFINE_XEN_GUEST_HANDLE(void); DEFINE_XEN_GUEST_HANDLE(uint64_t); DEFINE_XEN_GUEST_HANDLE(xen_pfn_t); DEFINE_XEN_GUEST_HANDLE(xen_ulong_t); + +/* Turn a plain number into a C unsigned (long) constant. */ +#define __mk_unsigned(x) x ## U +#define __mk_unsigned_long(x) x ## UL +#define mk_unsigned(x) __mk_unsigned(x) +#define mk_unsigned_long(x) __mk_unsigned_long(x) + +#else + +/* In assembly code we cannot use C numeric constant suffixes. */ +#define mk_unsigned(x) x +#define mk_unsigned_long(x) x + #endif /* @@ -451,13 +464,13 @@ DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); /* When specifying UVMF_MULTI, also OR in a pointer to a CPU bitmap. */ /* UVMF_LOCAL is merely UVMF_MULTI with a NULL bitmap pointer. */ /* ` enum uvm_flags { */ -#define UVMF_NONE (0UL<<0) /* No flushing at all. */ -#define UVMF_TLB_FLUSH (1UL<<0) /* Flush entire TLB(s). */ -#define UVMF_INVLPG (2UL<<0) /* Flush only one entry. */ -#define UVMF_FLUSHTYPE_MASK (3UL<<0) -#define UVMF_MULTI (0UL<<2) /* Flush subset of TLBs. */ -#define UVMF_LOCAL (0UL<<2) /* Flush local TLB. */ -#define UVMF_ALL (1UL<<2) /* Flush all TLBs. */ +#define UVMF_NONE mk_unsigned_long(0<<0) /* No flushing at all. */ +#define UVMF_TLB_FLUSH mk_unsigned_long(1<<0) /* Flush entire TLB(s). */ +#define UVMF_INVLPG mk_unsigned_long(2<<0) /* Flush only one entry. */ +#define UVMF_FLUSHTYPE_MASK mk_unsigned_long(3<<0) +#define UVMF_MULTI mk_unsigned_long(0<<2) /* Flush subset of TLBs. */ +#define UVMF_LOCAL mk_unsigned_long(0<<2) /* Flush local TLB. */ +#define UVMF_ALL mk_unsigned_long(1<<2) /* Flush all TLBs. */ /* ` } */ /* @@ -504,15 +517,11 @@ DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); #define MAX_VMASST_TYPE 3 #endif -#ifndef __ASSEMBLY__ - -typedef uint16_t domid_t; - /* Domain ids >= DOMID_FIRST_RESERVED cannot be used for ordinary domains. */ -#define DOMID_FIRST_RESERVED (0x7FF0U) +#define DOMID_FIRST_RESERVED mk_unsigned(0x7FF0) /* DOMID_SELF is used in certain contexts to refer to oneself. */ -#define DOMID_SELF (0x7FF0U) +#define DOMID_SELF mk_unsigned(0x7FF0) /* * DOMID_IO is used to restrict page-table updates to mapping I/O memory. @@ -523,7 +532,7 @@ typedef uint16_t domid_t; * This only makes sense in MMUEXT_SET_FOREIGNDOM, but in that context can * be specified by any calling domain. */ -#define DOMID_IO (0x7FF1U) +#define DOMID_IO mk_unsigned(0x7FF1) /* * DOMID_XEN is used to allow privileged domains to map restricted parts of @@ -531,17 +540,21 @@ typedef uint16_t domid_t; * This only makes sense in MMUEXT_SET_FOREIGNDOM, and is only permitted if * the caller is privileged. */ -#define DOMID_XEN (0x7FF2U) +#define DOMID_XEN mk_unsigned(0x7FF2) /* * DOMID_COW is used as the owner of sharable pages */ -#define DOMID_COW (0x7FF3U) +#define DOMID_COW mk_unsigned(0x7FF3) /* DOMID_INVALID is used to identify pages with unknown owner. */ -#define DOMID_INVALID (0x7FF4U) +#define DOMID_INVALID mk_unsigned(0x7FF4) /* Idle domain. */ -#define DOMID_IDLE (0x7FFFU) +#define DOMID_IDLE mk_unsigned(0x7FFF) + +#ifndef __ASSEMBLY__ + +typedef uint16_t domid_t; /* * Send an array of these to HYPERVISOR_mmu_update(). @@ -901,20 +914,11 @@ typedef struct dom0_vga_console_info { typedef uint8_t xen_domain_handle_t[16]; -/* Turn a plain number into a C unsigned long constant. */ -#define __mk_unsigned_long(x) x ## UL -#define mk_unsigned_long(x) __mk_unsigned_long(x) - __DEFINE_XEN_GUEST_HANDLE(uint8, uint8_t); __DEFINE_XEN_GUEST_HANDLE(uint16, uint16_t); __DEFINE_XEN_GUEST_HANDLE(uint32, uint32_t); __DEFINE_XEN_GUEST_HANDLE(uint64, uint64_t); -#else /* __ASSEMBLY__ */ - -/* In assembly code we cannot use C numeric constant suffixes. */ -#define mk_unsigned_long(x) x - #endif /* !__ASSEMBLY__ */ /* Default definitions for macros used by domctl/sysctl. */