Fix a few randconfig build breakages that started appearing after the
SYSCTL patch series.

First, reintroduce depends on !PV_SHIM_EXCLUSIVE for HVM, as it was
before 568f806cba4c.

Also, add depends on !PV_SHIM_EXCLUSIVE for SYSCTL, that way the
behavior goes back to what it was before 34317c508294.

Fixes: 568f806cba4c ("xen/x86: remove "depends on !PV_SHIM_EXCLUSIVE"")
Fixes: 34317c508294 ("xen/sysctl: wrap around sysctl hypercall")
Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
CC: jbeulich@suse.com
CC: andrew.cooper3@citrix.com
CC: roger.pau@citrix.com
CC: Penny.Zheng@amd.com
---
 xen/arch/x86/hvm/Kconfig | 1 +
 xen/common/Kconfig       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/xen/arch/x86/hvm/Kconfig b/xen/arch/x86/hvm/Kconfig
index 5cb9f29042..f10a2b3744 100644
--- a/xen/arch/x86/hvm/Kconfig
+++ b/xen/arch/x86/hvm/Kconfig
@@ -1,5 +1,6 @@
 menuconfig HVM
 	bool "HVM support"
+	depends on !PV_SHIM_EXCLUSIVE
 	default !PV_SHIM
 	select COMPAT
 	select IOREQ_SERVER
diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 76f9ce705f..53f681bbb2 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -653,6 +653,7 @@ menu "Supported hypercall interfaces"
 
 config SYSCTL
 	bool "Enable sysctl hypercall"
+	depends on !PV_SHIM_EXCLUSIVE
 	default y
 	help
 	  This option shall only be disabled on some dom0less systems, or
-- 
2.25.1

On 23.10.2025 01:21, Stefano Stabellini wrote:
> Fix a few randconfig build breakages that started appearing after the
> SYSCTL patch series.
> 
> First, reintroduce depends on !PV_SHIM_EXCLUSIVE for HVM, as it was
> before 568f806cba4c.
> 
> Also, add depends on !PV_SHIM_EXCLUSIVE for SYSCTL, that way the
> behavior goes back to what it was before 34317c508294.
> 
> Fixes: 568f806cba4c ("xen/x86: remove "depends on !PV_SHIM_EXCLUSIVE"")
> Fixes: 34317c508294 ("xen/sysctl: wrap around sysctl hypercall")
> Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>

As before, while ...

> --- a/xen/arch/x86/hvm/Kconfig
> +++ b/xen/arch/x86/hvm/Kconfig
> @@ -1,5 +1,6 @@
>  menuconfig HVM
>  	bool "HVM support"
> +	depends on !PV_SHIM_EXCLUSIVE
>  	default !PV_SHIM
>  	select COMPAT
>  	select IOREQ_SERVER

... this indeed is a straight (partial) revert of one of the two named
commits, ...

> --- a/xen/common/Kconfig
> +++ b/xen/common/Kconfig
> @@ -653,6 +653,7 @@ menu "Supported hypercall interfaces"
>  
>  config SYSCTL
>  	bool "Enable sysctl hypercall"
> +	depends on !PV_SHIM_EXCLUSIVE
>  	default y
>  	help
>  	  This option shall only be disabled on some dom0less systems, or

... this isn't when imo it should be. It has a benefit, though: Despite
being just a partial revert, it prevents sysctl.o from being built into
the shim binary. On that basis:

Acked-by: Jan Beulich <jbeulich@suse.com>

Jan