[Qemu-devel] Patch for kqemu-1.3.0pre5 on Fedora Core 4 x86_64

[Ben Dailey <bdailey@bhmsd.k12.in.us>]

[-- Attachment #1: Type: text/plain, Size: 1734 bytes --]

Hello,

I have just recently joined the list and thought I would share this
simple patch to get kqemu-1.3.0pre5 to compile against the
2.6.16-1.2096_FC4smp kernel. Configure was run as "./configure
--cc=gcc32 --host-cc=gcc". Before the patch the make output was as
follows:

make -C /lib/modules/2.6.16-1.2096_FC4smp/build M=`pwd` modules
make[1]: Entering directory `/usr/src/kernels/2.6.16-1.2096_FC4-smp-x86_64'
  CC [M]  /usr/local/src/cvs/kqemu-1.3.0pre5_pre/kqemu-linux.o
/usr/local/src/cvs/kqemu-1.3.0pre5_pre/kqemu-linux.c: In function ‘kqemu_lock_user_page’:
/usr/local/src/cvs/kqemu-1.3.0pre5_pre/kqemu-linux.c:80: error: ‘mem_map’ undeclared (first use in this function)
/usr/local/src/cvs/kqemu-1.3.0pre5_pre/kqemu-linux.c:80: error: (Each undeclared identifier is reported only once
/usr/local/src/cvs/kqemu-1.3.0pre5_pre/kqemu-linux.c:80: error: for each function it appears in.)
/usr/local/src/cvs/kqemu-1.3.0pre5_pre/kqemu-linux.c: In function ‘kqemu_alloc_zeroed_page’:
/usr/local/src/cvs/kqemu-1.3.0pre5_pre/kqemu-linux.c:107: error: ‘mem_map’ undeclared (first use in this function)
/usr/local/src/cvs/kqemu-1.3.0pre5_pre/kqemu-linux.c: In function ‘kqemu_vmalloc_to_phys’:
/usr/local/src/cvs/kqemu-1.3.0pre5_pre/kqemu-linux.c:147: error: ‘mem_map’ undeclared (first use in this function)
make[2]: *** [/usr/local/src/cvs/kqemu-1.3.0pre5_pre/kqemu-linux.o] Error 1
make[1]: *** [_module_/usr/local/src/cvs/kqemu-1.3.0pre5_pre] Error 2
make[1]: Leaving directory `/usr/src/kernels/2.6.16-1.2096_FC4-smp-x86_64'
make: *** [kqemu.ko] Error 2

-- 
Thank You,
Ben Dailey
bdailey@bhmsd.k12.in.us
Asst. Technology Director
Bluffton Harrison MSD
www.bhmsd.k12.in.us


[-- Attachment #2: kqemu-linux_042506.patch --]
[-- Type: text/x-patch, Size: 490 bytes --]

--- kqemu-1.3.0pre5_pre/kqemu-linux.c	2006-03-27 15:58:01.000000000 -0500
+++ kqemu-1.3.0pre5/kqemu-linux.c	2006-04-25 12:55:42.000000000 -0400
@@ -23,7 +23,8 @@
 #error "Linux 2.4.19 or above needed"
 #endif
 
-#ifndef page_to_pfn
+/* The pfn_to_page() API appeared in 2.5.14 and changed to function during 2.6.x */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) && !defined(pfn_to_page)
 #define page_to_pfn(page) ((page) - mem_map)
 #define pfn_to_page(pfn) (mem_map + (pfn))
 #endif