[Qemu-devel] [PATCH] qemu: fix out of tree cross compile

[Qemu-devel] [PATCH] qemu: fix out of tree cross compile

[Alexey Kardashevskiy]

QEMU uses headers from source directory, however the "asm" symlink was
created in the build directory what broke KVM stuff compilation.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 5ae7e4a..9c3c5e5 100755
--- a/configure
+++ b/configure
@@ -4135,7 +4135,7 @@ if test "$linux" = "yes" ; then
   esac
     # For non-KVM architectures we will not have asm headers
     if [ -e "$source_path/linux-headers/asm-$linux_arch" ]; then
-      symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm
+      symlink "$source_path/linux-headers/asm-$linux_arch" $source_path/linux-headers/asm
     fi
 fi
 
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH] qemu: fix out of tree cross compile

[Peter Maydell]

On 27 May 2013 07:13, Alexey Kardashevskiy <aik@ozlabs.ru> wrote:
> QEMU uses headers from source directory, however the "asm" symlink was
> created in the build directory what broke KVM stuff compilation.
>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
>  configure |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 5ae7e4a..9c3c5e5 100755
> --- a/configure
> +++ b/configure
> @@ -4135,7 +4135,7 @@ if test "$linux" = "yes" ; then
>    esac
>      # For non-KVM architectures we will not have asm headers
>      if [ -e "$source_path/linux-headers/asm-$linux_arch" ]; then
> -      symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm
> +      symlink "$source_path/linux-headers/asm-$linux_arch" $source_path/linux-headers/asm

This is definitely wrong -- the asm symlink must be created
in the build tree, because you could have two build trees
which are building for different architectures and need
different symlink targets. (More generally, an out of tree
build should never create files in the source tree, because
the point of out of tree builds is to leave the source tree
in a pristine state.)

What is the actual bug here? QEMU builds fine for me, because
the build directory is also in the include path via "-I.".

thanks
-- PMM

Re: [Qemu-devel] [PATCH] qemu: fix out of tree cross compile

[Alexey Kardashevskiy]

On 05/27/2013 08:24 PM, Peter Maydell wrote:
> On 27 May 2013 07:13, Alexey Kardashevskiy <aik@ozlabs.ru> wrote:
>> QEMU uses headers from source directory, however the "asm" symlink was
>> created in the build directory what broke KVM stuff compilation.
>>
>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>> ---
>>  configure |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index 5ae7e4a..9c3c5e5 100755
>> --- a/configure
>> +++ b/configure
>> @@ -4135,7 +4135,7 @@ if test "$linux" = "yes" ; then
>>    esac
>>      # For non-KVM architectures we will not have asm headers
>>      if [ -e "$source_path/linux-headers/asm-$linux_arch" ]; then
>> -      symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm
>> +      symlink "$source_path/linux-headers/asm-$linux_arch" $source_path/linux-headers/asm
> 
> This is definitely wrong -- the asm symlink must be created
> in the build tree, because you could have two build trees
> which are building for different architectures and need
> different symlink targets. (More generally, an out of tree
> build should never create files in the source tree, because
> the point of out of tree builds is to leave the source tree
> in a pristine state.)

Ok, ok. Then I'll post another patch in a a response to this.

> What is the actual bug here? QEMU builds fine for me, because
> the build directory is also in the include path via "-I.".

Does you build directory beside inside the source tree directory? I cannot
see the other way for it to work. -I <blabla>/linux-headers must be added,
"-I." is not enough.

The actual bug is that it does not cross compile until I apply this or the
other patch.

