xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Doug Goldstein <cardoe@cardoe.com>
To: xen-devel@lists.xen.org
Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>,
	Doug Goldstein <cardoe@cardoe.com>
Subject: [PATCH v2 1/2] xsm: only define XSM_MAGIC in xsm.h
Date: Wed, 16 Mar 2016 14:18:42 -0500	[thread overview]
Message-ID: <1458155923-15648-1-git-send-email-cardoe@cardoe.com> (raw)

Rather than have XSM_MAGIC set in the global xen/config.h and set in
xsm.h if it's unset, just set it once in xsm.h since its only used in
files that already include xsm.h

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
CC: Daniel De Graaf <dgdegra@tycho.nsa.gov>
 xen/include/xen/config.h | 1 -
 xen/include/xsm/xsm.h    | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
index 96f5539..3f8c53d 100644
--- a/xen/include/xen/config.h
+++ b/xen/include/xen/config.h
@@ -79,7 +79,6 @@
 #define STR(...) __STR(__VA_ARGS__)
-#define XSM_MAGIC 0xf97cff8c
 /* Maintain statistics on the access vector cache */
 #define FLASK_AVC_STATS 1
diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index 3afed70..37a102a 100644
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -23,8 +23,11 @@ DEFINE_XEN_GUEST_HANDLE(xsm_op_t);
 /* policy magic number (defined by XSM_MAGIC) */
 typedef u32 xsm_magic_t;
-#ifndef XSM_MAGIC
-#define XSM_MAGIC 0x00000000
+#define XSM_MAGIC 0xf97cff8c
+#define XSM_MAGIC 0x0
 /* These annotations are used by callers and in dummy.h to document the

Xen-devel mailing list

             reply	other threads:[~2016-03-16 19:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-16 19:18 Doug Goldstein [this message]
2016-03-16 19:18 ` [PATCH v2 2/2] xsm: move FLASK_AVC_STATS to Kconfig Doug Goldstein
2016-03-22 18:31 ` [PATCH v2 1/2] xsm: only define XSM_MAGIC in xsm.h Doug Goldstein
2016-03-25 15:07 ` Daniel De Graaf
2016-03-25 15:30   ` Konrad Rzeszutek Wilk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458155923-15648-1-git-send-email-cardoe@cardoe.com \
    --to=cardoe@cardoe.com \
    --cc=dgdegra@tycho.nsa.gov \
    --cc=xen-devel@lists.xen.org \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).