diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-07 17:57:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-07 17:57:23 +0100 |
| commit | 55519a4b244e4822774b593e36647ecf7598286b (patch) | |
| tree | d8f8b7253fa29b7402137b16954a258a4ab5d948 | |
| parent | 9c269f6d7bfb81cbbf501576b979831478dac5d9 (diff) | |
| parent | f85e3457cea170b5a0c48e9aa67d316f9e3cbcba (diff) | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging
QOM/QTest infrastructure fixes
* Relicensing of FWPathProvider interface
* Clean up all targets' qtests
# gpg: Signature made Mon 07 Apr 2014 17:56:13 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/qom-devices-for-2.0:
tests: Update check-clean rule
fw-path-provider: Change GPL version to 2+
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/core/fw-path-provider.c | 3 | ||||
| -rw-r--r-- | include/hw/fw-path-provider.h | 3 | ||||
| -rw-r--r-- | tests/Makefile | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c index b11715733..1290c3e60 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 301834972..7afaec0b1 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 diff --git a/tests/Makefile b/tests/Makefile index 6086f6869..88f7105d0 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 |