Skip to contentSkip to conversation

1 Bug found for compiling on 32 Bit machine

PATCH Daniel Hecken 2 participants 5 messages May 21, 2007 – May 23, 2007 3 messages not in the archive KVM

lore
Share & tools
lore
#0 lore raw

Hello,

I have found an issue for compiling on 32 Bit machines in v2.6.22-rc1-g1ab29f3.

I'm not sure if I have set the #ifdef CONFIG_X86_64 at the right place. Please have a look at it. With this patch v2.6.22-rc1-g1ab29f3 compiles und runs fine.

Daniel

kernel/vmx.c renamed from drivers/kvm/vmx.c +7 -0
@@ -41,7 +41,10 @@
 #else
 #define HOST_IS_64 0
 #endif
+
+#ifdef CONFIG_X86_64
 #define EFER_SAVE_RESTORE_BITS ((u64)EFER_SCE)
+#endif
 
 static struct vmcs_descriptor {
 	int size;
@@ -87,7 +90,9 @@
 
 static inline u64 msr_efer_save_restore_bits(struct vmx_msr_entry msr)
 {
+#ifdef CONFIG_X86_64
 	return (u64)msr.data & EFER_SAVE_RESTORE_BITS;
+#endif
 }
 
 static inline int msr_efer_need_save_restore(struct kvm_vcpu *vcpu)
@@ -279,6 +284,7 @@
 
 static void load_transition_efer(struct kvm_vcpu *vcpu)
 {
+#ifdef CONFIG_X86_64
 	u64 trans_efer;
 	int efer_offset = vcpu->msr_offset_efer;
 
@@ -288,6 +294,7 @@
 				vcpu->guest_msrs[efer_offset]);
 	wrmsrl(MSR_EFER, trans_efer);
 	vcpu->stat.efer_reload++;
+#endif
 }
 
 static void vmx_save_host_state(struct kvm_vcpu *vcpu)

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

_______________________________________________
kvm-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-devel

A message that is not in the archive (sent off-list or not yet received): 46514E80.3080208-LcvzS2Pvy/[email protected]

#2 lore raw
Quoted 10 lines · Daniel Hecken

Hello,

I have found an issue for compiling on 32 Bit machines in v2.6.22-rc1-g1ab29f3.

I'm not sure if I have set the #ifdef CONFIG_X86_64 at the right place. Please have a look at it. With this patch v2.6.22-rc1-g1ab29f3 compiles und runs fine.

v2.6.22-rc1-170-ga6935db compiles fine here. Can you double-check?

Signature · 8 lines
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

A message that is not in the archive (sent off-list or not yet received): 4651588A.1050808-atKUWr5tajBWk0Htik3J/[email protected]

#4 lore raw
Quoted 6 lines · Avi Kivity
Quoted 5 lines · Daniel Hecken

Hello,

I have found an issue for compiling on 32 Bit machines in v2.6.22-rc1-g1ab29f3.

Quoted 8 lines
Quoted 5 lines

I'm not sure if I have set the #ifdef CONFIG_X86_64 at the right place. Please have a look at it. With this patch v2.6.22-rc1-g1ab29f3 compiles und runs fine.

v2.6.22-rc1-170-ga6935db compiles fine here. Can you double-check?

The warnings are gone, but mine only compiles with my patch. gcc is Version 3.4.6 included in Ubuntu Feisty.

(Intel Core 2 Duo running 32 Bit Ubuntu Feisty with kernel 2.6.20-15)

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

#5 lore raw
In reply to a message not in the archive
Quoted 6 lines · Avi Kivity
Quoted 5 lines · Daniel Hecken

Hello,

I have found an issue for compiling on 32 Bit machines in v2.6.22-rc1-g1ab29f3.

Quoted 8 lines
Quoted 5 lines

I'm not sure if I have set the #ifdef CONFIG_X86_64 at the right place. Please have a look at it. With this patch v2.6.22-rc1-g1ab29f3 compiles und runs fine.

v2.6.22-rc1-170-ga6935db compiles fine here. Can you double-check?

Hello Avi,

as we discovered on IRC EFER_SCE is only defined below 2.6.22 in include/asm-i386/msr-index.h or include/asm-386/msr.h so I made a patch for external-module-compat.h. I hope I defined it in the right way.

Daniel

kernel/external-module-compat.h +14 -0
@@ -151,3 +151,17 @@
 #define CPU_DEAD_FROZEN                (CPU_DEAD | CPU_TASKS_FROZEN)
 
 #endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
+
+#ifndef _EFER_SCE
+#define _EFER_SCE		0  /* SYSCALL/SYSRET */
+#endif
+
+#ifndef EFER_SCE
+#define EFER_SCE		(1<<_EFER_SCE)
+#endif
+
+#endif
+
+

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

_______________________________________________
kvm-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-devel

A message that is not in the archive (sent off-list or not yet received): 4654281D.10806-LcvzS2Pvy/[email protected]

#7 lore raw
Quoted 20 lines · Daniel Hecken
Quoted 7 lines · Avi Kivity
Quoted 5 lines · Daniel Hecken

Hello,

I have found an issue for compiling on 32 Bit machines in v2.6.22-rc1-g1ab29f3.

Quoted 9 lines
Quoted 6 lines

I'm not sure if I have set the #ifdef CONFIG_X86_64 at the right place. Please have a look at it. With this patch v2.6.22-rc1-g1ab29f3 compiles und runs fine.

v2.6.22-rc1-170-ga6935db compiles fine here. Can you double-check?

Quoted 6 lines

Hello Avi,

as we discovered on IRC EFER_SCE is only defined below 2.6.22 in include/asm-i386/msr-index.h or include/asm-386/msr.h so I made a patch for external-module-compat.h. I hope I defined it in the right way.

Looks good. Applied & thanks.

Signature · 8 lines
Do not meddle in the internals of kernels, for they are subtle and quick to panic.


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/