Skip to content

Commit 29c2f18

Browse files
bulwahnjgross1
authored andcommitted
x86/xen: select HIBERNATE_CALLBACKS more directly
The config XEN_SAVE_RESTORE's only purpose is to select HIBERNATE_CALLBACKS, when config XEN is set. The XEN config definition can simply select HIBERNATE_CALLBACKS, though, and the definition of XEN_SAVE_RESTORE can be dropped. So, remove this indirection through XEN_SAVE_RESTORE and select HIBERNATE_CALLBACKS directly. Also, drop the XEN_SAVE_RESTORE from the x86 xen config fragment. No functional change intended with this clean-up. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@redhat.com> Reviewed-by: Juergen Gross <jgross@suse.com> Signed-off-by: Juergen Gross <jgross@suse.com> Message-ID: <20250829070402.159390-1-lukas.bulwahn@redhat.com>
1 parent 2ea7a5b commit 29c2f18

2 files changed

Lines changed: 1 addition & 7 deletions

File tree

arch/x86/configs/xen.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ CONFIG_CPU_FREQ=y
1212

1313
# x86 xen specific config options
1414
CONFIG_XEN_PVH=y
15-
CONFIG_XEN_SAVE_RESTORE=y
1615
# CONFIG_XEN_DEBUG_FS is not set
1716
CONFIG_XEN_MCE_LOG=y
1817
CONFIG_XEN_ACPI_PROCESSOR=m

arch/x86/xen/Kconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ config XEN
88
depends on PARAVIRT
99
select PARAVIRT_CLOCK
1010
select X86_HV_CALLBACK_VECTOR
11+
select HIBERNATE_CALLBACKS
1112
depends on X86_64 || (X86_32 && X86_PAE)
1213
depends on X86_64 || (X86_GENERIC || MPENTIUM4 || MATOM)
1314
depends on X86_LOCAL_APIC && X86_TSC
@@ -64,12 +65,6 @@ config XEN_PVHVM_GUEST
6465
help
6566
Support running as a Xen PVHVM guest.
6667

67-
config XEN_SAVE_RESTORE
68-
bool
69-
depends on XEN
70-
select HIBERNATE_CALLBACKS
71-
default y
72-
7368
config XEN_DEBUG_FS
7469
bool "Enable Xen debug and tuning parameters in debugfs"
7570
depends on XEN && DEBUG_FS

0 commit comments

Comments
 (0)