This is how I run ./configure:
/home/alexey/pcipassthru/qemu-impreza/configure
--source-path=/home/alexey/pcipassthru/qemu-impreza
--target-list=ppc64-softmmu
--cpu=ppc64
--cross-prefix=powerpc64-linux-
--prefix=/home/alexey/pcipassthru/lib4qemu/install
--extra-ldflags=-L/home/alexey/pcipassthru/lib4qemu/usr/lib64
'--extra-cflags=--sysroot=/home/alexey/pcipassthru/lib4qemu/
-I/home/alexey/pcipassthru/lib4qemu/usr/include -D__EXCEPTIONS
-D__LONG_DOUBLE_128__ -D__NO_INLINE__ -Wno-redundant-decls
-Wno-missing-prototypes -Wmissing-include-dirs'
--disable-werror
--enable-fdt
--enable-attr
--enable-kvm
--enable-profiler
--disable-seccomp
--enable-trace-backend=stderr
--enable-debug
--disable-debug-tcg
--enable-debug-info

This is where the compilation fails on:
powerpc64-linux-gcc \
-I/home/alexey/pcipassthru/qemu-impreza/tcg
-I/home/alexey/pcipassthru/qemu-impreza/tcg/ppc64
-I/home/alexey/pcipassthru/qemu-impreza/linux-headers
-I.
-I/home/alexey/pcipassthru/qemu-impreza
-I/home/alexey/pcipassthru/qemu-impreza/include
-I/home/alexey/pcipassthru/qemu-impreza/target-ppc
-Itarget-ppc
-D_GNU_SOURCE
-D_FILE_OFFSET_BITS=64
-D_LARGEFILE_SOURCE
-Wstrict-prototypes
-Wredundant-decls -Wall
-Wundef
-Wwrite-strings
-Wmissing-prototypes
-fno-strict-aliasing
--sysroot=/home/alexey/pcipassthru/lib4qemu/
-I/home/alexey/pcipassthru/lib4qemu/usr/include
-D__EXCEPTIONS -D__LONG_DOUBLE_128__ -D__NO_INLINE__
-Wno-redundant-decls -Wno-missing-prototypes
-Wmissing-include-dirs  -Wendif-labels
-Wmissing-include-dirs -Wempty-body
-Wnested-externs -Wformat-security
-Wformat-y2k -Winit-self -Wignored-qualifiers
-Wold-style-declaration -Wold-style-definition
-Wtype-limits
-I/home/alexey/pcipassthru/lib4qemu/usr/include
-I/home/alexey/pcipassthru/lib4qemu/usr/include/p11-kit-1
-I/home/alexey/pcipassthru/lib4qemu/usr/include
-I/home/alexey/pcipassthru/lib4qemu/usr/include/libusb-1.0
-I/home/alexey/pcipassthru/lib4qemu/usr/include
-I/home/alexey/pcipassthru/lib4qemu/usr/include/pixman-1
-I../linux-headers
-I..
-I/home/alexey/pcipassthru/qemu-impreza/target-ppc
-DNEED_CPU_H
-I/home/alexey/pcipassthru/qemu-impreza/include
-pthread
-I/home/alexey/pcipassthru/lib4qemu/usr/include/glib-2.0
-I/home/alexey/pcipassthru/lib4qemu/usr/lib64/glib-2.0/include
-MMD -MP -MT target-ppc/kvm.o -MF target-ppc/kvm.d -g
-I/home/alexey/pcipassthru/lib4qemu/usr/include -c
-o target-ppc/kvm.o
/home/alexey/pcipassthru/qemu-impreza/target-ppc/kvm.c
/home/alexey/pcipassthru/qemu-impreza/hw/ppc/xics.c: In function
'icp_get_kvm_state':
/home/alexey/pcipassthru/qemu-impreza/hw/ppc/xics.c:186:15: error:
'KVM_REG_PPC_ICP_STATE' undeclared (first use in this function)
         .id = KVM_REG_PPC_ICP_STATE,
               ^
...




-- 
Alexey

[Qemu-devel] [PATCH] qemu: fix out of tree cross compile

[Alexey Kardashevskiy]

