Re: [PATCH] x86: Pick up local arch trace header

[Jan Kiszka <jan.kiszka@web.de>]

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

Aidan Marks wrote:
> 
> Il 20/09/09 21:42, Jan Kiszka ha scritto:
>> Aidan Marks wrote:
>>> Il 20/09/09 18:56, Jan Kiszka ha scritto:
>>>> Aidan Marks wrote:
>>>>> Hi Jan
>>>>>
>>>>> thanks, applied your patch, getting further, but now missing mmutrace.h...
>>>>>
>>>>> vger kvm-kmod-devel-88 # make
>>>>> make -C /lib/modules/2.6.31-gentoo/build M=`pwd` \
>>>>>                 LINUXINCLUDE="-I`pwd`/include -Iinclude \
>>>>>                  -Iarch/x86/include -I`pwd`/include-compat \
>>>>>                 -include include/linux/autoconf.h \
>>>>>                 -include `pwd`/x86/external-module-compat.h " \
>>>>>                 "$@"
>>>>> make[1]: Entering directory `/usr/src/linux-2.6.31-gentoo'
>>>>>   LD      /tmp/kvm-kmod-devel-88/x86/built-in.o
>>>>>   CC [M]  /tmp/kvm-kmod-devel-88/x86/svm.o
>>>>>   CC [M]  /tmp/kvm-kmod-devel-88/x86/vmx.o
>>>>>   CC [M]  /tmp/kvm-kmod-devel-88/x86/vmx-debug.o
>>>>>   CC [M]  /tmp/kvm-kmod-devel-88/x86/kvm_main.o
>>>>>   CC [M]  /tmp/kvm-kmod-devel-88/x86/x86.o
>>>>>   CC [M]  /tmp/kvm-kmod-devel-88/x86/mmu.o
>>>>> In file included from /tmp/kvm-kmod-devel-88/x86/mmutrace.h:220,
>>>>>                  from /tmp/kvm-kmod-devel-88/x86/mmu.c:184:
>>>>> include/trace/define_trace.h:53:43: error: ./mmutrace.h: No such file or
>>>>> directory
>>>>> make[3]: *** [/tmp/kvm-kmod-devel-88/x86/mmu.o] Error 1
>>>>> make[2]: *** [/tmp/kvm-kmod-devel-88/x86] Error 2
>>>>> make[1]: *** [_module_/tmp/kvm-kmod-devel-88] Error 2
>>>>> make[1]: Leaving directory `/usr/src/linux-2.6.31-gentoo'
>>>>> make: *** [all] Error 2
>>>> Here is a better approach:
>>>>
>>>> diff --git a/include/arch/x86/kvm b/include/arch/x86/kvm
>>>> new file mode 120000
>>>> index 0000000..c635817
>>>> --- /dev/null
>>>> +++ b/include/arch/x86/kvm
>>>> @@ -0,0 +1 @@
>>>> +../../../x86
>>>> \ No newline at end of file
>>>>
>>>> I also pushed a kvm-kmod update for 2.6.31-based modules in my repos,
>>>> see
>>>>
>>>> 	git://git.kiszka.org/kvm-kmod.git queue
>>>>
>>>> To use this one instead of devel-88, clone it and run
>>>>
>>>> git submodule update --init
>>>> ./configure
>>>> make sync
>>>> make
>>>>
>>>> Jan
>>>>
>>> Hi Jan
>>>
>>>
>>> $ git clone git://git.kiszka.org/kvm-kmod.git
>>> Initialized empty Git repository in /tmp/kvm-kmod/.git/
>>> remote: Counting objects: 449, done.
>>> remote: Compressing objects: 100% (217/217), done.
>>> remote: Total 449 (delta 262), reused 374 (delta 214)
>>> Receiving objects: 100% (449/449), 99.59 KiB | 38 KiB/s, done.
>>> Resolving deltas: 100% (262/262), done.
>>> $ cd kvm-kmod
>>> $ git submodule update --init
>>> Submodule 'linux-2.6' (git://git.kiszka.org/kvm.git) registered for path
>>> 'linux-2.6'
>>> Initialized empty Git repository in /tmp/kvm-kmod/linux-2.6/.git/
>>> fatal: The remote end hung up unexpectedly
>>> Clone of 'git://git.kiszka.org/kvm.git' into submodule path 'linux-2.6'
>>> failed
>>> $
>>>
>>> :(
>> Ah, my fault. That's because your 'origin' is now kiszka.org. Go to
>> kvm-kmod/.git/config and update the submodule url to
>> git://git.kernel.org/pub/scm/virt/kvm/kvm.git. Then do a 'git submodule
>> update' and proceed with the other steps.
>>
> 
> Hi Jan
> 
> ok thanks (sorry, new to git).
> 
> unfortunately, still getting the mmutrace.h failure (same error without
> kerneldir):
[...]

OK, there was more git foo hidden behind "clone my tree": Once you
cloned it, you are still on the master branch. You then have to checkout
that 'queue' branch I was referring to:

.../kvm-kmod> git checkout -b queue origin/queue

Now you have to run 'git submodule update' once again as my queue uses a
different revision from kvm.git. But then everything should really work.

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]