[Qemu-devel] [PULL 0/2] Docker patches

[Qemu-devel] [PULL 0/2] Docker patches

[Fam Zheng]

The following changes since commit 42e0d60f1615ef63d16e41bb1668805560c37870:

  Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160804' into staging (2016-08-04 18:36:05 +0100)

are available in the git repository at:

  git@github.com:famz/qemu tags/docker-pull-request

for you to fetch changes up to 4a93f78ed086d6f0bceb3f0b281009e6026935b7:

  docker: Add "--enable-werror" to configure command line (2016-08-05 16:34:55 +0800)

----------------------------------------------------------------

Two bug fixes. One fixes breakage on RHEL 7, reported by Paolo, the other one
fixes the missing --enable-werror in docker build, which was intended since the
beginning, but was left behind during later iterations of the initial patch
series (lost .git in the docker src copy).

----------------------------------------------------------------

Fam Zheng (2):
  docker: Be compatible with older docker
  docker: Add "--enable-werror" to configure command line

 tests/docker/Makefile.include | 5 ++---
 tests/docker/common.rc        | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.7.4

[Qemu-devel] [PULL 1/2] docker: Be compatible with older docker

[Fam Zheng]

By not using "--format" with docker images command.

The option is not available on RHEL 7 docker command. Use an awk
matching command instead.

Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <1470202928-3392-1-git-send-email-famz@redhat.com>
---
 tests/docker/Makefile.include | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 78af468..4f4707d 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -107,9 +107,8 @@ docker-run-%: docker-qemu-src
 	fi
 	$(if $(filter $(TESTS),$(CMD)),$(if $(filter $(IMAGES),$(IMAGE)), \
 		$(call quiet-command,\
-			if $(SRC_PATH)/tests/docker/docker.py images \
-				--format={{.Repository}}:{{.Tag}} | \
-					grep -qx qemu:$(IMAGE); then \
+			if $(SRC_PATH)/tests/docker/docker.py images | \
+				awk '$$1=="qemu" && $$2=="$(IMAGE)"{found=1} END{exit(!found)}'; then \
 				$(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \
 				-t \
 				$(if $(DEBUG),-i,--net=none) \
-- 
2.7.4

[Qemu-devel] [PULL 2/2] docker: Add "--enable-werror" to configure command line

[Fam Zheng]

We don't have .git in the docker checkout, add this to enable -Werror
explicitly.

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-id: 1469453510-658-1-git-send-email-famz@redhat.com
---
 tests/docker/common.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/docker/common.rc b/tests/docker/common.rc
index 77069e1..0c6d8d5 100755
--- a/tests/docker/common.rc
+++ b/tests/docker/common.rc
@@ -24,6 +24,7 @@ requires()
 build_qemu()
 {
     $QEMU_SRC/configure \
+        --enable-werror \
         ${TARGET_LIST:+"--target-list=${TARGET_LIST}"} \
         --prefix="$PWD/install" \
         $EXTRA_CONFIGURE_OPTS \
-- 
2.7.4

Re: [Qemu-devel] [PULL 2/2] docker: Add "--enable-werror" to configure command line

[Paolo Bonzini]

On 05/08/2016 11:04, Fam Zheng wrote:
> We don't have .git in the docker checkout, add this to enable -Werror
> explicitly.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> Message-id: 1469453510-658-1-git-send-email-famz@redhat.com
> ---
>  tests/docker/common.rc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tests/docker/common.rc b/tests/docker/common.rc
> index 77069e1..0c6d8d5 100755
> --- a/tests/docker/common.rc
> +++ b/tests/docker/common.rc
> @@ -24,6 +24,7 @@ requires()
>  build_qemu()
>  {
>      $QEMU_SRC/configure \
> +        --enable-werror \
>          ${TARGET_LIST:+"--target-list=${TARGET_LIST}"} \
>          --prefix="$PWD/install" \
>          $EXTRA_CONFIGURE_OPTS \
> 

centos6 has -Wuninitialized errors.  Should this be applied only to
Fedora and Ubuntu?

Paolo

Re: [Qemu-devel] [PULL 2/2] docker: Add "--enable-werror" to configure command line

[Fam Zheng]

On Tue, 08/09 17:21, Paolo Bonzini wrote:
> 
> 
> On 05/08/2016 11:04, Fam Zheng wrote:
> > We don't have .git in the docker checkout, add this to enable -Werror
> > explicitly.
> > 
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > Message-id: 1469453510-658-1-git-send-email-famz@redhat.com
> > ---
> >  tests/docker/common.rc | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/tests/docker/common.rc b/tests/docker/common.rc
> > index 77069e1..0c6d8d5 100755
> > --- a/tests/docker/common.rc
> > +++ b/tests/docker/common.rc
> > @@ -24,6 +24,7 @@ requires()
> >  build_qemu()
> >  {
> >      $QEMU_SRC/configure \
> > +        --enable-werror \
> >          ${TARGET_LIST:+"--target-list=${TARGET_LIST}"} \
> >          --prefix="$PWD/install" \
> >          $EXTRA_CONFIGURE_OPTS \
> > 
> 
> centos6 has -Wuninitialized errors.  Should this be applied only to
> Fedora and Ubuntu?

That way I think build_qemu can be made sensible to the env. For now I'm not
seeing any compiling failure with centos6, even though this patch is already
merged.  Do you mean this is a potential false alarm?

Fam

Re: [Qemu-devel] [PULL 2/2] docker: Add "--enable-werror" to configure command line

[Paolo Bonzini]

> On Tue, 08/09 17:21, Paolo Bonzini wrote:
> > On 05/08/2016 11:04, Fam Zheng wrote:
> > > We don't have .git in the docker checkout, add this to enable -Werror
> > > explicitly.
> > > 
> > > Signed-off-by: Fam Zheng <famz@redhat.com>
> > > Message-id: 1469453510-658-1-git-send-email-famz@redhat.com
> > > ---
> > >  tests/docker/common.rc | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/tests/docker/common.rc b/tests/docker/common.rc
> > > index 77069e1..0c6d8d5 100755
> > > --- a/tests/docker/common.rc
> > > +++ b/tests/docker/common.rc
> > > @@ -24,6 +24,7 @@ requires()
> > >  build_qemu()
> > >  {
> > >      $QEMU_SRC/configure \
> > > +        --enable-werror \
> > >          ${TARGET_LIST:+"--target-list=${TARGET_LIST}"} \
> > >          --prefix="$PWD/install" \
> > >          $EXTRA_CONFIGURE_OPTS \
> > > 
> > 
> > centos6 has -Wuninitialized errors.  Should this be applied only to
> > Fedora and Ubuntu?
> 
> That way I think build_qemu can be made sensible to the env. For now I'm not
> seeing any compiling failure with centos6, even though this patch is already
> merged.  Do you mean this is a potential false alarm?

I don't know... I remember seeing some, but now I don't see any failure.
Perhaps this is because of --enable-debug?  Uninitialized variables require
optimization.  But CentOS 6 should have _FORTIFY_SOURCE and thus should
enable optimization.

Paolo

Re: [Qemu-devel] [PULL 2/2] docker: Add "--enable-werror" to configure command line

[Fam Zheng]

On Wed, 08/10 03:09, Paolo Bonzini wrote:
> 
> > On Tue, 08/09 17:21, Paolo Bonzini wrote:
> > > On 05/08/2016 11:04, Fam Zheng wrote:
> > > > We don't have .git in the docker checkout, add this to enable -Werror
> > > > explicitly.
> > > > 
> > > > Signed-off-by: Fam Zheng <famz@redhat.com>
> > > > Message-id: 1469453510-658-1-git-send-email-famz@redhat.com
> > > > ---
> > > >  tests/docker/common.rc | 1 +
> > > >  1 file changed, 1 insertion(+)
> > > > 
> > > > diff --git a/tests/docker/common.rc b/tests/docker/common.rc
> > > > index 77069e1..0c6d8d5 100755
> > > > --- a/tests/docker/common.rc
> > > > +++ b/tests/docker/common.rc
> > > > @@ -24,6 +24,7 @@ requires()
> > > >  build_qemu()
> > > >  {
> > > >      $QEMU_SRC/configure \
> > > > +        --enable-werror \
> > > >          ${TARGET_LIST:+"--target-list=${TARGET_LIST}"} \
> > > >          --prefix="$PWD/install" \
> > > >          $EXTRA_CONFIGURE_OPTS \
> > > > 
> > > 
> > > centos6 has -Wuninitialized errors.  Should this be applied only to
> > > Fedora and Ubuntu?
> > 
> > That way I think build_qemu can be made sensible to the env. For now I'm not
> > seeing any compiling failure with centos6, even though this patch is already
> > merged.  Do you mean this is a potential false alarm?
> 
> I don't know... I remember seeing some, but now I don't see any failure.
> Perhaps this is because of --enable-debug?  Uninitialized variables require
> optimization.  But CentOS 6 should have _FORTIFY_SOURCE and thus should
> enable optimization.

I just checked it does have _FORTIFY_SOURCE and -O2. So maybe we can leave this
for now and come back fix things when something goes wrong.

Fam

Re: [Qemu-devel] [PULL 0/2] Docker patches

[Peter Maydell]

On 5 August 2016 at 10:04, Fam Zheng <famz@redhat.com> wrote:
> The following changes since commit 42e0d60f1615ef63d16e41bb1668805560c37870:
>
>   Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160804' into staging (2016-08-04 18:36:05 +0100)
>
> are available in the git repository at:
>
>   git@github.com:famz/qemu tags/docker-pull-request
>
> for you to fetch changes up to 4a93f78ed086d6f0bceb3f0b281009e6026935b7:
>
>   docker: Add "--enable-werror" to configure command line (2016-08-05 16:34:55 +0800)
>
> ----------------------------------------------------------------
>
> Two bug fixes. One fixes breakage on RHEL 7, reported by Paolo, the other one
> fixes the missing --enable-werror in docker build, which was intended since the
> beginning, but was left behind during later iterations of the initial patch
> series (lost .git in the docker src copy).
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM