diff mbox

configure: Virtfs doesn't require libcap.

Message ID 20120422101605.BBAC46AC03A@msa102.auone-net.jp
State New
Headers show

Commit Message

Kusanagi Kouichi April 22, 2012, 10:16 a.m. UTC
Only proxy helper does.

Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
---
 configure |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Paolo Bonzini April 23, 2012, 6:43 a.m. UTC | #1
Il 22/04/2012 12:16, Kusanagi Kouichi ha scritto:
> Only proxy helper does.
> 
> Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
> ---
>  configure |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index 2d62d12..c8e6fe4 100755
> --- a/configure
> +++ b/configure
> @@ -2860,9 +2860,11 @@ tools=
>  if test "$softmmu" = yes ; then
>    tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
>    if test "$virtfs" != no ; then
> -      if test "$cap" = yes && test "$linux" = yes && test "$attr" = yes ; then
> +      if test "$linux" = yes && test "$attr" = yes ; then
>  	  virtfs=yes
> -	  tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
> +	  if test "$cap" = yes ; then
> +	      tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
> +	  fi
>        else
>  	  if test "$virtfs" = yes; then
>  	      feature_not_found "virtfs"

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Anthony Liguori April 24, 2012, 6:24 p.m. UTC | #2
On 04/22/2012 05:16 AM, Kusanagi Kouichi wrote:
> Only proxy helper does.
>
> Signed-off-by: Kusanagi Kouichi<slash@ac.auone-net.jp>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   configure |    6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 2d62d12..c8e6fe4 100755
> --- a/configure
> +++ b/configure
> @@ -2860,9 +2860,11 @@ tools=
>   if test "$softmmu" = yes ; then
>     tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
>     if test "$virtfs" != no ; then
> -      if test "$cap" = yes&&  test "$linux" = yes&&  test "$attr" = yes ; then
> +      if test "$linux" = yes&&  test "$attr" = yes ; then
>   	  virtfs=yes
> -	  tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
> +	  if test "$cap" = yes ; then
> +	      tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
> +	  fi
>         else
>   	  if test "$virtfs" = yes; then
>   	      feature_not_found "virtfs"
Anthony Liguori April 25, 2012, 7:20 p.m. UTC | #3
On 04/22/2012 05:16 AM, Kusanagi Kouichi wrote:
> Only proxy helper does.
>
> Signed-off-by: Kusanagi Kouichi<slash@ac.auone-net.jp>

This broke the build:

http://spunk.home.kraxel.org/bb/builders/ubuntu-default/builds/52

Since the improve seems to be purely cosmetic, I'm going to revert this change.

Regards,

Anthony Liguori

> ---
>   configure |    6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 2d62d12..c8e6fe4 100755
> --- a/configure
> +++ b/configure
> @@ -2860,9 +2860,11 @@ tools=
>   if test "$softmmu" = yes ; then
>     tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
>     if test "$virtfs" != no ; then
> -      if test "$cap" = yes&&  test "$linux" = yes&&  test "$attr" = yes ; then
> +      if test "$linux" = yes&&  test "$attr" = yes ; then
>   	  virtfs=yes
> -	  tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
> +	  if test "$cap" = yes ; then
> +	      tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
> +	  fi
>         else
>   	  if test "$virtfs" = yes; then
>   	      feature_not_found "virtfs"
Kusanagi Kouichi April 26, 2012, 12:59 p.m. UTC | #4
On 2012-04-25 14:20:12 -0500, Anthony Liguori wrote:
> On 04/22/2012 05:16 AM, Kusanagi Kouichi wrote:
> >Only proxy helper does.
> >
> >Signed-off-by: Kusanagi Kouichi<slash@ac.auone-net.jp>
> 
> This broke the build:
> 
> http://spunk.home.kraxel.org/bb/builders/ubuntu-default/builds/52

I cannot see IPv6 only sites. Could you send me the contents of the URL?

> Since the improve seems to be purely cosmetic, I'm going to revert this change.
> 
> Regards,
> 
> Anthony Liguori
> 
> >---
> >  configure |    6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> >diff --git a/configure b/configure
> >index 2d62d12..c8e6fe4 100755
> >--- a/configure
> >+++ b/configure
> >@@ -2860,9 +2860,11 @@ tools=
> >  if test "$softmmu" = yes ; then
> >    tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
> >    if test "$virtfs" != no ; then
> >-      if test "$cap" = yes&&  test "$linux" = yes&&  test "$attr" = yes ; then
> >+      if test "$linux" = yes&&  test "$attr" = yes ; then
> >  	  virtfs=yes
> >-	  tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
> >+	  if test "$cap" = yes ; then
> >+	      tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
> >+	  fi
> >        else
> >  	  if test "$virtfs" = yes; then
> >  	      feature_not_found "virtfs"
>
Gerd Hoffmann April 26, 2012, 1:41 p.m. UTC | #5
On 04/26/12 14:59, Kusanagi Kouichi wrote:
> On 2012-04-25 14:20:12 -0500, Anthony Liguori wrote:
>> On 04/22/2012 05:16 AM, Kusanagi Kouichi wrote:
>>> Only proxy helper does.
>>>
>>> Signed-off-by: Kusanagi Kouichi<slash@ac.auone-net.jp>
>>
>> This broke the build:
>>
>> http://spunk.home.kraxel.org/bb/builders/ubuntu-default/builds/52
> 
> I cannot see IPv6 only sites. Could you send me the contents of the URL?

There is a proxy @ www.kraxel.org now.  Here is the build log for the
most recent build:

http://www.kraxel.org/bb/builders/ubuntu-default/builds/60/steps/compile/logs/stdio

cheers,
  Gerd
Kusanagi Kouichi April 28, 2012, 5:59 a.m. UTC | #6
On 2012-04-25 14:20:12 -0500, Anthony Liguori wrote:
> On 04/22/2012 05:16 AM, Kusanagi Kouichi wrote:
> >Only proxy helper does.
> >
> >Signed-off-by: Kusanagi Kouichi<slash@ac.auone-net.jp>
> 
> This broke the build:
> 
> http://spunk.home.kraxel.org/bb/builders/ubuntu-default/builds/52

It turned out that hw/9pfs/virtio-9p-handle.c is broken. Indeed, it
doesn't compile. My patch only exposed it.
I found a patch to fix this: http://patchwork.ozlabs.org/patch/142969/

> Since the improve seems to be purely cosmetic, I'm going to revert this change.
> 
> Regards,
> 
> Anthony Liguori
diff mbox

Patch

diff --git a/configure b/configure
index 2d62d12..c8e6fe4 100755
--- a/configure
+++ b/configure
@@ -2860,9 +2860,11 @@  tools=
 if test "$softmmu" = yes ; then
   tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
   if test "$virtfs" != no ; then
-      if test "$cap" = yes && test "$linux" = yes && test "$attr" = yes ; then
+      if test "$linux" = yes && test "$attr" = yes ; then
 	  virtfs=yes
-	  tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
+	  if test "$cap" = yes ; then
+	      tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
+	  fi
       else
 	  if test "$virtfs" = yes; then
 	      feature_not_found "virtfs"