[Qemu-devel] [PULL for-2.6 0/1] qemu-ga patch queue for 2.6

[Qemu-devel] [PULL for-2.6 0/1] qemu-ga patch queue for 2.6

[Michael Roth]

The following changes since commit 1f7685fafa6ba1354731a59822e5cc43323d6989:

  Update language files for QEMU 2.6.0 (2016-04-19 18:41:25 +0100)

are available in the git repository at:

  git://github.com/mdroth/qemu.git tags/qga-pull-2016-04-19-tag

for you to fetch changes up to fb91f30bb9716c391ce0441942fffa601ad99684:

  qemu-ga: do not run qga test when guest agent disabled (2016-04-19 16:51:15 -0500)

----------------------------------------------------------------
qemu-ga patch queue for 2.6

* fixes inadvertant change that unconditionally disables qemu-ga unit test
* fixes make check failures when building with --disable-guest-agent that
  were present visible before the unit test was inadvertantly disabled.

----------------------------------------------------------------
Yang Hongyang (1):
      qemu-ga: do not run qga test when guest agent disabled

 tests/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

[Qemu-devel] [PULL 1/1] qemu-ga: do not run qga test when guest agent disabled

[Michael Roth]

From: Yang Hongyang <hongyang.yang@easystack.cn>

When configure with --disable-guest-agent, make check will fail with:
ERROR:tests/test-qga.c:74:fixture_setup: assertion failed (error == NULL):
 Failed to execute child process "/home/xx/qemu/qemu-ga" (No such file or
directory) (g-exec-error-quark, 8)
make: *** [check-tests/test-qga] Error 1

This check was commented out by bab47d9a75a. I think that was by
mistake, because the commit message of that commit didn't mention
this change.

Signed-off-by: Yang Hongyang <hongyang.yang@easystack.cn>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Michael Roth <mdroth@linux.vnet.ibm.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Cc: qemu-stable@nongnu.org
---
 tests/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/Makefile b/tests/Makefile
index 9de9598..9194f18 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -83,7 +83,9 @@ check-unit-y += tests/test-crypto-cipher$(EXESUF)
 check-unit-y += tests/test-crypto-secret$(EXESUF)
 check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlscredsx509$(EXESUF)
 check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlssession$(EXESUF)
-#check-unit-$(CONFIG_LINUX) += tests/test-qga$(EXESUF)
+ifneq (,$(findstring qemu-ga,$(TOOLS)))
+check-unit-$(CONFIG_LINUX) += tests/test-qga$(EXESUF)
+endif
 check-unit-y += tests/test-timed-average$(EXESUF)
 check-unit-y += tests/test-io-task$(EXESUF)
 check-unit-y += tests/test-io-channel-socket$(EXESUF)
-- 
1.9.1

Re: [Qemu-devel] [PULL for-2.6 0/1] qemu-ga patch queue for 2.6

[Peter Maydell]

On 19 April 2016 at 23:34, Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> The following changes since commit 1f7685fafa6ba1354731a59822e5cc43323d6989:
>
>   Update language files for QEMU 2.6.0 (2016-04-19 18:41:25 +0100)
>
> are available in the git repository at:
>
>   git://github.com/mdroth/qemu.git tags/qga-pull-2016-04-19-tag
>
> for you to fetch changes up to fb91f30bb9716c391ce0441942fffa601ad99684:
>
>   qemu-ga: do not run qga test when guest agent disabled (2016-04-19 16:51:15 -0500)
>
> ----------------------------------------------------------------
> qemu-ga patch queue for 2.6
>
> * fixes inadvertant change that unconditionally disables qemu-ga unit test
> * fixes make check failures when building with --disable-guest-agent that
>   were present visible before the unit test was inadvertantly disabled.
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM