Re: [Qemu-devel] [PATCH] Import KVM headers including Makefile andimport script

[Anthony Liguori <aliguori@us.ibm.com>]

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 <aliguori@us.ibm.com>
>> ---
>>  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 <asm/kvm\(.*\)>$:\
#if defined(__x86_64__) || defined(__i386__)            \
#include <asm-x86/kvm\1>                                \
#elif defined(__powerpc__)                              \
#include <asm-powerpc/kvm\1>                            \
#endif\
:g

-- 
Regards,

Anthony Liguori