[PATCH 0/3] kvm-userspace: kvmppc: fix build for ppc

[PATCH 0/3] kvm-userspace: kvmppc: fix build for ppc

[ehrhardt]

From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>

Updating and testing kvm-userspace for ppc after a too long time brought up
some issues fixed in this series.

The patches are small and their description should be comprehendible. Due to
the fact that most of the issues where build time issues I also started to
discuss about/establish some kind of automated build test for us that should
allow us to find such things faster.
let me know if qumranet has such a process for x86 already and I should help
you to include ppc.

[patches in series]
[PATCH 1/3] kvm-userspace: kvmppc: fix file header in libkvm-powerpc.c
[PATCH 2/3] kvm-userspace: kvmppc: fix hostlonbits detection when cross compiling
[PATCH 3/3] kvm-userspace: kvmppc: fix building userspace for powerpc

---
[diffstat]
 Makefile                       |    3 ++-
 kernel/powerpc/Makefile.pre    |    1 +
 kernel/powerpc/hack-module.awk |    5 +++++
 libkvm/libkvm-powerpc.c        |   14 +++++---------
 qemu/Makefile.target           |    2 +-
 qemu/configure                 |   13 +++++++------
 6 files changed, 21 insertions(+), 17 deletions(-)

[PATCH 1/3] kvm-userspace: kvmppc: fix file header in libkvm-powerpc.c

[ehrhardt]

From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>

It came up in the review of the s390 libkvm code that we have some
broken headers too.

Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
---

[diffstat]
 libkvm-powerpc.c |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

[diff]
diff --git a/libkvm/libkvm-powerpc.c b/libkvm/libkvm-powerpc.c
--- a/libkvm/libkvm-powerpc.c
+++ b/libkvm/libkvm-powerpc.c
@@ -1,10 +1,7 @@
 /*
- * This header is for functions & variables that will ONLY be
- * used inside libkvm for x86.
- * THESE ARE NOT EXPOSED TO THE USER AND ARE ONLY FOR USE
- * WITHIN LIBKVM.
- *
- * derived from libkvm.c
+ * This file contains the powerpc specific implementation for the 
+ * architecture dependent functions defined in kvm-common.h and
+ * libkvm.h
  *
  * Copyright (C) 2006 Qumranet, Inc.
  *
@@ -12,11 +9,10 @@
  *      Avi Kivity   <avi@qumranet.com>
  *      Yaniv Kamay  <yaniv@qumranet.com>
  *
- * Copyright 2007 IBM Corporation.
- * Added by & Authors:
+ * Copyright IBM Corp. 2007,2008
+ * Added by:
  * 	Jerone Young <jyoung5@us.ibm.com>
  * 	Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
- *
  *
  * This work is licensed under the GNU LGPL license, version 2.
  */

[PATCH 1/3] kvm-userspace: kvmppc: fix file header in libkvm-powerpc.c v2

[ehrhardt]

From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>

It came up in the review of the s390 libkvm code that we have some
broken headers too.

Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
---

[diffstat]
 libkvm-powerpc.c |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

[diff]
diff --git a/libkvm/libkvm-powerpc.c b/libkvm/libkvm-powerpc.c
--- a/libkvm/libkvm-powerpc.c
+++ b/libkvm/libkvm-powerpc.c
@@ -1,10 +1,7 @@
 /*
- * This header is for functions & variables that will ONLY be
- * used inside libkvm for x86.
- * THESE ARE NOT EXPOSED TO THE USER AND ARE ONLY FOR USE
- * WITHIN LIBKVM.
- *
- * derived from libkvm.c
+ * This file contains the powerpc specific implementation for the 
+ * architecture dependent functions defined in kvm-common.h and
+ * libkvm.h
  *
  * Copyright (C) 2006 Qumranet, Inc.
  *
@@ -12,11 +9,10 @@
  *      Avi Kivity   <avi@qumranet.com>
  *      Yaniv Kamay  <yaniv@qumranet.com>
  *
- * Copyright 2007 IBM Corporation.
- * Added by & Authors:
+ * Copyright IBM Corp. 2007,2008
+ * Authors:
  * 	Jerone Young <jyoung5@us.ibm.com>
  * 	Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
- *
  *
  * This work is licensed under the GNU LGPL license, version 2.
  */

[PATCH 2/3] kvm-userspace: kvmppc: fix hostlonbits detection when cross compiling

[ehrhardt]

From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>

