[PATCH 1/2] kvm-kmod: Use the main development tree of kvm as Linux submodule

[PATCH 1/2] kvm-kmod: Use the main development tree of kvm as Linux submodule

[wolfgang.mauerer]

From: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>

Most people won't have the sources installed in the path
that is the current default setting.

Signed-off-by: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>
---
 .gitmodules |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 9c63921..42fc7a1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "linux-2.6"]
 	path = linux-2.6
-	url = ../kvm.git
+	url = git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
-- 
1.6.4

[PATCH 2/2] kvm-kmod: Document the build process

[wolfgang.mauerer]

From: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>

A package without build instructions is like a kernel
without a penguin.

Signed-off-by: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>
---
 README |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 README

diff --git a/README b/README
new file mode 100644
index 0000000..40a72d3
--- /dev/null
+++ b/README
@@ -0,0 +1,26 @@
+Building the KVM kernel module is performed differently depending on whether
+you are working from a clone of the git repository or from a source release.
+
+- To build from a release, simply use ./configure (possibly with any
+  arguments that are required for your setup, see ./configure --help)
+  and make.
+
+- Building from a cloned git repository requires a kernel tree with the main
+  kvm sources that is included as a submodule in the linux-2.6/ directory.  By
+  default, the KVM development tree on git.kernel.org is used, but you can
+  change this setting in .gitmodules
+
+  Before the kvm module can be built, the linux submodule must be initialised 
+  and populated. The required sequence of commands is
+
+  git submodule init
+  git submodule update
+  ./configure
+  make sync
+  make
+
+  Notice that you can also specify an existing Linux tree for the
+  synchronisation stage by using
+
+  make sync LINUX=/path/to/tree
+
-- 
1.6.4

RE: [PATCH 2/2] kvm-kmod: Document the build process

[Dietmar Maurer]

> +  Before the kvm module can be built, the linux submodule must be
> initialised
> +  and populated. The required sequence of commands is
> +
> +  git submodule init
> +  git submodule update
> +  ./configure
> +  make sync
> +  make
> +
> +  Notice that you can also specify an existing Linux tree for the
> +  synchronisation stage by using
> +
> +  make sync LINUX=/path/to/tree

I always get errors when i try to sync (with our Linux-2.6.24 tree)

./configure --kerneldir=${TOP}/linux-2.6.24-openvz
make sync LINUX=${TOP}/linux-2.6.24-openvz

make[1]: Entering directory `/a/dir/kvm-kmod-2.6.30.1'
./sync kvm-kmod-2.6.30.1
Traceback (most recent call last):
  File "./sync", line 210, in <module>
    header_sync(arch)
  File "./sync", line 181, in header_sync
    hack(T, 'x86', 'include/linux/kvm.h')
  File "./sync", line 127, in hack
    _hack(T + '/' + file, arch)
  File "./sync", line 118, in _hack
    data = file(fname).read()
IOError: [Errno 2] No such file or directory: 'header/include/linux/kvm.h'
make[1]: *** [sync] Error 1

Any idea whats wrong?

- Dietmar

Re: [PATCH 2/2] kvm-kmod: Document the build process

[Wolfgang Mauerer]

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

Hio,

Dietmar Maurer wrote:
>> +  Before the kvm module can be built, the linux submodule must be
>> initialised
>> +  and populated. The required sequence of commands is
>> +
>> +  git submodule init
>> +  git submodule update
>> +  ./configure
>> +  make sync
>> +  make
>> +
>> +  Notice that you can also specify an existing Linux tree for the
>> +  synchronisation stage by using
>> +
>> +  make sync LINUX=/path/to/tree
> 
> I always get errors when i try to sync (with our Linux-2.6.24 tree)
> 
> ./configure --kerneldir=${TOP}/linux-2.6.24-openvz
> make sync LINUX=${TOP}/linux-2.6.24-openvz
> 
> make[1]: Entering directory `/a/dir/kvm-kmod-2.6.30.1'
> ./sync kvm-kmod-2.6.30.1
> Traceback (most recent call last):
>   File "./sync", line 210, in <module>
>     header_sync(arch)
>   File "./sync", line 181, in header_sync
>     hack(T, 'x86', 'include/linux/kvm.h')
>   File "./sync", line 127, in hack
>     _hack(T + '/' + file, arch)
>   File "./sync", line 118, in _hack
>     data = file(fname).read()
> IOError: [Errno 2] No such file or directory: 'header/include/linux/kvm.h'
> make[1]: *** [sync] Error 1
> 
> Any idea whats wrong?