The symlink to platform linux headers is made in the build tree by
the configure script but gcc is not told to look for them there.
The patch fixes this.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 5ae7e4a..5ba691a 100755
--- a/configure
+++ b/configure
@@ -547,7 +547,7 @@ Haiku)
   if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
     audio_possible_drivers="$audio_possible_drivers fmod"
   fi
-  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
+  QEMU_INCLUDES="-I$(pwd)/linux-headers $QEMU_INCLUDES"
 ;;
 esac
 
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH] qemu: fix out of tree cross compile

[Paolo Bonzini]

Il 27/05/2013 16:12, Alexey Kardashevskiy ha scritto:
> The symlink to platform linux headers is made in the build tree by
> the configure script but gcc is not told to look for them there.
> The patch fixes this.
> 
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
>  configure |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 5ae7e4a..5ba691a 100755
> --- a/configure
> +++ b/configure
> @@ -547,7 +547,7 @@ Haiku)
>    if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
>      audio_possible_drivers="$audio_possible_drivers fmod"
>    fi
> -  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
> +  QEMU_INCLUDES="-I$(pwd)/linux-headers $QEMU_INCLUDES"

You need to have both directories.  Files other than asm/*.h will be
found in the source path.

Paolo

Re: [Qemu-devel] [PATCH] qemu: fix out of tree cross compile

[Alexey Kardashevskiy]

On 05/28/2013 01:02 AM, Paolo Bonzini wrote:
> Il 27/05/2013 16:12, Alexey Kardashevskiy ha scritto:
>> The symlink to platform linux headers is made in the build tree by
>> the configure script but gcc is not told to look for them there.
>> The patch fixes this.
>>
>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>> ---
>>  configure |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index 5ae7e4a..5ba691a 100755
>> --- a/configure
>> +++ b/configure
>> @@ -547,7 +547,7 @@ Haiku)
>>    if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
>>      audio_possible_drivers="$audio_possible_drivers fmod"
>>    fi
>> -  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
>> +  QEMU_INCLUDES="-I$(pwd)/linux-headers $QEMU_INCLUDES"
> 
> You need to have both directories.  Files other than asm/*.h will be
> found in the source path.

So do I need this?

+  QEMU_INCLUDES="-I$(pwd)/linux-headers -I\$(SRC_PATH)/linux-headers
$QEMU_INCLUDES"




-- 
Alexey

[Qemu-devel] [PATCH v2] qemu: fix out of tree cross compile

[Alexey Kardashevskiy]

The symlink to "asm" platform linux headers is made in the build tree by
the configure script but gcc is not told to look for them there.

The patch fixes this.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 configure |    1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 5ae7e4a..20b42f0 100755
--- a/configure
+++ b/configure
@@ -548,6 +548,7 @@ Haiku)
     audio_possible_drivers="$audio_possible_drivers fmod"
   fi
   QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
+  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers $QEMU_INCLUDES"
 ;;
 esac
 
-- 
1.7.10.4

[Qemu-devel] [PATCH v3] qemu: fix out of tree cross compile

[Alexey Kardashevskiy]

The symlink to "asm" platform linux headers is made in the build tree by
the configure script but gcc is not told to look for them there.

The patch fixes this.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---

The previous patch did not remove the old line adding includes. Early morning,
lack of focus :)

---
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 5ae7e4a..eca2a20 100755
--- a/configure
+++ b/configure
@@ -547,7 +547,7 @@ Haiku)
   if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
     audio_possible_drivers="$audio_possible_drivers fmod"
   fi
-  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
+  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers $QEMU_INCLUDES"
 ;;
 esac
 
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH v3] qemu: fix out of tree cross compile

[Paolo Bonzini]

Il 28/05/2013 01:49, Alexey Kardashevskiy ha scritto:
> The symlink to "asm" platform linux headers is made in the build tree by
> the configure script but gcc is not told to look for them there.
> 
> The patch fixes this.
> 
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> 
> The previous patch did not remove the old line adding includes. Early morning,
> lack of focus :)
> 
> ---
>  configure |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 5ae7e4a..eca2a20 100755
> --- a/configure
> +++ b/configure
> @@ -547,7 +547,7 @@ Haiku)
>    if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
>      audio_possible_drivers="$audio_possible_drivers fmod"
>    fi
> -  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
> +  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers $QEMU_INCLUDES"
>  ;;
>  esac
>  
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Paolo

Re: [Qemu-devel] [PATCH v3] qemu: fix out of tree cross compile

[Andreas Färber]

Am 28.05.2013 10:54, schrieb Paolo Bonzini:
> Il 28/05/2013 01:49, Alexey Kardashevskiy ha scritto:
>> The symlink to "asm" platform linux headers is made in the build tree by
>> the configure script but gcc is not told to look for them there.
>>
>> The patch fixes this.
>>
>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>> ---
>>
>> The previous patch did not remove the old line adding includes. Early morning,
>> lack of focus :)
>>
>> ---
>>  configure |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index 5ae7e4a..eca2a20 100755
>> --- a/configure
>> +++ b/configure
>> @@ -547,7 +547,7 @@ Haiku)
>>    if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
>>      audio_possible_drivers="$audio_possible_drivers fmod"
>>    fi
>> -  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
>> +  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers $QEMU_INCLUDES"
>>  ;;
>>  esac
>>  
>>
> 
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Hm, I see no other case of adding $(pwd) to QEMU_INCLUDES - shouldn't
this just be -Ilinux-headers?

And might it make sense to give the build directory precedence over the
source directory?

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH v3] qemu: fix out of tree cross compile

[Paolo Bonzini]

Il 28/05/2013 11:12, Andreas Färber ha scritto:
> Am 28.05.2013 10:54, schrieb Paolo Bonzini:
>> Il 28/05/2013 01:49, Alexey Kardashevskiy ha scritto:
>>> The symlink to "asm" platform linux headers is made in the build tree by
>>> the configure script but gcc is not told to look for them there.
>>>
>>> The patch fixes this.
>>>
>>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>>> ---
>>>
>>> The previous patch did not remove the old line adding includes. Early morning,
>>> lack of focus :)
>>>
>>> ---
>>>  configure |    2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/configure b/configure
>>> index 5ae7e4a..eca2a20 100755
>>> --- a/configure
>>> +++ b/configure
>>> @@ -547,7 +547,7 @@ Haiku)
>>>    if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
>>>      audio_possible_drivers="$audio_possible_drivers fmod"
>>>    fi
>>> -  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
>>> +  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers $QEMU_INCLUDES"
>>>  ;;
>>>  esac
>>>  
>>>
>>
>> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> 
> Hm, I see no other case of adding $(pwd) to QEMU_INCLUDES - shouldn't
> this just be -Ilinux-headers?

I think -Ilinux-headers would add
<builddir>/x86_64-softmmu/linux-headers, which is wrong.

> And might it make sense to give the build directory precedence over the
> source directory?

It shouldn't matter.

Paolo

Re: [Qemu-devel] [PATCH v3] qemu: fix out of tree cross compile

[Anthony Liguori]

Alexey Kardashevskiy <aik@ozlabs.ru> writes:

> The symlink to "asm" platform linux headers is made in the build tree by
> the configure script but gcc is not told to look for them there.
>
> The patch fixes this.
>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
>
> The previous patch did not remove the old line adding includes. Early morning,
> lack of focus :)

Please repost as a top level patch.

Regards,

Anthony Liguori



>
> ---
>  configure |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 5ae7e4a..eca2a20 100755
> --- a/configure
> +++ b/configure
> @@ -547,7 +547,7 @@ Haiku)
>    if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
>      audio_possible_drivers="$audio_possible_drivers fmod"
>    fi
> -  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
> +  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers $QEMU_INCLUDES"
>  ;;
>  esac
>  
> -- 
> 1.7.10.4