The kvm merge with qemu brought code for 64bit power that broke cross
compilation. The issue is caused by configure trying to execute target
architecture binaries where configure is executed.

I tried to change that detection so that it works with&without cross
compilation with only a small change and especially without an addtional
configure command line switch. Including the bits/wordsize.h header a platform
usually can check its wordsize and by doing that configure can check the
hostlongbits without executing the binary. Instead it now stops after
preprocessing stage which resolved the __WORDSIZE constant and retrieves
that value.

I don't like that check style, but it is at least less broken than before.
Comments and other approaches welcome.

Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
---

[diffstat]
 configure |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

[diff]

diff --git a/qemu/configure b/qemu/configure
--- a/qemu/configure
+++ b/qemu/configure
@@ -685,14 +685,15 @@
 # ppc specific hostlongbits selection
 if test "$cpu" = "powerpc" ; then
     cat > $TMPC <<EOF
-int main(void){return sizeof(long);}
+#include <bits/wordsize.h>
+__WORDSIZE
 EOF
 
-    if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null; then
-        $TMPE
-        case $? in
-            4) hostlongbits="32";;
-            8) hostlongbits="64";;
+    if $cc $ARCH_CFLAGS -E -o $TMPE.E $TMPC 2> /dev/null; then
+        wordsize=`tail -n 1 ${TMPE}.E`
+        case $wordsize in
+            32) hostlongbits="32";;
+            64) hostlongbits="64";;
             *) echo "Couldn't determine bits per long value"; exit 1;;
         esac
     else

[PATCH 2/3] kvm-userspace: kvmppc: fix hostlonbits detection when cross compiling

[ehrhardt]

From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>

A recent kvm merge with qemu brought code for 64bit power that broke cross
compilation. The issue is caused by configure trying to execute target
architecture binaries where configure is executed.

I tried to change that detection so that it works with&without cross
compilation with only a small change and especially without an addtional
configure command line switch. Including the bits/wordsize.h header a platform
usually can check its wordsize and by doing that configure can check the
hostlongbits without executing the binary. Instead it now stops after
preprocessing stage which resolved the __WORDSIZE constant and retrieves
that value.

I don't like my new check style, but it is at least less broken than before.
Another approach that was suggested was that qemu might end up needing
something like asm-offsets in the kernel to manage architecture sizes etc.
Comments and other approaches welcome.
 
Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
---

[diffstat]
 configure |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

[diff]

diff --git a/qemu/configure b/qemu/configure
--- a/qemu/configure
+++ b/qemu/configure
@@ -685,14 +685,15 @@
 # ppc specific hostlongbits selection
 if test "$cpu" = "powerpc" ; then
     cat > $TMPC <<EOF
-int main(void){return sizeof(long);}
+#include <bits/wordsize.h>
+__WORDSIZE
 EOF
 
-    if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null; then
-        $TMPE
-        case $? in
-            4) hostlongbits="32";;
-            8) hostlongbits="64";;
+    if $cc $ARCH_CFLAGS -E -o $TMPE.E $TMPC 2> /dev/null; then
+        wordsize=`tail -n 1 ${TMPE}.E`
+        case $wordsize in
+            32) hostlongbits="32";;
+            64) hostlongbits="64";;
             *) echo "Couldn't determine bits per long value"; exit 1;;
         esac
     else

[PATCH 2/3] kvm-userspace: kvmppc: fix hostlonbits detection when cross compiling v2

[ehrhardt]

From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>

*update*
further debugging according to some requests revealed that ARCH_CFLAGS does
not contain all CFLAGS that might be needed, especially those supplied via
extra-cflags. Therefore people supplying things via extra-cflags instead of an
environment variable might have had issues.

A recent kvm merge with qemu brought code for 64bit power that broke cross
compilation. The issue is caused by configure trying to execute target
architecture binaries where configure is executed.

I tried to change that detection so that it works with&without cross
compilation with only a small change and especially without an addtional
configure command line switch. Including the bits/wordsize.h header a platform
usually can check its wordsize and by doing that configure can check the
hostlongbits without executing the binary. Instead it now stops after
preprocessing stage which resolved the __WORDSIZE constant and retrieves
that value.

I don't like my new check style, but it is at least less broken than before.
Another approach that was suggested was that qemu might end up needing
something like asm-offsets in the kernel to manage architecture sizes etc.
Comments and other approaches welcome.
 
Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
---

[diffstat]
 configure |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

[diff]