Do you have a checked out Linux tree in linux-2.6/?
Currently, the linux-2.6 submodule seems to reference
a commit that is not present in the standard kvm
repo, so I assume that git submodule update
has failed for you. For now, you can fix this by
using git checkout in linux-2.6/

Btw.: Wrt. git sync, I've also updated to README
a bit to the two different kernel trees that come into
play. Comments?

Jan: I think the bogous reference is a leftover
from the tree that you've added as submodule; after
my patch to use Avi's tree, the information might be
out of sync.

Best, Wolfgang

[-- Attachment #2: readme.diff --]
[-- Type: text/x-patch, Size: 1742 bytes --]

diff --git a/README b/README
index 40a72d3..34cc51a 100644
--- a/README
+++ b/README
@@ -1,16 +1,21 @@
 Building the KVM kernel module is performed differently depending on whether
 you are working from a clone of the git repository or from a source release.
+Notice that two kernels are involved: One from which the KVM sources
+are taken (kernel A), and one for which the module is built (kernel B). 
+For out-of-tree module builds, it is well possible that kernel A is more
+recent than kernel B.
 
 - To build from a release, simply use ./configure (possibly with any
   arguments that are required for your setup, see ./configure --help)
-  and make.
+  and make. The kernel specified with --kerneldir refers to kernel B,
+  that is, the kernel for which the module is built.
 
 - Building from a cloned git repository requires a kernel tree with the main
-  kvm sources that is included as a submodule in the linux-2.6/ directory.  By
-  default, the KVM development tree on git.kernel.org is used, but you can
-  change this setting in .gitmodules
+  kvm sources (kernel A) that is included as a submodule in the linux-2.6/
+  directory.  By default, the KVM development tree on git.kernel.org is used,
+  but you can change this setting in .gitmodules
 
-  Before the kvm module can be built, the linux submodule must be initialised 
+  Before the kvm module can be built, the linux submodule must be initialised
   and populated. The required sequence of commands is
 
   git submodule init
@@ -24,3 +29,5 @@ you are working from a clone of the git repository or from a source release.
 
   make sync LINUX=/path/to/tree
 
+  The synchronisation stage refers to kernel A, that is, the kernel
+  from which the KVM sources are taken.

RE: [PATCH 2/2] kvm-kmod: Document the build process

[Dietmar Maurer]

> -----Original Message-----
> From: kvm-owner@vger.kernel.org [mailto:kvm-owner@vger.kernel.org] On
> Behalf Of Wolfgang Mauerer
> Sent: Mittwoch, 21. Oktober 2009 16:21
> To: Dietmar Maurer
> Cc: kvm@vger.kernel.org; Kiszka, Jan
> Subject: Re: [PATCH 2/2] kvm-kmod: Document the build process
> 
> Hio,
> 
> Dietmar Maurer wrote:
> >> +  Before the kvm module can be built, the linux submodule must be
> >> initialised
> >> +  and populated. The required sequence of commands is
> >> +
> >> +  git submodule init
> >> +  git submodule update
> >> +  ./configure
> >> +  make sync
> >> +  make
> >> +
> >> +  Notice that you can also specify an existing Linux tree for the
> >> + synchronisation stage by using
> >> +
> >> +  make sync LINUX=/path/to/tree
> >
> > I always get errors when i try to sync (with our Linux-2.6.24 tree)
> >
> > ./configure --kerneldir=${TOP}/linux-2.6.24-openvz
> > make sync LINUX=${TOP}/linux-2.6.24-openvz
> >
> > make[1]: Entering directory `/a/dir/kvm-kmod-2.6.30.1'
> > ./sync kvm-kmod-2.6.30.1
> > Traceback (most recent call last):
> >   File "./sync", line 210, in <module>
> >     header_sync(arch)
> >   File "./sync", line 181, in header_sync
> >     hack(T, 'x86', 'include/linux/kvm.h')
> >   File "./sync", line 127, in hack
> >     _hack(T + '/' + file, arch)
> >   File "./sync", line 118, in _hack
> >     data = file(fname).read()
> > IOError: [Errno 2] No such file or directory:
> 'header/include/linux/kvm.h'
> > make[1]: *** [sync] Error 1
> >
> > Any idea whats wrong?
> 
> Do you have a checked out Linux tree in linux-2.6/?

Sorry, seem I am confused. You wrote

>> +  make sync LINUX=/path/to/tree

So why do I need another linux tree? Can't we fix the 'sync' script?

- Dietmar

Re: [PATCH 2/2] kvm-kmod: Document the build process

[Jan Kiszka]

Dietmar Maurer wrote:
> 
>> -----Original Message-----
>> From: kvm-owner@vger.kernel.org [mailto:kvm-owner@vger.kernel.org] On
>> Behalf Of Wolfgang Mauerer
>> Sent: Mittwoch, 21. Oktober 2009 16:21
>> To: Dietmar Maurer
>> Cc: kvm@vger.kernel.org; Kiszka, Jan
>> Subject: Re: [PATCH 2/2] kvm-kmod: Document the build process
>>
>> Hio,
>>
>> Dietmar Maurer wrote:
>>>> +  Before the kvm module can be built, the linux submodule must be
>>>> initialised
>>>> +  and populated. The required sequence of commands is
>>>> +
>>>> +  git submodule init
>>>> +  git submodule update
>>>> +  ./configure
>>>> +  make sync
>>>> +  make
>>>> +
>>>> +  Notice that you can also specify an existing Linux tree for the
>>>> + synchronisation stage by using
>>>> +
>>>> +  make sync LINUX=/path/to/tree
>>> I always get errors when i try to sync (with our Linux-2.6.24 tree)
>>>
>>> ./configure --kerneldir=${TOP}/linux-2.6.24-openvz
>>> make sync LINUX=${TOP}/linux-2.6.24-openvz
>>>
>>> make[1]: Entering directory `/a/dir/kvm-kmod-2.6.30.1'
>>> ./sync kvm-kmod-2.6.30.1
>>> Traceback (most recent call last):
>>>   File "./sync", line 210, in <module>
>>>     header_sync(arch)
>>>   File "./sync", line 181, in header_sync
>>>     hack(T, 'x86', 'include/linux/kvm.h')
>>>   File "./sync", line 127, in hack
>>>     _hack(T + '/' + file, arch)
>>>   File "./sync", line 118, in _hack
>>>     data = file(fname).read()
>>> IOError: [Errno 2] No such file or directory:
>> 'header/include/linux/kvm.h'
>>> make[1]: *** [sync] Error 1
>>>
>>> Any idea whats wrong?
>> Do you have a checked out Linux tree in linux-2.6/?
> 
> Sorry, seem I am confused. You wrote
> 
>>> +  make sync LINUX=/path/to/tree
> 
> So why do I need another linux tree? Can't we fix the 'sync' script?

There is nothing to fix. The sync script takes the KVM kernel module
sources from a recent kernel A and patch them so that kvm-kmod can build
them for an ancient kernel B.

Now you have two options where this kernel A could be located on sync:
by default (LINUX unset), it is in kvm-kmod/linux-2.6 (that git
submodule). Or you define a different local tree via
LINUX=/path/to/kernel/A - like above.

Jan

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux

[PATCH] kvm-kmod: Document the build process (take 2)

[Wolfgang Mauerer]

A package without build instructions is like a kernel
without a penguin.

Signed-off-by: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>
---
 README |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)
 create mode 100644 README

