* [Xen-devel] [PATCH] tools/ocaml: abi check: #include on x86 only
@ 2019-09-10 15:17 Ian Jackson
2019-09-10 15:20 ` Andrew Cooper
0 siblings, 1 reply; 2+ messages in thread
From: Ian Jackson @ 2019-09-10 15:17 UTC (permalink / raw)
To: xen-devel
Cc: Andrew Cooper, Ian Jackson, Christian Lindig, Wei Liu, David Scott
Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
tools/ocaml/libs/xc/xenctrl_stubs.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c
index f86ecc7b7e..3eff6dd8c2 100644
--- a/tools/ocaml/libs/xc/xenctrl_stubs.c
+++ b/tools/ocaml/libs/xc/xenctrl_stubs.c
@@ -135,7 +135,20 @@ static value c_bitmap_to_ocaml_list
CAMLparam0();
CAMLlocal2(list, tmp);
+#if defined(__i386__) || defined(__x86_64__)
+/*
+ * This check file contains a mixture of stuff, because it is
+ * generated from the whole of this xenctrl_stubs.c file (without
+ * regard to arch ifdefs) and the whole of xenctrl.ml (which does not
+ * have any arch ifdeffery). Currently, there is only x86 and
+ * arch-independent stuff, and there is no facility in the abi-check
+ * script for arch conditionals. So for now we make the checks
+ * effective on x86 only; this will suffice to defend even ARM
+ * because breaking changes to common code will break the build
+ * on x86 and not make it to master. This is a bit of a bodge.
+ */
#include "xenctrl_abi_check.h"
+#endif
list = tmp = Val_emptylist;
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Xen-devel] [PATCH] tools/ocaml: abi check: #include on x86 only
2019-09-10 15:17 [Xen-devel] [PATCH] tools/ocaml: abi check: #include on x86 only Ian Jackson
@ 2019-09-10 15:20 ` Andrew Cooper
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Cooper @ 2019-09-10 15:20 UTC (permalink / raw)
To: Ian Jackson, xen-devel; +Cc: Christian Lindig, Wei Liu, David Scott
On 10/09/2019 16:17, Ian Jackson wrote:
Subject +=
Spotted by Gitlab CI.
> Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-10 15:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-10 15:17 [Xen-devel] [PATCH] tools/ocaml: abi check: #include on x86 only Ian Jackson
2019-09-10 15:20 ` Andrew Cooper
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).