From mboxrd@z Thu Jan 1 00:00:00 1970 From: Doug Goldstein Subject: Re: [PATCH v2 1/2] xsm: only define XSM_MAGIC in xsm.h Date: Tue, 22 Mar 2016 13:31:10 -0500 Message-ID: <56F18F6E.6080701@cardoe.com> References: <1458155923-15648-1-git-send-email-cardoe@cardoe.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6287754494428321366==" Return-path: In-Reply-To: <1458155923-15648-1-git-send-email-cardoe@cardoe.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Daniel De Graaf List-Id: xen-devel@lists.xenproject.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============6287754494428321366== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="xlMfl9lsOlD5V5rKnHnkwKn4OMhb7el0u" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --xlMfl9lsOlD5V5rKnHnkwKn4OMhb7el0u Content-Type: multipart/mixed; boundary="7nHQ6Nl61iaNRrBSQjrJEBff0AM9qqHEL" From: Doug Goldstein To: xen-devel@lists.xen.org Cc: Daniel De Graaf Message-ID: <56F18F6E.6080701@cardoe.com> Subject: Re: [PATCH v2 1/2] xsm: only define XSM_MAGIC in xsm.h References: <1458155923-15648-1-git-send-email-cardoe@cardoe.com> In-Reply-To: <1458155923-15648-1-git-send-email-cardoe@cardoe.com> --7nHQ6Nl61iaNRrBSQjrJEBff0AM9qqHEL Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 3/16/16 2:18 PM, Doug Goldstein wrote: > 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 >=20 > Signed-off-by: Doug Goldstein > --- > CC: Daniel De Graaf > --- > xen/include/xen/config.h | 1 - > xen/include/xsm/xsm.h | 7 +++++-- > 2 files changed, 5 insertions(+), 3 deletions(-) >=20 > 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__) > =20 > #ifdef CONFIG_FLASK > -#define XSM_MAGIC 0xf97cff8c > /* Maintain statistics on the access vector cache */ > #define FLASK_AVC_STATS 1 > #endif > 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); > =20 > /* policy magic number (defined by XSM_MAGIC) */ > typedef u32 xsm_magic_t; > -#ifndef XSM_MAGIC > -#define XSM_MAGIC 0x00000000 > + > +#ifdef CONFIG_FLASK > +#define XSM_MAGIC 0xf97cff8c > +#else > +#define XSM_MAGIC 0x0 > #endif > =20 > /* These annotations are used by callers and in dummy.h to document th= e >=20 ping? --=20 Doug Goldstein --7nHQ6Nl61iaNRrBSQjrJEBff0AM9qqHEL-- --xlMfl9lsOlD5V5rKnHnkwKn4OMhb7el0u Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJW8Y9xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNTM5MEQ2RTNFMTkyNzlCNzVDMzIwOTVB MkJDMDNEQzg3RUQxQkQ0AAoJEKK8A9yH7RvUQuAP/A/O0zQQe0bn336pk7or3Q8l WvUQmcUG7X9f6XCeSkhGhu1EsTbszrmx/zM98W8ERXp6rYdPEyouRyWzwJOW9cmE tPmlN6BfkdMrUt67xW/q6oSw+6dtos5HX6hpAoIVlSDAGx1EOWGqYiClLc0HXEv7 GpCUO082XLJkRxDHq4uJpyQtL6lf3EokBPzr/e1cUDmvd0bg/YA69qnopMx1Nowl 7rYCZwGSbWhmdeX3QS1p3SCAO69K0kUi9ak7Q3tIDIWNrTKtQG4bzRpcSZJYN9gp Mw+stmC5KwTI2HQQGTbwiIDNUJS9JG5xbwEPvlSUIWHMrhotN+LQ98p0wDsiTtjo r3wV8TMo6M1/z4YyTts27/f8HwmfGLGhktZeujBKy5K7n9VNbShtX587Idrnqgtq b4Rj/48nFDlcCJchusth1ZjL8iZes/LtIN+UjHJSlgyR87B69TPKlbn/lHStuGP3 xW3EJyRIGvp8cnmhyOGJDamj39xhgSdBsJQHt7C3A4wQcoJ2stVvgKqMbtPZf6kW 0SlcGXsQ2j9RfwkguH/1lXWvL3DqKL0hVJNlAmdw77I6FpHdMNhYwk+PFBQ+t56v PdxBtj1zCwQvmyyq0yC/EMD2e2qVeKueOzvyMpJqtDbqyiDSiXhpwXkWCDoAP4iJ CFmZEdFA+N2f8/J8NsJp =HZzV -----END PGP SIGNATURE----- --xlMfl9lsOlD5V5rKnHnkwKn4OMhb7el0u-- --===============6287754494428321366== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9y Zy94ZW4tZGV2ZWwK --===============6287754494428321366==--