diff --git a/README b/README
new file mode 100644
index 0000000..bef7586
--- /dev/null
+++ b/README
@@ -0,0 +1,37 @@
+Building the KVM kernel module is performed differently depending on whether
+you are working from a clone of the git repository or from a source release.
+Notice that two kernels are involved: One from which the KVM sources
+are taken (kernel A), and one for which the module is built (kernel B). 
+For out-of-tree module builds, it is well possible that kernel A is more
+recent than kernel B.
+
+- To build from a release (this is the default case), simply
+  use ./configure (possibly with any arguments that are required for
+  your setup, see ./configure --help) and make. The kernel specified
+  with --kerneldir refers to kernel B, that is, the kernel for which
+  the module is built.
+
+- Building from a cloned git repository (most likely useful for developers
+  only) requires a kernel tree with the main kvm sources (kernel A) that
+  is included as a submodule in the linux-2.6/ directory.  By default,
+  the KVM development tree on git.kernel.org is used, but this can be
+  changed in the git configuration.
+
+  Before the kvm module can be built, the linux submodule must be initialised
+  and populated. The required sequence of commands is
+
+  git submodule init
+  git submodule update
+  ./configure
+  make sync
+  make
+
+  Notice that you can also specify an existing Linux tree for the
+  synchronisation stage by using
+
+  make sync LINUX=/path/to/kernel/A
+
+  LINUX specifies the path to kernel A from which the KVM sources are taken. 
+  The directory must point to a local git tree, not to a plain directory
+  containing the kernel sources. If LINUX is unset, the default value
+  is linux-2.6/, i.e., the git submodule.
-- 
1.6.4

Re: [PATCH] kvm-kmod: Document the build process (take 2)

[Jan Kiszka]

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

