2 Bugs found for compilation on 32 Bit machine

Hello,

I have an Intel Core 2 Duo running Ubuntu Feisty 2.6.20-15 in 32 Bit mode. If I try to compile kvm-trunk ( kvm-24-gfbfe1dc ) and the modules from git ( v2.6.22-rc1-gf552bf6 ) I get a few compiler errors and the compiler stops.

Please find attached 2 patches to fix the errors.

Danie Hecken

@@ -39,12 +39,11 @@
 libkvm.a: kvmctl.o
 	$(AR) rcs $@ $^
 
-flatfiles-common = test/simple.flat test/stringio.flat test/memtest1.flat \
-	test/bootstrap test/vmexit.flat
+flatfiles-common = test/bootstrap test/vmexit.flat
 
 flatfiles-32 = 
 
-flatfiles-64 = test/access.flat test/irq.flat test/sieve.flat
+flatfiles-64 = test/access.flat test/irq.flat test/sieve.flat test/simple.flat test/stringio.flat test/memtest1.flat
 
 flatfiles: $(flatfiles-common) $(flatfiles-$(bits))
 

@@ -479,6 +479,7 @@
 	int index, save_nmsrs;
 
 	save_nmsrs = 0;
+#ifdef X86_64
 	if (is_long_mode(vcpu)) {
 		index = __find_msr_index(vcpu, MSR_SYSCALL_MASK);
 		if (index >= 0)

@@ -496,12 +497,11 @@
 		 * MSR_K6_STAR is only needed on long mode guests, and only
 		 * if efer.sce is enabled.
 		 */
-#ifdef X86_64
 		index = __find_msr_index(vcpu, MSR_K6_STAR);
 		if ((index >= 0) && (vcpu->shadow_efer & EFER_SCE))
 			move_msr_up(vcpu, index, save_nmsrs++);
-#endif
 	}
+#endif
 	vcpu->save_nmsrs = save_nmsrs;
 
 #ifdef CONFIG_X86_64

-------------------------------------------------------------------------
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

Applied, thanks. Please supply Signed-off-by: lines in the future for kernel patches.

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/