From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1Cc1BY-0000Lj-Ih for qemu-devel@nongnu.org; Wed, 08 Dec 2004 07:44:48 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1Cc1BX-0000L1-EF for qemu-devel@nongnu.org; Wed, 08 Dec 2004 07:44:47 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1Cc1BX-0000Ky-93 for qemu-devel@nongnu.org; Wed, 08 Dec 2004 07:44:47 -0500 Received: from [62.27.20.254] (helo=koniczek.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cc11Y-0004Bm-9U for qemu-devel@nongnu.org; Wed, 08 Dec 2004 07:34:28 -0500 Received: from vaion (pD95F01AE.dip.t-dialin.net [217.95.1.174]) (authenticated bits=0) by koniczek.de (8.12.0/8.12.0) with ESMTP id iB8CV19V027014 for ; Wed, 8 Dec 2004 13:31:02 +0100 Message-ID: <074f01c4dd22$3a578fa0$c6449b86@vaion> From: "Martin Koniczek" Date: Wed, 8 Dec 2004 13:34:01 +0100 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0745_01C4DD2A.93C3BCA0" Subject: [Qemu-devel] cleaned patch for host kernel running linux-2.6.9 Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. ------=_NextPart_000_0745_01C4DD2A.93C3BCA0 Content-Type: text/plain; format=flowed; charset="iso-8859-1"; reply-type=original Content-Transfer-Encoding: 7bit works fine for me... attention, its one of my first "released" patchworks, use at own risk, feedback welcome i hope i got everything right: - just removed the patches which where incorporated into official 2.6.9 kernel by rusty - made a new diff to get cleaner and better fitting results vs. 2.6.9 ------=_NextPart_000_0745_01C4DD2A.93C3BCA0 Content-Type: application/octet-stream; name="linux-2.6.9-qemu-fast.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="linux-2.6.9-qemu-fast.patch" --- linux-2.6.9/arch/i386/Kconfig 2004-10-18 23:53:22.000000000 +0200=0A= +++ linux-2.6.9-qemu/arch/i386/Kconfig 2004-12-07 21:56:49.000000000 = +0100=0A= @@ -337,6 +337,14 @@ config X86_GENERIC=0A= =0A= endif=0A= =0A= +config QEMU=0A= + bool "Kernel to run under QEMU"=0A= + depends on EXPERIMENTAL=0A= + help=0A= + Select this if you want to boot the kernel inside qemu-fast,=0A= + the non-mmu version of the x86 emulator. See=0A= + . Say N.=0A= +=0A= #=0A= # Define implied options from the CPU selection here=0A= #=0A= --- linux-2.6.9/include/asm-i386/fixmap.h 2004-10-18 23:53:08.000000000 = +0200=0A= +++ linux-2.6.9-qemu/include/asm-i386/fixmap.h 2004-12-07 = 23:16:11.000000000 +0100=0A= @@ -20,7 +20,11 @@=0A= * Leave one empty page between vmalloc'ed areas and=0A= * the start of the fixmap.=0A= */=0A= +#ifdef CONFIG_QEMU=0A= +#define __FIXADDR_TOP 0xa7fff000=0A= +#else=0A= #define __FIXADDR_TOP 0xfffff000=0A= +#endif=0A= =0A= #ifndef __ASSEMBLY__=0A= #include =0A= --- linux-2.6.9/include/asm-i386/page.h 2004-10-18 23:53:22.000000000 = +0200=0A= +++ linux-2.6.9-qemu/include/asm-i386/page.h 2004-12-07 = 21:56:49.000000000 +0100=0A= @@ -121,12 +121,19 @@ extern int sysctl_legacy_va_layout;=0A= #endif /* __ASSEMBLY__ */=0A= =0A= #ifdef __ASSEMBLY__=0A= +#ifdef CONFIG_QEMU=0A= +#define __PAGE_OFFSET (0x90000000)=0A= +#else=0A= #define __PAGE_OFFSET (0xC0000000)=0A= +#endif /* QEMU */=0A= +#else=0A= +#ifdef CONFIG_QEMU=0A= +#define __PAGE_OFFSET (0x90000000UL)=0A= #else=0A= #define __PAGE_OFFSET (0xC0000000UL)=0A= +#endif /* QEMU */=0A= #endif=0A= =0A= -=0A= #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)=0A= #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE)=0A= #define MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE)=0A= --- linux-2.6.9/include/asm-i386/param.h 2004-10-18 23:53:24.000000000 = +0200=0A= +++ linux-2.6.9-qemu/include/asm-i386/param.h 2004-12-07 = 21:56:49.000000000 +0100=0A= @@ -2,7 +2,12 @@=0A= #define _ASMi386_PARAM_H=0A= =0A= #ifdef __KERNEL__=0A= -# define HZ 1000 /* Internal kernel timer frequency */=0A= +# include =0A= +# ifdef CONFIG_QEMU=0A= +# define HZ 100=0A= +# else=0A= +# define HZ 1000 /* Internal kernel timer frequency */=0A= +# endif=0A= # define USER_HZ 100 /* .. some user interfaces are in "ticks" */=0A= # define CLOCKS_PER_SEC (USER_HZ) /* like times() */=0A= #endif=0A= ------=_NextPart_000_0745_01C4DD2A.93C3BCA0--