kvm: move kvmclock initialization inside kvm_guest_init
Subsystems (4)
PATCH 1/1 kvm: move kvmclock initialization inside kvm_guest_init
It makes no sense for the clock initialization to be hanging around in setup_32.c when we have a generic kvm guest initialization function available. So, we move kvmclock_init() inside such a function, leading to a cleaner code.
--- arch/x86/kernel/kvm.c | 2 ++ arch/x86/kernel/setup_32.c | 4 ---- include/linux/kvm_para.h | 5 +++++ 3 files changed, 7 insertions(+), 4 deletions(-)
arch/x86/kernel/kvm.c +2 -0
@@ -210,6 +210,8 @@ static void paravirt_ops_setup(void) pv_info.name ="KVM" ; pv_info.paravirt_enabled =1 ; +kvmclock_init (); +if (kvm_para_has_feature (KVM_FEATURE_NOP_IO_DELAY )) pv_cpu_ops.io_delay = kvm_io_delay;
arch/x86/kernel/setup_32.c +0 -4
@@ -771,10 +771,6 @@ void __init setup_arch(char **cmdline_p) max_low_pfn =setup_memory (); -#ifdef CONFIG_KVM_CLOCK -kvmclock_init (); -#endif -#ifdef CONFIG_VMI /* * Must be after max_low_pfn is determined, and before kernel
include/linux/kvm_para.h +5 -0
@@ -28,6 +28,11 @@ void __init kvm_guest_init(void);#else #define kvm_guest_init () do { } while (0)#endif +#ifdef CONFIG_KVM_CLOCK +void kvmclock_init (void ); +#else +#define kvmclock_init () do { } while (0) +#endif static inline int kvm_para_has_feature (unsigned int feature) {
Signature · 8 lines
1.5.0.6 ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
Quoted 47 lines · Glauber Costa
It makes no sense for the clock initialization to be hanging around in
setup_32.cwhen we have a generic kvm guest initialization function available. So, we movekvmclock_init()inside such a function, leading to a cleaner code.Signed-off-by Glauber Costa <[email protected]>--- arch/x86/kernel/kvm.c | 2 ++ arch/x86/kernel/setup_32.c | 4 ---- include/linux/kvm_para.h | 5 +++++ 3 files changed, 7 insertions(+), 4 deletions(-)arch/x86/kernel/kvm.c +2
-0@@ -210,6 +210,8 @@ static void paravirt_ops_setup(void) pv_info.name ="KVM" ; pv_info.paravirt_enabled =1 ; +kvmclock_init (); +if (kvm_para_has_feature (KVM_FEATURE_NOP_IO_DELAY )) pv_cpu_ops.io_delay = kvm_io_delay;arch/x86/kernel/setup_32.c +0
-4@@ -771,10 +771,6 @@ void __init setup_arch(char **cmdline_p) max_low_pfn =setup_memory (); -#ifdef CONFIG_KVM_CLOCK -kvmclock_init (); -#endif -#ifdef CONFIG_VMI /* * Must be after max_low_pfn is determined, and before kernel include/linux/kvm_para.h +0
-0@@ -28,6 +28,11 @@ void __init kvm_guest_init(void);#else
include/linux/kvm_para.h void __init kvm_guest_init(void); · line 38
Quoted 10 lines
include/linux/kvm_para.h +5
-0#define kvm_guest_init () do { } while (0)#endif +#ifdef CONFIG_KVM_CLOCK +void kvmclock_init (void ); +#else +#define kvmclock_init () do { } while (0) +#endif static inline int kvm_para_has_feature (unsigned int feature) {
Forget about it. Marelo just screamed to me (and somehow I heard it), that this create a bogus dependency between clock and the mmu functions. Duh.
I'll resend a better version
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
Quoted 47 lines · Glauber Costa
It makes no sense for the clock initialization to be hanging around in
setup_32.cwhen we have a generic kvm guest initialization function available. So, we movekvmclock_init()inside such a function, leading to a cleaner code.Signed-off-by Glauber Costa <[email protected]>--- arch/x86/kernel/kvm.c | 2 ++ arch/x86/kernel/setup_32.c | 4 ---- include/linux/kvm_para.h | 5 +++++ 3 files changed, 7 insertions(+), 4 deletions(-)arch/x86/kernel/kvm.c +2
-0@@ -210,6 +210,8 @@ static void paravirt_ops_setup(void) pv_info.name ="KVM" ; pv_info.paravirt_enabled =1 ; +kvmclock_init (); +if (kvm_para_has_feature (KVM_FEATURE_NOP_IO_DELAY )) pv_cpu_ops.io_delay = kvm_io_delay;arch/x86/kernel/setup_32.c +0
-4@@ -771,10 +771,6 @@ void __init setup_arch(char **cmdline_p) max_low_pfn =setup_memory (); -#ifdef CONFIG_KVM_CLOCK -kvmclock_init (); -#endif -#ifdef CONFIG_VMI /* * Must be after max_low_pfn is determined, and before kernel include/linux/kvm_para.h +0
-0@@ -28,6 +28,11 @@ void __init kvm_guest_init(void);#else
include/linux/kvm_para.h void __init kvm_guest_init(void); · line 38
Quoted 10 lines
include/linux/kvm_para.h +5
-0#define kvm_guest_init () do { } while (0)#endif +#ifdef CONFIG_KVM_CLOCK +void kvmclock_init (void ); +#else +#define kvmclock_init () do { } while (0) +#endif static inline int kvm_para_has_feature (unsigned int feature) {
Forget about it. Marelo just screamed to me (and somehow I heard it), that this create a bogus dependency between clock and the mmu functions. Duh.
I'll resend a better version