From patchwork Mon Feb 3 12:38:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11362589 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2898017E0 for ; Mon, 3 Feb 2020 12:41:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F418C2082E for ; Mon, 3 Feb 2020 12:41:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="iZ2T02JM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F418C2082E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyb2G-0000UI-6O for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Feb 2020 07:41:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56400) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyazh-0004Af-DL for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyazg-0005tR-6d for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:25 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46617 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iyazg-0005tG-2j for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580733503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JBL9YxUk9otLkAzIzzLN7sC1OctGE8a3LO68IHZ9IY8=; b=iZ2T02JMVAvGQLBMednB3k8qyM9QNwwMWM+s1rd57x9qDahgE7gSwIfFOk3AJHR8VjjU9r KJuxrNOGyNbUWv7UXjvoYEPhI1KTtnnagHWzpcdAiipikqtPCiK6FnaoSiqfAJQxUucUma PEHeN/U2JYzin/GIcvPSoPePaB1rNiI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-18-JBz9lyIfNWm7GlCUmGKF1g-1; Mon, 03 Feb 2020 07:38:21 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B256C1800D41; Mon, 3 Feb 2020 12:38:20 +0000 (UTC) Received: from thuth.com (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id BEC0E61070; Mon, 3 Feb 2020 12:38:19 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 03/13] docs/devel: Fix qtest paths and info about check-block in testing.rst Date: Mon, 3 Feb 2020 13:38:01 +0100 Message-Id: <20200203123811.8651-4-thuth@redhat.com> In-Reply-To: <20200203123811.8651-1-thuth@redhat.com> References: <20200203123811.8651-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: JBz9lyIfNWm7GlCUmGKF1g-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The qtests have recently been moved to a separate subdirectory, so the paths that are mentioned in the documentation have to be adjusted accordingly. And some of the iotests are now always run as part of "make check", so this information has to be adjusted here, too. Message-Id: <20200122134511.23806-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- docs/devel/testing.rst | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index ab5be0c729..770a987ea4 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -16,8 +16,8 @@ The usual way to run these tests is: make check -which includes QAPI schema tests, unit tests, and QTests. Different sub-types -of "make check" tests will be explained below. +which includes QAPI schema tests, unit tests, QTests and some iotests. +Different sub-types of "make check" tests will be explained below. Before running tests, it is best to build QEMU programs first. Some tests expect the executables to exist and will fail with obscure messages if they @@ -79,8 +79,8 @@ QTest cases can be executed with make check-qtest -The QTest library is implemented by ``tests/libqtest.c`` and the API is defined -in ``tests/libqtest.h``. +The QTest library is implemented by ``tests/qtest/libqtest.c`` and the API is +defined in ``tests/qtest/libqtest.h``. Consider adding a new QTest case when you are introducing a new virtual hardware, or extending one if you are adding functionalities to an existing @@ -94,20 +94,20 @@ libqos instead of directly calling into libqtest. Steps to add a new QTest case are: 1. Create a new source file for the test. (More than one file can be added as - necessary.) For example, ``tests/test-foo-device.c``. + necessary.) For example, ``tests/qtest/foo-test.c``. 2. Write the test code with the glib and libqtest/libqos API. See also existing tests and the library headers for reference. -3. Register the new test in ``tests/Makefile.include``. Add the test executable - name to an appropriate ``check-qtest-*-y`` variable. For example: +3. Register the new test in ``tests/qtest/Makefile.include``. Add the test + executable name to an appropriate ``check-qtest-*-y`` variable. For example: - ``check-qtest-generic-y = tests/test-foo-device$(EXESUF)`` + ``check-qtest-generic-y = tests/qtest/foo-test$(EXESUF)`` 4. Add object dependencies of the executable in the Makefile, including the test source file(s) and other interesting objects. For example: - ``tests/test-foo-device$(EXESUF): tests/test-foo-device.o $(libqos-obj-y)`` + ``tests/qtest/foo-test$(EXESUF): tests/qtest/foo-test.o $(libqos-obj-y)`` Debugging a QTest failure is slightly harder than the unit test because the tests look up QEMU program names in the environment variables, such as @@ -152,8 +152,9 @@ parser (either fixing a bug or extending/modifying the syntax). To do this: check-block ----------- -``make check-block`` is a legacy command to invoke block layer iotests and is -rarely used. See "QEMU iotests" section below for more information. +``make check-block`` runs a subset of the block layer iotests (the tests that +are in the "auto" group in ``tests/qemu-iotests/group``). +See the "QEMU iotests" section below for more information. GCC gcov support ---------------- From patchwork Mon Feb 3 12:38:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11362593 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EFDB117E0 for ; Mon, 3 Feb 2020 12:42:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C47EE2086A for ; Mon, 3 Feb 2020 12:42:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gjpHx7RJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C47EE2086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyb3d-0003AF-WB for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Feb 2020 07:42:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56430) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyazj-0004B0-U4 for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyazi-0005uV-33 for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:27 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:59265 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iyazh-0005uA-Vx for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580733505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jIemPolUT38Is5SWfiN804eHYytqt4bZltyZqQFpz30=; b=gjpHx7RJcNuHTRL+Oe3ENzAiBfs4Ajp3qXF5WYTXo0rIhVl7cnsRDmgTdPd4mlgYqi0FF2 9yVD1zVQIzjrj8AH1E3Oh0vEmKO0WBvacLtvWPMkv3Uedqqfgs1R53p3vbhoqDxXvQKlOv i9yd3cNQGLNfZFuk8M6WIwg/9RzizL0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-257-wJl7HVPKNaegpp5YFVfJBw-1; Mon, 03 Feb 2020 07:38:23 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E248107ACC4; Mon, 3 Feb 2020 12:38:22 +0000 (UTC) Received: from thuth.com (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1AEA2196B1; Mon, 3 Feb 2020 12:38:20 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 04/13] tests/Makefile: Fix inclusion of the qos dependency files Date: Mon, 3 Feb 2020 13:38:02 +0100 Message-Id: <20200203123811.8651-5-thuth@redhat.com> In-Reply-To: <20200203123811.8651-1-thuth@redhat.com> References: <20200203123811.8651-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: wJl7HVPKNaegpp5YFVfJBw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The qos dependency files can be found under tests/qtest/libqos and not under tests/qtest/qos. Fixes: 1cf4323ecd0 ("Move the libqos files under tests/qtest/") Message-Id: <20200127140245.20065-1-thuth@redhat.com> Reviewed-by: Laurent Vivier Signed-off-by: Thomas Huth --- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index fe63fec5f1..2f1cafed72 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -919,6 +919,6 @@ all: $(QEMU_IOTESTS_HELPERS-y) -include $(wildcard tests/*.d) -include $(wildcard tests/qtest/*.d) --include $(wildcard tests/qtest/qos/*.d) +-include $(wildcard tests/qtest/libqos/*.d) endif From patchwork Mon Feb 3 12:38:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11362595 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ECC1192A for ; Mon, 3 Feb 2020 12:42:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C21AE20721 for ; Mon, 3 Feb 2020 12:42:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AZejhn1s" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C21AE20721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyb3d-00039l-U2 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Feb 2020 07:42:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56448) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyazm-0004Dr-44 for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyazl-0005vt-1l for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:30 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24920 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iyazk-0005vX-Ug for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580733508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aVKW4uyfDbLew3gzo21eLO4dRKn9CVLGg0EgUodmFGQ=; b=AZejhn1swNu0mvhXzfr8sb52X02/hw0ntUWDyKDCKBYQFCl/Kw5hGnCU6LlZvGYZ1Roj4s r/U6UgTtAh/AsW3CXeXWWHu0V89bnIxZ14Gh0rcqxS+4rZc4C1RqOluxLp9v8cz0GC1f8m 2rsw6euB48PK7l3CozDhnLAeiUkntMQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-422-_GuCSI8_Ote-iVyuvZCW4g-1; Mon, 03 Feb 2020 07:38:24 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 794CA100550E; Mon, 3 Feb 2020 12:38:23 +0000 (UTC) Received: from thuth.com (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BB32196B1; Mon, 3 Feb 2020 12:38:22 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 05/13] boot-order-test: fix memleaks in boot-order-test Date: Mon, 3 Feb 2020 13:38:03 +0100 Message-Id: <20200203123811.8651-6-thuth@redhat.com> In-Reply-To: <20200203123811.8651-1-thuth@redhat.com> References: <20200203123811.8651-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: _GuCSI8_Ote-iVyuvZCW4g-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pan Nengyuan Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Pan Nengyuan It's not a big deal, but 'check qtest-ppc/ppc64' runs fail if sanitizers is enabled. The memory leak stack is as follow: Direct leak of 128 byte(s) in 4 object(s) allocated from: #0 0x7f11756f5970 in __interceptor_calloc (/lib64/libasan.so.5+0xef970) #1 0x7f1174f2549d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5249d) #2 0x556af05aa7da in mm_fw_cfg_init /mnt/sdb/qemu/tests/libqos/fw_cfg.c:119 #3 0x556af059f4f5 in read_boot_order_pmac /mnt/sdb/qemu/tests/boot-order-test.c:137 #4 0x556af059efe2 in test_a_boot_order /mnt/sdb/qemu/tests/boot-order-test.c:47 #5 0x556af059f2c0 in test_boot_orders /mnt/sdb/qemu/tests/boot-order-test.c:59 #6 0x556af059f52d in test_pmac_oldworld_boot_order /mnt/sdb/qemu/tests/boot-order-test.c:152 #7 0x7f1174f46cb9 (/lib64/libglib-2.0.so.0+0x73cb9) #8 0x7f1174f46b73 (/lib64/libglib-2.0.so.0+0x73b73) #9 0x7f1174f46b73 (/lib64/libglib-2.0.so.0+0x73b73) #10 0x7f1174f46f71 in g_test_run_suite (/lib64/libglib-2.0.so.0+0x73f71) #11 0x7f1174f46f94 in g_test_run (/lib64/libglib-2.0.so.0+0x73f94) Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Message-Id: <20200203025935.36228-1-pannengyuan@huawei.com> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/qtest/boot-order-test.c | 6 +++--- tests/qtest/libqos/fw_cfg.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/qtest/boot-order-test.c b/tests/qtest/boot-order-test.c index a725bce729..4241304ff5 100644 --- a/tests/qtest/boot-order-test.c +++ b/tests/qtest/boot-order-test.c @@ -134,7 +134,7 @@ static void test_prep_boot_order(void) static uint64_t read_boot_order_pmac(QTestState *qts) { - QFWCFG *fw_cfg = mm_fw_cfg_init(qts, 0xf0000510); + g_autoptr(QFWCFG) fw_cfg = mm_fw_cfg_init(qts, 0xf0000510); return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE); } @@ -159,7 +159,7 @@ static void test_pmac_newworld_boot_order(void) static uint64_t read_boot_order_sun4m(QTestState *qts) { - QFWCFG *fw_cfg = mm_fw_cfg_init(qts, 0xd00000510ULL); + g_autoptr(QFWCFG) fw_cfg = mm_fw_cfg_init(qts, 0xd00000510ULL); return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE); } @@ -171,7 +171,7 @@ static void test_sun4m_boot_order(void) static uint64_t read_boot_order_sun4u(QTestState *qts) { - QFWCFG *fw_cfg = io_fw_cfg_init(qts, 0x510); + g_autoptr(QFWCFG) fw_cfg = io_fw_cfg_init(qts, 0x510); return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE); } diff --git a/tests/qtest/libqos/fw_cfg.h b/tests/qtest/libqos/fw_cfg.h index 13325cc4ff..c6a7cf8cf0 100644 --- a/tests/qtest/libqos/fw_cfg.h +++ b/tests/qtest/libqos/fw_cfg.h @@ -49,4 +49,6 @@ static inline void pc_fw_cfg_uninit(QFWCFG *fw_cfg) io_fw_cfg_uninit(fw_cfg); } +G_DEFINE_AUTOPTR_CLEANUP_FUNC(QFWCFG, mm_fw_cfg_uninit) + #endif From patchwork Mon Feb 3 12:38:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11362587 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 01FAE92A for ; Mon, 3 Feb 2020 12:41:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C82AD20721 for ; Mon, 3 Feb 2020 12:41:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZvIgMAcn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C82AD20721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39375 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyb2F-0000Tw-Su for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Feb 2020 07:41:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56445) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyazl-0004Db-RD for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyazk-0005vd-ON for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:29 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:30646 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iyazk-0005vM-Kv for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580733508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jvNIvJNOvgqKCmAOhgSNVoFRz83zRgIq0oQyVrP6NSA=; b=ZvIgMAcn3ZUkTsfZjU/M1VimL6BYJbfa/n4Su5U4vylmEQFiZucmTl5nayDx+/oJ9xkHK+ 4bCFfvFDbCYDA5oH+trQ9Y/r29wZRG/8++iNu9JUA+ljINui5vLfx8pCG8o0PAJ/KbfJ+8 mkp6z3JGr1bX5TIDhG+H08816iYv/6U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-16-LLtTCEODMpmxMqH5OmdkGw-1; Mon, 03 Feb 2020 07:38:25 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E47B913E6; Mon, 3 Feb 2020 12:38:24 +0000 (UTC) Received: from thuth.com (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id D63C461070; Mon, 3 Feb 2020 12:38:23 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 06/13] tests/qtest: update comments about bios-tables-test-allowed-diff.h Date: Mon, 3 Feb 2020 13:38:04 +0100 Message-Id: <20200203123811.8651-7-thuth@redhat.com> In-Reply-To: <20200203123811.8651-1-thuth@redhat.com> References: <20200203123811.8651-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: LLtTCEODMpmxMqH5OmdkGw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heyi Guo Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Heyi Guo Update comments in tests/qtest/bios-tables-test.c to reflect the current path of bios-tables-test-allowed-diff.h, which is now under tests/qtest/ as well. Signed-off-by: Heyi Guo Message-Id: <20200202110009.51479-1-guoheyi@huawei.com> Reviewed-by: Thomas Huth Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth --- tests/qtest/bios-tables-test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 3ab4872bd7..b4752c644c 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -14,14 +14,14 @@ * How to add or update the tests: * Contributor: * 1. add empty files for new tables, if any, under tests/data/acpi - * 2. list any changed files in tests/bios-tables-test-allowed-diff.h + * 2. list any changed files in tests/qtest/bios-tables-test-allowed-diff.h * 3. commit the above *before* making changes that affect the tables * * Contributor or ACPI Maintainer (steps 4-7 need to be redone to resolve conflicts * in binary commit created in step 6): * * After 1-3 above tests will pass but ignore differences with the expected files. - * You will also notice that tests/bios-tables-test-allowed-diff.h lists + * You will also notice that tests/qtest/bios-tables-test-allowed-diff.h lists * a bunch of files. This is your hint that you need to do the below: * 4. Run * make check V=1 @@ -40,14 +40,14 @@ * in commit log. * 7. Before sending patches to the list (Contributor) * or before doing a pull request (Maintainer), make sure - * tests/bios-tables-test-allowed-diff.h is empty - this will ensure + * tests/qtest/bios-tables-test-allowed-diff.h is empty - this will ensure * following changes to ACPI tables will be noticed. * * The resulting patchset/pull request then looks like this: - * - patch 1: list changed files in tests/bios-tables-test-allowed-diff.h. + * - patch 1: list changed files in tests/qtest/bios-tables-test-allowed-diff.h. * - patches 2 - n: real changes, may contain multiple patches. * - patch n + 1: update golden master binaries and empty - * tests/bios-tables-test-allowed-diff.h + * tests/qtest/bios-tables-test-allowed-diff.h */ #include "qemu/osdep.h" From patchwork Mon Feb 3 12:38:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11362591 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B781F92A for ; Mon, 3 Feb 2020 12:41:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8F5AA20721 for ; Mon, 3 Feb 2020 12:41:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Av2hLKe2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F5AA20721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyb2P-0000np-Pa for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Feb 2020 07:41:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56572) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyazq-0004PJ-U3 for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyazp-00060t-Ob for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:34 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:29422 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iyazp-00060l-K4 for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580733513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6BAfDRfyVrac8vqNlqJsxXbM7U3B9FzdnCCJs7abenY=; b=Av2hLKe2CMA5UgcTnoWPEXlKp7/h2QcUVYcn5fPi2DuxmFK+kw9tsCSeP1TueC96EQOJ2V c2Cijwdr3rsJ1cjChzCkpGnbv9kWWv6lYoDw0w0iXYejqK9ytHSoydH7qs7LYzYkgnjwTH 7oHmbzYmdr3XCBSJyr7OCVBFBKWnWPU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-423-W7J98HmMOX2dwbG-Sv8C8A-1; Mon, 03 Feb 2020 07:38:27 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 269F213E5; Mon, 3 Feb 2020 12:38:26 +0000 (UTC) Received: from thuth.com (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B8B6196B1; Mon, 3 Feb 2020 12:38:25 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 07/13] gitlab-ci: Refresh the list of iotests Date: Mon, 3 Feb 2020 13:38:05 +0100 Message-Id: <20200203123811.8651-8-thuth@redhat.com> In-Reply-To: <20200203123811.8651-1-thuth@redhat.com> References: <20200203123811.8651-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: W7J98HmMOX2dwbG-Sv8C8A-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" iotest 147 and 205 have recently been marked as "NBD-only", so they are currently simply skipped and thus can be removed. iotest 129 occasionally fails in the gitlab-CI, and according to Max, there are some known issues with this test (see for example this URL: https://lists.nongnu.org/archive/html/qemu-block/2019-06/msg00499.html ), so for the time being, let's disable it until the problems are fixed. The iotests 040, 127, 203 and 256 are scheduled to become part of "make check-block", so we also do not have to test them seperately here anymore. On the other side, new iotests have been added to the QEMU repository in the past months, so we can now add some new test > 256 instead. Message-Id: <20200121131936.8214-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 228783993e..c15e394f09 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,12 +54,12 @@ build-tcg-disabled: - make check-qapi-schema - cd tests/qemu-iotests/ - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 048 - 052 063 077 086 101 104 106 113 147 148 150 151 152 157 159 160 - 163 170 171 183 184 192 194 197 205 208 215 221 222 226 227 236 - - ./check -qcow2 028 040 051 056 057 058 065 067 068 082 085 091 095 096 102 - 122 124 127 129 132 139 142 144 145 147 151 152 155 157 165 194 - 196 197 200 202 203 205 208 209 215 216 218 222 227 234 246 247 - 248 250 254 255 256 + 052 063 077 086 101 104 106 113 148 150 151 152 157 159 160 163 + 170 171 183 184 192 194 197 208 215 221 222 226 227 236 253 277 + - ./check -qcow2 028 051 056 057 058 065 067 068 082 085 091 095 096 102 122 + 124 132 139 142 144 145 151 152 155 157 165 194 196 197 200 202 + 208 209 215 216 218 222 227 234 246 247 248 250 254 255 257 258 + 260 261 262 263 264 270 272 273 277 279 build-user: script: From patchwork Mon Feb 3 12:38:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11362599 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3A3F692A for ; Mon, 3 Feb 2020 12:43:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 10D9C20721 for ; Mon, 3 Feb 2020 12:43:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QQCP/RSI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10D9C20721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyb4q-00050m-6L for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Feb 2020 07:43:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56514) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyazn-0004Hr-So for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyazm-0005yB-W2 for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:31 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:36298 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iyazm-0005xZ-S0 for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580733510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=np1mN3DW35IWZEkuFyN8DHqAYmknUGCbOR5Hn3+rgZk=; b=QQCP/RSIrqfwGczPm427xB8If9QuBWRDgIIlaDFDLE0TqG4a3uPfU1uW+0/qd/AP7Rfd24 j16kv4w8a8NHone5nRIwrP4fe4unxnSMgfSFtjthFOkCzxKxFhFE402SZL78x8jZTPgQsS zymVfA3p3bQtaQ3jCO96XLdvqRxjCnc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-391-oQxDr_sLPF-AK36bKV--5w-1; Mon, 03 Feb 2020 07:38:28 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 53C66800D41; Mon, 3 Feb 2020 12:38:27 +0000 (UTC) Received: from thuth.com (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8424261070; Mon, 3 Feb 2020 12:38:26 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 08/13] hw/bt: Remove empty Kconfig file Date: Mon, 3 Feb 2020 13:38:06 +0100 Message-Id: <20200203123811.8651-9-thuth@redhat.com> In-Reply-To: <20200203123811.8651-1-thuth@redhat.com> References: <20200203123811.8651-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: oQxDr_sLPF-AK36bKV--5w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" While removing the bluetooth code some weeks ago, I had to leave the hw/bt/Kconfig file around. Otherwise some of the builds would have been broken since the generated dependency files tried to include it before they were rebuilt. Meanwhile, all those dependency files should have been updated, so we can remove the empty Kconfig file now, too. Message-Id: <20200123064525.6935-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- hw/bt/Kconfig | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 hw/bt/Kconfig diff --git a/hw/bt/Kconfig b/hw/bt/Kconfig deleted file mode 100644 index e69de29bb2..0000000000 From patchwork Mon Feb 3 12:38:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11362585 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 06C7892A for ; Mon, 3 Feb 2020 12:39:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D2B4920721 for ; Mon, 3 Feb 2020 12:39:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hXGW5+MF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2B4920721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyb0Y-00066h-W4 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Feb 2020 07:39:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56558) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyazp-0004LY-8W for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyazo-000602-9t for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:33 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:26332 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iyazo-0005zG-6R for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580733511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DtsjpTBF0GqaghML3YQTQ1/tMXVw713kPgZppEdgPj8=; b=hXGW5+MFV98Hib/OBnge2tien27MZYIo9eDPBDKJ3e5zNOWrjpuFlbT95LYHLV3CI95x5o uXv68BJMJjapzS0gl+hW7uyMqBBa9cSE+fNQets2a2ZOr3lG8DBvE2OwBcs1oIO9KoiMGD /9V0zCQRPHmXETQxSPVDgWDtN9w2yK8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-237-dUIYYJb7Oiy-8AGGriSDxg-1; Mon, 03 Feb 2020 07:38:29 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DED891851FD9; Mon, 3 Feb 2020 12:38:28 +0000 (UTC) Received: from thuth.com (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id A25A361070; Mon, 3 Feb 2020 12:38:27 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 09/13] hw/input: Do not enable CONFIG_PCKBD by default Date: Mon, 3 Feb 2020 13:38:07 +0100 Message-Id: <20200203123811.8651-10-thuth@redhat.com> In-Reply-To: <20200203123811.8651-1-thuth@redhat.com> References: <20200203123811.8651-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: dUIYYJb7Oiy-8AGGriSDxg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The i8042 PS/2 Controller should not be enabled by default. It has to be selected by machines or chipsets (e.g. SuperIO chipsets). Message-Id: <20200115113748.24757-1-thuth@redhat.com> Acked-by: Paolo Bonzini Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- hw/input/Kconfig | 1 - hw/isa/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/input/Kconfig b/hw/input/Kconfig index 25c77a1b87..64f14daabf 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -7,7 +7,6 @@ config LM832X config PCKBD bool - default y select PS2 depends on ISA_BUS diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 8a38813cc1..c7f07854f7 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -16,6 +16,7 @@ config I82378 config ISA_SUPERIO bool select ISA_BUS + select PCKBD config PC87312 bool From patchwork Mon Feb 3 12:38:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11362601 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1D15092A for ; Mon, 3 Feb 2020 12:44:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A794020721 for ; Mon, 3 Feb 2020 12:44:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ecsp3g8g" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A794020721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyb5d-0005vJ-LP for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Feb 2020 07:44:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56585) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyazt-0004Ve-8L for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyazs-00061h-6Z for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:37 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:40285 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iyazs-00061Z-2Y for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580733515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hcge/HmQbTgGjkLkgFhQJGSuo52P761XJZ/zxNQAbXU=; b=Ecsp3g8gNP2DhFMfuNH5l31PAXYrdZV2auXswh0B4GEvajJDn0Wy55Wme40nP9+eTZpZe/ svYEOjd0NX9XHpCeLK6N+b27jGoxZEZM3O+5ShQM0a4tRKCxUBQAGK2wdz3Jb46W15wcfs Pf1Hyk7Qszhnh4yRdQpgEqW8tBup54U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-190-Pp0q4t4fOL-qRAwF-BYEGg-1; Mon, 03 Feb 2020 07:38:33 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C616C1851FD9; Mon, 3 Feb 2020 12:38:32 +0000 (UTC) Received: from thuth.com (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B62E196B1; Mon, 3 Feb 2020 12:38:29 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 10/13] hw/hppa/Kconfig: LASI chipset requires PARALLEL port Date: Mon, 3 Feb 2020 13:38:08 +0100 Message-Id: <20200203123811.8651-11-thuth@redhat.com> In-Reply-To: <20200203123811.8651-1-thuth@redhat.com> References: <20200203123811.8651-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Pp0q4t4fOL-qRAwF-BYEGg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The PARISC Lasi chipset emulation requires some of the common parallel support and fails to build on a --without-default-devices: LINK hppa-softmmu/qemu-system-hppa /usr/bin/ld: hw/hppa/lasi.o: in function `lasi_init': hw/hppa/lasi.c:324: undefined reference to `parallel_mm_init' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:206: qemu-system-hppa] Error 1 Fixes: 376b851909d Reported-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200129192350.27143-1-philmd@redhat.com> Acked-by: Helge Deller Signed-off-by: Thomas Huth --- hw/hppa/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig index 82178c7dcb..22948db025 100644 --- a/hw/hppa/Kconfig +++ b/hw/hppa/Kconfig @@ -12,4 +12,5 @@ config DINO select LSI_SCSI_PCI select LASI_82596 select LASIPS2 + select PARALLEL select ARTIST From patchwork Mon Feb 3 12:38:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11362605 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5353C13B4 for ; Mon, 3 Feb 2020 12:48:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 198BF2082E for ; Mon, 3 Feb 2020 12:48:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ah3ygukF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 198BF2082E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyb8y-0001wL-Ai for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Feb 2020 07:48:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56726) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyazx-0004hI-Mo for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyazv-00063L-Ae for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:41 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:29674 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iyazv-000635-0h for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580733518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F5IlqUmZX5LS5DDn/gkpHkUkHf6FxQ4Y59lF6/1wwYk=; b=Ah3ygukFAWoq/47vpdAA8xq9KF3aj5w9SaTxJlyewNsEDb4fOOb009aRhQlTmP4+CJgs9C v0kqygKzw1w4qIUmV5yhByNH0uUcNog3OQBck7dzMTh3YNjJf5e9q8XFXl3u9UQiqfEozr r3uC13u/jHcUjpIxoW90odOJ1CT5B0w= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-263-CqQtvHHmNA6yfoHnHIoBww-1; Mon, 03 Feb 2020 07:38:35 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F16E6100550E; Mon, 3 Feb 2020 12:38:33 +0000 (UTC) Received: from thuth.com (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F4DC61070; Mon, 3 Feb 2020 12:38:32 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 11/13] hw/*/Makefile.objs: Move many .o files to common-objs Date: Mon, 3 Feb 2020 13:38:09 +0100 Message-Id: <20200203123811.8651-12-thuth@redhat.com> In-Reply-To: <20200203123811.8651-1-thuth@redhat.com> References: <20200203123811.8651-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: CqQtvHHmNA6yfoHnHIoBww-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We have many files that apparently do not depend on the target CPU configuration, i.e. which can be put into common-obj-y instead of obj-y. This way, the code can be shared for example between qemu-system-arm and qemu-system-aarch64, or the various big and little endian variants like qemu-system-sh4 and qemu-system-sh4eb, so that we do not have to compile the code multiple times anymore. Reviewed-by: Stefan Hajnoczi Message-Id: <20200130133841.10779-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- hw/adc/Makefile.objs | 2 +- hw/block/Makefile.objs | 2 +- hw/char/Makefile.objs | 16 ++++++++-------- hw/core/Makefile.objs | 2 +- hw/display/Makefile.objs | 2 +- hw/dma/Makefile.objs | 6 +++--- hw/gpio/Makefile.objs | 10 +++++----- hw/i2c/Makefile.objs | 4 ++-- hw/i2c/ppc4xx_i2c.c | 1 - hw/input/Makefile.objs | 8 ++++---- hw/net/Makefile.objs | 6 +++--- hw/nvram/Makefile.objs | 2 +- hw/pcmcia/Makefile.objs | 2 +- hw/sd/Makefile.objs | 10 +++++----- hw/ssi/Makefile.objs | 4 ++-- hw/usb/Makefile.objs | 4 ++-- 16 files changed, 40 insertions(+), 41 deletions(-) diff --git a/hw/adc/Makefile.objs b/hw/adc/Makefile.objs index 3f6dfdedae..2b9dc36c7f 100644 --- a/hw/adc/Makefile.objs +++ b/hw/adc/Makefile.objs @@ -1 +1 @@ -obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o +common-obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs index 28c2495a00..4b4a2b338d 100644 --- a/hw/block/Makefile.objs +++ b/hw/block/Makefile.objs @@ -10,7 +10,7 @@ common-obj-$(CONFIG_ONENAND) += onenand.o common-obj-$(CONFIG_NVME_PCI) += nvme.o common-obj-$(CONFIG_SWIM) += swim.o -obj-$(CONFIG_SH4) += tc58128.o +common-obj-$(CONFIG_SH4) += tc58128.o obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs index 02d8a66925..9e9a6c1aff 100644 --- a/hw/char/Makefile.objs +++ b/hw/char/Makefile.objs @@ -13,14 +13,13 @@ common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o common-obj-$(CONFIG_XEN) += xen_console.o common-obj-$(CONFIG_CADENCE) += cadence_uart.o -obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o -obj-$(CONFIG_COLDFIRE) += mcf_uart.o -obj-$(CONFIG_OMAP) += omap_uart.o -obj-$(CONFIG_SH4) += sh_serial.o -obj-$(CONFIG_PSERIES) += spapr_vty.o -obj-$(CONFIG_DIGIC) += digic-uart.o -obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o -obj-$(CONFIG_RASPI) += bcm2835_aux.o +common-obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o +common-obj-$(CONFIG_COLDFIRE) += mcf_uart.o +common-obj-$(CONFIG_OMAP) += omap_uart.o +common-obj-$(CONFIG_SH4) += sh_serial.o +common-obj-$(CONFIG_DIGIC) += digic-uart.o +common-obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o +common-obj-$(CONFIG_RASPI) += bcm2835_aux.o common-obj-$(CONFIG_CMSDK_APB_UART) += cmsdk-apb-uart.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o @@ -33,4 +32,5 @@ common-obj-$(CONFIG_MILKYMIST) += milkymist-uart.o common-obj-$(CONFIG_SCLPCONSOLE) += sclpconsole.o sclpconsole-lm.o obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o +obj-$(CONFIG_PSERIES) += spapr_vty.o obj-$(CONFIG_TERMINAL3270) += terminal3270.o diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index 9e41ec9a15..6215e7c208 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -19,8 +19,8 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o common-obj-$(CONFIG_SOFTMMU) += null-machine.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o +common-obj-$(CONFIG_SOFTMMU) += numa.o obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o -obj-$(CONFIG_SOFTMMU) += numa.o common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o common-obj-$(CONFIG_XILINX_AXI) += stream.o diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 5f03dfdcc4..77a7d622bd 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -24,7 +24,7 @@ common-obj-$(CONFIG_BOCHS_DISPLAY) += bochs-display.o common-obj-$(CONFIG_BLIZZARD) += blizzard.o common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o common-obj-$(CONFIG_FRAMEBUFFER) += framebuffer.o -obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o +common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o common-obj-$(CONFIG_ZAURUS) += tc6393xb.o common-obj-$(CONFIG_MACFB) += macfb.o diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs index b672e7a522..f4b1cfe26d 100644 --- a/hw/dma/Makefile.objs +++ b/hw/dma/Makefile.objs @@ -8,9 +8,9 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o common-obj-$(CONFIG_STP2000) += sparc32_dma.o -obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o +common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o -obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o -obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o +common-obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o +common-obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o common-obj-$(CONFIG_RASPI) += bcm2835_dma.o diff --git a/hw/gpio/Makefile.objs b/hw/gpio/Makefile.objs index d305b3b24b..3cfc261f9b 100644 --- a/hw/gpio/Makefile.objs +++ b/hw/gpio/Makefile.objs @@ -5,8 +5,8 @@ common-obj-$(CONFIG_ZAURUS) += zaurus.o common-obj-$(CONFIG_E500) += mpc8xxx.o common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o -obj-$(CONFIG_OMAP) += omap_gpio.o -obj-$(CONFIG_IMX) += imx_gpio.o -obj-$(CONFIG_RASPI) += bcm2835_gpio.o -obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o -obj-$(CONFIG_ASPEED_SOC) += aspeed_gpio.o +common-obj-$(CONFIG_OMAP) += omap_gpio.o +common-obj-$(CONFIG_IMX) += imx_gpio.o +common-obj-$(CONFIG_RASPI) += bcm2835_gpio.o +common-obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o +common-obj-$(CONFIG_ASPEED_SOC) += aspeed_gpio.o diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs index d7073a401f..6ba976b257 100644 --- a/hw/i2c/Makefile.objs +++ b/hw/i2c/Makefile.objs @@ -9,5 +9,5 @@ common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o common-obj-$(CONFIG_ASPEED_SOC) += aspeed_i2c.o common-obj-$(CONFIG_NRF51_SOC) += microbit_i2c.o common-obj-$(CONFIG_MPC_I2C) += mpc_i2c.o -obj-$(CONFIG_OMAP) += omap_i2c.o -obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o +common-obj-$(CONFIG_OMAP) += omap_i2c.o +common-obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c index 3f015a1581..c0a8e04567 100644 --- a/hw/i2c/ppc4xx_i2c.c +++ b/hw/i2c/ppc4xx_i2c.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/module.h" -#include "cpu.h" #include "hw/i2c/ppc4xx_i2c.h" #include "hw/irq.h" diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs index f98f635685..abc1ff03c0 100644 --- a/hw/input/Makefile.objs +++ b/hw/input/Makefile.objs @@ -12,7 +12,7 @@ common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-hid.o common-obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host.o common-obj-$(CONFIG_VHOST_USER_INPUT) += vhost-user-input.o -obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o -obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o -obj-$(CONFIG_TSC210X) += tsc210x.o -obj-$(CONFIG_LASIPS2) += lasips2.o +common-obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o +common-obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o +common-obj-$(CONFIG_TSC210X) += tsc210x.o +common-obj-$(CONFIG_LASIPS2) += lasips2.o diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs index 19f13e9fa5..991c46c773 100644 --- a/hw/net/Makefile.objs +++ b/hw/net/Makefile.objs @@ -34,8 +34,8 @@ common-obj-$(CONFIG_SUNHME) += sunhme.o common-obj-$(CONFIG_FTGMAC100) += ftgmac100.o common-obj-$(CONFIG_SUNGEM) += sungem.o -obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o -obj-$(CONFIG_COLDFIRE) += mcf_fec.o +common-obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o +common-obj-$(CONFIG_COLDFIRE) += mcf_fec.o obj-$(CONFIG_MILKYMIST) += milkymist-minimac2.o obj-$(CONFIG_PSERIES) += spapr_llan.o obj-$(CONFIG_XILINX_ETHLITE) += xilinx_ethlite.o @@ -45,7 +45,7 @@ common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET)) += vhost_net.o common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET))) += vhost_net-stub.o common-obj-$(CONFIG_ALL) += vhost_net-stub.o -obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \ +common-obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \ fsl_etsec/rings.o fsl_etsec/miim.o common-obj-$(CONFIG_ROCKER) += rocker/rocker.o rocker/rocker_fp.o \ diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs index 090df63fcd..f3ad921382 100644 --- a/hw/nvram/Makefile.objs +++ b/hw/nvram/Makefile.objs @@ -4,5 +4,5 @@ common-obj-$(CONFIG_AT24C) += eeprom_at24c.o common-obj-y += fw_cfg.o common-obj-$(CONFIG_CHRP_NVRAM) += chrp_nvram.o common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o +common-obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o obj-$(CONFIG_PSERIES) += spapr_nvram.o -obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o diff --git a/hw/pcmcia/Makefile.objs b/hw/pcmcia/Makefile.objs index 4eac060c93..02cd986a2c 100644 --- a/hw/pcmcia/Makefile.objs +++ b/hw/pcmcia/Makefile.objs @@ -1,2 +1,2 @@ common-obj-y += pcmcia.o -obj-$(CONFIG_PXA2XX) += pxa2xx.o +common-obj-$(CONFIG_PXA2XX) += pxa2xx.o diff --git a/hw/sd/Makefile.objs b/hw/sd/Makefile.objs index a884c238df..e371281ac4 100644 --- a/hw/sd/Makefile.objs +++ b/hw/sd/Makefile.objs @@ -4,8 +4,8 @@ common-obj-$(CONFIG_SD) += sd.o core.o sdmmc-internal.o common-obj-$(CONFIG_SDHCI) += sdhci.o common-obj-$(CONFIG_SDHCI_PCI) += sdhci-pci.o -obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o -obj-$(CONFIG_OMAP) += omap_mmc.o -obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o -obj-$(CONFIG_RASPI) += bcm2835_sdhost.o -obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o +common-obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o +common-obj-$(CONFIG_OMAP) += omap_mmc.o +common-obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o +common-obj-$(CONFIG_RASPI) += bcm2835_sdhost.o +common-obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o diff --git a/hw/ssi/Makefile.objs b/hw/ssi/Makefile.objs index f5bcc65fe7..07a85f1967 100644 --- a/hw/ssi/Makefile.objs +++ b/hw/ssi/Makefile.objs @@ -6,5 +6,5 @@ common-obj-$(CONFIG_ASPEED_SOC) += aspeed_smc.o common-obj-$(CONFIG_STM32F2XX_SPI) += stm32f2xx_spi.o common-obj-$(CONFIG_MSF2) += mss-spi.o -obj-$(CONFIG_OMAP) += omap_spi.o -obj-$(CONFIG_IMX) += imx_spi.o +common-obj-$(CONFIG_OMAP) += omap_spi.o +common-obj-$(CONFIG_IMX) += imx_spi.o diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 0052d49ce1..2b10868937 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -13,8 +13,8 @@ common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o common-obj-$(CONFIG_USB_XHCI_NEC) += hcd-xhci-nec.o common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o -obj-$(CONFIG_TUSB6010) += tusb6010.o -obj-$(CONFIG_IMX) += chipidea.o +common-obj-$(CONFIG_TUSB6010) += tusb6010.o +common-obj-$(CONFIG_IMX) += chipidea.o # emulated usb devices common-obj-$(CONFIG_USB) += dev-hub.o From patchwork Mon Feb 3 12:38:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11362603 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D9E492A for ; Mon, 3 Feb 2020 12:46:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D90A92082E for ; Mon, 3 Feb 2020 12:46:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ad5FaKbF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D90A92082E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyb7A-0007wx-3M for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Feb 2020 07:46:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56601) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyazv-0004bb-CG for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyazu-00062m-9u for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:39 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22176 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iyazu-00062W-62 for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580733517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l8LCcHExFV+u56yZNG7JkALSiczhC8QwIbIFhfpnJPY=; b=ad5FaKbFXjIvTDoFc++D0bU/UAGzkjU+pAFEMEkRZRGhQyNThC9IdPeuIeKgsxrT/0U03K oMhMHb0cEhN4qyzRLPHx8ll2I84sbr/DftLWPMDMlzs26jTk5CNNhhROdi1U4+m79PS5z8 foGlZxcKblLrNDq6mudvpubJRzMoKKo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-368-r_Bu6VJyNFai7j54aOyvQQ-1; Mon, 03 Feb 2020 07:38:36 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 41E6F1005510; Mon, 3 Feb 2020 12:38:35 +0000 (UTC) Received: from thuth.com (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6726C196BD; Mon, 3 Feb 2020 12:38:34 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 12/13] include/sysemu/sysemu.h: Remove usused variable no_quit Date: Mon, 3 Feb 2020 13:38:10 +0100 Message-Id: <20200203123811.8651-13-thuth@redhat.com> In-Reply-To: <20200203123811.8651-1-thuth@redhat.com> References: <20200203123811.8651-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: r_Bu6VJyNFai7j54aOyvQQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The no_quit variable has been removed in commit 78782712a62d56 ("vl: drop no_quit variable"), so let's remove the extern declaration in the header now, too. Fixes: 78782712a62d ("vl: drop no_quit variable") Message-Id: <20200108192402.19672-1-thuth@redhat.com> Reviewed-by: Laurent Vivier Reviewed-by: Alex Bennée Signed-off-by: Thomas Huth --- include/sysemu/sysemu.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 80c57fdc4e..686f4217a6 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -44,7 +44,6 @@ extern int alt_grab; extern int ctrl_grab; extern int cursor_hide; extern int graphic_rotate; -extern int no_quit; extern int no_shutdown; extern int old_param; extern int boot_menu; From patchwork Mon Feb 3 12:38:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11362597 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EA09117E0 for ; Mon, 3 Feb 2020 12:42:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C1C5F20721 for ; Mon, 3 Feb 2020 12:42:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Sg1k4ON9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1C5F20721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyb3l-0003Sg-Vz for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Feb 2020 07:42:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56715) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyazx-0004hF-LN for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyazw-00063k-CE for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:41 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:33262 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iyazw-00063c-8F for qemu-devel@nongnu.org; Mon, 03 Feb 2020 07:38:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580733519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7khwH6SQQON5PqxU6RXbZYXMnlSBvMPO+olzTuJGAZ0=; b=Sg1k4ON9r37qaBRMf+SWZR2NbIYBV1ZgCXkWhJw+vFQO8OKjITo5LIrNsQUA+gmw97BeTY oND63DMoiOX9S3wrrmwutmfyxPP03QMXTBr1uD82PMwtx9GdTk+Zmxq80tHIwKxY2LKywT CVI5yrtOkqRRJPGsUNcoixTgibl2Lfo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-5-nuXGm4XsMNiQtGoV38rXDQ-1; Mon, 03 Feb 2020 07:38:37 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 79C3B107ACCC; Mon, 3 Feb 2020 12:38:36 +0000 (UTC) Received: from thuth.com (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F25061070; Mon, 3 Feb 2020 12:38:35 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 13/13] trivial: Remove xenfb_enabled from sysemu.h Date: Mon, 3 Feb 2020 13:38:11 +0100 Message-Id: <20200203123811.8651-14-thuth@redhat.com> In-Reply-To: <20200203123811.8651-1-thuth@redhat.com> References: <20200203123811.8651-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: nuXGm4XsMNiQtGoV38rXDQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The define is only used in one other place. Move the code there instead of keeping this xen-specific define in sysemu.h. Message-Id: <20200121161747.10569-1-thuth@redhat.com> Acked-by: Paul Durrant Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- hw/xenpv/xen_machine_pv.c | 2 +- include/sysemu/sysemu.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 3a8af1a1e0..8df575a457 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -60,7 +60,7 @@ static void xen_init_pv(MachineState *machine) xen_be_register("qnic", &xen_netdev_ops); /* configure framebuffer */ - if (xenfb_enabled) { + if (vga_interface_type == VGA_XENFB) { xen_config_dev_vfb(0, "vnc"); xen_config_dev_vkbd(0); } diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 686f4217a6..6358a324a7 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -32,7 +32,6 @@ typedef enum { } VGAInterfaceType; extern int vga_interface_type; -#define xenfb_enabled (vga_interface_type == VGA_XENFB) extern int graphic_width; extern int graphic_height;