[Xen-changelog] [xen master] ocaml/xc_get_cpu_featureset/arm: Return not implemented on ARM

[patchbot@xxxxxxx]

commit 397463f2bbb2b1bca235bfddde60aa6f1ffe6ab4
Author:     Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
AuthorDate: Fri Apr 29 02:38:33 2016 -0400
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Mon May 2 10:19:34 2016 +0100

    ocaml/xc_get_cpu_featureset/arm: Return not implemented on ARM
    
    ... as it is not implemented on it.
    
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Release-acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 tools/ocaml/libs/xc/xenctrl_stubs.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c 
b/tools/ocaml/libs/xc/xenctrl_stubs.c
index 5477df3..5e45551 100644
--- a/tools/ocaml/libs/xc/xenctrl_stubs.c
+++ b/tools/ocaml/libs/xc/xenctrl_stubs.c
@@ -1218,6 +1218,7 @@ CAMLprim value stub_xc_get_cpu_featureset(value xch, 
value idx)
 {
        CAMLparam2(xch, idx);
        CAMLlocal1(bitmap_val);
+#if defined(__i386__) || defined(__x86_64__)
 
        /* Safe, because of the global ocaml lock. */
        static uint32_t fs_len;
@@ -1245,7 +1246,9 @@ CAMLprim value stub_xc_get_cpu_featureset(value xch, 
value idx)
                for (i = 0; i < len; ++i)
                        Store_field(bitmap_val, i, caml_copy_int64(fs[i]));
        }
-
+#else
+       caml_failwith("xc_get_cpu_featureset: not implemented");
+#endif
        CAMLreturn(bitmap_val);
 }
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog