From patchwork Wed Feb 6 15:28:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1037606 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vlrh5m0yz9sLw for ; Thu, 7 Feb 2019 02:35:32 +1100 (AEDT) Received: from localhost ([127.0.0.1]:52705 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grPEY-0004gA-Oy for incoming@patchwork.ozlabs.org; Wed, 06 Feb 2019 10:35:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grP81-00009O-Ti for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grP80-0004PQ-4P for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:45 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:38107) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grP7k-0004Kk-SZ; Wed, 06 Feb 2019 10:28:30 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MKsaz-1gYtjh21YT-00LDQP; Wed, 06 Feb 2019 16:28:16 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2019 16:28:01 +0100 Message-Id: <20190206152807.31896-2-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190206152807.31896-1-laurent@vivier.eu> References: <20190206152807.31896-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:FxcW8Sbtvzn7pG9lhKTO7bT45vhL3DRvt26w18Fw9BB+hhujV4d 4YEout9mI8xg6+/zoKBmhkvhD/XPdNDcO2B7djPEe7YM3acTIaHwF53qdSiCYwymEMfI3tC +W2MwbJLhQ012RfqK9TbXQM20XRWqIXbmY28xe9XkKczdgzn6jijXRqiWzMSx83lu9euZmc UMCSTvVY6cloBBDgDYbzw== X-UI-Out-Filterresults: notjunk:1; V03:K0:gXltWkK9geg=:Ro4Ih6JrW9jLPYEFHmFtWJ BX0Z6E8mpQs2NwRda3C3eEDnYu1zH2MJZ1rbhuSm6jQbA9Tufd18zDwMiHD6jUorQob2wjG65 CQq/MRTHTTpeot/lqVZguhhhD/Sbr6TCwz88LGx7eCRfpYsLWsaAJ3hTnfFP2YKeqqWveg63k kCy/I0Rs6dgV6hQpnfGC5gEiyx5854/DZwigh+Af8NkbTUlt4TwPKpddle2L30g8xjTsGhBf7 srTx244hD5GC9tF0ho3KkBQKyGaUArM37PgyjYjUTyYQ7X+9PFEM7TAaGh1PVc9M1vpJm3vZY fWLm198BKAHgd6dBNkz/Hy9AscAT6z4RS+MM5jysETWcEl3r9geg6GfT8X+ElKBcBsEufrM1c PrECp28Cdz6nSwi0f6Yv8Uzi89mq9UkmKqieLG/PmV8ISNTMiFDkCCcyoTNwEW2AkrXYny0fo oggDhPHjX9G+0so03lE48A8wrbAvjK2ApBKb+b7KxWQNyVvCRVwXW+uci6Ec9Uk49PDiMgg7u 9oCjoAH57424PfdbtwQF96rBh5ecdP1cc5GiiVvWbUVvHL4kGVwdnf9Jl3uGcoCPJAH3US5c+ tA2W/QUo9iA03L8NUlOspbX8f/lt/FJ4JyyI2Kvxik3uwMF3PlLrU29wYppgazUZfWLslmq3O JFStrbLAR8htN0NFjGTFxisOcDIH/RdalPGwrQ+M8/PLn7G1YiuraYbefAEYOTsKUCdOHCobY vHPKaUZUN72V4wRg4GDl0f7OACiEFh7HLdPCXC4002up/0Ew2K3FN9EedN4= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 1/7] qemu-common.h: Update copyright string for 2019 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi , Peter Maydell , Eduardo Habkost , qemu-trivial@nongnu.org, Mark Cave-Ayland , Anthony Green , Michael Tokarev , Laurent Vivier , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, Guan Xuetao , Artyom Tarasenko Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Update the copyright string we use in version/help output, since we're well into the new year now. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi Reviewed-by: Alex Bennée Message-Id: <20190201173655.4567-1-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier --- include/qemu-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index ed60ba251d..a102245519 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -17,7 +17,7 @@ #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR) /* Copyright string for -version arguments, About dialogs, etc */ -#define QEMU_COPYRIGHT "Copyright (c) 2003-2018 " \ +#define QEMU_COPYRIGHT "Copyright (c) 2003-2019 " \ "Fabrice Bellard and the QEMU Project developers" /* Bug reporting information for --help arguments, About dialogs, etc */ From patchwork Wed Feb 6 15:28:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1037601 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vlkr1pgkz9sLw for ; Thu, 7 Feb 2019 02:30:28 +1100 (AEDT) Received: from localhost ([127.0.0.1]:52637 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grP9e-000103-3N for incoming@patchwork.ozlabs.org; Wed, 06 Feb 2019 10:30:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grP81-00009Q-UD for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grP80-0004PO-4Q for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:45 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:52543) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grP7k-0004L1-T9; Wed, 06 Feb 2019 10:28:30 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N49Yn-1hHpwG3hQ1-0101Hh; Wed, 06 Feb 2019 16:28:18 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2019 16:28:02 +0100 Message-Id: <20190206152807.31896-3-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190206152807.31896-1-laurent@vivier.eu> References: <20190206152807.31896-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:50GsQBkRs00UIdjKznqXiDUEnSYc3iLcB1QYRVJJtiPsDy0LKGi W6NqyJRP/m7xfmm3M/+Meig9bn/JJqJyJ0Yn8kloK4ahy1hUJgtWq3/KGX04DO/LZcoJkGa 06uVe1j7USFPDszs79WjohXWU5daUAkK0tNKTL1pAqYDg/AbCpHuwNjKVu5eKMVXdb99Tkh u1lurMbwWV+Shs05xQ21g== X-UI-Out-Filterresults: notjunk:1; V03:K0:2oBQh1yUJ3I=:0Tk4D5/7ClhGCJ1fQX8Ebk +3Bd0rgm7iHGI6ANmF0X1kkIurdI1wkN6QFQoGepjwFztcdba1Yy5S4E2eEVXaQbZ7EXe1LTj cv0bmdan0R5nR/rSc9GzCAnll4KbHVkTGn5WgPNrXS+SwhjLrD2US6547IEsLi6nCVuiMbp4x F4tuwR2i1ZpFV+qZ65RGZlYJh9hhlGskIN1OEABdIL7edu7eMmGW2lU1hJcNLv+QGC86VIEQF +hH/AWYF2WXSxwBNxJR1a4//vS4UJDverlJti6p7yvZw6eJeZmvQ8HhF5DQRW7J1425yPOWpH a0rTFJO2Q+hHyOXQvPXrZlXsIJZEq7et6ASBs3CLhWiFVYmhPkpPEu/ZB++h9qvY/DZlxsM4H 4dfrjJ4N5BM7qVIHehxffzxYvqqJ4151mwwsHWVg0QYfu2HpWhJDss7gzOti712zixUyZTveP 8e/g76YQg5taWIh0MTeclOcGfWG1WGJ8/PPw9Y6+/pEt4gOtoAq5ScyK62m3KMamyBP5hPURF lmzJ8g2RHd2757lDDzQ8jH5AwjI1EJ1yxtaYyonJwOhgap1Uy3U15chK/7aA5qbwA5iC+wrGR g27N4fNydiiU77PbJioFmRMrkCOdrjV/2ZByZ5VzZctlCKBG37RA9SGYSZqSZgPd3Yn7/uiPs dF/GAaTz6+Qr1auiLyCDjNcX9R8jCZhmgAEzsYsXgT3I9TPCeCqTSffl1TheL89rCUqkAtfAw p8vJdxxRkDw0pj0GxH0Hb8ulUPq/D7Ie4HYafA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 2/7] target/moxie: Fix LGPL information in the file headers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , qemu-trivial@nongnu.org, Mark Cave-Ayland , Anthony Green , Michael Tokarev , Laurent Vivier , Richard Henderson , qemu-arm@nongnu.org, Guan Xuetao , Artyom Tarasenko Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth It's either "GNU *Library* General Public License version 2" or "GNU Lesser General Public License version *2.1*", but there was no "version 2.0" of the "Lesser" license. So assume that version 2.1 is meant here. Also the files mentioned the GPL instead of the LGPL after declaring that the files are licensed under the LGPL, so change these spots to use LGPL, too. Signed-off-by: Thomas Huth Acked-by: Richard Henderson Message-Id: <1549266858-5043-1-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- target/moxie/cpu.c | 2 +- target/moxie/cpu.h | 4 ++-- target/moxie/helper.c | 4 ++-- target/moxie/mmu.c | 4 ++-- target/moxie/translate.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c index 8d67eb6727..46434e65ba 100644 --- a/target/moxie/cpu.c +++ b/target/moxie/cpu.c @@ -13,7 +13,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ diff --git a/target/moxie/cpu.h b/target/moxie/cpu.h index d40f1e6c45..080df4ee6f 100644 --- a/target/moxie/cpu.h +++ b/target/moxie/cpu.h @@ -6,14 +6,14 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ diff --git a/target/moxie/helper.c b/target/moxie/helper.c index 5b1532b837..f3d8ee7d6b 100644 --- a/target/moxie/helper.c +++ b/target/moxie/helper.c @@ -6,14 +6,14 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ diff --git a/target/moxie/mmu.c b/target/moxie/mmu.c index bd90b1eebc..87783a36f8 100644 --- a/target/moxie/mmu.c +++ b/target/moxie/mmu.c @@ -6,14 +6,14 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ diff --git a/target/moxie/translate.c b/target/moxie/translate.c index 29da02bc05..68ca223e22 100644 --- a/target/moxie/translate.c +++ b/target/moxie/translate.c @@ -5,7 +5,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 of + * as published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but @@ -13,7 +13,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ From patchwork Wed Feb 6 15:28:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1037600 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vlkn1rG2z9sLw for ; Thu, 7 Feb 2019 02:30:23 +1100 (AEDT) Received: from localhost ([127.0.0.1]:52635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grP9X-0000tF-3Q for incoming@patchwork.ozlabs.org; Wed, 06 Feb 2019 10:30:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grP81-00009S-V2 for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grP80-0004PR-4U for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:45 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:46235) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grP7m-0004L6-73; Wed, 06 Feb 2019 10:28:34 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M597s-1gsV3H0ahA-001DZI; Wed, 06 Feb 2019 16:28:19 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2019 16:28:03 +0100 Message-Id: <20190206152807.31896-4-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190206152807.31896-1-laurent@vivier.eu> References: <20190206152807.31896-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:uW5v0R4LE0jQQp6k3QrcZUOwcZLwJKx33bMFRYBnx2o6IyzqUYE 8mpEJLe/1uJUUd/oRlujIMY1t9Pl39K1dANaWEoutyZoXlO3PbjERXy6DeC/6LT9A36MGsp +DfsWUX2iTprsmo/2sI17ISVNeJCfeTFbDxQD/RlUM44AMq62Lj3d6Pl96BWWlJOiULzrqO jKVPBZBwvP5h7KatFAMjw== X-UI-Out-Filterresults: notjunk:1; V03:K0:yZ1Jw8JO910=:brW/X1OVB/ciRR9cXAuZHd c28YCMiUa2Buuc6XAFPRqCMgSqWOrGh4w8uWNLvYtbqqVRJOkwLxoMbzmOSHY6dk9X3STDjyj Xy5rizZX4CTckNUAmYZN6lCTeK1VSMGyVVxLlX0xoAIiXwVDHYxLYXCAJIQnN56O+UhneVtob KCXbdWAWi5BZpL1jxkvgORdr4aI1XG24xOfG1+5uJWSCORxEDtmMy1noKNKBn/GwrzfiOhHqv F0Tlr0otYTfy7E/YhcY0FSHuax3L5hwo0HHNyKRS6Eifd4RCWNu6oK6IQP1dU5d7tTB6ZOIHi N+UiBmTfI6VGxnoJVQJKwspHvhIypB/dj1iagMiHMoKZNGETHjtDdARYI+Rr50sT7rScblxsy JTbxzZL9N4CMBYIL8PpTJ32x6/c0esjZmvGex7GoVkZQvPkd5ShM/cOg66TMHJHs1McQxz2r0 wk/3nNe5tUCErvF5ZVp+xzz36glaxl4Ksw0ljsPRd0NzBXLmUNF5wbpTmccaYMVGKrh6T6L0d LtJU8bKgGs2FBJfFvgfwcndWao9LyK1FTy+trso0PmEoRla6S3fOH8Odxp5RDAy2zpXyLZCaN qWapl5b63qYcYY74StuEpK1jMhMKNaF7HVz8ZdCoaVpncLp/R2D+uG1C6M8JE44vKjAEE7b2o aLvbhlwOJMeH0dw9P5PT4OrhQ2JZc/yaLmwYYz8DnDKmtKwICt7zv3Q4VgwZGf50wD/gji5vL /GbucCjDAmYtLAbtRV+PqXl2XFsx5hPYfNQDESitGnCy81t56VegNAT/5Sc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PULL 3/7] configure: Avoid non-portable 'test -o/-a' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , qemu-trivial@nongnu.org, Mark Cave-Ayland , Anthony Green , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-arm@nongnu.org, Guan Xuetao , Artyom Tarasenko Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Eric Blake POSIX says that it is better to use &&/|| and two separate test invocations than it is to try and use -a and -o (in fact, there are some tests that are inherently ambiguous to parse if the user passes in corner-case input like "("). Since we cannot guarantee which shell runs configure, we cannot rely on -o/-a always following bash's parser rules. Signed-off-by: Eric Blake Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20190205023937.18245-1-eblake@redhat.com> Signed-off-by: Laurent Vivier --- configure | 63 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 3d89870d99..61bc70708e 100755 --- a/configure +++ b/configure @@ -1834,8 +1834,8 @@ fi # Consult white-list to determine whether to enable werror # by default. Only enable by default for git builds if test -z "$werror" ; then - if test -d "$source_path/.git" -a \ - \( "$linux" = "yes" -o "$mingw32" = "yes" \) ; then + if test -d "$source_path/.git" && \ + { test "$linux" = "yes" || test "$mingw32" = "yes"; }; then werror="yes" else werror="no" @@ -2940,7 +2940,7 @@ EOF sdl=yes # static link with sdl ? (note: sdl.pc's --static --libs is broken) - if test "$sdl" = "yes" -a "$static" = "yes" ; then + if test "$sdl" = "yes" && test "$static" = "yes" ; then if test $? = 0 && echo $sdl_libs | grep -- -laa > /dev/null; then sdl_libs="$sdl_libs $(aalib-config --static-libs 2>/dev/null)" sdl_cflags="$sdl_cflags $(aalib-config --cflags 2>/dev/null)" @@ -3082,7 +3082,7 @@ fi ########################################## # VNC SASL detection -if test "$vnc" = "yes" -a "$vnc_sasl" != "no" ; then +if test "$vnc" = "yes" && test "$vnc_sasl" != "no" ; then cat > $TMPC < #include @@ -3105,7 +3105,7 @@ fi ########################################## # VNC JPEG detection -if test "$vnc" = "yes" -a "$vnc_jpeg" != "no" ; then +if test "$vnc" = "yes" && test "$vnc_jpeg" != "no" ; then cat > $TMPC < #include @@ -3127,7 +3127,7 @@ fi ########################################## # VNC PNG detection -if test "$vnc" = "yes" -a "$vnc_png" != "no" ; then +if test "$vnc" = "yes" && test "$vnc_png" != "no" ; then cat > $TMPC < #include @@ -3491,7 +3491,7 @@ fi # This workaround is required due to a bug in pkg-config file for glib as it # doesn't define GLIB_STATIC_COMPILATION for pkg-config --static -if test "$static" = yes -a "$mingw32" = yes; then +if test "$static" = yes && test "$mingw32" = yes; then QEMU_CFLAGS="-DGLIB_STATIC_COMPILATION $QEMU_CFLAGS" fi @@ -3584,7 +3584,7 @@ fi ########################################## # pixman support probe -if test "$want_tools" = "no" -a "$softmmu" = "no"; then +if test "$want_tools" = "no" && test "$softmmu" = "no"; then pixman_cflags= pixman_libs= elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then @@ -3699,7 +3699,7 @@ else done fi -if test "$mingw32" != yes -a "$pthread" = no; then +if test "$mingw32" != yes && test "$pthread" = no; then error_exit "pthread check failed" \ "Make sure to have the pthread libs and headers installed." fi @@ -3826,7 +3826,7 @@ fi ########################################## # TPM passthrough is only on x86 Linux -if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then +if test "$targetos" = Linux && { test "$cpu" = i386 || test "$cpu" = x86_64; }; then tpm_passthrough=$tpm else tpm_passthrough=no @@ -3992,7 +3992,7 @@ EOF fi fi -if test "$opengl" = "yes" -a "$have_x11" = "yes"; then +if test "$opengl" = "yes" && test "$have_x11" = "yes"; then for target in $target_list; do case $target in lm32-softmmu) # milkymist-tmu2 requires X11 and OpenGL @@ -4612,8 +4612,8 @@ elif compile_prog "" "$pthread_lib -lrt" ; then libs_qga="$libs_qga -lrt" fi -if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \ - "$haiku" != "yes" ; then +if test "$darwin" != "yes" && test "$mingw32" != "yes" && \ + test "$solaris" != yes && test "$haiku" != "yes" ; then libs_softmmu="-lutil $libs_softmmu" fi @@ -4688,7 +4688,8 @@ fi ########################################## # check if we have VSS SDK headers for win -if test "$mingw32" = "yes" -a "$guest_agent" != "no" -a "$vss_win32_sdk" != "no" ; then +if test "$mingw32" = "yes" && test "$guest_agent" != "no" && \ + test "$vss_win32_sdk" != "no" ; then case "$vss_win32_sdk" in "") vss_win32_include="-isystem $source_path" ;; *\ *) # The SDK is installed in "Program Files" by default, but we cannot @@ -4727,7 +4728,8 @@ fi # VSS provider from the source. It is usually unnecessary because the # pre-compiled .tlb file is included. -if test "$mingw32" = "yes" -a "$guest_agent" != "no" -a "$guest_agent_with_vss" = "yes" ; then +if test "$mingw32" = "yes" && test "$guest_agent" != "no" && \ + test "$guest_agent_with_vss" = "yes" ; then if test -z "$win_sdk"; then programfiles="$PROGRAMFILES" test -n "$PROGRAMW6432" && programfiles="$PROGRAMW6432" @@ -4743,7 +4745,7 @@ fi ########################################## # check if mingw environment provides a recent ntddscsi.h -if test "$mingw32" = "yes" -a "$guest_agent" != "no"; then +if test "$mingw32" = "yes" && test "$guest_agent" != "no"; then cat > $TMPC << EOF #include #include @@ -4790,7 +4792,7 @@ case "$capstone" in "" | yes) if $pkg_config capstone; then capstone=system - elif test -e "${source_path}/.git" -a $git_update = 'yes' ; then + elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then capstone=git elif test -e "${source_path}/capstone/Makefile" ; then capstone=internal @@ -5162,7 +5164,7 @@ fi # There is no point enabling this if cpuid.h is not usable, # since we won't be able to select the new routines. -if test "$cpuid_h" = "yes" -a "$avx2_opt" != "no"; then +if test "$cpuid_h" = "yes" && test "$avx2_opt" != "no"; then cat > $TMPC << EOF #pragma GCC push_options #pragma GCC target("avx2") @@ -5220,7 +5222,7 @@ EOF fi cmpxchg128=no -if test "$int128" = yes -a "$atomic128" = no; then +if test "$int128" = yes && test "$atomic128" = no; then cat > $TMPC << EOF int main(void) { @@ -5893,9 +5895,9 @@ fi # Mac OS X ships with a broken assembler roms= -if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \ - "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \ - "$softmmu" = yes ; then +if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ + test "$targetos" != "Darwin" && test "$targetos" != "SunOS" && \ + test "$softmmu" = yes ; then # Different host OS linkers have different ideas about the name of the ELF # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the _fbsd # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386pe. @@ -5907,7 +5909,7 @@ if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \ fi done fi -if test "$cpu" = "ppc64" -a "$targetos" != "Darwin" ; then +if test "$cpu" = "ppc64" && test "$targetos" != "Darwin" ; then roms="$roms spapr-rtas" fi @@ -6373,7 +6375,7 @@ if test "$modules" = "yes"; then echo "CONFIG_STAMP=_$( (echo $qemu_version; echo $pkgversion; cat $0) | $shacmd - | cut -f1 -d\ )" >> $config_host_mak echo "CONFIG_MODULES=y" >> $config_host_mak fi -if test "$have_x11" = "yes" -a "$need_x11" = "yes"; then +if test "$have_x11" = "yes" && test "$need_x11" = "yes"; then echo "CONFIG_X11=y" >> $config_host_mak echo "X11_CFLAGS=$x11_cflags" >> $config_host_mak echo "X11_LIBS=$x11_libs" >> $config_host_mak @@ -6568,7 +6570,7 @@ fi if test "$vhost_scsi" = "yes" ; then echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak fi -if test "$vhost_net" = "yes" -a "$vhost_user" = "yes"; then +if test "$vhost_net" = "yes" && test "$vhost_user" = "yes"; then echo "CONFIG_VHOST_NET_USED=y" >> $config_host_mak fi if test "$vhost_crypto" = "yes" ; then @@ -6963,11 +6965,11 @@ elif test "$ARCH" = "sparc64" ; then QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/sparc $QEMU_INCLUDES" elif test "$ARCH" = "s390x" ; then QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/s390 $QEMU_INCLUDES" -elif test "$ARCH" = "x86_64" -o "$ARCH" = "x32" ; then +elif test "$ARCH" = "x86_64" || test "$ARCH" = "x32" ; then QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES" elif test "$ARCH" = "ppc64" ; then QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/ppc $QEMU_INCLUDES" -elif test "$ARCH" = "riscv32" -o "$ARCH" = "riscv64" ; then +elif test "$ARCH" = "riscv32" || test "$ARCH" = "riscv64" ; then QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/riscv $QEMU_INCLUDES" else QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES" @@ -7384,7 +7386,7 @@ if test ! -z "$gdb_xml_files" ; then echo "TARGET_XML_FILES=$list" >> $config_target_mak fi -if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then +if test "$target_user_only" = "yes" && test "$bflt" = "yes"; then echo "TARGET_HAS_BFLT=y" >> $config_target_mak fi if test "$target_bsd_user" = "yes" ; then @@ -7506,7 +7508,7 @@ if test "$gprof" = "yes" ; then fi fi -if test "$target_linux_user" = "yes" -o "$target_bsd_user" = "yes" ; then +if test "$target_linux_user" = "yes" || test "$target_bsd_user" = "yes" ; then ldflags="$ldflags $textseg_ldflags" fi @@ -7518,7 +7520,8 @@ fi # - we build the system emulation for s390x (qemu-system-s390x) # - KVM is enabled # - the linker supports --s390-pgste -if test "$TARGET_ARCH" = "s390x" -a "$target_softmmu" = "yes" -a "$ARCH" = "s390x" -a "$kvm" = "yes"; then +if test "$TARGET_ARCH" = "s390x" && test "$target_softmmu" = "yes" && \ + test "$ARCH" = "s390x" && test "$kvm" = "yes"; then if ld_has --s390-pgste ; then ldflags="-Wl,--s390-pgste $ldflags" fi From patchwork Wed Feb 6 15:28:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1037605 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vlqL2NQXz9s7T for ; Thu, 7 Feb 2019 02:34:22 +1100 (AEDT) Received: from localhost ([127.0.0.1]:52699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grPDQ-0003kn-86 for incoming@patchwork.ozlabs.org; Wed, 06 Feb 2019 10:34:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grP8A-0000Ii-S4 for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grP88-0004Wo-Or for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:54 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:36805) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grP7y-0004LY-83; Wed, 06 Feb 2019 10:28:43 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MCbMx-1gztaB3u5b-009hc7; Wed, 06 Feb 2019 16:28:21 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2019 16:28:04 +0100 Message-Id: <20190206152807.31896-5-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190206152807.31896-1-laurent@vivier.eu> References: <20190206152807.31896-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:bKdTrc9mrqwbl4GZgE3NVIEcluiPnApM95YC1fDj/QTrRmobN3V dG/u2K7a8HyTQSrJ7i7/2XFSkjyptgLIABjl+mop/XjG8gToRxQ1od0o1YVRB9B7codCT2s jidWk50pWxiR6DDFjiLGSwncbdu1dH9/lNuwjSYCARDKByUR83mTILmyXrR949YIBoshGCU 1ReVSvdCaliIIhG/71dSQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:yb+Fau6AAYc=:4+LU9Pxf1yPfBVZp8wygvM ZUeH/yZJOPT52Wfe0YeCj8rv7ZF6PN6DggaeshwXc5fki++BJwakvE6g587D5GvpmEPp4MAzg jj9VWNTF+ACSWjLYI/h86NR0DuoEBvFLEHSGa4tzgU0ZtDupXECqCX5MbDJPymU+hdIRps2Rd KaHiSrRCWwZ2Keswf9yiGW7AApiHDgrWxZWAYEiXYVq0jlN509H1urKfnWcMMLQsPL6GDAI+c 9z+AXVudbx4IrB6a2DdciOY8zFOVkj5uLNqMPycpeDMYwCz0mAC3Zpx2+x1I9cq+Dr+sD3cjZ gtkck+YEe/au6bOT2h3LNysmXnTsYa1P5n0Zuxomd831uChrOqEIWJ8YCR4m4nwsjQyWfJhVz RkyJ87J+D1ZEGRe4+jHtvfU0eUp+Oq1HK/tE7NBOZE65+QBXmO0ByTrKgwWb6u2KmqEA9MDAo nxgKDfjP6sm6roJL8IMo78cY7gmqOZx8lb9mUztGb/s50XxvzGwnLi7t4tq7TxVEnEbgMZXtH dnrwOt7vDeKfk7qV187bAMEFaZpNRHdd7tyQBIhq3fRGdAu+82i10K75VXrH6VAlfzu+zfpWn ZnOGKSRQcaXNQWFmhod9wyy80bb+E4/hkVt18PQbOo80OKzmKNvJ9j/K/eLetqorrmJUAVp8w VUFEf8h1a5VfMiA55W91z0UTS0u1kkP7D7vNSv4KEvKaO0pgd444OUDKRVGMQmynm5Py9T4BT sJua+27b6Quy1ObLl2VtbCX3DnsCNlUrzEJzMnjHfN2f64/LLzjy6sJMijQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 4/7] hw/sparc64/sun4u: Drop useless inclusion of "hw/i386/pc.h" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , qemu-trivial@nongnu.org, Mark Cave-Ayland , Anthony Green , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Guan Xuetao , Artyom Tarasenko Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé In 47973a2dbf we split the last generic chipset out of the PC board, but forgot to remove the include of "hw/i386/pc.h". Since it is now unused, remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Mark Cave-Ayland Message-Id: <20190204210433.26088-2-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/sparc64/sun4u.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index f76b19e4e9..fdf3f14a29 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -33,7 +33,6 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "hw/pci-host/sabre.h" -#include "hw/i386/pc.h" #include "hw/char/serial.h" #include "hw/char/parallel.h" #include "hw/timer/m48t59.h" From patchwork Wed Feb 6 15:28:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1037602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vlmn23HRz9s7T for ; Thu, 7 Feb 2019 02:32:09 +1100 (AEDT) Received: from localhost ([127.0.0.1]:52679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grPBH-0002Eq-3I for incoming@patchwork.ozlabs.org; Wed, 06 Feb 2019 10:32:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grP80-00007E-5T for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grP7y-0004Ol-3X for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:43 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:40983) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grP7w-0004M1-6H; Wed, 06 Feb 2019 10:28:42 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MZkxj-1geuHZ1lyx-00Wknr; Wed, 06 Feb 2019 16:28:22 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2019 16:28:05 +0100 Message-Id: <20190206152807.31896-6-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190206152807.31896-1-laurent@vivier.eu> References: <20190206152807.31896-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:I/l1wIG9RgiSe/mg3CqvszPKZgpos3TLowNggKqzG/ZxR/4yIix tCE8cOy04FcHkmI+grDa0F7dgWZayGkwKExnS9E4Th2J/crbGXXacXFOW3SWzM/ZrLkvToL 4noTWFwPvRJCmbpYs2K3ZDiBIaPFiVKBd7P3Z16fqUkmQEYEbpI83bM0PNYg1Nr4HDGcD9h 2qt8gH0yTOR2Q89K8UdkQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:+ExGxIGhJE0=:OqSyYalCLaI0QciLXQOSHE auo7UiJVqAnIccrKjrhsPCCuMPSrKPUdB8mA2oTGj4kFrM3BTouDxPtRIXu0X36NOyAMpDv1h /zZHr/hcuYfpBNil9ohYoCCfjCg+tXxMe+oErtoolD5w68rn5XQz35Jb+cA0GPv7GHriw6VvW eHococZHF6ijKsZfHdLyz05ZziHojHUBZg41ShEY/AvoURbZvSDB8fMZRBv7TDFASED3UKvBD tD2JljqdVAE3MqP6epIGmh2ycGFSVFg9oYdT3BaOCmtJchIUopL8dULeCdOyaKlC76VIsS5iL D9DvWo4rXyjBmqUGAFCHRi9kC5lH57ZlsZua0g/QImy5Rr8DMmbS6sc0D5A+jxuPBZRS9L0KY rgSIl9lylnZmDBvCAaZGb5Zp3GVHC03t0qQs9OVwmxXJnasLPjJVKn51AIUUcIs/puML9TJ1+ xYt/GCQJrJUN5XEy1jzDU7A54zx3sEdmbzCOWYYDawh0p1l0dUlQKFIRZVkhSgYoYZoPKUCKE n3YEHwgoth+w1NcEWcAjkS1h/TxZioEySRGJr8lYvyi7Rj71R11UtMLHO5pIKF2/CSLEqu2nJ 6szJwsMJdr5ojeDkpEIs/Vl2H58KbzoE3NEkcoB2Oys6B32c50xWj5n9H4m4Bpj9OC6swqeIj 4UkfQw57WiLzR+2hdThEI0EnrB49/x8me7jZivoRKb4uVfZvc6ZNfLaUMnkqB+KgBFDXunUJb Z8U8CWEZgu5OQbDGMfmRqfe5FBfc5ah0fLCdEzTNlVfLNw/Qf/4ZooutMHY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 5/7] hw/unicore32/puv3: Drop useless inclusion of "hw/i386/pc.h" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , qemu-trivial@nongnu.org, Mark Cave-Ayland , Anthony Green , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Guan Xuetao , Artyom Tarasenko Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé In 47973a2dbf we split the last generic chipset out of the PC board, but forgot to remove the include of "hw/i386/pc.h". Since it is now unused, remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20190204210433.26088-3-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/unicore32/puv3.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index 830fe3face..b42e600f74 100644 --- a/hw/unicore32/puv3.c +++ b/hw/unicore32/puv3.c @@ -15,7 +15,6 @@ #include "ui/console.h" #include "hw/boards.h" #include "hw/loader.h" -#include "hw/i386/pc.h" #include "sysemu/qtest.h" #undef DEBUG_PUV3 From patchwork Wed Feb 6 15:28:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1037603 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vlpm1Yw5z9s7T for ; Thu, 7 Feb 2019 02:33:52 +1100 (AEDT) Received: from localhost ([127.0.0.1]:52689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grPCw-0003LZ-3h for incoming@patchwork.ozlabs.org; Wed, 06 Feb 2019 10:33:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grP84-0000CK-2v for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grP81-0004Qj-Rz for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:47 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:39701) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grP7w-0004Mn-5i; Wed, 06 Feb 2019 10:28:42 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MGQaz-1guuhR0FnZ-00GroH; Wed, 06 Feb 2019 16:28:24 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2019 16:28:06 +0100 Message-Id: <20190206152807.31896-7-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190206152807.31896-1-laurent@vivier.eu> References: <20190206152807.31896-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:iH7TvnHM38z1/6cxlo1cF6tH0prcGWKywSJfD6wk1p6glvnKHGo +f41ev8cv64xgJLwtLFO3TLWh4Wf9XJnFZJV2JsUPwnAgO7e/FXcB1U5sH8JuMnQ6OqR6Vx 4BBAxGLBeEQ26ZG5ly50DvbdQP0hu9ukvJx4PJMBiEAOhp23Kz4z2tE7bSuVzETs8s13WZO E9Nu7k3xIawLVYOLvfQyA== X-UI-Out-Filterresults: notjunk:1; V03:K0:wS66bhI8fKI=:hpycvEs1pT+hfG2C6EnRXG YuXez5QyOm8WVGa8+ub9Kv17A0SQJbeMqkzgvqKkq9ICSdN47t5HweOr+YtJl8vzw6R7EJ/P+ qyd91ZBlbcZMqUE/tI1ytk2ib9GWCQUiPNLnDGN41GximCxwANRIlab59aUSWNRzqx9D3powh WNmDqr9G2A2QFfhpilU4D8gd6mNxKvuC24hmJRvKdNsq7QWG4/wtZ2jwigb6e+F8zQWrtz3Li MdeXISdJerTqYxcpSH82wFro3EMMbnE3i5hvLjegz2wQJFS1P8s9q1mQD9NQTcM58W4R3/iIY j0oMcn3fa/LJSizR6QFJxYztbpHjdpm6JGB3hBXwqXeQa6X76AMxTKkIUTkRPZCjUHGbBTZ3V FfAw3nnIs+MA66pqps0OOKN4ppOWMJtA1jUYK7FBxgjQ3EFXxpeM8tOnwEqAgAWYPfphQnA8L oGwTE9gAg0ZqszaLSfZX3tp0PZidBNDEYXIbLdCjIXcZPLiYyKFWQBt8GGUW8qEQF4cjs7j4S EE6xEmqrikwqM3hqHMM/YnIR62TbgIlSBuWxnJfhyHOTV2DH5CFhNfbTririLFL50hxrBxlaA Q0zhrRnERz8h7UA8Dc9P70Sd0bW4hVdMhUYMyAjW+Tvb13i568T1CbEPh1MhPxV1ehbBhovrW ivqMLqi36RxhQpHT5TxTHqe3PCw75k4coo6s0OTURLyhMEUBYTo+ALQ9cZ3KeLKl8mB5DwMI8 Kc6ntktSLKZsF2a06X2z2+cwEaa0VqHn2VTm3tchOCe3b4CNtPvzxx44VwE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 6/7] hw/cpu/cluster: Mark the cpu-cluster device with user_creatable = false X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , qemu-trivial@nongnu.org, Mark Cave-Ayland , Anthony Green , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Alistair Francis , Luc Michel , Guan Xuetao , Artyom Tarasenko Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The device can not be instantiated by the user and QEMU currently aborts when you try to use it: $ x86_64-softmmu/qemu-system-x86_64 -device cpu-cluster qemu-system-x86_64: hw/cpu/cluster.c:73: cpu_cluster_realize: Assertion `cbdata.cpu_count > 0' failed. Aborted (core dumped) Since this is an internal device only, mark it with user_creatable = false. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Luc Michel Reviewed-by: Alistair Francis Message-Id: <1549371525-29899-1-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- hw/cpu/cluster.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c index 25f90702b1..6f5f037b3c 100644 --- a/hw/cpu/cluster.c +++ b/hw/cpu/cluster.c @@ -79,6 +79,9 @@ static void cpu_cluster_class_init(ObjectClass *klass, void *data) dc->props = cpu_cluster_properties; dc->realize = cpu_cluster_realize; + + /* This is not directly for users, CPU children must be attached by code */ + dc->user_creatable = false; } static const TypeInfo cpu_cluster_type_info = { From patchwork Wed Feb 6 15:28:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1037604 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vlq961qTz9s7T for ; Thu, 7 Feb 2019 02:34:13 +1100 (AEDT) Received: from localhost ([127.0.0.1]:52697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grPDH-0003eD-Qo for incoming@patchwork.ozlabs.org; Wed, 06 Feb 2019 10:34:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grP87-0000Dx-Le for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grP84-0004SP-0a for qemu-devel@nongnu.org; Wed, 06 Feb 2019 10:28:49 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:54505) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grP7y-0004MF-7T; Wed, 06 Feb 2019 10:28:43 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mdvyo-1hR0rH2Ah4-00b6Hi; Wed, 06 Feb 2019 16:28:25 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2019 16:28:07 +0100 Message-Id: <20190206152807.31896-8-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190206152807.31896-1-laurent@vivier.eu> References: <20190206152807.31896-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:phOavywWNVsBXnFLU/hFHxIScoTktw3Qh/cVYO372smu4BBlmfV XUNo2yZVTe/BsPKV/y/aH3A1JX7WQsx93NvEXfuTAokUN9QkxOjXSMiHwTivcYWdExj9NNL QhLIH23R1KLOyamY7xPolasgu52p2sSMZli94sXl6a2e3giG6pxSGx+GOoy2zkfXF6L/HIA oMKqUfAGcp9J5XK+7WS4g== X-UI-Out-Filterresults: notjunk:1; V03:K0:sdjldisaT/0=:X/4oGKqGeTTdlov8fhN/Ke IQoqbwXHMiJ6v1ywy/NiLpo7nc9u3+DF730xIpzqcMgWQMAfn2GGpcW96t/c5UHbSMcK+8R/i omziyUBz7sCmpGnjOnOIEeMW7Xtx3uZBlP4zzlhxq0QBfFFMRI0I1T5ua97bNThgR8h4O+wMY SKB/8WQyqkyflj5/B25SUt/1NVSRuKD1CoA3ioL6m8tL33hnajgTtvA/mys1UdUb2CCZ/GZLD u1OqevcVVcSbloRxh7nYX/3a8+zTT3fBiDe1dhxtA3FhNFhA8gE4VaeAtIwQGrNxuDI4XH69M LqVyawOZZy522PClRruNp7JF8Hf+69WpcUNIgdieDdNmaHVi/YuzZeaR/kwTiLmpkF5eNNh81 W7tclnk0kySxybCXxK29zQTLuyWaV6BNgPy6z2Pt5Nz+2vzCpLCjU4IFgjBeOmcmJ2nS3v6BD tzNC+Ph8DHifE/A55TYFuOneYBNmjoDrBOpC86q/wel5OMfzP9qmG7y9gB9RfQVt1gu7kmC65 vWmwMmQIey4W0PxgyKzWAkyTeW5An4bs9ri7gKXQSBjw1DqUY9UL4Rw3a0hNzJWvUc/SmFTbw nlOBKXrUuQSwr0H+yWtR5qhj0Lyvt2RVVmDEVDpzkIMyimyRMhucwQSPZNjSiFBMTMHUeBonQ 8K3gsFc8ACZqTPhK1lFbxM28uLnxOJWZllnYkhL9zKj1jV9g5qd+DH5zWPcU6YBhN+wwlE0DM 9sJwB9o+sFQZopacDLDAhmj6OXrvfRHnEVr3e4ellcRCBAxAyJQmSvYPYj4= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 7/7] hw/input/tsc210x: Fix building with no verbosity X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , qemu-trivial@nongnu.org, Mark Cave-Ayland , Anthony Green , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Guan Xuetao , Artyom Tarasenko , Stefano Garzarella Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé When building with TSC_VERBOSE not defined, we get: CC arm-softmmu/hw/input/tsc210x.o hw/input/tsc210x.c: In function ‘tsc2102_data_register_write’: hw/input/tsc210x.c:554:5: error: label at end of compound statement default: ^~~~~~~ hw/input/tsc210x.c: In function ‘tsc2102_control_register_write’: hw/input/tsc210x.c:638:5: error: label at end of compound statement bad_reg: ^~~~~~~ hw/input/tsc210x.c: In function ‘tsc2102_audio_register_write’: hw/input/tsc210x.c:766:5: error: label at end of compound statement default: ^~~~~~~ make[1]: *** [rules.mak:69: hw/input/tsc210x.o] Error 1 Fix this by replacing the culprit fprintf(stderr) calls by a more recent API: qemu_log_mask(LOG_GUEST_ERROR). Other fprintf() calls are left untouched. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Stefano Garzarella Message-Id: <20190204204517.23698-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/input/tsc210x.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c index ded0db9351..2eb3cb9518 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -552,10 +552,8 @@ static void tsc2102_data_register_write( return; default: -#ifdef TSC_VERBOSE - fprintf(stderr, "tsc2102_data_register_write: " - "no such register: 0x%02x\n", reg); -#endif + qemu_log_mask(LOG_GUEST_ERROR, "tsc2102_data_register_write: " + "no such register: 0x%02x\n", reg); } } @@ -636,10 +634,8 @@ static void tsc2102_control_register_write( default: bad_reg: -#ifdef TSC_VERBOSE - fprintf(stderr, "tsc2102_control_register_write: " - "no such register: 0x%02x\n", reg); -#endif + qemu_log_mask(LOG_GUEST_ERROR, "tsc2102_control_register_write: " + "no such register: 0x%02x\n", reg); } } @@ -764,10 +760,8 @@ static void tsc2102_audio_register_write( return; default: -#ifdef TSC_VERBOSE - fprintf(stderr, "tsc2102_audio_register_write: " - "no such register: 0x%02x\n", reg); -#endif + qemu_log_mask(LOG_GUEST_ERROR, "tsc2102_audio_register_write: " + "no such register: 0x%02x\n", reg); } }