On 12.12.2025 05:02, Penny Zheng wrote: > --- a/xen/arch/x86/include/asm/paging.h > +++ b/xen/arch/x86/include/asm/paging.h > @@ -57,7 +57,8 @@ > #endif > #if defined(CONFIG_PAGING) && !defined(CONFIG_PV_SHIM_EXCLUSIVE) > /* Enable log dirty mode */ > -#define PG_log_dirty (XEN_DOMCTL_SHADOW_ENABLE_LOG_DIRTY << PG_mode_shift) > +#define PG_log_dirty IS_ENABLED(CONFIG_MGMT_HYPERCALLS) && \ > + (XEN_DOMCTL_SHADOW_ENABLE_LOG_DIRTY << PG_mode_shift)
This needs wrapping in parentheses, at which point indentation of the 2nd line will then also be correct. > --- a/xen/include/hypercall-defs.c > +++ b/xen/include/hypercall-defs.c > @@ -196,10 +196,10 @@ dm_op(domid_t domid, unsigned int nr_bufs, > xen_dm_op_buf_t *bufs) > #endif > #ifdef CONFIG_MGMT_HYPERCALLS > sysctl(xen_sysctl_t *u_sysctl) > -#endif > #if defined(CONFIG_X86) && defined(CONFIG_PAGING) && > !defined(CONFIG_PV_SHIM_EXCLUSIVE) > paging_domctl_cont(xen_domctl_t *u_domctl) > #endif > +#endif /* CONFIG_MGMT_HYPERCALLS */ please (as soon as #if-s nest or there's other complexity). > @@ -279,6 +279,9 @@ hvm_op do do do > do do > #endif > #ifdef CONFIG_MGMT_HYPERCALLS > sysctl do do do do do > +#if defined(CONFIG_X86) && defined(CONFIG_PAGING) && > !defined(CONFIG_PV_SHIM_EXCLUSIVE) > +paging_domctl_cont do do do do - > +#endif > #endif > #ifndef CONFIG_PV_SHIM_EXCLUSIVE > domctl do do do do do Hmm, paging_domctl_cont ahead of domctl isn't very nice. Of course much depends on how all of this will look by the end of the series. Jan
