From xiantao.zhang at intel.com Thu Jun 1 02:17:41 2006 From: xiantao.zhang at intel.com (Zhang, Xiantao) Date: Thu, 1 Jun 2006 10:17:41 +0800 Subject: [Fedora-xen] FW: [IA64]We have successfully booted dom0/domU/domVTI (xen/ia64) on FC5 Message-ID: <9FBCE015AF479F46B3B410499F3AE05B011EC67D@pdsmsx405> Hi Aron, > -----Original Message----- > From: Aron Griffis [mailto:aron at hp.com] > Sent: 2006?6?1? 3:13 > To: Zhang, Xiantao > Cc: fedora-xen at redhat.com > Subject: Re: [Fedora-xen] FW: [IA64]We have successfully booted > dom0/domU/domVTI (xen/ia64) on FC5 > > Zhang, Xiantao wrote: [Fri May 26 2006, 09:38:51AM EDT] > > >> - The configuration files for dom0/domU seems a big difference > > >> compared to xen-ia64-unstable.hg. (Why?) Currently the ext3 is > > >> compiled as module, however initrd doesn't work for domU even > > >> when we add "ramdisk=" in config file. So we change ext3 to be > > >> kernel built-in, and then domU can boot up immediately. > > > > > > Ok, I'll fix that in the rpm. > > > > OK. > > I added ext3 as 'y' instead of module, this is now in the > fedora-kernel-ia64 repo. > > > >> - Xen-ia64-unstable.hg doesn't have IDE devices configured for > > >> domU, however fedora-kernel-ia64 does, which wastes much time > > >> for probe. If the configuration file can be kept consistence > > >> with xen-ia64-unstable.hg, above issues are gone. > > > That's my mistake too. I'll fix it. > > OK too:) > > On investigation, I don't see IDE configured for the xenU kernel. > Could you point out the specific problem, or send a patch to the > config? I saw the issue was fixed by CSet 33. Did you encounter it after Cset 33? :) > Thanks, > Aron From rafiq.ahamed at hp.com Thu Jun 1 02:19:03 2006 From: rafiq.ahamed at hp.com (Ahamed K, Rafiq (HP)) Date: Wed, 31 May 2006 22:19:03 -0400 Subject: [Fedora-xen] HVM Loader Doesn't See the "vcpus" Parameter? Message-ID: <0B5B70C578796045A2F555952837914C01C24DC6@tayexc13.americas.cpqcorp.net> Every time "hvmloader" comes up to load a VM, it shows cpu=1 as detected, no matter what number you give in .hvm configuration file. I have vcpus=2 and cpus = "2-4" in my .hvm file! Any idea why is this? Or Am I missing anything? I am guessing due to this I am not able to run the un-modified "Multiprocessor" Windows. Any help would be appreciated. Thanks R These are the details of my configuration I am having a server with 2 dual core XEON with VT-x enabled on it. Linux linux 2.6.16.13-xen #2 SMP Wed May 24 10:41:28 MDT 2006 i686 i686 i386 GNU/Linux linux:~ # xm info host : linux release : 2.6.16.13-xen version : #2 SMP Wed May 24 10:41:28 MDT 2006 machine : i686 nr_cpus : 8 nr_nodes : 1 sockets_per_node : 2 cores_per_socket : 2 threads_per_core : 2 cpu_mhz : 2667 hw_caps : bfebfbff:20100000:00000000:00000180:000064bd:00000000:00000001 total_memory : 3583 free_memory : 2522 xen_major : 3 xen_minor : 0 xen_extra : -unstable xen_caps : xen-3.0-x86_32 hvm-3.0-x86_32 platform_params : virt_start=0xfc000000 xen_changeset : Sun May 21 20:15:58 2006 +0100 10058:14717dedba02 cc_compiler : gcc version 4.0.2 20050901 (prerelease) (SUSE Linux) cc_compile_by : root cc_compile_domain : local cc_compile_date : Wed May 24 10:31:04 MDT 2006 -------------- next part -------------- An HTML attachment was scrubbed... URL: From xiantao.zhang at intel.com Thu Jun 1 02:21:12 2006 From: xiantao.zhang at intel.com (Zhang, Xiantao) Date: Thu, 1 Jun 2006 10:21:12 +0800 Subject: [Fedora-xen] FW: [IA64]We have successfully booteddom0/domU/domVTI (xen/ia64) on FC5 Message-ID: <9FBCE015AF479F46B3B410499F3AE05B011EC67E@pdsmsx405> >From the last mail: Currently the ext3 is compiled as module, however initrd doesn't work for domU even when we add "ramdisk=" in config file. So we change ext3 to be kernel built-in, and then domU can boot up immediately. Thanks -Xiantao > -----Original Message----- > From: Jeremy Katz [mailto:katzj at redhat.com] > Sent: 2006?6?1? 4:52 > To: Aron Griffis > Cc: Zhang, Xiantao; fedora-xen at redhat.com > Subject: Re: [Fedora-xen] FW: [IA64]We have successfully > booteddom0/domU/domVTI (xen/ia64) on FC5 > > On Wed, 2006-05-31 at 15:13 -0400, Aron Griffis wrote: > > Zhang, Xiantao wrote: [Fri May 26 2006, 09:38:51AM EDT] > > > >> - The configuration files for dom0/domU seems a big difference > > > >> compared to xen-ia64-unstable.hg. (Why?) Currently the ext3 is > > > >> compiled as module, however initrd doesn't work for domU even > > > >> when we add "ramdisk=" in config file. So we change ext3 to be > > > >> kernel built-in, and then domU can boot up immediately. > > > > > > > > Ok, I'll fix that in the rpm. > > > > > > OK. > > > > I added ext3 as 'y' instead of module, this is now in the > > fedora-kernel-ia64 repo. > > Things are configured as they are so that we don't have configuration > skew between Xen and non-Xen kernels as that just leads to confusion and > tool problems down the road. What's the problem with initrds and ia64 > xen? > > Jeremy From aron at hp.com Thu Jun 1 02:22:26 2006 From: aron at hp.com (Aron Griffis) Date: Wed, 31 May 2006 22:22:26 -0400 Subject: [Fedora-xen] FW: [IA64]We have successfully booted dom0/domU/domVTI (xen/ia64) on FC5 In-Reply-To: <9FBCE015AF479F46B3B410499F3AE05B011EC67D@pdsmsx405> References: <9FBCE015AF479F46B3B410499F3AE05B011EC67D@pdsmsx405> Message-ID: <20060601022225.GC23993@olive.flatmonk> Zhang, Xiantao wrote: [Wed May 31 2006, 10:17:41PM EDT] > I saw the issue was fixed by CSet 33. Did you encounter it after > Cset 33? :) Cset 33 was a huge screwup of mine. Somehow I saved a kernel with CONFIG_XEN *unset* as the xenU config. I reverted it in cset 34 but disabled some other hardware that obviously won't be available in an unprivileged environment. Please look at the config in cset 34 and let me know if I missed something. Aron -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From aron at hp.com Thu Jun 1 02:23:40 2006 From: aron at hp.com (Aron Griffis) Date: Wed, 31 May 2006 22:23:40 -0400 Subject: [Fedora-xen] FW: [IA64]We have successfully booteddom0/domU/domVTI (xen/ia64) on FC5 In-Reply-To: <9FBCE015AF479F46B3B410499F3AE05B011EC67E@pdsmsx405> References: <9FBCE015AF479F46B3B410499F3AE05B011EC67E@pdsmsx405> Message-ID: <20060601022340.GD23993@olive.flatmonk> Zhang, Xiantao wrote: [Wed May 31 2006, 10:21:12PM EDT] > Currently the ext3 is compiled as module, however initrd doesn't > work for domU even when we add "ramdisk=" in config file. So we > change ext3 to be kernel built-in, and then domU can boot up > immediately. Could you provide more details how you're configuring it to use the initrd? Aron -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From xiantao.zhang at intel.com Thu Jun 1 02:28:30 2006 From: xiantao.zhang at intel.com (Zhang, Xiantao) Date: Thu, 1 Jun 2006 10:28:30 +0800 Subject: [Fedora-xen] FW: [IA64]We have successfully booteddom0/domU/domVTI (xen/ia64) on FC5 Message-ID: <9FBCE015AF479F46B3B410499F3AE05B011EC680@pdsmsx405> We configured it (compiled out by spec) as the option ramdisk in XenU 's configuration file, and then boot it directly. Any other steps needed ? Thanks -Xiantao > -----Original Message----- > From: Aron Griffis [mailto:aron at hp.com] > Sent: 2006?6?1? 10:24 > To: Zhang, Xiantao > Cc: Jeremy Katz; fedora-xen at redhat.com > Subject: Re: [Fedora-xen] FW: [IA64]We have successfully > booteddom0/domU/domVTI (xen/ia64) on FC5 > > Zhang, Xiantao wrote: [Wed May 31 2006, 10:21:12PM EDT] > > Currently the ext3 is compiled as module, however initrd doesn't > > work for domU even when we add "ramdisk=" in config file. So we > > change ext3 to be kernel built-in, and then domU can boot up > > immediately. > > Could you provide more details how you're configuring it to use the > initrd? > > Aron From rcamp at campworld.net Thu Jun 1 03:00:47 2006 From: rcamp at campworld.net (Richard Camp) Date: Wed, 31 May 2006 20:00:47 -0700 Subject: [Fedora-xen] HVM Loader Doesn't See the "vcpus" Parameter? In-Reply-To: <0B5B70C578796045A2F555952837914C01C24DC6@tayexc13.americas.cpqcorp.net> References: <0B5B70C578796045A2F555952837914C01C24DC6@tayexc13.americas.cpqcorp.net> Message-ID: <447E585F.2080907@campworld.net> Hello, If memory serves me correctly Intel's VT-X technology supports only one virtual cpu. Even if you have 4 cores the guest OS will only see one of them. Multiprocessor Windows would be pointless. A modified xen guest would see multiple cpus. Richard Ahamed K, Rafiq (HP) wrote: > Every time "hvmloader" comes up to load a VM, it shows cpu=1 as > detected, no matter what number you give in .hvm configuration file. I > have vcpus=2 and cpus = "2-4" in my .hvm file! > > Any idea why is this? Or Am I missing anything? > > I am guessing due to this I am not able to run the un-modified > "Multiprocessor" Windows. > > Any help would be appreciated. > > Thanks R > > > These are the details of my configuration > > I am having a server with 2 dual core XEON with VT-x enabled on it. > > Linux linux 2.6.16.13-xen #2 SMP Wed May 24 10:41:28 MDT 2006 i686 > i686 i386 GNU/Linux > > linux:~ # xm info > host : linux > release : 2.6.16.13-xen > version : #2 SMP Wed May 24 10:41:28 MDT 2006 > machine : i686 > nr_cpus : 8 > nr_nodes : 1 > sockets_per_node : 2 > cores_per_socket : 2 > threads_per_core : 2 > cpu_mhz : 2667 > hw_caps : > bfebfbff:20100000:00000000:00000180:000064bd:00000000:00000001 > total_memory : 3583 > free_memory : 2522 > xen_major : 3 > xen_minor : 0 > xen_extra : -unstable > xen_caps : xen-3.0-x86_32 hvm-3.0-x86_32 > platform_params : virt_start=0xfc000000 > xen_changeset : Sun May 21 20:15:58 2006 +0100 10058:14717dedba02 > cc_compiler : gcc version 4.0.2 20050901 (prerelease) (SUSE > Linux) > cc_compile_by : root > cc_compile_domain : local > cc_compile_date : Wed May 24 10:31:04 MDT 2006 > > ------------------------------------------------------------------------ > > -- > Fedora-xen mailing list > Fedora-xen at redhat.com > https://www.redhat.com/mailman/listinfo/fedora-xen > From xiantao.zhang at intel.com Thu Jun 1 03:02:27 2006 From: xiantao.zhang at intel.com (Zhang, Xiantao) Date: Thu, 1 Jun 2006 11:02:27 +0800 Subject: [Fedora-xen] FW: [IA64]We have successfully booteddom0/domU/domVTI (xen/ia64) on FC5 Message-ID: <9FBCE015AF479F46B3B410499F3AE05B011EC681@pdsmsx405> I will check it at latest CSet. If necessary, I will send out the patch :) Thanks -Xiantao > -----Original Message----- > From: Aron Griffis [mailto:aron at hp.com] > Sent: 2006?6?1? 10:24 > To: Zhang, Xiantao > Cc: Jeremy Katz; fedora-xen at redhat.com > Subject: Re: [Fedora-xen] FW: [IA64]We have successfully > booteddom0/domU/domVTI (xen/ia64) on FC5 > > Zhang, Xiantao wrote: [Wed May 31 2006, 10:21:12PM EDT] > > Currently the ext3 is compiled as module, however initrd doesn't > > work for domU even when we add "ramdisk=" in config file. So we > > change ext3 to be kernel built-in, and then domU can boot up > > immediately. > > Could you provide more details how you're configuring it to use the > initrd? > > Aron From katzj at redhat.com Thu Jun 1 03:47:41 2006 From: katzj at redhat.com (Jeremy Katz) Date: Wed, 31 May 2006 23:47:41 -0400 Subject: [Fedora-xen] FW: [IA64]We have successfully booteddom0/domU/domVTI (xen/ia64) on FC5 In-Reply-To: <9FBCE015AF479F46B3B410499F3AE05B011EC67E@pdsmsx405> References: <9FBCE015AF479F46B3B410499F3AE05B011EC67E@pdsmsx405> Message-ID: <1149133661.7431.7.camel@aglarond.local> On Thu, 2006-06-01 at 10:21 +0800, Zhang, Xiantao wrote: > From the last mail: > Currently the ext3 is compiled as module, however initrd doesn't work > for domU even when we add "ramdisk=" in config file. So we change ext3 to > be kernel built-in, and then domU can boot up immediately. Right -- my question was why don't initrds work. This is really a requirement given how some of the early boot process works. There are ways you can hack around it, but they'll always be just that, a hack. Jeremy From acanvar at gmail.com Thu Jun 1 06:07:08 2006 From: acanvar at gmail.com (Ashe Canvar) Date: Wed, 31 May 2006 23:07:08 -0700 Subject: [Fedora-xen] slow disk performance in Xen0 FC5 Message-ID: Hi all, My dom0 and domU machines are showing terrible disk performance degradation. For instance my avg data read rate ( tested using hdparm -t /dev/hda) is 55MB/s using the regular smp kernel but it falls to 2.6MB/s when I boot into dom0. No other domains are runnign at this point. I have looked for incrementing interrupts in ide0 , there are none. hdparm shows that dma mode is enabled. dmesg shows that the same driver is being used for both smp and dom0 cases ( Uniform Multi-Platform E-IDE driver Revision: 7.00alpha2 ). I have total of 2Gig RAM in the box and dom0 is restricted to 512M. Any help appreciated ! Thanks, -ashe [root at medusa1 ~]# rpm -qa | grep -i xen kernel-xenU-2.6.16-1.2080_FC5 kernel-xen0-2.6.16-1.2080_FC5 xen-3.0.1-4 From xiantao.zhang at intel.com Thu Jun 1 06:09:34 2006 From: xiantao.zhang at intel.com (Zhang, Xiantao) Date: Thu, 1 Jun 2006 14:09:34 +0800 Subject: [Fedora-xen] FW: [IA64]We have successfully booted dom0/domU/domVTI (xen/ia64) on FC5 Message-ID: <9FBCE015AF479F46B3B410499F3AE05B011EC684@pdsmsx405> Hi Aron, I have checked CSet 34 and found IDE driver has been removed in XenU configuration. It is fine with me now.:) Thanks -Xiantao > -----Original Message----- > From: Aron Griffis [mailto:aron at hp.com] > Sent: 2006?6?1? 10:22 > To: Zhang, Xiantao > Cc: fedora-xen at redhat.com > Subject: Re: [Fedora-xen] FW: [IA64]We have successfully booted > dom0/domU/domVTI (xen/ia64) on FC5 > > Zhang, Xiantao wrote: [Wed May 31 2006, 10:17:41PM EDT] > > I saw the issue was fixed by CSet 33. Did you encounter it after > > Cset 33? :) > > Cset 33 was a huge screwup of mine. Somehow I saved a kernel with > CONFIG_XEN *unset* as the xenU config. I reverted it in cset 34 but > disabled some other hardware that obviously won't be available in an > unprivileged environment. > > Please look at the config in cset 34 and let me know if I missed > something. > > Aron From takebe_akio at jp.fujitsu.com Thu Jun 1 06:26:00 2006 From: takebe_akio at jp.fujitsu.com (Akio Takebe) Date: Thu, 01 Jun 2006 15:26:00 +0900 Subject: [Fedora-xen] xen-ia64 heads up, missing asm/asmmacro.h In-Reply-To: <20060530224401.GK23787@vino.zko.hp.com> References: <20060530224401.GK23787@vino.zko.hp.com> Message-ID: <3FC685443FF244takebe_akio@jp.fujitsu.com> Hi, Aron You should use my fix patch. http://lists.xensource.com/archives/html/xen-ia64-devel/2006-05/msg00433.html Best Regards, Akio Takebe >Sometime recently glibc-kernheaders dropped >/usr/include/asm/asmmacro.h. This prevents the kernel rpm from >building with xen support on ia64. > >See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=193606 > >For people working on fedora-xen-ia64, the workaround is to download >http://free.linux.hp.com/~agriffis/asmmacro.h and put it in >/usr/include/asm > >Aron > >-----------------------application/pgp-signature----------------------- >-----BEGIN PGP SIGNATURE----- >Version: GnuPG v1.4.2.2 (GNU/Linux) > >iD8DBQFEfMqxJrHF4yAQTrARAv9gAJ46BRIS/6R2TBUGL1Fp5wj0ooP+vACgwsZ0 >pgPtVHYZ0CPWo1X3QOgdEMw= >=4KZB >-----END PGP SIGNATURE----- > >-------------------------------text/plain------------------------------- >-- >Fedora-xen mailing list >Fedora-xen at redhat.com >https://www.redhat.com/mailman/listinfo/fedora-xen From takebe_akio at jp.fujitsu.com Thu Jun 1 07:27:01 2006 From: takebe_akio at jp.fujitsu.com (Akio Takebe) Date: Thu, 01 Jun 2006 16:27:01 +0900 Subject: [Fedora-xen] [patch] cleanup linux-2.6-xen-sparce Message-ID: <43C6854CC6174Dtakebe_akio@jp.fujitsu.com> Hi, Alex and Aron This is a cleanup patch. Signed-off-by: Akio Takebe Best Regards, Akio Takebe diff -r acabf4bdec4f linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c Wed May 31 13: 05:21 2006 -0600 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c Mon Jun 05 18: 55:47 2006 +0900 @@ -564,7 +564,7 @@ xen_ia64_privcmd_entry_munmap(struct xen entry->gpfn = INVALID_GPFN; } -static int +static void xen_ia64_privcmd_entry_open(struct xen_ia64_privcmd_range* privcmd_range, int i) { @@ -576,7 +576,7 @@ xen_ia64_privcmd_entry_open(struct xen_i } } -static int +static void xen_ia64_privcmd_entry_close(struct xen_ia64_privcmd_range* privcmd_range, int i) { -------------- next part -------------- A non-text attachment was scrubbed... Name: fix_non-void.patch Type: application/octet-stream Size: 643 bytes Desc: not available URL: From bench at silentmedia.com Thu Jun 1 08:23:49 2006 From: bench at silentmedia.com (Ben) Date: Thu, 1 Jun 2006 01:23:49 -0700 Subject: [Fedora-xen] slow disk performance in Xen0 FC5 In-Reply-To: References: Message-ID: <321EB8A5-049D-41E3-BD5E-5425D44BD77A@silentmedia.com> It helped me a lot (but did not really fix the problem) when I set my disk queueing mode to deadline, from whatever it had been before. For instance, on my domU: echo deadline > /sys/block/xvda/queue/scheduler The command is similar on the dom0, just use the appropriate block device. BUT, what *really* helped me out was to turn on write caching on my SATA raid card. It helped such an absurd amount that I have to suspect some corner case performance problem was being hit before, but I don't know what it would have been. On May 31, 2006, at 11:07 PM, Ashe Canvar wrote: > Hi all, > > My dom0 and domU machines are showing terrible disk performance > degradation. > > For instance my avg data read rate ( tested using hdparm -t /dev/hda) > is 55MB/s using the regular smp kernel but it falls to 2.6MB/s when I > boot into dom0. No other domains are runnign at this point. I have > looked for incrementing interrupts in ide0 , there are none. hdparm > shows that dma mode is enabled. dmesg shows that the same driver is > being used for both smp and dom0 cases ( Uniform Multi-Platform E-IDE > driver Revision: 7.00alpha2 ). > > I have total of 2Gig RAM in the box and dom0 is restricted to 512M. > > Any help appreciated ! > > Thanks, > -ashe > > [root at medusa1 ~]# rpm -qa | grep -i xen > kernel-xenU-2.6.16-1.2080_FC5 > kernel-xen0-2.6.16-1.2080_FC5 > xen-3.0.1-4 > > -- > Fedora-xen mailing list > Fedora-xen at redhat.com > https://www.redhat.com/mailman/listinfo/fedora-xen From takebe_akio at jp.fujitsu.com Thu Jun 1 11:28:57 2006 From: takebe_akio at jp.fujitsu.com (Akio Takebe) Date: Thu, 01 Jun 2006 20:28:57 +0900 Subject: [Fedora-xen] [RFC] cleanup warning (redefine MMIO_SIZE) Message-ID: <45C6856E923A0Ctakebe_akio@jp.fujitsu.com> Hi, all This issue is only for fedora-xen-ia64. fedora-xen-ia64 turn on CONFIG_FB_NEOMAGIC in .config. (xen-ia64-unstable is default turn off it) In the case of CONFIG_FB_NEOMAGIC=y, MMIO_SIZE is redefine. I think MMIO_SIZE in arch-ia64.h is only used in arch-ia64.h and xen/arch/ia64/vmx/vmx_init.c. Am I right? We should move some defines(e.g. MMIO_xxx) from public header to not public header because they are used only in vmx_init.c, shouldn't we? fedora-xen-ia64's warning is: In file included from drivers/video/neofb.c:85: include/video/neomagic.h:136:1: warning: "MMIO_SIZE" redefined In file included from include/xen/interface/xen.h:17, from include/asm/hypervisor.h:41, from include/asm/page.h:246, from include/asm/ptrace.h:86, from include/asm/processor.h:20, from include/asm/thread_info.h:11, from include/linux/thread_info.h:21, from include/linux/preempt.h:10, from include/linux/spinlock.h:50, from include/linux/capability.h:45, from include/linux/sched.h:7, from include/linux/module.h:10, from drivers/video/neofb.c:58: include/xen/interface/arch-ia64.h:71:1: warning: this is the location of the previous definition Best Regards, Akio Takebe From Tristan.Gingold at bull.net Thu Jun 1 11:47:19 2006 From: Tristan.Gingold at bull.net (Tristan Gingold) Date: Thu, 1 Jun 2006 13:47:19 +0200 Subject: [Fedora-xen] Re: [Xen-ia64-devel] [RFC] cleanup warning (redefine MMIO_SIZE) In-Reply-To: <45C6856E923A0Ctakebe_akio@jp.fujitsu.com> References: <45C6856E923A0Ctakebe_akio@jp.fujitsu.com> Message-ID: <200606011347.19199.Tristan.Gingold@bull.net> Le Jeudi 01 Juin 2006 13:28, Akio Takebe a ?crit : > Hi, all > > This issue is only for fedora-xen-ia64. > fedora-xen-ia64 turn on CONFIG_FB_NEOMAGIC in .config. > (xen-ia64-unstable is default turn off it) > In the case of CONFIG_FB_NEOMAGIC=y, MMIO_SIZE is redefine. > I think MMIO_SIZE in arch-ia64.h is only used > in arch-ia64.h and xen/arch/ia64/vmx/vmx_init.c. > Am I right? > > We should move some defines(e.g. MMIO_xxx) from public header > to not public header because they are used only > in vmx_init.c, shouldn't we? Yes. In my opinion, arch-ia64.h must be as small as possible and identifiers should be in the 'xen' name space. We are very far from the last point! Tristan. From listas at openlogic.com.br Thu Jun 1 12:19:38 2006 From: listas at openlogic.com.br (Leonardo Pinto) Date: Thu, 1 Jun 2006 10:19:38 -0200 Subject: [Fedora-xen] Re: FW: need your help In-Reply-To: <7DB05FAE36435F40BA952CF808CFE7B6D07593@HSDLNTD1110010.noida.hcltech.com> References: <7DB05FAE36435F40BA952CF808CFE7B6D07593@HSDLNTD1110010.noida.hcltech.com> Message-ID: <20060601120039.M78056@openlogic.com.br> *** An advice: He makes the description of its environment, generally aid very in these hours. Good, as you must have read in post previous, I ONLY got the functioning of the network in the version: 2.6.16-1.2096_FC5. And in this same version, I face some problems of performance with disk I/O. By incredible that seems, you are certain. This loaded module in the DomU's is only enough. -> "alias eth0 xennet" in "/etc/modprobe.conf" If not to function, only can be problem of the Xen in your Linux distribution. -- Leonardo Pinto listas#openlogic dot com br On Thu, 1 Jun 2006 11:49:26 +0530, Iqbal Ashraf, Noida wrote > Hi Pinto,I am also getting the same problem and could not find a solution to it. If you have been able to find it, can you please help me. > I already tried to configure "alias eth0 xennet" in:"/etc/modprobe.conf". However I do not get success!Simply the domain does not obtain to see of form some the interface. Bringing up interface eth0: xennet device eth0 does not seem to be present,delaying initialization.[FAILED] With RegardsIqbal Ashraf From iqbal.a at hcl.in Thu Jun 1 12:27:49 2006 From: iqbal.a at hcl.in (Iqbal Ashraf, Noida) Date: Thu, 1 Jun 2006 17:57:49 +0530 Subject: [Fedora-xen] RE: FW: need your help Message-ID: <7DB05FAE36435F40BA952CF808CFE7B6D07E8A@HSDLNTD1110010.noida.hcltech.com> Dear Pinto, I was using the version: 2.6.15-1.2054_FC5 .so, I will now try with the version specified by you. Thanks for the reply. With Regards Iqbal Ashraf -----Original Message----- From: Leonardo Pinto [mailto:listas at openlogic.com.br] Sent: Thursday, June 01, 2006 5:50 PM To: Iqbal Ashraf, Noida Cc: Fedora Xen Subject: Re: FW: need your help *** An advice: He makes the description of its environment, generally aid very in these hours. Good, as you must have read in post previous, I ONLY got the functioning of the network in the version: 2.6.16-1.2096_FC5. And in this same version, I face some problems of performance with disk I/O. By incredible that seems, you are certain. This loaded module in the DomU's is only enough. -> "alias eth0 xennet" in "/etc/modprobe.conf" If not to function, only can be problem of the Xen in your Linux distribution. -- Leonardo Pinto listas#openlogic dot com br On Thu, 1 Jun 2006 11:49:26 +0530, Iqbal Ashraf, Noida wrote > Hi Pinto,I am also getting the same problem and could not find a solution to it. If you have been able to find it, can you please help me. > I already tried to configure "alias eth0 xennet" in:"/etc/modprobe.conf". However I do not get success!Simply the domain does not obtain to see of form some the interface. Bringing up interface eth0: xennet device eth0 does not seem to be present,delaying initialization.[FAILED] With RegardsIqbal Ashraf DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or HCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of HCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. Before opening any mail and attachments please check them for viruses and defect. ----------------------------------------------------------------------------------------------------------------------- From aron at hp.com Thu Jun 1 14:45:27 2006 From: aron at hp.com (Aron Griffis) Date: Thu, 1 Jun 2006 10:45:27 -0400 Subject: [Fedora-xen] xen-ia64 heads up, missing asm/asmmacro.h In-Reply-To: <3FC685443FF244takebe_akio@jp.fujitsu.com> References: <20060530224401.GK23787@vino.zko.hp.com> <3FC685443FF244takebe_akio@jp.fujitsu.com> Message-ID: <20060601144526.GL23787@vino.zko.hp.com> Hi Akio, Akio Takebe wrote: [Thu Jun 01 2006, 02:26:00AM EDT] > You should use my fix patch. > http://lists.xensource.com/archives/html/xen-ia64-devel/2006-05/msg00433.html Yep, I noticed that last evening. Today I'll update the repo to xen-unstable (Alex and Keir just synced) and that will pull in your patch. Thanks for pointing it out. Regards, Aron -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From alex.williamson at hp.com Thu Jun 1 14:43:36 2006 From: alex.williamson at hp.com (Alex Williamson) Date: Thu, 01 Jun 2006 08:43:36 -0600 Subject: [Fedora-xen] Re: [Xen-ia64-devel] [RFC] cleanup warning (redefine MMIO_SIZE) In-Reply-To: <200606011347.19199.Tristan.Gingold@bull.net> References: <45C6856E923A0Ctakebe_akio@jp.fujitsu.com> <200606011347.19199.Tristan.Gingold@bull.net> Message-ID: <1149173016.5480.8.camel@lappy> On Thu, 2006-06-01 at 13:47 +0200, Tristan Gingold wrote: > Le Jeudi 01 Juin 2006 13:28, Akio Takebe a ?crit : > > Hi, all > > > > This issue is only for fedora-xen-ia64. > > fedora-xen-ia64 turn on CONFIG_FB_NEOMAGIC in .config. > > (xen-ia64-unstable is default turn off it) > > In the case of CONFIG_FB_NEOMAGIC=y, MMIO_SIZE is redefine. > > I think MMIO_SIZE in arch-ia64.h is only used > > in arch-ia64.h and xen/arch/ia64/vmx/vmx_init.c. > > Am I right? > > > > We should move some defines(e.g. MMIO_xxx) from public header > > to not public header because they are used only > > in vmx_init.c, shouldn't we? > Yes. In my opinion, arch-ia64.h must be as small as possible and identifiers > should be in the 'xen' name space. We are very far from the last point! I agree as well. However, I also think the fedora-xen-ia64 tree should turn off CONFIG_FB_NEOMAGIC. AFAIK, there's absolutely no way that you'd ever need to use the NeoMagic frame buffer driver on an ia64 system. Thanks, Alex -- Alex Williamson HP Open Source & Linux Org. From garyshi at gmail.com Thu Jun 1 15:56:27 2006 From: garyshi at gmail.com (Gary Shi) Date: Thu, 1 Jun 2006 23:56:27 +0800 Subject: [Fedora-xen] NAT routing causes TCP checksum error Message-ID: I've set up my a xen server as my LAN gateway, which has a DSL connection and does NAT masquerade for the LAN, and I run several domU on the server with routing network settings. All things work smoothly except the xenU domains can't reach the internet with TCP: ping works fine, telnet can establish connection and receive server packets, but real data packets sent through ppp0 shows checksum error (tcpdump -vv shows cksum incorrect). Then I found the problem on xensource community faq, and after I followed his instruction to turned off the TX checksumming, my network works properly. http://wiki.xensource.com/xenwiki/XenFaq#head-4ce9767df34fe1c9cf4f85f7e07cb10110eae9b7 And here's a post describing some details, could you guys fix the problem in xen0 kernel so we won't get stuck by this problem again? http://lists.xensource.com/archives/html/xen-users/2006-04/msg00032.html -- regards, Gary Shi -------------- next part -------------- An HTML attachment was scrubbed... URL: From rafiq.ahamed at hp.com Thu Jun 1 16:24:44 2006 From: rafiq.ahamed at hp.com (Ahamed K, Rafiq (HP)) Date: Thu, 1 Jun 2006 12:24:44 -0400 Subject: [Fedora-xen] HVM Loader Doesn't See the "vcpus" Parameter? In-Reply-To: <447E585F.2080907@campworld.net> Message-ID: <0B5B70C578796045A2F555952837914C01C2505D@tayexc13.americas.cpqcorp.net> I haven't read that anywhere. If you find a pointer, can you please forward me? And moreover in the latest XEN 3.0.2 they have the support for SMP Guests. And my belief was that was for vmx guests too? Thanks R -----Original Message----- From: Richard Camp [mailto:rcamp at campworld.net] Sent: Wednesday, May 31, 2006 9:01 PM To: Ahamed K, Rafiq (HP) Cc: fedora-xen at redhat.com Subject: Re: [Fedora-xen] HVM Loader Doesn't See the "vcpus" Parameter? Hello, If memory serves me correctly Intel's VT-X technology supports only one virtual cpu. Even if you have 4 cores the guest OS will only see one of them. Multiprocessor Windows would be pointless. A modified xen guest would see multiple cpus. Richard Ahamed K, Rafiq (HP) wrote: > Every time "hvmloader" comes up to load a VM, it shows cpu=1 as > detected, no matter what number you give in .hvm configuration file. I > have vcpus=2 and cpus = "2-4" in my .hvm file! > > Any idea why is this? Or Am I missing anything? > > I am guessing due to this I am not able to run the un-modified > "Multiprocessor" Windows. > > Any help would be appreciated. > > Thanks R > > > These are the details of my configuration > > I am having a server with 2 dual core XEON with VT-x enabled on it. > > Linux linux 2.6.16.13-xen #2 SMP Wed May 24 10:41:28 MDT 2006 i686 > i686 i386 GNU/Linux > > linux:~ # xm info > host : linux > release : 2.6.16.13-xen > version : #2 SMP Wed May 24 10:41:28 MDT 2006 > machine : i686 > nr_cpus : 8 > nr_nodes : 1 > sockets_per_node : 2 > cores_per_socket : 2 > threads_per_core : 2 > cpu_mhz : 2667 > hw_caps : > bfebfbff:20100000:00000000:00000180:000064bd:00000000:00000001 > total_memory : 3583 > free_memory : 2522 > xen_major : 3 > xen_minor : 0 > xen_extra : -unstable > xen_caps : xen-3.0-x86_32 hvm-3.0-x86_32 > platform_params : virt_start=0xfc000000 > xen_changeset : Sun May 21 20:15:58 2006 +0100 10058:14717dedba02 > cc_compiler : gcc version 4.0.2 20050901 (prerelease) (SUSE > Linux) > cc_compile_by : root > cc_compile_domain : local > cc_compile_date : Wed May 24 10:31:04 MDT 2006 > > ------------------------------------------------------------------------ > > -- > Fedora-xen mailing list > Fedora-xen at redhat.com > https://www.redhat.com/mailman/listinfo/fedora-xen > From dmourati at gmail.com Thu Jun 1 22:42:16 2006 From: dmourati at gmail.com (Demetri Mouratis) Date: Thu, 1 Jun 2006 15:42:16 -0700 Subject: [Fedora-xen] Xenguest-install.py Tries to boot non-xen kernel Bad File Descriptor Message-ID: <3cc2cbc40606011542w1378a6bcifabe12a6fc5a1b96@mail.gmail.com> I've installed xen on top of FC5 as the dom0 and am running into trouble starting my first domU. I'm following the FedoraXenQuickstartFC5 here: http://fedoraproject.org/wiki/FedoraXenQuickstartFC5 Here's the dom0: [root at db4 ~]# uname -a Linux db4.rnmd.net 2.6.16-1.2122_FC5xen0 #1 SMP Sun May 21 15:34:43 EDT 2006 i686 i686 i386 GNU/Linux And the command to install: [root at db4 ~]# xenguest-install.py -n xendomain1 -f /home/xen/xendomain1 -s 25 -r 256 -l http://ops1.rnmd.net/fedora/core/5/i386/os -x ks=http://ops1.rnmd.net/kickstart/cfgs/ks-fedora-core-5-xen-guest.cfg And the result: sending termination signals...done sending kill signals...done disabling swap... /dev/mapper/VolGroup00-LogVol01 unmounting filesystems... /mnt/runtime done disabling /dev/loop0 /proc done /dev/pts done /sys done /tmp/ramfs done /selinux done /mnt/sysimage/boot done /mnt/sysimage/proc done /mnt/sysimage/sys done /mnt/sysimage/selinux done /mnt/sysimage/dev done /mnt/sysimage done rebooting system Restarting system. If your install completed successfully, you can restart your guest by running 'xm create -c xendomain1'. [root at db4 ~]# xm create -c xendomain1 Using config file "/etc/xen/xendomain1". Going to boot Fedora Core (2.6.15-1.2054_FC5smp) kernel: /vmlinuz-2.6.15-1.2054_FC5smp initrd: /initrd-2.6.15-1.2054_FC5smp.img Error: (9, 'Bad file descriptor') It looks to me like the problem is that xm create is trying to boot a non xen Kernel. Anyone else seeing this behavior? Thanks. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=192911 From takebe_akio at jp.fujitsu.com Fri Jun 2 05:48:03 2006 From: takebe_akio at jp.fujitsu.com (Akio Takebe) Date: Fri, 02 Jun 2006 14:48:03 +0900 Subject: [Fedora-xen] FW: [IA64]We have successfullybooteddom0/domU/domVTI (xen/ia64) on FC5 In-Reply-To: <1149133661.7431.7.camel@aglarond.local> References: <9FBCE015AF479F46B3B410499F3AE05B011EC67E@pdsmsx405> <1149133661.7431.7.camel@aglarond.local> Message-ID: <53C686081D354Ftakebe_akio@jp.fujitsu.com> Hi, Jeremy I made a patch to support initrd of domU. I think it work good in the case of using xen-ia64-usntable. I'm checking fedora-xen-ia64 now, please wait. If necessary, I'll make a patch. :-) Best Regards, Akio Takebe >On Thu, 2006-06-01 at 10:21 +0800, Zhang, Xiantao wrote: >> From the last mail: >> Currently the ext3 is compiled as module, however initrd doesn't work >> for domU even when we add "ramdisk=" in config file. So we change ext3 to >> be kernel built-in, and then domU can boot up immediately. > >Right -- my question was why don't initrds work. This is really a >requirement given how some of the early boot process works. There are >ways you can hack around it, but they'll always be just that, a hack. > >Jeremy > >-- >Fedora-xen mailing list >Fedora-xen at redhat.com >https://www.redhat.com/mailman/listinfo/fedora-xen From takebe_akio at jp.fujitsu.com Fri Jun 2 05:43:16 2006 From: takebe_akio at jp.fujitsu.com (Akio Takebe) Date: Fri, 02 Jun 2006 14:43:16 +0900 Subject: [Fedora-xen] Re: [Xen-ia64-devel] [RFC] cleanup warning (redefine MMIO_SIZE) In-Reply-To: <1149173016.5480.8.camel@lappy> References: <45C6856E923A0Ctakebe_akio@jp.fujitsu.com> <200606011347.19199.Tristan.Gingold@bull.net> <1149173016.5480.8.camel@lappy> Message-ID: <52C68607724394takebe_akio@jp.fujitsu.com> Hi, Alex, Tristan and Aron > I agree as well. However, I also think the fedora-xen-ia64 tree >should turn off CONFIG_FB_NEOMAGIC. AFAIK, there's absolutely no way >that you'd ever need to use the NeoMagic frame buffer driver on an ia64 >system. Thanks, > Yes, I agree about turning off NeoMagic. This is old FB driver. So I also think NeoMagic isn't needed by ia64. Aron, could you turn off CONFIG_FB_NEOMAGIC? BTW, I'll cleanup arch-ia64.h. :-) Best Regards, Akio Takebe From christoph.ehret at unifr.ch Fri Jun 2 09:51:41 2006 From: christoph.ehret at unifr.ch (Christoph Ehret) Date: Fri, 02 Jun 2006 11:51:41 +0200 Subject: [Fedora-xen] xend hang on during startup on Bridge firewalling registered Message-ID: <1149241901.16462.15.camel@diufpc190.unifr.ch> Hi, I just followed the instruction on http://fedoraproject.org/wiki/FedoraXenQuickstartFC5 but when I boot on the LinuxXen kernel, it hangs on "Starting xend: Bridge firewalling registered" and then I have seven or more lines of vif0.0: received packet with own address as source address Now, if I start in interactive mode and does not start xend during boot, I can then log into the system and then start xend . Here I have again these lines of vif0.0: received ... , but at least xend finishes the start process. What have I to do that I works without having to start in Interactive mode and that the vif0.0: received... messages disappear ? Just to mention that my laptop is not connected to the internet, but this should not be the problem I think, isn't it ? Thanks for your answers. Seeu Chris From ikent at redhat.com Fri Jun 2 15:22:47 2006 From: ikent at redhat.com (Ian Kent) Date: Fri, 02 Jun 2006 23:22:47 +0800 Subject: [Fedora-xen] Xen install of other than FC5 on FC5 Dom0 Message-ID: <1149261767.18181.3.camel@raven.themaw.net> Hi all, It appears that I can only build FC5 guests on my FC5 machine. Anyone have any pointers to documentation that can explain creating guests of another distribution, such as Rawhide, on my FC5 box? Ian From bishoptf at gmail.com Fri Jun 2 15:31:18 2006 From: bishoptf at gmail.com (Tom Bishop) Date: Fri, 2 Jun 2006 10:31:18 -0500 Subject: [Fedora-xen] Xen install of other than FC5 on FC5 Dom0 In-Reply-To: <1149261767.18181.3.camel@raven.themaw.net> References: <1149261767.18181.3.camel@raven.themaw.net> Message-ID: Well in a hurry but you can install most any distribution you want, I have probably 5, suse, ubuntu, debian, the only one that I haven't is FreeBSD (on my to do list). The distributions don't make it as easy to do but there are several ways to do it. The way I have done it is to boot up one a second drive and do the installation there, then re-boot under the orginial FC5 drive and mount the second drive and copy (cp -ax) to a file.img or your partitions that you want to use. you can also install to a partition on your existing drive but sometimes they may overwrite your orginial boot-loader. Will provide some more detail links that will provide more information but don't have time right now..hope this helps a little right now. On 6/2/06, Ian Kent wrote: > > > Hi all, > > It appears that I can only build FC5 guests on my FC5 machine. > > Anyone have any pointers to documentation that can explain creating > guests of another distribution, such as Rawhide, on my FC5 box? > > Ian > > > -- > Fedora-xen mailing list > Fedora-xen at redhat.com > https://www.redhat.com/mailman/listinfo/fedora-xen > -------------- next part -------------- An HTML attachment was scrubbed... URL: From aron at hp.com Fri Jun 2 15:32:05 2006 From: aron at hp.com (Aron Griffis) Date: Fri, 2 Jun 2006 11:32:05 -0400 Subject: [Fedora-xen] fedora-xen-ia64 integration, step 1 Message-ID: <20060602153205.GE19677@vino.zko.hp.com> Hi Dave and Juan, I'd like to get started on the path to integrating the fedora-xen-ia64 work into fedora. There are a number of pieces that I'll be trying to pull together over the next few days. The biggest/hardest piece is the kernel rpm. I've split the changes into two parts: 1. generic fixes and enablement 2. ia64 xen integration This mail contains the first part. For the second part, I'd like to request that Juan updates his patch to the most recent xen-unstable first. Then I'll work on making it build on ia64 and send back whatever changes are necessary, including the ia64-xen[0U] configs. Once the kernel rpm is working, it should be a relatively simple matter to make the remainder of modifications to "turn on" xen-ia64. Sound reasonable? Regards, Aron -- This patch makes the following changes to the kernel specfile: - abstract xenlinux build using xen_flags, xen_target and xen_image instead of assuming x86 behavior - add xen_* overrides to %ifarch ia64, won't be used until buildxen is flipped on for ia64 - run the xen-mkbuildtree-pre hook following applying the xen patch. This touches a couple files on ia64 but doesn't interfere with any patching down the line. (I and others have been submitting patches to xen-ia64-devel and xen-devel to further reduce its function, but it should be harmless as-is.) - update numerous hardcoded references to /boot to use %{image_install_path} instead. But make an exception for the xenU kernels which never need to be available for system boot. - build the hypervisor with %{?_smp_mflags} (it works fine) Signed-off-by: Aron Griffis --- kernel-2.6.spec.orig 2006-06-01 19:12:59.000000000 -0400 +++ kernel-2.6.spec 2006-06-02 11:18:33.000000000 -0400 @@ -32,6 +32,9 @@ %define xen_version 20060524 %define make_target bzImage %define kernel_image x86 +%define xen_flags verbose=y debug=y crash_debug=y +%define xen_target vmlinuz +%define xen_image vmlinuz %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} @@ -127,11 +130,15 @@ %endif %ifarch ia64 -%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config +%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64*.config %define image_install_path boot/efi/EFI/redhat %define signmodules 1 %define make_target compressed %define kernel_image vmlinux.gz +# ia64 doesn't building with debug=y at the moment +%define xen_flags verbose=y crash_debug=y +%define xen_target compressed +%define xen_image vmlinux.gz %endif # @@ -834,6 +841,15 @@ # Delete the rest of the backup files, they just confuse the build later find -name "*.p.xen" | xargs rm -f +# Run the xen-mkbuildtree-pre hook, if it exists for this architecture. +# Hopefully this is kept clean (or non-existent) so that patches aren't confused +# further down the line. Presently it's used only for ia64, and only for files +# that we aren't interested in patching. +if [[ -f "arch/%{_arch}/xen-mkbuildtree-pre" ]]; then + chmod +x arch/%{_arch}/xen-mkbuildtree-pre + arch/%{_arch}/xen-mkbuildtree-pre +fi + # # Xen includes a patch which moves the vsyscall fixmap into a user-space VA, # freeing user-space from reliance on an absolute fixmap area and so allowing @@ -1157,7 +1173,13 @@ mkdir -p $RPM_BUILD_ROOT/%{image_install_path} install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer - cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer + if [[ "$Flavour" == *xenU* ]]; then + # xenU kernels should always install to /boot + # because they're never needed for system boot + cp $KernelImage $RPM_BUILD_ROOT/boot/vmlinuz-$KernelVer + else + cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer + fi if [ -f arch/$Arch/boot/zImage.stub ]; then cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || : fi @@ -1293,15 +1315,15 @@ %if %{includexen} %if %{buildxen} cd xen - mkdir -p $RPM_BUILD_ROOT/%{image_install_path} + mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot %if %{buildxenPAE} - make debug=y verbose=y crash_debug=y pae=y - install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}-PAE + make %{xen_flags} pae=y + install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}-PAE install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE make clean %endif - make debug=y verbose=y crash_debug=y - install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL} + make %{?_smp_mflags} %{xen_flags} + install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL} install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL} cd .. %endif @@ -1310,31 +1332,31 @@ cd linux-%{kversion}.%{_target_cpu} %if %{buildup} -BuildKernel %make_target %kernel_image +BuildKernel %{make_target} %{kernel_image} %endif %if %{buildpae} -BuildKernel %make_target %kernel_image PAE +BuildKernel %{make_target} %{kernel_image} PAE %endif %if %{buildsmp} -BuildKernel %make_target %kernel_image smp +BuildKernel %{make_target} %{kernel_image} smp %endif %if %{includexen} %if %{buildxenPAE} -BuildKernel vmlinuz vmlinuz xen0-PAE -BuildKernel vmlinuz vmlinuz xenU-PAE +BuildKernel %{xen_target} %{xen_image} xen0-PAE +BuildKernel %{xen_target} %{xen_image} xenU-PAE %endif %if %{buildxen} -BuildKernel vmlinuz vmlinuz xen0 -BuildKernel vmlinuz vmlinuz xenU +BuildKernel %{xen_target} %{xen_image} xen0 +BuildKernel %{xen_target} %{xen_image} xenU %endif %endif %if %{buildkdump} -BuildKernel %make_target %kernel_image kdump +BuildKernel %{make_target} %{kernel_image} kdump %endif ### @@ -1443,7 +1465,7 @@ %post xen0 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0 -/sbin/new-kernel-pkg --package kernel-xen0 --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen0 +/sbin/new-kernel-pkg --package kernel-xen0 --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL} %{KVERREL}xen0 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X %post xen0-devel @@ -1469,7 +1491,7 @@ %post xen0-PAE [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0-PAE -/sbin/new-kernel-pkg --package kernel-xen0-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen0-PAE +/sbin/new-kernel-pkg --package kernel-xen0-PAE --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}-PAE %{KVERREL}xen0-PAE [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X %post xen0-PAE-devel @@ -1611,7 +1633,7 @@ /%{image_install_path}/vmlinuz-%{KVERREL}xen0 /boot/System.map-%{KVERREL}xen0 /boot/config-%{KVERREL}xen0 -/boot/xen.gz-%{KVERREL} +/%{image_install_path}/xen.gz-%{KVERREL} /boot/xen-syms-%{KVERREL} %dir /lib/modules/%{KVERREL}xen0 /lib/modules/%{KVERREL}xen0/kernel @@ -1628,7 +1650,7 @@ %files xenU %defattr(-,root,root) -/%{image_install_path}/vmlinuz-%{KVERREL}xenU +/boot/vmlinuz-%{KVERREL}xenU /boot/System.map-%{KVERREL}xenU /boot/config-%{KVERREL}xenU %dir /lib/modules/%{KVERREL}xenU @@ -1651,7 +1673,7 @@ /%{image_install_path}/vmlinuz-%{KVERREL}xen0-PAE /boot/System.map-%{KVERREL}xen0-PAE /boot/config-%{KVERREL}xen0-PAE -/boot/xen.gz-%{KVERREL}-PAE +/%{image_install_path}/xen.gz-%{KVERREL}-PAE /boot/xen-syms-%{KVERREL}-PAE %dir /lib/modules/%{KVERREL}xen0-PAE /lib/modules/%{KVERREL}xen0-PAE/kernel @@ -1668,7 +1690,7 @@ %files xenU-PAE %defattr(-,root,root) -/%{image_install_path}/vmlinuz-%{KVERREL}xenU-PAE +/boot/vmlinuz-%{KVERREL}xenU-PAE /boot/System.map-%{KVERREL}xenU-PAE /boot/config-%{KVERREL}xenU-PAE %dir /lib/modules/%{KVERREL}xenU-PAE -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From ikent at redhat.com Fri Jun 2 15:38:10 2006 From: ikent at redhat.com (Ian Kent) Date: Fri, 02 Jun 2006 23:38:10 +0800 Subject: [Fedora-xen] Xen install of other than FC5 on FC5 Dom0 In-Reply-To: References: <1149261767.18181.3.camel@raven.themaw.net> Message-ID: <1149262690.18181.8.camel@raven.themaw.net> On Fri, 2006-06-02 at 10:31 -0500, Tom Bishop wrote: > Well in a hurry but you can install most any distribution you want, I > have probably 5, suse, ubuntu, debian, the only one that I haven't is > FreeBSD (on my to do list). The distributions don't make it as easy > to do but there are several ways to do it. The way I have done it is > to boot up one a second drive and do the installation there, then > re-boot under the orginial FC5 drive and mount the second drive and > copy (cp -ax) to a file.img or your partitions that you want to use. > you can also install to a partition on your existing drive but > sometimes they may overwrite your orginial boot-loader. Will provide > some more detail links that will provide more information but don't > have time right now..hope this helps a little right now. So are we assuming the install to the other disk will use Grub (ie. will the pygrub work here) or are you constructing a specific configuration? > > On 6/2/06, Ian Kent wrote: > > Hi all, > > It appears that I can only build FC5 guests on my FC5 machine. > > Anyone have any pointers to documentation that can explain > creating > guests of another distribution, such as Rawhide, on my FC5 > box? > > Ian > > > -- > Fedora-xen mailing list > Fedora-xen at redhat.com > https://www.redhat.com/mailman/listinfo/fedora-xen > From katzj at redhat.com Fri Jun 2 15:48:39 2006 From: katzj at redhat.com (Jeremy Katz) Date: Fri, 02 Jun 2006 11:48:39 -0400 Subject: [Fedora-xen] fedora-xen-ia64 integration, step 1 In-Reply-To: <20060602153205.GE19677@vino.zko.hp.com> References: <20060602153205.GE19677@vino.zko.hp.com> Message-ID: <1149263319.24623.1.camel@aglarond.local> On Fri, 2006-06-02 at 11:32 -0400, Aron Griffis wrote: > - update numerous hardcoded references to /boot to use > %{image_install_path} instead. But make an exception for the > xenU kernels which never need to be available for system > boot. For consistency with native, I'd prefer the kernels for xenU to also end up in %{image_install_path}. Jeremy From quintela at redhat.com Fri Jun 2 16:14:25 2006 From: quintela at redhat.com (Juan Quintela) Date: Fri, 02 Jun 2006 18:14:25 +0200 Subject: [Fedora-xen] Re: fedora-xen-ia64 integration, step 1 In-Reply-To: <20060602153205.GE19677@vino.zko.hp.com> References: <20060602153205.GE19677@vino.zko.hp.com> Message-ID: <1149264866.3003.12.camel@troll.mitica> On Fri, 2006-06-02 at 11:32 -0400, Aron Griffis wrote: > Hi Dave and Juan, Hi Aron > -- > This patch makes the following changes to the kernel specfile: > > - abstract xenlinux build using xen_flags, xen_target and > xen_image instead of assuming x86 behavior > > - add xen_* overrides to %ifarch ia64, won't be used until > buildxen is flipped on for ia64 > > - run the xen-mkbuildtree-pre hook following applying the xen > patch. This touches a couple files on ia64 but doesn't > interfere with any patching down the line. (I and others have > been submitting patches to xen-ia64-devel and xen-devel to > further reduce its function, but it should be harmless as-is.) I think that this one is not acceptable :( We compile from the same source on _all_ architectures. If the source changes from architecture to architecture, we are broken :( Notice also that I do my compile testing as something like:i cd tree for arch in $CONFIGS; do make O=../$ARCH all done Or somesuch. What is on that patch, anyways. > - update numerous hardcoded references to /boot to usetu > %{image_install_path} instead. But make an exception for the > xenU kernels which never need to be available for system > boot. Uh, oh. If everything happens as I hope, after this weekend, xenU kernel is history. xen0 & xenU kernels are going to be the same kernel :p You need another solution here. I haven't studied the ia64 efi thing to be able to suggest anything, sorry. > - build the hypervisor with %{?_smp_mflags} (it works fine) > %if %{buildup} > -BuildKernel %make_target %kernel_image > +BuildKernel %{make_target} %{kernel_image} > %endif Any reason why you do this changes? in space separated cases, it shouldn't be needed the use of {} Hope that this helps. Later, Juan. From aron at hp.com Fri Jun 2 16:22:12 2006 From: aron at hp.com (Aron Griffis) Date: Fri, 2 Jun 2006 12:22:12 -0400 Subject: [Fedora-xen] fedora-xen-ia64 integration, step 1 In-Reply-To: <1149263319.24623.1.camel@aglarond.local> References: <20060602153205.GE19677@vino.zko.hp.com> <1149263319.24623.1.camel@aglarond.local> Message-ID: <20060602162212.GB28164@olive.flatmonk> Jeremy Katz wrote: [Fri Jun 02 2006, 11:48:39AM EDT] > On Fri, 2006-06-02 at 11:32 -0400, Aron Griffis wrote: > > - update numerous hardcoded references to /boot to use > > %{image_install_path} instead. But make an exception for the > > xenU kernels which never need to be available for system > > boot. > > For consistency with native, I'd prefer the kernels for xenU to also end > up in %{image_install_path}. Ok, it doesn't make a huge difference to me. I was just trying to spare the efi partition, but it's not a big deal. Aron -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From aron at hp.com Fri Jun 2 16:37:14 2006 From: aron at hp.com (Aron Griffis) Date: Fri, 2 Jun 2006 12:37:14 -0400 Subject: [Fedora-xen] Re: fedora-xen-ia64 integration, step 1 In-Reply-To: <1149264866.3003.12.camel@troll.mitica> References: <20060602153205.GE19677@vino.zko.hp.com> <1149264866.3003.12.camel@troll.mitica> Message-ID: <20060602163714.GC28164@olive.flatmonk> Juan Quintela wrote: [Fri Jun 02 2006, 12:14:25PM EDT] > > - run the xen-mkbuildtree-pre hook following applying the xen > > patch. This touches a couple files on ia64 but doesn't > > interfere with any patching down the line. (I and others have > > been submitting patches to xen-ia64-devel and xen-devel to > > further reduce its function, but it should be harmless as-is.) > > I think that this one is not acceptable :( > We compile from the same source on _all_ architectures. If the source > changes from architecture to architecture, we are broken :( > > Notice also that I do my compile testing as something like:i > > cd tree > for arch in $CONFIGS; do > make O=../$ARCH all > done Ok, we can make this work, no problem :-) Here is the current xen-mkbuildtree-pre in xen-unstable: http://xenbits.xensource.com/xen-unstable.hg?f=a2d784a51f25;file=linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Instead of running it only on ia64, we can run it on all architectures. Since the recent patches, the last remaining files created by that script are: include/asm-ia64/xen/asm-xsi-offsets.h drivers/xen/core/xenia64_init.c Neither of those affect any architecture other than ia64. I'm hoping to move the second one to a better home next week. The first one is less trivial since it's auto-generated in the hypervisor build. > > - update numerous hardcoded references to /boot to usetu > > %{image_install_path} instead. But make an exception for the > > xenU kernels which never need to be available for system > > boot. > > Uh, oh. If everything happens as I hope, after this weekend, xenU > kernel is history. xen0 & xenU kernels are going to be the same > kernel :p You need another solution here. I haven't studied the ia64 > efi thing to be able to suggest anything, sorry. No problem. I'm very happy to switch to a unified xen kernel. > > - build the hypervisor with %{?_smp_mflags} (it works fine) > > > > %if %{buildup} > > -BuildKernel %make_target %kernel_image > > +BuildKernel %{make_target} %{kernel_image} > > %endif > > Any reason why you do this changes? in space separated cases, it > shouldn't be needed the use of {} Nope, it just seemed more consistent with, for example, the %if conditional preceding it :-) Aron -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From quintela at redhat.com Fri Jun 2 16:53:02 2006 From: quintela at redhat.com (Juan Quintela) Date: Fri, 02 Jun 2006 18:53:02 +0200 Subject: [Fedora-xen] Re: fedora-xen-ia64 integration, step 1 In-Reply-To: <20060602163714.GC28164@olive.flatmonk> References: <20060602153205.GE19677@vino.zko.hp.com> <1149264866.3003.12.camel@troll.mitica> <20060602163714.GC28164@olive.flatmonk> Message-ID: <1149267183.3003.19.camel@troll.mitica> On Fri, 2006-06-02 at 12:37 -0400, Aron Griffis wrote: Hi I am going to integrate the _non_ problematic changes right now :) > Ok, we can make this work, no problem :-) > > Here is the current xen-mkbuildtree-pre in xen-unstable: > http://xenbits.xensource.com/xen-unstable.hg?f=a2d784a51f25;file=linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre > > Instead of running it only on ia64, we can run it on all > architectures. Since the recent patches, the last remaining files > created by that script are: > > include/asm-ia64/xen/asm-xsi-offsets.h > drivers/xen/core/xenia64_init.c Noooooooooooo, the sparse tree braindamage again :( xen-sparse tree is already brain-damaged enough for now, I think that addind this kind of "improvements" will make it completelly uncromprensible. If you already have a different repository, why don't you _just_ put that files into the right place in the 1st place? I will very much preffer to add another patch that this copy of files :p /me is just confused > Nope, it just seemed more consistent with, for example, the %if > conditional preceding it :-) Taking a look at integrating your changes. Thanks, Juan. From aron at hp.com Fri Jun 2 17:10:02 2006 From: aron at hp.com (Aron Griffis) Date: Fri, 2 Jun 2006 13:10:02 -0400 Subject: [Fedora-xen] fedora-xen-ia64 integration, step 1 In-Reply-To: <20060602153205.GE19677@vino.zko.hp.com> References: <20060602153205.GE19677@vino.zko.hp.com> Message-ID: <20060602171002.GD28164@olive.flatmonk> Here is an updated patch based on Juan's and Jeremy's comments. -- This patch makes the following changes to the kernel specfile: - abstract xenlinux build using xen_flags, xen_target and xen_image instead of assuming x86 behavior - add xen_* overrides to %ifarch ia64, won't be used until buildxen is flipped on for ia64 - run the ia64 xen-mkbuildtree-pre hook following applying the xen patch, on all architectures for consistency. - update numerous hardcoded references to /boot to use %{image_install_path} instead. No exception for xenU kernels. - build the hypervisor with %{?_smp_mflags} (it works fine) Signed-off-by: Aron Griffis --- kernel-2.6.spec.orig 2006-06-01 19:12:59.000000000 -0400 +++ kernel-2.6.spec 2006-06-02 13:05:34.000000000 -0400 @@ -32,6 +32,9 @@ %define xen_version 20060524 %define make_target bzImage %define kernel_image x86 +%define xen_flags verbose=y debug=y crash_debug=y +%define xen_target vmlinuz +%define xen_image vmlinuz %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} @@ -127,11 +130,15 @@ %endif %ifarch ia64 -%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config +%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64*.config %define image_install_path boot/efi/EFI/redhat %define signmodules 1 %define make_target compressed %define kernel_image vmlinux.gz +# ia64 doesn't building with debug=y at the moment +%define xen_flags verbose=y crash_debug=y +%define xen_target compressed +%define xen_image vmlinux.gz %endif # @@ -834,6 +841,11 @@ # Delete the rest of the backup files, they just confuse the build later find -name "*.p.xen" | xargs rm -f +# Run the ia64 xen-mkbuildtree-pre hook, which creates these symlinks: +# include/asm-ia64/xen/asm-xsi-offsets.h +# drivers/xen/core/xenia64_init.c +arch/ia64/xen-mkbuildtree-pre + # # Xen includes a patch which moves the vsyscall fixmap into a user-space VA, # freeing user-space from reliance on an absolute fixmap area and so allowing @@ -1293,15 +1305,15 @@ %if %{includexen} %if %{buildxen} cd xen - mkdir -p $RPM_BUILD_ROOT/%{image_install_path} + mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot %if %{buildxenPAE} - make debug=y verbose=y crash_debug=y pae=y - install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}-PAE + make %{xen_flags} pae=y + install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}-PAE install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE make clean %endif - make debug=y verbose=y crash_debug=y - install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL} + make %{?_smp_mflags} %{xen_flags} + install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL} install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL} cd .. %endif @@ -1323,13 +1335,13 @@ %if %{includexen} %if %{buildxenPAE} -BuildKernel vmlinuz vmlinuz xen0-PAE -BuildKernel vmlinuz vmlinuz xenU-PAE +BuildKernel %xen_target %xen_image xen0-PAE +BuildKernel %xen_target %xen_image xenU-PAE %endif %if %{buildxen} -BuildKernel vmlinuz vmlinuz xen0 -BuildKernel vmlinuz vmlinuz xenU +BuildKernel %xen_target %xen_image xen0 +BuildKernel %xen_target %xen_image xenU %endif %endif @@ -1443,7 +1455,7 @@ %post xen0 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0 -/sbin/new-kernel-pkg --package kernel-xen0 --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen0 +/sbin/new-kernel-pkg --package kernel-xen0 --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL} %{KVERREL}xen0 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X %post xen0-devel @@ -1469,7 +1481,7 @@ %post xen0-PAE [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0-PAE -/sbin/new-kernel-pkg --package kernel-xen0-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen0-PAE +/sbin/new-kernel-pkg --package kernel-xen0-PAE --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}-PAE %{KVERREL}xen0-PAE [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X %post xen0-PAE-devel @@ -1611,7 +1623,7 @@ /%{image_install_path}/vmlinuz-%{KVERREL}xen0 /boot/System.map-%{KVERREL}xen0 /boot/config-%{KVERREL}xen0 -/boot/xen.gz-%{KVERREL} +/%{image_install_path}/xen.gz-%{KVERREL} /boot/xen-syms-%{KVERREL} %dir /lib/modules/%{KVERREL}xen0 /lib/modules/%{KVERREL}xen0/kernel @@ -1651,7 +1663,7 @@ /%{image_install_path}/vmlinuz-%{KVERREL}xen0-PAE /boot/System.map-%{KVERREL}xen0-PAE /boot/config-%{KVERREL}xen0-PAE -/boot/xen.gz-%{KVERREL}-PAE +/%{image_install_path}/xen.gz-%{KVERREL}-PAE /boot/xen-syms-%{KVERREL}-PAE %dir /lib/modules/%{KVERREL}xen0-PAE /lib/modules/%{KVERREL}xen0-PAE/kernel -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From eric.marty1 at libertysurf.fr Fri Jun 2 18:30:13 2006 From: eric.marty1 at libertysurf.fr (Eric Marty) Date: Fri, 2 Jun 2006 20:30:13 +0200 Subject: [Fedora-xen] Kernel DomU ?????? In-Reply-To: <20060602163714.GC28164@olive.flatmonk> Message-ID: <001c01c68672$96c674e0$3201a8c0@ltlabo> Hello All, The stupid question ... When i boot in DOMU i have : Fedora Core release 3 kernel xen.2.6.16-xen on an i686 same with other version Fedora if i verify mu kernel with uname -a , i have Xen. If anybody can tell me Why ? Thanks Eric From aron at hp.com Fri Jun 2 20:54:30 2006 From: aron at hp.com (Aron Griffis) Date: Fri, 2 Jun 2006 16:54:30 -0400 Subject: [Fedora-xen] Re: fedora-xen-ia64 integration, step 1 In-Reply-To: <1149267183.3003.19.camel@troll.mitica> References: <20060602153205.GE19677@vino.zko.hp.com> <1149264866.3003.12.camel@troll.mitica> <20060602163714.GC28164@olive.flatmonk> <1149267183.3003.19.camel@troll.mitica> Message-ID: <20060602205429.GE28164@olive.flatmonk> Juan Quintela wrote: [Fri Jun 02 2006, 12:53:02PM EDT] > > Here is the current xen-mkbuildtree-pre in xen-unstable: > > http://xenbits.xensource.com/xen-unstable.hg?f=a2d784a51f25;file=linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre > > > > Instead of running it only on ia64, we can run it on all > > architectures. Since the recent patches, the last remaining files > > created by that script are: > > > > include/asm-ia64/xen/asm-xsi-offsets.h > > drivers/xen/core/xenia64_init.c > > Noooooooooooo, the sparse tree braindamage again :( > > xen-sparse tree is already brain-damaged enough for now, I think > that addind this kind of "improvements" will make it completelly > uncromprensible. I agree that it's an ugly hack. But please consider two things: 1. If you look at the revision history for xen-mkbuildtree-pre (at the link I posted above) you'll see that it's down from 12 files to 2 in the past month. We're working hard on getting rid of it completely. 2. The two files that are left have zero chance of confusing your patching process. One is regenerated on every build (asm-xsi-offsets.h). The other is planning to be moved soon. > If you already have a different repository, why don't you _just_ put > that files into the right place in the 1st place? Now I'm the one that's confused! :-( I don't have a different repository. I have a temporary xen-ia64-unstable tree ported to 2.6.17-rc5-git6 (at the moment) so I could generate linux-2.6-xen.patch. The repository I have personally is only for the purpose of prototyping this effort. At this point I'm working on going from prototyping to integration, which means that instead of using my temporary tree, we'll use the xen-unstable tree that you have already ported. xen-unstable and xen-ia64-unstable were synced just a couple days ago so it should work well on ia64. Thanks for looking at the changes. I'll work on eradicating xen-mkbuildtree-pre, but it will probably take a few days at least. Aron -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From quintela at redhat.com Sat Jun 3 03:17:49 2006 From: quintela at redhat.com (Juan Quintela) Date: Sat, 03 Jun 2006 05:17:49 +0200 Subject: [Fedora-xen] Re: fedora-xen-ia64 integration, step 1 In-Reply-To: <20060602205429.GE28164@olive.flatmonk> References: <20060602153205.GE19677@vino.zko.hp.com> <1149264866.3003.12.camel@troll.mitica> <20060602163714.GC28164@olive.flatmonk> <1149267183.3003.19.camel@troll.mitica> <20060602205429.GE28164@olive.flatmonk> Message-ID: <1149304669.3003.31.camel@troll.mitica> On Fri, 2006-06-02 at 16:54 -0400, Aron Griffis wrote: Hi > I agree that it's an ugly hack. But please consider two things: > > 1. If you look at the revision history for xen-mkbuildtree-pre (at the > link I posted above) you'll see that it's down from 12 files to > 2 in the past month. We're working hard on getting rid of it > completely. That is one steep in the right direction :) > 2. The two files that are left have zero chance of confusing your > patching process. One is regenerated on every build > (asm-xsi-offsets.h). The other is planning to be moved soon. It is my understanding that you generate this file during the hypervisor building, right. Just now, we are not generating file from the hypervisor, but we could generate it. > > If you already have a different repository, why don't you _just_ put > > that files into the right place in the 1st place? > > Now I'm the one that's confused! :-( Sorry, to confuse you. > I don't have a different repository. I have a temporary > xen-ia64-unstable tree ported to 2.6.17-rc5-git6 (at the moment) so > I could generate linux-2.6-xen.patch. The repository I have > personally is only for the purpose of prototyping this effort. ok, s/repository/tree/, or s/repository/local repository/. You are already patching the xen-unstable tree. Your patch contains several changes. Why don't you add just two files instead of a script that generates two links to two files that you also included in your patch? I am losing anything? Or could you, instead of generate the script that links the files, just include the files in the right place? > At this point I'm working on going from prototyping to integration, > which means that instead of using my temporary tree, we'll use the > xen-unstable tree that you have already ported. xen-unstable and > xen-ia64-unstable were synced just a couple days ago so it should work > well on ia64. Actually we use linux-2.6-xen instead of xen-unstable because it is a _real_ tree, and make everything _so_ much nicer :) What I don't understand is: a- all your changes are on xen-unstable, then they should also be on linux-2.6-xen, and you should do nothing, everything should be fine. b- some of your patches are not on xen-unstable, and you need to send me a patch. If you have to send me a patch to put on top of my linux-xen patch, then you can also include that two missing files instead of one sript that generates a link to them? I am missing anything? _ > Thanks for looking at the changes. I'll work on eradicating > xen-mkbuildtree-pre, but it will probably take a few days at least. A few days is not a problem at all :) Later, Juan. From eredicator at hugedesigns.net Mon Jun 5 05:41:44 2006 From: eredicator at hugedesigns.net (Eredicator X) Date: Mon, 5 Jun 2006 14:41:44 +0900 (JST) Subject: [Fedora-xen] FC4 on a FC5 Xen System Message-ID: <4153586.1831149486104793.JavaMail.root@maximus.hugedesigns.net> I am trying to install a FC4 domain on my Xen FC5 system that has several FC5 domains already running well. I get through the install questions and then am told that my url is invalid. I thought it was my tree so I made another ... then tested that with a FC4 install on a separate box and it works fine. I don't see any hints in the logs and if I switch to my FC5 tree the install takes off with out a problem. Can anyone point me to a tutorial or some reference for this.... I have googled around quite a bit and not found anything at this time...... Thanks all help is appreciated. E./ From ikent at redhat.com Mon Jun 5 08:29:32 2006 From: ikent at redhat.com (Ian Kent) Date: Mon, 05 Jun 2006 16:29:32 +0800 Subject: [Fedora-xen] FC4 on a FC5 Xen System In-Reply-To: <4153586.1831149486104793.JavaMail.root@maximus.hugedesigns.net> References: <4153586.1831149486104793.JavaMail.root@maximus.hugedesigns.net> Message-ID: <1149496172.4455.11.camel@raven.themaw.net> On Mon, 2006-06-05 at 14:41 +0900, Eredicator X wrote: > I am trying to install a FC4 domain on my Xen FC5 system that has several FC5 domains already running well. > > I get through the install questions and then am told that my url is invalid. I thought it was my tree so I made another ... then tested that with a FC4 install on a separate box and it works fine. I don't see any hints in the logs and if I switch to my FC5 tree the install takes off with out a problem. > > Can anyone point me to a tutorial or some reference for this.... I have googled around quite a bit and not found anything at this time...... I posted a similar question as well but with a slightly different view. I bet you'll find that your build tree doesn't have an images/xen/vmlinux or an images/xen/initrd.img (unless you've built them). Then there's the problem that an FC4 tree doesn't (usually) have a domU kernel either. If they were there, such as with Rawhide, then it still fails to start the install without any apparent clues in the log as far as I can see. At least that's my experience. Anyone willing to describe the process to build the boot kernel and init ramdisk and a domU kernel for FC4? Anyone know why the boot kernel and init ramdisk image in the Rawhide tree doesn't seem to work from FC5? Ian From eredicator at hugedesigns.net Mon Jun 5 08:53:31 2006 From: eredicator at hugedesigns.net (Eredicator X) Date: Mon, 5 Jun 2006 17:53:31 +0900 (JST) Subject: [Fedora-xen] FC4 on a FC5 Xen System Message-ID: <26616830.1921149497611222.JavaMail.root@maximus.hugedesigns.net> ----- Original Message ----- From: Ian Kent To: Eredicator X Cc: fedora-xen at redhat.com Sent: Monday, June 5, 2006 5:29:32 PM GMT+0900 Subject: Re: [Fedora-xen] FC4 on a FC5 Xen System On Mon, 2006-06-05 at 14:41 +0900, Eredicator X wrote: > I am trying to install a FC4 domain on my Xen FC5 system that has several FC5 domains already running well. > > I get through the install questions and then am told that my url is invalid. I thought it was my tree so I made another ... then tested that with a FC4 install on a separate box and it works fine. I don't see any hints in the logs and if I switch to my FC5 tree the install takes off with out a problem. > > Can anyone point me to a tutorial or some reference for this.... I have googled around quite a bit and not found anything at this time...... I posted a similar question as well but with a slightly different view. I bet you'll find that your build tree doesn't have an images/xen/vmlinux or an images/xen/initrd.img (unless you've built them). Then there's the problem that an FC4 tree doesn't (usually) have a domU kernel either. If they were there, such as with Rawhide, then it still fails to start the install without any apparent clues in the log as far as I can see. At least that's my experience. Anyone willing to describe the process to build the boot kernel and init ramdisk and a domU kernel for FC4? Anyone know why the boot kernel and init ramdisk image in the Rawhide tree doesn't seem to work from FC5? Ian Thanks Ian for making my request a little clearer.... I simply need to have a FC4 box so I can continue to use my current mail server and cut down on power consumption by combining boxes. This runs at my house and I pay the electric bill :(. I have seen posts on the Xen users list where people are running multiple os's cent debian ect. on thier Xen servers, so it is possible, I just need the how. Thanks again and any imput is appreciated. E./ From ikent at redhat.com Mon Jun 5 11:47:02 2006 From: ikent at redhat.com (Ian Kent) Date: Mon, 05 Jun 2006 19:47:02 +0800 Subject: [Fedora-xen] FC4 on a FC5 Xen System In-Reply-To: <26616830.1921149497611222.JavaMail.root@maximus.hugedesigns.net> References: <26616830.1921149497611222.JavaMail.root@maximus.hugedesigns.net> Message-ID: <1149508022.23299.4.camel@raven.themaw.net> On Mon, 2006-06-05 at 17:53 +0900, Eredicator X wrote: > ----- Original Message ----- > From: Ian Kent > To: Eredicator X > Cc: fedora-xen at redhat.com > Sent: Monday, June 5, 2006 5:29:32 PM GMT+0900 > Subject: Re: [Fedora-xen] FC4 on a FC5 Xen System > > On Mon, 2006-06-05 at 14:41 +0900, Eredicator X wrote: > > I am trying to install a FC4 domain on my Xen FC5 system that has several FC5 domains already running well. > > > > I get through the install questions and then am told that my url is invalid. I thought it was my tree so I made another ... then tested that with a FC4 install on a separate box and it works fine. I don't see any hints in the logs and if I switch to my FC5 tree the install takes off with out a problem. > > > > Can anyone point me to a tutorial or some reference for this.... I have googled around quite a bit and not found anything at this time...... > > I posted a similar question as well but with a slightly different view. > > I bet you'll find that your build tree doesn't have an > images/xen/vmlinux or an images/xen/initrd.img (unless you've built > them). Then there's the problem that an FC4 tree doesn't (usually) have > a domU kernel either. > > If they were there, such as with Rawhide, then it still fails to start > the install without any apparent clues in the log as far as I can see. > At least that's my experience. > > Anyone willing to describe the process to build the boot kernel and init > ramdisk and a domU kernel for FC4? > > Anyone know why the boot kernel and init ramdisk image in the Rawhide > tree doesn't seem to work from FC5? > > Ian > > > Thanks Ian for making my request a little clearer.... I simply need to have a FC4 box so I can continue to use my current mail server and cut down on power consumption by combining boxes. This runs at my house and I pay the electric bill :(. > > I have seen posts on the Xen users list where people are running multiple os's cent debian ect. on thier Xen servers, so it is possible, I just need the how. > > Thanks again and any imput is appreciated. As far as I can see (and I've just started poking around with Xen) running an unmodified OS needs a CPU with hardware vitalization support. This article seems to have a bunch of info. http://lwn.net/Articles/182080/ Ian From mito at chartermi.net Mon Jun 5 13:23:57 2006 From: mito at chartermi.net (Mito) Date: Mon, 5 Jun 2006 09:23:57 -0400 Subject: [Fedora-xen] FC4 on a FC5 Xen System In-Reply-To: <4153586.1831149486104793.JavaMail.root@maximus.hugedesigns.net> Message-ID: <001b01c688a3$4ea857e0$03c8a8c0@PAPA> I'm still a beginner in the world of Xen, but I did dive in pretty hard right away and learned a few good tricks. This page is a page of notes I took for myself for setting up exactly what you're trying to setup, a FC4 domU on a FC5 dom0. http://mitopia.net/index.php/Xen_3.0.2_Setup Mine too was necessary to for my mailserver (Scalix) to work, and it works perfectly in this environment. I am still tweaking with the IP-Tables portion of the NAT networking, but it is working. Hope this can be of some help. Mito -----Original Message----- From: fedora-xen-bounces at redhat.com [mailto:fedora-xen-bounces at redhat.com] On Behalf Of Eredicator X Sent: Monday, June 05, 2006 1:42 AM To: fedora-xen at redhat.com Subject: [Fedora-xen] FC4 on a FC5 Xen System I am trying to install a FC4 domain on my Xen FC5 system that has several FC5 domains already running well. I get through the install questions and then am told that my url is invalid. I thought it was my tree so I made another ... then tested that with a FC4 install on a separate box and it works fine. I don't see any hints in the logs and if I switch to my FC5 tree the install takes off with out a problem. Can anyone point me to a tutorial or some reference for this.... I have googled around quite a bit and not found anything at this time...... Thanks all help is appreciated. E./ -- Fedora-xen mailing list Fedora-xen at redhat.com https://www.redhat.com/mailman/listinfo/fedora-xen From sct at redhat.com Tue Jun 6 09:29:07 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Tue, 06 Jun 2006 10:29:07 +0100 Subject: [Fedora-xen] Problem starting a full virtualized Windows Guest In-Reply-To: References: Message-ID: <1149586147.5463.2.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Mon, 2006-05-15 at 16:25 +0200, Sven Oehme wrote: > i am running xen 3.0.2 on FC5 and try to setup a full virtualized > Windows Guest . > the installation Program starts , but as soon as it shows the text > Windows is starting in the left bottom, nothing more happens . I've found similar problems installing a fully-virtualised RHEL-4 onto FC-5; RHEL-3 installs fine. It seems that the IO emulation in Xen-3.0.2 (which is what FC-5 is using) has some problems in these cases. The rawhide kernel follows the upstream xen-unstable development branch, and that one works fine for RHEL-4 FV installs for me; does that help for you? Thanks, Stephen From ManognaR_C at infosys.com Tue Jun 6 10:55:26 2006 From: ManognaR_C at infosys.com (Manogna Ramakrishna Chebiyyam) Date: Tue, 6 Jun 2006 16:25:26 +0530 Subject: [Fedora-xen] Xen Message-ID: hi everyone, I work on fedora-core 5.I have been trying to install xen internally and i have been having problems. I have successfully installed domain 0 but having problems with installing domain-U. My hardware is SATA and this i have used LVM's.this is my partition ?????????????????????????????? Partitioning ?????????????????????????????? ? ? ? Device Start End Size Type Mount Point ? ? VG VolGroup00 4960M VolGroup ? ? ? LV LogVol01 544M swap ? ? ? LV LogVol00 4416M ext3 / ? ? ? /dev/xvda ? ? ? xvda1 1 13 101M ext3 /boot ? ? ? xvda2 14 652 5012M physical v ? ? ? ? ? ? ? ? ? ? ? ? ? ? and this is the error i get Fedora Core ???????????????? Exception Occurred ???????????????? ?????? ? ???? ? ? Traceback (most recent call last): ? ? ? ? Na? File "/usr/bin/anaconda", line 1218, in ? ? ? ? ? Si? intf.run(id, dispatch) ? ? ? ? Su? File "/usr/lib/anaconda/text.py", line ? ? ? ? ? 535, in run ? ? ? ? ? dispatch.gotoNext() ? ? ? ? St? File "/usr/lib/anaconda/dispatch.py", line ? ? ? ? ? 146, in gotoNext ? ? ? ? ? self.moveStep() ? ? ? ? ? File "/usr/lib/anaconda/dispatch.py", line ? ? ? ? ? 217, in moveStep ? ? ? ? T? rc = apply(func, self.bindArgs(args)) ? ? ? ? C? ? ? ? R? ?????? ?????????? ????????? ? ? ? ? ? OK ? ? Remote ? ? Debug ? ? ? ? ? ?????? ?????????? ????????? ? ? ? ? ? ? ?????? ? ???? ???????????????????????????????????????????????????? plzzz help me.Its an SOS call **************** CAUTION - Disclaimer ***************** This e-mail contains PRIVILEGED AND CONFIDENTIAL INFORMATION intended solely for the use of the addressee(s). If you are not the intended recipient, please notify the sender by e-mail and delete the original message. Further, you are not to copy, disclose, or distribute this e-mail or its contents to any other person and any such actions are unlawful. This e-mail may contain viruses. Infosys has taken every reasonable precaution to minimize this risk, but is not liable for any damage you may sustain as a result of any virus in this e-mail. You should carry out your own virus checks before opening the e-mail or attachment. Infosys reserves the right to monitor and review the content of all messages sent to or from this e-mail address. Messages sent to or from this e-mail address may be stored on the Infosys e-mail system. ***INFOSYS******** End of Disclaimer ********INFOSYS*** From sct at redhat.com Tue Jun 6 11:20:05 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Tue, 06 Jun 2006 12:20:05 +0100 Subject: [Fedora-xen] Xen install of other than FC5 on FC5 Dom0 In-Reply-To: <1149261767.18181.3.camel@raven.themaw.net> References: <1149261767.18181.3.camel@raven.themaw.net> Message-ID: <1149592806.5463.7.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Fri, 2006-06-02 at 23:22 +0800, Ian Kent wrote: > It appears that I can only build FC5 guests on my FC5 machine. > > Anyone have any pointers to documentation that can explain creating > guests of another distribution, such as Rawhide, on my FC5 box? Right now, rawhide is using a later version of Xen than FC5 (FC5 is using the 3.0.2 stable Xen release, whereas rawhide is tracking upstream Xen development). You can run an earlier guest on a later hypervisor/dom0, but not the other way around; so you can't run a rawhide guest on an FC5 xen0 kernel. People have reported success running a rawhide kernel on FC5, and using that to host a rawhide guest, though. --Stephen From oehmes at de.ibm.com Tue Jun 6 11:29:02 2006 From: oehmes at de.ibm.com (Sven Oehme) Date: Tue, 6 Jun 2006 13:29:02 +0200 Subject: [Fedora-xen] Problem starting a full virtualized Windows Guest In-Reply-To: <1149586147.5463.2.camel@sisko.sctweedie.blueyonder.co.uk> Message-ID: Hi , this is fixed in the xen-unstable repro since at least 2-3 Weeks, since that i never tried a redhat kernel, which kernel you are referring to , http://download.fedora.redhat.com/pub/fedora/linux/core/development/i386/os/Fedora/RPMS ? Sven "Stephen C. Tweedie" 06/06/2006 11:29 AM To Sven Oehme/Germany/IBM at IBMDE cc fedora-xen at redhat.com, Stephen Tweedie Subject Re: [Fedora-xen] Problem starting a full virtualized Windows Guest Hi, On Mon, 2006-05-15 at 16:25 +0200, Sven Oehme wrote: > i am running xen 3.0.2 on FC5 and try to setup a full virtualized > Windows Guest . > the installation Program starts , but as soon as it shows the text > Windows is starting in the left bottom, nothing more happens . I've found similar problems installing a fully-virtualised RHEL-4 onto FC-5; RHEL-3 installs fine. It seems that the IO emulation in Xen-3.0.2 (which is what FC-5 is using) has some problems in these cases. The rawhide kernel follows the upstream xen-unstable development branch, and that one works fine for RHEL-4 FV installs for me; does that help for you? Thanks, Stephen -------------- next part -------------- An HTML attachment was scrubbed... URL: From sct at redhat.com Tue Jun 6 11:34:41 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Tue, 06 Jun 2006 12:34:41 +0100 Subject: [Fedora-xen] FC4 on a FC5 Xen System In-Reply-To: <001b01c688a3$4ea857e0$03c8a8c0@PAPA> References: <001b01c688a3$4ea857e0$03c8a8c0@PAPA> Message-ID: <1149593681.5463.11.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Mon, 2006-06-05 at 09:23 -0400, Mito wrote: > I'm still a beginner in the world of Xen, but I did dive in pretty hard > right away and learned a few good tricks. This page is a page of notes I > took for myself for setting up exactly what you're trying to setup, a FC4 > domU on a FC5 dom0. > > http://mitopia.net/index.php/Xen_3.0.2_Setup I'm wondering why you took such a tortuous route to install xen-3.0.2 on FC5? FC5 comes with Xen already included, and # yum install xen would have installed it for you. FC5 updates currently carries xen-3.0.2 versions for both xen and kernel-xen*. Xen-3.0.2 won't run the early, pre-3.0.0 version of Xen that FC4 used, so to run FC4 on a FC5 host you will need some helping hands; as you described, qemu is ideal for that. Cheers, Stephen From sct at redhat.com Tue Jun 6 12:13:48 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Tue, 06 Jun 2006 13:13:48 +0100 Subject: [Fedora-xen] Xen In-Reply-To: References: Message-ID: <1149596028.5463.16.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Tue, 2006-06-06 at 16:25 +0530, Manogna Ramakrishna Chebiyyam wrote: > and this is the error i get To have any hope of helping, we'd need a lot more information. When did the error occur? How were you doing the install? Can you capture the anaconda log output to a remote host, using the "remote" key in the error dialogue? Thanks, Stephen From mito at chartermi.net Tue Jun 6 12:43:36 2006 From: mito at chartermi.net (Mito) Date: Tue, 6 Jun 2006 08:43:36 -0400 Subject: [Fedora-xen] FC4 on a FC5 Xen System In-Reply-To: <1149593681.5463.11.camel@sisko.sctweedie.blueyonder.co.uk> Message-ID: <001501c68966$d451adb0$03c8a8c0@PAPA> Hi, I know that FC5 comes with Xen already, and I know that I could have easily used yum to install it. The problem is, that using either of those options I was completely unable to get NAT networking to work, which in my specific case, was a must-have. So, I decided to torture myself, and came up with this process (which really isn't that big of a deal, the most torture is the actual setup of the domU, the Xen and dom0 setup was pretty painless). When installing via source, all I had to do was make sure that the modules needed to run NAT were included in the kernel, and the NAT networking worked perfectly first try. Thus, why I kept my walkthrough, and why I have given it as a resource to those who have had the same problems. Hopefully it will help someone who had the same difficulties as I had. Mito -----Original Message----- From: Stephen C. Tweedie [mailto:sct at redhat.com] Sent: Tuesday, June 06, 2006 7:35 AM To: Mito Cc: 'Eredicator X'; fedora-xen at redhat.com; Stephen Tweedie Subject: RE: [Fedora-xen] FC4 on a FC5 Xen System Hi, On Mon, 2006-06-05 at 09:23 -0400, Mito wrote: > I'm still a beginner in the world of Xen, but I did dive in pretty hard > right away and learned a few good tricks. This page is a page of notes I > took for myself for setting up exactly what you're trying to setup, a FC4 > domU on a FC5 dom0. > > http://mitopia.net/index.php/Xen_3.0.2_Setup I'm wondering why you took such a tortuous route to install xen-3.0.2 on FC5? FC5 comes with Xen already included, and # yum install xen would have installed it for you. FC5 updates currently carries xen-3.0.2 versions for both xen and kernel-xen*. Xen-3.0.2 won't run the early, pre-3.0.0 version of Xen that FC4 used, so to run FC4 on a FC5 host you will need some helping hands; as you described, qemu is ideal for that. Cheers, Stephen From sct at redhat.com Tue Jun 6 13:29:46 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Tue, 06 Jun 2006 14:29:46 +0100 Subject: [Fedora-xen] slow disk performance in Xen0 FC5 In-Reply-To: References: Message-ID: <1149600587.5463.19.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Wed, 2006-05-31 at 23:07 -0700, Ashe Canvar wrote: > For instance my avg data read rate ( tested using hdparm -t /dev/hda) > is 55MB/s using the regular smp kernel but it falls to 2.6MB/s when I > boot into dom0. No other domains are runnign at this point. I have > looked for incrementing interrupts in ide0 , there are none. If interrupt delivery is not happening, then that may certainly explain poor performance! There were some important fixes to Xen's irq delivery mechanism that have been added to FC5 since the 1.2080 kernel you are running. Could you please try updating to a newer kernel and seeing if you can reproduce the problem? Thanks, Stephen From sct at redhat.com Tue Jun 6 13:33:11 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Tue, 06 Jun 2006 14:33:11 +0100 Subject: [Fedora-xen] Xenguest-install.py Tries to boot non-xen kernel Bad File Descriptor In-Reply-To: <3cc2cbc40606011542w1378a6bcifabe12a6fc5a1b96@mail.gmail.com> References: <3cc2cbc40606011542w1378a6bcifabe12a6fc5a1b96@mail.gmail.com> Message-ID: <1149600791.5463.22.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Thu, 2006-06-01 at 15:42 -0700, Demetri Mouratis wrote: > [root at db4 ~]# xenguest-install.py -n xendomain1 -f > /home/xen/xendomain1 -s 25 -r 256 -l > http://ops1.rnmd.net/fedora/core/5/i386/os -x > ks=http://ops1.rnmd.net/kickstart/cfgs/ks-fedora-core-5-xen-guest.cfg ... > [root at db4 ~]# xm create -c xendomain1 > Using config file "/etc/xen/xendomain1". > Going to boot Fedora Core (2.6.15-1.2054_FC5smp) > kernel: /vmlinuz-2.6.15-1.2054_FC5smp > initrd: /initrd-2.6.15-1.2054_FC5smp.img > Error: (9, 'Bad file descriptor') > > It looks to me like the problem is that xm create is trying to boot a > non xen Kernel. Looks like it. What are the contents of your kickstart file? A non- kickstart domU install definitely leaves the domU, not the smp, kernel installed. -_Stephen From dmourati at gmail.com Tue Jun 6 16:40:08 2006 From: dmourati at gmail.com (Demetri Mouratis) Date: Tue, 6 Jun 2006 09:40:08 -0700 Subject: [Fedora-xen] Xenguest-install.py Tries to boot non-xen kernel Bad File Descriptor In-Reply-To: <1149600791.5463.22.camel@sisko.sctweedie.blueyonder.co.uk> References: <3cc2cbc40606011542w1378a6bcifabe12a6fc5a1b96@mail.gmail.com> <1149600791.5463.22.camel@sisko.sctweedie.blueyonder.co.uk> Message-ID: <3cc2cbc40606060940x64028f4axf310819140bb55dd@mail.gmail.com> On 6/6/06, Stephen C. Tweedie wrote: > Hi, > > On Thu, 2006-06-01 at 15:42 -0700, Demetri Mouratis wrote: > > > [root at db4 ~]# xenguest-install.py -n xendomain1 -f > > /home/xen/xendomain1 -s 25 -r 256 -l > > http://ops1.rnmd.net/fedora/core/5/i386/os -x > > ks=http://ops1.rnmd.net/kickstart/cfgs/ks-fedora-core-5-xen-guest.cfg > > ... > > > [root at db4 ~]# xm create -c xendomain1 > > Using config file "/etc/xen/xendomain1". > > Going to boot Fedora Core (2.6.15-1.2054_FC5smp) > > kernel: /vmlinuz-2.6.15-1.2054_FC5smp > > initrd: /initrd-2.6.15-1.2054_FC5smp.img > > Error: (9, 'Bad file descriptor') > > > > It looks to me like the problem is that xm create is trying to boot a > > non xen Kernel. > > Looks like it. What are the contents of your kickstart file? A non- > kickstart domU install definitely leaves the domU, not the smp, kernel > installed. > > -_Stephen Hi Stephen, Thanks for the reply. Attached is my ks file. I don't think there is anything funky going on there. Basically, I did a manual install from the xenguest-install script then poached the resultant anaconda-ks.cfg file. The strange thing from my perspective, and I've noted this in the bug, is that invoking xenguest-install non-interactively, i.e., without the -x option, produces a working domU booting the correct kernel. Thanks. # Kickstart file generated by Demetri install url --url http://ops1.rnmd.net/fedora/core/5/i386/os lang en_US.UTF-8 langsupport --default=en_US.UTF-8 en_US.UTF-8 keyboard us network --device eth0 --bootproto dhcp rootpw --iscrypted _removed to protect the innocent_ firewall --disabled selinux --disabled authconfig --enableshadow --enablemd5 timezone America/Los_Angeles bootloader --location=mbr reboot # The following is the partition information you requested # Note that any partitions you deleted are not expressed # here so unless you clear all partitions first, this is # not guaranteed to work clearpart --all --drives=xvda --initlabel part /boot --fstype ext3 --size=100 --ondisk=xvda part pv.2 --size=0 --grow --ondisk=xvda volgroup VolGroup00 --pesize=32768 pv.2 logvol / --fstype ext3 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=272 --grow --maxsize=544 %packages @ admin-tools @ text-internet @ dialup @ smb-server @ web-server @ printing @ server-cfg kernel-smp grub lvm2 e2fsprogs %post From sct at redhat.com Tue Jun 6 17:15:13 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Tue, 06 Jun 2006 18:15:13 +0100 Subject: [Fedora-xen] Problem starting a full virtualized Windows Guest In-Reply-To: References: Message-ID: <1149614113.5463.31.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Tue, 2006-06-06 at 13:29 +0200, Sven Oehme wrote: > this is fixed in the xen-unstable repro since at least 2-3 Weeks, > since that i never tried a redhat kernel, which kernel you are > referring to , > http://download.fedora.redhat.com/pub/fedora/linux/core/development/i386/os/Fedora/RPMS ? Yes. That one tracks xen-unstable quite closely. Cheers, Stephen From sct at redhat.com Tue Jun 6 17:24:14 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Tue, 06 Jun 2006 18:24:14 +0100 Subject: [Fedora-xen] FC4 on a FC5 Xen System In-Reply-To: <001501c68966$d451adb0$03c8a8c0@PAPA> References: <001501c68966$d451adb0$03c8a8c0@PAPA> Message-ID: <1149614654.5463.36.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Tue, 2006-06-06 at 08:43 -0400, Mito wrote: > So, I decided to torture myself, and came up with this process (which really > isn't that big of a deal, the most torture is the actual setup of the domU, > the Xen and dom0 setup was pretty painless). When installing via source, > all I had to do was make sure that the modules needed to run NAT were > included in the kernel, and the NAT networking worked perfectly first try. What exactly did you need to add? We may be able to turn them on in the mainline kernel builds. --Stephen From oehmes at de.ibm.com Tue Jun 6 19:34:54 2006 From: oehmes at de.ibm.com (Sven Oehme) Date: Tue, 6 Jun 2006 21:34:54 +0200 Subject: [Fedora-xen] Problem starting a full virtualized Windows Guest In-Reply-To: <1149614113.5463.31.camel@sisko.sctweedie.blueyonder.co.uk> Message-ID: Hi , the kernel-xen0 rpm's seem pretty fresh, but the xen-3.0.2-4 is older than 1 month , so i expect my bug isn't fixed before you do a rebase on this package. when is that expected ? Sven "Stephen C. Tweedie" 06/06/2006 07:15 PM To Sven Oehme/Germany/IBM at IBMDE cc fedora-xen at redhat.com, Stephen Tweedie Subject Re: [Fedora-xen] Problem starting a full virtualized Windows Guest Hi, On Tue, 2006-06-06 at 13:29 +0200, Sven Oehme wrote: > this is fixed in the xen-unstable repro since at least 2-3 Weeks, > since that i never tried a redhat kernel, which kernel you are > referring to , > http://download.fedora.redhat.com/pub/fedora/linux/core/development/i386/os/Fedora/RPMS ? Yes. That one tracks xen-unstable quite closely. Cheers, Stephen -------------- next part -------------- An HTML attachment was scrubbed... URL: From eric.marty1 at libertysurf.fr Tue Jun 6 19:47:00 2006 From: eric.marty1 at libertysurf.fr (Eric Marty) Date: Tue, 6 Jun 2006 21:47:00 +0200 Subject: [Fedora-xen] How to Virtual Interface Ethernet In-Reply-To: <3cc2cbc40606060940x64028f4axf310819140bb55dd@mail.gmail.com> Message-ID: <002201c689a1$fa8d9300$3201a8c0@ltlabo> Hello All, Anybody have the doc concerning how to install the network with Xen ? Each time to define the vif in my file for to load the DomU i have error Vif [ ' ' ] Many Thanks Eric From sct at redhat.com Tue Jun 6 20:22:05 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Tue, 06 Jun 2006 21:22:05 +0100 Subject: [Fedora-xen] Problem starting a full virtualized Windows Guest In-Reply-To: References: Message-ID: <1149625325.5463.49.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Tue, 2006-06-06 at 21:34 +0200, Sven Oehme wrote: > the kernel-xen0 rpm's seem pretty fresh, but the xen-3.0.2-4 is older > than 1 month , so i expect my bug isn't fixed before you do a rebase > on this package. when is that expected ? The xen plus kernel-xen0 in rawhide works fine f or me and I have seen no reports of specific problems requiring an update, so there isn't any timetable for a rebase. It's probably about time to do one anyway, though. Can you reproduce the problem with the current packages? --Stephen > From ikent at redhat.com Wed Jun 7 03:40:47 2006 From: ikent at redhat.com (Ian Kent) Date: Wed, 07 Jun 2006 11:40:47 +0800 Subject: [Fedora-xen] Xen install of other than FC5 on FC5 Dom0 In-Reply-To: <1149592806.5463.7.camel@sisko.sctweedie.blueyonder.co.uk> References: <1149261767.18181.3.camel@raven.themaw.net> <1149592806.5463.7.camel@sisko.sctweedie.blueyonder.co.uk> Message-ID: <1149651647.2770.39.camel@raven.themaw.net> On Tue, 2006-06-06 at 12:20 +0100, Stephen C. Tweedie wrote: > Hi, > > On Fri, 2006-06-02 at 23:22 +0800, Ian Kent wrote: > > > It appears that I can only build FC5 guests on my FC5 machine. > > > > Anyone have any pointers to documentation that can explain creating > > guests of another distribution, such as Rawhide, on my FC5 box? > > Right now, rawhide is using a later version of Xen than FC5 (FC5 is > using the 3.0.2 stable Xen release, whereas rawhide is tracking upstream > Xen development). You can run an earlier guest on a later > hypervisor/dom0, but not the other way around; so you can't run a > rawhide guest on an FC5 xen0 kernel. Thanks. That's the conclusion I arrived at from poking around. > > People have reported success running a rawhide kernel on FC5, and using > that to host a rawhide guest, though. Tried this but unfortunately my Radeon based card has become a problem again with the latest Rawhide kernel and I haven't really got time right now to deal with it. The other thing that this post begs is the question of how to get an FC4 guest running using the standard xenguest-install.py script since there is no simple way to generate the initial ramdisk image needed (of course there is a xenU kernel that could be used in the repo). It puzzles me that we haven't we put together a package that has a set of such install pairs for our distributions that have included Xen support? OK, maintenance of such a package in a fast moving development area like this would be a pain. Ian From sct at redhat.com Wed Jun 7 08:43:58 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Wed, 07 Jun 2006 09:43:58 +0100 Subject: [Fedora-xen] Xenguest-install.py Tries to boot non-xen kernel Bad File Descriptor In-Reply-To: <3cc2cbc40606060940x64028f4axf310819140bb55dd@mail.gmail.com> References: <3cc2cbc40606011542w1378a6bcifabe12a6fc5a1b96@mail.gmail.com> <1149600791.5463.22.camel@sisko.sctweedie.blueyonder.co.uk> <3cc2cbc40606060940x64028f4axf310819140bb55dd@mail.gmail.com> Message-ID: <1149669838.5520.5.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Tue, 2006-06-06 at 09:40 -0700, Demetri Mouratis wrote: > Thanks for the reply. Attached is my ks file. ... > %packages > @ admin-tools > @ text-internet > @ dialup > @ smb-server > @ web-server > @ printing > @ server-cfg > kernel-smp Hmm, does it work if you replace this with kernel-xenU? > Basically, I did a manual install from > the xenguest-install script then poached the resultant anaconda-ks.cfg > file. Well, if that's the result of a xenguest-install.py, it looks like an anaconda bug in the kickstart generation --- I'll try to reproduce this. Cheers, Stephen From takebe_akio at jp.fujitsu.com Wed Jun 7 09:50:02 2006 From: takebe_akio at jp.fujitsu.com (Akio Takebe) Date: Wed, 07 Jun 2006 18:50:02 +0900 Subject: [Fedora-xen] [patch] typo of kernel release Message-ID: <1DC68A17BF98EDtakebe_akio@jp.fujitsu.com> Hi, Aron I found typo. Rpms name have extra "%". Am I righit? # ls RPMS/ia64/kernel-* RPMS/ia64/kernel-2.6.16-%2.2232_FC6agriffis.2.ia64.rpm RPMS/ia64/kernel-debuginfo-2.6.16-%2.2232_FC6agriffis.2.ia64.rpm RPMS/ia64/kernel-devel-2.6.16-%2.2232_FC6agriffis.2.ia64.rpm RPMS/ia64/kernel-xen0-2.6.16-%2.2232_FC6agriffis.2.ia64.rpm RPMS/ia64/kernel-xen0-devel-2.6.16-%2.2232_FC6agriffis.2.ia64.rpm RPMS/ia64/kernel-xenU-2.6.16-%2.2232_FC6agriffis.2.ia64.rpm RPMS/ia64/kernel-xenU-devel-2.6.16-%2.2232_FC6agriffis.2.ia64.rpm Signed-off-by: Akio Takebe Best Regards, Akio Takebe -------------- next part -------------- A non-text attachment was scrubbed... Name: fix_release.patch Type: application/octet-stream Size: 597 bytes Desc: not available URL: From aron at hp.com Wed Jun 7 10:43:43 2006 From: aron at hp.com (Aron Griffis) Date: Wed, 7 Jun 2006 06:43:43 -0400 Subject: [Fedora-xen] [patch] typo of kernel release In-Reply-To: <1DC68A17BF98EDtakebe_akio@jp.fujitsu.com> References: <1DC68A17BF98EDtakebe_akio@jp.fujitsu.com> Message-ID: <20060607104343.GA7272@olive.flatmonk> Akio Takebe wrote: [Wed Jun 07 2006, 05:50:02AM EDT] > I found typo. > Rpms name have extra "%". Applied, thanks. Aron -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From sct at redhat.com Wed Jun 7 11:29:43 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Wed, 07 Jun 2006 12:29:43 +0100 Subject: [Fedora-xen] Xen install of other than FC5 on FC5 Dom0 In-Reply-To: <1149651647.2770.39.camel@raven.themaw.net> References: <1149261767.18181.3.camel@raven.themaw.net> <1149592806.5463.7.camel@sisko.sctweedie.blueyonder.co.uk> <1149651647.2770.39.camel@raven.themaw.net> Message-ID: <1149679784.5520.18.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Wed, 2006-06-07 at 11:40 +0800, Ian Kent wrote: > The other thing that this post begs is the question of how to get an FC4 > guest running using the standard xenguest-install.py script since there > is no simple way to generate the initial ramdisk image needed (of course > there is a xenU kernel that could be used in the repo). Either by manually creating a tree with yum install-groups, or by running something like qemu to bootstrap the process. > It puzzles me that we haven't we put together a package that has a set > of such install pairs for our distributions that have included Xen > support? OK, maintenance of such a package in a fast moving development > area like this would be a pain. Right, and FC4 with a non-FC4, xen-compatible kernel is not a combination we want to support. It's sad, but FC4 is simply not compatible with current Xen. --Stephen From ikent at redhat.com Wed Jun 7 12:57:31 2006 From: ikent at redhat.com (Ian Kent) Date: Wed, 07 Jun 2006 20:57:31 +0800 Subject: [Fedora-xen] Xen install of other than FC5 on FC5 Dom0 In-Reply-To: <1149679784.5520.18.camel@sisko.sctweedie.blueyonder.co.uk> References: <1149261767.18181.3.camel@raven.themaw.net> <1149592806.5463.7.camel@sisko.sctweedie.blueyonder.co.uk> <1149651647.2770.39.camel@raven.themaw.net> <1149679784.5520.18.camel@sisko.sctweedie.blueyonder.co.uk> Message-ID: <1149685051.2939.8.camel@raven.themaw.net> On Wed, 2006-06-07 at 12:29 +0100, Stephen C. Tweedie wrote: > Hi, > > On Wed, 2006-06-07 at 11:40 +0800, Ian Kent wrote: > > > The other thing that this post begs is the question of how to get an FC4 > > guest running using the standard xenguest-install.py script since there > > is no simple way to generate the initial ramdisk image needed (of course > > there is a xenU kernel that could be used in the repo). > > Either by manually creating a tree with yum install-groups, or by > running something like qemu to bootstrap the process. Actually tried that as well. Qemu network didn't work for me so I gave up on that as well. But in any case this is just an experiment to see how things fit together, hence my possibly silly requirements. The object being "how easy is it to setup an environment 'identical' to one that my customer would be using". So that gives the requirement of using a standard install process. It's not problem, Xen and the OS integration is not quite up to it yet. I expect once the integration settles and the development is stable for a bit longer things will improve. > > > It puzzles me that we haven't we put together a package that has a set > > of such install pairs for our distributions that have included Xen > > support? OK, maintenance of such a package in a fast moving development > > area like this would be a pain. > > Right, and FC4 with a non-FC4, xen-compatible kernel is not a > combination we want to support. It's sad, but FC4 is simply not > compatible with current Xen. Yep. Ian From sct at redhat.com Wed Jun 7 13:08:38 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Wed, 07 Jun 2006 14:08:38 +0100 Subject: [Fedora-xen] Xen install of other than FC5 on FC5 Dom0 In-Reply-To: <1149685051.2939.8.camel@raven.themaw.net> References: <1149261767.18181.3.camel@raven.themaw.net> <1149592806.5463.7.camel@sisko.sctweedie.blueyonder.co.uk> <1149651647.2770.39.camel@raven.themaw.net> <1149679784.5520.18.camel@sisko.sctweedie.blueyonder.co.uk> <1149685051.2939.8.camel@raven.themaw.net> Message-ID: <1149685718.5520.48.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Wed, 2006-06-07 at 20:57 +0800, Ian Kent wrote: > It's not problem, Xen and the OS integration is not quite up to it yet. > I expect once the integration settles and the development is stable for > a bit longer things will improve. It's actually not bad. But it wasn't so good with FC4, nor was the ABI for guests frozen at the time of FC4. So don't let the bad experience of FC4-on-FC5 put you off trying with FC5 and/or rawhide; in particular, if you have problems with it, do let us known and/or file bugzillas. Cheers, Stephen From ikent at redhat.com Wed Jun 7 15:19:13 2006 From: ikent at redhat.com (Ian Kent) Date: Wed, 07 Jun 2006 23:19:13 +0800 Subject: [Fedora-xen] Xen install of other than FC5 on FC5 Dom0 In-Reply-To: <1149685718.5520.48.camel@sisko.sctweedie.blueyonder.co.uk> References: <1149261767.18181.3.camel@raven.themaw.net> <1149592806.5463.7.camel@sisko.sctweedie.blueyonder.co.uk> <1149651647.2770.39.camel@raven.themaw.net> <1149679784.5520.18.camel@sisko.sctweedie.blueyonder.co.uk> <1149685051.2939.8.camel@raven.themaw.net> <1149685718.5520.48.camel@sisko.sctweedie.blueyonder.co.uk> Message-ID: <1149693554.2939.21.camel@raven.themaw.net> On Wed, 2006-06-07 at 14:08 +0100, Stephen C. Tweedie wrote: > Hi, > > On Wed, 2006-06-07 at 20:57 +0800, Ian Kent wrote: > > > It's not problem, Xen and the OS integration is not quite up to it yet. > > I expect once the integration settles and the development is stable for > > a bit longer things will improve. > > It's actually not bad. But it wasn't so good with FC4, nor was the ABI > for guests frozen at the time of FC4. So don't let the bad experience > of FC4-on-FC5 put you off trying with FC5 and/or rawhide; in particular, > if you have problems with it, do let us known and/or file bugzillas. Yep, someone else has logged a bz regarding the FC6 Radeon problem. I'm watching and hoping. Ian From dmourati at gmail.com Wed Jun 7 17:43:04 2006 From: dmourati at gmail.com (Demetri Mouratis) Date: Wed, 7 Jun 2006 10:43:04 -0700 Subject: [Fedora-xen] Xenguest-install.py Tries to boot non-xen kernel Bad File Descriptor In-Reply-To: <1149669838.5520.5.camel@sisko.sctweedie.blueyonder.co.uk> References: <3cc2cbc40606011542w1378a6bcifabe12a6fc5a1b96@mail.gmail.com> <1149600791.5463.22.camel@sisko.sctweedie.blueyonder.co.uk> <3cc2cbc40606060940x64028f4axf310819140bb55dd@mail.gmail.com> <1149669838.5520.5.camel@sisko.sctweedie.blueyonder.co.uk> Message-ID: <3cc2cbc40606071043x49c012e5ic5e44fb7b2b1f1f2@mail.gmail.com> On 6/7/06, Stephen C. Tweedie wrote: > > Well, if that's the result of a xenguest-install.py, it looks like an > anaconda bug in the kickstart generation --- I'll try to reproduce this. > Stephen, Don't bother. On closer examination I had put my anaconda-ks.cfg from my base FC5 install under ks-fedora-core-5-xen-guest.cfg in place of the one resulting from invoking xenguest-install.py. Thanks for finding my mistake. I'm verifying it now and will note in the bug accordingly. Thanks! From aron at hp.com Wed Jun 7 21:26:25 2006 From: aron at hp.com (Aron Griffis) Date: Wed, 7 Jun 2006 17:26:25 -0400 Subject: [Fedora-xen] [patch 0/4] elilo multiboot support Message-ID: The following patches give grubby the ability to manipulate multiboot-capable elilo.conf. Fedora's elilo already contains the support, these patches simply teach grubby to take advantage of it. These patches are an enabler for using Xen on ia64 with Fedora. I have tested these changes with both grubby and elilo, using both multiboot and non-multiboot configurations. Regards, Aron -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From aron at hp.com Wed Jun 7 21:36:58 2006 From: aron at hp.com (Aron Griffis) Date: Wed, 7 Jun 2006 17:36:58 -0400 Subject: [Fedora-xen] [patch 1/4] elilo multiboot support (grubby: new functions) In-Reply-To: References: Message-ID: This patch adds some generic functions to make extending grubby a little easier, and makes changes throughout the code to take advantage of them. Specifically: - new functions for manipulating singleLine->element arrays: insertElement removeElement - new functions for matching keywords to types: getKeywordByType getTypeByKeyword - new functions for search an entry for lines matching a type: getLineByType getLineByType2 - new function for inserting a line to an entry from a template: addLineTmpl - simple debugging via dprintf, which is normally compiled out - repair one memcpy to use memmove instead, since it was unsafely working with overlapping regions Signed-off-by: Aron Griffis grubby.c | 390 +++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 258 insertions(+), 132 deletions(-) --- grubby.c.0 2006-06-07 15:11:48.000000000 -0400 +++ grubby.c 2006-06-07 15:31:45.000000000 -0400 @@ -31,6 +31,14 @@ #include "block.h" +#define DEBUG 0 + +#if DEBUG +#define dprintf(format, args...) printf(format , ## args) +#else +#define dprintf(format, args...) +#endif + #define _(A) (A) #define CODE_SEG_SIZE 128 /* code segment checked by --bootloader-probe */ @@ -77,7 +85,7 @@ char * key; enum lineType_e type; char nextChar; -} ; +}; struct configFileInfo { char * defaultConfig; @@ -258,7 +266,6 @@ struct configFileInfo * cfi; }; - struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index); struct singleEntry * findEntryByPath(struct grubConfig * cfg, const char * path, const char * prefix, @@ -271,6 +278,18 @@ static int getNextLine(char ** bufPtr, struct singleLine * line, struct configFileInfo * cfi); static char * getRootSpecifier(char * str); +static void insertElement(struct singleLine * line, + const char * item, int insertHere); +static void removeElement(struct singleLine * line, int removeHere); +static struct keywordTypes * getKeywordByType(enum lineType_e type, + struct configFileInfo * cfi); +static enum lineType_e getTypeByKeyword(char * keyword, + struct configFileInfo * cfi); +static struct singleLine * getLineByType(enum lineType_e type, + struct singleLine * line); +static struct singleLine * getLineByType2(enum lineType_e type1, + enum lineType_e type2, + struct singleLine * line); static char * sdupprintf(const char *format, ...) #ifdef __GNUC__ @@ -305,6 +324,54 @@ return buf; } +static struct keywordTypes * getKeywordByType(enum lineType_e type, + struct configFileInfo * cfi) { + struct keywordTypes * kw; + for (kw = cfi->keywords; kw->key; kw++) { + if (kw->type == type) + return kw; + } + return NULL; +} + +static enum lineType_e getTypeByKeyword(char * keyword, + struct configFileInfo * cfi) { + struct keywordTypes * kw; + for (kw = cfi->keywords; kw->key; kw++) { + if (!strcmp(keyword, kw->key)) + return kw->type; + } + return LT_UNKNOWN; +} + +/* These two (getLineByType and getLineByType2) cover the most common cases + * without going overboard... + */ +static struct singleLine * getLineByType(enum lineType_e type, + struct singleLine * line) { + dprintf("getLineByType(%d): ", type); + for (; line; line = line->next) { + dprintf("%d:%s ", line->type, + line->numElements ? line->elements[0].item : "(empty)"); + if (line->type == type) break; + } + dprintf(line ? "\n" : " (failed)\n"); + return line; +} + +static struct singleLine * getLineByType2(enum lineType_e type1, + enum lineType_e type2, + struct singleLine * line) { + dprintf("getLineByType(%d,%d): ", type1, type2); + for (; line; line = line->next) { + dprintf("%d:%s ", line->type, + line->numElements ? line->elements[0].item : "(empty)"); + if (line->type == type1 || line->type == type2) break; + } + dprintf(line ? "\n" : " (failed)\n"); + return line; +} + static int isBracketedTitle(struct singleLine * line) { if ((*line->elements[0].item == '[') && (line->numElements == 1)) { int len = strlen(line->elements[0].item); @@ -318,19 +385,10 @@ return 0; } -/* figure out if this is a entry separator */ static int isEntrySeparator(struct singleLine * line, struct configFileInfo * cfi) { - if (line->type == LT_WHITESPACE) - return 0; - if (line->type == cfi->entrySeparator) - return 1; - if (line->type == LT_OTHER) - return 1; - if (cfi->titleBracketed && isBracketedTitle(line)) { - return 1; - } - return 0; + return line->type == cfi->entrySeparator || line->type == LT_OTHER || + (cfi->titleBracketed && isBracketedTitle(line)); } /* extract the title from within brackets (for zipl) */ @@ -425,9 +483,7 @@ char * chptr; int elementsAlloced = 0; struct lineElement * element; - struct keywordTypes * keywords = cfi->keywords; int first = 1; - int i; lineFree(line); @@ -481,14 +537,8 @@ if (!line->numElements) line->type = LT_WHITESPACE; else { - for (i = 0; keywords[i].key; i++) - if (!strcmp(line->elements[0].item, keywords[i].key)) break; - - if (keywords[i].key) { - line->type = keywords[i].type; - } else { - line->type = LT_UNKNOWN; - + line->type = getTypeByKeyword(line->elements[0].item, cfi); + if (line->type == LT_UNKNOWN) { /* zipl does [title] instead of something reasonable like all * the other boot loaders. kind of ugly */ if (cfi->titleBracketed && isBracketedTitle(line)) { @@ -644,8 +694,8 @@ int last, len; if (*line->elements[1].item == '"') - memcpy(line->elements[1].item, line->elements[1].item + 1, - strlen(line->elements[1].item + 1) + 1); + memmove(line->elements[1].item, line->elements[1].item + 1, + strlen(line->elements[1].item + 1) + 1); last = line->numElements - 1; len = strlen(line->elements[last].item) - 1; @@ -761,8 +811,7 @@ if (!entry) return; - line = entry->lines; - while (line && line->type != LT_TITLE) line = line->next; + line = getLineByType(LT_TITLE, entry->lines); if (line && line->numElements >= 2) fprintf(out, "%sdefault%s%s\n", indent, separator, @@ -913,12 +962,10 @@ char * dev; char * rootspec; - line = entry->lines; - while (line && line->type != LT_KERNEL) line = line->next; - - if (!line) return 0; if (skipRemoved && entry->skip) return 0; - if (line->numElements < 2) return 0; + + line = getLineByType(LT_KERNEL, entry->lines); + if (!line || line->numElements < 2) return 0; if (flags & GRUBBY_BADIMAGE_OKAY) return 1; @@ -926,8 +973,7 @@ strlen(line->elements[1].item) + 1); rootspec = getRootSpecifier(line->elements[1].item); sprintf(fullName, "%s%s", bootPrefix, - line->elements[1].item + ((rootspec != NULL) ? - strlen(rootspec) : 0)); + line->elements[1].item + (rootspec ? strlen(rootspec) : 0)); if (access(fullName, R_OK)) return 0; for (i = 2; i < line->numElements; i++) @@ -936,19 +982,15 @@ dev = line->elements[i].item + 5; } else { /* look for a lilo style LT_ROOT line */ - line = entry->lines; - while (line && line->type != LT_ROOT) line = line->next; + line = getLineByType(LT_ROOT, entry->lines); if (line && line->numElements >= 2) { dev = line->elements[1].item; } else { - int type; - /* didn't succeed in finding a LT_ROOT, let's try LT_KERNELARGS */ - line = entry->lines; - - type = ((entry->multiboot) ? LT_MBMODULE : LT_KERNELARGS); - - while (line && line->type != type) line = line->next; + /* didn't succeed in finding a LT_ROOT, let's try LT_KERNELARGS. + * grub+multiboot uses LT_MBMODULE for the args, so check that too. + */ + line = getLineByType2(LT_KERNELARGS, LT_MBMODULE, entry->lines); /* failed to find one */ if (!line) return 0; @@ -1019,10 +1061,7 @@ entry = findEntryByIndex(config, indexVars[i]); if (!entry) return NULL; - line = entry->lines; - while (line && line->type != LT_KERNEL) - line = line->next; - + line = getLineByType(LT_KERNEL, entry->lines); if (!line) return NULL; if (index) *index = indexVars[i]; @@ -1064,10 +1103,8 @@ kernel += 6; } - while ((entry = findEntryByIndex(config, i))) { - line = entry->lines; - while (line && line->type != checkType) line=line->next; - + for (entry = findEntryByIndex(config, i); entry; entry = entry->next, i++) { + line = getLineByType(checkType, entry->lines); if (line && line->numElements >= 2 && !entry->skip) { rootspec = getRootSpecifier(line->elements[1].item); @@ -1076,10 +1113,10 @@ kernel + strlen(prefix))) break; } - + /* have to check multiboot lines too */ if (entry->multiboot) { - while (line && line->type != LT_MBMODULE) line = line->next; + line = getLineByType(LT_MBMODULE, line); if (line && line->numElements >= 2 && !entry->skip) { rootspec = getRootSpecifier(line->elements[1].item); if (!strcmp(line->elements[1].item + @@ -1088,8 +1125,6 @@ break; } } - - i++; } if (index) *index = i; @@ -1099,12 +1134,11 @@ /* make sure this entry has a kernel identifier; this skips non-Linux boot entries (could find netbsd etc, though, which is unfortunate) */ - line = entry->lines; - while (line && line->type != LT_KERNEL) line = line->next; + line = getLineByType(LT_KERNEL, entry->lines); if (!line) { if (!index) index = &i; (*index)++; - return findEntryByPath(config, kernel, prefix, index); + return findEntryByPath(config, kernel, prefix, index); /* recurse */ } return entry; @@ -1271,11 +1305,9 @@ char * root = NULL; int i; - line = entry->lines; - while (line && line->type != LT_KERNEL) line = line->next; - printf("index=%d\n", index); + line = getLineByType(LT_KERNEL, entry->lines); printf("kernel=%s\n", line->elements[1].item); if (line->numElements >= 3) { @@ -1293,9 +1325,7 @@ } printf("\"\n"); } else { - line = entry->lines; - while (line && line->type != LT_KERNELARGS) line=line->next; - + line = getLineByType(LT_KERNELARGS, entry->lines); if (line) { char * s; @@ -1319,9 +1349,7 @@ } if (!root) { - line = entry->lines; - while (line && line->type != LT_ROOT) line = line->next; - + line = getLineByType(LT_ROOT, entry->lines); if (line && line->numElements >= 2) root=line->elements[1].item; } @@ -1336,8 +1364,7 @@ printf("root=%s\n", s); } - line = entry->lines; - while (line && line->type != LT_INITRD) line = line->next; + line = getLineByType(LT_INITRD, entry->lines); if (line && line->numElements >= 2) { printf("initrd=%s", prefix); @@ -1421,14 +1448,12 @@ if (config->cfi == &grubConfigType) { dumpSysconfigGrub(); } else { - line = config->theLines; - while (line && line->type != LT_BOOT) line = line->next; + line = getLineByType(LT_BOOT, config->theLines); if (line && line->numElements >= 1) { printf("boot=%s\n", line->elements[1].item); } - line = config->theLines; - while (line && line->type != LT_LBA) line = line->next; + line = getLineByType(LT_LBA, config->theLines); if (line) printf("lba\n"); } @@ -1443,77 +1468,112 @@ return 0; } +struct singleLine * addLineTmpl(struct singleEntry * entry, + struct singleLine * tmplLine, + struct singleLine * prevLine, + const char * val) { + int i; + struct singleLine * newLine = malloc(sizeof(*newLine)); + + newLine->indent = strdup(tmplLine->indent); + newLine->next = NULL; + newLine->type = tmplLine->type; + newLine->numElements = tmplLine->numElements; + newLine->elements = malloc(sizeof(*newLine->elements) * + newLine->numElements); + + for (i = 0; i < newLine->numElements; i++) { + newLine->elements[i].indent = strdup(tmplLine->elements[i].indent); + newLine->elements[i].item = strdup(tmplLine->elements[i].item); + } + + if (val) { + /* override the inherited value with our own. + * This is a little weak because it only applies to elements[1] + */ + if (newLine->numElements > 1) + removeElement(newLine, 1); + insertElement(newLine, val, 1); + + /* but try to keep the rootspec from the template... sigh */ + if (tmplLine->type == LT_KERNEL || + tmplLine->type == LT_MBMODULE || + tmplLine->type == LT_INITRD) + { + char * rootspec = getRootSpecifier(tmplLine->elements[1].item); + if (rootspec != NULL) { + free(newLine->elements[1].item); + newLine->elements[1].item = + sdupprintf("%s%s", rootspec, val); + } + } + } + + if (!entry->lines) { + /* first one on the list */ + entry->lines = newLine; + } else if (prevLine) { + /* add after prevLine */ + newLine->next = prevLine->next; + prevLine->next = newLine; + } + + return newLine; +} + /* val may be NULL */ struct singleLine * addLine(struct singleEntry * entry, struct configFileInfo * cfi, - enum lineType_e type, const char * defaultIndent, - char * val) { + enum lineType_e type, char * defaultIndent, + const char * val) { struct singleLine * line, * prev; - int i; + struct keywordTypes * kw; + struct singleLine tmpl; - for (i = 0; cfi->keywords[i].key; i++) - if (cfi->keywords[i].type == type) break; - if (type != LT_TITLE || !cfi->titleBracketed) - if (!cfi->keywords[i].key) abort(); + /* NB: This function shouldn't allocation items on the heap, but rather on + * the stack since it calls addLineTmpl which will make copies. + */ + + if (type == LT_TITLE && cfi->titleBracketed) { + /* we're doing a bracketed title (zipl) */ + tmpl.type = type; + tmpl.numElements = 1; + tmpl.elements = alloca(sizeof(*tmpl.elements)); + tmpl.elements[0].item = alloca(strlen(val)+3); + sprintf(tmpl.elements[0].item, "[%s]", val); + tmpl.elements[0].indent = ""; + } else { + kw = getKeywordByType(type, cfi); + if (!kw) abort(); + tmpl.type = type; + tmpl.numElements = val ? 2 : 1; + tmpl.elements = alloca(sizeof(*tmpl.elements) * tmpl.numElements); + tmpl.elements[0].item = kw->key; + tmpl.elements[0].indent = alloca(2); + sprintf(tmpl.elements[0].indent, "%c", kw->nextChar); + if (val) { + tmpl.elements[1].item = (char *)val; + tmpl.elements[1].indent = ""; + } + } /* The last non-empty line gives us the indention to us and the line to insert after. Note that comments are considered empty lines, which may not be ideal? If there are no lines or we are looking at the first line, we use defaultIndent (the first line is normally indented differently from the rest) */ - if (entry->lines) { - line = entry->lines; - prev = NULL; - while (line) { - if (line->numElements) prev = line; - line = line->next; - } - if (!prev) { - /* just use the last line */ - prev = entry->lines; - while (prev->next) prev = prev->next; - } - - line = prev->next; - prev->next = malloc(sizeof(*line)); - prev->next->next = line; - line = prev->next; - - if (prev == entry->lines) - line->indent = strdup(defaultIndent); - else - line->indent = strdup(prev->indent); - } else { - line = malloc(sizeof(*line)); - line->indent = strdup(defaultIndent); - line->next = NULL; + for (line = entry->lines, prev = NULL; line; line = line->next) { + if (line->numElements) prev = line; + /* fall back on the last line if prev isn't otherwise set */ + if (!line->next && !prev) prev = line; } - if (type != LT_TITLE || !cfi->titleBracketed) { - line->type = type; - line->numElements = val ? 2 : 1; - line->elements = malloc(sizeof(*line->elements) * line->numElements); - line->elements[0].item = strdup(cfi->keywords[i].key); - line->elements[0].indent = malloc(2); - line->elements[0].indent[0] = cfi->keywords[i].nextChar; - line->elements[0].indent[1] = '\0'; - - if (val) { - line->elements[1].item = val; - line->elements[1].indent = strdup(""); - } - } else { - /* we're doing the title of a bracketed title (zipl) */ - line->type = type; - line->numElements = 1; - line->elements = malloc(sizeof(*line->elements) * line->numElements); - - line->elements[0].item = malloc(strlen(val) + 3); - sprintf(line->elements[0].item, "[%s]", val); - line->elements[0].indent = strdup(""); - } + if (prev == entry->lines) + tmpl.indent = defaultIndent ?: ""; + else + tmpl.indent = prev->indent; - return line; + return addLineTmpl(entry, &tmpl, prev, val); } void removeLine(struct singleEntry * entry, struct singleLine * line) { @@ -1538,6 +1598,73 @@ free(line); } +static void insertElement(struct singleLine * line, + const char * item, int insertHere) { + + /* sanity check */ + if (insertHere > line->numElements) { + dprintf("insertElement() adjusting insertHere from %d to %d\n", + insertHere, line->numElements); + insertHere = line->numElements; + } + + line->elements = realloc(line->elements, (line->numElements + 1) * + sizeof(*line->elements)); + memmove(&line->elements[insertHere+1], + &line->elements[insertHere], + (line->numElements - insertHere) * + sizeof(*line->elements)); + line->elements[insertHere].item = strdup(item); + + if (insertHere > 0 && line->elements[insertHere-1].indent[0] == '\0') { + /* move the end-of-line forward */ + line->elements[insertHere].indent = + line->elements[insertHere-1].indent; + line->elements[insertHere-1].indent = strdup(" "); + } else { + /* technically this should honor nextChar from keywordTypes + * when insertHere == 0, but oh well + */ + line->elements[insertHere].indent = + strdup(insertHere == line->numElements ? "" : " "); + } + + line->numElements++; + + dprintf("insertElement(%s, '%s%s', %d)\n", + line->elements[0].item, + line->elements[insertHere].item, + line->elements[insertHere].indent, + insertHere); +} + +static void removeElement(struct singleLine * line, int removeHere) { + int i; + + /* sanity check */ + if (removeHere >= line->numElements) return; + + dprintf("removeElement(%s, %d:%s)\n", line->elements[0].item, + removeHere, line->elements[removeHere].item); + + free(line->elements[removeHere].item); + + if (removeHere > 1) { + /* previous argument gets this argument's post-indentation */ + free(line->elements[removeHere-1].indent); + line->elements[removeHere-1].indent = + line->elements[removeHere].indent; + } else { + free(line->elements[removeHere].indent); + } + + /* now collapse the array, but don't bother to realloc smaller */ + for (i = removeHere; i < line->numElements - 1; i++) + line->elements[i] = line->elements[i + 1]; + + line->numElements--; +} + int argMatch(const char * one, const char * two) { char * first, * second; char * chptr; @@ -2546,8 +2673,7 @@ if (!entry) return 0; if (!suitableImage(entry, bootPrefix, 0, flags)) return 0; - line = entry->lines; - while (line && line->type != LT_KERNEL) line = line->next; + line = getLineByType2(LT_KERNEL, LT_HYPER, entry->lines); if (!line) return 0; rootspec = getRootSpecifier(line->elements[1].item); From aron at hp.com Wed Jun 7 21:37:39 2006 From: aron at hp.com (Aron Griffis) Date: Wed, 7 Jun 2006 17:37:39 -0400 Subject: [Fedora-xen] [patch 2/4] elilo multiboot support (grubby: add LT_HYPER) In-Reply-To: Message-ID: This patch adds support for the LT_HYPER line type. Whereas grub uses a kernel=hypervisor module=kernel module=initrd, elilo uses vmm=hypervisor image=kernel initrd=initrd. Adding LT_HYPER support, and extending it backward to grub, makes dealing with this a lot easier. configFileInfo->mbHyperFirst is added to differentiate between grub wanting the hypervisor listed first, and elilo wanting the kernel listed first (image= is the entry separator so it's very important) configFileInfo->mbInitRdIsModule is added to handle grub wanting the initrd listed as a module when multibooting The logic in addNewKernel is considerably rewritten (and cleaned up!) to be more generic and handle elilo alongside grub. Signed-off-by: Aron Griffis grubby.c | 463 ++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 285 insertions(+), 178 deletions(-) --- grubby.c.1 2006-06-07 15:31:45.000000000 -0400 +++ grubby.c 2006-06-07 16:14:33.000000000 -0400 @@ -49,9 +49,10 @@ char * indent; }; -enum lineType_e { LT_WHITESPACE, LT_TITLE, LT_KERNEL, LT_INITRD, LT_DEFAULT, - LT_UNKNOWN, LT_ROOT, LT_FALLBACK, LT_KERNELARGS, LT_BOOT, - LT_BOOTROOT, LT_LBA, LT_MBMODULE, LT_OTHER, LT_GENERIC }; +enum lineType_e { LT_WHITESPACE, LT_TITLE, LT_KERNEL, LT_INITRD, LT_HYPER, + LT_DEFAULT, LT_MBMODULE, LT_ROOT, LT_FALLBACK, LT_KERNELARGS, LT_BOOT, + LT_BOOTROOT, LT_LBA, LT_OTHER, LT_GENERIC, LT_UNKNOWN +}; struct singleLine { char * indent; @@ -72,11 +73,12 @@ #define GRUB_CONFIG_NO_DEFAULT (1 << 0) /* don't write out default=0 */ -#define KERNEL_KERNEL (1 << 0) -#define KERNEL_INITRD (1 << 2) -#define KERNEL_TITLE (1 << 3) -#define KERNEL_ARGS (1 << 4) -#define KERNEL_MB (1 << 5) +/* These defines are (only) used in addNewKernel() */ +#define NEED_KERNEL (1 << 0) +#define NEED_INITRD (1 << 2) +#define NEED_TITLE (1 << 3) +#define NEED_ARGS (1 << 4) +#define NEED_MB (1 << 5) #define MAIN_DEFAULT (1 << 0) #define DEFAULT_SAVED -2 @@ -97,6 +99,8 @@ int argsInQuotes; int maxTitleLength; int titleBracketed; + int mbHyperFirst; + int mbInitRdIsModule; }; struct keywordTypes grubKeywords[] = { @@ -107,6 +111,7 @@ { "kernel", LT_KERNEL, ' ' }, { "initrd", LT_INITRD, ' ' }, { "module", LT_MBMODULE, ' ' }, + { "kernel", LT_HYPER, ' ' }, { NULL, 0, 0 }, }; @@ -120,6 +125,8 @@ 0, /* argsInQuotes */ 0, /* maxTitleLength */ 0, /* titleBracketed */ + 1, /* mbHyperFirst */ + 1, /* mbInitRdIsModule */ }; struct keywordTypes yabootKeywords[] = { @@ -173,6 +180,17 @@ { NULL, 0, 0 }, }; +struct keywordTypes eliloKeywords[] = { + { "label", LT_TITLE, '=' }, + { "root", LT_ROOT, '=' }, + { "default", LT_DEFAULT, '=' }, + { "image", LT_KERNEL, '=' }, + { "initrd", LT_INITRD, '=' }, + { "append", LT_KERNELARGS, '=' }, + { "vmm", LT_HYPER, '=' }, + { NULL, 0, 0 }, +}; + struct keywordTypes siloKeywords[] = { { "label", LT_TITLE, '=' }, { "root", LT_ROOT, '=' }, @@ -196,7 +214,7 @@ struct configFileInfo eliloConfigType = { "/boot/efi/EFI/redhat/elilo.conf", /* defaultConfig */ - liloKeywords, /* keywords */ + eliloKeywords, /* keywords */ 0, /* defaultIsIndex */ 0, /* defaultSupportSaved */ LT_KERNEL, /* entrySeparator */ @@ -204,6 +222,8 @@ 1, /* argsInQuotes */ 0, /* maxTitleLength */ 0, /* titleBracketed */ + 0, /* mbHyperFirst */ + 0, /* mbInitRdIsModule */ }; struct configFileInfo liloConfigType = { @@ -216,6 +236,8 @@ 1, /* argsInQuotes */ 15, /* maxTitleLength */ 0, /* titleBracketed */ + 0, /* mbHyperFirst */ + 0, /* mbInitRdIsModule */ }; struct configFileInfo yabootConfigType = { @@ -228,6 +250,8 @@ 1, /* argsInQuotes */ 15, /* maxTitleLength */ 0, /* titleBracketed */ + 0, /* mbHyperFirst */ + 0, /* mbInitRdIsModule */ }; struct configFileInfo siloConfigType = { @@ -240,6 +264,8 @@ 1, /* argsInQuotes */ 15, /* maxTitleLength */ 0, /* titleBracketed */ + 0, /* mbHyperFirst */ + 0, /* mbInitRdIsModule */ }; struct configFileInfo ziplConfigType = { @@ -252,6 +278,8 @@ 1, /* argsInQuotes */ 15, /* maxTitleLength */ 1, /* titleBracketed */ + 0, /* mbHyperFirst */ + 0, /* mbInitRdIsModule */ }; struct grubConfig { @@ -656,11 +684,46 @@ if (line->type == LT_DEFAULT && line->numElements == 2) { cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT; defaultLine = line; + + } else if (line->type == LT_KERNEL) { + /* if by some freak chance this is multiboot and the "module" + * lines came earlier in the template, make sure to use LT_HYPER + * instead of LT_KERNEL now + */ + if (entry->multiboot) { + struct singleLine * l; + for (l = entry->lines; l; l = l->next) { + if (l->type == LT_MBMODULE) { + line->type = LT_HYPER; /* caught it! */ + break; + } + } + } + } else if (line->type == LT_MBMODULE) { + /* go back and fix the LT_KERNEL line to indicate LT_HYPER + * instead, now that we know this is a multiboot entry. + * This only applies to grub, but that's the only place we + * should find LT_MBMODULE lines anyway. + */ + struct singleLine * l; + for (l = entry->lines; l; l = l->next) { + if (l->type == LT_HYPER) + break; + else if (l->type == LT_KERNEL) { + l->type = LT_HYPER; + break; + } + } entry->multiboot = 1; + + } else if (line->type == LT_HYPER) { + entry->multiboot = 1; + } else if (line->type == LT_FALLBACK && line->numElements == 2) { cfg->fallbackImage = strtol(line->elements[1].item, &end, 10); if (*end) cfg->fallbackImage = -1; + } else if (line->type == LT_TITLE && line->numElements > 1) { /* make the title a single argument (undoing our parsing) */ len = 0; @@ -685,6 +748,7 @@ line->elements[line->numElements - 1].indent; line->elements[1].item = buf; line->numElements = 2; + } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) { /* Strip off any " which may be present; they'll be put back on write. This is one of the few (the only?) places that grubby @@ -702,7 +766,6 @@ if (line->elements[last].item[len] == '"') line->elements[last].item[len] = '\0'; } - } /* If we find a generic config option which should live at the @@ -964,7 +1027,7 @@ if (skipRemoved && entry->skip) return 0; - line = getLineByType(LT_KERNEL, entry->lines); + line = getLineByType2(LT_KERNEL, LT_HYPER, entry->lines); if (!line || line->numElements < 2) return 0; if (flags & GRUBBY_BADIMAGE_OKAY) return 1; @@ -1061,7 +1124,7 @@ entry = findEntryByIndex(config, indexVars[i]); if (!entry) return NULL; - line = getLineByType(LT_KERNEL, entry->lines); + line = getLineByType2(LT_KERNEL, LT_HYPER, entry->lines); if (!line) return NULL; if (index) *index = indexVars[i]; @@ -1104,7 +1167,10 @@ } for (entry = findEntryByIndex(config, i); entry; entry = entry->next, i++) { - line = getLineByType(checkType, entry->lines); + if (checkType == LT_KERNEL) + line = getLineByType2(LT_KERNEL, LT_HYPER, entry->lines); + else + line = getLineByType(checkType, entry->lines); if (line && line->numElements >= 2 && !entry->skip) { rootspec = getRootSpecifier(line->elements[1].item); @@ -1134,7 +1200,7 @@ /* make sure this entry has a kernel identifier; this skips non-Linux boot entries (could find netbsd etc, though, which is unfortunate) */ - line = getLineByType(LT_KERNEL, entry->lines); + line = getLineByType2(LT_KERNEL, LT_HYPER, entry->lines); if (!line) { if (!index) index = &i; (*index)++; @@ -1307,7 +1373,7 @@ printf("index=%d\n", index); - line = getLineByType(LT_KERNEL, entry->lines); + line = getLineByType2(LT_KERNEL, LT_HYPER, entry->lines); printf("kernel=%s\n", line->elements[1].item); if (line->numElements >= 3) { @@ -1496,7 +1562,8 @@ insertElement(newLine, val, 1); /* but try to keep the rootspec from the template... sigh */ - if (tmplLine->type == LT_KERNEL || + if (tmplLine->type == LT_HYPER || + tmplLine->type == LT_KERNEL || tmplLine->type == LT_MBMODULE || tmplLine->type == LT_INITRD) { @@ -2112,13 +2179,9 @@ char * newKernelArgs, char * newKernelInitrd, char * newMBKernel, char * newMBKernelArgs) { struct singleEntry * new; - struct singleLine * newLine = NULL, * tmplLine = NULL, * lastLine = NULL; + struct singleLine * newLine = NULL, * tmplLine = NULL; int needs; - char * indent = NULL; - char * rootspec = NULL; char * chptr; - int i; - enum lineType_e type; if (!newKernelPath) return 0; @@ -2148,66 +2211,113 @@ config->entries = new; /* copy/update from the template */ - needs = KERNEL_KERNEL | KERNEL_INITRD | KERNEL_TITLE; + needs = NEED_KERNEL | NEED_TITLE; + if (newKernelInitrd) + needs |= NEED_INITRD; if (newMBKernel) { - needs |= KERNEL_MB; + needs |= NEED_MB; new->multiboot = 1; } if (template) { for (tmplLine = template->lines; tmplLine; tmplLine = tmplLine->next) { - /* remember the indention level; we may need it for new lines */ - if (tmplLine->numElements) - indent = tmplLine->indent; - /* skip comments */ chptr = tmplLine->indent; while (*chptr && isspace(*chptr)) chptr++; if (*chptr == '#') continue; - /* we don't need an initrd here */ - if (tmplLine->type == LT_INITRD && !newKernelInitrd) continue; - - if (tmplLine->type == LT_KERNEL && - !template->multiboot && (needs & KERNEL_MB)) { - struct singleLine *l; - needs &= ~ KERNEL_MB; - - l = addLine(new, config->cfi, LT_KERNEL, - config->secondaryIndent, - newMBKernel + strlen(prefix)); - - tmplLine = lastLine; - if (!new->lines) { - new->lines = l; - } else { - newLine->next = l; - newLine = l; - } - continue; - } else if (tmplLine->type == LT_KERNEL && - template->multiboot && !new->multiboot) { - continue; /* don't need multiboot kernel here */ - } + if (tmplLine->type == LT_KERNEL && + tmplLine->numElements >= 2) { + if (!template->multiboot && (needs & NEED_MB)) { + /* it's not a multiboot template and this is the kernel + * line. Try to be intelligent about inserting the + * hypervisor at the same time. + */ + if (config->cfi->mbHyperFirst) { + /* insert the hypervisor first */ + newLine = addLine(new, config->cfi, LT_HYPER, + tmplLine->indent, + newMBKernel + strlen(prefix)); + /* set up for adding the kernel line */ + free(tmplLine->indent); + tmplLine->indent = strdup(config->secondaryIndent); + needs &= ~NEED_MB; + } + if (needs & NEED_KERNEL) { + /* use addLineTmpl to preserve line elements, + * otherwise we could just call addLine. Unfortunately + * this means making some changes to the template + * such as the indent change above and the type + * change below. + */ + struct keywordTypes * mbm_kw = + getKeywordByType(LT_MBMODULE, config->cfi); + if (mbm_kw) { + tmplLine->type = LT_MBMODULE; + free(tmplLine->elements[0].item); + tmplLine->elements[0].item = strdup(mbm_kw->key); + } + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelPath + strlen(prefix)); + needs &= ~NEED_KERNEL; + } + if (needs & NEED_MB) { /* !mbHyperFirst */ + newLine = addLine(new, config->cfi, LT_HYPER, + config->secondaryIndent, + newMBKernel + strlen(prefix)); + needs &= ~NEED_MB; + } + } else if (needs & NEED_KERNEL) { + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelPath + strlen(prefix)); + needs &= ~NEED_KERNEL; + } - if (!new->lines) { - newLine = malloc(sizeof(*newLine)); - new->lines = newLine; - } else { - newLine->next = malloc(sizeof(*newLine)); - newLine = newLine->next; - } + } else if (tmplLine->type == LT_HYPER && + tmplLine->numElements >= 2) { + if (new->multiboot) { + if (needs & NEED_MB) { + newLine = addLineTmpl(new, tmplLine, newLine, + newMBKernel + strlen(prefix)); + needs &= ~NEED_MB; + } + } else if (needs & NEED_KERNEL) { + /* template is multi but new is not, + * insert the kernel where the hypervisor was before + */ + tmplLine->type = LT_KERNEL; + free(tmplLine->elements[0].item); + tmplLine->elements[0].item = + strdup(getKeywordByType(LT_KERNEL, config->cfi)->key); + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelPath + strlen(prefix)); + needs &= ~NEED_KERNEL; + } + } else if (tmplLine->type == LT_MBMODULE && + tmplLine->numElements >= 2) { + if (new->multiboot) { + if (needs & NEED_KERNEL) { + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelPath + + strlen(prefix)); + needs &= ~NEED_KERNEL; + } else if (config->cfi->mbInitRdIsModule && + (needs & NEED_INITRD)) { + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelInitrd); + needs &= ~NEED_INITRD; + } + } else if (needs & NEED_INITRD) { + /* template is multi but new is not, + * insert the initrd where the module was before + */ + newLine = addLine(new, config->cfi, LT_INITRD, + config->secondaryIndent, + newKernelInitrd + strlen(prefix)); + needs &= ~NEED_INITRD; + } - newLine->indent = strdup(tmplLine->indent); - newLine->next = NULL; - newLine->type = tmplLine->type; - newLine->numElements = tmplLine->numElements; - newLine->elements = malloc(sizeof(*newLine->elements) * - newLine->numElements); - for (i = 0; i < newLine->numElements; i++) { - newLine->elements[i].item = strdup(tmplLine->elements[i].item); - newLine->elements[i].indent = strdup(tmplLine->elements[i].indent); } @@ -2257,127 +2367,124 @@ strlen(prefix)); } } else if (tmplLine->type == LT_INITRD && - tmplLine->numElements >= 2) { - needs &= ~KERNEL_INITRD; - free(newLine->elements[1].item); - if (new->multiboot && !template->multiboot) { - free(newLine->elements[0].item); - newLine->elements[0].item = strdup("module"); - newLine->type = LT_MBMODULE; - } - rootspec = getRootSpecifier(tmplLine->elements[1].item); - if (rootspec != NULL) { - newLine->elements[1].item = sdupprintf("%s%s", - rootspec, - newKernelInitrd + - strlen(prefix)); - } else { - newLine->elements[1].item = strdup(newKernelInitrd + - strlen(prefix)); - } - } else if (tmplLine->type == LT_MBMODULE && - tmplLine->numElements >= 2 && (needs & KERNEL_INITRD)) { - needs &= ~KERNEL_INITRD; - if (!new->multiboot && template->multiboot) { - free(newLine->elements[0].item); - newLine->elements[0].item = strdup("initrd"); - newLine->type = LT_INITRD; - } - free(newLine->elements[1].item); - rootspec = getRootSpecifier(tmplLine->elements[1].item); - if (rootspec != NULL) { - newLine->elements[1].item = sdupprintf("%s%s", - rootspec, - newKernelInitrd + - strlen(prefix)); - } else { - newLine->elements[1].item = strdup(newKernelInitrd + - strlen(prefix)); - } - } else if (tmplLine->type == LT_TITLE && - tmplLine->numElements >= 2) { - needs &= ~KERNEL_TITLE; - - for (i = 1; i < newLine->numElements; i++) { - free(newLine->elements[i].item); - free(newLine->elements[i].indent); + tmplLine->numElements >= 2 && + (needs & NEED_INITRD)) { + if (new->multiboot && !template->multiboot && + config->cfi->mbInitRdIsModule) { + /* make sure we don't insert the module initrd + * before the module kernel... if we don't do it here, + * it will be inserted following the template. + */ + if (!needs & NEED_KERNEL) { + newLine = addLine(new, config->cfi, LT_MBMODULE, + config->secondaryIndent, + newKernelInitrd + strlen(prefix)); + needs &= ~NEED_INITRD; + } + } else { + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelInitrd + strlen(prefix)); + needs &= ~NEED_INITRD; } - newLine->elements[1].item = strdup(newKernelTitle); - newLine->elements[1].indent = strdup(""); - newLine->numElements = 2; } else if (tmplLine->type == LT_TITLE && - config->cfi->titleBracketed && - tmplLine->numElements == 1) { - needs &= ~KERNEL_TITLE; - free(newLine->elements[0].item); - free(newLine->elements[0].indent); - newLine->elements = malloc(sizeof(*newLine->elements) * - newLine->numElements); - - newLine->elements[0].item = malloc(strlen(newKernelTitle) + 3); - sprintf(newLine->elements[0].item, "[%s]", newKernelTitle); - newLine->elements[0].indent = strdup(""); - newLine->numElements = 1; - } + (needs & NEED_TITLE)) { + if (tmplLine->numElements >= 2) { + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelTitle); + needs &= ~NEED_TITLE; + } else if (tmplLine->numElements == 1 && + config->cfi->titleBracketed) { + /* addLineTmpl doesn't handle titleBracketed */ + newLine = addLine(new, config->cfi, LT_TITLE, + tmplLine->indent, newKernelTitle); + needs &= ~NEED_TITLE; + } + + } else { + /* pass through other lines from the template */ + newLine = addLineTmpl(new, tmplLine, newLine, NULL); + } } + } else { - for (i = 0; config->cfi->keywords[i].key; i++) { - if ((config->cfi->keywords[i].type == config->cfi->entrySeparator) || (config->cfi->keywords[i].type == LT_OTHER)) + /* don't have a template, so start the entry with the + * appropriate starting line + */ + switch (config->cfi->entrySeparator) { + case LT_KERNEL: + if (new->multiboot && config->cfi->mbHyperFirst) { + /* fall through to LT_HYPER */ + } else { + newLine = addLine(new, config->cfi, LT_KERNEL, + config->primaryIndent, + newKernelPath + strlen(prefix)); + needs &= ~NEED_KERNEL; + break; + } + + case LT_HYPER: + newLine = addLine(new, config->cfi, LT_HYPER, + config->primaryIndent, + newMBKernel + strlen(prefix)); + needs &= ~NEED_MB; break; - } - switch (config->cfi->keywords[i].type) { - case LT_KERNEL: needs &= ~KERNEL_KERNEL, - chptr = newKernelPath + strlen(prefix); - type = LT_KERNEL; break; - case LT_TITLE: needs &= ~KERNEL_TITLE, chptr = newKernelTitle; - type = LT_TITLE; break; - default: - /* zipl strikes again */ - if (config->cfi->titleBracketed) { - needs &= ~KERNEL_TITLE; - chptr = newKernelTitle; - type = LT_TITLE; - break; - } else { - abort(); - } - } + case LT_TITLE: + newLine = addLine(new, config->cfi, LT_TITLE, + config->primaryIndent, newKernelTitle); + needs &= ~NEED_TITLE; + break; - newLine = addLine(new, config->cfi, type, config->primaryIndent, chptr); - new->lines = newLine; + default: + abort(); + } } - if (new->multiboot) { - if (needs & KERNEL_MB) - newLine = addLine(new, config->cfi, LT_KERNEL, - config->secondaryIndent, - newMBKernel + strlen(prefix)); - if (needs & KERNEL_KERNEL) - newLine = addLine(new, config->cfi, LT_MBMODULE, - config->secondaryIndent, - newKernelPath + strlen(prefix)); - /* don't need to check for title as it's guaranteed to have been - * done as we only do multiboot with grub which uses title as - * a separator */ - if (needs & KERNEL_INITRD && newKernelInitrd) - newLine = addLine(new, config->cfi, LT_MBMODULE, - config->secondaryIndent, - newKernelInitrd + strlen(prefix)); - } else { - if (needs & KERNEL_KERNEL) - newLine = addLine(new, config->cfi, LT_KERNEL, - config->secondaryIndent, - newKernelPath + strlen(prefix)); - if (needs & KERNEL_TITLE) - newLine = addLine(new, config->cfi, LT_TITLE, - config->secondaryIndent, - newKernelTitle); - if (needs & KERNEL_INITRD && newKernelInitrd) - newLine = addLine(new, config->cfi, LT_INITRD, - config->secondaryIndent, - newKernelInitrd + strlen(prefix)); + /* add the remainder of the lines, i.e. those that either + * weren't present in the template, or in the case of no template, + * all the lines following the entrySeparator. + */ + if (needs & NEED_TITLE) { + newLine = addLine(new, config->cfi, LT_TITLE, + config->secondaryIndent, + newKernelTitle); + needs &= ~NEED_TITLE; + } + if ((needs & NEED_MB) && config->cfi->mbHyperFirst) { + newLine = addLine(new, config->cfi, LT_HYPER, + config->secondaryIndent, + newMBKernel + strlen(prefix)); + needs &= ~NEED_MB; + } + if (needs & NEED_KERNEL) { + newLine = addLine(new, config->cfi, + (new->multiboot && getKeywordByType(LT_MBMODULE, + config->cfi)) ? + LT_MBMODULE : LT_KERNEL, + config->secondaryIndent, + newKernelPath + strlen(prefix)); + needs &= ~NEED_KERNEL; + } + if (needs & NEED_MB) { + newLine = addLine(new, config->cfi, LT_HYPER, + config->secondaryIndent, + newMBKernel + strlen(prefix)); + needs &= ~NEED_MB; + } + if (needs & NEED_INITRD) { + newLine = addLine(new, config->cfi, + (new->multiboot && getKeywordByType(LT_MBMODULE, + config->cfi)) ? + LT_MBMODULE : LT_INITRD, + config->secondaryIndent, + newKernelInitrd + strlen(prefix)); + needs &= ~NEED_INITRD; + } + + if (needs) { + printf(_("grubby: needs=%d, aborting\n"), needs); + abort(); } if (updateImage(config, "0", prefix, newKernelArgs, NULL, From aron at hp.com Wed Jun 7 21:38:21 2006 From: aron at hp.com (Aron Griffis) Date: Wed, 7 Jun 2006 17:38:21 -0400 Subject: [Fedora-xen] [patch 3/4] elilo multiboot support (grubby: args) In-Reply-To: Message-ID: elilo handles hypervisor args by putting a "--" separator on the append line, like this: append="hyper args -- kernel args" This patch modifies updateActualImage() to handle this situation, including removing the hypervisor args plus separator when a multiboot template is used to construct a non-multiboot entry. Signed-off-by: Aron Griffis grubby.c | 279 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 128 insertions(+), 151 deletions(-) --- grubby.c.2 2006-06-07 16:14:33.000000000 -0400 +++ grubby.c 2006-06-07 16:16:44.000000000 -0400 @@ -101,6 +101,7 @@ int titleBracketed; int mbHyperFirst; int mbInitRdIsModule; + int mbConcatArgs; }; struct keywordTypes grubKeywords[] = { @@ -127,6 +128,7 @@ 0, /* titleBracketed */ 1, /* mbHyperFirst */ 1, /* mbInitRdIsModule */ + 0, /* mbConcatArgs */ }; struct keywordTypes yabootKeywords[] = { @@ -224,6 +226,7 @@ 0, /* titleBracketed */ 0, /* mbHyperFirst */ 0, /* mbInitRdIsModule */ + 1, /* mbConcatArgs */ }; struct configFileInfo liloConfigType = { @@ -238,6 +241,7 @@ 0, /* titleBracketed */ 0, /* mbHyperFirst */ 0, /* mbInitRdIsModule */ + 0, /* mbConcatArgs */ }; struct configFileInfo yabootConfigType = { @@ -252,6 +256,7 @@ 0, /* titleBracketed */ 0, /* mbHyperFirst */ 0, /* mbInitRdIsModule */ + 0, /* mbConcatArgs */ }; struct configFileInfo siloConfigType = { @@ -266,6 +271,7 @@ 0, /* titleBracketed */ 0, /* mbHyperFirst */ 0, /* mbInitRdIsModule */ + 0, /* mbConcatArgs */ }; struct configFileInfo ziplConfigType = { @@ -280,6 +286,7 @@ 1, /* titleBracketed */ 0, /* mbHyperFirst */ 0, /* mbInitRdIsModule */ + 0, /* mbConcatArgs */ }; struct grubConfig { @@ -1754,14 +1761,13 @@ struct singleEntry * entry; struct singleLine * line, * rootLine; int index = 0; - int i, j, k; + int i, k; const char ** newArgs, ** oldArgs; const char ** arg; - const char * chptr; - int useKernelArgs = 0; - int useRoot = 0; + int useKernelArgs, useRoot; int firstElement; int *usedElements, *usedArgs; + int doreplace; if (!image) return 0; @@ -1788,54 +1794,102 @@ } } - for (i = 0; cfg->cfi->keywords[i].key; i++) - if (cfg->cfi->keywords[i].type == LT_KERNELARGS) break; - if (cfg->cfi->keywords[i].key) - useKernelArgs = 1; + useKernelArgs = (getKeywordByType(LT_KERNELARGS, cfg->cfi) + && (!multibootArgs || cfg->cfi->mbConcatArgs)); - for (i = 0; cfg->cfi->keywords[i].key; i++) - if (cfg->cfi->keywords[i].type == LT_ROOT) break; + useRoot = (getKeywordByType(LT_ROOT, cfg->cfi) + && !multibootArgs); - if (cfg->cfi->keywords[i].key) - useRoot = 1; + for (k = 0, arg = newArgs; *arg; arg++, k++) ; + usedArgs = calloc(k, sizeof(*usedArgs)); - k = 0; - for (arg = newArgs; *arg; arg++) - k++; - usedArgs = calloc(k, sizeof(int)); + for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) { - while ((entry = findEntryByPath(cfg, image, prefix, &index))) { - index++; + if (multibootArgs && !entry->multiboot) + continue; - line = entry->lines; - while (line && line->type != LT_KERNEL) line = line->next; - if (!line) continue; - firstElement = 2; - - if (entry->multiboot && !multibootArgs) { - /* first mb module line is the real kernel */ - while (line && line->type != LT_MBMODULE) line = line->next; - firstElement = 2; - } else if (useKernelArgs) { - while (line && line->type != LT_KERNELARGS) line = line->next; + /* Determine where to put the args. If this config supports + * LT_KERNELARGS, use that. Otherwise use + * LT_HYPER/LT_KERNEL/LT_MBMODULE lines. + */ + if (useKernelArgs) { + line = getLineByType(LT_KERNELARGS, entry->lines); + if (!line) { + /* no LT_KERNELARGS, need to add it */ + line = addLine(entry, cfg->cfi, LT_KERNELARGS, + cfg->secondaryIndent, NULL); + } firstElement = 1; + + } else if (multibootArgs) { + line = getLineByType(LT_HYPER, entry->lines); + if (!line) { + /* a multiboot entry without LT_HYPER? */ + continue; + } + firstElement = 2; + + } else { + line = getLineByType2(LT_KERNEL, LT_MBMODULE, entry->lines); + if (!line) { + /* no LT_KERNEL or LT_MBMODULE in this entry? */ + continue; + } + firstElement = 2; } - if (!line && useKernelArgs) { - /* no append in there, need to add it */ - line = addLine(entry, cfg->cfi, LT_KERNELARGS, NULL, NULL); + /* handle the elilo case which does: + * append="hypervisor args -- kernel args" + */ + if (entry->multiboot && cfg->cfi->mbConcatArgs) { + /* this is a multiboot entry, make sure there's + * -- on the args line + */ + for (i = firstElement; i < line->numElements; i++) { + if (!strcmp(line->elements[i].item, "--")) + break; + } + if (i == line->numElements) { + /* assume all existing args are kernel args, + * prepend -- to make it official + */ + insertElement(line, "--", firstElement); + i = firstElement; + } + if (!multibootArgs) { + /* kernel args start after the -- */ + firstElement = i + 1; + } + } else if (cfg->cfi->mbConcatArgs) { + /* this is a non-multiboot entry, remove hyper args */ + for (i = firstElement; i < line->numElements; i++) { + if (!strcmp(line->elements[i].item, "--")) + break; + } + if (i < line->numElements) { + /* remove args up to -- */ + while (strcmp(line->elements[firstElement].item, "--")) + removeElement(line, firstElement); + /* remove -- */ + removeElement(line, firstElement); + } } - usedElements = calloc(line->numElements, sizeof(int)); - - k = 0; - for (arg = newArgs; *arg; arg++) { - if (usedArgs[k]) { - k++; - continue; - } + usedElements = calloc(line->numElements, sizeof(*usedElements)); + + for (k = 0, arg = newArgs; *arg; arg++, k++) { + if (usedArgs[k]) continue; + + doreplace = 1; for (i = firstElement; i < line->numElements; i++) { + if (multibootArgs && cfg->cfi->mbConcatArgs && + !strcmp(line->elements[i].item, "--")) + { + /* reached the end of hyper args, insert here */ + doreplace = 0; + break; + } if (usedElements[i]) continue; if (!argMatch(line->elements[i].item, *arg)) { @@ -1844,91 +1898,62 @@ break; } } - chptr = strchr(*arg, '='); - if (i < line->numElements) { - /* replace */ + if (i < line->numElements && doreplace) { + /* direct replacement */ free(line->elements[i].item); line->elements[i].item = strdup(*arg); - } else if (useRoot && !strncmp(*arg, "root=/dev/", 10) && *chptr) { - rootLine = entry->lines; - while (rootLine && rootLine->type != LT_ROOT) - rootLine = rootLine->next; - if (!rootLine) { - rootLine = addLine(entry, cfg->cfi, LT_ROOT, NULL, NULL); - rootLine->elements = realloc(rootLine->elements, - 2 * sizeof(*rootLine->elements)); - rootLine->numElements++; - rootLine->elements[1].indent = strdup(""); - rootLine->elements[1].item = strdup(""); - } - free(rootLine->elements[1].item); - rootLine->elements[1].item = strdup(chptr + 1); - } else { - /* append */ - line->elements = realloc(line->elements, - (line->numElements + 1) * sizeof(*line->elements)); - line->elements[line->numElements].item = strdup(*arg); - usedElements = realloc(usedElements, - (line->numElements + 1) * sizeof(int)); - usedElements[line->numElements] = 1; - - if (line->numElements > 1) { - /* add to existing list of arguments */ - line->elements[line->numElements].indent = - line->elements[line->numElements - 1].indent; - line->elements[line->numElements - 1].indent = strdup(" "); + } else if (useRoot && !strncmp(*arg, "root=/dev/", 10)) { + /* root= replacement */ + rootLine = getLineByType(LT_ROOT, entry->lines); + if (rootLine) { + free(rootLine->elements[1].item); + rootLine->elements[1].item = strdup(*arg + 5); } else { - /* First thing on this line; treat a bit differently. Note - this is only possible if we've added a LT_KERNELARGS - entry */ - line->elements[line->numElements].indent = strdup(""); + rootLine = addLine(entry, cfg->cfi, LT_ROOT, + cfg->secondaryIndent, *arg + 5); } + } - line->numElements++; + else { + /* insert/append */ + insertElement(line, *arg, i); + usedElements = realloc(usedElements, line->numElements * + sizeof(*usedElements)); + memmove(&usedElements[i + 1], &usedElements[i], + line->numElements - i - 1); + usedElements[i] = 1; /* if we updated a root= here even though there is a LT_ROOT available we need to remove the LT_ROOT entry (this will happen if we switch from a device to a label) */ if (useRoot && !strncmp(*arg, "root=", 5)) { - rootLine = entry->lines; - while (rootLine && rootLine->type != LT_ROOT) - rootLine = rootLine->next; - if (rootLine) { + rootLine = getLineByType(LT_ROOT, entry->lines); + if (rootLine) removeLine(entry, rootLine); - } } } - k++; } free(usedElements); - /* no arguments to remove (i.e. no append line) */ - if (!line) continue; - - /* this won't remove an LT_ROOT item properly (but then again, - who cares? */ for (arg = oldArgs; *arg; arg++) { - for (i = firstElement; i < line->numElements; i++) - if (!argMatch(line->elements[i].item, *arg)) + for (i = firstElement; i < line->numElements; i++) { + if (multibootArgs && cfg->cfi->mbConcatArgs && + !strcmp(line->elements[i].item, "--")) + /* reached the end of hyper args, stop here */ + break; + if (!argMatch(line->elements[i].item, *arg)) { + removeElement(line, i); break; - - if (i < line->numElements) { - /* if this isn't the first argument the previous argument - gets this arguments post-indention */ - if (i > firstElement) { - free(line->elements[i - 1].indent); - line->elements[i - 1].indent = line->elements[i].indent; } - - free(line->elements[i].item); - - for (j = i + 1; j < line->numElements; j++) - line->elements[j - 1] = line->elements[j]; - - line->numElements--; + } + /* handle removing LT_ROOT line too */ + if (useRoot && !strncmp(*arg, "root=", 5)) { + rootLine = getLineByType(LT_ROOT, entry->lines); + if (rootLine) + removeLine(entry, rootLine); } } @@ -2318,54 +2343,6 @@ needs &= ~NEED_INITRD; } - strdup(tmplLine->elements[i].indent); - } - - lastLine = tmplLine; - if (tmplLine->type == LT_KERNEL && tmplLine->numElements >= 2) { - char * repl; - if (!template->multiboot) { - needs &= ~KERNEL_KERNEL; - repl = newKernelPath; - } else { - needs &= ~KERNEL_MB; - repl = newMBKernel; - } - if (new->multiboot && !template->multiboot) { - free(newLine->elements[0].item); - newLine->elements[0].item = strdup("module"); - newLine->type = LT_MBMODULE; - } - free(newLine->elements[1].item); - rootspec = getRootSpecifier(tmplLine->elements[1].item); - if (rootspec != NULL) { - newLine->elements[1].item = sdupprintf("%s%s", - rootspec, - repl + - strlen(prefix)); - } else { - newLine->elements[1].item = strdup(repl + - strlen(prefix)); - } - } else if (tmplLine->type == LT_MBMODULE && - tmplLine->numElements >= 2 && (needs & KERNEL_KERNEL)) { - needs &= ~KERNEL_KERNEL; - if (!new->multiboot && template->multiboot) { - free(newLine->elements[0].item); - newLine->elements[0].item = strdup("kernel"); - newLine->type = LT_KERNEL; - } - free(newLine->elements[1].item); - rootspec = getRootSpecifier(tmplLine->elements[1].item); - if (rootspec != NULL) { - newLine->elements[1].item = sdupprintf("%s%s", - rootspec, - newKernelPath + - strlen(prefix)); - } else { - newLine->elements[1].item = strdup(newKernelPath + - strlen(prefix)); - } } else if (tmplLine->type == LT_INITRD && tmplLine->numElements >= 2 && (needs & NEED_INITRD)) { From aron at hp.com Wed Jun 7 21:39:19 2006 From: aron at hp.com (Aron Griffis) Date: Wed, 7 Jun 2006 17:39:19 -0400 Subject: [Fedora-xen] [patch 4/4] elilo multiboot support (new-kernel-pkg) In-Reply-To: Message-ID: This patch allows new-kernel-pkg to call grubby with multiboot arguments for elilo. Additionally it fixes multiple /sbin/grubby instances to use the variable from the top of the script. Signed-off-by: Aron Griffis new-kernel-pkg | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) --- new-kernel-pkg.0 Mon Jun 05 14:04:27 2006 -0400 +++ new-kernel-pkg Wed Jun 07 16:41:34 2006 -0400 @@ -125,7 +125,7 @@ install() { fi fi - if [ -n "$mbkernel" ]; then + if [ -n "$mbkernel" -a -n "$cfgLilo" -a "$liloFlag" != "elilo" ]; then [ -n "$verbose" ] && echo "multiboot specified, not updating lilo.conf" cfgLilo="" fi @@ -140,7 +140,7 @@ install() { else title="Red Hat Linux ($version)" fi - /sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version \ + $grubby --add-kernel=$bootPrefix/$kernelName-$version \ $INITRD --copy-default $makedefault --title "$title" \ ${mbkernel:+--add-multiboot="$mbkernel"} ${mbargs:+--mbargs="$mbargs"} \ --args="root=$rootdevice $kernargs" --remove-kernel="TITLE=$title" @@ -151,11 +151,11 @@ install() { if [ -n "$cfgLilo" ]; then [ -n "$verbose" ] && echo "adding $version to $liloConfig" - /sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ - --copy-default $makedefault --title $version \ - --args="root=$rootdevice $kernargs" \ - --remove-kernel="TITLE=$version" \ - --$liloFlag + $grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD + --copy-default $makedefault --title $version \ + ${mbkernel:+--add-multiboot="$mbkernel"} ${mbargs:+--mbargs="$mbargs"} \ + --args="root=$rootdevice $kernargs" --remove-kernel="TITLE=$version" \ + --$liloFlag if [ -n "$runLilo" ]; then [ -n "$verbose" ] && echo "running $lilo" @@ -181,14 +181,14 @@ remove() { if [ -n "$cfgGrub" ]; then [ -n "$verbose" ] && echo "removing $version from $grubConfig" - /sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version + $grubby --remove-kernel=$bootPrefix/$kernelName-$version else [ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby" fi if [ -n "$cfgLilo" ]; then [ -n "$verbose" ] && echo "removing $version from $liloConfig" - /sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version \ + $grubby --remove-kernel=$bootPrefix/$kernelName-$version \ --$liloFlag if [ -n "$runLilo" ]; then @@ -207,7 +207,7 @@ update() { update() { if [ -n "$cfgGrub" ]; then [ -n "$verbose" ] && echo "updating $version from $grubConfig" - /sbin/grubby --update-kernel=$bootPrefix/$kernelName-$version \ + $grubby --update-kernel=$bootPrefix/$kernelName-$version \ ${kernargs:+--args="$kernargs"} \ ${removeargs:+--remove-args="$removeargs"} else @@ -216,7 +216,7 @@ update() { if [ -n "$cfgLilo" ]; then [ -n "$verbose" ] && echo "updating $version from $liloConfig" - /sbin/grubby --update-kernel=$bootPrefix/$kernelName-$version \ + $grubby --update-kernel=$bootPrefix/$kernelName-$version \ ${kernargs:+--args="$kernargs"} \ ${removeargs:+--remove-args="$removeargs"} \ --$liloFlag From thomas.vonsteiger at bluewin.ch Thu Jun 8 08:02:26 2006 From: thomas.vonsteiger at bluewin.ch (thomas.vonsteiger at bluewin.ch) Date: Thu, 8 Jun 2006 10:02:26 +0200 Subject: [Fedora-xen] System shutting down -- need manual reset. Message-ID: <00ce01c68ad1$e1cb68c0$3e01a8c0@athlon> Hello, I have daily this kernel error and with system down. Kernel Version 2.6.16-1.2122_FC5xen0, box running on latest updates. Is this a know problem ? (XEN) Assertion '(sp == 0) || (pending_eoi[cpu][sp-1].vector < vector)' failed, line 189, file irq.c (XEN) BUG at irq.c:189 (XEN) (file=extable.c, line=77) Pre-exception: ff13173f -> 00000000 (XEN) ----[ Xen-3.0.2-2 Not tainted ]---- (XEN) CPU: 0 (XEN) EIP: e008:[] __do_IRQ_guest+0x192/0x2af (XEN) EFLAGS: 00010086 CONTEXT: hypervisor (XEN) eax: ff1a7138 ebx: ff117d4b ecx: 0000399b edx: 0000399b (XEN) esi: 00005305 edi: 00000000 ebp: ff1b9eac esp: ff1b9e74 (XEN) cr0: 8005003b cr3: 61531000 (XEN) ds: e010 es: e010 fs: e010 gs: e010 ss: e010 cs: e008 (XEN) Xen stack trace from esp=ff1b9e74: (XEN) ff197519 ff197527 000000bd ff197527 ffbfee80 00000001 00000013 ff1d2d00 (XEN) ffbb5280 ffffffff ff1b9ebc 00000001 00000000 ff117d4b ff1b9edc ff131250 (XEN) 000000b0 00000000 ff1b9edc ff11cfc7 00000000 00000000 000000b0 ff1d2d00 (XEN) ff1c3680 ff117d4b 00e46103 ff12cdd5 ff1b9ee8 ff117d4b 00000003 ffbbb204 (XEN) 00005305 00000000 ff1b9f7c 00000000 00b00000 ff11b6b1 0000e008 00000246 (XEN) ff1c1100 ffbbb204 58825219 00005aeb ff1081eb ffbb6080 0000000e ff1b9f40 (XEN) ff131874 0000000e 00000001 00000001 ff131844 ffbea080 ffbbb180 0007a120 (XEN) 00000000 ffb4f080 ffbbb180 00000000 58825219 00005aeb ffbea080 0007a120 (XEN) 00000000 ffb4f080 ff1b9fac ff11bb79 00000001 ff1c2500 00000002 ff1b9fb4 (XEN) ff1b9fac ff17e171 00200002 00000001 00000000 00000002 00000000 ff17e376 (XEN) 00000000 00000000 00000000 00005305 00000000 00000000 00005305 00880000 (XEN) 00005305 00b00000 00000000 0000e008 00000202 0000007b 0000007b 00000000 (XEN) 00000000 00000000 ffb4f080 (XEN) Xen call trace: (XEN) [] __do_IRQ_guest+0x192/0x2af (XEN) [] do_IRQ+0x58/0x18e (XEN) [] common_interrupt+0x45/0x50 (XEN) [] __enter_scheduler+0x3d8/0x48c (XEN) [] do_softirq+0xa1/0xb8 (XEN) (XEN) ************************************ (XEN) CPU0 FATAL TRAP 6 (invalid opcode), ERROR_CODE 0000, IN INTERRUPT CONTEXT. (XEN) System shutting down -- need manual reset. (XEN) ************************************ Regards, Thomas From supercomputer at gmail.com Wed Jun 7 21:42:04 2006 From: supercomputer at gmail.com (Chris Vaughan) Date: Wed, 7 Jun 2006 15:42:04 -0600 Subject: [Fedora-xen] FC5 Domain network setup, HELP Message-ID: <216ee070606071442q5a1bfb80v3f9a2115bb92d635@mail.gmail.com> Hi, I am trying to set up networking so that my domain can access the outside world. I used the following setup guide which got me a working XEN station. http://www.fedoraproject.org/wiki/FedoraXenQuickstart This is what my config file looks like: kernel ="/boot/vmlinuz-2.6.16-1.2122_FC5xenU" memory = 64 name = "rawhide" nics = 1 disk = ['file:/home/chris/images/fedora.img,sda1,w'] vif = [ 'mac=aa:cc:00:00:00:ab, bridge=xenbr0' ] dhcp="dhcp" root = "/dev/sda1" extra = "ro selinux=0 3" Bridgeing and everything is setup by default. What steps am I missing to get this running via dhcp or a static ip address? Thanks, Chris Vaughan -------------- next part -------------- An HTML attachment was scrubbed... URL: From xen.mails at gmail.com Thu Jun 8 08:57:45 2006 From: xen.mails at gmail.com (Anand Gupta) Date: Thu, 8 Jun 2006 14:27:45 +0530 Subject: [Fedora-xen] FC5 Domain network setup, HELP In-Reply-To: <216ee070606071442q5a1bfb80v3f9a2115bb92d635@mail.gmail.com> References: <216ee070606071442q5a1bfb80v3f9a2115bb92d635@mail.gmail.com> Message-ID: Try to do a modprobe xennet The module is not compiled statically in the FC5 kernel. Instead its available as a module. You will need to do modprobe on both dom0 and domU (i think) to get networking working. On 6/8/06, Chris Vaughan wrote: > > Hi, > > I am trying to set up networking so that my domain can access the outside > world. > > I used the following setup guide which got me a working XEN station. > http://www.fedoraproject.org/wiki/FedoraXenQuickstart > > > This is what my config file looks like: > kernel ="/boot/vmlinuz-2.6.16-1.2122_FC5xenU" > memory = 64 > name = "rawhide" > nics = 1 > disk = ['file:/home/chris/images/fedora.img,sda1,w'] > vif = [ 'mac=aa:cc:00:00:00:ab, bridge=xenbr0' ] > dhcp="dhcp" > root = "/dev/sda1" > extra = "ro selinux=0 3" > > Bridgeing and everything is setup by default. > > What steps am I missing to get this running via dhcp or a static ip > address? > > Thanks, > > Chris Vaughan > > -- > Fedora-xen mailing list > Fedora-xen at redhat.com > https://www.redhat.com/mailman/listinfo/fedora-xen > > > -- regards, Anand Gupta -------------- next part -------------- An HTML attachment was scrubbed... URL: From gawain.lynch at bigpond.com Thu Jun 8 09:20:19 2006 From: gawain.lynch at bigpond.com (Gawain Lynch) Date: Thu, 08 Jun 2006 19:20:19 +1000 Subject: [Fedora-xen] FC5 Domain network setup, HELP In-Reply-To: <216ee070606071442q5a1bfb80v3f9a2115bb92d635@mail.gmail.com> References: <216ee070606071442q5a1bfb80v3f9a2115bb92d635@mail.gmail.com> Message-ID: <1149758420.2916.2.camel@legolas.felicity.net.au> On Wed, 2006-06-07 at 15:42 -0600, Chris Vaughan wrote: > What steps am I missing to get this running via dhcp or a static ip > address? Ensure /etc/modprobe.conf has the line: alias eth0 xennet And /etc/sysconfig/network-scripts/ifcfg-eth0 looks something like this DEVICE=eth0 BOOTPROTO=dhcp ONBOOT=yes DHCP_HOSTNAME=myhost.mydomain.com PEERDNS=yes TYPE=Ethernet From sct at redhat.com Thu Jun 8 15:27:12 2006 From: sct at redhat.com (Stephen C. Tweedie) Date: Thu, 08 Jun 2006 16:27:12 +0100 Subject: [Fedora-xen] System shutting down -- need manual reset. In-Reply-To: <00ce01c68ad1$e1cb68c0$3e01a8c0@athlon> References: <00ce01c68ad1$e1cb68c0$3e01a8c0@athlon> Message-ID: <1149780433.5447.30.camel@sisko.sctweedie.blueyonder.co.uk> Hi, On Thu, 2006-06-08 at 10:02 +0200, thomas.vonsteiger at bluewin.ch wrote: > I have daily this kernel error and with system down. > Kernel Version 2.6.16-1.2122_FC5xen0, box running on latest updates. > > Is this a know problem ? > > (XEN) Assertion '(sp == 0) || (pending_eoi[cpu][sp-1].vector < vector)' > failed, line 189, file irq.c I've seen it reported before, but I don't think we actually have an open bugzilla for it. Would it be possible to try the kernel-xen0 and xen rpms from rawhide? Those have a newer version of xen which may address this, Thanks, Stephen From thomas.vonsteiger at bluewin.ch Thu Jun 8 17:24:50 2006 From: thomas.vonsteiger at bluewin.ch (thomas.vonsteiger at bluewin.ch) Date: Thu, 8 Jun 2006 19:24:50 +0200 Subject: AW: [Fedora-xen] System shutting down -- need manual reset. In-Reply-To: <1149780433.5447.30.camel@sisko.sctweedie.blueyonder.co.uk> Message-ID: <006c01c68b20$8f0d36a0$3e01a8c0@athlon> Hi Stephen, I will try this rawhide rpm's and give you then feedback. Thanks, Thomas -----Urspr?ngliche Nachricht----- Von: Stephen C. Tweedie [mailto:sct at redhat.com] Gesendet: Donnerstag, 8. Juni 2006 17:27 An: thomas.vonsteiger at bluewin.ch Cc: fedora-xen at redhat.com; Stephen Tweedie Betreff: Re: [Fedora-xen] System shutting down -- need manual reset. Hi, On Thu, 2006-06-08 at 10:02 +0200, thomas.vonsteiger at bluewin.ch wrote: > I have daily this kernel error and with system down. > Kernel Version 2.6.16-1.2122_FC5xen0, box running on latest updates. > > Is this a know problem ? > > (XEN) Assertion '(sp == 0) || (pending_eoi[cpu][sp-1].vector < vector)' > failed, line 189, file irq.c I've seen it reported before, but I don't think we actually have an open bugzilla for it. Would it be possible to try the kernel-xen0 and xen rpms from rawhide? Those have a newer version of xen which may address this, Thanks, Stephen -- No virus found in this incoming message. Checked by AVG Free Edition. Version: 7.1.394 / Virus Database: 268.8.3/358 - Release Date: 07.06.2006 From supercomputer at gmail.com Thu Jun 8 19:44:35 2006 From: supercomputer at gmail.com (Chris Vaughan) Date: Thu, 8 Jun 2006 13:44:35 -0600 Subject: [Fedora-xen] FC5 Domain network setup, HELP In-Reply-To: <1149758420.2916.2.camel@legolas.felicity.net.au> References: <216ee070606071442q5a1bfb80v3f9a2115bb92d635@mail.gmail.com> <1149758420.2916.2.camel@legolas.felicity.net.au> Message-ID: <216ee070606081244g701d49fbs3f31bf3bc4c2e6a3@mail.gmail.com> Thanks, I got it working I also had to edit /etc/sysconfig/network and add these two lines. NETWORKING=yes HOSTNAME=xendomain I also had issues with my modules not being loaded so I copied kernel-xenU-2.6.16-1.2122_FC5.i686.rpm onto the image and executed it once the domain was created. On 6/8/06, Gawain Lynch wrote: > > On Wed, 2006-06-07 at 15:42 -0600, Chris Vaughan wrote: > > > What steps am I missing to get this running via dhcp or a static ip > > address? > > Ensure /etc/modprobe.conf has the line: > alias eth0 xennet > > And /etc/sysconfig/network-scripts/ifcfg-eth0 looks something like this > > DEVICE=eth0 > BOOTPROTO=dhcp > ONBOOT=yes > DHCP_HOSTNAME=myhost.mydomain.com > PEERDNS=yes > TYPE=Ethernet > > > > -- ------------------------------ Christopher Vaughan -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.vonsteiger at bluewin.ch Sat Jun 10 09:39:16 2006 From: thomas.vonsteiger at bluewin.ch (Thomas von Steiger) Date: Sat, 10 Jun 2006 11:39:16 +0200 Subject: [Fedora-xen] What is possible with vlan and xen ? Message-ID: <1149932356.5256.0.camel@magma.dom0.local> Hi, To work with xen clusters we need many network to manage this. What is possible with setup vlan's for xen quests ? Maybe in 2 years we have networkinterfaces with switch technologie like virtualisation in cpu's. Thomas From phil at pricom.com.au Sun Jun 11 19:06:36 2006 From: phil at pricom.com.au (Philip Rhoades) Date: Mon, 12 Jun 2006 05:06:36 +1000 Subject: [Fedora-xen] Netrwork and updating questions Message-ID: <1150052796.3325.9.camel@prix.pricom.com.au> People, Q1. I have a FC5 machine "prix" that is directly connected to the Internet: 203.222.80.166 I am running xen on this machine and have setup a FC5 virtual machine: 192.168.10.10 If I alias prix with: ifconfig eth0:0 192.168.10.1 I can ping the virtual machine but not the other way around - I guess I need to sort out vifs? - on prix "brctl show" gives: bridge name bridge id STP enabled interfaces xenbr0 8000.feffffffffff no peth0 vif0.0 vif2.0 Q2. I have just updated the kernel on prix to 2.6.16-1.2133_FC5xen0 - is there a quick way of updating/re-creating the virtual machine (2.6.16-1.2080_FC5smp)? - I don't want to have to download everything twice (or more if I create more VMs) . . Thanks, Phil. -- Philip Rhoades Pricom Pty Limited (ACN 003 252 275 ABN 91 003 252 275) GPO Box 3411 Sydney NSW 2001 Australia Mobile: +61:(0)411-185-652 Fax: +61:(0)2-8221-9599 E-mail: phil at pricom.com.au From tve at voneicken.com Sun Jun 11 23:31:56 2006 From: tve at voneicken.com (Thorsten von Eicken) Date: Sun, 11 Jun 2006 16:31:56 -0700 Subject: [Fedora-xen] slow disk performance in Xen0 FC5 Message-ID: <448CA7EC.7010706@voneicken.com> > On Wed, 2006-05-31 at 23:07 -0700, Ashe Canvar wrote: > >> For instance my avg data read rate ( tested using hdparm -t /dev/hda) >> is 55MB/s using the regular smp kernel but it falls to 2.6MB/s when I >> boot into dom0. No other domains are runnign at this point. I have >> looked for incrementing interrupts in ide0 , there are none. > > There were some important fixes to Xen's irq delivery mechanism that > have been added to FC5 since the 1.2080 kernel you are running. Could > you please try updating to a newer kernel and seeing if you can > reproduce the problem? Same problem here. Machine is dog slow whenever disk accesses are required. Running yum takes ages. This is a dual-cpu 2.4Ghz xeon w/ATA drive. Running a stock FC5 kernel I get ~30MB/sec read or write bandwidth. With xen kernel I get 3-7MB/s in dom0 and it varies a lot. Typically I see the following in top (this was taken while running yum): [root at medusa1 ~]# top top - 16:19:22 up 11 min, 2 users, load average: 0.69, 1.63, 1.43 Tasks: 72 total, 1 running, 71 sleeping, 0 stopped, 0 zombie Cpu(s): 7.4% us, 1.5% sy, 0.0% ni, 16.9% id, 0.0% wa, 74.2% hi, 0.0% si Mem: 262308k total, 142696k used, 119612k free, 9072k buffers Swap: 1052248k total, 0k used, 1052248k free, 49168k cached PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND 2748 root 15 0 52860 42m 5268 S 49.9 16.5 0:48.33 yum 2778 root 17 0 2140 1004 808 R 10.2 0.4 0:01.75 top 368 root 16 0 0 0 0 S 0.6 0.0 0:04.00 kjournald Note the high %hi! At almost the same time: [root at medusa1 ~]# iostat -x 10 Linux 2.6.16-1.2122_FC5xen0 (medusa1) 06/11/2006 avg-cpu: %user %nice %system %iowait %idle 1.02 0.00 64.62 0.00 34.36 Device: rrqm/s wrqm/s r/s w/s rsec/s wsec/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util hda 0.00 3.68 0.00 0.72 0.00 35.17 0.00 17.59 49.14 0.00 0.00 0.00 0.00 Almost no disk activity, but high system time. I'm pretty sure it was not doing network I/O. [root at medusa1 ~]# dmesg | head Linux version 2.6.16-1.2122_FC5xen0 (bhcompile at hs20-bc1-3.build.redhat.com) (gcc version 4.1.0 20060304 (Red Hat 4.1.0-3)) #1 SMP Sun May 21 15:34:43 EDT 2006 [root at medusa1 ~]# dmesg | egrep ATA hda: ST380011A, ATA DISK drive [root at medusa1 ~]# dmesg | egrep IDE PCI: Ignoring BAR0-3 of IDE controller 0000:00:1f.1 Uniform Multi-Platform E-IDE driver Revision: 7.00alpha2 ICH3: IDE controller at PCI slot 0000:00:1f.1 Well, the bottom line is that the machine is not usable like this. Grrr. Thorsten From malexand at wu-wien.ac.at Mon Jun 12 09:27:15 2006 From: malexand at wu-wien.ac.at (Michael Alexander) Date: Mon, 12 Jun 2006 11:27:15 +0200 Subject: [Fedora-xen] CfP Workshop on XEN in HPC Cluster and Grid Computing Environments (XHPC) Message-ID: <008F43E3-A06A-4878-B2CC-C6E7150BECB8@wu-wien.ac.at> =============================================================== CALL FOR PAPERS (XHPC'06) Workshop on XEN in High-Performance Cluster and Grid Computing Environments as part of: The Fourth International Symposium on Parallel and Distributed Processing and Applications (ISPA'2006). Sorrento, Italy =============================================================== Date: 1-4 December 2006 ISPA'2006: http://www.ispa-conference.org/2006/ Workshop URL: http://xhpc.ai.wu-wien.ac.at/ws/ (due date: August 4, 2006) Scope: The Xen virtual machine monitor is reaching wide-spread adoption in a variety of operating systems as well as scientific educational and operational usage areas. With its low overhead, Xen allows for concurrently running large numbers of virtual machines, providing each encapsulation, isolation and network-wide CPU migratability. Xen offers a network-wide abstraction layer of individual machine resources to OS environments, thereby opening whole new cluster-and grid high-performance computing (HPC) architectures and HPC services options. With Xen finding applications in HPC environments, this workshop aims to bring together researchers and practitioners active on Xen in high-performance cluster and grid computing environments. The workshop will be one day in length, composed of 20 min paper presentations, each followed by 10 min discussion sections. Presentations may be accompanied with interactive demonstrations. The workshop will end with a 30 min panel discussion by presenters. TOPICS Topics include, but are not limited to, the following subject matters: - Xen in cluster and grid environments - Workload characterizations for Xen-based clusters - Xen cluster and grid architectures - Cluster reliability, fault-tolerance, and security - Compute job entry and scheduling - Compute workload load levelling - Cluster and grid filesystems for Xen - Research and education use cases - VM cluster distribution algorithms - MPI, PVM on virtual machines - System sizing - High-speed interconnects in Xen - Xen extensions and utilities for cluster and grid computing - Network architectures for Xen clusters - Xen on large SMP machines - Measuring performance - Performance tuning of Xen domains - Xen performance tuning on various load types - Xen cluster/grid tools - Management of Xen clusters PAPER SUBMISSION Papers submitted to each workshop will be reviewed by at least three members of the program committee and external reviewers. Submissions should include abstract, key words, the e-mail address of the corresponding author, and must not exceed 15 pages, including tables and figures, and preferably be in LaTeX or FrameMaker, although submissions in the LNCS Word format will be accepted as well. Electronic submission through the submission website is strongly encouraged. Hardcopies will be accepted only if electronic submission is not possible. Submission of a paper should be regarded as a commitment that, should the paper be accepted, at least one of the authors will register and attend the conference to present the work. An award for best student paper will be given. http://isda2006.ujn.edu.cn/isda/author/submit.php Format should be according to the Springer LNCS Style http://www.springer.de/comp/lncs/authors.html It is expected that the proceedings of the workshop programs will be published by Springer's LNCS series or IEEE CS. IMPORTANT DATES Paper submission due: August 4, 2006 Acceptance notification: September 1, 2006 Camera-ready due: September 20, 2006 Conference: December 1-4, 2006 CHAIR Michael Alexander (chair), WU Vienna, Austria Geyong Min (co-chair), University of Bradford, UK Gudula Ruenger (co-chair), Chemnitz University of Technology, Germany PROGRAM COMMITTEE Franck Cappello, CNRS-Universit? Paris-Sud, France Claudia Eckert, Fraunhofer-Institute, Germany Rob Gardner, HP Labs, USA Marcus Hardt, Forschungszentrum Karlsruhe, Germany Sverre Jarp, CERN, Switzerland Thomas Lange, University of Cologne, Germany Ronald Luijten, IBM Research Laboratory, Zurich, Switzerland Klaus Ita, WU Vienna, Austria Franco Travostino, Nortel CTO Office, USA Andreas Unterkircher, CERN, Switzerland GENERAL INFORMATION This workshop will be held as part of ISPA 2006 in Sorrento, Italy - http://www.sorrentoinfo.com/sorrento/sorrento_italy.asp. From tournesol33 at gmail.com Tue Jun 13 06:40:27 2006 From: tournesol33 at gmail.com (tournesol) Date: Tue, 13 Jun 2006 15:40:27 +0900 Subject: [Fedora-xen] Why xenU in grub.conf Message-ID: <448E5DDB.5090507@gmail.com> Hi forks Why xenU in grub.conf ? for what ? title Fedora Core (2.6.16-1.2122_FC5xenU) root (hd0,0) kernel /vmlinuz-2.6.16-1.2122_FC5xenU ro root=/dev/VolGroup00/LogVol00 rhgb quiet tournesol From gawain.lynch at bigpond.com Tue Jun 13 15:32:17 2006 From: gawain.lynch at bigpond.com (Gawain Lynch) Date: Wed, 14 Jun 2006 01:32:17 +1000 Subject: [Fedora-xen] [RFC] Extending xenguest-install.py Message-ID: <1150212737.2797.12.camel@legolas.felicity.net.au> The attached patch adds the following options to the xenguest-install.py script: -U, --genuuid Generate a random UUID and exit -M, --genmac Generate a random MAC address and exit -C CONFOUT, --genconf=CONFOUT Generate a template guest config file Is this something that people think might be useful? If so I'll raise an RFE in bugzilla. Take care, Gawain -------------- next part -------------- A non-text attachment was scrubbed... Name: xenguest-install.patch Type: text/x-patch Size: 2277 bytes Desc: not available URL: From takebe_akio at jp.fujitsu.com Tue Jun 13 15:51:28 2006 From: takebe_akio at jp.fujitsu.com (Akio Takebe) Date: Wed, 14 Jun 2006 00:51:28 +0900 Subject: [Fedora-xen] Why xenU in grub.conf In-Reply-To: <448E5DDB.5090507@gmail.com> References: <448E5DDB.5090507@gmail.com> Message-ID: Hi, tournesol and all The reason is that kernel-xenU of FC use the same post-intall-tools as native kernel. (Probably kdump also have the same issue.) I also think this is unhappy. I think the better %post is like the below. (this is a sample code, not tested.) If necessary, I'll make a patch. :-) -------kernel.spec--------- %post xenU [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU /sbin/new-kernel-pkg --package kernel-xenU --mkinitrd --depmod --noconfig --install %{KVERREL}xenU [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X ---------------- --- new-kernel-pkg in mkinird ----- diff -uNrp mkinitrd-5.0.41/grubby/new-kernel-pkg mkinitrd-5.0.41.new/grubby/new-kernel-pkg --- mkinitrd-5.0.41/grubby/new-kernel-pkg 2006-03-31 08:15:19.000000000 +0900 +++ mkinitrd-5.0.41.new/grubby/new-kernel-pkg 2006-06-14 01:01:48.000000000 +0900 @@ -81,7 +81,7 @@ usage() { echo " [--initrdfile=] [--depmod] [--rmmoddep]" >&2 echo " [--kernel-args=] [--remove-args=]" >&2 echo " [--banner=] [--multiboot=multiboot]" >&2 - echo " [--mbargs=mbargs] [--make-default]" >&2 + echo " [--mbargs=mbargs] [--make-default] [--noconfig]" >&2 echo " <--install | --remove | --update> " >&2 echo " (ex: `basename $0` --mkinitrd --depmod --install 2.4.7-2)" >&2 exit 1 @@ -336,6 +336,9 @@ while [ $# -gt 0 ]; do --make-default) makedefault="--make-default" ;; + --noconfig) + nocfg=1 + ;; --package) if echo $1 | grep '=' >/dev/null ; then @@ -422,8 +425,8 @@ if [ ! -x $grubby ] ; then fi -[ -n "$grubConfig" ] && [ -f "$grubConfig" ] && cfgGrub=1; -[ -n "$liloConfig" ] && [ -f "$liloConfig" ] && cfgLilo=1; +[ -n "$grubConfig" ] && [ -f "$grubConfig" ] && [ -n $nocfg ]&& cfgGrub=1; +[ -n "$liloConfig" ] && [ -f "$liloConfig" ] && [ -n $nocfg ]&& cfgLilo=1; # if we have a lilo config on an x86 box, see if the default boot loader # is lilo to determine if it should be run Best Regards, Akio Takebe >Hi forks > >Why xenU in grub.conf ? for what ? > > >title Fedora Core (2.6.16-1.2122_FC5xenU) >root (hd0,0) >kernel /vmlinuz-2.6.16-1.2122_FC5xenU ro root=/dev/VolGroup00/LogVol00 >rhgb quiet > > > > > > > > > >tournesol > >-- >Fedora-xen mailing list >Fedora-xen at redhat.com >https://www.redhat.com/mailman/listinfo/fedora-xen From katzj at redhat.com Tue Jun 13 17:14:45 2006 From: katzj at redhat.com (Jeremy Katz) Date: Tue, 13 Jun 2006 13:14:45 -0400 Subject: [Fedora-xen] Why xenU in grub.conf In-Reply-To: <448E5DDB.5090507@gmail.com> References: <448E5DDB.5090507@gmail.com> Message-ID: <1150218886.22018.25.camel@orodruin.boston.redhat.com> On Tue, 2006-06-13 at 15:40 +0900, tournesol wrote: > Why xenU in grub.conf ? for what ? > > title Fedora Core (2.6.16-1.2122_FC5xenU) > root (hd0,0) > kernel /vmlinuz-2.6.16-1.2122_FC5xenU ro root=/dev/VolGroup00/LogVol00 > rhgb quiet Because our default setup actually installs normally and then uses a bootloader (pygrub) to boot the guest using the configs inside of the guest Jeremy From katzj at redhat.com Tue Jun 13 17:17:57 2006 From: katzj at redhat.com (Jeremy Katz) Date: Tue, 13 Jun 2006 13:17:57 -0400 Subject: [Fedora-xen] [RFC] Extending xenguest-install.py In-Reply-To: <1150212737.2797.12.camel@legolas.felicity.net.au> References: <1150212737.2797.12.camel@legolas.felicity.net.au> Message-ID: <1150219077.22018.29.camel@orodruin.boston.redhat.com> On Wed, 2006-06-14 at 01:32 +1000, Gawain Lynch wrote: > The attached patch adds the following options to the xenguest-install.py > script: What's the use case for these? Since without going through the install process, the "template" configs that you're doing aren't really going to work. And there are other ways of getting UUIDs and macaddrs. Jeremy From pm.priya at hp.com Tue Jun 13 19:04:38 2006 From: pm.priya at hp.com (P M, Priya) Date: Wed, 14 Jun 2006 00:34:38 +0530 Subject: [Fedora-xen] Exporting "SD" device. Message-ID: Hi, We have Intel VT enabled system loaded with Xen 3.0.2 and qemu based FC5+linux 2.6.16 as a guest operating system. We want to export the disk to the domain 1 (FC5_linux 2.6.16) as "SD" device. But we are not able to export the SCSI disk as a SD device, we could export as a "HD" device. In the Configuration file, disk = [ 'file:/home/adteam/linux_fc5_2.6.16,ioemu:hda,w','phy:/dev/sdd,ioemu:hdb ,w' ] if we use ioemu:hdb, then the device is exported to the domain 1 and we could see the device. If we use disk = [ 'file:/home/adteam/linux_fc5_2.6.16,ioemu:hda,w','phy:/dev/sdd,/dev/sdb, w' ] /dev/sdb, then the device is not seen on domain 1. Are we missing something. Is it not possible to export an SD device to domain 1? Is there any limitiation in qemu based domain 1, because our domain 0 is qemu based operating system. Is there any performance difference between "hda" and "sda" exported devices??? Thanks. -------------- next part -------------- An HTML attachment was scrubbed... URL: From aron at hp.com Tue Jun 13 21:22:51 2006 From: aron at hp.com (Aron Griffis) Date: Tue, 13 Jun 2006 17:22:51 -0400 Subject: [Fedora-xen] Fedora Xen/IA64 status page Message-ID: <20060613212251.GA17793@vino.zko.hp.com> I created a wiki page to track Fedora Xen/IA64 work items and status. For anybody interested: http://wiki.xensource.com/xenwiki/FedoraXenIA64 Aron -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From supercomputer at gmail.com Tue Jun 13 22:07:34 2006 From: supercomputer at gmail.com (Chris Vaughan) Date: Tue, 13 Jun 2006 16:07:34 -0600 Subject: [Fedora-xen] Multiple Xens with static IP addresses Message-ID: <216ee070606131507x50e20f59s66344913d3205672@mail.gmail.com> I am wanting to boot multiple xen images but I was wondering if there is an easier way to set it's ip address than mounting the image and editing /etc/sysconfig/network-scripts/ifcfg-eth0 every time. I've tried putting this in my xen.cfg file vif=['192.168.0.3'] and it doesn't appear to do anything. Is this the correct way to boot a xen image and assign it a static ip address? Thanks, -- ------------------------------ Christopher Vaughan -------------- next part -------------- An HTML attachment was scrubbed... URL: From gawain.lynch at bigpond.com Tue Jun 13 23:42:10 2006 From: gawain.lynch at bigpond.com (Gawain Lynch) Date: Wed, 14 Jun 2006 09:42:10 +1000 Subject: [Fedora-xen] [RFC] Extending xenguest-install.py In-Reply-To: <1150219077.22018.29.camel@orodruin.boston.redhat.com> References: <1150212737.2797.12.camel@legolas.felicity.net.au> <1150219077.22018.29.camel@orodruin.boston.redhat.com> Message-ID: <1150242130.2797.22.camel@legolas.felicity.net.au> On Tue, 2006-06-13 at 13:17 -0400, Jeremy Katz wrote: > On Wed, 2006-06-14 at 01:32 +1000, Gawain Lynch wrote: > > The attached patch adds the following options to the xenguest-install.py > > script: > > What's the use case for these? Since without going through the install > process, the "template" configs that you're doing aren't really going to > work. And there are other ways of getting UUIDs and macaddrs. OK true wrt the "template", it was an after thought while I was there. As for uuid and mac, I found myself creating a number of configs from scratch and having to manually generate that data. I was going to write a separate script based on xenguest-install.py and figured that it probably belonged all together... It just seemed like one of those things that might help a few of us :-) Gawain From yongkang.you at intel.com Wed Jun 14 01:01:28 2006 From: yongkang.you at intel.com (You, Yongkang) Date: Wed, 14 Jun 2006 09:01:28 +0800 Subject: [Fedora-xen] Exporting "SD" device. Message-ID: <16A54BF5D6E14E4D916CE26C9AD30575044A24AC@pdsmsx402.ccr.corp.intel.com> Priya, HVM QEMU doesn?t support emulate SCSI device. So you have to use the IDE device. Your first configuration is correct. Best Regards, Yongkang (Kangkang) ?? ________________________________ From: fedora-xen-bounces at redhat.com [mailto:fedora-xen-bounces at redhat.com] On Behalf Of P M, Priya Sent: 2006?6?14? 3:05 To: fedora-xen at redhat.com Subject: [Fedora-xen] Exporting "SD" device. Hi, We have Intel VT enabled system loaded with Xen 3.0.2 and qemu based FC5+linux 2.6.16 as a guest operating system. We want to export the disk to the domain 1 (FC5_linux 2.6.16) as "SD" device. But we are not able to export the SCSI disk as a SD device, we could export as a "HD" device. In the Configuration file, disk = [ 'file:/home/adteam/linux_fc5_2.6.16,ioemu:hda,w','phy:/dev/sdd,ioemu:hdb,w' ] if we use ioemu:hdb, then the device is exported to the domain 1 and we could see the device. If we use disk = [ 'file:/home/adteam/linux_fc5_2.6.16,ioemu:hda,w','phy:/dev/sdd,/dev/sdb,w' ] /dev/sdb, then the device is not seen on domain 1. Are we missing something. Is it not possible to export an SD device to domain 1? Is there any limitiation in qemu based domain 1, because our domain 0 is qemu based operating system. Is there any performance difference between "hda" and "sda" exported devices??? Thanks. -------------- next part -------------- An HTML attachment was scrubbed... URL: From mito at chartermi.net Wed Jun 14 03:08:22 2006 From: mito at chartermi.net (Mito) Date: Tue, 13 Jun 2006 23:08:22 -0400 Subject: [Fedora-xen] Multiple Xens with static IP addresses In-Reply-To: <216ee070606131507x50e20f59s66344913d3205672@mail.gmail.com> Message-ID: <00a501c68f5f$cc1633b0$03c8a8c0@PAPA> I've ran into this problem a few times, and was able to fix it once (but regrettably I don't remember the details, maybe someone else here who knows more could fill in the blanks better). Anyways, in my case, I was able to assign IP addresses via the xen config file for a while, and then it stopped working at some point. I found out that if you remove all knowledge that the domU has about an IP address, then it will take the one from the xen config. Something like that at least. as I said, I've ran into this problem multiple times, but only been able to fix it once. _____ From: fedora-xen-bounces at redhat.com [mailto:fedora-xen-bounces at redhat.com] On Behalf Of Chris Vaughan Sent: Tuesday, June 13, 2006 6:08 PM To: Fedora-xen at redhat.com Subject: [Fedora-xen] Multiple Xens with static IP addresses I am wanting to boot multiple xen images but I was wondering if there is an easier way to set it's ip address than mounting the image and editing /etc/sysconfig/network-scripts/ifcfg-eth0 every time. I've tried putting this in my xen.cfg file vif=['192.168.0.3'] and it doesn't appear to do anything. Is this the correct way to boot a xen image and assign it a static ip address? Thanks, -- ------------------------------ Christopher Vaughan -------------- next part -------------- An HTML attachment was scrubbed... URL: From xiantao.zhang at intel.com Wed Jun 14 07:39:57 2006 From: xiantao.zhang at intel.com (Zhang, Xiantao) Date: Wed, 14 Jun 2006 15:39:57 +0800 Subject: [Fedora-xen] Fedora Xen/IA64 status page Message-ID: Hi, Aron I have tried linux-2.6.tip-xen, and build successfully after some fixes. But I don't know which CSet it based, so the hypervisor couldn't be built to boot this kernel, Could you give some tips ? Thanks & Best Regards -Xiantao OTC,Intel Corporation > -----Original Message----- > From: fedora-xen-bounces at redhat.com [mailto:fedora-xen-bounces at redhat.com] > On Behalf Of Aron Griffis > Sent: 2006?6?14? 5:23 > To: fedora-xen at redhat.com > Subject: [Fedora-xen] Fedora Xen/IA64 status page > > I created a wiki page to track Fedora Xen/IA64 work items and status. > For anybody interested: > > http://wiki.xensource.com/xenwiki/FedoraXenIA64 > > Aron From aron at hp.com Wed Jun 14 13:35:45 2006 From: aron at hp.com (Aron Griffis) Date: Wed, 14 Jun 2006 09:35:45 -0400 Subject: [Fedora-xen] Fedora Xen/IA64 status page In-Reply-To: References: Message-ID: <20060614133545.GA12928@olive.flatmonk> Zhang, Xiantao wrote: [Wed Jun 14 2006, 03:39:57AM EDT] > I have tried linux-2.6.tip-xen, and build successfully after some > fixes. But I don't know which CSet it based, so the hypervisor > couldn't be built to boot this kernel, Could you give some tips ? It is not easy to discover... According to the history, xen-unstable patches were last pulled around a week ago, so if you use a hypervisor from around then, it should work. Alternatively get the xen tarball from http://free.linux.hp.com/~agriffis/fedora-kernel-ia64/ which is from the src.rpm. Then you're using the snapshot Red Hat is using. This is a potential problem in the Fedora method for creating the xen patch. The hypervisor and xenlinux are rarely from the same xen-unstable changeset. However since the hypervisor API is theoretically stable at this point, it should rarely be a problem. The ia64 port is more susceptible to version mismatch because it is changing more rapidly than the other architectures. Regards, Aron -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From xiantao.zhang at intel.com Thu Jun 15 07:31:18 2006 From: xiantao.zhang at intel.com (Zhang, Xiantao) Date: Thu, 15 Jun 2006 15:31:18 +0800 Subject: [Fedora-xen] [PATCH] make fedaro-kernel-ia64 build pass Message-ID: Hi, Aron Since ioremap has been implemented @/arch/kernel/mm/ioremap.c separately in kernel 2.6.17. We can remove it from io.h safely. This fix makes kernel rpm package build successfully. Thanks & Best Regards -Xiantao OTC,Intel Corporation -------------- next part -------------- A non-text attachment was scrubbed... Name: ioremap.diff Type: application/octet-stream Size: 1505 bytes Desc: ioremap.diff URL: From ManognaR_C at infosys.com Thu Jun 15 11:40:22 2006 From: ManognaR_C at infosys.com (Manogna Ramakrishna Chebiyyam) Date: Thu, 15 Jun 2006 17:10:22 +0530 Subject: [Fedora-xen] keyboard error Message-ID: hi, i had domain 0 already installed on my PC.. i was installing FC5 on my PC from CD's without disturbing the grub.. i chose /dev/VolGroup00/LogVol00 for / and /boot was in /dev/sda5.. and now i am not able to login in domain 0 because my keyboard and mouse is not responding.. they are in perfect working condition by the way.. please help!!!!!!!!!!!! Manogna Employee ID-53967 High Performance Computing SETLabs Infosys Technologies Limited Bangalore **************** CAUTION - Disclaimer ***************** This e-mail contains PRIVILEGED AND CONFIDENTIAL INFORMATION intended solely for the use of the addressee(s). If you are not the intended recipient, please notify the sender by e-mail and delete the original message. Further, you are not to copy, disclose, or distribute this e-mail or its contents to any other person and any such actions are unlawful. This e-mail may contain viruses. Infosys has taken every reasonable precaution to minimize this risk, but is not liable for any damage you may sustain as a result of any virus in this e-mail. You should carry out your own virus checks before opening the e-mail or attachment. Infosys reserves the right to monitor and review the content of all messages sent to or from this e-mail address. Messages sent to or from this e-mail address may be stored on the Infosys e-mail system. ***INFOSYS******** End of Disclaimer ********INFOSYS*** From xiantao.zhang at intel.com Fri Jun 16 07:27:43 2006 From: xiantao.zhang at intel.com (Zhang, Xiantao) Date: Fri, 16 Jun 2006 15:27:43 +0800 Subject: [Fedora-xen] FC6 VNC issue Message-ID: Hi all, We met vnc server issue in FC6-ia64. Seems VNC server in FC6 has some bugs so as not to connect it. After reversing to FC5's VNC package(4.1.1-36), we solved this issue with this method. So currently, we can use this version for Xen's development. Thanks & Best Regards -Xiantao OTC,Intel Corporation From jean-paul.pigache at bull.net Fri Jun 16 13:12:21 2006 From: jean-paul.pigache at bull.net (jean-paul.pigache at bull.net) Date: Fri, 16 Jun 2006 15:12:21 +0200 Subject: [Fedora-xen] DomUdoes not start with Fedora-Xen-ia64 Message-ID: We want to test Fedora-Xen-ia64, but Domu does not start. Here is a short description of the problem, and below a more detailed description of the context. DomU does not start: ------------------- Xen30 has been installed from Aron Griffis repositories (http://free.linux.hp.com/?griffis/agriffis-xen-ia64.repo) on may the 24th. File state: vmlinuz-2.6.16-%3.2232_FC6agriffis.3xen0 xen.gz-2.6.16-%3.2232_FC6agriffis.3 initrd-2.6.16-%3.2232_FC6agriffis.3xen0.img Dom0 starts successfully but we have no useful root console, but we can connect by ssh. Root console displayes some messages but we have no prompt to connect. The DomU is a clone of Dom0. But it does not start. DomU console does not open, and we do not know why. Any idea of what the problem could be ? We will make another try with a newest kernel. Jean-Paul Background information: here is a summary of the problems we faced before getting Fedora-Xen running: Fedora history : Fedora Core 5: ---------------- Install with CDs built from iso files. 1- Graphic install KO and no switching to text mode. So text mode only available because X server can not start: /var/log/Xorg.0.log: .... ATI Radeon X800 (R430) (PCIE), ATI Radeon X800 XL (R430) (PCIE), ATI Radeon X800 SE (R430) (PCIE), ATI Radeon X800 XTP (R430) (PCIE), ATI Radeon X850 5D4C (PCIE), ATI Radeon FireGL (R480) GL 5D50(PCIE), ATI Radeon X850 SE (R480) (PCIE), ATI Radeon X850 PRO (R480) (PCIE), ATI Radeon X850 XT (R480) (PCIE), ATI Radeon X850 XT PE (R480) (PCIE), ATI Radeon X850 PRO (R480) (AGP), ATI Radeon X850 SE (R480) (AGP), ATI Radeon X850 XT (R480) (AGP), ATI Radeon X850 XT PE (R480) (AGP) (II) Primary Device is: PCI 01:01:0 (II) ATI: Candidate "Device" section "Videocard0". Fatal server error: xf86MapVidMem: Could not mmap framebuffer (0xfbfd0000,0x4000) (Invalid argument) My video card is: 01:01.0 VGA compatible controller: ATI Technologies Inc Rage XL (rev 27) Bypass proposed by Tony Luck does not work. Patch of Bjorn Helgaas does not work too (not applicable because different sources) NOTE: Same problem occurs with Rawhide ia64 from 27 April. When system is running, X server can not start for the same reason. 2- hwclock can not be set when linux starts. hwclock: Open of /dev/efirtc failed, errno=2. No such file or directory. No usabel clock interface found. Cannot access the Hardware Clock in any known method. Problem seems to be located in /etc/rc.sysinit file where hardware clock is set before device creation (/sbin/start_udev step). When hardware clock setting step is done after device creation, hwclock gives right remanent time information. 3- After Dependencies checking and install beginning, an exception occurred. Messages are: Traceback (most recent call last): File "/usr/bin/anaconda", line 1080, in ? intf.run(id, dispatch) File "/usr/lib/anaconda/test.py", line513 in run rc=apply(win,(self.screen, )+ args) File "/usr/lib/anaconda/textw/confirm_text.py", line 32 in __call__ rc=present.requiredMediaMessage (intf, id.grpset) Attribute error: installData Instance has no attribute 'grpset' Fedora weekly 05142006 : install withCDs built from iso files --------------------------------------------------------------- Install in graphic mode does not work but install switches to text mode. 1- Graphic install still KO and switch to text mode. ( message 'module libXau.so.6 not found" in /tmp/X.log file' I don't investigate this problem further more and hope that library name is correct.) 2- In Partionning step, when 'Create custom Layout' option is choosen /boot/efi partition can not be created (Mounting point already in use). Partitionning has been made using 'Default layout creation' choice. 3- In Network Configuration for Eth0, when 'Configure using DHCP' default option is unset, given IP address is declared as invalid. Information message is: 'You must enter a valid IP address to continue.' When active on boot is not selected and others network adapters not configured, exception occurs in: anaconda.intf.run at line 938: ns1Entry.set (network.primaryNS NameError: global name 'network' is not defined. 4- With default configuration options for network adapters, setup goes on and aborts 5- After Dependencies checking and install beginning, an exception occurred. Traceback (most recent call last): File "/usr/bin/anaconda", line 1080, in ? intf.run(id, dispatch) File "/usr/lib/anaconda/test.py", line513 in run rc=apply(win,(self.screen, )+ args) File "/usr/lib/anaconda/textw/confirm_text.py", line 32 in __call__ rc=present.requiredMediaMessage (intf, id.grpset) Attribute error: installData Instance has no attribute 'grpset' Choice is then : OK to reboot, or Debug to enter in anaconda debugging mode. Fedora weekly 04252006: install with http method (vnc askmethod) --------------------------------------------------------------------- Come back on previous weekly because network configuration problems 1- Graphic install still KO and switch to text mode. 2- After language selection, an error occurrs: 'Failed to read keymap information: Success' Only choice is OK and install goes on Default options are kept and install ends. Warnings : - install from CDs built from iso files does not work in any case - don't choose CD-Rom test: it leads to finally reboot -------------- next part -------------- An HTML attachment was scrubbed... URL: From wong_powah at yahoo.ca Fri Jun 16 13:58:45 2006 From: wong_powah at yahoo.ca (PoWah Wong) Date: Fri, 16 Jun 2006 06:58:45 -0700 (PDT) Subject: [Fedora-xen] Xen on Fedora core 5 support Fedora core 3 and Redhat 7.2 Message-ID: <20060616135845.36184.qmail@web36214.mail.mud.yahoo.com> Does Xen on Fedora core 5 support Fedora core 3 and Redhat 7.2? If yes, what are the advices for installation? I had already looked at http://fedoraproject.org/wiki/FedoraXenQuickstartFC5 From laurent at unipress.be Fri Jun 16 14:04:10 2006 From: laurent at unipress.be (Laurent van der Straten) Date: Fri, 16 Jun 2006 16:04:10 +0200 Subject: [Fedora-xen] xenguest-install problem Message-ID: <1150466650.3013.80.camel@itweb.unipress.be> I try to install FC5 i386 as guest on fc5 X86_64 host. each try I get this : libvir: Xen Daemon error : POST operation failed: No such domain fc5i Failed to get devices for domain fc5 Traceback (most recent call last): File "/usr/sbin/xenguest-install.py", line 460, in ? main() File "/usr/sbin/xenguest-install.py", line 451, in main start_paravirt_install(name, ram, disk, mac, uuid, src, options.extra) File "/usr/sbin/xenguest-install.py", line 331, in start_paravirt_install dom = conn.createLinux(cfgxml, 0) File "/usr/lib64/python2.4/site-packages/libvirt.py", line 207, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed') libvirt.libvirtError: virDomainCreateLinux() failed details: Linux xen.unipress.be 2.6.16-1.2133_FC5xen0 #1 SMP Tue Jun 6 01:21:07 EDT 2006 x86_64 x86_64 x86_64 GNU/Linux [root at xen laurent]# /usr/sbin/xm list Name ID Mem(MiB) VCPUs State Time(s) Domain-0 0 512 1 r----- 7220.4 server : Dual Opteron 4GB RAM thanks a lot -- ********************************************************************** Laurent van der Straten Network/Operation Systems/Support Rue Th?odore Verhaegen, 196 202 1060 Bruxelles Belgium Tel: +32 2 533 99 84 Fax: +32 2 523 24 96 URL: www.up-servers.com ********************************************************************** From thomas.vonsteiger at bluewin.ch Sat Jun 17 04:22:19 2006 From: thomas.vonsteiger at bluewin.ch (thomas.vonsteiger at bluewin.ch) Date: Sat, 17 Jun 2006 06:22:19 +0200 Subject: AW: [Fedora-xen] Xen on Fedora core 5 support Fedora core 3 and Redhat7.2 In-Reply-To: <20060616135845.36184.qmail@web36214.mail.mud.yahoo.com> Message-ID: <015201c691c5$9fdcf280$3e01a8c0@athlon> I have running Redhat 7.2 as fc5 guest. One guest is a dd migration from old hardware and one guest is a normal boot install from a 7.2 iso image with SDL. On my hardware there are only single core kernel running. If I use smp kernel i can see only one cpu. Finaly you can to yum upgrade from this site: http://www.fedoralegacy.org/ It's realy fun to have a running guest with 64Mb Memory:-) Thomas -----Urspr?ngliche Nachricht----- Von: fedora-xen-bounces at redhat.com [mailto:fedora-xen-bounces at redhat.com] Im Auftrag von PoWah Wong Gesendet: Freitag, 16. Juni 2006 15:59 An: fedora-xen at redhat.com Betreff: [Fedora-xen] Xen on Fedora core 5 support Fedora core 3 and Redhat7.2 Does Xen on Fedora core 5 support Fedora core 3 and Redhat 7.2? If yes, what are the advices for installation? I had already looked at http://fedoraproject.org/wiki/FedoraXenQuickstartFC5 -- Fedora-xen mailing list Fedora-xen at redhat.com https://www.redhat.com/mailman/listinfo/fedora-xen -- No virus found in this incoming message. Checked by AVG Free Edition. Version: 7.1.394 / Virus Database: 268.9.0/366 - Release Date: 15.06.2006 From thomas.vonsteiger at bluewin.ch Sat Jun 17 04:49:43 2006 From: thomas.vonsteiger at bluewin.ch (thomas.vonsteiger at bluewin.ch) Date: Sat, 17 Jun 2006 06:49:43 +0200 Subject: AW: [Fedora-xen] System shutting down -- need manual reset. In-Reply-To: <1149780433.5447.30.camel@sisko.sctweedie.blueyonder.co.uk> Message-ID: <015301c691c9$731c8220$3e01a8c0@athlon> Hi Stephen, I get the same problem with this kernel version and with the latest fc5 kernel: 2.6.16-1.2129_FC5xen0 2.6.16-1.2133_FC5xen0 Now I have create this bugzilla: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195753 Thomas -----Urspr?ngliche Nachricht----- Von: Stephen C. Tweedie [mailto:sct at redhat.com] Gesendet: Donnerstag, 8. Juni 2006 17:27 An: thomas.vonsteiger at bluewin.ch Cc: fedora-xen at redhat.com; Stephen Tweedie Betreff: Re: [Fedora-xen] System shutting down -- need manual reset. Hi, On Thu, 2006-06-08 at 10:02 +0200, thomas.vonsteiger at bluewin.ch wrote: > I have daily this kernel error and with system down. > Kernel Version 2.6.16-1.2122_FC5xen0, box running on latest updates. > > Is this a know problem ? > > (XEN) Assertion '(sp == 0) || (pending_eoi[cpu][sp-1].vector < vector)' > failed, line 189, file irq.c I've seen it reported before, but I don't think we actually have an open bugzilla for it. Would it be possible to try the kernel-xen0 and xen rpms from rawhide? Those have a newer version of xen which may address this, Thanks, Stephen -- No virus found in this incoming message. Checked by AVG Free Edition. Version: 7.1.394 / Virus Database: 268.8.3/358 - Release Date: 07.06.2006 From gawain.lynch at bigpond.com Sat Jun 17 03:54:53 2006 From: gawain.lynch at bigpond.com (Gawain Lynch) Date: Sat, 17 Jun 2006 13:54:53 +1000 Subject: AW: [Fedora-xen] Xen on Fedora core 5 support Fedora core 3 and Redhat7.2 In-Reply-To: <015201c691c5$9fdcf280$3e01a8c0@athlon> References: <015201c691c5$9fdcf280$3e01a8c0@athlon> Message-ID: <1150516493.3201.21.camel@legolas.felicity.net.au> On Sat, 2006-06-17 at 06:22 +0200, thomas.vonsteiger at bluewin.ch wrote: > I have running Redhat 7.2 as fc5 guest. Are you running these on VT/Pacifica hardware? From thomas.vonsteiger at bluewin.ch Sat Jun 17 04:59:59 2006 From: thomas.vonsteiger at bluewin.ch (thomas.vonsteiger at bluewin.ch) Date: Sat, 17 Jun 2006 06:59:59 +0200 Subject: AW: AW: [Fedora-xen] Xen on Fedora core 5 support Fedora core 3and Redhat7.2 In-Reply-To: <1150516493.3201.21.camel@legolas.felicity.net.au> Message-ID: <015401c691ca$e2b45c10$3e01a8c0@athlon> On VT hardware. -----Urspr?ngliche Nachricht----- Von: Gawain Lynch [mailto:gawain.lynch at bigpond.com] Gesendet: Samstag, 17. Juni 2006 05:55 An: thomas.vonsteiger at bluewin.ch Cc: 'PoWah Wong'; fedora-xen at redhat.com Betreff: Re: AW: [Fedora-xen] Xen on Fedora core 5 support Fedora core 3and Redhat7.2 On Sat, 2006-06-17 at 06:22 +0200, thomas.vonsteiger at bluewin.ch wrote: > I have running Redhat 7.2 as fc5 guest. Are you running these on VT/Pacifica hardware? -- No virus found in this incoming message. Checked by AVG Free Edition. Version: 7.1.394 / Virus Database: 268.9.0/366 - Release Date: 15.06.2006 From samag70-ignore at yahoo.ca Tue Jun 20 16:09:45 2006 From: samag70-ignore at yahoo.ca (Tom Spec) Date: Tue, 20 Jun 2006 09:09:45 -0700 (PDT) Subject: [Fedora-xen] xenguest-install.py nfs problems Message-ID: <20060620160945.17919.qmail@web88204.mail.re2.yahoo.com> !-- DIV {margin:0px;}-->!-- DIV {margin:0px;}-->When I run xenguest-install.py on FC5, it always gives me the following error after "What is the install location?": Invalid NFS location given I have tried two different methods that work for me for regular installations,but I can't get this script to work. 1) Specify the location that contains the Fedora Core .iso files 2) Specify the location that contains the "Fedora" directory (and subsequently all the RPMs) Can someone tell me exactly what xenguest-install.py is looking for in an NFS install location? Note: It does seem to be mounting the NFS directory, it's just that it tells me it's invalid. Any help would be appreciated. # rpm -qa | grep xen kernel-xen0-2.6.16-1.2122_FC5 xen-3.0.2-0.FC5.3 Tom -------------- next part -------------- An HTML attachment was scrubbed... URL: From chitlesh at fedoraproject.org Tue Jun 20 16:18:32 2006 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Tue, 20 Jun 2006 18:18:32 +0200 Subject: [Fedora-xen] libvir: Xen Daemon error : POST operation failed: No such domain xenboxa Message-ID: <13dbfe4f0606200918v22a3d79blf39ff99e78315221@mail.gmail.com> Hai there, xenguest-install.py is failing each time. Below are more details about my problem: -bash-3.1# uname -r 2.6.16-1.2133_FC5xen0 -bash-3.1# rpm -qa | grep xen kernel-xen0-2.6.16-1.2133_FC5 xen-3.0.2-0.FC5.3 -bash-3.1# /usr/sbin/xenguest-install.py What is the name of your virtual machine? xenbox How much RAM should be allocated (in megabytes)? 512 What would you like to use as the disk (path)? /home/chitlesh/xenbox What is the install location? http://mirrors.kernel.org/fedora/core/5/i386/os Starting install... libvir: Xen Daemon error : POST operation failed: No such domain xenboxa Failed to get devices for domain xenbox Traceback (most recent call last): File "/usr/sbin/xenguest-install.py", line 460, in ? main() File "/usr/sbin/xenguest-install.py", line 451, in main start_paravirt_install(name, ram, disk, mac, uuid, src, options.extra) File "/usr/sbin/xenguest-install.py", line 331, in start_paravirt_install dom = conn.createLinux(cfgxml, 0) File "/usr/lib/python2.4/site-packages/libvirt.py", line 207, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed') libvirt.libvirtError: virDomainCreateLinux() failed -bash-3.1# /usr/sbin/xm list Name ID Mem(MiB) VCPUs State Time(s) Domain-0 0 256 1 r----- 941.0 Checking for xendomains:/etc/init.d/xendomains: line 69: log_failure_msg: command not found i already did xm mem-set 0 256 What should I do to overcome this ? Chitlesh -- http://clunixchit.blogspot.com From veillard at redhat.com Tue Jun 20 16:30:45 2006 From: veillard at redhat.com (Daniel Veillard) Date: Tue, 20 Jun 2006 12:30:45 -0400 Subject: [Fedora-xen] libvir: Xen Daemon error : POST operation failed: No such domain xenboxa In-Reply-To: <13dbfe4f0606200918v22a3d79blf39ff99e78315221@mail.gmail.com> References: <13dbfe4f0606200918v22a3d79blf39ff99e78315221@mail.gmail.com> Message-ID: <20060620163045.GK1330@redhat.com> On Tue, Jun 20, 2006 at 06:18:32PM +0200, Chitlesh GOORAH wrote: > Hai there, > > xenguest-install.py is failing each time. Below are more details about > my problem: > > > -bash-3.1# uname -r > 2.6.16-1.2133_FC5xen0 > > -bash-3.1# rpm -qa | grep xen > kernel-xen0-2.6.16-1.2133_FC5 > xen-3.0.2-0.FC5.3 make sure you have libvirt-0.1.0 installed. Daniel -- Daniel Veillard | Red Hat http://redhat.com/ veillard at redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/ From chitlesh at fedoraproject.org Tue Jun 20 16:39:20 2006 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Tue, 20 Jun 2006 18:39:20 +0200 Subject: [Fedora-xen] libvir: Xen Daemon error : POST operation failed: No such domain xenboxa In-Reply-To: <20060620163045.GK1330@redhat.com> References: <13dbfe4f0606200918v22a3d79blf39ff99e78315221@mail.gmail.com> <20060620163045.GK1330@redhat.com> Message-ID: <13dbfe4f0606200939r13b7901eu44314097fcbdd347@mail.gmail.com> On 6/20/06, Daniel Veillard wrote: > > make sure you have libvirt-0.1.0 installed. > > Daniel > libvirt is installed -bash-3.1# rpm -qa | grep libvirt libvirt-python-0.1.0-1.FC5 libvirt-devel-0.1.0-1.FC5 libvirt-0.1.0-1.FC5 libvirt-debuginfo-0.1.0-1.FC5 -- http://clunixchit.blogspot.com From ronwahler at yahoo.com Tue Jun 20 20:15:58 2006 From: ronwahler at yahoo.com (Ron Wahler) Date: Tue, 20 Jun 2006 13:15:58 -0700 (PDT) Subject: [Fedora-xen] xen boot problem Message-ID: <20060620201558.47101.qmail@web30312.mail.mud.yahoo.com> FC5 kernel version: 2.6.1-2133_FC5 xen: 3.2 this is the error I get after selecting xen from the grub boot line and then booting to the xen kernel, I never get to the login prompt booting at RL 3. any help would be great. thanks, Ron. dmesg: Jun 20 09:46:20 localhost kernel: audit(1150818380.683:5): avc: denied { create } for pid=2663 comm="python" name="xend" scontext=system_u:sy stem_r:xend_t:s0 tcontext=system_u:object_r:var_run_t:s0 tclass=dir cat /var/log/xend-debug.log Exception in thread Thread-3: Traceback (most recent call last): File "/usr/lib/python2.4/threading.py", line 442, in __bootstrap self.run() File "/usr/lib/python2.4/threading.py", line 422, in run self.__target(*self.__args, **self.__kwargs) File "/usr/lib/python2.4/site-packages/xen/xend/server/XMLRPCServer.py", line 94, in run self.server = UnixXMLRPCServer(XML_RPC_SOCKET, False) File "/usr/lib/python2.4/site-packages/xen/util/xmlrpclib2.py", line 147, in __init__ os.chown(parent, os.geteuid(), os.getegid()) OSError: [Errno 13] Permission denied: '/var/run/xend' xen.log: cat /var/log/xend.log [2006-06-20 13:56:42 xend] INFO (SrvDaemon:285) Xend Daemon started [2006-06-20 13:56:42 xend] INFO (SrvDaemon:289) Xend changeset: unavailable . [2006-06-20 13:56:42 xend.XendDomainInfo] DEBUG (XendDomainInfo:201) XendDomainInfo.recreate({'paused': 0, 'cpu_time': 36250185703L, 'ssidref': 0, 'handle': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 'shutdown_reason': 0, 'dying': 0, 'dom': 0, 'mem_kb': 262144, 'maxmem_kb': -4, 'max_vcpu_id': 0, 'crashed': 0, 'running': 1, 'shutdown': 0, 'online_vcpus': 1, 'blocked': 0}) [2006-06-20 13:56:42 xend.XendDomainInfo] INFO (XendDomainInfo:213) Recreating domain 0, UUID 00000000-0000-0000-0000-000000000000. [2006-06-20 13:56:42 xend.XendDomainInfo] WARNING (XendDomainInfo:235) No vm path in store for existing domain 0 [2006-06-20 13:56:42 xend.XendDomainInfo] DEBUG (XendDomainInfo:673) Storing VM details: {'ssidref': '0', 'uuid': '00000000-0000-0000-0000-000000000000', 'on_reboot': 'restart', 'on_poweroff': 'destroy', 'name': 'Domain-0', 'vcpus': '1', 'vcpu_avail': '1', 'memory': '256', 'on_crash': 'restart', 'maxmem': '256'} [2006-06-20 13:56:42 xend.XendDomainInfo] DEBUG (XendDomainInfo:698) Storing domain details: {'cpu/0/availability': 'online', 'memory/target': '262144', 'name': 'Domain-0', 'console/limit': '1048576', 'vm': '/vm/00000000-0000-0000-0000-000000000000', 'domid': '0'} [2006-06-20 13:56:42 xend] DEBUG (XendDomain:152) number of vcpus to use is 0 [2006-06-20 13:56:42 xend.XendDomainInfo] DEBUG (XendDomainInfo:882) XendDomainInfo.handleShutdownWatch __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com From sanjamg at yahoo.com Tue Jun 20 23:08:10 2006 From: sanjamg at yahoo.com (Sanjam Garg) Date: Tue, 20 Jun 2006 16:08:10 -0700 (PDT) Subject: [Fedora-xen] xen Serial Port In-Reply-To: <20060620224350.57949.qmail@web30305.mail.mud.yahoo.com> Message-ID: <20060620230810.93657.qmail@web34102.mail.mud.yahoo.com> Hi Does anyone have any idea how I can communicate with /dev/ttyS0 present in Dom0 from a virtual machine. Sanjam --------------------------------- Talk is cheap. Use Yahoo! Messenger to make PC-to-Phone calls. Great rates starting at 1?/min. -------------- next part -------------- An HTML attachment was scrubbed... URL: From rmy at tigress.co.uk Wed Jun 21 09:33:35 2006 From: rmy at tigress.co.uk (Ron Yorston) Date: Wed, 21 Jun 2006 10:33:35 +0100 Subject: [Fedora-xen] xen boot problem In-Reply-To: <20060620201558.47101.qmail@web30312.mail.mud.yahoo.com> References: <20060620201558.47101.qmail@web30312.mail.mud.yahoo.com> Message-ID: <200606210933.k5L9XZ6l016981@tiffany.internal.tigress.co.uk> Ron Wahler wrote: >FC5 kernel version: 2.6.1-2133_FC5 >xen: 3.2 > >this is the error I get after selecting xen from the >grub boot line and then booting to the xen kernel, I >never get to the login prompt booting at RL 3. any >help would be great. >dmesg: > >Jun 20 09:46:20 localhost kernel: >audit(1150818380.683:5): avc: denied { >create } for pid=2663 comm="python" name="xend" >scontext=system_u:sy stem_r:xend_t:s0 >tcontext=system_u:object_r:var_run_t:s0 tclass=dir I ran into this last night. Another SELinux breakage. I got it to work by adding enforcing=0 to the xen0 kernel line in grub. It's a known issue: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195952 Ron From ron.wahler at gmail.com Wed Jun 21 16:56:08 2006 From: ron.wahler at gmail.com (Ron Wahler) Date: Wed, 21 Jun 2006 10:56:08 -0600 Subject: [Fedora-xen] xen boot problem Message-ID: with FC5 2.5.16.1-2133 and xen 3.2 to get zen to boot out of grub I had to turn off the xend on startup with chkconfig and then Zen would come up into X Windows. You then have to setenforce=0 and then start xend. chkconfig --level 345 xend off .... boot xen into xwindows ..... setenforce=o xend start ... now xen is ready for a guest. Ron Wahler http://www.positive-logic.net -------------- next part -------------- An HTML attachment was scrubbed... URL: From aron at hp.com Wed Jun 21 21:53:29 2006 From: aron at hp.com (Aron Griffis) Date: Wed, 21 Jun 2006 17:53:29 -0400 Subject: [Fedora-xen] Re: [patch 0/4] elilo multiboot support In-Reply-To: References: Message-ID: <20060621215329.GA19839@mustard.flatmonk> Hi Jeremy, I'm still waiting on review of these patches. Is there anything I can do to help out beyond sending this reminder? Thanks, Aron From katzj at redhat.com Wed Jun 21 22:26:38 2006 From: katzj at redhat.com (Jeremy Katz) Date: Wed, 21 Jun 2006 18:26:38 -0400 Subject: [Fedora-xen] Re: [patch 0/4] elilo multiboot support In-Reply-To: <20060621215329.GA19839@mustard.flatmonk> References: <20060621215329.GA19839@mustard.flatmonk> Message-ID: <1150928799.23608.0.camel@orodruin.boston.redhat.com> On Wed, 2006-06-21 at 17:53 -0400, Aron Griffis wrote: > I'm still waiting on review of these patches. Is there anything I can > do to help out beyond sending this reminder? Have a time machine handy? :-) Hopefully things are actually calming down for real today which will then give me some time to look at things like this tomorrow... my whiteboard is full of stuff that I've been dropping over the past week or so :-/ Jeremy From supercomputer at gmail.com Wed Jun 21 22:56:47 2006 From: supercomputer at gmail.com (Chris Vaughan) Date: Wed, 21 Jun 2006 16:56:47 -0600 Subject: [Fedora-xen] Xen Migration Errors Message-ID: <216ee070606211556x321ff704t456374f19f9c908e@mail.gmail.com> Hi, I am trying to perform a live xen migration and in the xm list it's saying that it transfers but when I try and console onto the node it looks like it does a kernel dump. Here is my xend.log: [2006-06-21 14:33:01 xend.XendDomainInfo] DEBUG (XendDomainInfo:259) XendDomainInfo.restore(['domain', ['domid', '4'], ['uuid', 'aeb7627f-88cb-2248-726c-42a57950aa83'], ['ssidref', '0'], ['vcpus', '1'], ['vcpu_avail', '1'], ['cpu_weight', '1.0'], ['memory', '64'], ['maxmem', '64'], ['features'], ['name', 'fedoraNode'], ['on_poweroff', 'destroy'], ['on_reboot', 'restart'], ['on_crash', 'restart'], ['image', ['linux', ['kernel', '/boot/vmlinuz-2.6.16-1.2122_FC5xenU'], ['root', '/dev/sda1'], ['args', 'selinux=0 3 HOSTINFO=testnode151:192.168.0.70SERVERINFO=testnode150: 192.168.0.70 NODELIST= GATEWAY=192.168.0.1 DNS=192.168.0.1USERLIST=test1:mike APP= APPARGS=']]], ['device', ['vif', ['backend', '0'], ['script', 'vif-bridge'], ['mac', '00:16:3e:03:c0:44']]], ['device', ['vbd', ['backend', '0'], ['dev', 'sda1'], ['uname', 'file:/home/chris/images/fedoraNode.img'], ['mode', 'w']]], ['state', '--p---'], ['shutdown_reason', 'poweroff'], ['cpu_time', '0.0'], ['online_vcpus', '1'], ['up_time', '70.0036299229'], ['start_time', ' 1150929727.88'], ['store_mfn', '134920'], ['console_mfn', '134919']]) [2006-06-21 14:33:01 xend.XendDomainInfo] DEBUG (XendDomainInfo:290) parseConfig: config is ['domain', ['domid', '4'], ['uuid', 'aeb7627f-88cb-2248-726c-42a57950aa83'], ['ssidref', '0'], ['vcpus', '1'], ['vcpu_avail', '1'], ['cpu_weight', '1.0'], ['memory', '64'], ['maxmem', '64'], ['features'], ['name', 'fedoraNode'], ['on_poweroff', 'destroy'], ['on_reboot', 'restart'], ['on_crash', 'restart'], ['image', ['linux', ['kernel', '/boot/vmlinuz-2.6.16-1.2122_FC5xenU'], ['root', '/dev/sda1'], ['args', 'selinux=0 3 HOSTINFO=testnode151:192.168.0.70SERVERINFO=testnode150: 192.168.0.70 NODELIST= GATEWAY=192.168.0.1 DNS=192.168.0.1USERLIST=test1:mike APP= APPARGS=']]], ['device', ['vif', ['backend', '0'], ['script', 'vif-bridge'], ['mac', '00:16:3e:03:c0:44']]], ['device', ['vbd', ['backend', '0'], ['dev', 'sda1'], ['uname', 'file:/home/chris/images/fedoraNode.img'], ['mode', 'w']]], ['state', '--p---'], ['shutdown_reason', 'poweroff'], ['cpu_time', '0.0'], ['online_vcpus', '1'], ['up_time', '70.0036299229'], ['start_time', ' 1150929727.88'], ['store_mfn', '134920'], ['console_mfn', '134919']] [2006-06-21 14:33:01 xend.XendDomainInfo] DEBUG (XendDomainInfo:389) parseConfig: result is {'uuid': 'aeb7627f-88cb-2248-726c-42a57950aa83', 'on_crash': 'restart', 'on_reboot': 'restart', 'image': ['linux', ['kernel', '/boot/vmlinuz-2.6.16-1.2122_FC5xenU'], ['root', '/dev/sda1'], ['args', 'selinux=0 3 HOSTINFO=testnode151:192.168.0.70 SERVERINFO=testnode150: 192.168.0.70 NODELIST= GATEWAY=192.168.0.1 DNS=192.168.0.1USERLIST=test1:mike APP= APPARGS=']], 'on_poweroff': 'destroy', 'bootloader_args': None, 'cpus': None, 'name': 'fedoraNode', 'backend': [], 'vcpus': 1, 'cpu_weight': 1.0, 'features': None, 'vcpu_avail': 1, 'memory': 64, 'device': [('vif', ['vif', ['backend', '0'], ['script', 'vif-bridge'], ['mac', '00:16:3e:03:c0:44']]), ('vbd', ['vbd', ['backend', '0'], ['dev', 'sda1'], ['uname', 'file:/home/chris/images/fedoraNode.img'], ['mode', 'w']])], 'bootloader': None, 'cpu': None, 'maxmem': 64} [2006-06-21 14:33:01 xend.XendDomainInfo] DEBUG (XendDomainInfo:1205) XendDomainInfo.construct: None [2006-06-21 14:33:01 xend.XendDomainInfo] DEBUG (XendDomainInfo:700) Storing VM details: {'name': 'fedoraNode', 'on_reboot': 'restart', 'image': "(linux (kernel /boot/vmlinuz-2.6.16-1.2122_FC5xenU) (root /dev/sda1) (args 'selinux=0 3 HOSTINFO=testnode151:192.168.0.70 SERVERINFO=testnode150: 192.168.0.70 NODELIST= GATEWAY=192.168.0.1 DNS=192.168.0.1USERLIST=test1:mike APP= APPARGS='))", 'on_poweroff': 'destroy', 'uuid': 'aeb7627f-88cb-2248-726c-42a57950aa83', 'on_crash': 'restart', 'vcpus': '1', 'vcpu_avail': '1', 'memory': '64', 'maxmem': '64'} [2006-06-21 14:33:01 xend] DEBUG (DevController:110) DevController: writing {'backend-id': '0', 'mac': '00:16:3e:03:c0:44', 'handle': '0', 'state': '1', 'backend': '/local/domain/0/backend/vif/23/0'} to /local/domain/23/device/vif/0. [2006-06-21 14:33:01 xend] DEBUG (DevController:112) DevController: writing {'mac': '00:16:3e:03:c0:44', 'state': '1', 'handle': '0', 'script': '/etc/xen/scripts/vif-bridge', 'frontend-id': '23', 'domain': 'fedoraNode', 'frontend': '/local/domain/23/device/vif/0'} to /local/domain/0/backend/vif/23/0. [2006-06-21 14:33:01 xend] DEBUG (blkif:24) exception looking up device number for sda1: [Errno 2] No such file or directory: '/dev/sda1' [2006-06-21 14:33:01 xend] DEBUG (DevController:110) DevController: writing {'virtual-device': '2049', 'backend-id': '0', 'state': '1', 'backend': '/local/domain/0/backend/vbd/23/2049'} to /local/domain/23/device/vbd/2049. [2006-06-21 14:33:01 xend] DEBUG (DevController:112) DevController: writing {'domain': 'fedoraNode', 'frontend': '/local/domain/23/device/vbd/2049', 'dev': 'sda1', 'state': '1', 'params': '/home/chris/images/fedoraNode.img', 'mode': 'w', 'frontend-id': '23', 'type': 'file'} to /local/domain/0/backend/vbd/23/2049. [2006-06-21 14:33:01 xend.XendDomainInfo] DEBUG (XendDomainInfo:725) Storing domain details: {'console/port': '2', 'name': 'fedoraNode', 'console/limit': '1048576', 'vm': '/vm/aeb7627f-88cb-2248-726c-42a57950aa83', 'domid': '23', 'cpu/0/availability': 'online', 'memory/target': '65536', 'store/port': '1'} [2006-06-21 14:33:01 xend] DEBUG (balloon:126) Balloon: free 237; need 73; done. [2006-06-21 14:33:01 xend] DEBUG (XendCheckpoint:155) [xc_restore]: /usr/lib/xen/bin/xc_restore 10 20 23 18432 1 2 [2006-06-21 14:33:01 xend] ERROR (XendCheckpoint:234) xc_linux_restore start: max_pfn = 4800 [2006-06-21 14:33:01 xend] ERROR (XendCheckpoint:234) Increased domain reservation by 12000 KB [2006-06-21 14:33:01 xend] ERROR (XendCheckpoint:234) Reloading memory pages: 0% [2006-06-21 14:33:08 xend] ERROR (XendCheckpoint:234) Received all pages (0 races) [2006-06-21 14:33:08 xend] ERROR (XendCheckpoint:234) ^H^H^H^H100% [2006-06-21 14:33:08 xend] ERROR (XendCheckpoint:234) Memory reloaded. [2006-06-21 14:33:08 xend] ERROR (XendCheckpoint:234) Decreased reservation by 2136 pages [2006-06-21 14:33:08 xend] ERROR (XendCheckpoint:234) Domain ready to be built. [2006-06-21 14:33:08 xend] ERROR (XendCheckpoint:234) Restore exit with rc=0 [2006-06-21 14:33:08 xend] DEBUG (XendCheckpoint:207) store-mfn 107286 [2006-06-21 14:33:08 xend] DEBUG (XendCheckpoint:207) console-mfn 28893 [2006-06-21 14:33:08 xend.XendDomainInfo] DEBUG (XendDomainInfo:663) XendDomainInfo.completeRestore [2006-06-21 14:33:08 xend.XendDomainInfo] DEBUG (XendDomainInfo:725) Storing domain details: {'console/ring-ref': '28893', 'console/port': '2', 'name': 'fedoraNode', 'console/limit': '1048576', 'vm': '/vm/aeb7627f-88cb-2248-726c-42a57950aa83', 'domid': '23', 'cpu/0/availability': 'online', 'memory/target': '65536', 'store/ring-ref': '107286', 'store/port': '1'} [2006-06-21 14:33:08 xend.XendDomainInfo] DEBUG (XendDomainInfo:908) XendDomainInfo.handleShutdownWatch [2006-06-21 14:33:08 xend.XendDomainInfo] DEBUG (XendDomainInfo:673) XendDomainInfo.completeRestore done Any help would be appreciated. Both distros are running FC5. Does the same hardware, kernel and image need to exist on the host and the migration destination? Thanks, -- ------------------------------ Christopher Vaughan -------------- next part -------------- An HTML attachment was scrubbed... URL: From rmortimer at bluechiptechnology.co.uk Thu Jun 22 15:01:52 2006 From: rmortimer at bluechiptechnology.co.uk (Robert Mortimer) Date: Thu, 22 Jun 2006 16:01:52 +0100 Subject: [Fedora-xen] Xen guest on RAID5 LVM (install problem) Message-ID: <00c601c6960c$cba574f0$5f00000a@rmortimer> I am trying to install a Xen FC5 client on my FC5 machine. I have a single SATA boot drive with a standard FC5 install I have a RAID5 array of 3 SATA disks for my VM's I run the install script but and specify the path to the logical Volume when prompted All goes well until the script tries to format the partition. If it has already been mounted it will recognize the fact When it goes to format I get the following just after the network setup loader received SIGSEGV!. Backtrace: [0x8049865] [0x754420] [0x8063ca0] [0x805e5e1] [0x804ad21] [0x80cae75] [0x8048131] install exited abnormally sending termination signals...done sending kill signals...done disabling swap... unmounting filesystems... /proc done /dev/pts done /sys done /tmp/ramfs done you may safely reboot your system If I format the LVM with ext3 I get to the partitioning but it then craps out on the format Robert From rmortimer at bluechiptechnology.co.uk Thu Jun 22 16:16:21 2006 From: rmortimer at bluechiptechnology.co.uk (Robert Mortimer) Date: Thu, 22 Jun 2006 17:16:21 +0100 Subject: [Fedora-xen] Xen guest on RAID5 LVM (install problem) In-Reply-To: <00c601c6960c$cba574f0$5f00000a@rmortimer> Message-ID: <00e401c69617$3359b890$5f00000a@rmortimer> The full trace debug from a VNC install is as follows Traceback (most recent call last): File "/usr/lib/anaconda/gui.py", line 951, in nextClicked self.dispatch.gotoNext() File "/usr/lib/anaconda/dispatch.py", line 146, in gotoNext self.moveStep() File "/usr/lib/anaconda/dispatch.py", line 217, in moveStep rc = apply(func, self.bindArgs(args)) File "/usr/lib/anaconda/backend.py", line 148, in doRepoSetup backend.doRepoSetup(intf, instPath) File "/usr/lib/anaconda/yuminstall.py", line 634, in doRepoSetup task() File "/usr/lib/anaconda/yuminstall.py", line 604, in doGroupSetup self.ayum.doGroupSetup() File "/usr/lib/python2.4/site-packages/yum/__init__.py", line 374, in doGroupSetup raise Errors.GroupsError, 'No Groups Available in any repository' GroupsError: No Groups Available in any repository Local variables in innermost frame: repo: anaconda e: Error: odd MDtype requested: group self: reposWithGroups: [] overwrite: False Dispatcher instance, containing members: intf: InstallInterface instance, containing members: intf.icw: InstallControlWindow instance, containing members: intf.icw.displayHelp: False intf.icw.releaseNotesViewerPid: None intf.icw.handle: 640 intf.icw.releaseNotesStartViewerAttempts: 0 intf.icw.releaseNotesType: html intf.icw.mainxml: intf.icw.dispatch: Already dumped intf.icw.reloadRcQueued: 0 intf.icw.ii: Already dumped intf.icw.currentWindow: AccountWindow instance, containing members: intf.icw.currentWindow.intf: Already dumped intf.icw.currentWindow.pw: intf.icw.currentWindow.confirm: intf.icw.currentWindow.forward: at 0xb7ad964c> > -----Original Message----- > From: fedora-xen-bounces at redhat.com > [mailto:fedora-xen-bounces at redhat.com]On Behalf Of Robert Mortimer > Sent: 22 June 2006 16:02 > To: fedora-xen at redhat.com > Subject: [Fedora-xen] Xen guest on RAID5 LVM (install problem) > > > I am trying to install a Xen FC5 client on my FC5 machine. > > I have a single SATA boot drive with a standard FC5 install > I have a RAID5 array of 3 SATA disks for my VM's > > I run the install script but and specify the path to the logical > Volume when > prompted > > All goes well until the script tries to format the partition. > If it has already been mounted it will recognize the fact > When it goes to format I get the following just after the network setup > > loader received SIGSEGV!. Backtrace: > [0x8049865] > [0x754420] > [0x8063ca0] > [0x805e5e1] > [0x804ad21] > [0x80cae75] > [0x8048131] > install exited abnormally > sending termination signals...done > sending kill signals...done > disabling swap... > unmounting filesystems... > /proc done > /dev/pts done > /sys done > /tmp/ramfs done > you may safely reboot your system > > If I format the LVM with ext3 I get to the partitioning but it then craps > out on the format > > Robert > > -- > Fedora-xen mailing list > Fedora-xen at redhat.com > https://www.redhat.com/mailman/listinfo/fedora-xen > From ron.wahler at gmail.com Thu Jun 22 16:39:36 2006 From: ron.wahler at gmail.com (Ron Wahler) Date: Thu, 22 Jun 2006 10:39:36 -0600 Subject: [Fedora-xen] guest install with loop backed FC5 dvd iso image Message-ID: I am trying to do a guest install of FC5 on a FC5 machine. Xen is running. I am having problems with setting up a proper guest location for the install. I did a loop back mount of a DVD iso image for FC5, then shared it with NFS in theory I want to use this to load my guest in xen. mount -o loop -t iso9660 FC-5-i386-DVD.iso /mnt then share /mnt on nfs. xenguest-install.py What is the name of your virtual machine? guest1 How much RAM should be allocated (in megabytes)? 256 What would you like to use as the disk (path)? /home/myhome/guest1 What is the install location? nfs:192.168.1.100:/mnt is the path here correct or do I need a sub directory of the ISO image for location ? here is the debug: Starting install... libvir: Xen Daemon error : POST operation failed: No such domain guest1a Failed to get devices for domain guest1 Traceback (most recent call last): File "/usr/sbin/xenguest-install.py", line 460, in ? main() File "/usr/sbin/xenguest-install.py", line 451, in main start_paravirt_install(name, ram, disk, mac, uuid, src, options.extra) File "/usr/sbin/xenguest-install.py", line 331, in start_paravirt_install dom = conn.createLinux(cfgxml, 0) File "/usr/lib/python2.4/site-packages/libvirt.py", line 207, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed') libvirt.libvirtError: virDomainCreateLinux() failed Has anyone seen this problem and know how to work around it. thanks, Ron Wahler http://www.positive-logic.net -------------- next part -------------- An HTML attachment was scrubbed... URL: From pbruna at it-linux.cl Thu Jun 22 17:01:04 2006 From: pbruna at it-linux.cl (Patricio Bruna V.) Date: Thu, 22 Jun 2006 13:01:04 -0400 Subject: [Fedora-xen] Xen NTPL In-Reply-To: References: Message-ID: <200606221301.04375.pbruna@it-linux.cl> Has the xen kernel supports for NTPL? -- Patricio Bruna V. Red Hat Certified Engineer IT Linux Ltda. http://www.it-linux.cl Fono/Fax: (+56-2) 697 11 66 Cel: (+56-8) 288 51 95 From ron.wahler at gmail.com Thu Jun 22 17:02:42 2006 From: ron.wahler at gmail.com (Ron Wahler) Date: Thu, 22 Jun 2006 11:02:42 -0600 Subject: [Fedora-xen] Re: guest install with loop backed FC5 dvd iso image In-Reply-To: References: Message-ID: Ok, solved this problem by reducing the memory in dom0 to 128 meg. xm mem-set 0 128 and using 256 meg in the guest. not a very graceful error but the blue install FC5 screen is up. Ron. On 6/22/06, Ron Wahler wrote: > > I am trying to do a guest install of FC5 on a FC5 machine. Xen is running. > I am having problems > with setting up a proper guest location for the install. > > I did a loop back mount of a DVD iso image for FC5, then shared it with > NFS > in theory I want to use this to load my guest in xen. > > mount -o loop -t iso9660 FC-5-i386-DVD.iso /mnt > > then share /mnt on nfs. > > > xenguest-install.py > What is the name of your virtual machine? guest1 > How much RAM should be allocated (in megabytes)? 256 > What would you like to use as the disk (path)? /home/myhome/guest1 > What is the install location? nfs:192.168.1.100:/mnt > > is the path here correct or do I need a sub directory of the ISO image for > location ? > > here is the debug: > > Starting install... > libvir: Xen Daemon error : POST operation failed: No such domain guest1a > Failed to get devices for domain guest1 > Traceback (most recent call last): > File "/usr/sbin/xenguest- install.py", line 460, in ? > main() > File "/usr/sbin/xenguest-install.py", line 451, in main > start_paravirt_install(name, ram, disk, mac, uuid, src, options.extra) > File "/usr/sbin/xenguest- install.py", line 331, in > start_paravirt_install > dom = conn.createLinux(cfgxml, 0) > File "/usr/lib/python2.4/site-packages/libvirt.py", line 207, in > createLinux > if ret is None:raise libvirtError('virDomainCreateLinux() failed') > libvirt.libvirtError: virDomainCreateLinux() failed > > > > Has anyone seen this problem and know how to work around it. > > thanks, > Ron Wahler > http://www.positive-logic.net > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From ron.wahler at gmail.com Thu Jun 22 17:56:15 2006 From: ron.wahler at gmail.com (Ron Wahler) Date: Thu, 22 Jun 2006 11:56:15 -0600 Subject: [Fedora-xen] Re: guest install with loop backed FC5 dvd iso image In-Reply-To: References: Message-ID: this install if fighting me on every step. So now I am progressing on the FC5 guest install and it can not access my nfs /mnt drive with the FC5 dvd iso, it is shared R/W from my dom0, any ideas to try ? I get to the screen that asks for the nfs server and directory to mount. thanks, Ron. On 6/22/06, Ron Wahler wrote: > > I am trying to do a guest install of FC5 on a FC5 machine. Xen is running. > I am having problems > with setting up a proper guest location for the install. > > I did a loop back mount of a DVD iso image for FC5, then shared it with > NFS > in theory I want to use this to load my guest in xen. > > mount -o loop -t iso9660 FC-5-i386-DVD.iso /mnt > > then share /mnt on nfs. > > > xenguest-install.py > What is the name of your virtual machine? guest1 > How much RAM should be allocated (in megabytes)? 256 > What would you like to use as the disk (path)? /home/myhome/guest1 > What is the install location? nfs:192.168.1.100:/mnt > > is the path here correct or do I need a sub directory of the ISO image for > location ? > > here is the debug: > > Starting install... > libvir: Xen Daemon error : POST operation failed: No such domain guest1a > Failed to get devices for domain guest1 > Traceback (most recent call last): > File "/usr/sbin/xenguest- install.py", line 460, in ? > main() > File "/usr/sbin/xenguest-install.py", line 451, in main > start_paravirt_install(name, ram, disk, mac, uuid, src, options.extra) > File "/usr/sbin/xenguest- install.py", line 331, in > start_paravirt_install > dom = conn.createLinux(cfgxml, 0) > File "/usr/lib/python2.4/site-packages/libvirt.py", line 207, in > createLinux > if ret is None:raise libvirtError('virDomainCreateLinux() failed') > libvirt.libvirtError: virDomainCreateLinux() failed > > > > Has anyone seen this problem and know how to work around it. > > thanks, > Ron Wahler > http://www.positive-logic.net > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From scott.hankin at gmail.com Thu Jun 22 18:43:59 2006 From: scott.hankin at gmail.com (Scott D Hankin) Date: Thu, 22 Jun 2006 14:43:59 -0400 Subject: [Fedora-xen] xenguest-install.py nfs problems In-Reply-To: <20060620160945.17919.qmail@web88204.mail.re2.yahoo.com> References: <20060620160945.17919.qmail@web88204.mail.re2.yahoo.com> Message-ID: I've found that the key thing it's looking for is an FC5 install area. Are you trying to install a non-Fedora system? On 6/20/06, Tom Spec wrote: > > When I run xenguest-install.py on FC5, it always gives me the following > error after "What is the install location?": > > Invalid NFS location given > > I have tried two different methods that work for me for regular > installations,but I can't get this script to work. > > 1) Specify the location that contains the Fedora Core .iso files > 2) Specify the location that contains the "Fedora" directory (and > subsequently all the RPMs) > > Can someone tell me exactly what xenguest-install.py is looking for in an > NFS install location? > > Note: It does seem to be mounting the NFS directory, it's just that it > tells me it's invalid. > > Any help would be appreciated. > > # rpm -qa | grep xen > kernel-xen0-2.6.16-1.2122_FC5 > xen-3.0.2-0.FC5.3 > > Tom > > > > -- > Fedora-xen mailing list > Fedora-xen at redhat.com > https://www.redhat.com/mailman/listinfo/fedora-xen > -- Scott ----------------------------- In the beginning, there was nothing, then God said, "Let there be light." And there was light. There was still nothing, but you could see it a lot better. -------------- next part -------------- An HTML attachment was scrubbed... URL: From sanjamg at yahoo.com Thu Jun 22 18:51:35 2006 From: sanjamg at yahoo.com (Sanjam Garg) Date: Thu, 22 Jun 2006 11:51:35 -0700 (PDT) Subject: [Fedora-xen] Serial port In-Reply-To: Message-ID: <20060622185135.60419.qmail@web34109.mail.mud.yahoo.com> Hi I need to use /dev/ttyS0 in one of the virtual machines. I have been facing a lot of problem with regard to that. domU config: interrupt = [ 4 ] ioports = [ "3f8-3ff" ] but an error is reported [root at ccc ~]# echo s> /dev/ttyS0 bash: /dev/ttyS0: No such device or address Thanks in advance Sanjam --------------------------------- How low will we go? Check out Yahoo! Messenger?s low PC-to-Phone call rates. -------------- next part -------------- An HTML attachment was scrubbed... URL: From aron at hp.com Thu Jun 22 19:14:56 2006 From: aron at hp.com (Aron Griffis) Date: Thu, 22 Jun 2006 15:14:56 -0400 Subject: [Fedora-xen] Re: [patch 0/4] elilo multiboot support In-Reply-To: <1150928799.23608.0.camel@orodruin.boston.redhat.com> References: <20060621215329.GA19839@mustard.flatmonk> <1150928799.23608.0.camel@orodruin.boston.redhat.com> Message-ID: <20060622191456.GB19747@vino.zko.hp.com> Jeremy Katz wrote: [Wed Jun 21 2006, 06:26:38PM EDT] > On Wed, 2006-06-21 at 17:53 -0400, Aron Griffis wrote: > > I'm still waiting on review of these patches. Is there anything I can > > do to help out beyond sending this reminder? > > Have a time machine handy? :-) Unfortunately no... :-| > Hopefully things are actually calming down for real today which will > then give me some time to look at things like this tomorrow... my > whiteboard is full of stuff that I've been dropping over the past > week or so :-/ Great, thanks. This situation starts to concern me because I'd my changes to get some soak time in rawhide before FC6 test releases. If there are issues, I'm more than willing to follow up with debugging and patches, but it gets more worrisome as the schedule is compressed. Regards, Aron From supercomputer at gmail.com Thu Jun 22 21:44:29 2006 From: supercomputer at gmail.com (Chris Vaughan) Date: Thu, 22 Jun 2006 15:44:29 -0600 Subject: [Fedora-xen] Re: Xen Migration Errors In-Reply-To: <216ee070606211556x321ff704t456374f19f9c908e@mail.gmail.com> References: <216ee070606211556x321ff704t456374f19f9c908e@mail.gmail.com> Message-ID: <216ee070606221444n1f2e80fya6b1a56304807191@mail.gmail.com> I found my answer here: http://lists.xensource.com/archives/html/xen-users/2006-06/msg00888.html On 6/21/06, Chris Vaughan wrote: > > Hi, > > I am trying to perform a live xen migration and in the xm list it's saying > that it transfers but when I try and console onto the node it looks like it > does a kernel dump. > > Here is my xend.log: > > [2006-06-21 14:33:01 xend.XendDomainInfo] DEBUG (XendDomainInfo:259) > XendDomainInfo.restore(['domain', ['domid', '4'], ['uuid', > 'aeb7627f-88cb-2248-726c-42a57950aa83'], ['ssidref', '0'], ['vcpus', '1'], > ['vcpu_avail', '1'], ['cpu_weight', '1.0 '], ['memory', '64'], ['maxmem', > '64'], ['features'], ['name', 'fedoraNode'], ['on_poweroff', 'destroy'], > ['on_reboot', 'restart'], ['on_crash', 'restart'], ['image', ['linux', > ['kernel', '/boot/vmlinuz-2.6.16-1.2122_FC5xenU' ], ['root', '/dev/sda1'], > ['args', 'selinux=0 3 HOSTINFO=testnode151:192.168.0.70SERVERINFO=testnode150: > 192.168.0.70 NODELIST= GATEWAY= 192.168.0.1 DNS=192.168.0.1USERLIST=test1:mike APP= APPARGS=']]], ['device', ['vif', ['backend', '0'], > ['script', 'vif-bridge'], ['mac', '00:16:3e:03:c0:44']]], ['device', ['vbd', > ['backend', '0'], ['dev', 'sda1'], ['uname', > 'file:/home/chris/images/fedoraNode.img'], ['mode', 'w']]], ['state', > '--p---'], ['shutdown_reason', 'poweroff'], ['cpu_time', ' 0.0'], > ['online_vcpus', '1'], ['up_time', '70.0036299229'], ['start_time', ' > 1150929727.88'], ['store_mfn', '134920'], ['console_mfn', '134919']]) > [2006-06-21 14:33:01 xend.XendDomainInfo] DEBUG (XendDomainInfo:290) > parseConfig: config is ['domain', ['domid', '4'], ['uuid', > 'aeb7627f-88cb-2248-726c-42a57950aa83'], ['ssidref', '0'], ['vcpus', '1'], > ['vcpu_avail', '1'], ['cpu_weight', ' 1.0'], ['memory', '64'], ['maxmem', > '64'], ['features'], ['name', 'fedoraNode'], ['on_poweroff', 'destroy'], > ['on_reboot', 'restart'], ['on_crash', 'restart'], ['image', ['linux', > ['kernel', '/boot/vmlinuz-2.6.16-1.2122_FC5xenU' ], ['root', '/dev/sda1'], > ['args', 'selinux=0 3 HOSTINFO=testnode151:192.168.0.70SERVERINFO=testnode150: > 192.168.0.70 NODELIST= GATEWAY= 192.168.0.1 DNS=192.168.0.1USERLIST=test1:mike APP= APPARGS=']]], ['device', ['vif', ['backend', '0'], > ['script', 'vif-bridge'], ['mac', '00:16:3e:03:c0:44']]], ['device', ['vbd', > ['backend', '0'], ['dev', 'sda1'], ['uname', > 'file:/home/chris/images/fedoraNode.img'], ['mode', 'w']]], ['state', > '--p---'], ['shutdown_reason', 'poweroff'], ['cpu_time', ' 0.0'], > ['online_vcpus', '1'], ['up_time', '70.0036299229'], ['start_time', ' > 1150929727.88'], ['store_mfn', '134920'], ['console_mfn', '134919']] > [2006-06-21 14:33:01 xend.XendDomainInfo] DEBUG (XendDomainInfo:389) > parseConfig: result is {'uuid': 'aeb7627f-88cb-2248-726c-42a57950aa83', > 'on_crash': 'restart', 'on_reboot': 'restart', 'image': ['linux', ['kernel', > '/boot/vmlinuz- 2.6.16-1.2122_FC5xenU'], ['root', '/dev/sda1'], ['args', > 'selinux=0 3 HOSTINFO=testnode151:192.168.0.70 SERVERINFO=testnode150: > 192.168.0.70 NODELIST= GATEWAY= 192.168.0.1 DNS=192.168.0.1USERLIST=test1:mike APP= APPARGS=']], 'on_poweroff': 'destroy', > 'bootloader_args': None, 'cpus': None, 'name': 'fedoraNode', 'backend': [], > 'vcpus': 1, 'cpu_weight': 1.0, 'features': None, 'vcpu_avail': 1, > 'memory': 64, 'device': [('vif', ['vif', ['backend', '0'], ['script', > 'vif-bridge'], ['mac', '00:16:3e:03:c0:44']]), ('vbd', ['vbd', ['backend', > '0'], ['dev', 'sda1'], ['uname', 'file:/home/chris/images/fedoraNode.img'], > ['mode', 'w']])], 'bootloader': None, 'cpu': None, 'maxmem': 64} > [2006-06-21 14:33:01 xend.XendDomainInfo] DEBUG (XendDomainInfo:1205) > XendDomainInfo.construct: None > [2006-06-21 14:33:01 xend.XendDomainInfo] DEBUG (XendDomainInfo:700) > Storing VM details: {'name': 'fedoraNode', 'on_reboot': 'restart', 'image': > "(linux (kernel /boot/vmlinuz- 2.6.16-1.2122_FC5xenU) (root /dev/sda1) > (args 'selinux=0 3 HOSTINFO=testnode151:192.168.0.70SERVERINFO=testnode150: > 192.168.0.70 NODELIST= GATEWAY= 192.168.0.1 DNS=192.168.0.1USERLIST=test1:mike APP= APPARGS='))", 'on_poweroff': 'destroy', 'uuid': > 'aeb7627f-88cb-2248-726c-42a57950aa83', 'on_crash': 'restart', 'vcpus': '1', > 'vcpu_avail': '1', 'memory': '64', 'maxmem': '64'} > [2006-06-21 14:33:01 xend] DEBUG (DevController:110) DevController: > writing {'backend-id': '0', 'mac': '00:16:3e:03:c0:44', 'handle': '0', > 'state': '1', 'backend': '/local/domain/0/backend/vif/23/0'} to > /local/domain/23/device/vif/0. > [2006-06-21 14:33:01 xend] DEBUG (DevController:112) DevController: > writing {'mac': '00:16:3e:03:c0:44', 'state': '1', 'handle': '0', 'script': > '/etc/xen/scripts/vif-bridge', 'frontend-id': '23', 'domain': 'fedoraNode', > 'frontend': '/local/domain/23/device/vif/0'} to > /local/domain/0/backend/vif/23/0. > [2006-06-21 14:33:01 xend] DEBUG (blkif:24) exception looking up device > number for sda1: [Errno 2] No such file or directory: '/dev/sda1' > [2006-06-21 14:33:01 xend] DEBUG (DevController:110) DevController: > writing {'virtual-device': '2049', 'backend-id': '0', 'state': '1', > 'backend': '/local/domain/0/backend/vbd/23/2049'} to > /local/domain/23/device/vbd/2049. > [2006-06-21 14:33:01 xend] DEBUG (DevController:112) DevController: > writing {'domain': 'fedoraNode', 'frontend': > '/local/domain/23/device/vbd/2049', 'dev': 'sda1', 'state': '1', 'params': > '/home/chris/images/fedoraNode.img', 'mode': 'w', 'frontend-id': '23', > 'type': 'file'} to /local/domain/0/backend/vbd/23/2049. > [2006-06-21 14:33:01 xend.XendDomainInfo] DEBUG (XendDomainInfo:725) > Storing domain details: {'console/port': '2', 'name': 'fedoraNode', > 'console/limit': '1048576', 'vm': > '/vm/aeb7627f-88cb-2248-726c-42a57950aa83', 'domid': '23', > 'cpu/0/availability': 'online', 'memory/target': '65536', 'store/port': '1'} > > [2006-06-21 14:33:01 xend] DEBUG (balloon:126) Balloon: free 237; need 73; > done. > [2006-06-21 14:33:01 xend] DEBUG (XendCheckpoint:155) [xc_restore]: > /usr/lib/xen/bin/xc_restore 10 20 23 18432 1 2 > [2006-06-21 14:33:01 xend] ERROR (XendCheckpoint:234) xc_linux_restore > start: max_pfn = 4800 > [2006-06-21 14:33:01 xend] ERROR (XendCheckpoint:234) Increased domain > reservation by 12000 KB > [2006-06-21 14:33:01 xend] ERROR (XendCheckpoint:234) Reloading memory > pages: 0% > [2006-06-21 14:33:08 xend] ERROR (XendCheckpoint:234) Received all pages > (0 races) > [2006-06-21 14:33:08 xend] ERROR (XendCheckpoint:234) ^H^H^H^H100% > [2006-06-21 14:33:08 xend] ERROR (XendCheckpoint:234) Memory reloaded. > [2006-06-21 14:33:08 xend] ERROR (XendCheckpoint:234) Decreased > reservation by 2136 pages > [2006-06-21 14:33:08 xend] ERROR (XendCheckpoint:234) Domain ready to be > built. > [2006-06-21 14:33:08 xend] ERROR (XendCheckpoint:234) Restore exit with > rc=0 > [2006-06-21 14:33:08 xend] DEBUG (XendCheckpoint:207) store-mfn 107286 > [2006-06-21 14:33:08 xend] DEBUG (XendCheckpoint:207) console-mfn 28893 > [2006-06-21 14:33:08 xend.XendDomainInfo] DEBUG (XendDomainInfo:663) > XendDomainInfo.completeRestore > [2006-06-21 14:33:08 xend.XendDomainInfo ] DEBUG (XendDomainInfo:725) > Storing domain details: {'console/ring-ref': '28893', 'console/port': '2', > 'name': 'fedoraNode', 'console/limit': '1048576', 'vm': > '/vm/aeb7627f-88cb-2248-726c-42a57950aa83', 'domid': '23', > 'cpu/0/availability': 'online', 'memory/target': '65536', 'store/ring-ref': > '107286', 'store/port': '1'} > [2006-06-21 14:33:08 xend.XendDomainInfo] DEBUG (XendDomainInfo:908) > XendDomainInfo.handleShutdownWatch > [2006-06-21 14:33:08 xend.XendDomainInfo] DEBUG (XendDomainInfo:673) > XendDomainInfo.completeRestore done > > Any help would be appreciated. Both distros are running FC5. Does the > same hardware, kernel and image need to exist on the host and the migration > destination? > > Thanks, > > > -- > ------------------------------ > Christopher Vaughan > -- ------------------------------ Christopher Vaughan -------------- next part -------------- An HTML attachment was scrubbed... URL: From riel at redhat.com Fri Jun 23 02:33:49 2006 From: riel at redhat.com (Rik van Riel) Date: Thu, 22 Jun 2006 22:33:49 -0400 (EDT) Subject: [Fedora-xen] Xen NTPL In-Reply-To: <200606221301.04375.pbruna@it-linux.cl> References: <200606221301.04375.pbruna@it-linux.cl> Message-ID: On Thu, 22 Jun 2006, Patricio Bruna V. wrote: > Has the xen kernel supports for NTPL? Yes, NPTL just works in the Xen kernel. The only issue there ever was was a performance issue, with the glibc variant that uses negative segment offsets. Current Fedora has a glibc variant that does address calculations to avoid the negative segment offsets. This removes the performance penalty FC4 had. -- All Rights Reversed From aron at hp.com Fri Jun 23 12:48:58 2006 From: aron at hp.com (Aron Griffis) Date: Fri, 23 Jun 2006 08:48:58 -0400 Subject: [Fedora-xen] [patch 5/4] elilo multiboot support In-Reply-To: References: Message-ID: <20060623124858.GA1566@olive.flatmonk> The new-kernel-pkg patch submitted in this thread contained a typo. This patch fixes that. Signed-off-by: Aron Griffis diff -r f59e085b800f -r 624f49b8c307 grubby/new-kernel-pkg --- a/grubby/new-kernel-pkg Wed Jun 07 16:17:07 2006 -0400 +++ b/grubby/new-kernel-pkg Thu Jun 22 20:16:57 2006 -0400 @@ -151,7 +151,7 @@ install() { if [ -n "$cfgLilo" ]; then [ -n "$verbose" ] && echo "adding $version to $liloConfig" - $grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD + $grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ --copy-default $makedefault --title $version \ ${mbkernel:+--add-multiboot="$mbkernel"} ${mbargs:+--mbargs="$mbargs"} \ --args="root=$rootdevice $kernargs" --remove-kernel="TITLE=$version" \ -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From xiantao.zhang at intel.com Fri Jun 23 13:31:29 2006 From: xiantao.zhang at intel.com (Zhang, Xiantao) Date: Fri, 23 Jun 2006 21:31:29 +0800 Subject: [Fedora-xen] FW: How to make xen0 and xen with http://free.linux.hp.com/~agriffis/fedora-kernel-rpm Message-ID: Thanks & Best Regards -Xiantao OTC,Intel Corporation -----Original Message----- From: Zhang, Xiantao Sent: 2006?6?23? 21:29 To: Yu, Fenghua; 'Aron Griffis' Cc: Yang, Fred; Tian, Kevin; You, Yongkang Subject: RE: How to make xen0 and xen with http://free.linux.hp.com/~agriffis/fedora-kernel-rpm Hi Fenghua/Aron This issue should be caused by mismatch of xen and xenlinux's Cset. Xen's version should be xen-unstable.hg's Cset 10314, but xenlinux not based xen-unstalbe.hg's 10314 and seems that it based xen-ia64-unstable.hg's Cset 10314. If so, it will cause unpredictable aftermath. The obvious phenomena is that one page of xen0's kernel code was flushed and triggered breakfault at last. Seems we should rebase linux-2.6-xen.patch to xen-unstalble's Cset 10314 first? Thanks & Best Regards -Xiantao OTC,Intel Corporation > -----Original Message----- > From: Yu, Fenghua > Sent: 2006?6?23? 10:50 > To: Aron Griffis; Zhang, Xiantao > Cc: Yang, Fred; Tian, Kevin; You, Yongkang > Subject: RE: How to make xen0 and xen with > http://free.linux.hp.com/~agriffis/fedora-kernel-rpm > > > Hi, Xiantao, > > Could you try to reproduce the issue and fix it today? Please update us the > status then we can follow up. I think I saw this kind of issue (invalid > hypercalls) at the very beginning. The issue was gone after rebuilding the > xen/kernel rpms or updating xen/kernel rpms. > > Thanks. > > -Fenghua > > -----Original Message----- > From: Aron Griffis [mailto:aron at hp.com] > Sent: Thursday, June 22, 2006 7:09 PM > To: Zhang, Xiantao > Cc: Yang, Fred; Tian, Kevin; You, Yongkang; Yu, Fenghua > Subject: Re: How to make xen0 and xen with > http://free.linux.hp.com/~agriffis/fedora-kernel-rpm > > Well, this is mixed news, but it is all I have at the > moment... > > I updated fedora-kernel-ia64 today. It builds and you can > find the new rpms in my yum repository. > > However it doesn't boot. The kernel attempts to make > invalid hypercalls. I have not looked closely yet and don't > know the root cause of the problem. > > If you would be willing to test and debug those rpms, that > would be fantastic. Even though it doesn't boot at the > moment, I am going to create an RFC patchset for Red Hat to > get comments for the moment. I plan to send that out > tomorrow morning. > > Best regards, > Aron > > Zhang, Xiantao wrote: [Thu Jun 22 2006, 09:03:33PM EDT] > > Oh, seems I had some misunderstandings here. OK, Wish your good news. :) > > Thanks & Best Regards > > -Xiantao > > > > OTC,Intel Corporation > > > > > -----Original Message----- > > > From: Aron Griffis [mailto:aron at hp.com] > > > Sent: 2006?6?23? 1:26 > > > To: Zhang, Xiantao > > > Cc: Yang, Fred; Tian, Kevin; You, Yongkang; Yu, Fenghua > > > Subject: Re: How to make xen0 and xen with > > > http://free.linux.hp.com/~agriffis/fedora-kernel-rpm > > > > > > Hi Xiantao, > > > > > > Zhang, Xiantao wrote: [Thu Jun 22 2006, 01:33:08AM EDT] > > > > We have noticed that you used this following tree to generate From aron at hp.com Fri Jun 23 15:02:44 2006 From: aron at hp.com (Aron Griffis) Date: Fri, 23 Jun 2006 11:02:44 -0400 Subject: [Fedora-xen] [RFC 0/3] Fedora patches to enable Xen on ia64 Message-ID: The following patches enable Xen support in Fedora on ia64. I'm not asking for these to be applied directly because of some issues that are called out in the kernel patch. However I would appreciate comments so that these can be applied when the issue are resolved. In addition to these patches, the elilo-multiboot patches are required, which can be found starting at https://www.redhat.com/archives/fedora-xen/2006-June/msg00068.html The result of all these patches can be found in my yum repository, see https://www.redhat.com/archives/fedora-xen/2006-May/msg00140.html Regards, Aron From aron at hp.com Fri Jun 23 15:03:51 2006 From: aron at hp.com (Aron Griffis) Date: Fri, 23 Jun 2006 11:03:51 -0400 Subject: [Fedora-xen] [RFC 2/3] libvirt.rpm patches In-Reply-To: Message-ID: This patch contains the simple modification necessary to make libvirt-0.1.1-1.src.rpm build on ia64. libvirt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -r 0275118faff4 -r 3175eb2de23f SPECS/libvirt.spec --- a/SPECS/libvirt.spec Thu Jun 22 20:00:15 2006 -0400 +++ b/SPECS/libvirt.spec Thu Jun 22 20:01:22 2006 -0400 @@ -14,7 +14,7 @@ BuildRequires: libxml2-devel BuildRequires: libxml2-devel BuildRequires: readline-devel Obsoletes: libvir -ExclusiveArch: i386 x86_64 +ExclusiveArch: i386 x86_64 ia64 %description This C library provides an API to use the Xen virtualization framework, From aron at hp.com Fri Jun 23 15:04:33 2006 From: aron at hp.com (Aron Griffis) Date: Fri, 23 Jun 2006 11:04:33 -0400 Subject: [Fedora-xen] [RFC 3/3] xen.rpm patches In-Reply-To: Message-ID: This patch contains the minor modification necessary to build xen-3.0.2-8.src.rpm, i.e. the xen tools, on ia64. xen.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff -r 375377600230 -r 1641d0542829 SPECS/xen.spec --- a/SPECS/xen.spec Thu Jun 22 20:03:39 2006 -0400 +++ b/SPECS/xen.spec Thu Jun 22 20:10:04 2006 -0400 @@ -27,20 +27,22 @@ BuildRequires: transfig libidn-devel zli BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel BuildRequires: libX11-devel python-devel ghostscript tetex-latex BuildRequires: ncurses-devel +%ifarch i386 x86_64 # for the VMX "bios" BuildRequires: dev86 +# so that x86_64 builds pick up glibc32 correctly +BuildRequires: /usr/include/gnu/stubs-32.h +%endif # for the docs BuildRequires: perl # so that the makefile knows to install udev rules BuildRequires: udev -# so that x86_64 builds pick up glibc32 correctly -BuildRequires: /usr/include/gnu/stubs-32.h Requires: bridge-utils Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: udev >= 059 Requires: libvirt-python Prereq: chkconfig -ExclusiveArch: i386 x86_64 +ExclusiveArch: i386 x86_64 ia64 %description This package contains the Xen hypervisor and Xen tools, needed to @@ -149,9 +151,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name} %{_libdir}/lib* %{_mandir}/man?/*.?.gz -%dir /usr/lib/xen -%dir /usr/lib/xen/boot +%ifarch i386 x86_64 /usr/lib/xen/boot/hvmloader +%endif %dir %{_datadir}/%{name}/qemu %{_datadir}/%{name}/qemu/keymaps/* %dir %{_localstatedir}/lib/%{name} From davej at redhat.com Fri Jun 23 15:10:49 2006 From: davej at redhat.com (Dave Jones) Date: Fri, 23 Jun 2006 11:10:49 -0400 Subject: [Fedora-xen] Re: [Fedora-ia64-list] [RFC 1/3] kernel.rpm patches In-Reply-To: References: Message-ID: <20060623151049.GB4649@redhat.com> On Fri, Jun 23, 2006 at 11:03:20AM -0400, Aron Griffis wrote: > - The ia64 xen configuration is added. This is a direct copy of the non-xen > configuration, after which menuconfig is run and the options relevant to > xen are modified. check out the CVS checkout instructions at http://people.redhat.com/davej/ Then take a look at the configs/ dir & Makefile.config ia64-xen should be generated from a template in the same way the x86 configs are rather than have a standalone config file. Dave -- http://www.codemonkey.org.uk From aron at hp.com Fri Jun 23 15:15:20 2006 From: aron at hp.com (Aron Griffis) Date: Fri, 23 Jun 2006 11:15:20 -0400 Subject: [Fedora-xen] Re: [Fedora-ia64-list] [RFC 1/3] kernel.rpm patches In-Reply-To: <20060623151049.GB4649@redhat.com> References: <20060623151049.GB4649@redhat.com> Message-ID: <20060623151520.GC2458@olive.flatmonk> Dave Jones wrote: [Fri Jun 23 2006, 11:10:49AM EDT] > check out the CVS checkout instructions at http://people.redhat.com/davej/ > Then take a look at the configs/ dir & Makefile.config Wow, I wish I'd known about this earlier. > ia64-xen should be generated from a template in the same way the x86 configs are > rather than have a standalone config file. Okay, will do, thanks. Aron From veillard at redhat.com Fri Jun 23 15:29:59 2006 From: veillard at redhat.com (Daniel Veillard) Date: Fri, 23 Jun 2006 11:29:59 -0400 Subject: [Fedora-xen] [RFC 2/3] libvirt.rpm patches In-Reply-To: References: Message-ID: <20060623152959.GG1330@redhat.com> On Fri, Jun 23, 2006 at 11:03:51AM -0400, Aron Griffis wrote: > This patch contains the simple modification necessary to make > libvirt-0.1.1-1.src.rpm build on ia64. > > libvirt.spec | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff -r 0275118faff4 -r 3175eb2de23f SPECS/libvirt.spec > --- a/SPECS/libvirt.spec Thu Jun 22 20:00:15 2006 -0400 > +++ b/SPECS/libvirt.spec Thu Jun 22 20:01:22 2006 -0400 > @@ -14,7 +14,7 @@ BuildRequires: libxml2-devel > BuildRequires: libxml2-devel > BuildRequires: readline-devel > Obsoletes: libvir > -ExclusiveArch: i386 x86_64 > +ExclusiveArch: i386 x86_64 ia64 > > %description > This C library provides an API to use the Xen virtualization framework, Initially xen didn't compiled on ia64, I will fix it, thanks for the head-up ! Daniel -- Daniel Veillard | Red Hat http://redhat.com/ veillard at redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/ From aron at hp.com Fri Jun 23 15:03:20 2006 From: aron at hp.com (Aron Griffis) Date: Fri, 23 Jun 2006 11:03:20 -0400 Subject: [Fedora-xen] [RFC 1/3] kernel.rpm patches In-Reply-To: Message-ID: This patch contains the changes to kernel-2.6.17-1.2302_FC6.src.rpm to build xen support on ia64. In particular: - Config.mk is updated from xen-unstable. It is maintained outside of the xen tarball in the fedora rpm and appears to have lagged behind. In particular, testing of the debug flag is added so that debug=n on the make command-line is honored. - The ia64 configuration is updated to the current kernel (simple oldconfig), and support for CONFIG_FB_NEOMAGIC is removed. See the thread starting at https://www.redhat.com/archives/fedora-xen/2006-June/msg00014.html where this driver causes build problems and the conclusion is that NeoMagic would never be used on ia64, so it may as well be disabled. - The ia64 xen configuration is added. This is a direct copy of the non-xen configuration, after which menuconfig is run and the options relevant to xen are modified. - A patch is added to fix building of the hypervisor on ia64 - A patch is added to fix building of xenlinux on ia64 - As discussed starting at https://www.redhat.com/archives/fedora-xen/2006-June/msg00028.html, this patch contains the following generic fixes to the specfile: - abstract xenlinux build using xen_flags, xen_target and xen_image instead of assuming x86 behavior - add xen_* overrides to %ifarch ia64 - update numerous hardcoded references to /boot to use %{image_install_path} instead - build the hypervisor with %{?_smp_mflags} (it works fine) Notes: - This patch does not call xen-mkbuildtree-pre, however it includes a crutch for ia64 to substitute. It creates two symlinks during the prep phase. Before Juan blows up :-) let me say that those symlinks are eradicated presently in xen-ia64-unstable upstream. However because of the latency involved in the patch trail (xen-ia64-unstable -> xen-unstable -> linux-2.6.tip-xen -> Juan's patch) they're still needed in this revision. - The patches to build the hypervisor and xenlinux on ia64 are not needed in current xen-unstable (and possibly current linux-2.6.tip-xen) but because of the long trail between ia64 commits and Juan's patch generation, along with the fact that Juan isn't presently testing his build on ia64, it's possible some similar patch will be required in future rpms. - The final xen kernel built here does not BOOT presently. The reason is that the hypervisor and kernel are mismatched. The hypervisor is from xen-unstable cset 10314, but the kernel is from some other cset, due to the fact that Juan's patch is generated from linux-2.6.tip-xen instead of xen-unstable. Normally this shouldn't be an issue. A hypervisor and kernel need only have some proximity to work together. It just happens that kernel-2.6.17-1.2302_FC6.src.rpm is based on a problematic mismatch for ia64. The ideal solution to this problem would be for Juan to update linux-2.6.xen-tip to match the xen-unstable cset before he generates his patch. The details of this would need to be worked out with Chris Wright who owns that tree. SOURCES/Config.mk | 22 SOURCES/kernel-2.6.17-ia64.config | 3457 ++++++++++++++----------------- SPECS/kernel-2.6.spec | 58 b/SOURCES/kernel-2.6.17-ia64-xen.config | 2770 ++++++++++++++++++++++++ b/SOURCES/linux-2.6-xen-ia64-fixes.patch | 63 b/SOURCES/xen-ia64-fixes.patch | 13 6 files changed, 4577 insertions(+), 1806 deletions(-) diff -r 906a91890923 -r 2fe66b75b217 SOURCES/Config.mk --- a/SOURCES/Config.mk Fri Jun 23 09:28:14 2006 -0400 +++ b/SOURCES/Config.mk Fri Jun 23 09:50:04 2006 -0400 @@ -1,4 +1,7 @@ # -*- mode: Makefile; -*- + +# A debug build of Xen and tools? +debug ?= n # Currently supported architectures: x86_32, x86_64 XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) @@ -21,11 +24,16 @@ OBJDUMP = $(CROSS_COMPILE)objdump OBJDUMP = $(CROSS_COMPILE)objdump DISTDIR ?= $(XEN_ROOT)/dist +DESTDIR ?= / INSTALL = install INSTALL_DIR = $(INSTALL) -d -m0755 INSTALL_DATA = $(INSTALL) -m0644 INSTALL_PROG = $(INSTALL) -m0755 + +ifneq ($(debug),y) +CFLAGS += -DNDEBUG +endif ifeq ($(XEN_TARGET_ARCH),x86_64) LIBDIR = lib64 @@ -44,13 +52,21 @@ CFLAGS += $(foreach i, $(EXTRA_INCLUDES) # Choose the best mirror to download linux kernel KERNEL_REPO = http://www.kernel.org -# ACM_USE_SECURITY_POLICY is set to security policy of Xen +# If ACM_SECURITY = y, then the access control module is compiled +# into Xen and the policy type can be set by the boot policy file +# y - Build the Xen ACM framework +# n - Do not build the Xen ACM framework +ACM_SECURITY ?= n + +# If ACM_SECURITY = y and no boot policy file is installed, +# then the ACM defaults to the security policy set by +# ACM_DEFAULT_SECURITY_POLICY # Supported models are: -# ACM_NULL_POLICY (ACM will not be built with this policy) +# ACM_NULL_POLICY # ACM_CHINESE_WALL_POLICY # ACM_SIMPLE_TYPE_ENFORCEMENT_POLICY # ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY -ACM_USE_SECURITY_POLICY ?= ACM_NULL_POLICY +ACM_DEFAULT_SECURITY_POLICY ?= ACM_NULL_POLICY # Optional components XENSTAT_XENTOP ?= y diff -r 906a91890923 -r 2fe66b75b217 SOURCES/kernel-2.6.17-ia64.config --- a/SOURCES/kernel-2.6.17-ia64.config Fri Jun 23 09:28:14 2006 -0400 +++ b/SOURCES/kernel-2.6.17-ia64.config Fri Jun 23 09:50:04 2006 -0400 @@ -2,593 +2,280 @@ # # Automatically generated make config: don't edit # -CONFIG_MMU=y -CONFIG_SMP=y -CONFIG_HOTPLUG_CPU=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# CONFIG_LOCALVERSION="" -# CONFIG_CRASH_DUMP is not set -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -# -# General setup -# # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_SYSCTL=y -CONFIG_LOG_BUF_SHIFT=17 +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set +CONFIG_CPUSETS=y +CONFIG_RELAY=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_MODULE_SIG=y +# CONFIG_MODULE_SIG_FORCE is not set +CONFIG_KMOD=y +CONFIG_STOP_MACHINE=y + +# +# Block layer +# +CONFIG_BLK_DEV_IO_TRACE=y + +# +# IO Schedulers +# CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_CFQ=y -CONFIG_POSIX_MQUEUE=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# Processor type and features +# +CONFIG_IA64=y +CONFIG_64BIT=y +CONFIG_MMU=y +CONFIG_SWIOTLB=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_TIME_INTERPOLATION=y +CONFIG_DMI=y +CONFIG_EFI=y +CONFIG_GENERIC_IOMAP=y +# CONFIG_XEN is not set +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y +CONFIG_IA64_UNCACHED_ALLOCATOR=y +CONFIG_DMA_IS_DMA32=y +CONFIG_IA64_GENERIC=y +# CONFIG_IA64_DIG is not set +# CONFIG_IA64_HP_ZX1 is not set +# CONFIG_IA64_HP_ZX1_SWIOTLB is not set +# CONFIG_IA64_SGI_SN2 is not set +# CONFIG_IA64_HP_SIM is not set +# CONFIG_ITANIUM is not set +CONFIG_MCKINLEY=y +# CONFIG_IA64_PAGE_SIZE_4KB is not set +# CONFIG_IA64_PAGE_SIZE_8KB is not set +CONFIG_IA64_PAGE_SIZE_16KB=y +# CONFIG_IA64_PAGE_SIZE_64KB is not set +CONFIG_PGTABLE_3=y +# CONFIG_PGTABLE_4 is not set +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_IA64_L1_CACHE_SHIFT=7 +CONFIG_IA64_CYCLONE=y +CONFIG_IOSAPIC=y +CONFIG_IA64_SGI_SN_XP=y +CONFIG_FORCE_MAX_ZONEORDER=17 +CONFIG_SMP=y +CONFIG_NR_CPUS=1024 +CONFIG_HOTPLUG_CPU=y +CONFIG_SCHED_SMT=y +# CONFIG_PERMIT_BSP_REMOVE is not set # CONFIG_PREEMPT is not set -CONFIG_PREEMPT_BKL=y - -# -# Loadable module support -# -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_OBSOLETE_MODPARM=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -CONFIG_KMOD=y -CONFIG_MODULE_SIG=y -# CONFIG_MODULE_SIG_FORCE is not set - -# -# Bus options (PCI, PCMCIA, EISA, MCA, ISA) +CONFIG_SELECT_MEMORY_MODEL=y +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_DISCONTIGMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_DISCONTIGMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_NEED_MULTIPLE_NODES=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MIGRATION=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_DISCONTIGMEM_ENABLE=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y +CONFIG_NUMA=y +CONFIG_NODES_SHIFT=8 +CONFIG_VIRTUAL_MEM_MAP=y +CONFIG_HOLES_IN_ZONE=y +CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y +# CONFIG_IA32_SUPPORT is not set +CONFIG_IA64_MCA_RECOVERY=m +CONFIG_PERFMON=y +CONFIG_IA64_PALINFO=y +CONFIG_SGI_SN=y + +# +# SN Devices +# +CONFIG_SGI_IOC3=m + +# +# Firmware Drivers +# +CONFIG_EFI_VARS=y +CONFIG_EFI_PCDP=y +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_MISC=y + +# +# Power management and ACPI +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set + +# +# ACPI (Advanced Configuration and Power Interface) Support +# +CONFIG_ACPI=y +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_FAN=y +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_NUMA=y +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_EC=y +CONFIG_ACPI_POWER=y +CONFIG_ACPI_SYSTEM=y +CONFIG_ACPI_CONTAINER=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# CPUFreq processor drivers +# +CONFIG_IA64_ACPI_CPUFREQ=m + +# +# Bus options (PCI, PCMCIA) # CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_MSI=y -CONFIG_PCI_LEGACY_PROC=y -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=m -# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set -CONFIG_ISA=y -# CONFIG_EISA is not set -# CONFIG_MCA is not set -# CONFIG_SCx200 is not set -CONFIG_HOTPLUG=y -# CONFIG_DEBUG_KOBJECT is not set - -# -# PCMCIA/CardBus support -# + +# +# PCI Hotplug Support +# +CONFIG_HOTPLUG_PCI=y +# CONFIG_HOTPLUG_PCI_FAKE is not set +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +# CONFIG_HOTPLUG_PCI_CPCI is not set +CONFIG_HOTPLUG_PCI_SHPC=m +CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y +CONFIG_HOTPLUG_PCI_SGI=m + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set CONFIG_PCMCIA=y CONFIG_PCMCIA_LOAD_CIS=y -# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA_IOCTL=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# CONFIG_YENTA=y -CONFIG_CARDBUS=y +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m CONFIG_I82092=m -CONFIG_PD6729=m -CONFIG_PCMCIA_IOCTL=y - -CONFIG_PCCARD=y -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set -CONFIG_MMC_BLOCK=y -# CONFIG_MMC_WBSD is not set -CONFIG_MMC_SDHCI=m - -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_MTHCA=m -# CONFIG_INFINIBAND_MTHCA_DEBUG is not set -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_DEBUG=y -CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_IPATH_CORE=m -CONFIG_INFINIBAND_IPATH=m - -# -# Executable file formats -# -CONFIG_BINFMT_ELF=y -# CONFIG_BINFMT_AOUT is not set -CONFIG_BINFMT_MISC=y - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_FW_LOADER=y - -# CONFIG_SPI is not set - -# -# Memory Technology Devices (MTD) -# -# CONFIG_MTD is not set -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CONCAT=m -CONFIG_MTD_CMDLINE_PARTS=y -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m -CONFIG_MTD_BLOCK2MTD=m -CONFIG_FTL=m -CONFIG_NFTL=m -CONFIG_NFTL_RW=y -CONFIG_INFTL=m -CONFIG_RFD_FTL=m - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_CFI_INTELEXT=m -CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_RAM=m -CONFIG_MTD_ROM=m -CONFIG_MTD_ABSENT=m -# CONFIG_MTD_OBSOLETE_CHIPS is not set - -# -# Mapping drivers for chip access -# -CONFIG_MTD_COMPLEX_MAPPINGS=y -# CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_PNC2000 is not set -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m -# CONFIG_MTD_SBC_GXX is not set -CONFIG_MTD_SCx200_DOCFLASH=m -# CONFIG_MTD_AMD76XROM is not set -CONFIG_MTD_SCB2_FLASH=m -# CONFIG_MTD_NETtel is not set -# CONFIG_MTD_DILNETPC is not set -# CONFIG_MTD_L440GX is not set -CONFIG_MTD_PCI=m -CONFIG_MTD_TS5500=m - -# -# Self-contained MTD device drivers -# -CONFIG_MTD_PMC551=m -# CONFIG_MTD_PMC551_BUGFIX is not set -# CONFIG_MTD_PMC551_DEBUG is not set -# CONFIG_MTD_SLRAM is not set -CONFIG_MTD_MTDRAM=m -CONFIG_MTDRAM_TOTAL_SIZE=4096 -CONFIG_MTDRAM_ERASE_SIZE=128 -# CONFIG_MTD_BLKMTD is not set - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOC2001PLUS is not set -# CONFIG_MTD_DOCPROBE is not set -# CONFIG_MTD_DOCPROBE_ADVANCED is not set -# CONFIG_MTD_DOCPROBE_ADDRESS is not set - -# -# NAND Flash Device Drivers -# -CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -CONFIG_MTD_NAND_IDS=m -CONFIG_MTD_NAND_NANDSIM=m -# CONFIG_MTD_ONENAND is not set -CONFIG_MTD_NAND_ECC_SMC=y -CONFIG_MTD_NAND_CS553X=m - -CONFIG_MTD_REDBOOT_PARTS=m -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -CONFIG_MTD_CFI_AMDSTD_RETRY=3 -# CONFIG_MTD_XIP is not set -# CONFIG_MTD_ICHXROM is not set -# CONFIG_MTD_PHRAM is not set -CONFIG_MTD_NAND_DISKONCHIP=m -# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 -# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set -# CONFIG_MTD_PLATRAM is not set - -# -# Parallel port support -# -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -# CONFIG_PARPORT_PC_FIFO is not set -# CONFIG_PARPORT_PC_SUPERIO is not set -CONFIG_PARPORT_PC_PCMCIA=m -CONFIG_PARPORT_1284=y - -# -# Plug and Play support -# -CONFIG_PNP=y -# CONFIG_PNP_DEBUG is not set - -# -# Protocols -# -CONFIG_ISAPNP=y -# CONFIG_PNPBIOS is not set -# CONFIG_ACPI_CONTAINER is not set -# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set -# CONFIG_ACPI_HOTKEY is not set - -# -# Block devices -# -# CONFIG_BLK_DEV_FD is not set -# CONFIG_BLK_DEV_XD is not set -CONFIG_PARIDE=m -CONFIG_PARIDE_PD=m -CONFIG_PARIDE_PCD=m -CONFIG_PARIDE_PF=m -CONFIG_PARIDE_PT=m -CONFIG_PARIDE_PG=m -CONFIG_PARIDE_ATEN=m -CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_BPCK6=m -CONFIG_PARIDE_COMM=m -CONFIG_PARIDE_DSTR=m -CONFIG_PARIDE_FIT2=m -CONFIG_PARIDE_FIT3=m -CONFIG_PARIDE_EPAT=m -CONFIG_PARIDE_EPATC8=y -CONFIG_PARIDE_EPIA=m -CONFIG_PARIDE_FRIQ=m -CONFIG_PARIDE_FRPW=m -CONFIG_PARIDE_KBIC=m -CONFIG_PARIDE_KTTI=m -CONFIG_PARIDE_ON20=m -CONFIG_PARIDE_ON26=m -CONFIG_BLK_CPQ_DA=m -CONFIG_BLK_CPQ_CISS_DA=m -CONFIG_CISS_SCSI_TAPE=y -CONFIG_BLK_DEV_DAC960=m -CONFIG_BLK_DEV_UMEM=m -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_INITRD=y -CONFIG_BLK_DEV_ATIIXP=y -CONFIG_LBD=y -CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_LSF=y - -# -# ATA/ATAPI/MFM/RLL support -# -CONFIG_IDE=y -CONFIG_IDE_GENERIC=y -# CONFIG_HPT34X_AUTODMA is not set - -CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_HD_IDE is not set -CONFIG_BLK_DEV_IDEDISK=y -CONFIG_IDEDISK_MULTI_MODE=y -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_IDECD=m -# CONFIG_BLK_DEV_IDETAPE is not set -CONFIG_BLK_DEV_IDEFLOPPY=y -CONFIG_BLK_DEV_IDESCSI=y -CONFIG_IDE_TASK_IOCTL=y -# CONFIG_BLK_DEV_IDE_SATA is not set - -# -# IDE chipset support/bugfixes -# -CONFIG_BLK_DEV_CMD640=y -CONFIG_BLK_DEV_CMD640_ENHANCED=y -CONFIG_BLK_DEV_IDEPNP=y -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_SHARE_IRQ=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y -# CONFIG_BLK_DEV_OPTI621 is not set -CONFIG_BLK_DEV_RZ1000=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -CONFIG_IDEDMA_PCI_AUTO=y -# CONFIG_IDEDMA_ONLYDISK is not set -CONFIG_BLK_DEV_AEC62XX=y -CONFIG_BLK_DEV_ALI15X3=y -# CONFIG_WDC_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -CONFIG_BLK_DEV_CMD64X=y -CONFIG_BLK_DEV_TRIFLEX=y -CONFIG_BLK_DEV_CY82C693=y -CONFIG_BLK_DEV_CS5520=y -CONFIG_BLK_DEV_CS5530=y -CONFIG_BLK_DEV_CS5535=y -CONFIG_BLK_DEV_HPT34X=y -CONFIG_BLK_DEV_HPT366=y -CONFIG_BLK_DEV_IT821X=y -# CONFIG_BLK_DEV_SC1200 is not set -CONFIG_BLK_DEV_PIIX=y -# CONFIG_BLK_DEV_NS87415 is not set -CONFIG_BLK_DEV_PDC202XX_OLD=y -# CONFIG_PDC202XX_BURST is not set -CONFIG_BLK_DEV_PDC202XX_NEW=y -CONFIG_BLK_DEV_SVWKS=y -CONFIG_BLK_DEV_SIIMAGE=y -CONFIG_BLK_DEV_SIS5513=y -CONFIG_BLK_DEV_SLC90E66=y -# CONFIG_BLK_DEV_TRM290 is not set -CONFIG_BLK_DEV_VIA82CXXX=y -# CONFIG_IDE_CHIPSETS is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set -CONFIG_IDEDMA_AUTO=y -# CONFIG_BLK_DEV_HD is not set - -# -# SCSI device support -# -CONFIG_SCSI=m -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_RAID_ATTRS=m - -CONFIG_ISCSI_TCP=m - -# -# SCSI low-level drivers -# -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_3W_9XXX=m -# CONFIG_SCSI_7000FASST is not set -CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AACRAID=m -CONFIG_SCSI_AIC7XXX=m -CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 -CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -# CONFIG_AIC7XXX_PROBE_EISA_VL is not set -# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set -# CONFIG_AIC7XXX_DEBUG_ENABLE is not set -CONFIG_AIC7XXX_DEBUG_MASK=0 -# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set -CONFIG_SCSI_AIC7XXX_OLD=m -CONFIG_SCSI_AIC79XX=m -CONFIG_AIC79XX_CMDS_PER_DEVICE=4 -CONFIG_AIC79XX_RESET_DELAY_MS=15000 -# CONFIG_AIC79XX_BUILD_FIRMWARE is not set -# CONFIG_AIC79XX_ENABLE_RD_STRM is not set -# CONFIG_AIC79XX_DEBUG_ENABLE is not set -CONFIG_AIC79XX_DEBUG_MASK=0 -# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set -# CONFIG_SCSI_ADVANSYS is not set -CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_MM=m -CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_SATA=y -CONFIG_SCSI_SATA_SVW=m -CONFIG_SCSI_ATA_PIIX=m -CONFIG_SCSI_SATA_PROMISE=m -CONFIG_SCSI_SATA_VIA=m -CONFIG_BLK_DEV_SX8=m -CONFIG_SCSI_SATA_VITESSE=m -CONFIG_SCSI_SATA_SIL=m -CONFIG_SCSI_SATA_SIS=m -CONFIG_SCSI_SATA_SX4=m -CONFIG_SCSI_SATA_NV=m -CONFIG_SCSI_SATA_AHCI=m -CONFIG_SCSI_SATA_ULI=m -CONFIG_SCSI_SATA_QSTOR=m -CONFIG_SCSI_SATA_MV=m -CONFIG_SCSI_SATA_SIL24=m -CONFIG_SCSI_PDC_ADMA=m -CONFIG_SCSI_HPTIOP=m - -# CONFIG_SCSI_BUSLOGIC is not set -CONFIG_SCSI_INITIO=m -# CONFIG_SCSI_OMIT_FLASHPOINT is not set -# CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_EATA_PIO is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set -CONFIG_SCSI_GDTH=m -CONFIG_SCSI_IPS=m -CONFIG_SCSI_INIA100=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set -# CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y -# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set -# CONFIG_SCSI_QLOGIC_FC is not set -# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set -CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_DC395x=m -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_DEBUG is not set -CONFIG_SCSI_DC390T=m -CONFIG_SCSI_QLA_FC=m -# FIXME: Turn off for FC6 - Move to external firmware loader. -CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y -CONFIG_SCSI_QLA21XX=m -CONFIG_SCSI_QLA22XX=m -CONFIG_SCSI_QLA2300=m -CONFIG_SCSI_QLA2322=m -CONFIG_SCSI_QLA24XX=m -CONFIG_SCSI_QLA6312=m -# CONFIG_SCSI_IPR is not set -# CONFIG_SCSI_DPT_I2O is not set -CONFIG_SCSI_LPFC=m - -# -# PCMCIA SCSI adapter support -# -CONFIG_PCMCIA_AHA152X=m -# CONFIG_PCMCIA_FDOMAIN is not set -CONFIG_PCMCIA_NINJA_SCSI=m -CONFIG_PCMCIA_QLOGIC=m -CONFIG_PCMCIA_SYM53C500=m - - -# -# Multi-device support (RAID and LVM) -# -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID5=m -CONFIG_MD_RAID5_RESHAPE=y -CONFIG_MD_RAID6=m -CONFIG_MD_RAID10=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_MIRROR=m -CONFIG_DM_ZERO=m -CONFIG_DM_CRYPT=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m - -# -# Fusion MPT device support -# -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_MAX_SGE=40 -CONFIG_FUSION_CTL=m -CONFIG_FUSION_LAN=m -CONFIG_FUSION_SAS=m - -# -# IEEE 1394 (FireWire) support (EXPERIMENTAL) -# -CONFIG_IEEE1394=m - -# -# Subsystem Options -# -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -CONFIG_IEEE1394_OUI_DB=y - -# -# Device Drivers -# -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_OHCI1394=m - -# -# Protocol Drivers -# -CONFIG_IEEE1394_VIDEO1394=m -CONFIG_IEEE1394_SBP2=m -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set -CONFIG_IEEE1394_ETH1394=m -CONFIG_IEEE1394_DV1394=m -CONFIG_IEEE1394_RAWIO=m -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y -# CONFIG_IEEE1394_EXPORT_FULL_API is not set - -# -# I2O device support -# -# CONFIG_I2O is not set -# CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set - -# -# Networking support +CONFIG_PCCARD_NONSTATIC=y + +# +# Networking # CONFIG_NET=y + +# +# Networking options +# # CONFIG_NETDEBUG is not set - -# CONFIG_TCP_CONG_ADVANCED is not set - -# -# Networking options -# CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y CONFIG_NET_KEY=m CONFIG_INET=y -CONFIG_INET_TUNNEL=m -CONFIG_INET_DIAG=m CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_FWMARK=y CONFIG_IP_ROUTE_MULTIPATH=y +# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set CONFIG_IP_ROUTE_VERBOSE=y -# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set -CONFIG_IP_ROUTE_MULTIPATH_RR=m -CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m -CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m -CONFIG_IP_ROUTE_MULTIPATH_DRR=m # CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE=m @@ -601,10 +288,14 @@ CONFIG_INET_AH=m CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_NETCONSOLE=m -# CONFIG_NETPOLL_RX is not set -CONFIG_NETPOLL_TRAP=y -CONFIG_NET_POLL_CONTROLLER=y +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y # # IP: Virtual Server Configuration @@ -612,10 +303,18 @@ CONFIG_IP_VS=m CONFIG_IP_VS=m # CONFIG_IP_VS_DEBUG is not set CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# CONFIG_IP_VS_PROTO_TCP=y CONFIG_IP_VS_PROTO_UDP=y CONFIG_IP_VS_PROTO_ESP=y CONFIG_IP_VS_PROTO_AH=y + +# +# IPVS scheduler +# CONFIG_IP_VS_RR=m CONFIG_IP_VS_WRR=m CONFIG_IP_VS_LC=m @@ -626,8 +325,11 @@ CONFIG_IP_VS_SH=m CONFIG_IP_VS_SH=m CONFIG_IP_VS_SED=m CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# CONFIG_IP_VS_FTP=m - CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y @@ -635,24 +337,30 @@ CONFIG_INET6_AH=m CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_IPV6_TUNNEL=m -CONFIG_DECNET=m -CONFIG_DECNET_ROUTER=y -CONFIG_DECNET_ROUTE_FWMARK=y -# CONFIG_DECNET_NF_GRABULATOR is not set -CONFIG_BRIDGE=m +CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m @@ -664,103 +372,102 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m - -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_BRIDGE_NETFILTER=y # # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_CT_ACCT=y CONFIG_IP_NF_CONNTRACK_MARK=y +CONFIG_IP_NF_CONNTRACK_SECMARK=y CONFIG_IP_NF_CONNTRACK_EVENTS=y CONFIG_IP_NF_CONNTRACK_NETLINK=m -CONFIG_IP_NF_CONNTRACK_SECMARK=y +CONFIG_IP_NF_CT_PROTO_SCTP=m +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +CONFIG_IP_NF_NETBIOS_NS=m +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_AMANDA=m +CONFIG_IP_NF_PPTP=m +CONFIG_IP_NF_H323=m +CONFIG_IP_NF_SIP=m +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_DSCP=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_AH_ESP=m -CONFIG_IP_NF_MATCH_DSCP=m -CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_HASHLIMIT=m -CONFIG_IP_NF_MATCH_IPRANGE=m -CONFIG_IP_NF_MATCH_MULTIPORT=m -CONFIG_IP_NF_MATCH_OWNER=m -CONFIG_IP_NF_MATCH_POLICY=m -CONFIG_IP_NF_MATCH_RECENT=m -CONFIG_IP_NF_MATCH_TOS=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_SAME=m -CONFIG_IP_NF_TARGET_TOS=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_DSCP=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_TARGET_TCPMSS=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_NAT_NEEDED=y CONFIG_IP_NF_NAT_SNMP_BASIC=m CONFIG_IP_NF_NAT_IRC=m CONFIG_IP_NF_NAT_FTP=m CONFIG_IP_NF_NAT_TFTP=m CONFIG_IP_NF_NAT_AMANDA=m +CONFIG_IP_NF_NAT_PPTP=m +CONFIG_IP_NF_NAT_H323=m +CONFIG_IP_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_DSCP=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_IP_NF_CT_ACCT=y -CONFIG_IP_NF_CT_PROTO_SCTP=m -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -CONFIG_IP_NF_TFTP=m -CONFIG_IP_NF_AMANDA=m -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_NETBIOS_NS=m -CONFIG_IP_NF_PPTP=m -CONFIG_IP_NF_H323=m -CONFIG_IP_NF_SIP=m - -# -# IPv6: Netfilter Configuration + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) # CONFIG_IP6_NF_QUEUE=m CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_AHESP=m -CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m CONFIG_IP6_NF_MATCH_FRAG=m CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_OWNER=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MULTIPORT=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_OWNER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_MATCH_POLICY=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_TARGET_LOG=m CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + +# +# DECnet: Netfilter Configuration +# +# CONFIG_DECNET_NF_GRABULATOR is not set # # Bridge: Netfilter Configuration @@ -785,12 +492,25 @@ CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_ULOG=m -CONFIG_XFRM=y -CONFIG_XFRM_USER=y -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m + +# +# DCCP Configuration (EXPERIMENTAL) +# +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m +CONFIG_IP_DCCP_ACKVEC=y + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +CONFIG_IP_DCCP_CCID2=m +CONFIG_IP_DCCP_CCID3=m +CONFIG_IP_DCCP_TFRC_LIB=m + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set # # SCTP Configuration (EXPERIMENTAL) @@ -801,9 +521,26 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y + +# +# TIPC Configuration (EXPERIMENTAL) +# +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +# CONFIG_ATM_MPOA is not set +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m -CONFIG_LLC=m +CONFIG_DECNET=m +CONFIG_DECNET_ROUTER=y +CONFIG_DECNET_ROUTE_FWMARK=y +CONFIG_LLC=y # CONFIG_LLC2 is not set CONFIG_IPX=m # CONFIG_IPX_INTERN is not set @@ -817,25 +554,22 @@ CONFIG_NET_DIVERT=y CONFIG_NET_DIVERT=y # CONFIG_ECONET is not set CONFIG_WAN_ROUTER=m -CONFIG_IP_DCCP=m -CONFIG_IP_DCCP_CCID2=m -CONFIG_IP_DCCP_CCID3=m -# CONFIG_IP_DCCP_DEBUG is not set -CONFIG_IP_DCCP_UNLOAD_HACK=y - -# -# TIPC Configuration (EXPERIMENTAL) -# -CONFIG_TIPC=m -# CONFIG_TIPC_ADVANCED is not set -# CONFIG_TIPC_DEBUG is not set # # QoS and/or fair queueing # CONFIG_NET_SCHED=y +# CONFIG_NET_SCH_CLK_JIFFIES is not set +CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y +# CONFIG_NET_SCH_CLK_CPU is not set + +# +# Queueing/Scheduling +# CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_RED=m CONFIG_NET_SCH_SFQ=m @@ -843,25 +577,23 @@ CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_ESTIMATOR=y + +# +# Classification +# CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_ROUTE=y CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y CONFIG_CLS_U32_MARK=y CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_ACT_POLICE is not set -CONFIG_CLS_U32_PERF=y -CONFIG_NET_CLS_IND=y -# CONFIG_NET_CLS_ACT is not set -CONFIG_NET_CLS_BASIC=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m @@ -869,18 +601,459 @@ CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m CONFIG_NET_EMATCH_TEXT=m +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_CLS_POLICE=y +CONFIG_NET_CLS_IND=y +CONFIG_NET_ESTIMATOR=y # # Network testing # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m + +# +# Old SIR device drivers +# + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_IEEE80211=m +CONFIG_IEEE80211_DEBUG=y +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +CONFIG_IEEE80211_SOFTMAC_DEBUG=y +CONFIG_TUX=m + +# +# TUX options +# +CONFIG_TUX_EXTCGI=y +CONFIG_TUX_EXTENDED_LOG=y +# CONFIG_TUX_DEBUG is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +CONFIG_CONNECTOR=m + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Parallel port support +# +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +CONFIG_PARPORT_NOT_PC=y +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_1284=y + +# +# Plug and Play support +# +CONFIG_PNP=y +# CONFIG_PNP_DEBUG is not set + +# +# Protocols +# +# CONFIG_PNPACPI is not set + +# +# Block devices +# +CONFIG_PARIDE=m +CONFIG_PARIDE_PARPORT=m + +# +# Parallel IDE high-level drivers +# +CONFIG_PARIDE_PD=m +CONFIG_PARIDE_PCD=m +CONFIG_PARIDE_PF=m +CONFIG_PARIDE_PT=m +CONFIG_PARIDE_PG=m + +# +# Parallel IDE protocol modules +# +CONFIG_PARIDE_ATEN=m +CONFIG_PARIDE_BPCK=m +CONFIG_PARIDE_COMM=m +CONFIG_PARIDE_DSTR=m +CONFIG_PARIDE_FIT2=m +CONFIG_PARIDE_FIT3=m +CONFIG_PARIDE_EPAT=m +CONFIG_PARIDE_EPATC8=y +CONFIG_PARIDE_EPIA=m +CONFIG_PARIDE_FRIQ=m +CONFIG_PARIDE_FRPW=m +CONFIG_PARIDE_KBIC=m +CONFIG_PARIDE_KTTI=m +CONFIG_PARIDE_ON20=m +CONFIG_PARIDE_ON26=m +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +CONFIG_CISS_SCSI_TAPE=y +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SX8=m +CONFIG_BLK_DEV_UB=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_INITRD=y +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=y +CONFIG_IDE_MAX_HWIFS=4 +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +CONFIG_IDEDISK_MULTI_MODE=y +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_IDECD=m +# CONFIG_BLK_DEV_IDETAPE is not set +CONFIG_BLK_DEV_IDEFLOPPY=y +CONFIG_BLK_DEV_IDESCSI=m +CONFIG_IDE_TASK_IOCTL=y + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +CONFIG_BLK_DEV_IDEPNP=y +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_SHARE_IRQ=y +# CONFIG_BLK_DEV_OFFBOARD is not set +CONFIG_BLK_DEV_GENERIC=y +# CONFIG_BLK_DEV_OPTI621 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +CONFIG_IDEDMA_PCI_AUTO=y +# CONFIG_IDEDMA_ONLYDISK is not set +CONFIG_BLK_DEV_AEC62XX=y +CONFIG_BLK_DEV_ALI15X3=y +# CONFIG_WDC_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +CONFIG_BLK_DEV_CMD64X=y +CONFIG_BLK_DEV_TRIFLEX=y +CONFIG_BLK_DEV_CY82C693=y +CONFIG_BLK_DEV_CS5520=y +CONFIG_BLK_DEV_CS5530=y +CONFIG_BLK_DEV_HPT34X=y +# CONFIG_HPT34X_AUTODMA is not set +CONFIG_BLK_DEV_HPT366=y +# CONFIG_BLK_DEV_SC1200 is not set +CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_IT821X=y +# CONFIG_BLK_DEV_NS87415 is not set +CONFIG_BLK_DEV_PDC202XX_OLD=y +# CONFIG_PDC202XX_BURST is not set +CONFIG_BLK_DEV_PDC202XX_NEW=y +CONFIG_BLK_DEV_SVWKS=y +CONFIG_BLK_DEV_SIIMAGE=y +CONFIG_BLK_DEV_SLC90E66=y +# CONFIG_BLK_DEV_TRM290 is not set +CONFIG_BLK_DEV_VIA82CXXX=y +# CONFIG_IDE_ARM is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set +CONFIG_IDEDMA_AUTO=y +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y + +# +# SCSI Transport Attributes +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m + +# +# SCSI low-level drivers +# +CONFIG_ISCSI_TCP=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set +CONFIG_SCSI_AIC7XXX_OLD=m +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=4 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_ENABLE_RD_STRM is not set +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_SATA=m +CONFIG_SCSI_SATA_AHCI=m +CONFIG_SCSI_SATA_SVW=m +CONFIG_SCSI_ATA_PIIX=m +CONFIG_SCSI_SATA_MV=m +CONFIG_SCSI_SATA_NV=m +CONFIG_SCSI_PDC_ADMA=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_SATA_QSTOR=m +CONFIG_SCSI_SATA_PROMISE=m +CONFIG_SCSI_SATA_SX4=m +CONFIG_SCSI_SATA_SIL=m +CONFIG_SCSI_SATA_SIL24=m +CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m +CONFIG_SCSI_SATA_VIA=m +CONFIG_SCSI_SATA_VITESSE=m +CONFIG_SCSI_SATA_INTEL_COMBINED=y +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +# CONFIG_SCSI_IPR is not set +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_LPFC=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +# CONFIG_PCMCIA_FDOMAIN is not set +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID5=m +CONFIG_MD_RAID5_RESHAPE=y +CONFIG_MD_RAID6=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m + +# +# Fusion MPT device support +# +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=40 +CONFIG_FUSION_CTL=m +CONFIG_FUSION_LAN=m + +# +# IEEE 1394 (FireWire) support +# +CONFIG_IEEE1394=m + +# +# Subsystem Options +# +# CONFIG_IEEE1394_VERBOSEDEBUG is not set +CONFIG_IEEE1394_OUI_DB=y +CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y +CONFIG_IEEE1394_CONFIG_ROM_IP1394=y +# CONFIG_IEEE1394_EXPORT_FULL_API is not set + +# +# Device Drivers +# +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_OHCI1394=m + +# +# Protocol Drivers +# +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_SBP2=m +CONFIG_IEEE1394_ETH1394=m +CONFIG_IEEE1394_DV1394=m +CONFIG_IEEE1394_RAWIO=m + +# +# I2O device support +# +# CONFIG_I2O is not set + +# +# Network device support +# CONFIG_NETDEVICES=y - -# -# ARCnet devices -# -# CONFIG_ARCNET is not set CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_EQUALIZER=m @@ -888,59 +1061,33 @@ CONFIG_NET_SB1000=m CONFIG_NET_SB1000=m # -# ATM -# -# CONFIG_ATM_DUMMY is not set -CONFIG_ATM_CLIP=m -CONFIG_ATM_LANE=m -CONFIG_ATM_BR2684=m -CONFIG_NET_SCH_ATM=m -CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m -CONFIG_ATM_ENI=m -CONFIG_ATM_FIRESTREAM=m -# CONFIG_ATM_ZATM is not set -CONFIG_ATM_IDT77252=m -CONFIG_ATM_AMBASSADOR=m -CONFIG_ATM_HORIZON=m -CONFIG_ATM_FORE200E_MAYBE=m -CONFIG_ATM_HE=m -CONFIG_PPPOATM=m -CONFIG_ATM_NICSTAR=m -# CONFIG_ATM_IA is not set - - -# CONFIG_ATM_CLIP_NO_ICMP is not set -# CONFIG_ATM_MPOA is not set -# CONFIG_ATM_BR2684_IPFILTER is not set -# CONFIG_ATM_ENI_DEBUG is not set -# CONFIG_ATM_ENI_TUNE_BURST is not set -# CONFIG_ATM_ZATM_DEBUG is not set -# CONFIG_ATM_IDT77252_DEBUG is not set -# CONFIG_ATM_IDT77252_RCV_ALL is not set -# CONFIG_ATM_AMBASSADOR_DEBUG is not set -# CONFIG_ATM_HORIZON_DEBUG is not set -# CONFIG_ATM_FORE200E_PCA is not set -# CONFIG_ATM_HE_USE_SUNI is not set -# CONFIG_ATM_NICSTAR_USE_SUNI is not set -# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set -# CONFIG_ATM_IA_DEBUG is not set - - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y +# ARCnet devices +# +# CONFIG_ARCNET is not set + +# +# PHY device support +# CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m CONFIG_QSEMI_PHY=m CONFIG_LXT_PHY=m CONFIG_CICADA_PHY=m CONFIG_SMSC_PHY=m + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y CONFIG_MII=m CONFIG_HAPPYMEAL=m CONFIG_SUNGEM=m +CONFIG_CASSINI=m CONFIG_NET_VENDOR_3COM=y CONFIG_VORTEX=m CONFIG_TYPHOON=m @@ -951,20 +1098,15 @@ CONFIG_NET_TULIP=y CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m -# CONFIG_TULIP_NAPI is not set # CONFIG_TULIP_MWI is not set CONFIG_TULIP_MMIO=y -# CONFIG_NI5010 is not set -# CONFIG_PCMCIA_XIRTULIP is not set +# CONFIG_TULIP_NAPI is not set CONFIG_DE4X5=m CONFIG_WINBOND_840=m CONFIG_DM9102=m +CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m -CONFIG_ULI526X=m # CONFIG_HP100 is not set -CONFIG_LNE390=m -CONFIG_NE3210=m -CONFIG_ES3210=m CONFIG_NET_PCI=y CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m @@ -972,12 +1114,11 @@ CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m -CONFIG_BNX2=m +CONFIG_FORCEDETH=m CONFIG_DGRS=m # CONFIG_EEPRO100 is not set CONFIG_E100=m CONFIG_FEALNX=m -CONFIG_FORCEDETH=m CONFIG_NATSEMI=m CONFIG_NE2K_PCI=m CONFIG_8139CP=m @@ -987,20 +1128,14 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_SIS900=m -CONFIG_SIS190=m CONFIG_EPIC100=m CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set -CONFIG_TLAN=m CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y -CONFIG_VIA_VELOCITY=m CONFIG_NET_POCKET=y -CONFIG_ATP=m CONFIG_DE600=m CONFIG_DE620=m -CONFIG_CASSINI=m -# CONFIG_FEC_8XX is not set # # Ethernet (1000 Mbit) @@ -1017,21 +1152,127 @@ CONFIG_R8169=m CONFIG_R8169=m CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y +CONFIG_SIS190=m +CONFIG_SKGE=m +CONFIG_SKY2=m # CONFIG_SK98LIN is not set -CONFIG_SKGE=m +CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m -CONFIG_SKY2=m +CONFIG_BNX2=m # # Ethernet (10000 Mbit) # +CONFIG_CHELSIO_T1=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m -CONFIG_CHELSIO_T1=m - + +# +# Token Ring devices +# +CONFIG_TR=y +CONFIG_IBMOL=m +CONFIG_3C359=m +# CONFIG_TMS380TR is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +CONFIG_PCMCIA_WAVELAN=m +CONFIG_PCMCIA_NETWAVE=m + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set +CONFIG_HERMES=m +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_PCMCIA_WL3501=m + +# +# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support +# +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +# CONFIG_BCM43XX is not set +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# ATM drivers +# +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +# CONFIG_ATM_ZATM is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_FORE200E_MAYBE=m +# CONFIG_ATM_FORE200E_PCA is not set +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set CONFIG_FDDI=y # CONFIG_DEFXX is not set CONFIG_SKFP=m @@ -1043,216 +1284,68 @@ CONFIG_PPP_ASYNC=m CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m -CONFIG_IPPP_FILTER=y # CONFIG_PPP_BSDCOMP is not set +CONFIG_PPP_MPPE=m CONFIG_PPPOE=m -CONFIG_PPP_MPPE=m +CONFIG_PPPOATM=m CONFIG_SLIP=m CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y # CONFIG_SLIP_MODE_SLIP6 is not set - -# -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y - -# -# Obsolete Wireless cards support (pre-802.11) -# -# CONFIG_STRIP is not set -# CONFIG_ARLAN is not set -CONFIG_PCMCIA_WAVELAN=m -CONFIG_PCMCIA_NETWAVE=m - -# -# Wireless 802.11 Frequency Hopping cards support -# -# CONFIG_PCMCIA_RAYCS is not set - -# -# Wireless 802.11b ISA/PCI cards support -# -CONFIG_IEEE80211=m -CONFIG_IEEE80211_DEBUG=y -CONFIG_IEEE80211_CRYPT_WEP=m -CONFIG_IEEE80211_CRYPT_CCMP=m -CONFIG_IEEE80211_CRYPT_TKIP=m -CONFIG_IEEE80211_SOFTMAC=m -CONFIG_IEEE80211_SOFTMAC_DEBUG=y -# CONFIG_IPW2100 is not set -# CONFIG_IPW2200 is not set -# CONFIG_IPW2100_DEBUG is not set -# CONFIG_IPW2200_DEBUG is not set -CONFIG_AIRO=m -CONFIG_HERMES=m -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_PRISM54=m -# CONFIG_BCM43XX is not set -CONFIG_BCM43XX_DEBUG=y - -# -# Wireless 802.11b Pcmcia/Cardbus cards support -# -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_AIRO_CS=m -CONFIG_PCMCIA_ATMEL=m -CONFIG_PCMCIA_WL3501=m -CONFIG_NET_WIRELESS=y -CONFIG_NET_WIRELESS_RTNETLINK=y - -CONFIG_HOSTAP=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_CS=m - -# -# Token Ring devices -# -CONFIG_TR=y -CONFIG_IBMOL=m -CONFIG_3C359=m -# Broken with gcc4.1 -# CONFIG_TMS380TR is not set -CONFIG_TMSPCI=m -CONFIG_ABYSS=m -CONFIG_IBMLS=m -CONFIG_PCMCIA_IBMTR=m - - CONFIG_NET_FC=y # CONFIG_SHAPER is not set - -# -# Wan interfaces -# -# CONFIG_WAN is not set - -# -# PCMCIA network device support -# -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_3C589=m -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_PCMCIA_PCNET=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_PCMCIA_SMC91C92=m -CONFIG_PCMCIA_XIRC2PS=m -CONFIG_PCMCIA_AXNET=m - -# -# Amateur Radio support -# -# CONFIG_HAMRADIO is not set - -# -# IrDA (infrared) support -# -CONFIG_IRDA=m -# CONFIG_IRDA_DEBUG is not set -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -# CONFIG_IRDA_ULTRA is not set -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -CONFIG_IRTTY_SIR=m -CONFIG_DONGLE=y -CONFIG_ESI_DONGLE=m -CONFIG_ACTISYS_DONGLE=m -CONFIG_TEKRAM_DONGLE=m -CONFIG_TOIM3232_DONGLE=m -CONFIG_IRPORT_SIR=m -# CONFIG_DONGLE_OLD is not set -CONFIG_LITELINK_DONGLE=m -CONFIG_MA600_DONGLE=m -CONFIG_GIRBIL_DONGLE=m -CONFIG_MCP2120_DONGLE=m -CONFIG_OLD_BELKIN_DONGLE=m -CONFIG_ACT200L_DONGLE=m - -CONFIG_ALI_FIR=m -CONFIG_MCS_FIR=m -CONFIG_NSC_FIR=m -CONFIG_SIGMATEL_FIR=m -CONFIG_SMC_IRCC_FIR=m -CONFIG_TOSHIBA_FIR=m -CONFIG_USB_IRDA=m -CONFIG_VLSI_FIR=m -CONFIG_VIA_FIR=m -CONFIG_WINBOND_FIR=m - -# -# Bluetooth support -# -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_CMTP=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIUSB=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m -CONFIG_BT_HCIVHCI=m -CONFIG_BT_HCIUSB_SCO=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIBPA10X=m +CONFIG_NETCONSOLE=m +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_RX is not set +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y # # ISDN subsystem # - CONFIG_ISDN=m + +# +# Old ISDN4Linux +# CONFIG_ISDN_I4L=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_AVMB1_C4=m - CONFIG_ISDN_PPP=y CONFIG_ISDN_PPP_VJ=y CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y # CONFIG_ISDN_PPP_BSDCOMP is not set +CONFIG_ISDN_AUDIO=y CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y CONFIG_DE_AOC=y - -CONFIG_ISDN_AUDIO=y - -CONFIG_ISDN_DRV_HISAX=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m - -CONFIG_ISDN_CAPI_CAPIDRV=m -CONFIG_ISDN_DIVERSION=m - -CONFIG_HISAX_EURO=y +CONFIG_HISAX_NO_SENDCOMPLETE=y +CONFIG_HISAX_NO_LLC=y +CONFIG_HISAX_NO_KEYPAD=y CONFIG_HISAX_1TR6=y CONFIG_HISAX_NI1=y CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# CONFIG_HISAX_16_3=y CONFIG_HISAX_TELESPCI=y CONFIG_HISAX_S0BOX=y @@ -1272,22 +1365,36 @@ CONFIG_HISAX_HFC_SX=y CONFIG_HISAX_HFC_SX=y CONFIG_HISAX_ENTERNOW_PCI=y # CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# CONFIG_HISAX_ST5481=m # CONFIG_HISAX_HFCUSB is not set +CONFIG_HISAX_HFC4S8S=m CONFIG_HISAX_FRITZ_PCIPNP=m -CONFIG_HISAX_NO_SENDCOMPLETE=y -CONFIG_HISAX_NO_LLC=y -CONFIG_HISAX_NO_KEYPAD=y -CONFIG_HISAX_SEDLBAUER_CS=m -CONFIG_HISAX_ELSA_CS=m -CONFIG_HISAX_TELES_CS=m -CONFIG_HISAX_HFC4S8S=m - -CONFIG_ISDN_DRV_LOOP=m -CONFIG_HYSDN=m -CONFIG_HYSDN_CAPI=y - +CONFIG_HISAX_HDLC=y + +# +# Active cards +# + +# +# Siemens Gigaset +# +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +# CONFIG_GIGASET_DEBUG is not set +# CONFIG_GIGASET_UNDOCREQ is not set # # CAPI subsystem @@ -1298,6 +1405,7 @@ CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_CAPIFS_BOOL=y CONFIG_ISDN_CAPI_CAPIFS=m +CONFIG_ISDN_CAPI_CAPIDRV=m # # CAPI hardware drivers @@ -1307,23 +1415,17 @@ CONFIG_ISDN_CAPI_CAPIFS=m # Active AVM cards # CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m # # Active Eicon DIVA Server cards # # CONFIG_CAPI_EICON is not set -CONFIG_ISDN_DIVAS=m -CONFIG_ISDN_DIVAS_BRIPCI=y -CONFIG_ISDN_DIVAS_PRIPCI=y -CONFIG_ISDN_DIVAS_DIVACAPI=m -CONFIG_ISDN_DIVAS_USERIDI=m -CONFIG_ISDN_DIVAS_MAINT=m - -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_M105=m -# CONFIG_GIGASET_DEBUG is not set -# CONFIG_GIGASET_UNDOCREQ is not set # # Telephony Support @@ -1348,31 +1450,14 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # -# Input I/O drivers -# -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=y -# CONFIG_SERIO_RAW is not set - -# CONFIG_SERIO_CT82C710 is not set -# CONFIG_SERIO_PARKBD is not set -# CONFIG_SERIO_PCIPS2 is not set - -# # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_LKKBD is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_SERIAL=m @@ -1397,20 +1482,34 @@ CONFIG_JOYSTICK_SPACEORB=m CONFIG_JOYSTICK_SPACEORB=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m CONFIG_JOYSTICK_JOYDUMP=m -CONFIG_JOYSTICK_TWIDJOY=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_ELO=m CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_MK712=m CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_WISTRON_BTNS=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_PARKBD is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m # # Character devices @@ -1419,63 +1518,131 @@ CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_COMPUTONE is not set # CONFIG_ROCKETPORT is not set -# CONFIG_SYNCLINK is not set +# CONFIG_CYCLADES is not set +# CONFIG_DIGIEPCA is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +# CONFIG_ISI is not set # CONFIG_SYNCLINKMP is not set # CONFIG_SYNCLINK_GT is not set CONFIG_N_HDLC=m +# CONFIG_SPECIALIX is not set +# CONFIG_SX is not set +# CONFIG_RIO is not set # CONFIG_STALDRV is not set -# CONFIG_FTAPE is not set -# CONFIG_IBM_ASM is not set -CONFIG_TCG_TPM=m -CONFIG_TCG_TIS=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -# CONFIG_TCG_INFINEON is not set -# CONFIG_TELCLOCK is not set +CONFIG_SGI_SNSC=y +CONFIG_SGI_TIOCX=y +CONFIG_SGI_MBCS=m # # Serial drivers # CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_ACPI=y CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=16 CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_8250_RSA=y -# CONFIG_COMPUTONE is not set -# CONFIG_CYCLADES is not set -# CONFIG_DIGIEPCA is not set -# CONFIG_ESPSERIAL is not set -# CONFIG_MOXA_INTELLIO is not set -# CONFIG_MOXA_SMARTIO is not set -# CONFIG_ISI is not set -# CONFIG_RISCOM8 is not set -# CONFIG_SPECIALIX is not set -# CONFIG_SX is not set -# CONFIG_RIO is not set -# CONFIG_STALLION is not set -# CONFIG_ISTALLION is not set -# CONFIG_SERIAL_JSM is not set # # Non-8250 serial port support # CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_SGI_L1_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_SERIAL_SGI_IOC3=m CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set +# CONFIG_CRASH is not set CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m CONFIG_TIPAR=m # +# IPMI +# +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_I8XX_TCO=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m +CONFIG_WDT_501_PCI=y + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +# CONFIG_HW_RANDOM is not set +CONFIG_EFI_RTC=y +CONFIG_DTLK=m +CONFIG_R3964=m +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +CONFIG_AGP=y +CONFIG_AGP_SIS=y +CONFIG_AGP_VIA=y +CONFIG_AGP_I460=y +CONFIG_AGP_HP_ZX1=y +CONFIG_AGP_SGI_TIOCA=y +CONFIG_DRM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +# CONFIG_RAW_DRIVER is not set +# CONFIG_HPET is not set +CONFIG_HANGCHECK_TIMER=m +# CONFIG_MMTIMER is not set + +# +# TPM devices +# +CONFIG_TCG_TPM=m +CONFIG_TCG_ATMEL=m +# CONFIG_TELCLOCK is not set + +# # I2C support # CONFIG_I2C=m @@ -1484,64 +1651,95 @@ CONFIG_I2C_CHARDEV=m # # I2C Algorithms # -# CONFIG_I2C_DEBUG_ALGO is not set CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCF=m +CONFIG_I2C_ALGOPCA=m # # I2C Hardware Bus support # - -CONFIG_I2C_NFORCE2=m -CONFIG_I2C_PROSAVAGE=m -CONFIG_I2C_SAVAGE4=m -CONFIG_I2C_VOODOO3=m # CONFIG_I2C_ALI1535 is not set # CONFIG_I2C_ALI1563 is not set # CONFIG_I2C_ALI15X3 is not set # CONFIG_I2C_AMD756 is not set -# CONFIG_I2C_AMD756_S4882 is not set # CONFIG_I2C_AMD8111 is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_I810 is not set # CONFIG_I2C_PIIX4 is not set -# CONFIG_SCx200_ACB is not set +CONFIG_I2C_ISA=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_PROSAVAGE=m +CONFIG_I2C_SAVAGE4=m # CONFIG_I2C_SIS5595 is not set # CONFIG_I2C_SIS630 is not set # CONFIG_I2C_SIS96X is not set +CONFIG_I2C_STUB=m # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set - -# CONFIG_I2C_ELEKTOR is not set -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_VOODOO3=m +CONFIG_I2C_PCA_ISA=m + +# +# Miscellaneous I2C Chip support +# +CONFIG_SENSORS_DS1337=m +CONFIG_SENSORS_DS1374=m +CONFIG_SENSORS_EEPROM=m +CONFIG_SENSORS_PCF8574=m +CONFIG_SENSORS_PCA9539=m +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_MAX6875=m # CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set -CONFIG_I2C_ALGOPCA=m -CONFIG_I2C_PCA_ISA=m -CONFIG_I2C_STUB=m - -# -# I2C Hardware Sensors Chip support -# + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +CONFIG_W1=m + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS9490=m +CONFIG_W1_MASTER_DS9490_BRIDGE=m +CONFIG_W1_MASTER_DS2482=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2433=m + +# +# Hardware Monitoring support +# +CONFIG_HWMON=m +CONFIG_HWMON_VID=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_DS1337=m -CONFIG_SENSORS_DS1374=m -CONFIG_SENSORS_EEPROM=m +CONFIG_SENSORS_F71805F=m CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m -CONFIG_SENSORS_F71805F=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_HDAPS=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -1554,204 +1752,105 @@ CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_MAX6875=m CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_PCA9539=m -CONFIG_SENSORS_PCF8574=m -CONFIG_SENSORS_PCF8591=m -CONFIG_SENSORS_RTC8564=m CONFIG_SENSORS_SIS5595=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47B397=m CONFIG_SENSORS_VIA686A=m CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83781D=m -CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_W83792D=m - -CONFIG_RTC_X1205_I2C=m - -CONFIG_W1=m -CONFIG_W1_DS2433_CRC=y - -CONFIG_W1_MASTER_MATROX=m -CONFIG_W1_MASTER_DS9490=m -CONFIG_W1_MASTER_DS9490_BRIDGE=m -CONFIG_W1_MASTER_DS2482=m -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2433=m - -# -# Mice -# - -# -# IPMI -# -CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_POWEROFF=m - -# -# Watchdog Cards -# -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -CONFIG_SOFT_WATCHDOG=m -# CONFIG_WDT_501 is not set -CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y -# CONFIG_ACQUIRE_WDT is not set -# CONFIG_ADVANTECH_WDT is not set -# CONFIG_EUROTECH_WDT is not set -# CONFIG_IB700_WDT is not set -CONFIG_I8XX_TCO=m -# CONFIG_MIXCOMWD is not set -# CONFIG_SCx200_WDT is not set -# CONFIG_60XX_WDT is not set -CONFIG_W83877F_WDT=m -CONFIG_W83627HF_WDT=m -CONFIG_MACHZ_WDT=m -# CONFIG_SC520_WDT is not set -CONFIG_ALIM7101_WDT=m -CONFIG_ALIM1535_WDT=m -# CONFIG_SC1200_WDT is not set -# CONFIG_WAFER_WDT is not set -# CONFIG_CPU5_WDT is not set -CONFIG_I6300ESB_WDT=m -# CONFIG_SBC8360_WDT is not set -CONFIG_W83977F_WDT=m -CONFIG_PCIPCWATCHDOG=m -CONFIG_USBPCWATCHDOG=m -# CONFIG_SBC_EPX_C3_WATCHDOG is not set - -# CONFIG_HW_RANDOM is not set -# CONFIG_NVRAM is not set -CONFIG_RTC=y -CONFIG_RTC_CLASS=m -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_INTF_SYSFS=m -CONFIG_RTC_INTF_PROC=m -CONFIG_RTC_INTF_DEV=m -CONFIG_RTC_DRV_X1205=m -CONFIG_RTC_DRV_DS1672=m -CONFIG_RTC_DRV_PCF8563=m -CONFIG_RTC_DRV_RS5C372=m -# CONFIG_RTC_DRV_M48T86 is not set -# CONFIG_RTC_DRV_EP93XX is not set -# CONFIG_RTC_DRV_SA1100 is not set -# CONFIG_RTC_DRV_TEST is not set -CONFIG_DTLK=m -CONFIG_R3964=m -# CONFIG_APPLICOM is not set -# CONFIG_SONYPI is not set - -# -# Ftape, the floppy tape device driver -# -CONFIG_AGP=y -CONFIG_AGP_ALI=y -CONFIG_AGP_ATI=y -CONFIG_AGP_AMD=y -CONFIG_AGP_AMD64=y -CONFIG_AGP_INTEL=y -CONFIG_AGP_NVIDIA=y -CONFIG_AGP_SIS=y -CONFIG_AGP_SWORKS=y -CONFIG_AGP_VIA=y -CONFIG_AGP_EFFICEON=y -CONFIG_DRM=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -CONFIG_DRM_I810=m -CONFIG_DRM_I830=m -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m -CONFIG_DRM_SAVAGE=m -CONFIG_DRM_I915=m -CONFIG_DRM_VIA=m - -# -# PCMCIA character devices -# -# CONFIG_SYNCLINK_CS is not set - -CONFIG_CARDMAN_4000=m -CONFIG_CARDMAN_4040=m - -CONFIG_MWAVE=m -# CONFIG_RAW_DRIVER is not set -CONFIG_MAX_RAW_DEVS=8192 -CONFIG_HANGCHECK_TIMER=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# # # Multimedia devices # CONFIG_VIDEO_DEV=m -# CONFIG_VIDEO_ADV_DEBUG is not set CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=m + +# +# Video Capture Adapters +# + +# +# Video Capture Adapters +# +# CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_VIVI is not set - -# -# Video For Linux -# - -# -# Video Adapters -# -CONFIG_VIDEO_AUDIO_DECODER=m CONFIG_VIDEO_BT848=m CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_SAA6588=m CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m CONFIG_VIDEO_CPIA=m CONFIG_VIDEO_CPIA_PP=m CONFIG_VIDEO_CPIA_USB=m CONFIG_VIDEO_CPIA2=m -CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_CX25840=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_DECODER=m -CONFIG_VIDEO_DPC=m -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_OVCAMCHIP=m CONFIG_VIDEO_SAA5246A=m CONFIG_VIDEO_SAA5249=m -CONFIG_VIDEO_SAA6588=m -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y +CONFIG_TUNER_3036=m CONFIG_VIDEO_STRADIS=m -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m -CONFIG_VIDEO_W9966=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_ZORAN=m CONFIG_VIDEO_ZORAN_BUZ=m CONFIG_VIDEO_ZORAN_DC10=m CONFIG_VIDEO_ZORAN_DC30=m CONFIG_VIDEO_ZORAN_LML33=m CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_TUNER_3036=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DPC=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y +CONFIG_VIDEO_OVCAMCHIP=m + +# +# Encoders and Decoders +# +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# V4L USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_USB_DSBR=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_ET61X251=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_W9968CF=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC=m # # Radio Adapters @@ -1759,9 +1858,6 @@ CONFIG_RADIO_GEMTEK_PCI=m CONFIG_RADIO_GEMTEK_PCI=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_MAESTRO=m -CONFIG_RADIO_MIROPCM20=m -CONFIG_RADIO_MIROPCM20_RDS=m - # # Digital Video Broadcasting Devices @@ -1770,25 +1866,10 @@ CONFIG_DVB_CORE=m CONFIG_DVB_CORE=m # -# Supported Frontend Modules -# -CONFIG_DVB_STV0299=m -# CONFIG_DVB_SP887X is not set -CONFIG_DVB_CX24110=m -CONFIG_DVB_MT312=m -CONFIG_DVB_VES1820=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_DVB_BT8XX=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m - -# # Supported SAA7146 based PCI Adapters # CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y -# CONFIG_DVB_AV7110_FIRMWARE is not set CONFIG_DVB_BUDGET=m CONFIG_DVB_BUDGET_CI=m CONFIG_DVB_BUDGET_AV=m @@ -1797,27 +1878,6 @@ CONFIG_DVB_BUDGET_PATCH=m # # Supported USB Adapters # -CONFIG_DVB_TTUSB_BUDGET=m - -# -# Supported FlexCopII (B2C2) Adapters -# -CONFIG_DVB_CINERGYT2=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m -CONFIG_DVB_CINERGYT2_TUNING=y -CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32 -CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 -CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 -CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y -CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100 -CONFIG_DVB_OR51132=m CONFIG_DVB_USB=m # CONFIG_DVB_USB_DEBUG is not set CONFIG_DVB_USB_A800=m @@ -1825,43 +1885,121 @@ CONFIG_DVB_USB_DIBUSB_MB=m # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set CONFIG_DVB_USB_DIBUSB_MC=m CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m CONFIG_DVB_USB_DIGITV=m CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m CONFIG_DVB_USB_NOVA_T_USB2=m CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_CINERGYT2=m +CONFIG_DVB_CINERGYT2_TUNING=y +CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32 +CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 +CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 +CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y +CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100 + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# CONFIG_DVB_PLUTO2=m + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_STV0299=m +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_MT312=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_S5H1420=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terresterial DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m CONFIG_DVB_LGDT330X=m - -CONFIG_DVB_S5H1420=m -CONFIG_DVB_SP8870=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA10021=m - CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_VIDEO_VIDEOBUF=m CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_BUF=m +CONFIG_VIDEO_BUF_DVB=m CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_USB_DABUSB=m # # Graphics support # CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=m +CONFIG_FB_CFB_COPYAREA=m +CONFIG_FB_CFB_IMAGEBLIT=m +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_FIRMWARE_EDID is not set +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y +CONFIG_FB_CIRRUS=m +# CONFIG_FB_PM2 is not set # CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set -CONFIG_FB_VGA16=m -CONFIG_FB_VESA=y -CONFIG_VIDEO_SELECT=y -# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set CONFIG_FB_RIVA=m +# CONFIG_FB_RIVA_I2C is not set # CONFIG_FB_RIVA_DEBUG is not set -# CONFIG_FB_RIVA_I2C is not set -CONFIG_FB_I810=m -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y @@ -1870,43 +2008,25 @@ CONFIG_FB_MATROX_MAVEN=m CONFIG_FB_MATROX_MAVEN=m CONFIG_FB_MATROX_MULTIHEAD=y CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y # CONFIG_FB_RADEON_DEBUG is not set -# CONFIG_FB_RADEON_OLD is not set -CONFIG_FB_RADEON_I2C=y CONFIG_FB_ATY128=m CONFIG_FB_ATY=m CONFIG_FB_ATY_CT=y +CONFIG_FB_ATY_GENERIC_LCD=y CONFIG_FB_ATY_GX=y -# CONFIG_FB_SIS is not set -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_3DFX=m -CONFIG_FB_VOODOO1=m -CONFIG_FB_TRIDENT=m -# CONFIG_FB_VIRTUAL is not set -CONFIG_FB_KYRO=m -# CONFIG_FB_PM2 is not set -# CONFIG_FB_PM2_FIFO_DISCONNECT is not set -# CONFIG_FB_ASILIANT is not set -CONFIG_FB_3DFX_ACCEL=y -CONFIG_FB_TRIDENT_ACCEL=y -CONFIG_FB_CIRRUS=m -CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_ARC is not set -CONFIG_FB_INTEL=m -# CONFIG_FB_INTEL_DEBUG is not set -CONFIG_FB_ATY_GENERIC_LCD=y CONFIG_FB_SAVAGE=m CONFIG_FB_SAVAGE_I2C=y CONFIG_FB_SAVAGE_ACCEL=y -# 2.6.12-rc1-bk2 = Nvidia fb crashes. -# CONFIG_FB_NVIDIA is not set -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_GEODE is not set -# CONFIG_FB_S1D13XXX is not set -CONFIG_FB_CYBLA=m -# CONFIG_FB_FIRMWARE_EDID is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +CONFIG_FB_KYRO=m +CONFIG_FB_3DFX=m +CONFIG_FB_3DFX_ACCEL=y +CONFIG_FB_VOODOO1=m +CONFIG_FB_TRIDENT=m +CONFIG_FB_TRIDENT_ACCEL=y +# CONFIG_FB_VIRTUAL is not set # # Console display driver support @@ -1914,12 +2034,12 @@ CONFIG_VGA_CONSOLE=y CONFIG_VGA_CONSOLE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 -# CONFIG_MDA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FONTS is not set - +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y # # Logo configuration @@ -1928,6 +2048,11 @@ CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_DEVICE=y # # Sound @@ -1938,24 +2063,31 @@ CONFIG_SOUND=m # Advanced Linux Sound Architecture # CONFIG_SND=m -CONFIG_SND_VERBOSE_PROCFS=y +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_RTCTIMER=m +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_DYNAMIC_MINORS=y +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set -CONFIG_SND_DYNAMIC_MINORS=y -# CONFIG_SND_SUPPORT_OLD_API is not set # # Generic devices # +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_AC97_BUS=m CONFIG_SND_DUMMY=m CONFIG_SND_VIRMIDI=m CONFIG_SND_MTPAV=m @@ -1963,85 +2095,77 @@ CONFIG_SND_MPU401=m CONFIG_SND_MPU401=m # -# ISA devices +# PCI devices # CONFIG_SND_AD1889=m -# CONFIG_SND_WAVEFRONT is not set - -# -# PCI devices -# +CONFIG_SND_ALS300=m CONFIG_SND_ALI5451=m -CONFIG_SND_AZT3328=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CS4281=m -CONFIG_SND_CS5535AUDIO=m -CONFIG_SND_EMU10K1=m -CONFIG_SND_EMU10K1X=m -CONFIG_SND_CA0106=m -CONFIG_SND_KORG1212=m -CONFIG_SND_NM256=m -CONFIG_SND_RME32=m -CONFIG_SND_PCXHR=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m -CONFIG_SND_HDSP=m -CONFIG_SND_TRIDENT=m -CONFIG_SND_YMFPCI=m -CONFIG_SND_ALS4000=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m -CONFIG_SND_ES1938=m -CONFIG_SND_ES1968=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_FM801=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_SONICVIBES=m -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VX222=m -CONFIG_SND_BT87X=m -# CONFIG_SND_BT87X_OVERCLOCK is not set CONFIG_SND_ATIIXP=m CONFIG_SND_ATIIXP_MODEM=m CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_MAESTRO3=m CONFIG_SND_MIXART=m -CONFIG_SND_FM801_TEA575X=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDSPM=m -CONFIG_SND_ADLIB=m -CONFIG_SND_MIRO=m -CONFIG_SND_ALS300=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m CONFIG_SND_RIPTIDE=m - -# -# ALSA USB devices +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m + +# +# USB devices # CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_USX2Y=m # # PCMCIA devices # # CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set # # Open Sound System # # CONFIG_SOUND_PRIME is not set -# CONFIG_SOUND_BT878 is not set -# CONFIG_SOUND_CMPCI is not set # # USB support # +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB=y # CONFIG_USB_DEBUG is not set @@ -2052,6 +2176,7 @@ CONFIG_USB_DEVICEFS=y # CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set # # USB Host Controller Drivers @@ -2060,61 +2185,67 @@ CONFIG_USB_EHCI_SPLIT_ISO=y CONFIG_USB_EHCI_SPLIT_ISO=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_ISP116X_HCD=m CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=m +CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m # # USB Device Class drivers # -# CONFIG_USB_AUDIO is not set -# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set - -# -# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem -# -CONFIG_USB_MIDI=m CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m -CONFIG_BLK_DEV_UB=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_DATAFAB=y CONFIG_USB_STORAGE_FREECOM=y CONFIG_USB_STORAGE_ISD200=y CONFIG_USB_STORAGE_DPCM=y +CONFIG_USB_STORAGE_USBAT=y CONFIG_USB_STORAGE_SDDR09=y CONFIG_USB_STORAGE_SDDR55=y CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_ONETOUCH=y CONFIG_USB_STORAGE_ALAUDA=y CONFIG_USB_LIBUSUAL=y # -# USB Human Interface Devices (HID) +# USB Input Devices # CONFIG_USB_HID=y CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set CONFIG_HID_FF=y CONFIG_HID_PID=y CONFIG_LOGITECH_FF=y CONFIG_THRUSTMASTER_FF=y CONFIG_USB_HIDDEV=y -CONFIG_USB_IDMOUSE=m - -# -# USB HID Boot Protocol drivers -# -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set CONFIG_USB_AIPTEK=m - CONFIG_USB_WACOM=m - +CONFIG_USB_ACECAD=m CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m +CONFIG_USB_TOUCHSCREEN=m +CONFIG_USB_TOUCHSCREEN_EGALAX=y +CONFIG_USB_TOUCHSCREEN_PANJIT=y +CONFIG_USB_TOUCHSCREEN_3M=y +CONFIG_USB_TOUCHSCREEN_ITM=y +# CONFIG_USB_YEALINK is not set CONFIG_USB_XPAD=m +CONFIG_USB_ATI_REMOTE=m +CONFIG_USB_ATI_REMOTE2=m +CONFIG_USB_KEYSPAN_REMOTE=m +CONFIG_USB_APPLETOUCH=m # # USB Imaging devices @@ -2123,50 +2254,27 @@ CONFIG_USB_MICROTEK=m CONFIG_USB_MICROTEK=m # -# USB Multimedia devices -# -CONFIG_USB_DABUSB=m -CONFIG_USB_VICAM=m -CONFIG_USB_DSBR=m -CONFIG_USB_ET61X251=m -CONFIG_USB_IBMCAM=m -CONFIG_USB_KONICAWC=m -CONFIG_USB_OV511=m -CONFIG_USB_SE401=m -CONFIG_USB_STV680=m -CONFIG_USB_SN9C102=m - -# -# USB Network adaptors +# USB Network Adapters # CONFIG_USB_CATC=m CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m -CONFIG_USB_SPEEDTOUCH=m -# Has dumb detection, which gets loaded for every hid device. -# CONFIG_USB_YEALINK is not set -CONFIG_USB_ZD1201=m CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_NET_ZAURUS=m - -# -# USB Host-to-Host Cables -# +CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y - -# -# Intelligent USB Devices/Gadgets -# CONFIG_USB_ARMLINUX=y CONFIG_USB_EPSON2888=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_MON=y # # USB port drivers @@ -2182,20 +2290,20 @@ CONFIG_USB_SERIAL_ANYDATA=m CONFIG_USB_SERIAL_ANYDATA=m CONFIG_USB_SERIAL_ARK3116=m CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_HP4X=m -CONFIG_USB_SERIAL_IPAQ=m CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_IR=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m CONFIG_USB_SERIAL_KEYSPAN_MPR=y @@ -2214,66 +2322,130 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_OPTION=y -CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_XIRCOM=m - +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# CONFIG_USB_EMI62=m -CONFIG_USB_LED=m -# CONFIG_USB_CY7C63 is not set -CONFIG_USB_G_SERIAL=m - - -# -# USB Miscellaneous drivers -# CONFIG_USB_EMI26=m CONFIG_USB_AUERSWALD=m CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m -CONFIG_USB_TEST=m -# CONFIG_USB_GADGET is not set -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -# CONFIG_USB_GADGETFS is not set -CONFIG_USB_W9968CF=m -CONFIG_USB_ZC0301=m -CONFIG_USB_PWC=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_ATI_REMOTE=m -CONFIG_USB_ATI_REMOTE2=m -CONFIG_USB_ALI_M5632=y +CONFIG_USB_LED=m +# CONFIG_USB_CY7C63 is not set # CONFIG_USB_CYTHERM is not set +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_PHIDGETSERVO=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_PHIDGETKIT=m -CONFIG_USB_MON=y CONFIG_USB_SISUSBVGA=m CONFIG_USB_SISUSBVGA_CON=y -CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_ACECAD=m +CONFIG_USB_LD=m +CONFIG_USB_TEST=m + +# +# USB DSL modem support +# CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m CONFIG_USB_XUSBATM=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_KEYSPAN_REMOTE=m -CONFIG_USB_LD=m -CONFIG_USB_APPLETOUCH=m - -CONFIG_USB_TOUCHSCREEN=m - + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=m +CONFIG_MMC_SDHCI=m + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# InfiniBand support +# +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_IPATH_CORE=m +CONFIG_INFINIBAND_IPATH=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_DEBUG=y +CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y +CONFIG_INFINIBAND_SRP=m + +# +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# + +# +# Real Time Clock +# +CONFIG_RTC_LIB=m +CONFIG_RTC_CLASS=m + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=m +CONFIG_RTC_INTF_PROC=m +CONFIG_RTC_INTF_DEV=m + +# +# RTC drivers +# +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_RS5C372=m +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# DMA Engine support +# +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y + +# +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m # # File systems @@ -2283,6 +2455,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT2_FS_XIP=y +CONFIG_FS_XIP=y CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y @@ -2297,23 +2470,32 @@ CONFIG_REISERFS_FS_POSIX_ACL=y CONFIG_REISERFS_FS_POSIX_ACL=y CONFIG_REISERFS_FS_SECURITY=y CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y +CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_SECURITY=y +CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set -CONFIG_XFS_QUOTA=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_SECURITY=y +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_NOLOCK=m +CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_OCFS2_FS=m CONFIG_MINIX_FS=m CONFIG_ROMFS_FS=m +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y CONFIG_QUOTA=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y +CONFIG_DNOTIFY=y CONFIG_AUTOFS_FS=m CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m # # CD-ROM/DVD Filesystems @@ -2323,6 +2505,7 @@ CONFIG_ZISOFS=y CONFIG_ZISOFS=y CONFIG_ZISOFS_FS=y CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems @@ -2339,43 +2522,34 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" # CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y +CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_RAMFS=y -CONFIG_DEBUG_FS=y +CONFIG_CONFIGFS_FS=m # # Miscellaneous filesystems # -# CONFIG_ADFS_FS is not seta +# CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m -# uses sleepon and needs a major update CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m # CONFIG_BEFS_DEBUG is not set CONFIG_BFS_FS=m CONFIG_EFS_FS=m -# CONFIG_JFFS_FS is not set -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_FS_WRITEBUFFER=y -CONFIG_JFFS2_SUMMARY=y -# CONFIG_JFFS2_FS_XATTR is not set CONFIG_CRAMFS=m CONFIG_SQUASHFS=m # CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m -# CONFIG_QNX4FS_RW is not set CONFIG_SYSV_FS=m CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -CONFIG_9P_FS=m -CONFIG_FUSE_FS=m # # Network File Systems @@ -2386,6 +2560,7 @@ CONFIG_NFS_V4=y CONFIG_NFS_V4=y CONFIG_NFS_DIRECTIO=y CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y @@ -2393,17 +2568,18 @@ CONFIG_LOCKD=m CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m # CONFIG_SMB_FS is not set -# CONFIG_SMB_NLS_DEFAULT is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set -# CONFIG_CIFS_EXPERIMENTAL is not set CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_EXPERIMENTAL is not set CONFIG_NCP_FS=m CONFIG_NCPFS_PACKET_SIGNING=y CONFIG_NCPFS_IOCTL_LOCKING=y @@ -2416,17 +2592,7 @@ CONFIG_CODA_FS=m CONFIG_CODA_FS=m # CONFIG_CODA_FS_OLD_API is not set # CONFIG_AFS_FS is not set -# CONFIG_RXRPC is not set - -CONFIG_OCFS2_FS=m -CONFIG_CONFIGFS_FS=m - -CONFIG_DLM=m -CONFIG_DLM_DEVICE=m -CONFIG_DLM_DEBUG=y -CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_NOLOCK=m -CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_9P_FS=m # # Partition Types @@ -2446,14 +2612,13 @@ CONFIG_SGI_PARTITION=y CONFIG_SGI_PARTITION=y # CONFIG_ULTRIX_PARTITION is not set CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y CONFIG_EFI_PARTITION=y -CONFIG_KARMA_PARTITION=y - + +# +# Native Language Support +# CONFIG_NLS=y - -# -# Native Language Support -# CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_737=m @@ -2478,6 +2643,7 @@ CONFIG_NLS_ISO8859_8=m CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=m CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m @@ -2492,64 +2658,93 @@ CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=m -CONFIG_NLS_ASCII=y - -# -# Profiling support + +# +# Distributed Lock Manager +# +CONFIG_DLM=m +CONFIG_DLM_DEVICE=m +CONFIG_DLM_DEBUG=y + +# +# Library routines +# +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_PENDING_IRQ=y + +# +# HP Simulator drivers +# +# CONFIG_HP_SIMETH is not set +# CONFIG_HP_SIMSERIAL is not set +# CONFIG_HP_SIMSCSI is not set + +# +# Instrumentation Support # CONFIG_PROFILING=y CONFIG_OPROFILE=m +CONFIG_KPROBES=y # # Kernel hacking # +# CONFIG_PRINTK_TIME is not set +CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_INFO=y -# CONFIG_FRAME_POINTER is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_RCU_TORTURE_TEST is not set - -# Turn off these debug options for production kernels. +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_SCHEDSTATS=y CONFIG_DEBUG_SLAB=y +CONFIG_DEBUG_SLAB_LEAK=y CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_VM=y - -# These debug options are deliberatly left on. -# They aren't that much of a performance impact, and the value -# from getting out-of-tree modules fixed is worth the trade-off. -CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_SPINLOCK_SLEEP=y +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_VM=y +# CONFIG_FORCED_INLINING is not set CONFIG_BOOT_DELAY=y -CONFIG_DEBUG_SLAB_LEAK=y - -CONFIG_KGDB=y -# CONFIG_KGDB_CONSOLE is not set -CONFIG_KGDBOE=m -# CONFIG_KGDB_SIMPLE_SERIAL is not set -CONFIG_KGDB_8250_CONF_STRING="" +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_IA64_GRANULE_16MB=y +# CONFIG_IA64_GRANULE_64MB is not set +# CONFIG_IA64_PRINT_HAZARDS is not set +# CONFIG_DISABLE_VHPT is not set +# CONFIG_IA64_DEBUG_CMPXCHG is not set +# CONFIG_IA64_DEBUG_IRQ is not set # # Security options # +CONFIG_KEYS=y +CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set +# CONFIG_SECURITY_SECLVL is not set CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_SELINUX_DEVELOP=y CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y -# CONFIG_SECURITY_SECLVL is not set -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y # # Cryptographic options @@ -2558,10 +2753,12 @@ CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m @@ -2569,328 +2766,18 @@ CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m # CONFIG_CRYPTO_TEST is not set -CONFIG_LIBCRC32C=m -CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=y -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_TGR192=m - -# -# Library routines -# -CONFIG_CRC16=m -CONFIG_CRC32=m -CONFIG_CRC_CCITT=m - -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m - -CONFIG_INITRAMFS_SOURCE="" -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set - -CONFIG_ATA_OVER_ETH=m -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=m -CONFIG_BACKLIGHT_DEVICE=y -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_DEVICE=y - -CONFIG_NETDUMP=m -CONFIG_DISKDUMP=m - -CONFIG_SCHEDSTATS=y - -CONFIG_TUX=m -CONFIG_TUX_EXTCGI=y -CONFIG_TUX_EXTENDED_LOG=y -# CONFIG_TUX_DEBUG is not set - -CONFIG_CPUSETS=y -CONFIG_RELAY=y -# CONFIG_SECCOMP is not set -# CONFIG_PRINTK_TIME is not set - -CONFIG_DETECT_SOFTLOCKUP=y - -CONFIG_KEXEC=y - -CONFIG_HWMON=m -# CONFIG_HWMON_DEBUG_CHIP is not set -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y - -CONFIG_CONNECTOR=m - -CONFIG_IBMASR=m - -CONFIG_PM_LEGACY=y - -# CONFIG_CRASH is not set - -## BEGIN ISA Junk. - -# CONFIG_I82365 is not set -# CONFIG_TCIC is not set -# CONFIG_PCMCIA_PROBE is not set -# CONFIG_LTPC is not set -# CONFIG_COPS is not set - -CONFIG_SCSI_AHA152X=m -CONFIG_SCSI_AHA1542=m -# CONFIG_SCSI_IN2000 is not set -# CONFIG_SCSI_DTC3280 is not set -# CONFIG_SCSI_GENERIC_NCR5380 is not set -# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set -# CONFIG_SCSI_NCR53C406A is not set -# CONFIG_SCSI_PAS16 is not set -# CONFIG_SCSI_PSI240I is not set -# CONFIG_SCSI_QLOGIC_FAS is not set -# CONFIG_SCSI_SYM53C416 is not set -# CONFIG_SCSI_T128 is not set -# CONFIG_SCSI_U14_34F is not set -# CONFIG_SCSI_ULTRASTOR is not set -# CONFIG_CD_NO_IDESCSI is not set - -# CONFIG_EL1 is not set -# CONFIG_EL2 is not set -# CONFIG_ELPLUS is not set -# CONFIG_EL16 is not set -CONFIG_EL3=m -# CONFIG_3C515 is not set -# CONFIG_LANCE is not set -# CONFIG_NET_VENDOR_SMC is not set -# CONFIG_WD80x3 is not set -# CONFIG_ULTRA is not set -# CONFIG_SMC9194 is not set -# CONFIG_NET_VENDOR_RACAL is not set -# CONFIG_NI52 is not set -# CONFIG_NI65 is not set -# CONFIG_AT1700 is not set -# CONFIG_DEPCA is not set -CONFIG_NET_ISA=y -CONFIG_NE2000=m -# CONFIG_E2100 is not set -CONFIG_EWRK3=m -# CONFIG_EEXPRESS is not set -# CONFIG_EEXPRESS_PRO is not set -# CONFIG_HPLAN_PLUS is not set -# CONFIG_HPLAN is not set -# CONFIG_LP486E is not set -# CONFIG_ETH16I is not set -# CONFIG_ZNET is not set -# CONFIG_SEEQ8005 is not set -# CONFIG_AC3200 is not set -# CONFIG_APRICOT is not set -# CONFIG_CS89x0 is not set -# CONFIG_IBMTR is not set -# CONFIG_SKISA is not set -# CONFIG_PROTEON is not set -# CONFIG_SMCTR is not set -# CONFIG_WAVELAN is not set -# CONFIG_HISAX_16_0 is not set -# CONFIG_HISAX_AVM_A1 is not set -# CONFIG_HISAX_IX1MICROR2 is not set -# CONFIG_HISAX_ASUSCOM is not set -# CONFIG_HISAX_TELEINT is not set -# CONFIG_HISAX_HFCS is not set -# CONFIG_HISAX_SPORTSTER is not set -# CONFIG_HISAX_MIC is not set -# CONFIG_HISAX_ISURF is not set -# CONFIG_HISAX_HSTSAPHIR is not set -# CONFIG_ISDN_DRV_ICN is not set -# CONFIG_ISDN_DRV_PCBIT is not set -# CONFIG_ISDN_DRV_SC is not set -# CONFIG_ISDN_DRV_ACT2000 is not set -# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set -# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set - -# CONFIG_MOUSE_INPORT is not set -# CONFIG_MOUSE_ATIXL is not set -# CONFIG_MOUSE_LOGIBM is not set -# CONFIG_MOUSE_PC110PAD is not set - -# CONFIG_SERIAL_8250_FOURPORT is not set -# CONFIG_SERIAL_8250_ACCENT is not set -# CONFIG_SERIAL_8250_BOCA is not set -# CONFIG_SERIAL_8250_HUB6 is not set - -# CONFIG_PCWATCHDOG is not set -# CONFIG_WDT is not set - -# CONFIG_VIDEO_PMS is not set -# CONFIG_RADIO_CADET is not set -# CONFIG_RADIO_RTRACK is not set -# CONFIG_RADIO_RTRACK2 is not set -# CONFIG_RADIO_AZTECH is not set -# CONFIG_RADIO_GEMTEK is not set -# CONFIG_RADIO_SF16FMI is not set -# CONFIG_RADIO_SF16FMR2 is not set -# CONFIG_RADIO_TERRATEC is not set -# CONFIG_RADIO_TRUST is not set -# CONFIG_RADIO_TYPHOON is not set -# CONFIG_RADIO_ZOLTRIX is not set - -# CONFIG_SND_OPL4_LIB is not set -# CONFIG_SND_AD1848_LIB is not set -# CONFIG_SND_AD1816A is not set -# CONFIG_SND_AD1848 is not set -# CONFIG_SND_CS4231 is not set -# CONFIG_SND_CS4232 is not set -CONFIG_SND_CS4231_LIB=m -CONFIG_SND_CS4236=m -# CONFIG_SND_ES968 is not set -# CONFIG_SND_ES1688 is not set -# CONFIG_SND_ES18XX is not set -# CONFIG_SND_GUS_SYNTH is not set -# CONFIG_SND_GUSCLASSIC is not set -# CONFIG_SND_GUSEXTREME is not set -# CONFIG_SND_GUSMAX is not set -# CONFIG_SND_INTERWAVE is not set -# CONFIG_SND_INTERWAVE_STB is not set -# CONFIG_SND_OPTI92X_AD1848 is not set -# CONFIG_SND_OPTI92X_CS4231 is not set -# CONFIG_SND_OPTI93X is not set -# CONFIG_SND_SB8 is not set -CONFIG_SND_SB16=m -CONFIG_SND_SBAWE=m -# CONFIG_SND_SB16_CSP is not set -# CONFIG_SND_ALS100 is not set -# CONFIG_SND_AZT2320 is not set -# CONFIG_SND_CMI8330 is not set -# CONFIG_SND_DT019X is not set -CONFIG_SND_OPL3SA2=m -# CONFIG_SND_SGALAXY is not set -# CONFIG_SND_SSCAPE is not set -# CONFIG_SND_PDAUDIOCF is not set - -## END of ISA options. - -# FIXME: This needs to be made to depend on PPC -# CONFIG_USB_HIDINPUT_POWERBOOK is not set - -CONFIG_UNWIND_INFO=y -# CONFIG_FORCED_INLINING is not set - -CONFIG_MIGRATION=y -# CONFIG_NEW_LEDS is not set - -CONFIG_DMA_ENGINE=y -CONFIG_NET_DMA=y -CONFIG_INTEL_IOATDMA=m - -CONFIG_IA64=y -CONFIG_64BIT=y -# CONFIG_XEN is not set -# CONFIG_ARCH_XEN is not set -# CONFIG_XEN_PRIVILEGED_GUEST is not set -# CONFIG_XEN_VT is not set -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_TIME_INTERPOLATION=y -CONFIG_EFI=y -# CONFIG_ITANIUM is not set -CONFIG_MCKINLEY=y -CONFIG_IA64_GENERIC=y -# CONFIG_IA64_DIG is not set -# CONFIG_IA64_HP_ZX1 is not set -# CONFIG_IA64_SGI_SN2 is not set -# CONFIG_IA64_HP_SIM is not set -# CONFIG_IA64_PAGE_SIZE_4KB is not set -# CONFIG_IA64_PAGE_SIZE_8KB is not set -CONFIG_IA64_PAGE_SIZE_16KB=y -# CONFIG_IA64_PAGE_SIZE_64KB is not set -CONFIG_IA64_L1_CACHE_SHIFT=7 -CONFIG_VIRTUAL_MEM_MAP=y -CONFIG_NUMA=y -CONFIG_DISCONTIGMEM=y -CONFIG_IA64_MCA_RECOVERY=m -CONFIG_IA64_CYCLONE=y -# CONFIG_MMTIMER is not set -CONFIG_IOSAPIC=y -CONFIG_FORCE_MAX_ZONEORDER=18 -CONFIG_NR_CPUS=1024 -# CONFIG_IA32_SUPPORT is not set -# CONFIG_COMPAT is not set -CONFIG_PERFMON=y -CONFIG_IA64_PALINFO=y -CONFIG_EFI_VARS=y -CONFIG_EFI_PCDP=y -CONFIG_IDE_MAX_HWIFS=4 -CONFIG_BLK_DEV_SGIIOC4=m -# CONFIG_GEN_RTC is not set -CONFIG_EFI_RTC=y -CONFIG_AGP_I460=y -CONFIG_AGP_HP_ZX1=y -CONFIG_AGP_SGI_TIOCA=y -# CONFIG_HP_SIMETH is not set -# CONFIG_HP_SIMSERIAL is not set -# CONFIG_HP_SIMSCSI is not set -# CONFIG_IA64_PRINT_HAZARDS is not set -# CONFIG_DISABLE_VHPT is not set -# CONFIG_IA64_DEBUG_CMPXCHG is not set -# CONFIG_IA64_DEBUG_IRQ is not set -CONFIG_SGI_SNSC=y -CONFIG_IA64_SGI_SN_XP=y -CONFIG_ACPI=y -CONFIG_ACPI_SLEEP=y -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -CONFIG_ACPI_FAN=y -CONFIG_ACPI_PROCESSOR=y -CONFIG_ACPI_THERMAL=y -# CONFIG_ACPI_ASUS is not set -# CONFIG_ACPI_TOSHIBA is not set -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_EC=y -CONFIG_ACPI_POWER=y -CONFIG_ACPI_SYSTEM=y -CONFIG_ACPI_NUMA=y -CONFIG_ACPI_BLACKLIST_YEAR=0 -CONFIG_SERIAL_SGI_L1_CONSOLE=y -CONFIG_PM=y -# CONFIG_PM_DEBUG is not set -CONFIG_HOTPLUG_PCI=y -# CONFIG_HPET is not set -# CONFIG_HOTPLUG_PCI_FAKE is not set -CONFIG_HOTPLUG_PCI_ACPI=m -CONFIG_HOTPLUG_PCI_ACPI_IBM=m -# CONFIG_HOTPLUG_PCI_CPCI is not set -CONFIG_HOTPLUG_PCI_SHPC=m -CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y -# CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set -CONFIG_HOTPLUG_PCI_SGI=m -CONFIG_ACPI_VIDEO=m -# CONFIG_PNPACPI is not set -CONFIG_SCHED_SMT=y -CONFIG_SGI_TIOCX=y -CONFIG_SGI_MBCS=m -CONFIG_ARCH_DISCONTIGMEM_ENABLE=y -CONFIG_KPROBES=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_DEBUG=y -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_CPU_FREQ_STAT=m -CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_IA64_ACPI_CPUFREQ=m -CONFIG_SERIAL_SGI_IOC3=m -CONFIG_SGI_IOC3=m -# CONFIG_PERMIT_BSP_REMOVE is not set -# CONFIG_FORCE_CPEI_RETARGET is not set -CONFIG_NODES_SHIFT=8 + +# +# Hardware crypto devices +# diff -r 906a91890923 -r 2fe66b75b217 SPECS/kernel-2.6.spec --- a/SPECS/kernel-2.6.spec Fri Jun 23 09:28:14 2006 -0400 +++ b/SPECS/kernel-2.6.spec Fri Jun 23 09:50:04 2006 -0400 @@ -32,11 +32,14 @@ Summary: The Linux kernel (the core of t %if %{rhelbuild} %define tag EL %endif %define release %(R="$Revision: 1.2302 $"; RR="${R##: }"; echo ${RR%%?})_%tag %define signmodules 0 %define xen_version 20060610 %define make_target bzImage %define kernel_image x86 +%define xen_flags verbose=y debug=y crash_debug=y +%define xen_target vmlinuz +%define xen_image vmlinuz %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} @@ -55,10 +58,14 @@ Summary: The Linux kernel (the core of t %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config %endif -# Xen and kdump only build on i686 and x86_64 ... +# kdump only builds on i686 and x86_64 %ifnarch i686 x86_64 +%define buildkdump 0 +%endif + +# Xen only builds on i686, x86_64 and ia64 ... +%ifnarch i686 x86_64 ia64 %define buildxen 0 -%define buildkdump 0 %endif %ifarch ppc64 @@ -140,11 +147,15 @@ Summary: The Linux kernel (the core of t %endif %ifarch ia64 -%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config +%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64*.config %define image_install_path boot/efi/EFI/redhat %define signmodules 1 %define make_target compressed %define kernel_image vmlinux.gz +# ia64 doesn't building with debug=y at the moment +%define xen_flags verbose=y crash_debug=y +%define xen_target compressed +%define xen_image vmlinux.gz %endif # @@ -246,6 +257,8 @@ Source36: kernel-%{kversion}-i686-xen-PA #Source67: kernel-%{kversion}-sparc64.config #Source68: kernel-%{kversion}-sparc64-smp.config +Source133: kernel-%{kversion}-ia64-xen.config + # # Patches 0 through 100 are meant for core subsystem upgrades # @@ -293,6 +306,7 @@ Patch703: linux-2.6-xen-move-vdso-fixmap Patch703: linux-2.6-xen-move-vdso-fixmap.patch Patch704: linux-2.6-xen-vsyscall_base.patch Patch706: linux-2.6-xen_remap_vma_flags.patch +Patch707: linux-2.6-xen-ia64-fixes.patch # # Patches 800 through 899 are reserved for bugfixes to the core system @@ -449,6 +463,7 @@ Patch10001: linux-2.6-random-patches.pat # Xen hypervisor patches Patch20000: xen-sched-sedf.patch +Patch20001: xen-ia64-fixes.patch # END OF PATCH DEFINITIONS @@ -727,6 +742,7 @@ cp -rl xen-%{xen_version} xen # Any necessary hypervisor patches go here %patch20000 -p0 +%patch20001 -p0 %endif cd linux-%{kversion}.%{_target_cpu} @@ -804,11 +820,10 @@ cd linux-%{kversion}.%{_target_cpu} # %patch700 -p1 -b .p.xen # -# ... and back out all the ia64-specific sections, as they currently prevent +# ... and back out all the tpm-specific sections, as they currently prevent # non-xen builds from working. -# Now also with tpm -# -for f in `find drivers/char/tpm arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \ +# +for f in `find drivers/char/tpm -type f -name "*.p.xen"` ; do \ g=`dirname $f`/`basename $f .p.xen`; \ mv "$f" "$g"; \ if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \ @@ -816,6 +831,11 @@ done # Delete the rest of the backup files, they just confuse the build later find -name "*.p.xen" | xargs rm -f +# These are fixed in xen-ia64-unstable, can go away when that +# propagates to Juan's patch +ln -sf ../../../../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/ +ln -sf ../../../arch/ia64/xen/drivers/xenia64_init.c drivers/xen/core/ + # # Xen includes a patch which moves the vsyscall fixmap into a user-space VA, # freeing user-space from reliance on an absolute fixmap area and so allowing @@ -831,6 +851,7 @@ find -name "*.p.xen" | xargs rm -f %patch702 -p1 %patch704 -p1 %patch706 -p1 +%patch707 -p1 %endif @@ -1298,15 +1319,15 @@ mkdir -p $RPM_BUILD_ROOT/boot %if %{includexen} %if %{buildxen} cd xen - mkdir -p $RPM_BUILD_ROOT/%{image_install_path} + mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot %if %{buildxenPAE} - make debug=y verbose=y crash_debug=y pae=y - install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}-PAE + make %{?_smp_mflags} %{xen_flags} pae=y + install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}-PAE install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE make clean %endif - make debug=y verbose=y crash_debug=y - install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL} + make %{?_smp_mflags} %{xen_flags} + install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL} install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL} cd .. %endif @@ -1328,11 +1349,11 @@ BuildKernel %make_target %kernel_image s %if %{includexen} %if %{buildxenPAE} -BuildKernel vmlinuz vmlinuz xen-PAE +BuildKernel %xen_target %xen_image xen-PAE %endif %if %{buildxen} -BuildKernel vmlinuz vmlinuz xen +BuildKernel %xen_target %xen_image xen %endif %endif @@ -1447,7 +1468,7 @@ fi %post xen [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen if [ -e /proc/xen/xsd_kva -o ! -d /proc/xen ]; then - /sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen + /sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL} %{KVERREL}xen else /sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen fi @@ -1464,7 +1485,7 @@ fi %post xen-PAE [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen-PAE if [ -e /proc/xen/xsd_kva ]; then - /sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen-PAE + /sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}-PAE %{KVERREL}xen-PAE else /sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install %{KVERREL}xen-PAE fi @@ -1599,7 +1620,7 @@ fi /boot/symvers-%{KVERREL}xen.gz /boot/symsets-%{KVERREL}xen.tar.gz /boot/config-%{KVERREL}xen -/boot/xen.gz-%{KVERREL} +/%{image_install_path}/xen.gz-%{KVERREL} /boot/xen-syms-%{KVERREL} %dir /lib/modules/%{KVERREL}xen /lib/modules/%{KVERREL}xen/kernel @@ -1624,7 +1645,7 @@ fi /boot/symvers-%{KVERREL}xen-PAE.gz /boot/symsets-%{KVERREL}xen-PAE.tar.gz /boot/config-%{KVERREL}xen-PAE -/boot/xen.gz-%{KVERREL}-PAE +/%{image_install_path}/xen.gz-%{KVERREL}-PAE /boot/xen-syms-%{KVERREL}-PAE %dir /lib/modules/%{KVERREL}xen-PAE /lib/modules/%{KVERREL}xen-PAE/kernel @@ -2104,3 +2125,4 @@ fi - FC5 final kernel - 2.6.16-rc6-git3 + diff -r 906a91890923 -r 2fe66b75b217 SOURCES/kernel-2.6.17-ia64-xen.config --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/SOURCES/kernel-2.6.17-ia64-xen.config Fri Jun 23 09:50:04 2006 -0400 @@ -0,0 +1,2770 @@ +# ia64 +# +# Automatically generated make config: don't edit +# + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_SYSCTL=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +# CONFIG_IKCONFIG is not set +CONFIG_CPUSETS=y +CONFIG_RELAY=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_MODULE_SIG=y +# CONFIG_MODULE_SIG_FORCE is not set +CONFIG_KMOD=y +CONFIG_STOP_MACHINE=y + +# +# Block layer +# +CONFIG_BLK_DEV_IO_TRACE=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# Processor type and features +# +CONFIG_IA64=y +CONFIG_64BIT=y +CONFIG_MMU=y +CONFIG_SWIOTLB=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_TIME_INTERPOLATION=y +CONFIG_DMI=y +CONFIG_EFI=y +CONFIG_GENERIC_IOMAP=y +CONFIG_XEN=y +CONFIG_ARCH_XEN=y +CONFIG_XEN_IA64_DOM0_VP=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y +CONFIG_DMA_IS_DMA32=y +# CONFIG_IA64_GENERIC is not set +CONFIG_IA64_DIG=y +# CONFIG_IA64_HP_ZX1 is not set +# CONFIG_IA64_HP_ZX1_SWIOTLB is not set +# CONFIG_IA64_SGI_SN2 is not set +# CONFIG_IA64_HP_SIM is not set +# CONFIG_ITANIUM is not set +CONFIG_MCKINLEY=y +# CONFIG_IA64_PAGE_SIZE_4KB is not set +# CONFIG_IA64_PAGE_SIZE_8KB is not set +CONFIG_IA64_PAGE_SIZE_16KB=y +# CONFIG_IA64_PAGE_SIZE_64KB is not set +CONFIG_PGTABLE_3=y +# CONFIG_PGTABLE_4 is not set +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_IA64_L1_CACHE_SHIFT=7 +CONFIG_IA64_CYCLONE=y +CONFIG_IOSAPIC=y +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_SMP=y +CONFIG_NR_CPUS=1024 +CONFIG_HOTPLUG_CPU=y +CONFIG_SCHED_SMT=y +# CONFIG_PERMIT_BSP_REMOVE is not set +# CONFIG_PREEMPT is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_DISCONTIGMEM_ENABLE=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_VIRTUAL_MEM_MAP=y +CONFIG_HOLES_IN_ZONE=y +# CONFIG_IA32_SUPPORT is not set +CONFIG_IA64_MCA_RECOVERY=m +CONFIG_PERFMON=y +CONFIG_IA64_PALINFO=y + +# +# Firmware Drivers +# +CONFIG_EFI_VARS=y +CONFIG_EFI_PCDP=y +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_MISC=y + +# +# Power management and ACPI +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set + +# +# ACPI (Advanced Configuration and Power Interface) Support +# +CONFIG_ACPI=y +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_FAN=y +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_EC=y +CONFIG_ACPI_POWER=y +CONFIG_ACPI_SYSTEM=y +CONFIG_ACPI_CONTAINER=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# CPUFreq processor drivers +# +CONFIG_IA64_ACPI_CPUFREQ=m + +# +# Bus options (PCI, PCMCIA) +# +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +# CONFIG_PCI_DEBUG is not set + +# +# PCI Hotplug Support +# +CONFIG_HOTPLUG_PCI=y +# CONFIG_HOTPLUG_PCI_FAKE is not set +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +# CONFIG_HOTPLUG_PCI_CPCI is not set +CONFIG_HOTPLUG_PCI_SHPC=m +CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=y +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_PCCARD_NONSTATIC=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y +CONFIG_NET_KEY=m +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_FWMARK=y +CONFIG_IP_ROUTE_MULTIPATH=y +# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set +CONFIG_IP_ROUTE_VERBOSE=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y + +# +# IP: Virtual Server Configuration +# +CONFIG_IP_VS=m +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_IPV6_TUNNEL=m +CONFIG_NETWORK_SECMARK=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_CT_ACCT=y +CONFIG_IP_NF_CONNTRACK_MARK=y +CONFIG_IP_NF_CONNTRACK_SECMARK=y +CONFIG_IP_NF_CONNTRACK_EVENTS=y +CONFIG_IP_NF_CONNTRACK_NETLINK=m +CONFIG_IP_NF_CT_PROTO_SCTP=m +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +CONFIG_IP_NF_NETBIOS_NS=m +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_AMANDA=m +CONFIG_IP_NF_PPTP=m +CONFIG_IP_NF_H323=m +CONFIG_IP_NF_SIP=m +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_DSCP=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_HASHLIMIT=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +CONFIG_IP_NF_NAT_SNMP_BASIC=m +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_NAT_TFTP=m +CONFIG_IP_NF_NAT_AMANDA=m +CONFIG_IP_NF_NAT_PPTP=m +CONFIG_IP_NF_NAT_H323=m +CONFIG_IP_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_DSCP=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_OWNER=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + +# +# DECnet: Netfilter Configuration +# +# CONFIG_DECNET_NF_GRABULATOR is not set + +# +# Bridge: Netfilter Configuration +# +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m + +# +# DCCP Configuration (EXPERIMENTAL) +# +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m +CONFIG_IP_DCCP_ACKVEC=y + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +CONFIG_IP_DCCP_CCID2=m +CONFIG_IP_DCCP_CCID3=m +CONFIG_IP_DCCP_TFRC_LIB=m + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y + +# +# TIPC Configuration (EXPERIMENTAL) +# +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +# CONFIG_ATM_MPOA is not set +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +CONFIG_DECNET=m +CONFIG_DECNET_ROUTER=y +CONFIG_DECNET_ROUTE_FWMARK=y +CONFIG_LLC=y +# CONFIG_LLC2 is not set +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=y +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +CONFIG_NET_DIVERT=y +# CONFIG_ECONET is not set +CONFIG_WAN_ROUTER=m + +# +# QoS and/or fair queueing +# +CONFIG_NET_SCHED=y +# CONFIG_NET_SCH_CLK_JIFFIES is not set +CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y +# CONFIG_NET_SCH_CLK_CPU is not set + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_CLS_POLICE=y +CONFIG_NET_CLS_IND=y +CONFIG_NET_ESTIMATOR=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +# CONFIG_NET_TCPPROBE is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m + +# +# Old SIR device drivers +# + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_IEEE80211=m +CONFIG_IEEE80211_DEBUG=y +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +CONFIG_IEEE80211_SOFTMAC_DEBUG=y +CONFIG_TUX=m + +# +# TUX options +# +CONFIG_TUX_EXTCGI=y +CONFIG_TUX_EXTENDED_LOG=y +# CONFIG_TUX_DEBUG is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +CONFIG_CONNECTOR=m + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Parallel port support +# +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +CONFIG_PARPORT_NOT_PC=y +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_1284=y + +# +# Plug and Play support +# +CONFIG_PNP=y +# CONFIG_PNP_DEBUG is not set + +# +# Protocols +# +# CONFIG_PNPACPI is not set + +# +# Block devices +# +CONFIG_PARIDE=m +CONFIG_PARIDE_PARPORT=m + +# +# Parallel IDE high-level drivers +# +CONFIG_PARIDE_PD=m +CONFIG_PARIDE_PCD=m +CONFIG_PARIDE_PF=m +CONFIG_PARIDE_PT=m +CONFIG_PARIDE_PG=m + +# +# Parallel IDE protocol modules +# +CONFIG_PARIDE_ATEN=m +CONFIG_PARIDE_BPCK=m +CONFIG_PARIDE_COMM=m +CONFIG_PARIDE_DSTR=m +CONFIG_PARIDE_FIT2=m +CONFIG_PARIDE_FIT3=m +CONFIG_PARIDE_EPAT=m +CONFIG_PARIDE_EPATC8=y +CONFIG_PARIDE_EPIA=m +CONFIG_PARIDE_FRIQ=m +CONFIG_PARIDE_FRPW=m +CONFIG_PARIDE_KBIC=m +CONFIG_PARIDE_KTTI=m +CONFIG_PARIDE_ON20=m +CONFIG_PARIDE_ON26=m +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +CONFIG_CISS_SCSI_TAPE=y +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SX8=m +CONFIG_BLK_DEV_UB=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_INITRD=y +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=y +CONFIG_IDE_MAX_HWIFS=4 +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +CONFIG_IDEDISK_MULTI_MODE=y +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_IDECD=m +# CONFIG_BLK_DEV_IDETAPE is not set +CONFIG_BLK_DEV_IDEFLOPPY=y +CONFIG_BLK_DEV_IDESCSI=m +CONFIG_IDE_TASK_IOCTL=y + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +CONFIG_BLK_DEV_IDEPNP=y +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_SHARE_IRQ=y +# CONFIG_BLK_DEV_OFFBOARD is not set +CONFIG_BLK_DEV_GENERIC=y +# CONFIG_BLK_DEV_OPTI621 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +CONFIG_IDEDMA_PCI_AUTO=y +# CONFIG_IDEDMA_ONLYDISK is not set +CONFIG_BLK_DEV_AEC62XX=y +CONFIG_BLK_DEV_ALI15X3=y +# CONFIG_WDC_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +CONFIG_BLK_DEV_CMD64X=y +CONFIG_BLK_DEV_TRIFLEX=y +CONFIG_BLK_DEV_CY82C693=y +CONFIG_BLK_DEV_CS5520=y +CONFIG_BLK_DEV_CS5530=y +CONFIG_BLK_DEV_HPT34X=y +# CONFIG_HPT34X_AUTODMA is not set +CONFIG_BLK_DEV_HPT366=y +# CONFIG_BLK_DEV_SC1200 is not set +CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_IT821X=y +# CONFIG_BLK_DEV_NS87415 is not set +CONFIG_BLK_DEV_PDC202XX_OLD=y +# CONFIG_PDC202XX_BURST is not set +CONFIG_BLK_DEV_PDC202XX_NEW=y +CONFIG_BLK_DEV_SVWKS=y +CONFIG_BLK_DEV_SIIMAGE=y +CONFIG_BLK_DEV_SLC90E66=y +# CONFIG_BLK_DEV_TRM290 is not set +CONFIG_BLK_DEV_VIA82CXXX=y +# CONFIG_IDE_ARM is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set +CONFIG_IDEDMA_AUTO=y +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y + +# +# SCSI Transport Attributes +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m + +# +# SCSI low-level drivers +# +CONFIG_ISCSI_TCP=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set +CONFIG_SCSI_AIC7XXX_OLD=m +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=4 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_ENABLE_RD_STRM is not set +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_SATA=m +CONFIG_SCSI_SATA_AHCI=m +CONFIG_SCSI_SATA_SVW=m +CONFIG_SCSI_ATA_PIIX=m +CONFIG_SCSI_SATA_MV=m +CONFIG_SCSI_SATA_NV=m +CONFIG_SCSI_PDC_ADMA=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_SATA_QSTOR=m +CONFIG_SCSI_SATA_PROMISE=m +CONFIG_SCSI_SATA_SX4=m +CONFIG_SCSI_SATA_SIL=m +CONFIG_SCSI_SATA_SIL24=m +CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m +CONFIG_SCSI_SATA_VIA=m +CONFIG_SCSI_SATA_VITESSE=m +CONFIG_SCSI_SATA_INTEL_COMBINED=y +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +# CONFIG_SCSI_IPR is not set +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_LPFC=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +# CONFIG_PCMCIA_FDOMAIN is not set +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID5=m +CONFIG_MD_RAID5_RESHAPE=y +CONFIG_MD_RAID6=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m + +# +# Fusion MPT device support +# +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=40 +CONFIG_FUSION_CTL=m +CONFIG_FUSION_LAN=m + +# +# IEEE 1394 (FireWire) support +# +CONFIG_IEEE1394=m + +# +# Subsystem Options +# +# CONFIG_IEEE1394_VERBOSEDEBUG is not set +CONFIG_IEEE1394_OUI_DB=y +CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y +CONFIG_IEEE1394_CONFIG_ROM_IP1394=y +# CONFIG_IEEE1394_EXPORT_FULL_API is not set + +# +# Device Drivers +# +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_OHCI1394=m + +# +# Protocol Drivers +# +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_SBP2=m +CONFIG_IEEE1394_ETH1394=m +CONFIG_IEEE1394_DV1394=m +CONFIG_IEEE1394_RAWIO=m + +# +# I2O device support +# +# CONFIG_I2O is not set + +# +# Network device support +# +CONFIG_NETDEVICES=y +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_NET_SB1000=m + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set + +# +# PHY device support +# +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_SMSC_PHY=m + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_VORTEX=m +CONFIG_TYPHOON=m + +# +# Tulip family network device support +# +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +CONFIG_TULIP_MMIO=y +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +# CONFIG_HP100 is not set +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +CONFIG_AMD8111_ETH=m +CONFIG_AMD8111E_NAPI=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_ADAPTEC_STARFIRE_NAPI=y +CONFIG_B44=m +CONFIG_FORCEDETH=m +CONFIG_DGRS=m +# CONFIG_EEPRO100 is not set +CONFIG_E100=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE_MMIO=y +CONFIG_NET_POCKET=y +CONFIG_DE600=m +CONFIG_DE620=m + +# +# Ethernet (1000 Mbit) +# +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +CONFIG_E1000_NAPI=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +CONFIG_R8169_NAPI=y +CONFIG_R8169_VLAN=y +CONFIG_SIS190=m +CONFIG_SKGE=m +CONFIG_SKY2=m +# CONFIG_SK98LIN is not set +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m + +# +# Ethernet (10000 Mbit) +# +CONFIG_CHELSIO_T1=m +CONFIG_IXGB=m +CONFIG_IXGB_NAPI=y +CONFIG_S2IO=m +CONFIG_S2IO_NAPI=y +CONFIG_MYRI10GE=m + +# +# Token Ring devices +# +CONFIG_TR=y +CONFIG_IBMOL=m +CONFIG_3C359=m +# CONFIG_TMS380TR is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +CONFIG_PCMCIA_WAVELAN=m +CONFIG_PCMCIA_NETWAVE=m + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set +CONFIG_HERMES=m +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_PCMCIA_WL3501=m + +# +# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support +# +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +# CONFIG_BCM43XX is not set +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# ATM drivers +# +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +# CONFIG_ATM_ZATM is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_FORE200E_MAYBE=m +# CONFIG_ATM_FORE200E_PCA is not set +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_FDDI=y +# CONFIG_DEFXX is not set +CONFIG_SKFP=m +# CONFIG_HIPPI is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +# CONFIG_PPP_BSDCOMP is not set +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOATM=m +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set +CONFIG_NET_FC=y +# CONFIG_SHAPER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_RX is not set +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y + +# +# ISDN subsystem +# +CONFIG_ISDN=m + +# +# Old ISDN4Linux +# +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +# CONFIG_ISDN_PPP_BSDCOMP is not set +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +CONFIG_HISAX_NO_SENDCOMPLETE=y +CONFIG_HISAX_NO_LLC=y +CONFIG_HISAX_NO_KEYPAD=y +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_PCI=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_ENTERNOW_PCI=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +# CONFIG_HISAX_HFCUSB is not set +CONFIG_HISAX_HFC4S8S=m +CONFIG_HISAX_FRITZ_PCIPNP=m +CONFIG_HISAX_HDLC=y + +# +# Active cards +# + +# +# Siemens Gigaset +# +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +# CONFIG_GIGASET_DEBUG is not set +# CONFIG_GIGASET_UNDOCREQ is not set + +# +# CAPI subsystem +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m +CONFIG_ISDN_CAPI_CAPIDRV=m + +# +# CAPI hardware drivers +# + +# +# Active AVM cards +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m + +# +# Active Eicon DIVA Server cards +# +# CONFIG_CAPI_EICON is not set + +# +# Telephony Support +# +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_VSXXXAA=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_PARKBD is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_COMPUTONE is not set +# CONFIG_ROCKETPORT is not set +# CONFIG_CYCLADES is not set +# CONFIG_DIGIEPCA is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +# CONFIG_ISI is not set +# CONFIG_SYNCLINKMP is not set +# CONFIG_SYNCLINK_GT is not set +CONFIG_N_HDLC=m +# CONFIG_SPECIALIX is not set +# CONFIG_SX is not set +# CONFIG_RIO is not set +# CONFIG_STALDRV is not set + +# +# Serial drivers +# + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_JSM is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set +# CONFIG_CRASH is not set +CONFIG_PRINTER=m +CONFIG_LP_CONSOLE=y +CONFIG_PPDEV=m +CONFIG_TIPAR=m + +# +# IPMI +# +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_I8XX_TCO=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m +CONFIG_WDT_501_PCI=y + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +# CONFIG_HW_RANDOM is not set +CONFIG_EFI_RTC=y +CONFIG_DTLK=m +CONFIG_R3964=m +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +CONFIG_AGP=y +CONFIG_AGP_SIS=y +CONFIG_AGP_VIA=y +CONFIG_AGP_I460=y +CONFIG_DRM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +# CONFIG_RAW_DRIVER is not set +# CONFIG_HPET is not set +CONFIG_HANGCHECK_TIMER=m + +# +# TPM devices +# +CONFIG_TCG_TPM=m +CONFIG_TCG_ATMEL=m +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +CONFIG_I2C=m +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCF=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_I810 is not set +# CONFIG_I2C_PIIX4 is not set +CONFIG_I2C_ISA=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_PROSAVAGE=m +CONFIG_I2C_SAVAGE4=m +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +CONFIG_I2C_STUB=m +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set +CONFIG_I2C_VOODOO3=m +CONFIG_I2C_PCA_ISA=m + +# +# Miscellaneous I2C Chip support +# +CONFIG_SENSORS_DS1337=m +CONFIG_SENSORS_DS1374=m +CONFIG_SENSORS_EEPROM=m +CONFIG_SENSORS_PCF8574=m +CONFIG_SENSORS_PCA9539=m +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_MAX6875=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +CONFIG_W1=m + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS9490=m +CONFIG_W1_MASTER_DS9490_BRIDGE=m +CONFIG_W1_MASTER_DS2482=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2433=m + +# +# Hardware Monitoring support +# +CONFIG_HWMON=m +CONFIG_HWMON_VID=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_FSCHER=m +CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# Multimedia devices +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=m + +# +# Video Capture Adapters +# + +# +# Video Capture Adapters +# +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_VIVI is not set +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_SAA6588=m +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_PP=m +CONFIG_VIDEO_CPIA_USB=m +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_SAA5246A=m +CONFIG_VIDEO_SAA5249=m +CONFIG_TUNER_3036=m +CONFIG_VIDEO_STRADIS=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DPC=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y +CONFIG_VIDEO_OVCAMCHIP=m + +# +# Encoders and Decoders +# +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# V4L USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_USB_DSBR=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_ET61X251=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_W9968CF=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC=m + +# +# Radio Adapters +# +CONFIG_RADIO_GEMTEK_PCI=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MAESTRO=m + +# +# Digital Video Broadcasting Devices +# +CONFIG_DVB=y +CONFIG_DVB_CORE=m + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_CINERGYT2=m +CONFIG_DVB_CINERGYT2_TUNING=y +CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32 +CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 +CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 +CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y +CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100 + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_STV0299=m +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_MT312=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_S5H1420=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terresterial DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_VIDEO_VIDEOBUF=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_BUF=m +CONFIG_VIDEO_BUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_USB_DABUSB=m + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=m +CONFIG_FB_CFB_COPYAREA=m +CONFIG_FB_CFB_IMAGEBLIT=m +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_FIRMWARE_EDID is not set +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y +CONFIG_FB_CIRRUS=m +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +CONFIG_FB_RIVA=m +# CONFIG_FB_RIVA_I2C is not set +# CONFIG_FB_RIVA_DEBUG is not set +CONFIG_FB_MATROX=m +CONFIG_FB_MATROX_MILLENIUM=y +CONFIG_FB_MATROX_MYSTIQUE=y +CONFIG_FB_MATROX_G=y +CONFIG_FB_MATROX_I2C=m +CONFIG_FB_MATROX_MAVEN=m +CONFIG_FB_MATROX_MULTIHEAD=y +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +# CONFIG_FB_RADEON_DEBUG is not set +CONFIG_FB_ATY128=m +CONFIG_FB_ATY=m +CONFIG_FB_ATY_CT=y +CONFIG_FB_ATY_GENERIC_LCD=y +CONFIG_FB_ATY_GX=y +CONFIG_FB_SAVAGE=m +CONFIG_FB_SAVAGE_I2C=y +CONFIG_FB_SAVAGE_ACCEL=y +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +CONFIG_FB_KYRO=m +CONFIG_FB_3DFX=m +CONFIG_FB_3DFX_ACCEL=y +CONFIG_FB_VOODOO1=m +CONFIG_FB_TRIDENT=m +CONFIG_FB_TRIDENT_ACCEL=y +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +CONFIG_VGACON_SOFT_SCROLLBACK=y +CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y + +# +# Logo configuration +# +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_DEVICE=y + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_DYNAMIC_MINORS=y +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_AC97_BUS=m +CONFIG_SND_DUMMY=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +# CONFIG_SND_SERIAL_U16550 is not set +CONFIG_SND_MPU401=m + +# +# PCI devices +# +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_SPLIT_ISO=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_DPCM=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_STORAGE_ALAUDA=y +CONFIG_USB_LIBUSUAL=y + +# +# USB Input Devices +# +CONFIG_USB_HID=y +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +CONFIG_HID_FF=y +CONFIG_HID_PID=y +CONFIG_LOGITECH_FF=y +CONFIG_THRUSTMASTER_FF=y +CONFIG_USB_HIDDEV=y +CONFIG_USB_AIPTEK=m +CONFIG_USB_WACOM=m +CONFIG_USB_ACECAD=m +CONFIG_USB_KBTAB=m +CONFIG_USB_POWERMATE=m +CONFIG_USB_TOUCHSCREEN=m +CONFIG_USB_TOUCHSCREEN_EGALAX=y +CONFIG_USB_TOUCHSCREEN_PANJIT=y +CONFIG_USB_TOUCHSCREEN_3M=y +CONFIG_USB_TOUCHSCREEN_ITM=y +# CONFIG_USB_YEALINK is not set +CONFIG_USB_XPAD=m +CONFIG_USB_ATI_REMOTE=m +CONFIG_USB_ATI_REMOTE2=m +CONFIG_USB_KEYSPAN_REMOTE=m +CONFIG_USB_APPLETOUCH=m + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_MON=y + +# +# USB port drivers +# +CONFIG_USB_USS720=m + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRPRIME=m +CONFIG_USB_SERIAL_ANYDATA=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_AUERSWALD=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +# CONFIG_USB_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +CONFIG_USB_TEST=m + +# +# USB DSL modem support +# +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=m +CONFIG_MMC_SDHCI=m + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# InfiniBand support +# +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_DEBUG=y +CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y +CONFIG_INFINIBAND_SRP=m + +# +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# + +# +# Real Time Clock +# +CONFIG_RTC_LIB=m +CONFIG_RTC_CLASS=m + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=m +CONFIG_RTC_INTF_PROC=m +CONFIG_RTC_INTF_DEV=m + +# +# RTC drivers +# +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_RS5C372=m +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# DMA Engine support +# +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y + +# +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT2_FS_XIP=y +CONFIG_FS_XIP=y +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_SECURITY=y +CONFIG_XFS_POSIX_ACL=y +# CONFIG_XFS_RT is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_NOLOCK=m +CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_OCFS2_FS=m +CONFIG_MINIX_FS=m +CONFIG_ROMFS_FS=m +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=m +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_ZISOFS_FS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="ascii" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=m + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set +CONFIG_VXFS_FS=m +# CONFIG_HPFS_FS is not set +CONFIG_QNX4FS_FS=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m + +# +# Network File Systems +# +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_RPCSEC_GSS_SPKM3=m +# CONFIG_SMB_FS is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_EXPERIMENTAL is not set +CONFIG_NCP_FS=m +CONFIG_NCPFS_PACKET_SIGNING=y +CONFIG_NCPFS_IOCTL_LOCKING=y +CONFIG_NCPFS_STRONG=y +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +CONFIG_NCPFS_EXTRAS=y +CONFIG_CODA_FS=m +# CONFIG_CODA_FS_OLD_API is not set +# CONFIG_AFS_FS is not set +CONFIG_9P_FS=m + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +CONFIG_OSF_PARTITION=y +CONFIG_AMIGA_PARTITION=y +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +# CONFIG_LDM_PARTITION is not set +CONFIG_SGI_PARTITION=y +# CONFIG_ULTRIX_PARTITION is not set +CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Distributed Lock Manager +# +CONFIG_DLM=m +CONFIG_DLM_DEVICE=m +CONFIG_DLM_DEBUG=y + +# +# Library routines +# +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_PENDING_IRQ=y + +# +# Instrumentation Support +# +CONFIG_PROFILING=y +CONFIG_OPROFILE=m +CONFIG_KPROBES=y + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_SCHEDSTATS=y +CONFIG_DEBUG_SLAB=y +CONFIG_DEBUG_SLAB_LEAK=y +CONFIG_DEBUG_MUTEXES=y +CONFIG_DEBUG_SPINLOCK=y +CONFIG_DEBUG_SPINLOCK_SLEEP=y +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_VM=y +# CONFIG_FORCED_INLINING is not set +CONFIG_BOOT_DELAY=y +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_IA64_GRANULE_16MB=y +# CONFIG_IA64_GRANULE_64MB is not set +# CONFIG_IA64_PRINT_HAZARDS is not set +# CONFIG_DISABLE_VHPT is not set +# CONFIG_IA64_DEBUG_CMPXCHG is not set +# CONFIG_IA64_DEBUG_IRQ is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_DEBUG_PROC_KEYS=y +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +CONFIG_SECURITY_NETWORK_XFRM=y +CONFIG_SECURITY_CAPABILITIES=y +# CONFIG_SECURITY_ROOTPLUG is not set +# CONFIG_SECURITY_SECLVL is not set +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 +CONFIG_SECURITY_SELINUX_DISABLE=y +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 +CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +# CONFIG_CRYPTO_TEST is not set +CONFIG_CRYPTO_SIGNATURE=y +CONFIG_CRYPTO_SIGNATURE_DSA=y +CONFIG_CRYPTO_MPILIB=y + +# +# Hardware crypto devices +# +# CONFIG_XEN_UTIL is not set +CONFIG_HAVE_ARCH_ALLOC_SKB=y +CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SKBUFF=y +CONFIG_XEN_NETDEV_BACKEND=y +CONFIG_XEN_NETDEV_FRONTEND=y +# CONFIG_XEN_DEVMEM is not set +# CONFIG_XEN_REBOOT is not set +# CONFIG_XEN_SMPBOOT is not set +CONFIG_XEN_INTERFACE_VERSION=0x00030202 + +# +# XEN +# +CONFIG_XEN_PRIVILEGED_GUEST=y +# CONFIG_XEN_UNPRIVILEGED_GUEST is not set +CONFIG_XEN_BACKEND=y +# CONFIG_XEN_PCIDEV_BACKEND is not set +# CONFIG_XEN_PCIDEV_BACKEND_VPCI is not set +# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set +CONFIG_XEN_BLKDEV_BACKEND=y +# CONFIG_XEN_BLKDEV_TAP_BE is not set +# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set +CONFIG_XEN_NETDEV_LOOPBACK=y +# CONFIG_XEN_TPMDEV_BACKEND is not set +CONFIG_XEN_BLKDEV_FRONTEND=y +# CONFIG_XEN_BLKDEV_TAP is not set +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DISABLE_SERIAL=y +CONFIG_XEN_SYSFS=y +CONFIG_XEN_COMPAT_030002_AND_LATER=y +# CONFIG_XEN_COMPAT_LATEST_ONLY is not set +CONFIG_XEN_COMPAT_030002=y +CONFIG_NO_IDLE_HZ=y diff -r 906a91890923 -r 2fe66b75b217 SOURCES/linux-2.6-xen-ia64-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/SOURCES/linux-2.6-xen-ia64-fixes.patch Fri Jun 23 09:50:04 2006 -0400 @@ -0,0 +1,63 @@ +--- linux-2.6.17.ia64.orig/arch/ia64/xen/xenentry.S 2006-06-21 16:56:36.000000000 -0400 ++++ linux-2.6.17.ia64/arch/ia64/xen/xenentry.S 2006-06-21 20:59:47.000000000 -0400 +@@ -819,9 +819,6 @@ skip_rbs_switch: + st8 [r2]=r8 + st8 [r3]=r10 + .work_pending: +- tbit.nz p6,p0=r31,TIF_SIGDELAYED // signal delayed from MCA/INIT/NMI/PMI context? +-(p6) br.cond.sptk.few .sigdelayed +- ;; + tbit.z p6,p0=r31,TIF_NEED_RESCHED // current_thread_info()->need_resched==0? + (p6) br.cond.sptk.few .notify + #ifdef CONFIG_PREEMPT +@@ -857,17 +854,6 @@ skip_rbs_switch: + (pLvSys)br.cond.sptk.few .work_pending_syscall_end + br.cond.sptk.many .work_processed_kernel // don't re-check + +-// There is a delayed signal that was detected in MCA/INIT/NMI/PMI context where +-// it could not be delivered. Deliver it now. The signal might be for us and +-// may set TIF_SIGPENDING, so redrive ia64_leave_* after processing the delayed +-// signal. +- +-.sigdelayed: +- br.call.sptk.many rp=do_sigdelayed +- cmp.eq p6,p0=r0,r0 // p6 <- 1, always re-check +-(pLvSys)br.cond.sptk.few .work_pending_syscall_end +- br.cond.sptk.many .work_processed_kernel // re-check +- + .work_pending_syscall_end: + adds r2=PT(R8)+16,r12 + adds r3=PT(R10)+16,r12 +--- linux-2.6.17.ia64.orig/include/asm-ia64/io.h 2006-06-21 16:56:36.000000000 -0400 ++++ linux-2.6.17.ia64/include/asm-ia64/io.h 2006-06-21 18:11:00.000000000 -0400 +@@ -450,28 +450,14 @@ __writeq (unsigned long val, volatile vo + # define outl_p outl + #endif + +-/* +- * An "address" in IO memory space is not clearly either an integer or a pointer. We will +- * accept both, thus the casts. +- * +- * On ia-64, we access the physical I/O memory space through the uncached kernel region. +- */ +-static inline void __iomem * +-ioremap (unsigned long offset, unsigned long size) +-{ +-#ifdef CONFIG_XEN +- offset = HYPERVISOR_ioremap(offset, size); +-#endif +- return (void __iomem *) (__IA64_UNCACHED_OFFSET | (offset)); +-} ++extern void __iomem * ioremap(unsigned long offset, unsigned long size); ++extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size); + + static inline void + iounmap (volatile void __iomem *addr) + { + } + +-#define ioremap_nocache(o,s) ioremap(o,s) +- + /* Use normal IO mappings for DMI */ + #define dmi_ioremap ioremap + #define dmi_iounmap(x,l) iounmap(x) diff -r 906a91890923 -r 2fe66b75b217 SOURCES/xen-ia64-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/SOURCES/xen-ia64-fixes.patch Fri Jun 23 09:50:04 2006 -0400 @@ -0,0 +1,13 @@ +--- xen.orig/include/asm-ia64/xenpage.h 2006-05-03 15:05:40.000000000 -0400 ++++ xen/include/asm-ia64/xenpage.h 2006-06-22 12:15:40.000000000 -0400 +@@ -28,6 +28,10 @@ + #define page_to_virt(_page) maddr_to_virt(page_to_maddr(_page)) + #define maddr_to_page(kaddr) mfn_to_page(((kaddr) >> PAGE_SHIFT)) + ++/* Convert between Xen-heap virtual addresses and machine frame numbers. */ ++#define virt_to_mfn(va) (virt_to_maddr(va) >> PAGE_SHIFT) ++#define mfn_to_virt(mfn) maddr_to_virt(mfn << PAGE_SHIFT) ++ + #ifndef __ASSEMBLY__ + typedef union xen_va { + struct { From fedora at adslpipe.co.uk Sat Jun 24 17:38:55 2006 From: fedora at adslpipe.co.uk (Andy Burns) Date: Sat, 24 Jun 2006 18:38:55 +0100 Subject: [Fedora-xen] Running mixed FC5/FC6 domains Message-ID: <449D78AF.9040302@adslpipe.co.uk> Now that FC6T1 is upon us, I'm wondering if it is supported to run an FC6Tx domU as a guest of an FC5 dom0 host? Or an FC5 domU as a guest of an FC6 dom0 host? If possible would this require synchronised xen versions for guest and host domains? I see using xen as a good way to make upgrades less painful by live migration of guests between hosts while the hosts are upgraded, and by splitting functions of a server into multiple guests which can be tested/upgraded individually. Allowing mixed domains could ease the "upgrade treadmill" of Fedora, and reduce the possibility of breaking everything at once during upgrades. Presumably RHEL5 customers will eventually ask the same questions about supporting mixed RHEL6 upgrades with xen? Getting this right would give xen/linux the "no downtime" functionality I recall from performing rolling upgrades across nodes in VMS clusters years ago. Thoughts? From ikent at redhat.com Sun Jun 25 09:51:37 2006 From: ikent at redhat.com (Ian Kent) Date: Sun, 25 Jun 2006 17:51:37 +0800 Subject: [Fedora-xen] Running mixed FC5/FC6 domains In-Reply-To: <449D78AF.9040302@adslpipe.co.uk> References: <449D78AF.9040302@adslpipe.co.uk> Message-ID: <1151229097.4734.13.camel@raven.themaw.net> On Sat, 2006-06-24 at 18:38 +0100, Andy Burns wrote: > Now that FC6T1 is upon us, I'm wondering if it is supported to run an > FC6Tx domU as a guest of an FC5 dom0 host? Or an FC5 domU as a guest of > an FC6 dom0 host? If possible would this require synchronised xen > versions for guest and host domains? In theory this should be possible but I'm still trying and not able to do fc6 (guest) on fc5. I've been told that fc5 (guest) on fc6 (actually just running an fc6 kernel) should work but I've had no success with that yet either. Mind you my requirement is a bit of a big ask I guess, in that I would only consider this to "work" if I can run the xenguest-install.py successfully. There is apparently an incompatibility in the kernel interface as fc6 has a later snapshot of xen. I expect things will improve soon. > > I see using xen as a good way to make upgrades less painful by live > migration of guests between hosts while the hosts are upgraded, and by > splitting functions of a server into multiple guests which can be > tested/upgraded individually. > > Allowing mixed domains could ease the "upgrade treadmill" of Fedora, and > reduce the possibility of breaking everything at once during upgrades. > > Presumably RHEL5 customers will eventually ask the same questions about > supporting mixed RHEL6 upgrades with xen? Getting this right would give > xen/linux the "no downtime" functionality I recall from performing > rolling upgrades across nodes in VMS clusters years ago. I expect questions like this will come in think and fast. Setting up virtual test and development environments for multiple OS releases is likely considered "bread and butter functionality" for a product like xen. Ian From rmo at sunnmore.net Sun Jun 25 13:36:26 2006 From: rmo at sunnmore.net (Roy-Magne Mo) Date: Sun, 25 Jun 2006 15:36:26 +0200 Subject: [Fedora-xen] Running mixed FC5/FC6 domains In-Reply-To: <1151229097.4734.13.camel@raven.themaw.net> References: <449D78AF.9040302@adslpipe.co.uk> <1151229097.4734.13.camel@raven.themaw.net> Message-ID: <449E915A.8060600@sunnmore.net> Ian Kent wrote: > On Sat, 2006-06-24 at 18:38 +0100, Andy Burns wrote: >> Now that FC6T1 is upon us, I'm wondering if it is supported to run an >> FC6Tx domU as a guest of an FC5 dom0 host? Or an FC5 domU as a guest of >> an FC6 dom0 host? If possible would this require synchronised xen >> versions for guest and host domains? > > In theory this should be possible but I'm still trying and not able to > do fc6 (guest) on fc5. I've been told that fc5 (guest) on fc6 (actually > just running an fc6 kernel) should work but I've had no success with > that yet either. > > Mind you my requirement is a bit of a big ask I guess, in that I would > only consider this to "work" if I can run the xenguest-install.py > successfully. > > There is apparently an incompatibility in the kernel interface as fc6 > has a later snapshot of xen. > > I expect things will improve soon. I just installed a rawhide installation as a XEN guest today on a updated FC5 dom0 with xen-3.0.2-3.FC5 and kernel 2.6.17-1.2139_FC5xen0. But after installing and booting a couple of times I get this error message: Error: Device 0 (vif) could not be connected. Hotplug scripts not working. A boot clears the problem, so I guess it is some kind of resources that isn't cleaned up, probably related to (virtual) interfaces. All guests are LVM-backed so it's not loop devices that's exhausted. From jon at jongriffin.com Sun Jun 25 20:38:02 2006 From: jon at jongriffin.com (Jon Griffin) Date: Sun, 25 Jun 2006 13:38:02 -0700 Subject: [Fedora-xen] networking issue Message-ID: <449EF42A.30601@jongriffin.com> I am having no luck getting networking going on my FC5 box. I am using kernel 2.6.17-1.2139 and I have xennet modprobed in both U and 0 domains. I also tried adding: alias eth0 xennet in my xenU domain /etc/modprobe.conf It keeps coming back saying: xennet device eth0 does not seem to be present.... any suggestions? Thanks. From xiantao.zhang at intel.com Mon Jun 26 00:36:46 2006 From: xiantao.zhang at intel.com (Zhang, Xiantao) Date: Mon, 26 Jun 2006 08:36:46 +0800 Subject: [Fedora-xen] RE: How to make xen0 and xen with http://free.linux.hp.com/~agriffis/fedora-kernel-rpm Message-ID: Aron, Seems we have two method, maybe we can use xen-unstable.hg to generate xenlinux patch as first choice or talk to redhat side and persuade them pulling CSet from xen-unstable.hg just at it syncing with xen-ia64-unstable.hg. If so, it will reduce unnecessary extra work more :) Just FYI. Thanks & Best Regards -Xiantao OTC,Intel Corporation > -----Original Message----- > From: Aron Griffis [mailto:aron at hp.com] > Sent: 2006?6?23? 21:34 > To: Zhang, Xiantao > Cc: Yu, Fenghua; Yang, Fred; Tian, Kevin; You, Yongkang > Subject: Re: How to make xen0 and xen with > http://free.linux.hp.com/~agriffis/fedora-kernel-rpm > > Xiantao, > > Thank you for tracking this down! Unfortunately we can't simply > rebase the patch because it is made by Juan from linux-2.6.tip-xen > rather than directly from xen-unstable... i.e. we do not own the > patch, and it is constantly being remade without our intervention. > > Because of the method Red Hat uses to generate this patch, this > problem will continue to occur. I will bring up the issue today, > because I think we need to find a long-term solution to this problem. > > Thanks again for your help. > > Regards, > Aron > > -----Original Message----- > From: Zhang, Xiantao [mailto:xiantao.zhang at intel.com] > Sent: Friday, June 23, 2006 09:28 PM > Subject: RE: How to make xen0 and xen with > http://free.linux.hp.com/~agriffis/fedora-kernel-rpm > > > Hi Fenghua/Aron > This issue should be caused by mismatch of xen and xenlinux's Cset. Xen's > version should be xen-unstable.hg's Cset 10314, but xenlinux not based > xen-unstalbe.hg's 10314 and seems that it based xen-ia64-unstable.hg's Cset > 10314. If so, it will cause unpredictable aftermath. The obvious phenomena is > that one page of xen0's kernel code was flushed and triggered breakfault at > last. Seems we should rebase linux-2.6-xen.patch to xen-unstalble's Cset 10314 > first? > Thanks & Best Regards > -Xiantao > > OTC,Intel Corporation > > > -----Original Message----- > > From: Yu, Fenghua > Sent: 2006?6?23? 10:50 > > To: Aron Griffis; Zhang, Xiantao > > Cc: Yang, Fred; Tian, Kevin; You, Yongkang > > Subject: RE: How to make xen0 and xen with > > http://free.linux.hp.com/~agriffis/fedora-kernel-rpm > > > > > > Hi, Xiantao, > > > > Could you try to reproduce the issue and fix it today? Please update us the > > status then we can follow up. I think I saw this kind of issue (invalid > > hypercalls) at the very beginning. The issue was gone after rebuilding the > > xen/kernel rpms or updating xen/kernel rpms. > > > > Thanks. > > > > -Fenghua > > > > -----Original Message----- > > From: Aron Griffis [mailto:aron at hp.com] > > Sent: Thursday, June 22, 2006 7:09 PM > > To: Zhang, Xiantao > > Cc: Yang, Fred; Tian, Kevin; You, Yongkang; Yu, Fenghua > > Subject: Re: How to make xen0 and xen with > > http://free.linux.hp.com/~agriffis/fedora-kernel-rpm > > > > Well, this is mixed news, but it is all I have at the > > moment... > > > > I updated fedora-kernel-ia64 today. It builds and you can > > find the new rpms in my yum repository. > > > > However it doesn't boot. The kernel attempts to make > > invalid hypercalls. I have not looked closely yet and don't > > know the root cause of the problem. > > > > If you would be willing to test and debug those rpms, that > > would be fantastic. Even though it doesn't boot at the > > moment, I am going to create an RFC patchset for Red Hat to > > get comments for the moment. I plan to send that out > > tomorrow morning. > > > > Best regards, > > Aron > > > > Zhang, Xiantao wrote: [Thu Jun 22 2006, 09:03:33PM EDT] > > > Oh, seems I had some misunderstandings here. OK, Wish your good news. :) > > > Thanks & Best Regards > > > -Xiantao > > > > > > OTC,Intel Corporation > > > > > > > -----Original Message----- > > > > From: Aron Griffis [mailto:aron at hp.com] > > > > Sent: 2006?6?23? 1:26 > > > > To: Zhang, Xiantao > > > > Cc: Yang, Fred; Tian, Kevin; You, Yongkang; Yu, Fenghua > > > > Subject: Re: How to make xen0 and xen with > > > > http://free.linux.hp.com/~agriffis/fedora-kernel-rpm > > > > > > > > Hi Xiantao, > > > > > > > > Zhang, Xiantao wrote: [Thu Jun 22 2006, 01:33:08AM EDT] > > > > > We have noticed that you used this following tree to generate From horms at verge.net.au Mon Jun 26 09:09:15 2006 From: horms at verge.net.au (Horms) Date: Mon, 26 Jun 2006 18:09:15 +0900 (JST) Subject: [Fedora-xen] Re: Xen NTPL In-Reply-To: Message-ID: <20060626090915.B002F34037@koto.vergenet.net> In article you wrote: > On Thu, 22 Jun 2006, Patricio Bruna V. wrote: > >> Has the xen kernel supports for NTPL? > > Yes, NPTL just works in the Xen kernel. > > The only issue there ever was was a performance issue, > with the glibc variant that uses negative segment > offsets. > > Current Fedora has a glibc variant that does address > calculations to avoid the negative segment offsets. > This removes the performance penalty FC4 had. Hi Rik, Is this a fedora-specific feature, or is it something I can expect to show up in mainline glibc? -- Horms H: http://www.vergenet.net/~horms/ W: http://www.valinux.co.jp/en/ From riel at redhat.com Mon Jun 26 12:56:47 2006 From: riel at redhat.com (Rik van Riel) Date: Mon, 26 Jun 2006 08:56:47 -0400 (EDT) Subject: [Fedora-xen] Re: Xen NTPL In-Reply-To: <20060626090915.B002F34037@koto.vergenet.net> References: <20060626090915.B002F34037@koto.vergenet.net> Message-ID: On Mon, 26 Jun 2006, Horms wrote: > > Current Fedora has a glibc variant that does address > > calculations to avoid the negative segment offsets. > > This removes the performance penalty FC4 had. > > Is this a fedora-specific feature, or is it something I can expect > to show up in mainline glibc? I would expect the source code to be in mainline, but I do not know if any other distributions compile this glibc variant. -- All Rights Reversed From ron.wahler at gmail.com Mon Jun 26 16:07:21 2006 From: ron.wahler at gmail.com (Ron Wahler) Date: Mon, 26 Jun 2006 10:07:21 -0600 Subject: [Fedora-xen] problem with domU install from xenguest-install.py Message-ID: I am trying an http install a guest from http://download.fedora.redhat.com/pub/fedora/linux/core/5/i386/os/ the install starts ok but then fails because it can't find any Hard Disks. Is there a faq on how to create hard disks so the install sees a disk and not just the directory I passed it to install script ? or am I missing something ? thanks, Ron. xend.log 150, in waitForDevice raise VmError("Device %s (%s) could not be connected. " VmError: Device 51712 (vbd) could not be connected. Backend device not found. [2006-06-25 22:10:56 xend] INFO (XendDomain:363) Domain guest1 (2) unpaused. [2006-06-25 22:17:29 xend.XendDomainInfo] INFO (XendDomainInfo:841) Domain has shutdown: name=guest1 id=2 reason=reboot. [2006-06-25 22:17:29 xend.XendDomainInfo] DEBUG (XendDomainInfo:1343) XendDomainInfo.destroy: domid=2 -------------- next part -------------- An HTML attachment was scrubbed... URL: From katzj at redhat.com Mon Jun 26 19:21:18 2006 From: katzj at redhat.com (Jeremy Katz) Date: Mon, 26 Jun 2006 15:21:18 -0400 Subject: [Fedora-xen] Re: [patch 0/4] elilo multiboot support In-Reply-To: References: Message-ID: <1151349678.29585.18.camel@orodruin.boston.redhat.com> (dropping anaconda-devel and pjones from the cc... not generally applicable for anaconda-devel and I'm fielding this for Peter) On Wed, 2006-06-07 at 17:26 -0400, Aron Griffis wrote: > The following patches give grubby the ability to manipulate > multiboot-capable elilo.conf. Fedora's elilo already contains the > support, these patches simply teach grubby to take advantage of it. > These patches are an enabler for using Xen on ia64 with Fedora. > > I have tested these changes with both grubby and elilo, using both > multiboot and non-multiboot configurations. Aron -- Overall, these look pretty good. A few stylistic-ish things * The patches don't work individually -- applying them in sequence ends up with some not compiling bits. Was pretty easy to fix up, but worth noting * dprintf is already included in the standard library as a GNU extension, but with a different functionality -- something like dbgprintf would be better just to avoid problems there * Instead of having the getLineByType2 thing, it would probably be a little cleaner to just change the types to be a normal int instead of an enum and then be able to determine matches via bitwise operators In the bigger realm, there seems to be a bug or two lingering. Running the test suite ('make test' from the toplevel) seems to fail for x86/x86_64 with the patches applied -- it looks like we're gaining an initrd in cases where it's unexpected (copy-default shouldn't be copying the initrd, but it looks like it might be). Also, it looks like kernel arguments might be getting lost in the multiboot case. I'll try to look at this a little more later in the afternoon, but given how the past two weeks have been "later in the afternoon" could end up being Friday :/ Also, it'd be nice to have some test cases to add to the test suite just so that we can more easily ensure that minor bugfixes don't cause regressions. Jeremy From aron at hp.com Mon Jun 26 19:32:33 2006 From: aron at hp.com (Aron Griffis) Date: Mon, 26 Jun 2006 15:32:33 -0400 Subject: [Fedora-xen] Re: [patch 0/4] elilo multiboot support In-Reply-To: <1151349678.29585.18.camel@orodruin.boston.redhat.com> References: <1151349678.29585.18.camel@orodruin.boston.redhat.com> Message-ID: <20060626193233.GA12913@vino.zko.hp.com> Jeremy, Jeremy Katz wrote: [Mon Jun 26 2006, 03:21:18PM EDT] > Overall, these look pretty good. Good to hear. :-) > A few stylistic-ish things > * The patches don't work individually -- applying them in sequence ends > up with some not compiling bits. Was pretty easy to fix up, but worth > noting Thanks, and sorry for the inconvenience. > * dprintf is already included in the standard library as a GNU > extension, but with a different functionality -- something like > dbgprintf would be better just to avoid problems there Okay > * Instead of having the getLineByType2 thing, it would probably be a > little cleaner to just change the types to be a normal int instead of an > enum and then be able to determine matches via bitwise operators Heh, I wanted to do this but was already nervous about the volume of code being changed. I agree it would be better. I'll change this for the next submission. > In the bigger realm, there seems to be a bug or two lingering. Running > the test suite ('make test' from the toplevel) seems to fail for > x86/x86_64 with the patches applied -- it looks like we're gaining an > initrd in cases where it's unexpected (copy-default shouldn't be copying > the initrd, but it looks like it might be). Also, it looks like kernel > arguments might be getting lost in the multiboot case. I'll try to look > at this a little more later in the afternoon, but given how the past two > weeks have been "later in the afternoon" could end up being Friday :/ I hadn't even noticed the existence of the test suite, silly me. :-| My testing had all been manual. I'll run through the test suite and fix up the errors. > Also, it'd be nice to have some test cases to add to the test suite just > so that we can more easily ensure that minor bugfixes don't cause > regressions. Will do. Thanks for the review. Regards, Aron -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available URL: From pbruna at it-linux.cl Mon Jun 26 19:35:53 2006 From: pbruna at it-linux.cl (Patricio Bruna V.) Date: Mon, 26 Jun 2006 15:35:53 -0400 Subject: [Fedora-xen] PCI Delegation Message-ID: <200606261535.53172.pbruna@it-linux.cl> Has Fedora-xen support for PCI-Delegation? -- Patricio Bruna V. Red Hat Certified Engineer IT Linux Ltda. http://www.it-linux.cl Fono/Fax: (+56-2) 697 11 66 Cel: (+56-8) 288 51 95 From gawain.lynch at bigpond.com Mon Jun 26 22:17:13 2006 From: gawain.lynch at bigpond.com (Gawain Lynch) Date: Tue, 27 Jun 2006 08:17:13 +1000 Subject: [Fedora-xen] PCI Delegation In-Reply-To: <200606261535.53172.pbruna@it-linux.cl> References: <200606261535.53172.pbruna@it-linux.cl> Message-ID: <1151360234.3280.4.camel@legolas.felicity.net.au> On Mon, 2006-06-26 at 15:35 -0400, Patricio Bruna V. wrote: > Has Fedora-xen support for PCI-Delegation? > Not at present: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=188771 From horms at verge.net.au Tue Jun 27 02:42:43 2006 From: horms at verge.net.au (Horms) Date: Tue, 27 Jun 2006 11:42:43 +0900 (JST) Subject: [Fedora-xen] Re: Xen NTPL In-Reply-To: Message-ID: <20060627024243.8649834039@koto.vergenet.net> In article you wrote: > On Mon, 26 Jun 2006, Horms wrote: > >> > Current Fedora has a glibc variant that does address >> > calculations to avoid the negative segment offsets. >> > This removes the performance penalty FC4 had. >> >> Is this a fedora-specific feature, or is it something I can expect >> to show up in mainline glibc? > > I would expect the source code to be in mainline, but I > do not know if any other distributions compile this > glibc variant. Thanks. -- Horms H: http://www.vergenet.net/~horms/ W: http://www.valinux.co.jp/en/ From aron at hp.com Tue Jun 27 20:40:03 2006 From: aron at hp.com (Aron Griffis) Date: Tue, 27 Jun 2006 16:40:03 -0400 Subject: [Fedora-xen] [RFC] enable xen-ia64 in fedora kernel cvs Message-ID: <20060627204003.GB15677@olive.flatmonk> This patch enables xen-ia64 support in the fedora kernel. It applies to the cvs tree checked out according to the instructions at http://people.redhat.com/davej/ This is *nearly* ready to be applied. AFAIK, the only nagging issue is that it doesn't boot because of the hypervisor/kernel mismatch. (Full description of the problem at https://www.redhat.com/archives/fedora-ia64-list/2006-June/msg00026.html) To fix this for the moment, I think all that needs to happen is for Juan to generate a new linux-2.6-xen.patch from the linux-2.6.tip-xen repository, and then take a new snapshot of the hypervisor from xen-unstable. That should bring the two into near enough proximity for ia64 to boot again. Juan, could you do this ASAP? It would be a great help since I could follow up with a version of this patch suitable for integration. Regarding long-term solution, I think it would be best for Juan to take maintainership of the linux-2.6.tip-xen repository. That would allow him to sync it to xen-unstable at the same time that he takes the hypervisor snapshot. The result should always be a matched pair. I'd be interested to hear comments regarding this suggestion and this patch. b/devel/configs/config-xen-ia64 | 19 +++++++++ b/devel/linux-2.6-xen-ia64-fixes.patch | 63 +++++++++++++++++++++++++++++++++ b/devel/xen-ia64-fixes.patch | 13 ++++++ devel/Makefile.config | 18 +++++++-- devel/kernel-2.6.spec | 57 ++++++++++++++++++++--------- 5 files changed, 149 insertions(+), 21 deletions(-) diff -r 73280cc9332c -r ab31e6d960bb devel/Makefile.config --- a/devel/Makefile.config Tue Jun 27 15:01:33 2006 -0400 +++ b/devel/Makefile.config Tue Jun 27 15:50:47 2006 -0400 @@ -13,7 +13,8 @@ CONFIGFILES = \ $(CFG)-ppc.config $(CFG)-ppc-smp.config \ $(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \ $(CFG)-i686-xen-PAE.config \ - $(CFG)-i686-xen.config $(CFG)-x86_64-xen.config + $(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \ + $(CFG)-ia64-xen.config PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64 TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS))) @@ -21,8 +22,10 @@ configs: $(CONFIGFILES) configs: $(CONFIGFILES) @rm -f kernel-*-config @rm -f $(TEMPFILES) - @rm -f temp-xen-generic temp-x86-xen-generic temp-x86_64-xen-generic \ - temp-generic temp-x86_64-xen-generic-tmp + @rm -f temp-generic temp-xen-generic \ + temp-x86-xen-generic \ + temp-x86_64-xen-generic temp-x86_64-xen-generic-tmp \ + temp-ia64-xen-generic temp-ia64-xen-generic-tmp # Augment the clean target to clean up our own cruft clean :: @@ -69,6 +72,12 @@ temp-x86_64-xen-generic-tmp: configs/con perl scripts/merge.pl $^ > $@ temp-x86_64-xen-generic: configs/config-xen-x86_64 temp-x86_64-xen-generic-tmp + perl scripts/merge.pl $^ > $@ + +temp-ia64-xen-generic-tmp: configs/config-xen-generic temp-ia64-generic + perl scripts/merge.pl $^ > $@ + +temp-ia64-xen-generic: configs/config-xen-ia64 temp-ia64-xen-generic-tmp perl scripts/merge.pl $^ > $@ kernel-$(VERSION)-i686.config: configs/config-i686 temp-x86-generic @@ -134,3 +143,6 @@ kernel-$(VERSION)-x86_64-xen.config: con kernel-$(VERSION)-x86_64-xen.config: configs/config-xen-xen temp-x86_64-xen-generic perl scripts/merge.pl $^ x86_64 > $@ +kernel-$(VERSION)-ia64-xen.config: configs/config-xen-xen temp-ia64-xen-generic + perl scripts/merge.pl $^ ia64 > $@ + diff -r 73280cc9332c -r ab31e6d960bb devel/kernel-2.6.spec --- a/devel/kernel-2.6.spec Tue Jun 27 15:01:33 2006 -0400 +++ b/devel/kernel-2.6.spec Tue Jun 27 15:50:47 2006 -0400 @@ -37,6 +37,9 @@ Summary: The Linux kernel (the core of t %define xen_version 20060610 %define make_target bzImage %define kernel_image x86 +%define xen_flags verbose=y debug=y crash_debug=y +%define xen_target vmlinuz +%define xen_image vmlinuz %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} @@ -55,10 +58,14 @@ Summary: The Linux kernel (the core of t %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config %endif -# Xen and kdump only build on i686 and x86_64 ... +# kdump only builds on i686 and x86_64 %ifnarch i686 x86_64 +%define buildkdump 0 +%endif + +# Xen only builds on i686, x86_64 and ia64 ... +%ifnarch i686 x86_64 ia64 %define buildxen 0 -%define buildkdump 0 %endif %ifarch ppc64 @@ -140,11 +147,15 @@ Summary: The Linux kernel (the core of t %endif %ifarch ia64 -%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config +%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64*.config %define image_install_path boot/efi/EFI/redhat %define signmodules 1 %define make_target compressed %define kernel_image vmlinux.gz +# ia64 doesn't building with debug=y at the moment +%define xen_flags verbose=y crash_debug=y +%define xen_target compressed +%define xen_image vmlinux.gz %endif # @@ -246,6 +257,8 @@ Source36: kernel-%{kversion}-i686-xen-PA #Source67: kernel-%{kversion}-sparc64.config #Source68: kernel-%{kversion}-sparc64-smp.config +Source133: kernel-%{kversion}-ia64-xen.config + # # Patches 0 through 100 are meant for core subsystem upgrades # @@ -288,6 +301,7 @@ Patch703: linux-2.6-xen-move-vdso-fixmap Patch703: linux-2.6-xen-move-vdso-fixmap.patch Patch704: linux-2.6-xen-vsyscall_base.patch Patch706: linux-2.6-xen_remap_vma_flags.patch +Patch707: linux-2.6-xen-ia64-fixes.patch # # Patches 800 through 899 are reserved for bugfixes to the core system @@ -439,6 +453,7 @@ Patch10001: linux-2.6-random-patches.pat # Xen hypervisor patches Patch20000: xen-sched-sedf.patch +Patch20001: xen-ia64-fixes.patch # END OF PATCH DEFINITIONS @@ -717,6 +732,7 @@ cp -rl xen-%{xen_version} xen # Any necessary hypervisor patches go here %patch20000 -p0 +%patch20001 -p0 %endif cd linux-%{kversion}.%{_target_cpu} @@ -784,11 +800,10 @@ cd linux-%{kversion}.%{_target_cpu} # %patch700 -p1 -b .p.xen # -# ... and back out all the ia64-specific sections, as they currently prevent +# ... and back out all the tpm-specific sections, as they currently prevent # non-xen builds from working. -# Now also with tpm -# -for f in `find drivers/char/tpm arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \ +# +for f in `find drivers/char/tpm -type f -name "*.p.xen"` ; do \ g=`dirname $f`/`basename $f .p.xen`; \ mv "$f" "$g"; \ if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \ @@ -796,6 +811,11 @@ done # Delete the rest of the backup files, they just confuse the build later find -name "*.p.xen" | xargs rm -f +# These are fixed in xen-ia64-unstable, can go away when that +# propagates to Juan's patch +ln -sf ../../../../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/ +ln -sf ../../../arch/ia64/xen/drivers/xenia64_init.c drivers/xen/core/ + # # Xen includes a patch which moves the vsyscall fixmap into a user-space VA, # freeing user-space from reliance on an absolute fixmap area and so allowing @@ -811,6 +831,7 @@ find -name "*.p.xen" | xargs rm -f %patch702 -p1 %patch704 -p1 %patch706 -p1 +%patch707 -p1 %endif @@ -1266,15 +1287,15 @@ mkdir -p $RPM_BUILD_ROOT/boot %if %{includexen} %if %{buildxen} cd xen - mkdir -p $RPM_BUILD_ROOT/%{image_install_path} + mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot %if %{buildxenPAE} - make debug=y verbose=y crash_debug=y pae=y - install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}-PAE + make %{?_smp_mflags} %{xen_flags} pae=y + install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}-PAE install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE make clean %endif - make debug=y verbose=y crash_debug=y - install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL} + make %{?_smp_mflags} %{xen_flags} + install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL} install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL} cd .. %endif @@ -1296,11 +1317,11 @@ BuildKernel %make_target %kernel_image s %if %{includexen} %if %{buildxenPAE} -BuildKernel vmlinuz vmlinuz xen-PAE +BuildKernel %xen_target %xen_image xen-PAE %endif %if %{buildxen} -BuildKernel vmlinuz vmlinuz xen +BuildKernel %xen_target %xen_image xen %endif %endif @@ -1405,7 +1426,7 @@ fi %post xen [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen if [ -e /proc/xen/xsd_kva -o ! -d /proc/xen ]; then - /sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen + /sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL} %{KVERREL}xen else /sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen fi @@ -1422,7 +1443,7 @@ fi %post xen-PAE [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen-PAE if [ -e /proc/xen/xsd_kva ]; then - /sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen-PAE + /sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}-PAE %{KVERREL}xen-PAE else /sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install %{KVERREL}xen-PAE fi @@ -1551,7 +1572,7 @@ fi /boot/symvers-%{KVERREL}xen.gz /boot/symsets-%{KVERREL}xen.tar.gz /boot/config-%{KVERREL}xen -/boot/xen.gz-%{KVERREL} +/%{image_install_path}/xen.gz-%{KVERREL} /boot/xen-syms-%{KVERREL} %dir /lib/modules/%{KVERREL}xen /lib/modules/%{KVERREL}xen/kernel @@ -1576,7 +1597,7 @@ fi /boot/symvers-%{KVERREL}xen-PAE.gz /boot/symsets-%{KVERREL}xen-PAE.tar.gz /boot/config-%{KVERREL}xen-PAE -/boot/xen.gz-%{KVERREL}-PAE +/%{image_install_path}/xen.gz-%{KVERREL}-PAE /boot/xen-syms-%{KVERREL}-PAE %dir /lib/modules/%{KVERREL}xen-PAE /lib/modules/%{KVERREL}xen-PAE/kernel diff -r 73280cc9332c -r ab31e6d960bb devel/configs/config-xen-ia64 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/devel/configs/config-xen-ia64 Tue Jun 27 15:50:47 2006 -0400 @@ -0,0 +1,19 @@ +# override i686 xen + +# CONFIG_X86 is not set +# CONFIG_X86_XEN is not set +CONFIG_IA64=y +CONFIG_XEN=y +CONFIG_XEN_IA64_DOM0_VP=y +CONFIG_XEN_DISABLE_SERIAL=y + +# override ia64 generic + +# CONFIG_IA64_GENERIC is not set +CONFIG_IA64_DIG=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +CONFIG_FLATMEM_MANUAL=y +CONFIG_FORCE_MAX_ZONEORDER=11 + +# internal #defines conflict with xen-ia64 +# CONFIG_FB_NEOMAGIC is not set diff -r 73280cc9332c -r ab31e6d960bb devel/linux-2.6-xen-ia64-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/devel/linux-2.6-xen-ia64-fixes.patch Tue Jun 27 15:50:47 2006 -0400 @@ -0,0 +1,63 @@ +--- linux-2.6.17.ia64.orig/arch/ia64/xen/xenentry.S 2006-06-21 16:56:36.000000000 -0400 ++++ linux-2.6.17.ia64/arch/ia64/xen/xenentry.S 2006-06-21 20:59:47.000000000 -0400 +@@ -819,9 +819,6 @@ skip_rbs_switch: + st8 [r2]=r8 + st8 [r3]=r10 + .work_pending: +- tbit.nz p6,p0=r31,TIF_SIGDELAYED // signal delayed from MCA/INIT/NMI/PMI context? +-(p6) br.cond.sptk.few .sigdelayed +- ;; + tbit.z p6,p0=r31,TIF_NEED_RESCHED // current_thread_info()->need_resched==0? + (p6) br.cond.sptk.few .notify + #ifdef CONFIG_PREEMPT +@@ -857,17 +854,6 @@ skip_rbs_switch: + (pLvSys)br.cond.sptk.few .work_pending_syscall_end + br.cond.sptk.many .work_processed_kernel // don't re-check + +-// There is a delayed signal that was detected in MCA/INIT/NMI/PMI context where +-// it could not be delivered. Deliver it now. The signal might be for us and +-// may set TIF_SIGPENDING, so redrive ia64_leave_* after processing the delayed +-// signal. +- +-.sigdelayed: +- br.call.sptk.many rp=do_sigdelayed +- cmp.eq p6,p0=r0,r0 // p6 <- 1, always re-check +-(pLvSys)br.cond.sptk.few .work_pending_syscall_end +- br.cond.sptk.many .work_processed_kernel // re-check +- + .work_pending_syscall_end: + adds r2=PT(R8)+16,r12 + adds r3=PT(R10)+16,r12 +--- linux-2.6.17.ia64.orig/include/asm-ia64/io.h 2006-06-21 16:56:36.000000000 -0400 ++++ linux-2.6.17.ia64/include/asm-ia64/io.h 2006-06-21 18:11:00.000000000 -0400 +@@ -450,28 +450,14 @@ __writeq (unsigned long val, volatile vo + # define outl_p outl + #endif + +-/* +- * An "address" in IO memory space is not clearly either an integer or a pointer. We will +- * accept both, thus the casts. +- * +- * On ia-64, we access the physical I/O memory space through the uncached kernel region. +- */ +-static inline void __iomem * +-ioremap (unsigned long offset, unsigned long size) +-{ +-#ifdef CONFIG_XEN +- offset = HYPERVISOR_ioremap(offset, size); +-#endif +- return (void __iomem *) (__IA64_UNCACHED_OFFSET | (offset)); +-} ++extern void __iomem * ioremap(unsigned long offset, unsigned long size); ++extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size); + + static inline void + iounmap (volatile void __iomem *addr) + { + } + +-#define ioremap_nocache(o,s) ioremap(o,s) +- + /* Use normal IO mappings for DMI */ + #define dmi_ioremap ioremap + #define dmi_iounmap(x,l) iounmap(x) diff -r 73280cc9332c -r ab31e6d960bb devel/xen-ia64-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/devel/xen-ia64-fixes.patch Tue Jun 27 15:50:47 2006 -0400 @@ -0,0 +1,13 @@ +--- xen.orig/include/asm-ia64/xenpage.h 2006-05-03 15:05:40.000000000 -0400 ++++ xen/include/asm-ia64/xenpage.h 2006-06-22 12:15:40.000000000 -0400 +@@ -28,6 +28,10 @@ + #define page_to_virt(_page) maddr_to_virt(page_to_maddr(_page)) + #define maddr_to_page(kaddr) mfn_to_page(((kaddr) >> PAGE_SHIFT)) + ++/* Convert between Xen-heap virtual addresses and machine frame numbers. */ ++#define virt_to_mfn(va) (virt_to_maddr(va) >> PAGE_SHIFT) ++#define mfn_to_virt(mfn) maddr_to_virt(mfn << PAGE_SHIFT) ++ + #ifndef __ASSEMBLY__ + typedef union xen_va { + struct { -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From davej at redhat.com Tue Jun 27 20:49:34 2006 From: davej at redhat.com (Dave Jones) Date: Tue, 27 Jun 2006 16:49:34 -0400 Subject: [Fedora-xen] Re: [RFC] enable xen-ia64 in fedora kernel cvs In-Reply-To: <20060627204003.GB15677@olive.flatmonk> References: <20060627204003.GB15677@olive.flatmonk> Message-ID: <20060627204933.GM7914@redhat.com> On Tue, Jun 27, 2006 at 04:40:03PM -0400, Aron Griffis wrote: > This patch enables xen-ia64 support in the fedora kernel. It applies > to the cvs tree checked out according to the instructions at > http://people.redhat.com/davej/ > > This is *nearly* ready to be applied. AFAIK, the only nagging issue > is that it doesn't boot because of the hypervisor/kernel mismatch. > (Full description of the problem at > https://www.redhat.com/archives/fedora-ia64-list/2006-June/msg00026.html) > > To fix this for the moment, I think all that needs to happen is for > Juan to generate a new linux-2.6-xen.patch from the linux-2.6.tip-xen > repository, and then take a new snapshot of the hypervisor from > xen-unstable. That should bring the two into near enough proximity > for ia64 to boot again. Yeah, the daily -git rejects got the better of me yesterday, so I disabled xen builds whilst that gets worked out. There's another larger problem right now - the signed modules code is broken for some reason, resulting in kernels that don't boot. Fixing that is my priority right now. Dave -- http://www.codemonkey.org.uk From chrisw at sous-sol.org Tue Jun 27 21:34:10 2006 From: chrisw at sous-sol.org (Chris Wright) Date: Tue, 27 Jun 2006 14:34:10 -0700 Subject: [Fedora-xen] Re: [RFC] enable xen-ia64 in fedora kernel cvs In-Reply-To: <20060627204003.GB15677@olive.flatmonk> References: <20060627204003.GB15677@olive.flatmonk> Message-ID: <20060627213410.GC11588@sequoia.sous-sol.org> * Aron Griffis (aron at hp.com) wrote: > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/devel/linux-2.6-xen-ia64-fixes.patch Tue Jun 27 15:50:47 2006 -0400 > @@ -0,0 +1,63 @@ > +--- linux-2.6.17.ia64.orig/arch/ia64/xen/xenentry.S 2006-06-21 16:56:36.000000000 -0400 > ++++ linux-2.6.17.ia64/arch/ia64/xen/xenentry.S 2006-06-21 20:59:47.000000000 -0400 > +@@ -819,9 +819,6 @@ skip_rbs_switch: > + st8 [r2]=r8 > + st8 [r3]=r10 > + .work_pending: > +- tbit.nz p6,p0=r31,TIF_SIGDELAYED // signal delayed from MCA/INIT/NMI/PMI context? > +-(p6) br.cond.sptk.few .sigdelayed > +- ;; > + tbit.z p6,p0=r31,TIF_NEED_RESCHED // current_thread_info()->need_resched==0? > + (p6) br.cond.sptk.few .notify > + #ifdef CONFIG_PREEMPT > +@@ -857,17 +854,6 @@ skip_rbs_switch: > + (pLvSys)br.cond.sptk.few .work_pending_syscall_end > + br.cond.sptk.many .work_processed_kernel // don't re-check > + > +-// There is a delayed signal that was detected in MCA/INIT/NMI/PMI context where > +-// it could not be delivered. Deliver it now. The signal might be for us and > +-// may set TIF_SIGPENDING, so redrive ia64_leave_* after processing the delayed > +-// signal. > +- > +-.sigdelayed: > +- br.call.sptk.many rp=do_sigdelayed > +- cmp.eq p6,p0=r0,r0 // p6 <- 1, always re-check > +-(pLvSys)br.cond.sptk.few .work_pending_syscall_end > +- br.cond.sptk.many .work_processed_kernel // re-check > +- > + .work_pending_syscall_end: > + adds r2=PT(R8)+16,r12 > + adds r3=PT(R10)+16,r12 This should already be in tip-xen on xenbits (thanks to your patch). > +--- linux-2.6.17.ia64.orig/include/asm-ia64/io.h 2006-06-21 16:56:36.000000000 -0400 > ++++ linux-2.6.17.ia64/include/asm-ia64/io.h 2006-06-21 18:11:00.000000000 -0400 > +@@ -450,28 +450,14 @@ __writeq (unsigned long val, volatile vo > + # define outl_p outl > + #endif > + > +-/* > +- * An "address" in IO memory space is not clearly either an integer or a pointer. We will > +- * accept both, thus the casts. > +- * > +- * On ia-64, we access the physical I/O memory space through the uncached kernel region. > +- */ > +-static inline void __iomem * > +-ioremap (unsigned long offset, unsigned long size) > +-{ > +-#ifdef CONFIG_XEN > +- offset = HYPERVISOR_ioremap(offset, size); > +-#endif > +- return (void __iomem *) (__IA64_UNCACHED_OFFSET | (offset)); > +-} > ++extern void __iomem * ioremap(unsigned long offset, unsigned long size); > ++extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size); > + > + static inline void > + iounmap (volatile void __iomem *addr) > + { > + } > + > +-#define ioremap_nocache(o,s) ioremap(o,s) > +- > + /* Use normal IO mappings for DMI */ > + #define dmi_ioremap ioremap > + #define dmi_iounmap(x,l) iounmap(x) This should already be this way in tip-xen on xenbits, that's how I did the merge. > diff -r 73280cc9332c -r ab31e6d960bb devel/xen-ia64-fixes.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/devel/xen-ia64-fixes.patch Tue Jun 27 15:50:47 2006 -0400 > @@ -0,0 +1,13 @@ > +--- xen.orig/include/asm-ia64/xenpage.h 2006-05-03 15:05:40.000000000 -0400 > ++++ xen/include/asm-ia64/xenpage.h 2006-06-22 12:15:40.000000000 -0400 > +@@ -28,6 +28,10 @@ > + #define page_to_virt(_page) maddr_to_virt(page_to_maddr(_page)) > + #define maddr_to_page(kaddr) mfn_to_page(((kaddr) >> PAGE_SHIFT)) > + > ++/* Convert between Xen-heap virtual addresses and machine frame numbers. */ > ++#define virt_to_mfn(va) (virt_to_maddr(va) >> PAGE_SHIFT) > ++#define mfn_to_virt(mfn) maddr_to_virt(mfn << PAGE_SHIFT) > ++ > + #ifndef __ASSEMBLY__ > + typedef union xen_va { > + struct { Hmm, this one is missing, and it's not in xen-unstable sparse tree either, so I can see why it's not picked up. thanks, -chris From aron at hp.com Tue Jun 27 22:47:38 2006 From: aron at hp.com (Aron Griffis) Date: Tue, 27 Jun 2006 18:47:38 -0400 Subject: [Fedora-xen] Re: [RFC] enable xen-ia64 in fedora kernel cvs In-Reply-To: <20060627213410.GC11588@sequoia.sous-sol.org> References: <20060627204003.GB15677@olive.flatmonk> <20060627213410.GC11588@sequoia.sous-sol.org> Message-ID: <20060627224738.GC21655@olive.flatmonk> Chris Wright wrote: [Tue Jun 27 2006, 05:34:10PM EDT] > This should already be in tip-xen on xenbits (thanks to your patch). > > This should already be this way in tip-xen on xenbits, that's how I > did the merge. Right, these patches are not the issue. The issue is that Juan's patch is derived from one tree while the hypervisor snapshot is taken from another. The result is a hypervisor/kernel pair that have a proximity window of 2 weeks or so, but should be matched if possible to guarantee compatibility. Generally it shouldn't be an issue, but there was a compatibility break in ia64 recently, and the current fedora hypervisor snapshot is on one side of the line, while the xenlinux patch is on the other. IMHO the easiest way to avoid potential incompatibility on any architecture is to make sure they both source from the same xen-unstable changeset. That calls for either - Juan to handle the linux-2.6.tip-xen tree, or - closer synchronization between you and Juan, or - Juan to be able to snapshot the hypervisor using the same xen-unstable changeset used in linux-2.6.tip-xen at any time. Maybe the last one would be easiest? Is it possible to programmatically determine from the perspective of linux-2.6.tip-xen the related xen-unstable changeset? > Hmm, this one is missing, and it's not in xen-unstable sparse tree > either, so I can see why it's not picked up. I think it's in xen-ia64-unstable. This is a different issue, and not one for which I have any suggestions. The latency between xen-ia64-unstable and fedora is unavoidably long, due to the chain: xen-ia64-unstable -> xen-unstable -> linux-2.6.tip-xen -> Juan -> kernel.rpm. It's easy for upstream patches to be held up on that route. For that reason, I think it's likely an ia64 fixup patch will often be needed in kernel.rpm, especially while xen-ia64 is seeing so much work. Thakns, Aron From chrisw at sous-sol.org Tue Jun 27 23:12:34 2006 From: chrisw at sous-sol.org (Chris Wright) Date: Tue, 27 Jun 2006 16:12:34 -0700 Subject: [Fedora-xen] Re: [RFC] enable xen-ia64 in fedora kernel cvs In-Reply-To: <20060627224738.GC21655@olive.flatmonk> References: <20060627204003.GB15677@olive.flatmonk> <20060627213410.GC11588@sequoia.sous-sol.org> <20060627224738.GC21655@olive.flatmonk> Message-ID: <20060627231234.GG11588@sequoia.sous-sol.org> * Aron Griffis (aron at hp.com) wrote: > Chris Wright wrote: [Tue Jun 27 2006, 05:34:10PM EDT] > > This should already be in tip-xen on xenbits (thanks to your patch). > > > > This should already be this way in tip-xen on xenbits, that's how I > > did the merge. > > Right, these patches are not the issue. The issue is that Juan's > patch is derived from one tree while the hypervisor snapshot is taken > from another. The result is a hypervisor/kernel pair that have > a proximity window of 2 weeks or so, but should be matched if possible > to guarantee compatibility. > > Generally it shouldn't be an issue, but there was a compatibility > break in ia64 recently, and the current fedora hypervisor snapshot is > on one side of the line, while the xenlinux patch is on the other. This is difficult to track unless we get some actual heads up for interface breakage. For x86 32/86, these things get caught since it's where the bulk of the testing is done. > IMHO the easiest way to avoid potential incompatibility on any > architecture is to make sure they both source from the same > xen-unstable changeset. That calls for either > - Juan to handle the linux-2.6.tip-xen tree, or > - closer synchronization between you and Juan, or > - Juan to be able to snapshot the hypervisor using the same > xen-unstable changeset used in linux-2.6.tip-xen at any time. > > Maybe the last one would be easiest? Is it possible to > programmatically determine from the perspective of linux-2.6.tip-xen > the related xen-unstable changeset? The flow looks like this: xen-unstable (sparse tree cherry picks) -> linux-2.6-xen -> linux-2.6.tip-xen That first step records the xen-unstable cset number as part of the commit message. So when it hits linux-2.6.tip-xen that info is preserved, and can be culled programtically. Syncing the hv to that cset is not enough to guarantee compatibility, but should be pretty darn likely to work ;) The fedora side has additional changes which shouldn't be mixed with a pristine linux-2.6.tip-xen. thanks, -chris From aron at hp.com Wed Jun 28 11:59:16 2006 From: aron at hp.com (Aron Griffis) Date: Wed, 28 Jun 2006 07:59:16 -0400 Subject: [Fedora-xen] Re: [patch 0/4] elilo multiboot support In-Reply-To: <1151349678.29585.18.camel@orodruin.boston.redhat.com> References: <1151349678.29585.18.camel@orodruin.boston.redhat.com> Message-ID: <20060628115916.GE21655@olive.flatmonk> Jeremy Katz wrote: [Mon Jun 26 2006, 03:21:18PM EDT] > * dprintf is already included in the standard library as a GNU > extension, but with a different functionality -- something like > dbgprintf would be better just to avoid problems there renamed to dbgPrintf to match the style of the rest of the program. > * Instead of having the getLineByType2 thing, it would probably be a > little cleaner to just change the types to be a normal int instead of an > enum and then be able to determine matches via bitwise operators I left this an enum with explicit bit values. So you retain whatever advantage you gained using an enum, and only lose it when they're OR'd together for getLineByType. > In the bigger realm, there seems to be a bug or two lingering. Running > the test suite ('make test' from the toplevel) seems to fail for > x86/x86_64 with the patches applied -- it looks like we're gaining an > initrd in cases where it's unexpected (copy-default shouldn't be copying > the initrd, but it looks like it might be). Also, it looks like kernel > arguments might be getting lost in the multiboot case. I'll try to look > at this a little more later in the afternoon, but given how the past two > weeks have been "later in the afternoon" could end up being Friday :/ All of the test suite issues are fixed in the patch attached to this message. addNewKernel: - don't allow fall-through for LT_INITRD - don't corrupt the template, use a copy instead - don't forget to remove the prefix from the initrd - when converting a grub multiboot template to a normal entry, use the module template lines to preserve kernel parameters addLineTmpl: - set val=NULL for a bracketed title to prevent elements[1] being set isBracketedTitle: - change order of tests for correctness (not related to a failure) grubby/test/results/updargs/g3.7: - remove trailing spaces, they were only there because previous versions of grubby didn't quite handle EOL correctly grubby/test.sh: - current arch doesn't affect what tests can be run, so run them all The only test suite issue I didn't fix was related to symlink handling since I didn't touch that code. I think the code is attempting to resolve the symlink and create the temporary file next to the target, but the implementation is completely bogus at the moment (the output of readlink() doesn't change depending on cwd). > Also, it'd be nice to have some test cases to add to the test suite just > so that we can more easily ensure that minor bugfixes don't cause > regressions. Not included in this message, but I'll follow up with these too. Signed-off-by: Aron Griffis diff -r 57dd3b104446 -r 6964eee46f24 grubby/grubby.c --- a/grubby/grubby.c Tue Jun 27 19:09:26 2006 -0400 +++ b/grubby/grubby.c Wed Jun 28 07:44:20 2006 -0400 @@ -34,7 +34,7 @@ #define DEBUG 0 #if DEBUG -#define dbgPrintf(format, args...) printf(format , ## args) +#define dbgPrintf(format, args...) fprintf(stderr, format , ## args) #else #define dbgPrintf(format, args...) #endif @@ -89,10 +89,10 @@ struct singleEntry { /* These defines are (only) used in addNewKernel() */ #define NEED_KERNEL (1 << 0) -#define NEED_INITRD (1 << 2) -#define NEED_TITLE (1 << 3) -#define NEED_ARGS (1 << 4) -#define NEED_MB (1 << 5) +#define NEED_INITRD (1 << 1) +#define NEED_TITLE (1 << 2) +#define NEED_ARGS (1 << 3) +#define NEED_MB (1 << 4) #define MAIN_DEFAULT (1 << 0) #define DEFAULT_SAVED -2 @@ -321,6 +321,7 @@ struct singleEntry * findEntryByPath(str int * index); static int readFile(int fd, char ** bufPtr); static void lineInit(struct singleLine * line); +struct singleLine * lineDup(struct singleLine * line); static void lineFree(struct singleLine * line); static int lineWrite(FILE * out, struct singleLine * line, struct configFileInfo * cfi); @@ -403,7 +404,7 @@ static struct singleLine * getLineByType } static int isBracketedTitle(struct singleLine * line) { - if ((*line->elements[0].item == '[') && (line->numElements == 1)) { + if (line->numElements == 1 && *line->elements[0].item == '[') { int len = strlen(line->elements[0].item); if (*(line->elements[0].item + len - 1) == ']') { /* FIXME: this is a hack... */ @@ -467,6 +468,25 @@ static void lineInit(struct singleLine * line->elements = NULL; line->numElements = 0; line->next = NULL; +} + +struct singleLine * lineDup(struct singleLine * line) { + int i; + struct singleLine * newLine = malloc(sizeof(*newLine)); + + newLine->indent = strdup(line->indent); + newLine->next = NULL; + newLine->type = line->type; + newLine->numElements = line->numElements; + newLine->elements = malloc(sizeof(*newLine->elements) * + newLine->numElements); + + for (i = 0; i < newLine->numElements; i++) { + newLine->elements[i].indent = strdup(line->elements[i].indent); + newLine->elements[i].item = strdup(line->elements[i].item); + } + + return newLine; } static void lineFree(struct singleLine * line) { @@ -692,15 +712,8 @@ static struct grubConfig * readConfig(co * lines came earlier in the template, make sure to use LT_HYPER * instead of LT_KERNEL now */ - if (entry->multiboot) { - struct singleLine * l; - for (l = entry->lines; l; l = l->next) { - if (l->type == LT_MBMODULE) { - line->type = LT_HYPER; /* caught it! */ - break; - } - } - } + if (entry->multiboot) + line->type = LT_HYPER; } else if (line->type == LT_MBMODULE) { /* go back and fix the LT_KERNEL line to indicate LT_HYPER @@ -1540,20 +1553,7 @@ struct singleLine * addLineTmpl(struct s struct singleLine * tmplLine, struct singleLine * prevLine, const char * val) { - int i; - struct singleLine * newLine = malloc(sizeof(*newLine)); - - newLine->indent = strdup(tmplLine->indent); - newLine->next = NULL; - newLine->type = tmplLine->type; - newLine->numElements = tmplLine->numElements; - newLine->elements = malloc(sizeof(*newLine->elements) * - newLine->numElements); - - for (i = 0; i < newLine->numElements; i++) { - newLine->elements[i].indent = strdup(tmplLine->elements[i].indent); - newLine->elements[i].item = strdup(tmplLine->elements[i].item); - } + struct singleLine * newLine = lineDup(tmplLine); if (val) { /* override the inherited value with our own. @@ -1599,8 +1599,8 @@ struct singleLine * addLine(struct sing struct keywordTypes * kw; struct singleLine tmpl; - /* NB: This function shouldn't allocation items on the heap, but rather on - * the stack since it calls addLineTmpl which will make copies. + /* NB: This function shouldn't allocate items on the heap, rather on the + * stack since it calls addLineTmpl which will make copies. */ if (type == LT_TITLE && cfi->titleBracketed) { @@ -1611,6 +1611,7 @@ struct singleLine * addLine(struct sing tmpl.elements[0].item = alloca(strlen(val)+3); sprintf(tmpl.elements[0].item, "[%s]", val); tmpl.elements[0].indent = ""; + val = NULL; } else { kw = getKeywordByType(type, cfi); if (!kw) abort(); @@ -2199,7 +2200,7 @@ int addNewKernel(struct grubConfig * con char * newKernelArgs, char * newKernelInitrd, char * newMBKernel, char * newMBKernelArgs) { struct singleEntry * new; - struct singleLine * newLine = NULL, * tmplLine = NULL; + struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL; int needs; char * chptr; @@ -2240,7 +2241,10 @@ int addNewKernel(struct grubConfig * con } if (template) { - for (tmplLine = template->lines; tmplLine; tmplLine = tmplLine->next) { + for (masterLine = template->lines; + masterLine && (tmplLine = lineDup(masterLine)); + lineFree(tmplLine), masterLine = masterLine->next) + { /* skip comments */ chptr = tmplLine->indent; while (*chptr && isspace(*chptr)) chptr++; @@ -2295,23 +2299,10 @@ int addNewKernel(struct grubConfig * con } else if (tmplLine->type == LT_HYPER && tmplLine->numElements >= 2) { - if (new->multiboot) { - if (needs & NEED_MB) { - newLine = addLineTmpl(new, tmplLine, newLine, - newMBKernel + strlen(prefix)); - needs &= ~NEED_MB; - } - } else if (needs & NEED_KERNEL) { - /* template is multi but new is not, - * insert the kernel where the hypervisor was before - */ - tmplLine->type = LT_KERNEL; - free(tmplLine->elements[0].item); - tmplLine->elements[0].item = - strdup(getKeywordByType(LT_KERNEL, config->cfi)->key); + if (needs & NEED_MB) { newLine = addLineTmpl(new, tmplLine, newLine, - newKernelPath + strlen(prefix)); - needs &= ~NEED_KERNEL; + newMBKernel + strlen(prefix)); + needs &= ~NEED_MB; } } else if (tmplLine->type == LT_MBMODULE && @@ -2325,23 +2316,38 @@ int addNewKernel(struct grubConfig * con } else if (config->cfi->mbInitRdIsModule && (needs & NEED_INITRD)) { newLine = addLineTmpl(new, tmplLine, newLine, - newKernelInitrd); + newKernelInitrd + + strlen(prefix)); needs &= ~NEED_INITRD; } + } else if (needs & NEED_KERNEL) { + /* template is multi but new is not, + * insert the kernel in the first module slot + */ + tmplLine->type = LT_KERNEL; + free(tmplLine->elements[0].item); + tmplLine->elements[0].item = + strdup(getKeywordByType(LT_KERNEL, config->cfi)->key); + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelPath + strlen(prefix)); + needs &= ~NEED_KERNEL; } else if (needs & NEED_INITRD) { /* template is multi but new is not, - * insert the initrd where the module was before + * insert the initrd in the second module slot */ - newLine = addLine(new, config->cfi, LT_INITRD, - config->secondaryIndent, - newKernelInitrd + strlen(prefix)); + tmplLine->type = LT_INITRD; + free(tmplLine->elements[0].item); + tmplLine->elements[0].item = + strdup(getKeywordByType(LT_INITRD, config->cfi)->key); + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelInitrd + strlen(prefix)); needs &= ~NEED_INITRD; } } else if (tmplLine->type == LT_INITRD && - tmplLine->numElements >= 2 && - (needs & NEED_INITRD)) { - if (new->multiboot && !template->multiboot && + tmplLine->numElements >= 2) { + if (needs & NEED_INITRD && + new->multiboot && !template->multiboot && config->cfi->mbInitRdIsModule) { /* make sure we don't insert the module initrd * before the module kernel... if we don't do it here, @@ -2353,7 +2359,7 @@ int addNewKernel(struct grubConfig * con newKernelInitrd + strlen(prefix)); needs &= ~NEED_INITRD; } - } else { + } else if (needs & NEED_INITRD) { newLine = addLineTmpl(new, tmplLine, newLine, newKernelInitrd + strlen(prefix)); needs &= ~NEED_INITRD; diff -r 57dd3b104446 -r 6964eee46f24 grubby/test.sh --- a/grubby/test.sh Tue Jun 27 19:09:26 2006 -0400 +++ b/grubby/test.sh Wed Jun 28 07:44:20 2006 -0400 @@ -1,32 +1,4 @@ #!/bin/bash - -ARCH=$(uname -m) - -elilotest="" -lilotest="" -grubtest="" -zipltest="" -yaboottest="" - -case "$ARCH" in - i?86) - lilotest="yes" - grubtest="yes" - ;; - x86_64) - lilotest="yes" - grubtest="yes" - ;; - ppc*) - yaboottest="yes" - ;; - s390*) - zipltest="yes" - ;; - *) - echo "Not running any tests for $ARCH" - exit 0 -esac export MALLOC_CHECK_=2 @@ -47,35 +19,16 @@ oneTest () { echo -n " \"$arg\"" done echo "" - ./grubby $mode --bad-image-okay -c $cfg -o - "$@" | diff -u $correct -; + ./grubby $mode --bad-image-okay -c $cfg -o - "$@" | diff -u $correct - RESULT=1 fi } -liloTest() { - if [ -z "$lilotest" ]; then echo "skipping LILO test" ; return; fi - oneTest --lilo "$@" -} - -eliloTest() { - if [ -z "$elilotest" ]; then echo "skipping ELILO test" ; return; fi - oneTest --elilo "$@" -} - -grubTest() { - if [ -z "$grubtest" ]; then echo "skipping GRUB test" ; return; fi - oneTest --grub "$@" -} - -yabootTest() { - if [ -z "$yaboottest" ]; then echo "skipping YABOOT test" ; return; fi - oneTest --yaboot "$@" -} - -ziplTest() { - if [ -z "$zipltest" ]; then echo "skipping Z/IPL test" ; return; fi - oneTest --zipl "$@" -} +liloTest() { oneTest --${FUNCNAME%Test} "$@"; } +eliloTest() { oneTest --${FUNCNAME%Test} "$@"; } +grubTest() { oneTest --${FUNCNAME%Test} "$@"; } +yabootTest() { oneTest --${FUNCNAME%Test} "$@"; } +ziplTest() { oneTest --${FUNCNAME%Test} "$@"; } echo "Parse/write comparison..." for n in $(cd test; echo grub.[0-9]*); do @@ -120,7 +73,7 @@ if [ ! -L mytest ]; then if [ ! -L mytest ]; then echo " failed (not a symlink)" fi -target=$(ls -l mytest | awk '{ print $11 }') +target=$(readlink mytest) if [ "$target" != grub-test ]; then echo " failed (wrong target)" fi diff -r 57dd3b104446 -r 6964eee46f24 grubby/test/results/updargs/g3.7 --- a/grubby/test/results/updargs/g3.7 Tue Jun 27 19:09:26 2006 -0400 +++ b/grubby/test/results/updargs/g3.7 Wed Jun 28 07:44:20 2006 -0400 @@ -3,11 +3,11 @@ splashimage=(hd0,1)/grub/splash.xpm.gz splashimage=(hd0,1)/grub/splash.xpm.gz title Red Hat Linux (2.4.7-2smp) root (hd0,1) - kernel /vmlinuz-2.4.7-2smp + kernel /vmlinuz-2.4.7-2smp initrd /initrd-2.4.7-2smp.img title Red Hat Linux-up (2.4.7-2) root (hd0,1) - kernel /vmlinuz-2.4.7-2 + kernel /vmlinuz-2.4.7-2 initrd /initrd-2.4.7-2.img title DOS rootnoverify (hd0,0) -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 191 bytes Desc: not available URL: From pbruna at it-linux.cl Wed Jun 28 14:32:28 2006 From: pbruna at it-linux.cl (Patricio Bruna V.) Date: Wed, 28 Jun 2006 10:32:28 -0400 Subject: [Fedora-xen] Brigdes and network interfaces Message-ID: <200606281032.28473.pbruna@it-linux.cl> Are anyway, script, for create more bridges (beside xenbr0) and associate NICs to them? regards -- Patricio Bruna V. Red Hat Certified Engineer IT Linux Ltda. http://www.it-linux.cl Fono/Fax: (+56-2) 697 11 66 Cel: (+56-8) 288 51 95 From bench at silentmedia.com Wed Jun 28 16:57:25 2006 From: bench at silentmedia.com (Ben) Date: Wed, 28 Jun 2006 09:57:25 -0700 (PDT) Subject: [Fedora-xen] Brigdes and network interfaces In-Reply-To: <200606281032.28473.pbruna@it-linux.cl> References: <200606281032.28473.pbruna@it-linux.cl> Message-ID: Sure, but not with the fedora tools so far as I can tell. http://wiki.xensource.com/xenwiki/XenNetworking On Wed, 28 Jun 2006, Patricio Bruna V. wrote: > Are anyway, script, for create more bridges (beside xenbr0) and associate NICs > to them? > > regards > -- > Patricio Bruna V. > Red Hat Certified Engineer > IT Linux Ltda. > http://www.it-linux.cl > Fono/Fax: (+56-2) 697 11 66 > Cel: (+56-8) 288 51 95 > > -- > Fedora-xen mailing list > Fedora-xen at redhat.com > https://www.redhat.com/mailman/listinfo/fedora-xen > From berrange at redhat.com Wed Jun 28 20:08:26 2006 From: berrange at redhat.com (Daniel P. Berrange) Date: Wed, 28 Jun 2006 21:08:26 +0100 Subject: [Fedora-xen] Xen/libVirt GUI app: "Virtual Machine Manager" Message-ID: <20060628200826.GG28524@redhat.com> I'm pleased to make available the code for an early *development snapshot* of a graphical application for managing virtual machines. This application is using libvirt as its backend API for managing virtual machines, while the user interface is built in Python and GTK/Glade. The application allows monitoring of guest VM resource utilization / allocation. There are basic controls for controlling the run state of guest. There is also a VNC client widget (written in pure Python!) for displaying the virtual guest framebuffer on fully-virt machines: http://people.redhat.com/berrange/virt-manager/index.html This is a very early snapshot - lots of functionality isn't hooked up yet, the error handling is mostly not there, and there are certainly plenty of bugs. It should none-the-less give a reasonable feel for the kind of direction the application will evolve in. Furthermore the website includes the UI mockups done by our user interaction designers to show some of the ideas considered in ongoing development of the application. The RPMs linked to from the website should install on both Fedora Core 5[1] and Fedora Core 6 test1 [2]. The FAQ contains a list of explicit dependancies which should facilitate people trying to get it running on non Fedora Linux distros. BTW, for those at the Red Hat Summit in Nashville a few weeks back, this is the graphical app I talked about in my presentation on management tools for virtualized system[3] & showed some demos of. At the time I was calling it 'GNOME Virt Manager', but is now renamed 'Virtual Machine Manager' or 'virt-manager' for the binary command / package name. Regards, Dan. [1] You'll need libvirt-0.1.1 from updates-testing [2] The plan is to get the RPMs into Fedora Extras in time for FC6 [3] http://people.redhat.com/berrange/summit-2006/ -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=| From mads at kiilerich.com Wed Jun 28 22:16:37 2006 From: mads at kiilerich.com (Mads Kiilerich) Date: Thu, 29 Jun 2006 00:16:37 +0200 Subject: [Fedora-xen] 2.6.17-1.2139_FC5xen0: No network - no installation Message-ID: <44A2FFC5.5000302@kiilerich.com> Hi, I'm testing Xen on FC5 x86_64 and have some problems. I had it working when I was running dom0 on "core" packages. But when I install "updates" (and thus uses 2.6.17-1.2139_FC5xen0) it seems like there is no network connection from the installing domU machine to the dom0 machine. The FC installer can't get a connection to the ftp-server running on the dom0 host. No dhcp, no static ip connection, and no virtual network devices can be seen from dom0. I've tried to update my installation image as described on http://fedoraproject.org/wiki/FedoraXenQuickstartFC5 - that didn't solve my problem. I'm installing with e.g.: xenguest-install.py -n test1 -f /tmp/x -r 512 -l ftp://10.0.0.1/pub /etc/xen/test1 contains e.g.: name = "test1" memory = "512" disk = [ 'phy:/dev/VolGroup00/lv_test1,xvda,w' ] vif = [ 'mac=00:16:3e:68:3a:54' ] uuid = "41dc63c6-ba10-8e3b-d475-453677117f8a" bootloader="/usr/bin/pygrub" What am I doing wrong? /Mads From markmc at redhat.com Thu Jun 29 02:07:30 2006 From: markmc at redhat.com (Mark McLoughlin) Date: Thu, 29 Jun 2006 03:07:30 +0100 Subject: [Fedora-xen] 2.6.17-1.2139_FC5xen0: No network - no installation In-Reply-To: <44A2FFC5.5000302@kiilerich.com> References: <44A2FFC5.5000302@kiilerich.com> Message-ID: <1151546851.8204.3.camel@localhost.localdomain> Hi, On Thu, 2006-06-29 at 00:16 +0200, Mads Kiilerich wrote: > But when I install "updates" (and thus uses 2.6.17-1.2139_FC5xen0) it > seems like there is no network connection from the installing domU > machine to the dom0 machine. The FC installer can't get a connection to > the ftp-server running on the dom0 host. No dhcp, no static ip > connection, and no virtual network devices can be seen from dom0. Coincidentally, I've just tracked down something very similar in fc6test1/rawhide after a lot of poking. It turns out to be a libdhcp issue: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=197172 I don't think anaconda in FC5 updates uses libdhcp, so I doubt its the same issue but ... Cheers, Mark. From aron at hp.com Thu Jun 29 21:42:38 2006 From: aron at hp.com (Aron Griffis) Date: Thu, 29 Jun 2006 17:42:38 -0400 Subject: [Fedora-xen] [PATCH 6 of 6] Update new-kernel-pkg to support elilo w/ multiboot In-Reply-To: Message-ID: # HG changeset patch # User agriffis at cheo.zko.hp.com # Node ID c4bc9fbc2487083f4033f498cd7e6f1efd7af6bf # Parent c21b0cf582a12df3f29601fca13f9ac82cf0ff06 Update new-kernel-pkg to support elilo w/ multiboot Additionally fix multiple /sbin/grubby instances to use the variable from the top of the script. Signed-off-by: Aron Griffis new-kernel-pkg | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff -r c21b0cf582a1 -r c4bc9fbc2487 grubby/new-kernel-pkg --- a/grubby/new-kernel-pkg Thu Jun 29 17:01:05 2006 -0400 +++ b/grubby/new-kernel-pkg Thu Jun 29 17:06:02 2006 -0400 @@ -125,7 +125,7 @@ install() { fi fi - if [ -n "$mbkernel" ]; then + if [ -n "$mbkernel" -a -n "$cfgLilo" -a "$liloFlag" != "elilo" ]; then [ -n "$verbose" ] && echo "multiboot specified, not updating lilo.conf" cfgLilo="" fi @@ -140,7 +140,7 @@ install() { else title="Red Hat Linux ($version)" fi - /sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version \ + $grubby --add-kernel=$bootPrefix/$kernelName-$version \ $INITRD --copy-default $makedefault --title "$title" \ ${mbkernel:+--add-multiboot="$mbkernel"} ${mbargs:+--mbargs="$mbargs"} \ --args="root=$rootdevice $kernargs" --remove-kernel="TITLE=$title" @@ -151,11 +151,11 @@ install() { if [ -n "$cfgLilo" ]; then [ -n "$verbose" ] && echo "adding $version to $liloConfig" - /sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ - --copy-default $makedefault --title $version \ - --args="root=$rootdevice $kernargs" \ - --remove-kernel="TITLE=$version" \ - --$liloFlag + $grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ + --copy-default $makedefault --title $version \ + ${mbkernel:+--add-multiboot="$mbkernel"} ${mbargs:+--mbargs="$mbargs"} \ + --args="root=$rootdevice $kernargs" --remove-kernel="TITLE=$version" \ + --$liloFlag if [ -n "$runLilo" ]; then [ -n "$verbose" ] && echo "running $lilo" @@ -181,14 +181,14 @@ remove() { if [ -n "$cfgGrub" ]; then [ -n "$verbose" ] && echo "removing $version from $grubConfig" - /sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version + $grubby --remove-kernel=$bootPrefix/$kernelName-$version else [ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby" fi if [ -n "$cfgLilo" ]; then [ -n "$verbose" ] && echo "removing $version from $liloConfig" - /sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version \ + $grubby --remove-kernel=$bootPrefix/$kernelName-$version \ --$liloFlag if [ -n "$runLilo" ]; then @@ -207,7 +207,7 @@ update() { update() { if [ -n "$cfgGrub" ]; then [ -n "$verbose" ] && echo "updating $version from $grubConfig" - /sbin/grubby --update-kernel=$bootPrefix/$kernelName-$version \ + $grubby --update-kernel=$bootPrefix/$kernelName-$version \ ${kernargs:+--args="$kernargs"} \ ${removeargs:+--remove-args="$removeargs"} else @@ -216,7 +216,7 @@ update() { if [ -n "$cfgLilo" ]; then [ -n "$verbose" ] && echo "updating $version from $liloConfig" - /sbin/grubby --update-kernel=$bootPrefix/$kernelName-$version \ + $grubby --update-kernel=$bootPrefix/$kernelName-$version \ ${kernargs:+--args="$kernargs"} \ ${removeargs:+--remove-args="$removeargs"} \ --$liloFlag From aron at hp.com Thu Jun 29 21:42:34 2006 From: aron at hp.com (Aron Griffis) Date: Thu, 29 Jun 2006 17:42:34 -0400 Subject: [Fedora-xen] [PATCH 2 of 6] Add new generic functions In-Reply-To: Message-ID: <42e7d064ab2666bad84f.1151617354@vino.zko.hp.com> # HG changeset patch # User agriffis at cheo.zko.hp.com # Node ID 42e7d064ab2666bad84fc61f0465bee4f7c79d65 # Parent 8bbf845cad0dc1774c348f036d4eaa0365aef7e9 Add new generic functions This patch adds some generic functions to make extending grubby a little easier, and makes changes throughout the code to take advantage of them. - new function for duplicating a line (deep copy): dupLine - new functions for manipulating singleLine->element arrays: insertElement removeElement - new functions for matching keywords to types: getKeywordByType getTypeByKeyword - new functions for search an entry for lines matching a bitmask of types: getLineByType - new function for inserting a line to an entry from a template: addLineTmpl - simple debugging via dbgPrintf, which is normally compiled out Grubby builds with this patch and introduces no regressions. Signed-off-by: Aron Griffis grubby.c | 452 ++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 287 insertions(+), 165 deletions(-) diff -r 8bbf845cad0d -r 42e7d064ab26 grubby/grubby.c --- a/grubby/grubby.c Thu Jun 29 12:21:58 2006 -0400 +++ b/grubby/grubby.c Thu Jun 29 16:10:13 2006 -0400 @@ -31,6 +31,14 @@ #include "block.h" +#define DEBUG 0 + +#if DEBUG +#define dbgPrintf(format, args...) fprintf(stderr, format , ## args) +#else +#define dbgPrintf(format, args...) +#endif + #define _(A) (A) #define CODE_SEG_SIZE 128 /* code segment checked by --bootloader-probe */ @@ -41,9 +49,23 @@ struct lineElement { char * indent; }; -enum lineType_e { LT_WHITESPACE, LT_TITLE, LT_KERNEL, LT_INITRD, LT_DEFAULT, - LT_UNKNOWN, LT_ROOT, LT_FALLBACK, LT_KERNELARGS, LT_BOOT, - LT_BOOTROOT, LT_LBA, LT_MBMODULE, LT_OTHER, LT_GENERIC }; +enum lineType_e { + LT_WHITESPACE = 1 << 0, + LT_TITLE = 1 << 1, + LT_KERNEL = 1 << 2, + LT_INITRD = 1 << 3, + LT_DEFAULT = 1 << 5, + LT_MBMODULE = 1 << 6, + LT_ROOT = 1 << 7, + LT_FALLBACK = 1 << 8, + LT_KERNELARGS = 1 << 9, + LT_BOOT = 1 << 10, + LT_BOOTROOT = 1 << 11, + LT_LBA = 1 << 12, + LT_OTHER = 1 << 13, + LT_GENERIC = 1 << 14, + LT_UNKNOWN = 1 << 15, +}; struct singleLine { char * indent; @@ -77,7 +99,7 @@ struct keywordTypes { char * key; enum lineType_e type; char nextChar; -} ; +}; struct configFileInfo { char * defaultConfig; @@ -258,19 +280,28 @@ struct grubConfig { struct configFileInfo * cfi; }; - struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index); struct singleEntry * findEntryByPath(struct grubConfig * cfg, const char * path, const char * prefix, int * index); static int readFile(int fd, char ** bufPtr); static void lineInit(struct singleLine * line); +struct singleLine * lineDup(struct singleLine * line); static void lineFree(struct singleLine * line); static int lineWrite(FILE * out, struct singleLine * line, struct configFileInfo * cfi); static int getNextLine(char ** bufPtr, struct singleLine * line, struct configFileInfo * cfi); static char * getRootSpecifier(char * str); +static void insertElement(struct singleLine * line, + const char * item, int insertHere); +static void removeElement(struct singleLine * line, int removeHere); +static struct keywordTypes * getKeywordByType(enum lineType_e type, + struct configFileInfo * cfi); +static enum lineType_e getTypeByKeyword(char * keyword, + struct configFileInfo * cfi); +static struct singleLine * getLineByType(enum lineType_e type, + struct singleLine * line); static char * sdupprintf(const char *format, ...) #ifdef __GNUC__ @@ -305,8 +336,40 @@ static char * sdupprintf(const char *for return buf; } +static struct keywordTypes * getKeywordByType(enum lineType_e type, + struct configFileInfo * cfi) { + struct keywordTypes * kw; + for (kw = cfi->keywords; kw->key; kw++) { + if (kw->type == type) + return kw; + } + return NULL; +} + +static enum lineType_e getTypeByKeyword(char * keyword, + struct configFileInfo * cfi) { + struct keywordTypes * kw; + for (kw = cfi->keywords; kw->key; kw++) { + if (!strcmp(keyword, kw->key)) + return kw->type; + } + return LT_UNKNOWN; +} + +static struct singleLine * getLineByType(enum lineType_e type, + struct singleLine * line) { + dbgPrintf("getLineByType(%d): ", type); + for (; line; line = line->next) { + dbgPrintf("%d:%s ", line->type, + line->numElements ? line->elements[0].item : "(empty)"); + if (line->type & type) break; + } + dbgPrintf(line ? "\n" : " (failed)\n"); + return line; +} + static int isBracketedTitle(struct singleLine * line) { - if ((*line->elements[0].item == '[') && (line->numElements == 1)) { + if (line->numElements == 1 && *line->elements[0].item == '[') { int len = strlen(line->elements[0].item); if (*(line->elements[0].item + len - 1) == ']') { /* FIXME: this is a hack... */ @@ -318,19 +381,10 @@ static int isBracketedTitle(struct singl return 0; } -/* figure out if this is a entry separator */ static int isEntrySeparator(struct singleLine * line, struct configFileInfo * cfi) { - if (line->type == LT_WHITESPACE) - return 0; - if (line->type == cfi->entrySeparator) - return 1; - if (line->type == LT_OTHER) - return 1; - if (cfi->titleBracketed && isBracketedTitle(line)) { - return 1; - } - return 0; + return line->type == cfi->entrySeparator || line->type == LT_OTHER || + (cfi->titleBracketed && isBracketedTitle(line)); } /* extract the title from within brackets (for zipl) */ @@ -381,6 +435,25 @@ static void lineInit(struct singleLine * line->next = NULL; } +struct singleLine * lineDup(struct singleLine * line) { + int i; + struct singleLine * newLine = malloc(sizeof(*newLine)); + + newLine->indent = strdup(line->indent); + newLine->next = NULL; + newLine->type = line->type; + newLine->numElements = line->numElements; + newLine->elements = malloc(sizeof(*newLine->elements) * + newLine->numElements); + + for (i = 0; i < newLine->numElements; i++) { + newLine->elements[i].indent = strdup(line->elements[i].indent); + newLine->elements[i].item = strdup(line->elements[i].item); + } + + return newLine; +} + static void lineFree(struct singleLine * line) { int i; @@ -425,9 +498,7 @@ static int getNextLine(char ** bufPtr, s char * chptr; int elementsAlloced = 0; struct lineElement * element; - struct keywordTypes * keywords = cfi->keywords; int first = 1; - int i; lineFree(line); @@ -481,14 +552,8 @@ static int getNextLine(char ** bufPtr, s if (!line->numElements) line->type = LT_WHITESPACE; else { - for (i = 0; keywords[i].key; i++) - if (!strcmp(line->elements[0].item, keywords[i].key)) break; - - if (keywords[i].key) { - line->type = keywords[i].type; - } else { - line->type = LT_UNKNOWN; - + line->type = getTypeByKeyword(line->elements[0].item, cfi); + if (line->type == LT_UNKNOWN) { /* zipl does [title] instead of something reasonable like all * the other boot loaders. kind of ugly */ if (cfi->titleBracketed && isBracketedTitle(line)) { @@ -761,8 +826,7 @@ static void writeDefault(FILE * out, cha if (!entry) return; - line = entry->lines; - while (line && line->type != LT_TITLE) line = line->next; + line = getLineByType(LT_TITLE, entry->lines); if (line && line->numElements >= 2) fprintf(out, "%sdefault%s%s\n", indent, separator, @@ -913,12 +977,10 @@ int suitableImage(struct singleEntry * e char * dev; char * rootspec; - line = entry->lines; - while (line && line->type != LT_KERNEL) line = line->next; - - if (!line) return 0; if (skipRemoved && entry->skip) return 0; - if (line->numElements < 2) return 0; + + line = getLineByType(LT_KERNEL, entry->lines); + if (!line || line->numElements < 2) return 0; if (flags & GRUBBY_BADIMAGE_OKAY) return 1; @@ -926,8 +988,7 @@ int suitableImage(struct singleEntry * e strlen(line->elements[1].item) + 1); rootspec = getRootSpecifier(line->elements[1].item); sprintf(fullName, "%s%s", bootPrefix, - line->elements[1].item + ((rootspec != NULL) ? - strlen(rootspec) : 0)); + line->elements[1].item + (rootspec ? strlen(rootspec) : 0)); if (access(fullName, R_OK)) return 0; for (i = 2; i < line->numElements; i++) @@ -936,19 +997,15 @@ int suitableImage(struct singleEntry * e dev = line->elements[i].item + 5; } else { /* look for a lilo style LT_ROOT line */ - line = entry->lines; - while (line && line->type != LT_ROOT) line = line->next; + line = getLineByType(LT_ROOT, entry->lines); if (line && line->numElements >= 2) { dev = line->elements[1].item; } else { - int type; - /* didn't succeed in finding a LT_ROOT, let's try LT_KERNELARGS */ - line = entry->lines; - - type = ((entry->multiboot) ? LT_MBMODULE : LT_KERNELARGS); - - while (line && line->type != type) line = line->next; + /* didn't succeed in finding a LT_ROOT, let's try LT_KERNELARGS. + * grub+multiboot uses LT_MBMODULE for the args, so check that too. + */ + line = getLineByType(LT_KERNELARGS|LT_MBMODULE, entry->lines); /* failed to find one */ if (!line) return 0; @@ -1019,10 +1076,7 @@ struct singleEntry * findEntryByPath(str entry = findEntryByIndex(config, indexVars[i]); if (!entry) return NULL; - line = entry->lines; - while (line && line->type != LT_KERNEL) - line = line->next; - + line = getLineByType(LT_KERNEL, entry->lines); if (!line) return NULL; if (index) *index = indexVars[i]; @@ -1064,47 +1118,35 @@ struct singleEntry * findEntryByPath(str kernel += 6; } - while ((entry = findEntryByIndex(config, i))) { - line = entry->lines; - while (line && line->type != checkType) line=line->next; - - - if (line && line->numElements >= 2 && !entry->skip) { - rootspec = getRootSpecifier(line->elements[1].item); - if (!strcmp(line->elements[1].item + - ((rootspec != NULL) ? strlen(rootspec) : 0), - kernel + strlen(prefix))) - break; - } - - /* have to check multiboot lines too */ - if (entry->multiboot) { - while (line && line->type != LT_MBMODULE) line = line->next; - if (line && line->numElements >= 2 && !entry->skip) { - rootspec = getRootSpecifier(line->elements[1].item); - if (!strcmp(line->elements[1].item + - ((rootspec != NULL) ? strlen(rootspec) : 0), - kernel + strlen(prefix))) - break; - } - } - - i++; + for (entry = findEntryByIndex(config, i); entry; entry = entry->next, i++) { + if (entry->skip) continue; + + dbgPrintf("findEntryByPath looking for %d %s in %p\n", checkType, kernel, entry); + + /* check all the lines matching checkType */ + for (line = entry->lines; line; line = line->next) { + line = getLineByType(entry->multiboot && checkType == LT_KERNEL ? + LT_KERNEL|LT_MBMODULE : checkType, line); + if (!line) break; /* not found in this entry */ + + if (line && line->numElements >= 2) { + rootspec = getRootSpecifier(line->elements[1].item); + if (!strcmp(line->elements[1].item + + ((rootspec != NULL) ? strlen(rootspec) : 0), + kernel + strlen(prefix))) + break; + } + } + + /* make sure this entry has a kernel identifier; this skips + * non-Linux boot entries (could find netbsd etc, though, which is + * unfortunate) + */ + if (line && getLineByType(LT_KERNEL, entry->lines)) + break; /* found 'im! */ } if (index) *index = i; - } - - if (!entry) return NULL; - - /* make sure this entry has a kernel identifier; this skips non-Linux - boot entries (could find netbsd etc, though, which is unfortunate) */ - line = entry->lines; - while (line && line->type != LT_KERNEL) line = line->next; - if (!line) { - if (!index) index = &i; - (*index)++; - return findEntryByPath(config, kernel, prefix, index); } return entry; @@ -1271,11 +1313,9 @@ void displayEntry(struct singleEntry * e char * root = NULL; int i; - line = entry->lines; - while (line && line->type != LT_KERNEL) line = line->next; - printf("index=%d\n", index); + line = getLineByType(LT_KERNEL, entry->lines); printf("kernel=%s\n", line->elements[1].item); if (line->numElements >= 3) { @@ -1293,9 +1333,7 @@ void displayEntry(struct singleEntry * e } printf("\"\n"); } else { - line = entry->lines; - while (line && line->type != LT_KERNELARGS) line=line->next; - + line = getLineByType(LT_KERNELARGS, entry->lines); if (line) { char * s; @@ -1319,9 +1357,7 @@ void displayEntry(struct singleEntry * e } if (!root) { - line = entry->lines; - while (line && line->type != LT_ROOT) line = line->next; - + line = getLineByType(LT_ROOT, entry->lines); if (line && line->numElements >= 2) root=line->elements[1].item; } @@ -1336,8 +1372,7 @@ void displayEntry(struct singleEntry * e printf("root=%s\n", s); } - line = entry->lines; - while (line && line->type != LT_INITRD) line = line->next; + line = getLineByType(LT_INITRD, entry->lines); if (line && line->numElements >= 2) { printf("initrd=%s", prefix); @@ -1421,14 +1456,12 @@ int displayInfo(struct grubConfig * conf if (config->cfi == &grubConfigType) { dumpSysconfigGrub(); } else { - line = config->theLines; - while (line && line->type != LT_BOOT) line = line->next; + line = getLineByType(LT_BOOT, config->theLines); if (line && line->numElements >= 1) { printf("boot=%s\n", line->elements[1].item); } - line = config->theLines; - while (line && line->type != LT_LBA) line = line->next; + line = getLineByType(LT_LBA, config->theLines); if (line) printf("lba\n"); } @@ -1443,77 +1476,100 @@ int displayInfo(struct grubConfig * conf return 0; } +struct singleLine * addLineTmpl(struct singleEntry * entry, + struct singleLine * tmplLine, + struct singleLine * prevLine, + const char * val) { + struct singleLine * newLine = lineDup(tmplLine); + + if (val) { + /* override the inherited value with our own. + * This is a little weak because it only applies to elements[1] + */ + if (newLine->numElements > 1) + removeElement(newLine, 1); + insertElement(newLine, val, 1); + + /* but try to keep the rootspec from the template... sigh */ + if (tmplLine->type & (LT_KERNEL|LT_MBMODULE|LT_INITRD)) { + char * rootspec = getRootSpecifier(tmplLine->elements[1].item); + if (rootspec != NULL) { + free(newLine->elements[1].item); + newLine->elements[1].item = + sdupprintf("%s%s", rootspec, val); + } + } + } + + dbgPrintf("addLineTmpl(%s)\n", newLine->numElements ? + newLine->elements[0].item : ""); + + if (!entry->lines) { + /* first one on the list */ + entry->lines = newLine; + } else if (prevLine) { + /* add after prevLine */ + newLine->next = prevLine->next; + prevLine->next = newLine; + } + + return newLine; +} + /* val may be NULL */ struct singleLine * addLine(struct singleEntry * entry, struct configFileInfo * cfi, - enum lineType_e type, const char * defaultIndent, - char * val) { + enum lineType_e type, char * defaultIndent, + const char * val) { struct singleLine * line, * prev; - int i; - - for (i = 0; cfi->keywords[i].key; i++) - if (cfi->keywords[i].type == type) break; - if (type != LT_TITLE || !cfi->titleBracketed) - if (!cfi->keywords[i].key) abort(); + struct keywordTypes * kw; + struct singleLine tmpl; + + /* NB: This function shouldn't allocate items on the heap, rather on the + * stack since it calls addLineTmpl which will make copies. + */ + + if (type == LT_TITLE && cfi->titleBracketed) { + /* we're doing a bracketed title (zipl) */ + tmpl.type = type; + tmpl.numElements = 1; + tmpl.elements = alloca(sizeof(*tmpl.elements)); + tmpl.elements[0].item = alloca(strlen(val)+3); + sprintf(tmpl.elements[0].item, "[%s]", val); + tmpl.elements[0].indent = ""; + val = NULL; + } else { + kw = getKeywordByType(type, cfi); + if (!kw) abort(); + tmpl.type = type; + tmpl.numElements = val ? 2 : 1; + tmpl.elements = alloca(sizeof(*tmpl.elements) * tmpl.numElements); + tmpl.elements[0].item = kw->key; + tmpl.elements[0].indent = alloca(2); + sprintf(tmpl.elements[0].indent, "%c", kw->nextChar); + if (val) { + tmpl.elements[1].item = (char *)val; + tmpl.elements[1].indent = ""; + } + } /* The last non-empty line gives us the indention to us and the line to insert after. Note that comments are considered empty lines, which may not be ideal? If there are no lines or we are looking at the first line, we use defaultIndent (the first line is normally indented differently from the rest) */ - if (entry->lines) { - line = entry->lines; - prev = NULL; - while (line) { - if (line->numElements) prev = line; - line = line->next; - } - if (!prev) { - /* just use the last line */ - prev = entry->lines; - while (prev->next) prev = prev->next; - } - - line = prev->next; - prev->next = malloc(sizeof(*line)); - prev->next->next = line; - line = prev->next; - - if (prev == entry->lines) - line->indent = strdup(defaultIndent); - else - line->indent = strdup(prev->indent); - } else { - line = malloc(sizeof(*line)); - line->indent = strdup(defaultIndent); - line->next = NULL; - } - - if (type != LT_TITLE || !cfi->titleBracketed) { - line->type = type; - line->numElements = val ? 2 : 1; - line->elements = malloc(sizeof(*line->elements) * line->numElements); - line->elements[0].item = strdup(cfi->keywords[i].key); - line->elements[0].indent = malloc(2); - line->elements[0].indent[0] = cfi->keywords[i].nextChar; - line->elements[0].indent[1] = '\0'; - - if (val) { - line->elements[1].item = val; - line->elements[1].indent = strdup(""); - } - } else { - /* we're doing the title of a bracketed title (zipl) */ - line->type = type; - line->numElements = 1; - line->elements = malloc(sizeof(*line->elements) * line->numElements); - - line->elements[0].item = malloc(strlen(val) + 3); - sprintf(line->elements[0].item, "[%s]", val); - line->elements[0].indent = strdup(""); - } - - return line; + for (line = entry->lines, prev = NULL; line; line = line->next) { + if (line->numElements) prev = line; + /* fall back on the last line if prev isn't otherwise set */ + if (!line->next && !prev) prev = line; + } + + if (prev == entry->lines) + tmpl.indent = defaultIndent ?: ""; + else + tmpl.indent = prev->indent; + + return addLineTmpl(entry, &tmpl, prev, val); } void removeLine(struct singleEntry * entry, struct singleLine * line) { @@ -1536,6 +1592,73 @@ void removeLine(struct singleEntry * ent } free(line); +} + +static void insertElement(struct singleLine * line, + const char * item, int insertHere) { + + /* sanity check */ + if (insertHere > line->numElements) { + dbgPrintf("insertElement() adjusting insertHere from %d to %d\n", + insertHere, line->numElements); + insertHere = line->numElements; + } + + line->elements = realloc(line->elements, (line->numElements + 1) * + sizeof(*line->elements)); + memmove(&line->elements[insertHere+1], + &line->elements[insertHere], + (line->numElements - insertHere) * + sizeof(*line->elements)); + line->elements[insertHere].item = strdup(item); + + if (insertHere > 0 && line->elements[insertHere-1].indent[0] == '\0') { + /* move the end-of-line forward */ + line->elements[insertHere].indent = + line->elements[insertHere-1].indent; + line->elements[insertHere-1].indent = strdup(" "); + } else { + /* technically this should honor nextChar from keywordTypes + * when insertHere == 0, but oh well + */ + line->elements[insertHere].indent = + strdup(insertHere == line->numElements ? "" : " "); + } + + line->numElements++; + + dbgPrintf("insertElement(%s, '%s%s', %d)\n", + line->elements[0].item, + line->elements[insertHere].item, + line->elements[insertHere].indent, + insertHere); +} + +static void removeElement(struct singleLine * line, int removeHere) { + int i; + + /* sanity check */ + if (removeHere >= line->numElements) return; + + dbgPrintf("removeElement(%s, %d:%s)\n", line->elements[0].item, + removeHere, line->elements[removeHere].item); + + free(line->elements[removeHere].item); + + if (removeHere > 1) { + /* previous argument gets this argument's post-indentation */ + free(line->elements[removeHere-1].indent); + line->elements[removeHere-1].indent = + line->elements[removeHere].indent; + } else { + free(line->elements[removeHere].indent); + } + + /* now collapse the array, but don't bother to realloc smaller */ + for (i = removeHere; i < line->numElements - 1; i++) + line->elements[i] = line->elements[i + 1]; + + line->numElements--; } int argMatch(const char * one, const char * two) { @@ -2546,8 +2669,7 @@ int main(int argc, const char ** argv) { if (!entry) return 0; if (!suitableImage(entry, bootPrefix, 0, flags)) return 0; - line = entry->lines; - while (line && line->type != LT_KERNEL) line = line->next; + line = getLineByType(LT_KERNEL, entry->lines); if (!line) return 0; rootspec = getRootSpecifier(line->elements[1].item); From aron at hp.com Thu Jun 29 21:42:33 2006 From: aron at hp.com (Aron Griffis) Date: Thu, 29 Jun 2006 17:42:33 -0400 Subject: [Fedora-xen] [PATCH 1 of 6] Improve the test suite In-Reply-To: Message-ID: <8bbf845cad0dc1774c34.1151617353@vino.zko.hp.com> # HG changeset patch # User agriffis at cheo.zko.hp.com # Node ID 8bbf845cad0dc1774c348f036d4eaa0365aef7e9 # Parent 447ac07ef71dc6bb49376f5b0164823a8e8a38e0 Improve the test suite - By default, run all the tests, regardless of architecture. Since the test suite calls grubby and not the bootloaders themselves, there's no reason to be selective. - Add command-line parsing: -b B --bootloader=B Test bootloader B instead of all -h --help Show this help message -v --verbose Verbose output --version Show version information - Run parse/write checks on all bootloaders instead of just grub and lilo - Print statistics at the end of the run - NB: These changes reveal that yaboot parsing has some issues. Additionally the symlink test now returns failure, which wasn't being detected properly before. So... current test results are: 112 (93%) tests passed, 8 (6%) tests failed Signed-off-by: Aron Griffis test.sh | 308 ++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 165 insertions(+), 143 deletions(-) diff -r 447ac07ef71d -r 8bbf845cad0d grubby/test.sh --- a/grubby/test.sh Fri Jun 23 09:01:37 2006 -0400 +++ b/grubby/test.sh Thu Jun 29 12:21:58 2006 -0400 @@ -1,132 +1,150 @@ #!/bin/bash - -ARCH=$(uname -m) - -elilotest="" -lilotest="" -grubtest="" -zipltest="" -yaboottest="" - -case "$ARCH" in - i?86) - lilotest="yes" - grubtest="yes" - ;; - x86_64) - lilotest="yes" - grubtest="yes" - ;; - ppc*) - yaboottest="yes" - ;; - s390*) - zipltest="yes" - ;; - *) - echo "Not running any tests for $ARCH" - exit 0 -esac - -export MALLOC_CHECK_=2 - -RESULT=0 - -oneTest () { - mode=$1 - cfg=test/$2 - correct=test/results/$3 - shift; shift; shift - ./grubby $mode --bad-image-okay -c $cfg -o - "$@" | cmp $correct > /dev/null - - if [ $? != 0 ]; then +# +# test.sh -- grubby regression tests +# + +#---------------------------------------------------------------------- +# Global vars +#---------------------------------------------------------------------- + +read dum1 version dum2 <<<'$Revision: 0.0 $' +cmd=${0##*/} +opt_bootloader=* +opt_verbose=false +read -d '' usage < /dev/null; then + (( pass++ )) + if $opt_verbose; then + echo ------------------------------------------------------------- + echo -n "PASS: " + printf "%q " "${runme[@]}"; echo + "${runme[@]}" | diff -U30 "$cfg" - + echo + fi + else + (( fail++ )) echo ------------------------------------------------------------- - echo FAILURE: $cfg $correct "$@" - echo -n ./grubby $mode --bad-image-okay -c $cfg -o - - for arg in "$@"; do - echo -n " \"$arg\"" - done - echo "" - ./grubby $mode --bad-image-okay -c $cfg -o - "$@" | diff -u $correct -; - RESULT=1 + echo -n "FAIL: " + printf "%q " "${runme[@]}"; echo + "${runme[@]}" | diff -U30 "$correct" - + echo fi } -liloTest() { - if [ -z "$lilotest" ]; then echo "skipping LILO test" ; return; fi - oneTest --lilo "$@" -} - -eliloTest() { - if [ -z "$elilotest" ]; then echo "skipping ELILO test" ; return; fi - oneTest --elilo "$@" -} - -grubTest() { - if [ -z "$grubtest" ]; then echo "skipping GRUB test" ; return; fi - oneTest --grub "$@" -} - -yabootTest() { - if [ -z "$yaboottest" ]; then echo "skipping YABOOT test" ; return; fi - oneTest --yaboot "$@" -} - -ziplTest() { - if [ -z "$zipltest" ]; then echo "skipping Z/IPL test" ; return; fi - oneTest --zipl "$@" -} - -echo "Parse/write comparison..." -for n in $(cd test; echo grub.[0-9]*); do - grubTest $n ../$n --remove-kernel 1234 -done - -for n in $(cd test; echo lilo.[0-9]*); do - liloTest $n ../$n --remove-kernel 1234 -done - -echo "Permission preservation..." -cp test/grub.1 grub-test -chmod 0614 grub-test -touch -t 200301010101.00 grub-test -time=$(ls -l grub-test | awk '{ print $6 " " $7 " "$8}') -perm=$(ls -l grub-test | awk '{print $1}') -./grubby --grub --add-kernel bar --title title -c grub-test -newtime=$(ls -l grub-test | awk '{ print $6 " " $7 " "$8}') -newperm=$(ls -l grub-test | awk '{print $1}') -if [ "$time" == "$newtime" -o "$perm" != "$newperm" ]; then - echo " failed ($perm $newperm)"; -fi -rm -f grub-test - -cp test/lilo.1 lilo-test -chmod 0614 lilo-test -touch -t 200301010101.00 lilo-test -time=$(ls -l lilo-test | awk '{ print $6 " " $7 " "$8}') -perm=$(ls -l lilo-test | awk '{print $1}') -./grubby --lilo --add-kernel bar --title title -c lilo-test -newtime=$(ls -l lilo-test | awk '{ print $6 " " $7 " "$8}') -newperm=$(ls -l lilo-test | awk '{print $1}') -if [ "$time" == "$newtime" -o "$perm" != "$newperm" ]; then - echo " failed ($perm $newperm)"; -fi -rm -f lilo-test - -echo "Following symlinks..." -cp test/grub.1 grub-test -ln -s grub-test mytest -./grubby --grub --add-kernel bar --title title -c mytest -if [ ! -L mytest ]; then - echo " failed (not a symlink)" -fi -target=$(ls -l mytest | awk '{ print $11 }') -if [ "$target" != grub-test ]; then - echo " failed (wrong target)" -fi -rm -f grub-test mytest - -echo "GRUB default directive..." +# generate convenience functions +for b in $(./grubby --help | \ + sed -n 's/^.*--\([^ ]*\) *configure \1 bootloader$/\1/p'); do + eval "${b}Test() { [[ \"$b\" == \$opt_bootloader ]] && oneTest --$b \"\$@\"; }" +done + +#---------------------------------------------------------------------- +# Main +#---------------------------------------------------------------------- + +# Use /usr/bin/getopt which supports GNU-style long options +args=$(getopt -o b:hv --long bootloader,help,verbose,version -n "$cmd" -- "$@") || exit +eval set -- "$args" +while true; do + case $1 in + -b|--bootloader) opt_bootloader=$2; shift 2 ;; + -h|--help) echo "$usage"; exit 0 ;; + -v|--verbose) opt_verbose=true; shift ;; + --version) echo "$cmd $version"; exit 0 ;; + --) shift; break ;; + *) echo "failed to process cmdline args" >&2; exit 1 ;; + esac +done + +export MALLOC_CHECK_=2 + +testing="Parse/write comparison" +for n in test/*.[0-9]*; do + n=${n#*/} # remove test/ + b=${n%.*} # remove suffix + [[ $b == $opt_bootloader ]] || continue + ${b}Test $n ../$n --remove-kernel 1234 +done + +testing="Permission preservation" +unset b +for n in test/*.[0-9]*; do + n=${n#*/} # remove test/ + [[ ${n%.*} == "$b" ]] && continue + b=${n%.*} # remove suffix + [[ $b == $opt_bootloader ]] || continue + + echo "$testing ... --$b" + + cp test/$n ${b}-test + chmod 0614 ${b}-test + touch -t 200301010101.00 ${b}-test + time=$(ls -l ${b}-test | awk '{ print $6 " " $7 " "$8}') + perm=$(ls -l ${b}-test | awk '{print $1}') + ./grubby --${b} --add-kernel bar --title title -c ${b}-test + if [[ $? != 0 ]]; then + echo " FAIL (grubby returned non-zero)" + (( fail++ )) + elif newtime=$(ls -l ${b}-test | awk '{ print $6 " " $7 " "$8}') && \ + newperm=$(ls -l ${b}-test | awk '{print $1}') && \ + [[ $time == "$newtime" || $perm != "$newperm" ]] + then + echo " FAIL ($perm $newperm)"; + (( fail++ )) + else + (( pass++ )) + fi + rm -f ${b}-test +done + +testing="Following symlinks" +unset b +for n in test/*.[0-9]*; do + n=${n#*/} # remove test/ + [[ ${n%.*} == "$b" ]] && continue + b=${n%.*} # remove suffix + [[ $b == $opt_bootloader ]] || continue + + echo "$testing ... --$b" + + cp test/${b}.1 ${b}-test + ln -s ${b}-test mytest + ./grubby --${b} --add-kernel bar --title title -c mytest + if [[ $? != 0 ]]; then + echo " failed (grubby returned non-zero)" + (( fail++ )) + elif [[ ! -L mytest ]]; then + echo " failed (not a symlink)" + (( fail++ )) + elif target=$(readlink mytest) && [[ $target != "${b}-test" ]]; then + echo " failed (wrong target)" + (( fail++ )) + else + (( pass++ )) + fi + rm -f ${b}-test mytest +done + +testing="GRUB default directive" grubTest grub.1 default/g1.1 --boot-filesystem=/boot --add-kernel /boot/new-kernel --title Some_Title grubTest grub.1 default/g1.2 --boot-filesystem=/boot --add-kernel /boot/new-kernel --title Some_Title --make-default grubTest grub.3 default/g3.1 --boot-filesystem=/boot --set-default=/boot/vmlinuz-2.4.7-2 @@ -135,7 +153,7 @@ grubTest grub.4 default/g4.2 --boot-file grubTest grub.4 default/g4.2 --boot-filesystem=/ --set-default=/boot/vmlinuz-2.4.7-ac3 --remove-kernel /boot/vmlinuz-2.4.7-2.5 --add-kernel=/boot/new-kernel --copy-default --title New_Title grubTest grub.6 default/g6.1 --remove-kernel=/boot/vmlinuz-2.4.7-2.9 --boot-filesystem=/ -echo "LILO default directive..." +testing="LILO default directive" liloTest lilo.1 default/l1.1 --set-default=/boot/vmlinuz-2.4.18-4 liloTest lilo.1 default/l1.2 --remove-kernel=/boot/vmlinuz-2.4.18-4smp liloTest lilo.1 default/l1.3 --add-kernel /boot/kernel --title label \ @@ -143,11 +161,11 @@ liloTest lilo.1 default/l1.4 --add-kerne liloTest lilo.1 default/l1.4 --add-kernel /boot/kernel --title label \ --copy-default --make-default -echo "Z/IPL default directive..." +testing="Z/IPL default directive" ziplTest zipl.1 default/z1.1 --add-kernel /boot/new-kernel --title test ziplTest zipl.1 default/z1.2 --add-kernel /boot/new-kernel --title test --make-default -echo "GRUB fallback directive..." +testing="GRUB fallback directive" grubTest grub.5 fallback/g5.1 --remove-kernel=/boot/vmlinuz-2.4.7-ac3 \ --boot-filesystem=/ grubTest grub.5 fallback/g5.2 --remove-kernel=/boot/vmlinuz-2.4.7-2.5 \ @@ -156,13 +174,13 @@ grubTest grub.5 fallback/g5.3 --remove-k --boot-filesystem=/ --copy-default --add-kernel=/boot/new-kernel \ --title="Some_Title" -echo "GRUB new kernel argument handling..." +testing="GRUB new kernel argument handling" grubTest grub.1 args/g1.1 --boot-filesystem=/boot \ --add-kernel=/boot/foo --title=some_title --args="1234" --copy-default grubTest grub.1 args/g1.2 --boot-filesystem=/boot \ --add-kernel=/boot/foo --title=some_title --args="1234" -echo "GRUB remove kernel..." +testing="GRUB remove kernel" grubTest grub.7 remove/g7.1 --boot-filesystem=/ \ --remove-kernel=/boot/vmlinuz-2.4.7-2.5 grubTest grub.3 remove/g3.1 --boot-filesystem=/ \ @@ -170,16 +188,16 @@ grubTest grub.9 remove/g9.1 --boot-files grubTest grub.9 remove/g9.1 --boot-filesystem=/boot \ --remove-kernel=/boot/vmlinuz-2.4.7-2 -echo "YABOOT remove kernel..." +testing="YABOOT remove kernel" yabootTest yaboot.1 remove/y1.1 --boot-filesystem=/ --remove-kernel=DEFAULT yabootTest yaboot.1 remove/y1.2 --boot-filesystem=/ --remove-kernel=/boot/vmlinuz-2.5.50-eepro yabootTest yaboot.2 remove/y2.1 --boot-filesystem=/ --remove-kernel=/boot/vmlinux-2.5.50 -echo "Z/IPL remove kernel..." +testing="Z/IPL remove kernel" ziplTest zipl.1 remove/z1.1 --remove-kernel=/boot/vmlinuz-2.4.9-38 ziplTest zipl.1 remove/z1.2 --remove-kernel=DEFAULT -echo "GRUB update kernel argument handling..." +testing="GRUB update kernel argument handling" grubTest grub.1 updargs/g1.1 --update-kernel=DEFAULT --args="root=/dev/hda1" grubTest grub.1 updargs/g1.2 --update-kernel=DEFAULT \ --args="root=/dev/hda1 hda=ide-scsi root=/dev/hda2" @@ -209,7 +227,7 @@ grubTest grub.11 updargs/g11.2 --boot-fi --update-kernel=/vmlinuz-2.4.7-2smp \ --args "ro root=LABEL=/ single" -echo "LILO update kernel argument handling..." +testing="LILO update kernel argument handling" liloTest lilo.1 updargs/l1.1 --update-kernel=/boot/vmlinuz-2.4.18-4 \ --args="root=/dev/md1" liloTest lilo.1 updargs/l1.2 --update-kernel=/boot/vmlinuz-2.4.18-4smp \ @@ -223,7 +241,7 @@ liloTest lilo.3 updargs/l3.2 --update-ke liloTest lilo.3 updargs/l3.2 --update-kernel=ALL \ --remove-args="single" --args "root=/dev/hda2" -echo "LILO add kernel..." +testing="LILO add kernel" liloTest lilo.4 add/l4.1 --add-kernel=/boot/new-kernel.img --title="title" \ --copy-default --boot-filesystem=/boot liloTest lilo.4 add/l4.2 --add-kernel=/boot/new-kernel.img --title="linux" \ @@ -238,7 +256,7 @@ liloTest lilo.6 add/l6.2 --add-kernel=/b --initrd=/boot/new-initrd --copy-default --boot-filesystem=/boot --remove-kernel "TITLE=linux" -echo "GRUB add kernel..." +testing="GRUB add kernel" grubTest grub.1 add/g1.1 --add-kernel=/boot/new-kernel.img --title='title' \ --initrd=/boot/new-initrd --boot-filesystem=/ grubTest grub.1 add/g1.2 --add-kernel=/boot/new-kernel.img --title='title' \ @@ -260,19 +278,19 @@ grubTest grub.11 add/g11.1 --add-kernel= --initrd=/boot/new-initrd --boot-filesystem=/boot --copy-default \ --args='console=tty0 console=ttyS1,9600n81 single' -echo "YABOOT add kernel..." +testing="YABOOT add kernel" yabootTest yaboot.1 add/y1.1 --copy-default --boot-filesystem=/ --add-kernel=/boot/new-kernel \ --title=newtitle yabootTest yaboot.1 add/y1.2 --add-kernel=/boot/new-kernel --boot-filesystem=/ --title=newtitle -echo "YABOOT empty label..." +testing="YABOOT empty label" yabootTest yaboot.3 add/y3.1 --add-kernel=/boot/new-kernel --boot-filesystem=/ --title=newtitle -echo "Z/IPL add kernel..." +testing="Z/IPL add kernel" ziplTest zipl.1 add/z1.1 --add-kernel=/boot/new-kernel.img --title test ziplTest zipl.1 add/z1.2 --add-kernel=/boot/new-kernel.img --title test --copy-default -echo "LILO long titles..." +testing="LILO long titles" liloTest lilo.1 longtitle/l1.1 --add-kernel=/boot/new-kernel.img \ --title="linux-longtitle" --copy-default --boot-filesystem=/boot liloTest lilo.1 longtitle/l1.2 --add-kernel=/boot/new-kernel.img \ @@ -280,11 +298,11 @@ liloTest lilo.7 longtitle/l7.1 --add-ker liloTest lilo.7 longtitle/l7.1 --add-kernel=/boot/new-kernel.img \ --title="linux-longtitle-fix" --copy-default --boot-filesystem=/boot -echo "ELILO long titles..." +testing="ELILO long titles" eliloTest lilo.7 longtitle/e7.1 --add-kernel=/boot/new-kernel.img \ --title="linux-longtitle-fix" --copy-default --boot-filesystem=/boot -echo "GRUB add multiboot..." +testing="GRUB add multiboot" grubTest grub.1 multiboot/g1.1 --add-multiboot=/boot/xen.gz \ --add-kernel=/boot/vmlinuz-2.6.10-1.1088_FC4 --boot-filesystem=/boot \ --initrd=/boot/initrd-2.6.10-1.1088_FC4.img --title foo \ @@ -308,7 +326,7 @@ grubTest grub.10 multiboot/g10.4 --add-k --initrd=/boot/initrd-2.6.10-1.1088_FC4.img --title foo \ --boot-filesystem=/boot -echo "GRUB remove multiboot..." +testing="GRUB remove multiboot" grubTest grub.10 multiboot/g10.5 --boot-filesystem=/boot \ --remove-kernel=/boot/vmlinuz-2.6.10-1.1076_FC4 grubTest grub.10 multiboot/g10.6 --boot-filesystem=/boot \ @@ -316,4 +334,8 @@ grubTest grub.10 multiboot/g10.7 --boot- grubTest grub.10 multiboot/g10.7 --boot-filesystem=/boot \ --remove-multiboot=/boot/xen.gz -exit $RESULT +printf "\n%d (%d%%) tests passed, %d (%d%%) tests failed\n" \ + $pass $(((100*pass)/(pass+fail))) \ + $fail $(((100*fail)/(pass+fail))) + +exit $(( !!fail )) From aron at hp.com Thu Jun 29 21:42:32 2006 From: aron at hp.com (Aron Griffis) Date: Thu, 29 Jun 2006 17:42:32 -0400 Subject: [Fedora-xen] [PATCH 0 of 6] elilo multiboot support (take 2) Message-ID: The following patches give grubby the ability to manipulate multiboot-capable elilo.conf. Fedora's elilo already contains the support, these patches simply teach grubby to take advantage of it. These patches are an enabler for using Xen on ia64 with Fedora. This is a resend, with improvements, of the patches sent earlier. See https://www.redhat.com/archives/fedora-xen/2006-June/msg00068.html The improvements include: - general test suite improvements - grubby builds with each patch in succession - updates to the test suite for elilo multiboot - fixes to grubby.c to fix regressions introduced by the previous patches, when I hadn't noticed the existence of the regression test suite... Regards, Aron From aron at hp.com Thu Jun 29 21:42:36 2006 From: aron at hp.com (Aron Griffis) Date: Thu, 29 Jun 2006 17:42:36 -0400 Subject: [Fedora-xen] [PATCH 4 of 6] Modify updateActualImage to handle elilo-style args In-Reply-To: Message-ID: # HG changeset patch # User agriffis at cheo.zko.hp.com # Node ID bbebf7a97ae1e13bb2b3bce3dcc999a7de53aa98 # Parent 85b711b5111c64599507a5526427476d1163d6bf Modify updateActualImage to handle elilo-style args elilo handles hypervisor args by putting a "--" separator on the append line, like this: append="hyper args -- kernel args" This patch modifies updateActualImage() to handle this situation, including removing the hypervisor args plus separator when a multiboot template is used to construct a non-multiboot entry. Grubby builds with this patch, and the test suite doesn't report any new regressions. Signed-off-by: Aron Griffis grubby.c | 258 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 142 insertions(+), 116 deletions(-) diff -r 85b711b5111c -r bbebf7a97ae1 grubby/grubby.c --- a/grubby/grubby.c Thu Jun 29 16:46:55 2006 -0400 +++ b/grubby/grubby.c Thu Jun 29 16:56:35 2006 -0400 @@ -115,6 +115,7 @@ struct configFileInfo { int titleBracketed; int mbHyperFirst; int mbInitRdIsModule; + int mbConcatArgs; }; struct keywordTypes grubKeywords[] = { @@ -141,6 +142,7 @@ struct configFileInfo grubConfigType = { 0, /* titleBracketed */ 1, /* mbHyperFirst */ 1, /* mbInitRdIsModule */ + 0, /* mbConcatArgs */ }; struct keywordTypes yabootKeywords[] = { @@ -238,6 +240,7 @@ struct configFileInfo eliloConfigType = 0, /* titleBracketed */ 0, /* mbHyperFirst */ 0, /* mbInitRdIsModule */ + 1, /* mbConcatArgs */ }; struct configFileInfo liloConfigType = { @@ -252,6 +255,7 @@ struct configFileInfo liloConfigType = { 0, /* titleBracketed */ 0, /* mbHyperFirst */ 0, /* mbInitRdIsModule */ + 0, /* mbConcatArgs */ }; struct configFileInfo yabootConfigType = { @@ -266,6 +270,7 @@ struct configFileInfo yabootConfigType = 0, /* titleBracketed */ 0, /* mbHyperFirst */ 0, /* mbInitRdIsModule */ + 0, /* mbConcatArgs */ }; struct configFileInfo siloConfigType = { @@ -280,6 +285,7 @@ struct configFileInfo siloConfigType = { 0, /* titleBracketed */ 0, /* mbHyperFirst */ 0, /* mbInitRdIsModule */ + 0, /* mbConcatArgs */ }; struct configFileInfo ziplConfigType = { @@ -294,6 +300,7 @@ struct configFileInfo ziplConfigType = { 1, /* titleBracketed */ 0, /* mbHyperFirst */ 0, /* mbInitRdIsModule */ + 0, /* mbConcatArgs */ }; struct grubConfig { @@ -1742,14 +1749,13 @@ int updateActualImage(struct grubConfig struct singleEntry * entry; struct singleLine * line, * rootLine; int index = 0; - int i, j, k; + int i, k; const char ** newArgs, ** oldArgs; const char ** arg; - const char * chptr; - int useKernelArgs = 0; - int useRoot = 0; + int useKernelArgs, useRoot; int firstElement; int *usedElements, *usedArgs; + int doreplace; if (!image) return 0; @@ -1776,53 +1782,102 @@ int updateActualImage(struct grubConfig } } - for (i = 0; cfg->cfi->keywords[i].key; i++) - if (cfg->cfi->keywords[i].type == LT_KERNELARGS) break; - - if (cfg->cfi->keywords[i].key) - useKernelArgs = 1; - - for (i = 0; cfg->cfi->keywords[i].key; i++) - if (cfg->cfi->keywords[i].type == LT_ROOT) break; - - if (cfg->cfi->keywords[i].key) - useRoot = 1; - - k = 0; - for (arg = newArgs; *arg; arg++) - k++; - usedArgs = calloc(k, sizeof(int)); - - while ((entry = findEntryByPath(cfg, image, prefix, &index))) { - index++; - - line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines); - if (!line) continue; - firstElement = 2; - - if (entry->multiboot && !multibootArgs) { - /* first mb module line is the real kernel */ - while (line && line->type != LT_MBMODULE) line = line->next; - firstElement = 2; - } else if (useKernelArgs) { - while (line && line->type != LT_KERNELARGS) line = line->next; + + useKernelArgs = (getKeywordByType(LT_KERNELARGS, cfg->cfi) + && (!multibootArgs || cfg->cfi->mbConcatArgs)); + + useRoot = (getKeywordByType(LT_ROOT, cfg->cfi) + && !multibootArgs); + + for (k = 0, arg = newArgs; *arg; arg++, k++) ; + usedArgs = calloc(k, sizeof(*usedArgs)); + + for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) { + + if (multibootArgs && !entry->multiboot) + continue; + + /* Determine where to put the args. If this config supports + * LT_KERNELARGS, use that. Otherwise use + * LT_HYPER/LT_KERNEL/LT_MBMODULE lines. + */ + if (useKernelArgs) { + line = getLineByType(LT_KERNELARGS, entry->lines); + if (!line) { + /* no LT_KERNELARGS, need to add it */ + line = addLine(entry, cfg->cfi, LT_KERNELARGS, + cfg->secondaryIndent, NULL); + } firstElement = 1; - } - - if (!line && useKernelArgs) { - /* no append in there, need to add it */ - line = addLine(entry, cfg->cfi, LT_KERNELARGS, NULL, NULL); - } - - usedElements = calloc(line->numElements, sizeof(int)); - - k = 0; - for (arg = newArgs; *arg; arg++) { - if (usedArgs[k]) { - k++; - continue; - } + + } else if (multibootArgs) { + line = getLineByType(LT_HYPER, entry->lines); + if (!line) { + /* a multiboot entry without LT_HYPER? */ + continue; + } + firstElement = 2; + + } else { + line = getLineByType(LT_KERNEL|LT_MBMODULE, entry->lines); + if (!line) { + /* no LT_KERNEL or LT_MBMODULE in this entry? */ + continue; + } + firstElement = 2; + } + + /* handle the elilo case which does: + * append="hypervisor args -- kernel args" + */ + if (entry->multiboot && cfg->cfi->mbConcatArgs) { + /* this is a multiboot entry, make sure there's + * -- on the args line + */ for (i = firstElement; i < line->numElements; i++) { + if (!strcmp(line->elements[i].item, "--")) + break; + } + if (i == line->numElements) { + /* assume all existing args are kernel args, + * prepend -- to make it official + */ + insertElement(line, "--", firstElement); + i = firstElement; + } + if (!multibootArgs) { + /* kernel args start after the -- */ + firstElement = i + 1; + } + } else if (cfg->cfi->mbConcatArgs) { + /* this is a non-multiboot entry, remove hyper args */ + for (i = firstElement; i < line->numElements; i++) { + if (!strcmp(line->elements[i].item, "--")) + break; + } + if (i < line->numElements) { + /* remove args up to -- */ + while (strcmp(line->elements[firstElement].item, "--")) + removeElement(line, firstElement); + /* remove -- */ + removeElement(line, firstElement); + } + } + + usedElements = calloc(line->numElements, sizeof(*usedElements)); + + for (k = 0, arg = newArgs; *arg; arg++, k++) { + if (usedArgs[k]) continue; + + doreplace = 1; + for (i = firstElement; i < line->numElements; i++) { + if (multibootArgs && cfg->cfi->mbConcatArgs && + !strcmp(line->elements[i].item, "--")) + { + /* reached the end of hyper args, insert here */ + doreplace = 0; + break; + } if (usedElements[i]) continue; if (!argMatch(line->elements[i].item, *arg)) { @@ -1831,91 +1886,62 @@ int updateActualImage(struct grubConfig break; } } - chptr = strchr(*arg, '='); - - if (i < line->numElements) { - /* replace */ + + if (i < line->numElements && doreplace) { + /* direct replacement */ free(line->elements[i].item); line->elements[i].item = strdup(*arg); - } else if (useRoot && !strncmp(*arg, "root=/dev/", 10) && *chptr) { - rootLine = entry->lines; - while (rootLine && rootLine->type != LT_ROOT) - rootLine = rootLine->next; - if (!rootLine) { - rootLine = addLine(entry, cfg->cfi, LT_ROOT, NULL, NULL); - rootLine->elements = realloc(rootLine->elements, - 2 * sizeof(*rootLine->elements)); - rootLine->numElements++; - rootLine->elements[1].indent = strdup(""); - rootLine->elements[1].item = strdup(""); + + } else if (useRoot && !strncmp(*arg, "root=/dev/", 10)) { + /* root= replacement */ + rootLine = getLineByType(LT_ROOT, entry->lines); + if (rootLine) { + free(rootLine->elements[1].item); + rootLine->elements[1].item = strdup(*arg + 5); + } else { + rootLine = addLine(entry, cfg->cfi, LT_ROOT, + cfg->secondaryIndent, *arg + 5); } - - free(rootLine->elements[1].item); - rootLine->elements[1].item = strdup(chptr + 1); - } else { - /* append */ - line->elements = realloc(line->elements, - (line->numElements + 1) * sizeof(*line->elements)); - line->elements[line->numElements].item = strdup(*arg); - usedElements = realloc(usedElements, - (line->numElements + 1) * sizeof(int)); - usedElements[line->numElements] = 1; - - if (line->numElements > 1) { - /* add to existing list of arguments */ - line->elements[line->numElements].indent = - line->elements[line->numElements - 1].indent; - line->elements[line->numElements - 1].indent = strdup(" "); - } else { - /* First thing on this line; treat a bit differently. Note - this is only possible if we've added a LT_KERNELARGS - entry */ - line->elements[line->numElements].indent = strdup(""); - } - - line->numElements++; + } + + else { + /* insert/append */ + insertElement(line, *arg, i); + usedElements = realloc(usedElements, line->numElements * + sizeof(*usedElements)); + memmove(&usedElements[i + 1], &usedElements[i], + line->numElements - i - 1); + usedElements[i] = 1; /* if we updated a root= here even though there is a LT_ROOT available we need to remove the LT_ROOT entry (this will happen if we switch from a device to a label) */ if (useRoot && !strncmp(*arg, "root=", 5)) { - rootLine = entry->lines; - while (rootLine && rootLine->type != LT_ROOT) - rootLine = rootLine->next; - if (rootLine) { + rootLine = getLineByType(LT_ROOT, entry->lines); + if (rootLine) removeLine(entry, rootLine); - } } } - k++; } free(usedElements); - /* no arguments to remove (i.e. no append line) */ - if (!line) continue; - - /* this won't remove an LT_ROOT item properly (but then again, - who cares? */ for (arg = oldArgs; *arg; arg++) { - for (i = firstElement; i < line->numElements; i++) - if (!argMatch(line->elements[i].item, *arg)) + for (i = firstElement; i < line->numElements; i++) { + if (multibootArgs && cfg->cfi->mbConcatArgs && + !strcmp(line->elements[i].item, "--")) + /* reached the end of hyper args, stop here */ break; - - if (i < line->numElements) { - /* if this isn't the first argument the previous argument - gets this arguments post-indention */ - if (i > firstElement) { - free(line->elements[i - 1].indent); - line->elements[i - 1].indent = line->elements[i].indent; + if (!argMatch(line->elements[i].item, *arg)) { + removeElement(line, i); + break; } - - free(line->elements[i].item); - - for (j = i + 1; j < line->numElements; j++) - line->elements[j - 1] = line->elements[j]; - - line->numElements--; + } + /* handle removing LT_ROOT line too */ + if (useRoot && !strncmp(*arg, "root=", 5)) { + rootLine = getLineByType(LT_ROOT, entry->lines); + if (rootLine) + removeLine(entry, rootLine); } } From aron at hp.com Thu Jun 29 21:42:35 2006 From: aron at hp.com (Aron Griffis) Date: Thu, 29 Jun 2006 17:42:35 -0400 Subject: [Fedora-xen] [PATCH 3 of 6] Add support for LT_HYPER In-Reply-To: Message-ID: # HG changeset patch # User agriffis at cheo.zko.hp.com # Node ID ecdec03697eab8a622e46755d0330a05694f14f5 # Parent 42e7d064ab2666bad84fc61f0465bee4f7c79d65 Add support for LT_HYPER This patch adds support for the LT_HYPER line type. Whereas grub uses kernel=hypervisor module=kernel module=initrd, elilo uses vmm=hypervisor image=kernel initrd=initrd. Adding LT_HYPER support, and extending it backward to grub, makes dealing with this a lot easier. configFileInfo->mbHyperFirst is added to differentiate between grub wanting the hypervisor listed first, and elilo wanting the kernel listed first (image= is the entry separator so it's very important) configFileInfo->mbInitRdIsModule is added to handle grub wanting the initrd listed as a module when multibooting The logic in addNewKernel is considerably rewritten (and cleaned up!) to be more generic and handle elilo alongside grub. Additionally one memcpy is corrected to memmove, since it was unsafely copying overlapping regions. Grubby builds with this patch and no new regressions are reported by the test suite. Signed-off-by: Aron Griffis grubby.c | 531 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 294 insertions(+), 237 deletions(-) diff -r 42e7d064ab26 -r ecdec03697ea grubby/grubby.c --- a/grubby/grubby.c Thu Jun 29 16:10:13 2006 -0400 +++ b/grubby/grubby.c Thu Jun 29 16:33:24 2006 -0400 @@ -54,6 +54,7 @@ enum lineType_e { LT_TITLE = 1 << 1, LT_KERNEL = 1 << 2, LT_INITRD = 1 << 3, + LT_HYPER = 1 << 4, LT_DEFAULT = 1 << 5, LT_MBMODULE = 1 << 6, LT_ROOT = 1 << 7, @@ -86,11 +87,12 @@ struct singleEntry { #define GRUB_CONFIG_NO_DEFAULT (1 << 0) /* don't write out default=0 */ -#define KERNEL_KERNEL (1 << 0) -#define KERNEL_INITRD (1 << 2) -#define KERNEL_TITLE (1 << 3) -#define KERNEL_ARGS (1 << 4) -#define KERNEL_MB (1 << 5) +/* These defines are (only) used in addNewKernel() */ +#define NEED_KERNEL (1 << 0) +#define NEED_INITRD (1 << 1) +#define NEED_TITLE (1 << 2) +#define NEED_ARGS (1 << 3) +#define NEED_MB (1 << 4) #define MAIN_DEFAULT (1 << 0) #define DEFAULT_SAVED -2 @@ -111,6 +113,8 @@ struct configFileInfo { int argsInQuotes; int maxTitleLength; int titleBracketed; + int mbHyperFirst; + int mbInitRdIsModule; }; struct keywordTypes grubKeywords[] = { @@ -121,6 +125,7 @@ struct keywordTypes grubKeywords[] = { { "kernel", LT_KERNEL, ' ' }, { "initrd", LT_INITRD, ' ' }, { "module", LT_MBMODULE, ' ' }, + { "kernel", LT_HYPER, ' ' }, { NULL, 0, 0 }, }; @@ -134,6 +139,8 @@ struct configFileInfo grubConfigType = { 0, /* argsInQuotes */ 0, /* maxTitleLength */ 0, /* titleBracketed */ + 1, /* mbHyperFirst */ + 1, /* mbInitRdIsModule */ }; struct keywordTypes yabootKeywords[] = { @@ -187,6 +194,17 @@ struct keywordTypes liloKeywords[] = { { NULL, 0, 0 }, }; +struct keywordTypes eliloKeywords[] = { + { "label", LT_TITLE, '=' }, + { "root", LT_ROOT, '=' }, + { "default", LT_DEFAULT, '=' }, + { "image", LT_KERNEL, '=' }, + { "initrd", LT_INITRD, '=' }, + { "append", LT_KERNELARGS, '=' }, + { "vmm", LT_HYPER, '=' }, + { NULL, 0, 0 }, +}; + struct keywordTypes siloKeywords[] = { { "label", LT_TITLE, '=' }, { "root", LT_ROOT, '=' }, @@ -210,7 +228,7 @@ struct keywordTypes ziplKeywords[] = { struct configFileInfo eliloConfigType = { "/boot/efi/EFI/redhat/elilo.conf", /* defaultConfig */ - liloKeywords, /* keywords */ + eliloKeywords, /* keywords */ 0, /* defaultIsIndex */ 0, /* defaultSupportSaved */ LT_KERNEL, /* entrySeparator */ @@ -218,6 +236,8 @@ struct configFileInfo eliloConfigType = 1, /* argsInQuotes */ 0, /* maxTitleLength */ 0, /* titleBracketed */ + 0, /* mbHyperFirst */ + 0, /* mbInitRdIsModule */ }; struct configFileInfo liloConfigType = { @@ -230,6 +250,8 @@ struct configFileInfo liloConfigType = { 1, /* argsInQuotes */ 15, /* maxTitleLength */ 0, /* titleBracketed */ + 0, /* mbHyperFirst */ + 0, /* mbInitRdIsModule */ }; struct configFileInfo yabootConfigType = { @@ -242,6 +264,8 @@ struct configFileInfo yabootConfigType = 1, /* argsInQuotes */ 15, /* maxTitleLength */ 0, /* titleBracketed */ + 0, /* mbHyperFirst */ + 0, /* mbInitRdIsModule */ }; struct configFileInfo siloConfigType = { @@ -254,6 +278,8 @@ struct configFileInfo siloConfigType = { 1, /* argsInQuotes */ 15, /* maxTitleLength */ 0, /* titleBracketed */ + 0, /* mbHyperFirst */ + 0, /* mbInitRdIsModule */ }; struct configFileInfo ziplConfigType = { @@ -266,6 +292,8 @@ struct configFileInfo ziplConfigType = { 1, /* argsInQuotes */ 15, /* maxTitleLength */ 1, /* titleBracketed */ + 0, /* mbHyperFirst */ + 0, /* mbInitRdIsModule */ }; struct grubConfig { @@ -671,11 +699,39 @@ static struct grubConfig * readConfig(co if (line->type == LT_DEFAULT && line->numElements == 2) { cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT; defaultLine = line; + + } else if (line->type == LT_KERNEL) { + /* if by some freak chance this is multiboot and the "module" + * lines came earlier in the template, make sure to use LT_HYPER + * instead of LT_KERNEL now + */ + if (entry->multiboot) + line->type = LT_HYPER; + } else if (line->type == LT_MBMODULE) { + /* go back and fix the LT_KERNEL line to indicate LT_HYPER + * instead, now that we know this is a multiboot entry. + * This only applies to grub, but that's the only place we + * should find LT_MBMODULE lines anyway. + */ + struct singleLine * l; + for (l = entry->lines; l; l = l->next) { + if (l->type == LT_HYPER) + break; + else if (l->type == LT_KERNEL) { + l->type = LT_HYPER; + break; + } + } entry->multiboot = 1; + + } else if (line->type == LT_HYPER) { + entry->multiboot = 1; + } else if (line->type == LT_FALLBACK && line->numElements == 2) { cfg->fallbackImage = strtol(line->elements[1].item, &end, 10); if (*end) cfg->fallbackImage = -1; + } else if (line->type == LT_TITLE && line->numElements > 1) { /* make the title a single argument (undoing our parsing) */ len = 0; @@ -700,6 +756,7 @@ static struct grubConfig * readConfig(co line->elements[line->numElements - 1].indent; line->elements[1].item = buf; line->numElements = 2; + } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) { /* Strip off any " which may be present; they'll be put back on write. This is one of the few (the only?) places that grubby @@ -709,15 +766,14 @@ static struct grubConfig * readConfig(co int last, len; if (*line->elements[1].item == '"') - memcpy(line->elements[1].item, line->elements[1].item + 1, - strlen(line->elements[1].item + 1) + 1); + memmove(line->elements[1].item, line->elements[1].item + 1, + strlen(line->elements[1].item + 1) + 1); last = line->numElements - 1; len = strlen(line->elements[last].item) - 1; if (line->elements[last].item[len] == '"') line->elements[last].item[len] = '\0'; } - } /* If we find a generic config option which should live at the @@ -737,6 +793,7 @@ static struct grubConfig * readConfig(co movedLine = 1; continue; /* without setting 'last' */ } + /* If a second line of whitespace happens after a generic option which was moved, drop it. */ if (movedLine && line->type == LT_WHITESPACE && last->type == LT_WHITESPACE) { @@ -752,12 +809,13 @@ static struct grubConfig * readConfig(co entry->lines = line; else last->next = line; + dbgPrintf("readConfig added %d to %p\n", line->type, entry); } else { if (!cfg->theLines) cfg->theLines = line; - else { + else last->next = line; - } + dbgPrintf("readConfig added %d to cfg\n", line->type); } last = line; @@ -979,7 +1037,7 @@ int suitableImage(struct singleEntry * e if (skipRemoved && entry->skip) return 0; - line = getLineByType(LT_KERNEL, entry->lines); + line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines); if (!line || line->numElements < 2) return 0; if (flags & GRUBBY_BADIMAGE_OKAY) return 1; @@ -1076,7 +1134,7 @@ struct singleEntry * findEntryByPath(str entry = findEntryByIndex(config, indexVars[i]); if (!entry) return NULL; - line = getLineByType(LT_KERNEL, entry->lines); + line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines); if (!line) return NULL; if (index) *index = indexVars[i]; @@ -1126,7 +1184,8 @@ struct singleEntry * findEntryByPath(str /* check all the lines matching checkType */ for (line = entry->lines; line; line = line->next) { line = getLineByType(entry->multiboot && checkType == LT_KERNEL ? - LT_KERNEL|LT_MBMODULE : checkType, line); + LT_KERNEL|LT_MBMODULE|LT_HYPER : + checkType, line); if (!line) break; /* not found in this entry */ if (line && line->numElements >= 2) { @@ -1142,7 +1201,7 @@ struct singleEntry * findEntryByPath(str * non-Linux boot entries (could find netbsd etc, though, which is * unfortunate) */ - if (line && getLineByType(LT_KERNEL, entry->lines)) + if (line && getLineByType(LT_KERNEL|LT_HYPER, entry->lines)) break; /* found 'im! */ } @@ -1315,7 +1374,7 @@ void displayEntry(struct singleEntry * e printf("index=%d\n", index); - line = getLineByType(LT_KERNEL, entry->lines); + line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines); printf("kernel=%s\n", line->elements[1].item); if (line->numElements >= 3) { @@ -1491,7 +1550,7 @@ struct singleLine * addLineTmpl(struct s insertElement(newLine, val, 1); /* but try to keep the rootspec from the template... sigh */ - if (tmplLine->type & (LT_KERNEL|LT_MBMODULE|LT_INITRD)) { + if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD)) { char * rootspec = getRootSpecifier(tmplLine->elements[1].item); if (rootspec != NULL) { free(newLine->elements[1].item); @@ -1737,8 +1796,7 @@ int updateActualImage(struct grubConfig while ((entry = findEntryByPath(cfg, image, prefix, &index))) { index++; - line = entry->lines; - while (line && line->type != LT_KERNEL) line = line->next; + line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines); if (!line) continue; firstElement = 2; @@ -2108,13 +2166,9 @@ int addNewKernel(struct grubConfig * con char * newKernelArgs, char * newKernelInitrd, char * newMBKernel, char * newMBKernelArgs) { struct singleEntry * new; - struct singleLine * newLine = NULL, * tmplLine = NULL, * lastLine = NULL; + struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL; int needs; - char * indent = NULL; - char * rootspec = NULL; char * chptr; - int i; - enum lineType_e type; if (!newKernelPath) return 0; @@ -2144,236 +2198,239 @@ int addNewKernel(struct grubConfig * con config->entries = new; /* copy/update from the template */ - needs = KERNEL_KERNEL | KERNEL_INITRD | KERNEL_TITLE; + needs = NEED_KERNEL | NEED_TITLE; + if (newKernelInitrd) + needs |= NEED_INITRD; if (newMBKernel) { - needs |= KERNEL_MB; + needs |= NEED_MB; new->multiboot = 1; } if (template) { - for (tmplLine = template->lines; tmplLine; tmplLine = tmplLine->next) { - /* remember the indention level; we may need it for new lines */ - if (tmplLine->numElements) - indent = tmplLine->indent; + for (masterLine = template->lines; + masterLine && (tmplLine = lineDup(masterLine)); + lineFree(tmplLine), masterLine = masterLine->next) + { + dbgPrintf("addNewKernel processing %d\n", tmplLine->type); /* skip comments */ chptr = tmplLine->indent; while (*chptr && isspace(*chptr)) chptr++; if (*chptr == '#') continue; - /* we don't need an initrd here */ - if (tmplLine->type == LT_INITRD && !newKernelInitrd) continue; - - if (tmplLine->type == LT_KERNEL && - !template->multiboot && (needs & KERNEL_MB)) { - struct singleLine *l; - needs &= ~ KERNEL_MB; - - l = addLine(new, config->cfi, LT_KERNEL, - config->secondaryIndent, - newMBKernel + strlen(prefix)); - - tmplLine = lastLine; - if (!new->lines) { - new->lines = l; - } else { - newLine->next = l; - newLine = l; - } - continue; - } else if (tmplLine->type == LT_KERNEL && - template->multiboot && !new->multiboot) { - continue; /* don't need multiboot kernel here */ - } - - if (!new->lines) { - newLine = malloc(sizeof(*newLine)); - new->lines = newLine; + if (tmplLine->type == LT_KERNEL && + tmplLine->numElements >= 2) { + if (!template->multiboot && (needs & NEED_MB)) { + /* it's not a multiboot template and this is the kernel + * line. Try to be intelligent about inserting the + * hypervisor at the same time. + */ + if (config->cfi->mbHyperFirst) { + /* insert the hypervisor first */ + newLine = addLine(new, config->cfi, LT_HYPER, + tmplLine->indent, + newMBKernel + strlen(prefix)); + /* set up for adding the kernel line */ + free(tmplLine->indent); + tmplLine->indent = strdup(config->secondaryIndent); + needs &= ~NEED_MB; + } + if (needs & NEED_KERNEL) { + /* use addLineTmpl to preserve line elements, + * otherwise we could just call addLine. Unfortunately + * this means making some changes to the template + * such as the indent change above and the type + * change below. + */ + struct keywordTypes * mbm_kw = + getKeywordByType(LT_MBMODULE, config->cfi); + if (mbm_kw) { + tmplLine->type = LT_MBMODULE; + free(tmplLine->elements[0].item); + tmplLine->elements[0].item = strdup(mbm_kw->key); + } + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelPath + strlen(prefix)); + needs &= ~NEED_KERNEL; + } + if (needs & NEED_MB) { /* !mbHyperFirst */ + newLine = addLine(new, config->cfi, LT_HYPER, + config->secondaryIndent, + newMBKernel + strlen(prefix)); + needs &= ~NEED_MB; + } + } else if (needs & NEED_KERNEL) { + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelPath + strlen(prefix)); + needs &= ~NEED_KERNEL; + } + + } else if (tmplLine->type == LT_HYPER && + tmplLine->numElements >= 2) { + if (needs & NEED_MB) { + newLine = addLineTmpl(new, tmplLine, newLine, + newMBKernel + strlen(prefix)); + needs &= ~NEED_MB; + } + + } else if (tmplLine->type == LT_MBMODULE && + tmplLine->numElements >= 2) { + if (new->multiboot) { + if (needs & NEED_KERNEL) { + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelPath + + strlen(prefix)); + needs &= ~NEED_KERNEL; + } else if (config->cfi->mbInitRdIsModule && + (needs & NEED_INITRD)) { + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelInitrd + + strlen(prefix)); + needs &= ~NEED_INITRD; + } + } else if (needs & NEED_KERNEL) { + /* template is multi but new is not, + * insert the kernel in the first module slot + */ + tmplLine->type = LT_KERNEL; + free(tmplLine->elements[0].item); + tmplLine->elements[0].item = + strdup(getKeywordByType(LT_KERNEL, config->cfi)->key); + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelPath + strlen(prefix)); + needs &= ~NEED_KERNEL; + } else if (needs & NEED_INITRD) { + /* template is multi but new is not, + * insert the initrd in the second module slot + */ + tmplLine->type = LT_INITRD; + free(tmplLine->elements[0].item); + tmplLine->elements[0].item = + strdup(getKeywordByType(LT_INITRD, config->cfi)->key); + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelInitrd + strlen(prefix)); + needs &= ~NEED_INITRD; + } + + } else if (tmplLine->type == LT_INITRD && + tmplLine->numElements >= 2) { + if (needs & NEED_INITRD && + new->multiboot && !template->multiboot && + config->cfi->mbInitRdIsModule) { + /* make sure we don't insert the module initrd + * before the module kernel... if we don't do it here, + * it will be inserted following the template. + */ + if (!needs & NEED_KERNEL) { + newLine = addLine(new, config->cfi, LT_MBMODULE, + config->secondaryIndent, + newKernelInitrd + strlen(prefix)); + needs &= ~NEED_INITRD; + } + } else if (needs & NEED_INITRD) { + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelInitrd + strlen(prefix)); + needs &= ~NEED_INITRD; + } + + } else if (tmplLine->type == LT_TITLE && + (needs & NEED_TITLE)) { + if (tmplLine->numElements >= 2) { + newLine = addLineTmpl(new, tmplLine, newLine, + newKernelTitle); + needs &= ~NEED_TITLE; + } else if (tmplLine->numElements == 1 && + config->cfi->titleBracketed) { + /* addLineTmpl doesn't handle titleBracketed */ + newLine = addLine(new, config->cfi, LT_TITLE, + tmplLine->indent, newKernelTitle); + needs &= ~NEED_TITLE; + } + } else { - newLine->next = malloc(sizeof(*newLine)); - newLine = newLine->next; + /* pass through other lines from the template */ + newLine = addLineTmpl(new, tmplLine, newLine, NULL); } - - - newLine->indent = strdup(tmplLine->indent); - newLine->next = NULL; - newLine->type = tmplLine->type; - newLine->numElements = tmplLine->numElements; - newLine->elements = malloc(sizeof(*newLine->elements) * - newLine->numElements); - for (i = 0; i < newLine->numElements; i++) { - newLine->elements[i].item = strdup(tmplLine->elements[i].item); - newLine->elements[i].indent = - strdup(tmplLine->elements[i].indent); - } - - lastLine = tmplLine; - if (tmplLine->type == LT_KERNEL && tmplLine->numElements >= 2) { - char * repl; - if (!template->multiboot) { - needs &= ~KERNEL_KERNEL; - repl = newKernelPath; - } else { - needs &= ~KERNEL_MB; - repl = newMBKernel; - } - if (new->multiboot && !template->multiboot) { - free(newLine->elements[0].item); - newLine->elements[0].item = strdup("module"); - newLine->type = LT_MBMODULE; - } - free(newLine->elements[1].item); - rootspec = getRootSpecifier(tmplLine->elements[1].item); - if (rootspec != NULL) { - newLine->elements[1].item = sdupprintf("%s%s", - rootspec, - repl + - strlen(prefix)); - } else { - newLine->elements[1].item = strdup(repl + - strlen(prefix)); - } - } else if (tmplLine->type == LT_MBMODULE && - tmplLine->numElements >= 2 && (needs & KERNEL_KERNEL)) { - needs &= ~KERNEL_KERNEL; - if (!new->multiboot && template->multiboot) { - free(newLine->elements[0].item); - newLine->elements[0].item = strdup("kernel"); - newLine->type = LT_KERNEL; - } - free(newLine->elements[1].item); - rootspec = getRootSpecifier(tmplLine->elements[1].item); - if (rootspec != NULL) { - newLine->elements[1].item = sdupprintf("%s%s", - rootspec, - newKernelPath + - strlen(prefix)); - } else { - newLine->elements[1].item = strdup(newKernelPath + - strlen(prefix)); - } - } else if (tmplLine->type == LT_INITRD && - tmplLine->numElements >= 2) { - needs &= ~KERNEL_INITRD; - free(newLine->elements[1].item); - if (new->multiboot && !template->multiboot) { - free(newLine->elements[0].item); - newLine->elements[0].item = strdup("module"); - newLine->type = LT_MBMODULE; - } - rootspec = getRootSpecifier(tmplLine->elements[1].item); - if (rootspec != NULL) { - newLine->elements[1].item = sdupprintf("%s%s", - rootspec, - newKernelInitrd + - strlen(prefix)); - } else { - newLine->elements[1].item = strdup(newKernelInitrd + - strlen(prefix)); - } - } else if (tmplLine->type == LT_MBMODULE && - tmplLine->numElements >= 2 && (needs & KERNEL_INITRD)) { - needs &= ~KERNEL_INITRD; - if (!new->multiboot && template->multiboot) { - free(newLine->elements[0].item); - newLine->elements[0].item = strdup("initrd"); - newLine->type = LT_INITRD; - } - free(newLine->elements[1].item); - rootspec = getRootSpecifier(tmplLine->elements[1].item); - if (rootspec != NULL) { - newLine->elements[1].item = sdupprintf("%s%s", - rootspec, - newKernelInitrd + - strlen(prefix)); - } else { - newLine->elements[1].item = strdup(newKernelInitrd + - strlen(prefix)); - } - } else if (tmplLine->type == LT_TITLE && - tmplLine->numElements >= 2) { - needs &= ~KERNEL_TITLE; - - for (i = 1; i < newLine->numElements; i++) { - free(newLine->elements[i].item); - free(newLine->elements[i].indent); + } + + } else { + /* don't have a template, so start the entry with the + * appropriate starting line + */ + switch (config->cfi->entrySeparator) { + case LT_KERNEL: + if (new->multiboot && config->cfi->mbHyperFirst) { + /* fall through to LT_HYPER */ + } else { + newLine = addLine(new, config->cfi, LT_KERNEL, + config->primaryIndent, + newKernelPath + strlen(prefix)); + needs &= ~NEED_KERNEL; + break; } - newLine->elements[1].item = strdup(newKernelTitle); - newLine->elements[1].indent = strdup(""); - newLine->numElements = 2; - } else if (tmplLine->type == LT_TITLE && - config->cfi->titleBracketed && - tmplLine->numElements == 1) { - needs &= ~KERNEL_TITLE; - free(newLine->elements[0].item); - free(newLine->elements[0].indent); - newLine->elements = malloc(sizeof(*newLine->elements) * - newLine->numElements); - - newLine->elements[0].item = malloc(strlen(newKernelTitle) + 3); - sprintf(newLine->elements[0].item, "[%s]", newKernelTitle); - newLine->elements[0].indent = strdup(""); - newLine->numElements = 1; - } - } - } else { - for (i = 0; config->cfi->keywords[i].key; i++) { - if ((config->cfi->keywords[i].type == config->cfi->entrySeparator) || (config->cfi->keywords[i].type == LT_OTHER)) + case LT_HYPER: + newLine = addLine(new, config->cfi, LT_HYPER, + config->primaryIndent, + newMBKernel + strlen(prefix)); + needs &= ~NEED_MB; break; - } - - switch (config->cfi->keywords[i].type) { - case LT_KERNEL: needs &= ~KERNEL_KERNEL, - chptr = newKernelPath + strlen(prefix); - type = LT_KERNEL; break; - case LT_TITLE: needs &= ~KERNEL_TITLE, chptr = newKernelTitle; - type = LT_TITLE; break; - default: - /* zipl strikes again */ - if (config->cfi->titleBracketed) { - needs &= ~KERNEL_TITLE; - chptr = newKernelTitle; - type = LT_TITLE; - break; - } else { - abort(); - } - } - - newLine = addLine(new, config->cfi, type, config->primaryIndent, chptr); - new->lines = newLine; + + case LT_TITLE: + newLine = addLine(new, config->cfi, LT_TITLE, + config->primaryIndent, newKernelTitle); + needs &= ~NEED_TITLE; + break; + + default: + abort(); + } } - if (new->multiboot) { - if (needs & KERNEL_MB) - newLine = addLine(new, config->cfi, LT_KERNEL, - config->secondaryIndent, - newMBKernel + strlen(prefix)); - if (needs & KERNEL_KERNEL) - newLine = addLine(new, config->cfi, LT_MBMODULE, - config->secondaryIndent, - newKernelPath + strlen(prefix)); - /* don't need to check for title as it's guaranteed to have been - * done as we only do multiboot with grub which uses title as - * a separator */ - if (needs & KERNEL_INITRD && newKernelInitrd) - newLine = addLine(new, config->cfi, LT_MBMODULE, - config->secondaryIndent, - newKernelInitrd + strlen(prefix)); - } else { - if (needs & KERNEL_KERNEL) - newLine = addLine(new, config->cfi, LT_KERNEL, - config->secondaryIndent, - newKernelPath + strlen(prefix)); - if (needs & KERNEL_TITLE) - newLine = addLine(new, config->cfi, LT_TITLE, - config->secondaryIndent, - newKernelTitle); - if (needs & KERNEL_INITRD && newKernelInitrd) - newLine = addLine(new, config->cfi, LT_INITRD, - config->secondaryIndent, - newKernelInitrd + strlen(prefix)); + /* add the remainder of the lines, i.e. those that either + * weren't present in the template, or in the case of no template, + * all the lines following the entrySeparator. + */ + if (needs & NEED_TITLE) { + newLine = addLine(new, config->cfi, LT_TITLE, + config->secondaryIndent, + newKernelTitle); + needs &= ~NEED_TITLE; + } + if ((needs & NEED_MB) && config->cfi->mbHyperFirst) { + newLine = addLine(new, config->cfi, LT_HYPER, + config->secondaryIndent, + newMBKernel + strlen(prefix)); + needs &= ~NEED_MB; + } + if (needs & NEED_KERNEL) { + newLine = addLine(new, config->cfi, + (new->multiboot && getKeywordByType(LT_MBMODULE, + config->cfi)) ? + LT_MBMODULE : LT_KERNEL, + config->secondaryIndent, + newKernelPath + strlen(prefix)); + needs &= ~NEED_KERNEL; + } + if (needs & NEED_MB) { + newLine = addLine(new, config->cfi, LT_HYPER, + config->secondaryIndent, + newMBKernel + strlen(prefix)); + needs &= ~NEED_MB; + } + if (needs & NEED_INITRD) { + newLine = addLine(new, config->cfi, + (new->multiboot && getKeywordByType(LT_MBMODULE, + config->cfi)) ? + LT_MBMODULE : LT_INITRD, + config->secondaryIndent, + newKernelInitrd + strlen(prefix)); + needs &= ~NEED_INITRD; + } + + if (needs) { + printf(_("grubby: needs=%d, aborting\n"), needs); + abort(); } if (updateImage(config, "0", prefix, newKernelArgs, NULL, @@ -2669,7 +2726,7 @@ int main(int argc, const char ** argv) { if (!entry) return 0; if (!suitableImage(entry, bootPrefix, 0, flags)) return 0; - line = getLineByType(LT_KERNEL, entry->lines); + line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines); if (!line) return 0; rootspec = getRootSpecifier(line->elements[1].item); From aron at hp.com Thu Jun 29 21:42:37 2006 From: aron at hp.com (Aron Griffis) Date: Thu, 29 Jun 2006 17:42:37 -0400 Subject: [Fedora-xen] [PATCH 5 of 6] Add test suite cases for elilo multiboot In-Reply-To: Message-ID: # HG changeset patch # User agriffis at cheo.zko.hp.com # Node ID c21b0cf582a12df3f29601fca13f9ac82cf0ff06 # Parent bbebf7a97ae1e13bb2b3bce3dcc999a7de53aa98 Add test suite cases for elilo multiboot Additionally remove trailing whitespace from grubby/test/results/updargs/g3.7 since the recent grubby changes allow it to do a better job handling whitespace. Signed-off-by: Aron Griffis grubby/test/elilo.1 | 25 +++++++++++++++++++++++++ grubby/test/elilo.2 | 30 ++++++++++++++++++++++++++++++ grubby/test/results/multiboot/e1.1 | 30 ++++++++++++++++++++++++++++++ grubby/test/results/multiboot/e1.2 | 32 ++++++++++++++++++++++++++++++++ grubby/test/results/multiboot/e2.1 | 26 ++++++++++++++++++++++++++ grubby/test/results/multiboot/e2.2 | 25 +++++++++++++++++++++++++ grubby/test/results/multiboot/e2.3 | 23 +++++++++++++++++++++++ grubby/test.sh | 18 ++++++++++++++++++ grubby/test/results/updargs/g3.7 | 4 ++-- 9 files changed, 211 insertions(+), 2 deletions(-) diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test.sh --- a/grubby/test.sh Thu Jun 29 16:56:35 2006 -0400 +++ b/grubby/test.sh Thu Jun 29 17:01:05 2006 -0400 @@ -334,6 +334,24 @@ grubTest grub.10 multiboot/g10.7 --boot- grubTest grub.10 multiboot/g10.7 --boot-filesystem=/boot \ --remove-multiboot=/boot/xen.gz +testing="ELILO add multiboot" +eliloTest elilo.1 multiboot/e1.1 --add-multiboot=/boot/xen.gz \ + --add-kernel=/boot/vmlinuz-2.6.10-1.1088_FC4 --boot-filesystem=/boot \ + --initrd=/boot/initrd-2.6.10-1.1088_FC4.img --title foo \ + --mbargs="dom0_mem=130000" +eliloTest elilo.1 multiboot/e1.2 --add-multiboot=/boot/xen.gz \ + --add-kernel=/boot/vmlinuz-2.6.10-1.1088_FC4 --boot-filesystem=/boot \ + --initrd=/boot/initrd-2.6.10-1.1088_FC4.img --title foo \ + --mbargs="dom0_mem=130000" --copy-default + +testing="ELILO remove multiboot" +eliloTest elilo.2 multiboot/e2.1 --boot-filesystem=/boot \ + --remove-kernel=/boot/vmlinuz-2.6.10-1.1076_FC4 +eliloTest elilo.2 multiboot/e2.2 --boot-filesystem=/boot \ + --remove-kernel=/boot/vmlinuz-2.6.10-1.1082_FC4 +eliloTest elilo.2 multiboot/e2.3 --boot-filesystem=/boot \ + --remove-multiboot=/boot/xen.gz + printf "\n%d (%d%%) tests passed, %d (%d%%) tests failed\n" \ $pass $(((100*pass)/(pass+fail))) \ $fail $(((100*fail)/(pass+fail))) diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/results/updargs/g3.7 --- a/grubby/test/results/updargs/g3.7 Thu Jun 29 16:56:35 2006 -0400 +++ b/grubby/test/results/updargs/g3.7 Thu Jun 29 17:01:05 2006 -0400 @@ -3,11 +3,11 @@ splashimage=(hd0,1)/grub/splash.xpm.gz splashimage=(hd0,1)/grub/splash.xpm.gz title Red Hat Linux (2.4.7-2smp) root (hd0,1) - kernel /vmlinuz-2.4.7-2smp + kernel /vmlinuz-2.4.7-2smp initrd /initrd-2.4.7-2smp.img title Red Hat Linux-up (2.4.7-2) root (hd0,1) - kernel /vmlinuz-2.4.7-2 + kernel /vmlinuz-2.4.7-2 initrd /initrd-2.4.7-2.img title DOS rootnoverify (hd0,0) diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/elilo.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/grubby/test/elilo.1 Thu Jun 29 17:01:05 2006 -0400 @@ -0,0 +1,25 @@ +prompt +timeout=50 +default=linux +boot=/dev/md1 +map=/boot/map +install=/boot/boot.b +message=/boot/message +linear + +disk=/dev/sdm + bios=0x80 +disk=/dev/sdn + bios=0x81 + +image=/boot/vmlinuz-2.4.18-4 + label=linux-up + root=/dev/md0 + read-only + initrd=/boot/initrd-2.4.18-4.img + +image=/boot/vmlinuz-2.4.18-4smp + label=linux + root=/dev/md0 + read-only + initrd=/boot/initrd-2.4.18-4smp.img diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/elilo.2 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/grubby/test/elilo.2 Thu Jun 29 17:01:05 2006 -0400 @@ -0,0 +1,30 @@ +prompt +timeout=50 +default=linux +boot=/dev/md1 +map=/boot/map +install=/boot/boot.b +message=/boot/message +linear + +disk=/dev/sdm + bios=0x80 +disk=/dev/sdn + bios=0x81 + +image=/vmlinuz-2.6.10-1.1076_FC4 + label=foo + initrd=/initrd-2.6.10-1.1088_FC4.img + append="dom0_mem=130000 --" +image=/boot/vmlinuz-2.4.18-4 + label=linux-up + vmm=/xen.gz + root=/dev/md0 + read-only + initrd=/boot/initrd-2.4.18-4.img + +image=/vmlinuz-2.6.10-1.1082_FC4 + label=linux + root=/dev/md0 + read-only + initrd=/boot/initrd-2.4.18-4smp.img diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/results/multiboot/e1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/grubby/test/results/multiboot/e1.1 Thu Jun 29 17:01:05 2006 -0400 @@ -0,0 +1,30 @@ +prompt +timeout=50 +default=linux +boot=/dev/md1 +map=/boot/map +install=/boot/boot.b +message=/boot/message +linear + +disk=/dev/sdm + bios=0x80 +disk=/dev/sdn + bios=0x81 + +image=/vmlinuz-2.6.10-1.1088_FC4 + label=foo + vmm=/xen.gz + initrd=/initrd-2.6.10-1.1088_FC4.img + append="dom0_mem=130000 --" +image=/boot/vmlinuz-2.4.18-4 + label=linux-up + root=/dev/md0 + read-only + initrd=/boot/initrd-2.4.18-4.img + +image=/boot/vmlinuz-2.4.18-4smp + label=linux + root=/dev/md0 + read-only + initrd=/boot/initrd-2.4.18-4smp.img diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/results/multiboot/e1.2 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/grubby/test/results/multiboot/e1.2 Thu Jun 29 17:01:05 2006 -0400 @@ -0,0 +1,32 @@ +prompt +timeout=50 +default=linux +boot=/dev/md1 +map=/boot/map +install=/boot/boot.b +message=/boot/message +linear + +disk=/dev/sdm + bios=0x80 +disk=/dev/sdn + bios=0x81 + +image=/vmlinuz-2.6.10-1.1088_FC4 + vmm=/xen.gz + label=foo + root=/dev/md0 + read-only + initrd=/initrd-2.6.10-1.1088_FC4.img + append="dom0_mem=130000 --" +image=/boot/vmlinuz-2.4.18-4 + label=linux-up + root=/dev/md0 + read-only + initrd=/boot/initrd-2.4.18-4.img + +image=/boot/vmlinuz-2.4.18-4smp + label=linux + root=/dev/md0 + read-only + initrd=/boot/initrd-2.4.18-4smp.img diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/results/multiboot/e2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/grubby/test/results/multiboot/e2.1 Thu Jun 29 17:01:05 2006 -0400 @@ -0,0 +1,26 @@ +prompt +timeout=50 +default=linux +boot=/dev/md1 +map=/boot/map +install=/boot/boot.b +message=/boot/message +linear + +disk=/dev/sdm + bios=0x80 +disk=/dev/sdn + bios=0x81 + +image=/boot/vmlinuz-2.4.18-4 + label=linux-up + vmm=/xen.gz + root=/dev/md0 + read-only + initrd=/boot/initrd-2.4.18-4.img + +image=/vmlinuz-2.6.10-1.1082_FC4 + label=linux + root=/dev/md0 + read-only + initrd=/boot/initrd-2.4.18-4smp.img diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/results/multiboot/e2.2 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/grubby/test/results/multiboot/e2.2 Thu Jun 29 17:01:05 2006 -0400 @@ -0,0 +1,25 @@ +prompt +timeout=50 +default=foo +boot=/dev/md1 +map=/boot/map +install=/boot/boot.b +message=/boot/message +linear + +disk=/dev/sdm + bios=0x80 +disk=/dev/sdn + bios=0x81 + +image=/vmlinuz-2.6.10-1.1076_FC4 + label=foo + initrd=/initrd-2.6.10-1.1088_FC4.img + append="dom0_mem=130000 --" +image=/boot/vmlinuz-2.4.18-4 + label=linux-up + vmm=/xen.gz + root=/dev/md0 + read-only + initrd=/boot/initrd-2.4.18-4.img + diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/results/multiboot/e2.3 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/grubby/test/results/multiboot/e2.3 Thu Jun 29 17:01:05 2006 -0400 @@ -0,0 +1,23 @@ +prompt +timeout=50 +default=linux +boot=/dev/md1 +map=/boot/map +install=/boot/boot.b +message=/boot/message +linear + +disk=/dev/sdm + bios=0x80 +disk=/dev/sdn + bios=0x81 + +image=/vmlinuz-2.6.10-1.1076_FC4 + label=foo + initrd=/initrd-2.6.10-1.1088_FC4.img + append="dom0_mem=130000 --" +image=/vmlinuz-2.6.10-1.1082_FC4 + label=linux + root=/dev/md0 + read-only + initrd=/boot/initrd-2.4.18-4smp.img From supercomputer at gmail.com Thu Jun 29 22:56:21 2006 From: supercomputer at gmail.com (Chris Vaughan) Date: Thu, 29 Jun 2006 16:56:21 -0600 Subject: [Fedora-xen] Checkpointing Message-ID: <216ee070606291556p633570f8p1e2fe5a406ffb8eb@mail.gmail.com> Hi, Is there any way you can save a xen domain without suspending it or stopping it? I want to set up something so if my xen session crashes I can fire up another xen session from the save file that I created 5 minutes before the crash and hopefully minimize downtime. Thanks -- ------------------------------ Christopher Vaughan -------------- next part -------------- An HTML attachment was scrubbed... URL: From veillard at redhat.com Thu Jun 29 23:09:07 2006 From: veillard at redhat.com (Daniel Veillard) Date: Thu, 29 Jun 2006 19:09:07 -0400 Subject: [Fedora-xen] Re: [Xen-users] Checkpointing In-Reply-To: <216ee070606291556p633570f8p1e2fe5a406ffb8eb@mail.gmail.com> References: <216ee070606291556p633570f8p1e2fe5a406ffb8eb@mail.gmail.com> Message-ID: <20060629230906.GI1483@redhat.com> On Thu, Jun 29, 2006 at 04:56:21PM -0600, Chris Vaughan wrote: > Hi, > > Is there any way you can save a xen domain without suspending it or stopping > it? I want to set up something so if my xen session crashes I can fire up > another xen session from the save file that I created 5 minutes before the > crash and hopefully minimize downtime. Doesn't work in general because you would have to save the state of the filesystems too. Xen operations don't allow a save and continue for that reason I was told. Daniel -- Daniel Veillard | Red Hat http://redhat.com/ veillard at redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/ From supercomputer at gmail.com Thu Jun 29 23:14:11 2006 From: supercomputer at gmail.com (Chris Vaughan) Date: Thu, 29 Jun 2006 17:14:11 -0600 Subject: [Fedora-xen] Re: [Xen-users] Checkpointing In-Reply-To: <20060629230906.GI1483@redhat.com> References: <216ee070606291556p633570f8p1e2fe5a406ffb8eb@mail.gmail.com> <20060629230906.GI1483@redhat.com> Message-ID: <216ee070606291614x3b25e68fyd4a8f2b6336c03fc@mail.gmail.com> So what's the difference between a "Live Migration" & "Save" then? Does the live migration keep the image open and the save does not? To me they seam to be 2 peas in a pod but I guess I'm mistaken. Thanks On 6/29/06, Daniel Veillard wrote: > > On Thu, Jun 29, 2006 at 04:56:21PM -0600, Chris Vaughan wrote: > > Hi, > > > > Is there any way you can save a xen domain without suspending it or > stopping > > it? I want to set up something so if my xen session crashes I can fire > up > > another xen session from the save file that I created 5 minutes before > the > > crash and hopefully minimize downtime. > > Doesn't work in general because you would have to save the state of the > filesystems too. Xen operations don't allow a save and continue for that > reason I was told. > > Daniel > > -- > Daniel Veillard | Red Hat http://redhat.com/ > veillard at redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ > http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/ > -- ------------------------------ Christopher Vaughan -------------- next part -------------- An HTML attachment was scrubbed... URL: From Axel.Thimm at ATrpms.net Fri Jun 30 00:23:06 2006 From: Axel.Thimm at ATrpms.net (Axel Thimm) Date: Fri, 30 Jun 2006 02:23:06 +0200 Subject: [Fedora-xen] Re: Checkpointing In-Reply-To: <216ee070606291614x3b25e68fyd4a8f2b6336c03fc@mail.gmail.com> References: <216ee070606291556p633570f8p1e2fe5a406ffb8eb@mail.gmail.com> <20060629230906.GI1483@redhat.com> <216ee070606291614x3b25e68fyd4a8f2b6336c03fc@mail.gmail.com> Message-ID: <20060630002306.GA26375@neu.nirvana> On Thu, Jun 29, 2006 at 05:14:11PM -0600, Chris Vaughan wrote: > So what's the difference between a "Live Migration" & "Save" then? Does the > live migration keep the image open and the save does not? To me they seam > to be 2 peas in a pod but I guess I'm mistaken. Live migration ensures that the filesystem is passed as is from one state to the other. Restoring a checkpointed system would mean that the system would suddenly warp back in time wrt to the filesystem, or what is effectively the same from the system's POV the filesystem suddenly warped ahead in time. For example: Perhaps your crash between the checkpointing and the resuming was caused by rm -fr / and no checkpointing could undo that :) So checkpointing in xen would only work hand in hand with block device snapshoting. > Thanks > > > On 6/29/06, Daniel Veillard wrote: > > > >On Thu, Jun 29, 2006 at 04:56:21PM -0600, Chris Vaughan wrote: > >> Hi, > >> > >> Is there any way you can save a xen domain without suspending it or > >stopping > >> it? I want to set up something so if my xen session crashes I can fire > >up > >> another xen session from the save file that I created 5 minutes before > >the > >> crash and hopefully minimize downtime. > > > > Doesn't work in general because you would have to save the state of the > >filesystems too. Xen operations don't allow a save and continue for that > >reason I was told. > > > >Daniel > > > > > -- Axel.Thimm at ATrpms.net -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available URL: From takebe_akio at jp.fujitsu.com Fri Jun 30 02:24:38 2006 From: takebe_akio at jp.fujitsu.com (Akio Takebe) Date: Fri, 30 Jun 2006 11:24:38 +0900 Subject: [Fedora-xen] How to use linux-2.6.tip-xen Message-ID: <7EC69BEC562FA3takebe_akio@jp.fujitsu.com> Hi, Chris I'm now working on fedora-xen-ia64. Please tell me how to use linux-2.6.tip-xen. I use xen-ia64-unstable.hg and your linux-2.6.tip-xen, and boot dom0/domU/domVTi. I think the usage is the below. 1. hg clone http://xenbits.xensource.com/ext/xen-ia64-unstable.hg or http://xenbits.xensource.com/xen-unstable.hg 2. hg clone http://xenbits.xensource.com/ext/linux-2.6.tip-xen.hg I do patch to linux-2.6.tip-xen with xen-ia64-unstable.hg/patches or xen-unstable.hg/patches. 3. make xen & make tools in xen-ia64-unstable or xen-unstable.hg 4. make in linux-2.6.tip-xen 5. boot dom0 and xen with xen of xen-ia64-unstable & dom0 kernel of linux-2.6.tip-xen 6. boot domU with linux-2.6.tip-xen Am I right? or I need some more patches? Best Regards, Akio Takebe From katzj at redhat.com Fri Jun 30 04:02:49 2006 From: katzj at redhat.com (Jeremy Katz) Date: Fri, 30 Jun 2006 00:02:49 -0400 Subject: [Fedora-xen] Re: [PATCH 1 of 6] Improve the test suite In-Reply-To: <8bbf845cad0dc1774c34.1151617353@vino.zko.hp.com> References: <8bbf845cad0dc1774c34.1151617353@vino.zko.hp.com> Message-ID: <1151640169.4187.3.camel@aglarond.local> On Thu, 2006-06-29 at 17:42 -0400, Aron Griffis wrote: > - By default, run all the tests, regardless of architecture. Since the test > suite calls grubby and not the bootloaders themselves, there's no reason to > be selective. There was a reason why I changed this to be the way it is at one point... hell if I remember what it is anymore. Since things seem to work, I'm willing to give it a try again :) > - NB: These changes reveal that yaboot parsing has some issues. Well, more just that it reorders the file rather than actual issues. Fixed up the tests -- the reordering actually doesn't cause any problems for yaboot. > Additionally > the symlink test now returns failure, which wasn't being detected properly > before. Indeed. Fixed up the code for this to actually be correct. Jeremy From katzj at redhat.com Fri Jun 30 04:03:12 2006 From: katzj at redhat.com (Jeremy Katz) Date: Fri, 30 Jun 2006 00:03:12 -0400 Subject: [Fedora-xen] Re: [PATCH 0 of 6] elilo multiboot support (take 2) In-Reply-To: References: Message-ID: <1151640192.4187.5.camel@aglarond.local> On Thu, 2006-06-29 at 17:42 -0400, Aron Griffis wrote: > The following patches give grubby the ability to manipulate > multiboot-capable elilo.conf. Fedora's elilo already contains the > support, these patches simply teach grubby to take advantage of it. > These patches are an enabler for using Xen on ia64 with Fedora. Looks good -- I've applied all of these and they'll be in the mkinitrd build I'm going to push through the buildsys now. Jeremy From fedora at adslpipe.co.uk Fri Jun 30 07:57:42 2006 From: fedora at adslpipe.co.uk (Andy Burns) Date: Fri, 30 Jun 2006 08:57:42 +0100 Subject: [Fedora-xen] Xen/libVirt GUI app: "Virtual Machine Manager" In-Reply-To: <20060628200826.GG28524@redhat.com> References: <20060628200826.GG28524@redhat.com> Message-ID: <44A4D976.2060702@adslpipe.co.uk> Daniel P. Berrange wrote: > I'm pleased to make available the code for an early *development snapshot* > of a graphical application for managing virtual machines. It installed ok from your repo, also upgraded to libvirt ok, booted 2.6.17-1.2307_FC6xen, xend running, started your GUI from a tty # virt-manager dbus_bindings.DBusException Unable to determine the address of the message bus ( try 'man dbus-launch' and 'man dbus-daemon' for help) Could not connection to session bus, disabling DBus service Naturally I have got dbus running, at this point I got the open connection dialog, and tried to connect to local xen host (with and without read only, but as root) after a delay the dialog closed, but this message is displayed if invoked from a tty libvir: Xen Daemon error : could not connect to Xen Daemon Unable to open connection to hypervisor URI 'xen' libvirt.libvirtError virDomainLookupByID() failed However I did look at the mockup design and the screenshots on your pages, and I *like* the look of what it intends to do :-) From veillard at redhat.com Fri Jun 30 08:19:17 2006 From: veillard at redhat.com (Daniel Veillard) Date: Fri, 30 Jun 2006 04:19:17 -0400 Subject: [Fedora-xen] Xen/libVirt GUI app: "Virtual Machine Manager" In-Reply-To: <44A4D976.2060702@adslpipe.co.uk> References: <20060628200826.GG28524@redhat.com> <44A4D976.2060702@adslpipe.co.uk> Message-ID: <20060630081917.GJ1483@redhat.com> On Fri, Jun 30, 2006 at 08:57:42AM +0100, Andy Burns wrote: > Daniel P. Berrange wrote: > > >I'm pleased to make available the code for an early *development snapshot* > >of a graphical application for managing virtual machines. > > It installed ok from your repo, also upgraded to libvirt ok, booted > 2.6.17-1.2307_FC6xen, xend running, started your GUI from a tty > > # virt-manager > dbus_bindings.DBusException Unable to determine the address of the > message bus ( try 'man dbus-launch' and 'man dbus-daemon' for help) > Could not connection to session bus, disabling DBus service > > Naturally I have got dbus running, at this point I got the open > connection dialog, and tried to connect to local xen host (with and > without read only, but as root) after a delay the dialog closed, but > this message is displayed if invoked from a tty > > libvir: Xen Daemon error : could not connect to Xen Daemon > Unable to open connection to hypervisor URI 'xen' > libvirt.libvirtError virDomainLookupByID() failed Hum, which versions of xen, kernel and libvirt are you using ? It seems the xend daemon can't be reached locally, which makes a number of operations (like mapping between domain names and id) impossible. Daniel -- Daniel Veillard | Red Hat http://redhat.com/ veillard at redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/ From cgs at ldsys.net Thu Jun 29 23:54:40 2006 From: cgs at ldsys.net (Christopher G. Stach II) Date: Thu, 29 Jun 2006 18:54:40 -0500 Subject: [Fedora-xen] Re: [Xen-users] Checkpointing In-Reply-To: <216ee070606291614x3b25e68fyd4a8f2b6336c03fc@mail.gmail.com> References: <216ee070606291556p633570f8p1e2fe5a406ffb8eb@mail.gmail.com> <20060629230906.GI1483@redhat.com> <216ee070606291614x3b25e68fyd4a8f2b6336c03fc@mail.gmail.com> Message-ID: <44A46840.7040904@ldsys.net> Chris Vaughan wrote: > So what's the difference between a "Live Migration" & "Save" then? Does > the live migration keep the image open and the save does not? To me > they seam to be 2 peas in a pod but I guess I'm mistaken. > > Thanks > > Migration saves VM state and assumes that the filesystem does not change. Checkpointing would have to restore the filesystem to the same point in time that the snapshot was taken of the VM. Perhaps you could swing it with CoW or something, but it doesn't work now. -- Christopher G. Stach II From treed at ultraviolet.org Fri Jun 30 04:16:25 2006 From: treed at ultraviolet.org (Tracy R Reed) Date: Thu, 29 Jun 2006 21:16:25 -0700 Subject: [Fedora-xen] Re: [Xen-users] Checkpointing In-Reply-To: <44A46840.7040904@ldsys.net> References: <216ee070606291556p633570f8p1e2fe5a406ffb8eb@mail.gmail.com> <20060629230906.GI1483@redhat.com> <216ee070606291614x3b25e68fyd4a8f2b6336c03fc@mail.gmail.com> <44A46840.7040904@ldsys.net> Message-ID: <44A4A599.20608@ultraviolet.org> Christopher G. Stach II wrote: > Migration saves VM state and assumes that the filesystem does not > change. Checkpointing would have to restore the filesystem to the same > point in time that the snapshot was taken of the VM. Perhaps you could > swing it with CoW or something, but it doesn't work now. So take an LVM snapshot of the filesystem also. Maintaining network state would seem to be the harder thing to me. -- Tracy R Reed http://ultraviolet.org From cgs at ldsys.net Fri Jun 30 04:42:21 2006 From: cgs at ldsys.net (Christopher G. Stach II) Date: Thu, 29 Jun 2006 23:42:21 -0500 Subject: [Fedora-xen] Re: [Xen-users] Checkpointing In-Reply-To: <44A4A599.20608@ultraviolet.org> References: <216ee070606291556p633570f8p1e2fe5a406ffb8eb@mail.gmail.com> <20060629230906.GI1483@redhat.com> <216ee070606291614x3b25e68fyd4a8f2b6336c03fc@mail.gmail.com> <44A46840.7040904@ldsys.net> <44A4A599.20608@ultraviolet.org> Message-ID: <44A4ABAD.209@ldsys.net> Tracy R Reed wrote: > Christopher G. Stach II wrote: >> Migration saves VM state and assumes that the filesystem does not >> change. Checkpointing would have to restore the filesystem to the same >> point in time that the snapshot was taken of the VM. Perhaps you could >> swing it with CoW or something, but it doesn't work now. > > So take an LVM snapshot of the filesystem also. Maintaining network > state would seem to be the harder thing to me. > There was talk of weaving Cruz into Xen: http://www.hpl.hp.com/techreports/2005/HPL-2005-66.pdf -- Christopher G. Stach II From fedora at adslpipe.co.uk Fri Jun 30 08:49:31 2006 From: fedora at adslpipe.co.uk (Andy Burns) Date: Fri, 30 Jun 2006 09:49:31 +0100 Subject: [Fedora-xen] Xen/libVirt GUI app: "Virtual Machine Manager" In-Reply-To: <20060630081917.GJ1483@redhat.com> References: <20060628200826.GG28524@redhat.com> <44A4D976.2060702@adslpipe.co.uk> <20060630081917.GJ1483@redhat.com> Message-ID: <44A4E59B.2010300@adslpipe.co.uk> Daniel Veillard wrote: > which versions of xen, kernel and libvirt are you using ? xen Arch : i386 Version: 3.0.2 Release: 4 libvirt Arch : i386 Version: 0.1.0 Release: 1 kernel-xen Arch : i686 Version: 2.6.17 Release: 1.2307_FC6 I was going to say the only selinux messages I've been noticing on FC6T1 so far have been related to ntpd and nfs, but on checking I notice the following audit(1151652889.670:87): avc: denied { recv } for saddr=127.0.0.1 src=40682 daddr=127.0.0.1 dest=8000 netif=lo scontext=system_u:system_r:xend_t:s0 tcontext=system_u:object_r:unlabeled_t:s0 tclass=packet so I'll reboot with enforcing=0 and try again ... Thanks From veillard at redhat.com Fri Jun 30 11:24:09 2006 From: veillard at redhat.com (Daniel Veillard) Date: Fri, 30 Jun 2006 07:24:09 -0400 Subject: [Fedora-xen] Xen/libVirt GUI app: "Virtual Machine Manager" In-Reply-To: <44A4E59B.2010300@adslpipe.co.uk> References: <20060628200826.GG28524@redhat.com> <44A4D976.2060702@adslpipe.co.uk> <20060630081917.GJ1483@redhat.com> <44A4E59B.2010300@adslpipe.co.uk> Message-ID: <20060630112409.GL1483@redhat.com> On Fri, Jun 30, 2006 at 09:49:31AM +0100, Andy Burns wrote: > Daniel Veillard wrote: > > >which versions of xen, kernel and libvirt are you using ? > > xen > Arch : i386 > Version: 3.0.2 > Release: 4 > > libvirt > Arch : i386 > Version: 0.1.0 > Release: 1 > > kernel-xen > Arch : i686 > Version: 2.6.17 > Release: 1.2307_FC6 Very latest Xen hypervisor, you must use libvirt-0.1.1 and preferably a very recent xen too > 3.0.2-6 > so I'll reboot with enforcing=0 and try again ... I don't think it's selinux related, but an ABI breakage at the Xen hypervisor level. Update xen and libvirt. Daniel -- Daniel Veillard | Red Hat http://redhat.com/ veillard at redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/ From fedora at adslpipe.co.uk Fri Jun 30 11:33:24 2006 From: fedora at adslpipe.co.uk (Andy Burns) Date: Fri, 30 Jun 2006 12:33:24 +0100 Subject: [Fedora-xen] Xen/libVirt GUI app: "Virtual Machine Manager" In-Reply-To: <20060630081917.GJ1483@redhat.com> References: <20060628200826.GG28524@redhat.com> <44A4D976.2060702@adslpipe.co.uk> <20060630081917.GJ1483@redhat.com> Message-ID: <44A50C04.10102@adslpipe.co.uk> Daniel Veillard wrote: > It seems the xend daemon can't be reached locally Turns out it was selinux, booting in permissive mode allowed VMM to start up I'm still not up to speed on selinux policies, it it possible to set one that allows anything (or certain contexts) to make a TCP connection to xend, or would a specific one need to be added for VMM? What are the rules for modifying selinux policy for an Extra's package? From fedora at adslpipe.co.uk Fri Jun 30 11:41:52 2006 From: fedora at adslpipe.co.uk (Andy Burns) Date: Fri, 30 Jun 2006 12:41:52 +0100 Subject: [Fedora-xen] Xen/libVirt GUI app: "Virtual Machine Manager" In-Reply-To: <20060630112409.GL1483@redhat.com> References: <20060628200826.GG28524@redhat.com> <44A4D976.2060702@adslpipe.co.uk> <20060630081917.GJ1483@redhat.com> <44A4E59B.2010300@adslpipe.co.uk> <20060630112409.GL1483@redhat.com> Message-ID: <44A50E00.20801@adslpipe.co.uk> Daniel Veillard wrote: > Very latest Xen hypervisor, you must use libvirt-0.1.1 hmm, I'll swear I had seen the update to libvirt 0.1.1 get installed when I installed from the berrange repo, I didn't read the 0.1.0 when I pasted it above :-( > and preferably a very recent xen too > 3.0.2-6 I'm on the latest that rawhide offers me > I don't think it's selinux related, but an ABI breakage at the Xen > hypervisor level. Update xen and libvirt. strange, a reboot with enforcing=0 did allow it to run, and I was seeing the avc errors from xend receiving packets. my yum isn't happy at the moment, caught between mirror updates I think, checksums don't match, let me try a cleanall/makecache and see if anything newer show up for me, I've noticed xen kernels haven't been pushed for the last couple of kernel builds ... From katzj at redhat.com Fri Jun 30 13:23:02 2006 From: katzj at redhat.com (Jeremy Katz) Date: Fri, 30 Jun 2006 09:23:02 -0400 Subject: [Fedora-xen] Xen/libVirt GUI app: "Virtual Machine Manager" In-Reply-To: <44A50E00.20801@adslpipe.co.uk> References: <20060628200826.GG28524@redhat.com> <44A4D976.2060702@adslpipe.co.uk> <20060630081917.GJ1483@redhat.com> <44A4E59B.2010300@adslpipe.co.uk> <20060630112409.GL1483@redhat.com> <44A50E00.20801@adslpipe.co.uk> Message-ID: <1151673782.4187.19.camel@aglarond.local> On Fri, 2006-06-30 at 12:41 +0100, Andy Burns wrote: > my yum isn't happy at the moment, caught between mirror updates I think, > checksums don't match, let me try a cleanall/makecache and see if > anything newer show up for me, I've noticed xen kernels haven't been > pushed for the last couple of kernel builds ... Yes, the build has broken with the high amount of change going into the kernel right now Jeremy From yunfeng.zhao at intel.com Fri Jun 30 14:10:44 2006 From: yunfeng.zhao at intel.com (Zhao, Yunfeng) Date: Fri, 30 Jun 2006 22:10:44 +0800 Subject: [Fedora-xen] Cannot boot HVM guests on FC6 Test1 Message-ID: <08B1877B2880CE42811294894F33AD5C68C313@pdsmsx411.ccr.corp.intel.com> I could not boot HVM guest on FC6 Test1 IA32. After executed xm create,no qemu window popup. And xm list shows the guest blocked. I submitted a bug for this issue: http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=197350 On FC6 Test1 IA32e: I cannot boot FC6 Test1 IA32e in runlevel 5. and in runlevel 3 I cannot start xend. Thanks Yunfeng From thomas.vonsteiger at bluewin.ch Fri Jun 30 15:45:27 2006 From: thomas.vonsteiger at bluewin.ch (thomas.vonsteiger at bluewin.ch) Date: Fri, 30 Jun 2006 17:45:27 +0200 Subject: AW: [Fedora-xen] Xen/libVirt GUI app: "Virtual Machine Manager" In-Reply-To: <20060628200826.GG28524@redhat.com> Message-ID: <007001c69c5c$359a5970$3e01a8c0@athlon> Hello Daniel, If have running success virt-manager on my FC5 xenbox with all available features. FC5 has the stat of latest yum update's from original repo update. >From development.repo "yum install libvirt-python" Disable development repo. Add berrange-fedora.repo and "yum install virt-manager" If I use the binary virt-manager rpm from your repo, I can start virt-manager and a can define local xen host to connect. After this I get the virt-manager gui. Becose the gui has then no content. If I get the virt-manager src.rpm from your repo and rebuild the binary.rpm on my xen host, install them, virt-manager is running success. And I say to virt-manager: "Welcome in the virtual future"..:-) Many thanks, Thomas From berrange at redhat.com Fri Jun 30 17:37:47 2006 From: berrange at redhat.com (Daniel P. Berrange) Date: Fri, 30 Jun 2006 18:37:47 +0100 Subject: [Fedora-xen] Xen/libVirt GUI app: "Virtual Machine Manager" In-Reply-To: <007001c69c5c$359a5970$3e01a8c0@athlon> References: <20060628200826.GG28524@redhat.com> <007001c69c5c$359a5970$3e01a8c0@athlon> Message-ID: <20060630173747.GA25122@redhat.com> On Fri, Jun 30, 2006 at 05:45:27PM +0200, thomas.vonsteiger at bluewin.ch wrote: > Hello Daniel, > > If have running success virt-manager on my FC5 xenbox with all available > features. > > FC5 has the stat of latest yum update's from original repo update. > From development.repo "yum install libvirt-python" > Disable development repo. > Add berrange-fedora.repo and "yum install virt-manager" I think the problem is that you took libvirt from the 'development' repository which is basically FC6test1. For FC5 you should use the 'updates-testing' repository as per the instructions on the download page: yum --enablerepo=updates-testing install virt-manager Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|