From 20c50a955fdf02b02f8c75533f456e3fbdf13de1 Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy Date: Thu, 27 Mar 2014 01:13:02 +1100 Subject: [PATCH 1/2] fw-path-provider: Change GPL version to 2+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexey Kardashevskiy Acked-by: Paolo Bonzini Signed-off-by: Andreas Färber --- 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 b11715733d..1290c3e600 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 301834972c..7afaec0b1d 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 From f85e3457cea170b5a0c48e9aa67d316f9e3cbcba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 7 Apr 2014 18:33:22 +0200 Subject: [PATCH 2/2] tests: Update check-clean rule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Suggested-by: Peter Maydell Signed-off-by: Andreas Färber --- tests/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 6086f68698..88f7105d02 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