Wolfgang Mauerer wrote:
> A package without build instructions is like a kernel
> without a penguin.

Thanks, merged.

Jan

> 
> Signed-off-by: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>
> ---
>  README |   37 +++++++++++++++++++++++++++++++++++++
>  1 files changed, 37 insertions(+), 0 deletions(-)
>  create mode 100644 README
> 
> diff --git a/README b/README
> new file mode 100644
> index 0000000..bef7586
> --- /dev/null
> +++ b/README
> @@ -0,0 +1,37 @@
> +Building the KVM kernel module is performed differently depending on whether
> +you are working from a clone of the git repository or from a source release.
> +Notice that two kernels are involved: One from which the KVM sources
> +are taken (kernel A), and one for which the module is built (kernel B). 
> +For out-of-tree module builds, it is well possible that kernel A is more
> +recent than kernel B.
> +
> +- To build from a release (this is the default case), simply
> +  use ./configure (possibly with any arguments that are required for
> +  your setup, see ./configure --help) and make. The kernel specified
> +  with --kerneldir refers to kernel B, that is, the kernel for which
> +  the module is built.
> +
> +- Building from a cloned git repository (most likely useful for developers
> +  only) requires a kernel tree with the main kvm sources (kernel A) that
> +  is included as a submodule in the linux-2.6/ directory.  By default,
> +  the KVM development tree on git.kernel.org is used, but this can be
> +  changed in the git configuration.
> +
> +  Before the kvm module can be built, the linux submodule must be initialised
> +  and populated. The required sequence of commands is
> +
> +  git submodule init
> +  git submodule update
> +  ./configure
> +  make sync
> +  make
> +
> +  Notice that you can also specify an existing Linux tree for the
> +  synchronisation stage by using
> +
> +  make sync LINUX=/path/to/kernel/A
> +
> +  LINUX specifies the path to kernel A from which the KVM sources are taken. 
> +  The directory must point to a local git tree, not to a plain directory
> +  containing the kernel sources. If LINUX is unset, the default value
> +  is linux-2.6/, i.e., the git submodule.



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

Re: [PATCH 1/2] kvm-kmod: Use the main development tree of kvm as Linux submodule

[Avi Kivity]

On 10/20/2009 02:11 PM, wolfgang.mauerer@siemens.com wrote:
> From: Wolfgang Mauerer<wolfgang.mauerer@siemens.com>
>
> Most people won't have the sources installed in the path
> that is the current default setting.
>
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -1,3 +1,3 @@
>   [submodule "linux-2.6"]
>   	path = linux-2.6
> -	url = ../kvm.git
> +	url = git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
>    

'../kvm.git' is interpreted relative to the origin url, which is usually 
git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-kmod.git, so it 
all works out (including when kvm-kmod.git was cloned using the http 
protocol, or from a mirror).

What exactly are you trying to fix?

-- 
error compiling committee.c: too many arguments to function

Re: [PATCH 1/2] kvm-kmod: Use the main development tree of kvm as Linux submodule

[Wolfgang Mauerer]

Hi,

Avi Kivity wrote:
> On 10/20/2009 02:11 PM, wolfgang.mauerer@siemens.com wrote:
>> From: Wolfgang Mauerer<wolfgang.mauerer@siemens.com>
>>
>> Most people won't have the sources installed in the path
>> that is the current default setting.
>>
>> --- a/.gitmodules
>> +++ b/.gitmodules
>> @@ -1,3 +1,3 @@
>>   [submodule "linux-2.6"]
>>   	path = linux-2.6
>> -	url = ../kvm.git
>> +	url = git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
>>    
> 
> '../kvm.git' is interpreted relative to the origin url, which is usually 
> git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-kmod.git, so it 
> all works out (including when kvm-kmod.git was cloned using the http 
> protocol, or from a mirror).
> 
> What exactly are you trying to fix?

consider that you clone kvm-kmod from your repo and
then create local clones from which you do the build. If you don't
happen to have /path/to/my/kvm-kmod/../kvm, then the relative
submodule URL won't work, but the absolute one will.

Since the absolute URL wouldn't break anything AFAIK, but
makes this scenario work, I'd favour it, although my
life would not be much worse with the relative default
URL ;-)

Cheers, Wolfgang

Re: [PATCH 1/2] kvm-kmod: Use the main development tree of kvm as Linux submodule

[Avi Kivity]