diff --git a/qemu/configure b/qemu/configure
--- a/qemu/configure
+++ b/qemu/configure
@@ -685,14 +685,15 @@
 # ppc specific hostlongbits selection
 if test "$cpu" = "powerpc" ; then
     cat > $TMPC <<EOF
-int main(void){return sizeof(long);}
+#include <bits/wordsize.h>
+__WORDSIZE
 EOF
 
-    if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null; then
-        $TMPE
-        case $? in
-            4) hostlongbits="32";;
-            8) hostlongbits="64";;
+    if $cc $ARCH_CFLAGS $CFLAGS -E -o $TMPE.E $TMPC 2> /dev/null; then
+        wordsize=`tail -n 1 ${TMPE}.E`
+        case $wordsize in
+            32) hostlongbits="32";;
+            64) hostlongbits="64";;
             *) echo "Couldn't determine bits per long value"; exit 1;;
         esac
     else

Re: [PATCH 2/3] kvm-userspace: kvmppc: fix hostlonbits detection

[Hollis Blanchard]

On Tue, 2008-09-30 at 11:10 +0200, ehrhardt@linux.vnet.ibm.com wrote:
> diff --git a/qemu/configure b/qemu/configure
> --- a/qemu/configure
> +++ b/qemu/configure
> @@ -685,14 +685,15 @@
>  # ppc specific hostlongbits selection
>  if test "$cpu" = "powerpc" ; then
>      cat > $TMPC <<EOF
> -int main(void){return sizeof(long);}
> +#include <bits/wordsize.h>
> +__WORDSIZE
>  EOF
> 
> -    if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null; then
> -        $TMPE
> -        case $? in
> -            4) hostlongbits="32";;
> -            8) hostlongbits="64";;
> +    if $cc $ARCH_CFLAGS $CFLAGS -E -o $TMPE.E $TMPC 2> /dev/null; then
> +        wordsize=`tail -n 1 ${TMPE}.E`
> +        case $wordsize in
> +            32) hostlongbits="32";;
> +            64) hostlongbits="64";;
>              *) echo "Couldn't determine bits per long value"; exit 1;;
>          esac
>      else

Yeah, trying to execute target-specific code is simply incompatible with
cross-compiling, so clearly this needs to be changed.

<bits/wordsize.h> might be too Linux-specific, not sure. Also, I worry
about the preprocessor being allowed to insert all the whitespace it
wants, so I'm not sure if you can assume that __WORDSIZE will be on the
last output line.

Instead you could use this:
	$cc -E -dM - < /dev/null | grep __powerpc64__

-- 
Hollis Blanchard
IBM Linux Technology Center

Re: [Qemu-devel] [PATCH 2/3] kvm-userspace: kvmppc: fix hostlonbits

[malc]

On Tue, 30 Sep 2008, ehrhardt@linux.vnet.ibm.com wrote:

> From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
>
> *update*
> further debugging according to some requests revealed that ARCH_CFLAGS does
> not contain all CFLAGS that might be needed, especially those supplied via
> extra-cflags. Therefore people supplying things via extra-cflags instead of an
> environment variable might have had issues.

This part i don't get, there are few more checks before/after 
hostlongbits where no CFLAGS are added to the $cc argument list. What
makes hostlongbits selection "special"? Do people specify -m32/-m64 via
--extra-cflags?

>
> A recent kvm merge with qemu brought code for 64bit power that broke cross
> compilation. The issue is caused by configure trying to execute target
> architecture binaries where configure is executed.

Yes, i never thought about cross-compilation, my bad.

> I tried to change that detection so that it works with&without cross
> compilation with only a small change and especially without an addtional
> configure command line switch. Including the bits/wordsize.h header a platform
> usually can check its wordsize and by doing that configure can check the
> hostlongbits without executing the binary. Instead it now stops after
> preprocessing stage which resolved the __WORDSIZE constant and retrieves
> that value.
>
> I don't like my new check style, but it is at least less broken than before.
> Another approach that was suggested was that qemu might end up needing
> something like asm-offsets in the kernel to manage architecture sizes etc.
> Comments and other approaches welcome.
>

I think Hollis Blanchard's method is sound,

Thank you for bringing this up.

-- 
mailto:av1474@comtv.ru

Re: [Qemu-devel] [PATCH 2/3] kvm-userspace: kvmppc: fix hostlonbits

[Christian Ehrhardt]

