On 03/08/2023 11:15 am, Jan Beulich wrote: > On 13.07.2023 10:30, Edwin Török wrote: >> --- a/tools/ocaml/libs/xc/xenctrl_stubs.c >> +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c >> @@ -832,7 +832,7 @@ CAMLprim value physinfo_arch_caps(const xc_physinfo_t >> *info) >> >> tag = 1; /* tag x86 */ >> >> - arch_obj = Tag_cons; >> + arch_obj = Val_emptylist; >> >> #endif >> > Since, aiui, this also affects 4.17, but the patch as is doesn't apply > there, could you please provide a suitable backport of what went onto > the master branch?
diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index facb5615776b..7de2ff544428 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -748,7 +748,7 @@ CAMLprim value stub_xc_physinfo(value xch) Store_field(physinfo, 9, Val_int(c_physinfo.max_cpu_id + 1)); #if defined(__i386__) || defined(__x86_64__) - arch_cap_list = Tag_cons; + arch_cap_list = Val_emptylist; arch_cap_flags_tag = 1; /* tag x86 */ #else This logic got factored out of stub_xc_physinfo() into the new physinfo_arch_caps() as part of the ARM SVE work in 4.18. ~Andrew
