From: Wei Liu Date: Wed, 17 Jan 2018 16:43:54 +0000 (+0000) Subject: ocaml: fix arm build X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~753 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=81838c9067ab7f4b89d33f90a71225ffff9800ba;p=xen.git ocaml: fix arm build ARM doesn't have emulation_flags in the arch_domainconfig. Signed-off-by: Wei Liu Reviewed-by: Julien Grall --- diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 0b5a2361c0..dd6000caa3 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -176,10 +176,14 @@ CAMLprim value stub_xc_domain_create(value xch, value ssidref, break; case 1: /* X86 - emulation flags in the block */ +#if defined(__i386__) || defined(__x86_64__) for (l = Field(Field(domconfig, 0), 0); l != Val_none; l = Field(l, 1)) config.emulation_flags |= 1u << Int_val(Field(l, 0)); +#else + caml_failwith("Unhandled: x86"); +#endif break; default: @@ -320,6 +324,7 @@ static value alloc_domaininfo(xc_domaininfo_t * info) Store_field(result, 15, tmp); +#if defined(__i386__) || defined(__x86_64__) /* emulation_flags: x86_arch_emulation_flags list; */ tmp = emul_list = Val_emptylist; for (i = 0; i < 10; i++) { @@ -341,6 +346,7 @@ static value alloc_domaininfo(xc_domaininfo_t * info) Store_field(arch_config, 0, x86_arch_config); Store_field(result, 16, arch_config); +#endif CAMLreturn(result); }