From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M0dHF-0000ac-Gm for qemu-devel@nongnu.org; Sun, 03 May 2009 11:06:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M0dHA-0000YB-HL for qemu-devel@nongnu.org; Sun, 03 May 2009 11:06:48 -0400 Received: from [199.232.76.173] (port=52570 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M0dHA-0000Y8-CF for qemu-devel@nongnu.org; Sun, 03 May 2009 11:06:44 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:56150) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1M0dH9-0005er-Sq for qemu-devel@nongnu.org; Sun, 03 May 2009 11:06:44 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e7.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n43Etv9T026220 for ; Sun, 3 May 2009 10:55:57 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n43F6fIQ114302 for ; Sun, 3 May 2009 11:06:41 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n43F4nVv015772 for ; Sun, 3 May 2009 11:04:49 -0400 Message-ID: <49FDB2FF.3060001@us.ibm.com> Date: Sun, 03 May 2009 10:06:39 -0500 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] Import KVM headers including Makefile andimport script References: <1241298173-20668-1-git-send-email-aliguori@us.ibm.com> <49FD341C.8030205@redhat.com> In-Reply-To: <49FD341C.8030205@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: qemu-devel@nongnu.org, Hollis Blanchard Avi Kivity wrote: > Anthony Liguori wrote: >> These are the headers from Linux 2.6.29 that have been modified to >> work under >> QEMU. This includes the necessary scripts to generate the headers >> from the >> original Linux source tree. >> >> Signed-off-by: Anthony Liguori >> --- >> configure | 7 +- >> include/HEAD | 1 + >> include/Makefile | 26 ++ >> include/README | 6 + >> include/asm-powerpc/kvm.h | 55 ++++ >> include/asm-powerpc/kvm_para.h | 37 +++ >> include/asm-x86/kvm.h | 218 ++++++++++++++++ >> include/asm-x86/kvm_para.h | 147 +++++++++++ >> include/fixup.sed | 11 + >> include/linux/kvm.h | 533 >> ++++++++++++++++++++++++++++++++++++++++ >> include/linux/kvm_para.h | 44 ++++ >> > > Can we put them under kvm/, as include/ looks like a generic include > directory, which this isn't. Also, this generates a gratuitous > conflict with qemu-kvm.git, and we have enough of those already. I'd rather put them under linux/ because right now, we depend on a number of Linux headers (for USB pass through, for instance). The qemu-kvm.git layout is kvm/kernel/include. That doesn't seem to make a lot of sense for QEMU. > I also suggest using arch/*/include/asm as a way of avoiding the > symlink, instead of the extra hack in fixup.sed. > I did it the current way to avoid deep directory layouts. We would end up with an extra level of directories via linux/arch-x86/asm/foo.h as opposed to linux/asm-x86/foo.h. Did you have a reason for wanting to avoid the sed hacks verses a layout like this other than to avoid the hack? The fixup certainly can be made more readable. For instance: # Expand asm/ includes to avoid having to do symlink trickery s:^#include $:\ #if defined(__x86_64__) || defined(__i386__) \ #include \ #elif defined(__powerpc__) \ #include \ #endif\ :g -- Regards, Anthony Liguori