On 10/22/2009 06:13 PM, Wolfgang Mauerer wrote:
> Hi,
>
> Avi Kivity wrote:
>    
>> On 10/20/2009 02:11 PM, wolfgang.mauerer@siemens.com wrote:
>>      
>>> From: Wolfgang Mauerer<wolfgang.mauerer@siemens.com>
>>>
>>> Most people won't have the sources installed in the path
>>> that is the current default setting.
>>>
>>> --- a/.gitmodules
>>> +++ b/.gitmodules
>>> @@ -1,3 +1,3 @@
>>>    [submodule "linux-2.6"]
>>>    	path = linux-2.6
>>> -	url = ../kvm.git
>>> +	url = git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
>>>
>>>        
>> '../kvm.git' is interpreted relative to the origin url, which is usually
>> git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-kmod.git, so it
>> all works out (including when kvm-kmod.git was cloned using the http
>> protocol, or from a mirror).
>>
>> What exactly are you trying to fix?
>>      
> consider that you clone kvm-kmod from your repo and
> then create local clones from which you do the build. If you don't
> happen to have /path/to/my/kvm-kmod/../kvm, then the relative
> submodule URL won't work, but the absolute one will.
>    

Typically you create the clones using 'git submodule init && git 
submodule update', not clone them manually.

> Since the absolute URL wouldn't break anything AFAIK, but
> makes this scenario work, I'd favour it, although my
> life would not be much worse with the relative default
> URL ;-)
>    

You can still make it work by editing .git/config and updating the URLs.

-- 
error compiling committee.c: too many arguments to function

Re: [PATCH 1/2] kvm-kmod: Use the main development tree of kvm as Linux submodule

[Wolfgang Mauerer]

Avi Kivity wrote:
> On 10/22/2009 06:13 PM, Wolfgang Mauerer wrote:
>> Hi,
>>
>> Avi Kivity wrote:
>>    
>>> On 10/20/2009 02:11 PM, wolfgang.mauerer@siemens.com wrote:
>>>      
>>>> From: Wolfgang Mauerer<wolfgang.mauerer@siemens.com>
>>>>
>>>> Most people won't have the sources installed in the path
>>>> that is the current default setting.
>>>>
>>>> --- a/.gitmodules
>>>> +++ b/.gitmodules
>>>> @@ -1,3 +1,3 @@
>>>>    [submodule "linux-2.6"]
>>>>    	path = linux-2.6
>>>> -	url = ../kvm.git
>>>> +	url = git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
>>>>
>>>>        
>>> '../kvm.git' is interpreted relative to the origin url, which is usually
>>> git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-kmod.git, so it
>>> all works out (including when kvm-kmod.git was cloned using the http
>>> protocol, or from a mirror).
>>>
>>> What exactly are you trying to fix?
>>>      
>> consider that you clone kvm-kmod from your repo and
>> then create local clones from which you do the build. If you don't
>> happen to have /path/to/my/kvm-kmod/../kvm, then the relative
>> submodule URL won't work, but the absolute one will.
>>    
> 
> Typically you create the clones using 'git submodule init && git 
> submodule update', not clone them manually.
But that refers to linux-2.6/, I suppose, while I was talking
about kvm-kmod.
> 
>> Since the absolute URL wouldn't break anything AFAIK, but
>> makes this scenario work, I'd favour it, although my
>> life would not be much worse with the relative default
>> URL ;-)
>>    
> 
> You can still make it work by editing .git/config and updating the URLs.
> 
that's certainly true. I'd say it's a matter of taste, so
I'll just add a hint about .git/config to the README and leave
.gitmodules unmolested in the future.

Cheers, Wolfgang

Re: [PATCH 1/2] kvm-kmod: Use the main development tree of kvm as Linux submodule

[Avi Kivity]

On 10/22/2009 06:25 PM, Wolfgang Mauerer wrote:
>
>    
>>> consider that you clone kvm-kmod from your repo and
>>> then create local clones from which you do the build. If you don't
>>> happen to have /path/to/my/kvm-kmod/../kvm, then the relative
>>> submodule URL won't work, but the absolute one will.
>>>
>>>        
>> Typically you create the clones using 'git submodule init&&  git
>> submodule update', not clone them manually.
>>      
> But that refers to linux-2.6/, I suppose, while I was talking
> about kvm-kmod.
>    

Oh.  If you create local clones for kvm-kmod.git, also create local 
clones for kvm.git.  I'd expect the submodule to use the local clone 
(for example, if I don't have access to the external hosting).

> that's certainly true. I'd say it's a matter of taste, so
> I'll just add a hint about .git/config to the README and leave
> .gitmodules unmolested in the future.
>    

Relative paths are a requirement for http: access, which is needed from 
certain corporate firewalls, so it will have to stay.

-- 
error compiling committee.c: too many arguments to function