malc wrote:
> On Tue, 30 Sep 2008, ehrhardt@linux.vnet.ibm.com wrote:
>
>> From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
>>
>> *update*
>> further debugging according to some requests revealed that 
>> ARCH_CFLAGS does
>> not contain all CFLAGS that might be needed, especially those 
>> supplied via
>> extra-cflags. Therefore people supplying things via extra-cflags 
>> instead of an
>> environment variable might have had issues.
>
> This part i don't get, there are few more checks before/after 
> hostlongbits where no CFLAGS are added to the $cc argument list. What
> makes hostlongbits selection "special"? Do people specify -m32/-m64 via
> --extra-cflags?
>
it was there to ensure availability of the needed include paths to reach 
wordsize.h.
But Hollis approach is much simpler, better and more reliable so never 
mind :-)

>>
>> A recent kvm merge with qemu brought code for 64bit power that broke 
>> cross
>> compilation. The issue is caused by configure trying to execute target
>> architecture binaries where configure is executed.
>
> Yes, i never thought about cross-compilation, my bad.
np, now it's fixed - thanks for quickly applying it.
>
>> I tried to change that detection so that it works with&without cross
>> compilation with only a small change and especially without an addtional
>> configure command line switch. Including the bits/wordsize.h header a 
>> platform
>> usually can check its wordsize and by doing that configure can check the
>> hostlongbits without executing the binary. Instead it now stops after
>> preprocessing stage which resolved the __WORDSIZE constant and retrieves
>> that value.
>>
>> I don't like my new check style, but it is at least less broken than 
>> before.
>> Another approach that was suggested was that qemu might end up needing
>> something like asm-offsets in the kernel to manage architecture sizes 
>> etc.
>> Comments and other approaches welcome.
>>
>
> I think Hollis Blanchard's method is sound,
>
> Thank you for bringing this up.
>


-- 

Grüsse / regards, 
Christian Ehrhardt
IBM Linux Technology Center, Open Virtualization

Re: [Qemu-devel] [PATCH 2/3] kvm-userspace: kvmppc: fix hostlonbits

[malc]

On Tue, 30 Sep 2008, ehrhardt@linux.vnet.ibm.com wrote:

> From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>

The commit message of r5364, the revision which basically exists
because of your posts, was somehow butchered and as such doesn't
include any references, i'm very sorry about that.

The above line was there in the commit message editing buffer, but
then i somehow screwed it all up, probably when trying to reformat
stuff suffling text around.

Once again, i'm sorry.

[..snip..]

-- 
mailto:av1474@comtv.ru

[PATCH] kvm-userspace: kvmppc: fix building userspace for powerpc

[ehrhardt]

From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>

Commit 2d5737d8 added the requirement for an $arch/Makefile.pre in the
kernel subdirectory. This patch adds a stub for powerpc.
Additionally now a file kernel/$arch/hack-module.awk is needed and a simple
version for ppc is added for that one too.
In the root Makefile ia64 patch 030253bf added ia64 with a comma which should
break both architectures because filter works without. The patch removes that
comma.
The commit 76ff90aa fixed the dependency to DEPLIBS, but the definition of the
libfdt dependency lacks the right path (../libfdt/).

Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
---

[diffstat]
 Makefile                       |    2 +-
 kernel/powerpc/Makefile.pre    |    1 +
 kernel/powerpc/hack-module.awk |    5 +++++
 qemu/Makefile.target           |    2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

[diff]

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@
 ifneq '$(filter $(ARCH), i386 x86_64)' ''
     qemu: extboot
 endif
-ifneq '$(filter $(ARCH), powerpc, ia64)' ''
+ifneq '$(filter $(ARCH), powerpc ia64)' ''
     qemu: libfdt
 endif
 user: libkvm
diff --git a/kernel/powerpc/Makefile.pre b/kernel/powerpc/Makefile.pre
new file mode 100644
--- /dev/null
+++ b/kernel/powerpc/Makefile.pre
@@ -0,0 +1,1 @@
+prerequisite:
diff --git a/kernel/powerpc/hack-module.awk b/kernel/powerpc/hack-module.awk
new file mode 100644
--- /dev/null
+++ b/kernel/powerpc/hack-module.awk
@@ -0,0 +1,5 @@
+/MODULE_AUTHOR/ {
+    printf("MODULE_INFO(version, \"%s\");\n", version)
+}
+
+{ print }
diff --git a/qemu/Makefile.target b/qemu/Makefile.target
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -579,7 +579,7 @@
 
 ifdef CONFIG_LIBFDT
 LIBS += -lfdt
