Skip to contentSkip to conversation

Hyperv detection - code cleanup

PATCH In review Ky Srinivasan 3 participants 5 messages May 19, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 Hyperv detection - code cleanup

From: K. Y. Srinivasan <[email protected]>
Subject: Code cleanup - get rid of the "ms" prefix in hyperv related files.

arch/x86/include/asm/hyperv.h +2 -2
Index: linux.trees.git/arch/x86/include/asm/hyperv.h
===================================================================
@@ -190,11 +190,11 @@
 #define HV_STATUS_INVALID_HYPERCALL_INPUT	3
 #define HV_STATUS_INVALID_ALIGNMENT		4
 
-struct ms_hyperv_info {
+struct hyperv_info {
 	u32 features;
 	u32 hints;
 };
 
-extern struct ms_hyperv_info ms_hyperv;
+extern struct hyperv_info hyperv_info;
 
 #endif
arch/x86/include/asm/hypervisor.h +1 -1
Index: linux.trees.git/arch/x86/include/asm/hypervisor.h
===================================================================
@@ -44,6 +44,6 @@ extern const struct hypervisor_x86 *x86_
 
 /* Recognized hypervisors */
 extern const struct hypervisor_x86 x86_hyper_vmware;
-extern const struct hypervisor_x86 x86_hyper_ms_hyperv;
+extern const struct hypervisor_x86 x86_hyper_hyperv;
 
 #endif
arch/x86/kernel/cpu/Makefile +1 -1
Index: linux.trees.git/arch/x86/kernel/cpu/Makefile
===================================================================
@@ -14,7 +14,7 @@ CFLAGS_common.o		:= $(nostackp)
 
 obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
 obj-y			+= proc.o capflags.o powerflags.o common.o
-obj-y			+= vmware.o hypervisor.o sched.o mshyperv.o
+obj-y			+= vmware.o hypervisor.o sched.o hyperv.o
 
 obj-$(CONFIG_X86_32)	+= bugs.o cmpxchg.o
 obj-$(CONFIG_X86_64)	+= bugs_64.o
arch/x86/kernel/cpu/hyperv.c new file +55 -0

55 lines not on this page · raw message

arch/x86/kernel/cpu/mshyperv.c deleted +0 -55

55 lines not on this page · raw message

arch/x86/kernel/cpu/hypervisor.c +1 -1
Index: linux.trees.git/arch/x86/kernel/cpu/hypervisor.c
===================================================================
@@ -33,7 +33,7 @@
 static const __initconst struct hypervisor_x86 * const hypervisors[] =
 {
 	&x86_hyper_vmware,
-	&x86_hyper_ms_hyperv,
+	&x86_hyper_hyperv,
 };
 
 const struct hypervisor_x86 *x86_hyper;
#1 lore raw
Quoted 5 lines · Ky Srinivasan

From: K. Y. Srinivasan <[email protected]>
Subject: Code cleanup - get rid of the "ms" prefix in hyperv related files.

NAK in the extreme.

"hyperv" -- without the capitalization to make it stand out -- is way too easy to read as just an abbreviation for "hypervisor".

-hpa

#2 lore raw
Quoted 11 lines · H. Peter Anvin
Quoted 5 lines · Ky Srinivasan

From: K. Y. Srinivasan <[email protected]>
Subject: Code cleanup - get rid of the "ms" prefix in hyperv related files.

NAK in the extreme.

"hyperv" -- without the capitalization to make it stand out -- is way too easy to read as just an abbreviation for "hypervisor".

Which is what I confused it with, and hence I wrote the ms_* changes in my patch. But KY wanted it changed back so I suggested he write a patch.

I personally like the ms_ stuff, it makes it more obvious what is going on here, but that's just me.

thanks,

greg k-h

#3 lore raw
Quoted 13 lines · Greg KH
Quoted 11 lines · H. Peter Anvin
Quoted 5 lines · Ky Srinivasan

From: K. Y. Srinivasan <[email protected]>
Subject: Code cleanup - get rid of the "ms" prefix in hyperv related files.

NAK in the extreme.

"hyperv" -- without the capitalization to make it stand out -- is way too easy to read as just an abbreviation for "hypervisor".

Quoted 7 lines

Which is what I confused it with, and hence I wrote the ms_* changes in my patch. But KY wanted it changed back so I suggested he write a patch.

I personally like the ms_ stuff, it makes it more obvious what is going on here, but that's just me.

Well, I agree with you. Sorry, Ky.

-hpa

#4 lore raw
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

On 5/19/2010 at 2:21 PM, in message <[email protected]>, "H. Peter

Quoted 18 lines · Anvin
Quoted 17 lines · Greg KH
Quoted 11 lines · H. Peter Anvin
Quoted 5 lines · Ky Srinivasan

From: K. Y. Srinivasan <[email protected]>
Subject: Code cleanup - get rid of the "ms" prefix in hyperv related files.

NAK in the extreme.

"hyperv" -- without the capitalization to make it stand out -- is way too easy to read as just an abbreviation for "hypervisor".

Which is what I confused it with, and hence I wrote the ms_* changes in my patch. But KY wanted it changed back so I suggested he write a patch.

Quoted 5 lines
Quoted 3 lines

I personally like the ms_ stuff, it makes it more obvious what is going on here, but that's just me.

Well, I agree with you. Sorry, Ky.

I see your concern.

Regards,

K. Y

Quoted 2 lines

-hpa