Re: [Xen-devel] [PATCH] ocaml: fix arm build

[Christian Lindig <christian.lindig@xxxxxxxxxx>]

This looks good to me. I don't think conditional compilation can be avoided 
here.

-- Christian

> On 17. Jan 2018, at 17:00, Wei Liu <wei.liu2@xxxxxxxxxx> wrote:
> 
> CC Ocaml experts
> 
> On Wed, Jan 17, 2018 at 04:43:54PM +0000, Wei Liu wrote:
>> ARM doesn't have emulation_flags in the arch_domainconfig.
>> 
>> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
>> ---
>> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
>> Cc: Julien Grall <julien.grall@xxxxxxx>
>> Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
>> ---
>> tools/ocaml/libs/xc/xenctrl_stubs.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>> 
>> diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c 
>> b/tools/ocaml/libs/xc/xenctrl_stubs.c
>> index 0b5a2361c0..fd128778b3 100644
>> --- a/tools/ocaml/libs/xc/xenctrl_stubs.c
>> +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c
>> @@ -175,11 +175,15 @@ CAMLprim value stub_xc_domain_create(value xch, value 
>> ssidref,
>>              caml_failwith("Unhandled: ARM");
>>              break;
>> 
>> +#if defined(__i386__) || defined(__x86_64__)
>>      case 1: /* X86 - emulation flags in the block */
>>              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);
>> }
>> -- 
>> 2.11.0
>> 


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel