On 10/09/2019 15:43, Jan Beulich wrote: > On 09.09.2019 15:47, Andrew Cooper wrote: >> --- a/tools/ocaml/libs/xc/xenctrl_stubs.c >> +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c >> @@ -690,7 +690,8 @@ CAMLprim value stub_xc_physinfo(value xch) >> BUILD_BUG_ON(XEN_SYSCTL_PHYSCAP_hvm != (1u << 0)); >> BUILD_BUG_ON(XEN_SYSCTL_PHYSCAP_pv != (1u << 1)); >> BUILD_BUG_ON(XEN_SYSCTL_PHYSCAP_directio != (1u << 2)); >> - BUILD_BUG_ON(XEN_SYSCTL_PHYSCAP_MAX != >> XEN_SYSCTL_PHYSCAP_directio); >> + BUILD_BUG_ON(XEN_SYSCTL_PHYSCAP_hap != (1u << 3)); >> + BUILD_BUG_ON(XEN_SYSCTL_PHYSCAP_MAX != XEN_SYSCTL_PHYSCAP_hap); >> cap_list = c_bitmap_to_ocaml_list(c_physinfo.capabilities); >> >> physinfo = caml_alloc_tuple(10); > I'm afraid in particular this hunk doesn't apply anymore, and > I'm not confident that simply dropping it is the right answer. > I'd therefore like to ask for a proper re-base, or for someone > else to apply the result of folding these additions into the > base patch.
Roger is currently working on a rebase. There is also a logical error which requires the addition of CAP_SHADOW. ~Andrew _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
