[Qemu-devel] [PULL for-2.0 0/2] QOM devices patch queue 2014-04-07

[Qemu-devel] [PULL for-2.0 0/2] QOM devices patch queue 2014-04-07

[Andreas Färber]

Hello Peter,

This is my QOM (devices) patch queue. Please pull.

Regards,
Andreas

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Anthony Liguori <anthony@codemonkey.ws>

Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>

The following changes since commit bd7ce902ab2b5e4f5cd53e1e032d89789b6932a8:

  Merge remote-tracking branch 'remotes/spice/tags/pull-spice-6' into staging (2014-04-07 12:48:34 +0100)

are available in the git repository at:


  git://github.com/afaerber/qemu-cpu.git tags/qom-devices-for-2.0

for you to fetch changes up to f85e3457cea170b5a0c48e9aa67d316f9e3cbcba:

  tests: Update check-clean rule (2014-04-07 18:33:22 +0200)

----------------------------------------------------------------
QOM/QTest infrastructure fixes

* Relicensing of FWPathProvider interface
* Clean up all targets' qtests

----------------------------------------------------------------
Alexey Kardashevskiy (1):
      fw-path-provider: Change GPL version to 2+

Andreas Färber (1):
      tests: Update check-clean rule

 hw/core/fw-path-provider.c    | 3 ++-
 include/hw/fw-path-provider.h | 3 ++-
 tests/Makefile                | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

[Qemu-devel] [PULL for-2.0 1/2] fw-path-provider: Change GPL version to 2+

[Andreas Färber]

From: Alexey Kardashevskiy <aik@ozlabs.ru>

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/core/fw-path-provider.c    | 3 ++-
 include/hw/fw-path-provider.h | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c
index b117157..1290c3e 100644
--- a/hw/core/fw-path-provider.c
+++ b/hw/core/fw-path-provider.c
@@ -3,7 +3,8 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; under version 2 of the License.
+ *  the Free Software Foundation; either version 2 of the License,
+ *  or (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/hw/fw-path-provider.h b/include/hw/fw-path-provider.h
index 3018349..7afaec0 100644
--- a/include/hw/fw-path-provider.h
+++ b/include/hw/fw-path-provider.h
@@ -3,7 +3,8 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; under version 2 of the License.
+ *  the Free Software Foundation; either version 2 of the License,
+ *  or (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- 
1.8.4.5

[Qemu-devel] [PULL for-2.0 2/2] tests: Update check-clean rule

[Andreas Färber]

Only i386, x86_64, sparc and sparc64 qtests were cleaned up.
Make this more generic to not miss any newly tested targets.

Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 tests/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/Makefile b/tests/Makefile
index 6086f68..88f7105 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -394,7 +394,8 @@ check-block: $(patsubst %,check-%, $(check-block-y))
 check: check-qapi-schema check-unit check-qtest
 check-clean:
 	$(MAKE) -C tests/tcg clean
-	rm -rf $(check-unit-y) $(check-qtest-i386-y) $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
+	rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
+	rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)))
 
 clean: check-clean
 
-- 
1.8.4.5

Re: [Qemu-devel] [PULL for-2.0 0/2] QOM devices patch queue 2014-04-07

[Peter Maydell]

On 7 April 2014 17:57, Andreas Färber <afaerber@suse.de> wrote:
> Hello Peter,
>
> This is my QOM (devices) patch queue. Please pull.
>
> Regards,
> Andreas
>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: Anthony Liguori <anthony@codemonkey.ws>
>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
>
> The following changes since commit bd7ce902ab2b5e4f5cd53e1e032d89789b6932a8:
>
>   Merge remote-tracking branch 'remotes/spice/tags/pull-spice-6' into staging (2014-04-07 12:48:34 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/afaerber/qemu-cpu.git tags/qom-devices-for-2.0
>
> for you to fetch changes up to f85e3457cea170b5a0c48e9aa67d316f9e3cbcba:
>
>   tests: Update check-clean rule (2014-04-07 18:33:22 +0200)
>
> ----------------------------------------------------------------
> QOM/QTest infrastructure fixes
>
> * Relicensing of FWPathProvider interface
> * Clean up all targets' qtests

Applied, thanks.

-- PMM