-DEPLIBS += libfdt.a
+DEPLIBS += ../libfdt/libfdt.a
 endif
 
 # SCSI layer

[PATCH 0/3] kvm-userspace: kvmppc: fix build for ppc v2

[ehrhardt]

From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>

*update
Short after resending v1 I realized that I forgot to put Avi and
qemu-devel@nongnu.org (for 2/3) on cc. I also updated the header text in 1/3 a
bit and verified my hostlongbits proposal on recent cross toolchain versions
because there was a question about that.

Updating and testing kvm-userspace for ppc after a too long time brought up
some issues fixed in this series.

The patches are small and their description should be comprehendible. Due to
the fact that most of the issues where build time issues I also started to
discuss about/establish some kind of automated build test for us that should
allow us to find such things faster.
Let me know if qumranet has such a process for x86 already and I should help
you to include powerpc.

[patches in series]
[PATCH 1/3] kvm-userspace: kvmppc: fix file header in libkvm-powerpc.c
[PATCH 2/3] kvm-userspace: kvmppc: fix hostlonbits detection when cross compiling
[PATCH 3/3] kvm-userspace: kvmppc: fix building userspace for powerpc

---
[diffstat]
 Makefile                       |    3 ++-
 kernel/powerpc/Makefile.pre    |    1 +
 kernel/powerpc/hack-module.awk |    5 +++++
 libkvm/libkvm-powerpc.c        |   14 +++++---------
 qemu/Makefile.target           |    2 +-
 qemu/configure                 |   13 +++++++------
 6 files changed, 21 insertions(+), 17 deletions(-)

Re: [PATCH 0/3] kvm-userspace: kvmppc: fix build for ppc v2

[Hollis Blanchard]

On Tue, 2008-09-30 at 08:36 +0200, ehrhardt@linux.vnet.ibm.com wrote:
> From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
> 
> *update
> Short after resending v1 I realized that I forgot to put Avi and
> qemu-devel@nongnu.org (for 2/3) on cc. I also updated the header text in 1/3 a
> bit and verified my hostlongbits proposal on recent cross toolchain versions
> because there was a question about that.
> 
> Updating and testing kvm-userspace for ppc after a too long time brought up
> some issues fixed in this series.
> 
> The patches are small and their description should be comprehendible. Due to
> the fact that most of the issues where build time issues I also started to
> discuss about/establish some kind of automated build test for us that should
> allow us to find such things faster.
> Let me know if qumranet has such a process for x86 already and I should help
> you to include powerpc.
> 
> [patches in series]
> [PATCH 1/3] kvm-userspace: kvmppc: fix file header in libkvm-powerpc.c
> [PATCH 2/3] kvm-userspace: kvmppc: fix hostlonbits detection when cross compiling
> [PATCH 3/3] kvm-userspace: kvmppc: fix building userspace for powerpc

Acked-by: Hollis Blanchard <hollisb@us.ibm.com>

Avi, assuming agreement from qemu folks on patch #2, please apply these.
Thanks.

-- 
Hollis Blanchard
IBM Linux Technology Center

Re: [PATCH 0/3] kvm-userspace: kvmppc: fix build for ppc v2

[Avi Kivity]

ehrhardt@linux.vnet.ibm.com wrote:
> From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
>
> *update
> Short after resending v1 I realized that I forgot to put Avi and
> qemu-devel@nongnu.org (for 2/3) on cc. I also updated the header text in 1/3 a
> bit and verified my hostlongbits proposal on recent cross toolchain versions
> because there was a question about that.
>
> Updating and testing kvm-userspace for ppc after a too long time brought up
> some issues fixed in this series.
>
> The patches are small and their description should be comprehendible. Due to
> the fact that most of the issues where build time issues I also started to
> discuss about/establish some kind of automated build test for us that should
> allow us to find such things faster.
> Let me know if qumranet has such a process for x86 already and I should help
> you to include powerpc.
>
> [patches in series]
> [PATCH 1/3] kvm-userspace: kvmppc: fix file header in libkvm-powerpc.c
> [PATCH 2/3] kvm-userspace: kvmppc: fix hostlonbits detection when cross compiling
> [PATCH 3/3] kvm-userspace: kvmppc: fix building userspace for powerpc
>   

Applied 1 and 3, thanks.  2 appears to have already been merged via qemu 
upstream.

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