From nobody Mon Apr 29 03:57:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579356489; cv=none; d=zohomail.com; s=zohoarc; b=UGSYObxelJ1sxSae4y3pZBXGaddfIh+fwu4BV9QrOuSZoCQIMr/yM4Z51+XnIfQCvgt/f4esTeStIiiLC++ZnTwuFmVjaz5w2er/7mZpLnjteF3QpeWPxMFgty0aoO6bVTDf00cJFfdWNLMEqKsFycW9GSgYF03j3nsRhsWpqDc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579356489; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LTF0bu2VPlQk0T1fzA08DqOqjAzbdx7Avrwx3TjytMM=; b=IoY625mX8ueABfBK14dbEAI4dLRLXyq7nuS3YAOsLWTt1KidVJecZjUNYaUblJJM0ETPjX7P+ADf6MhXUgf7iIbtNtI4tmqhASDvxjQCTc+xINb3TfewgL5WmUgX/MFIM4d/O+eeRLeCrSB8REP8XZeApPPFZ9mcBvLoZtzZVzs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579356489441973.2868185677041; Sat, 18 Jan 2020 06:08:09 -0800 (PST) Received: from localhost ([::1]:40634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isolj-0001QL-SI for importer@patchew.org; Sat, 18 Jan 2020 09:08:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45286) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isokO-0000Be-Ci for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:06:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isokK-0007WN-UV for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:06:43 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53164 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 1isokK-0007Vx-RB for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:06:40 -0500 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-367-c70JbIQuN7akSyQObe3p9Q-1; Sat, 18 Jan 2020 09:06:39 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9B262800D41; Sat, 18 Jan 2020 14:06:37 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-59.brq.redhat.com [10.40.204.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 76BCB5C1D4; Sat, 18 Jan 2020 14:06:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579356400; 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=LTF0bu2VPlQk0T1fzA08DqOqjAzbdx7Avrwx3TjytMM=; b=AlYKC2IWHnYdvpQLloIuiqC/4ubHTUzOFcKAF/wLqeb2kWRzYIt+x/TEBQbOKbcpEJj03x 8k/CuxWsdmI+c6LvBefpd+jrUzUL+zL7bteDs8UeFEOpjGpcltS5ZhUTtXSqxNccdtQu+j lpnd3AJ3WCZf0KmeEnLW1u8IresNBQA= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Riku Voipio , Laurent Vivier Subject: [PATCH v2 1/6] configure: Do not build libfdt if not required Date: Sat, 18 Jan 2020 15:06:14 +0100 Message-Id: <20200118140619.26333-2-philmd@redhat.com> In-Reply-To: <20200118140619.26333-1-philmd@redhat.com> References: <20200118140619.26333-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: c70JbIQuN7akSyQObe3p9Q-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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: , Cc: Thomas Huth , Eduardo Habkost , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alistair Francis , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We only require libfdt for system emulation, in a small set of architecture: 4077 # fdt support is mandatory for at least some target architectures, 4078 # so insist on it if we're building those system emulators. 4079 fdt_required=3Dno 4080 for target in $target_list; do 4081 case $target in 4082 aarch64*-softmmu|arm*-softmmu|ppc*-softmmu|microblaze*-softmmu|mi= ps64el-softmmu|riscv*-softmmu) 4083 fdt_required=3Dyes Do not build libfdt if we did not manually specified --enable-fdt, or have one of the platforms that require it in our target list. Reviewed-by: Thomas Huth Reviewed-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- v2: Improved description (thuth) --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 557e4382ea..c67a7e73db 100755 --- a/configure +++ b/configure @@ -4095,6 +4095,8 @@ if test "$fdt_required" =3D "yes"; then "targets which need it (by specifying a cut down --target-list)." fi fdt=3Dyes +elif test "$fdt" !=3D "yes" ; then + fdt=3Dno fi =20 if test "$fdt" !=3D "no" ; then --=20 2.21.1 From nobody Mon Apr 29 03:57:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579356491; cv=none; d=zohomail.com; s=zohoarc; b=d0rpO5Kb1gNQIO2MisycG8nAnZdQoT57n3jkLixcE6qx9Arp5oT2jMEj39a9ZU1W7yPAAm0JrWS7kzfhCwao91RqZ5dIlHB5dvwolSg26AG6CGw4fEX3KBsBqgEDx1kixi0dPWSrwcdTFhrypHopjVRZBiU2CZQRENVVawEuf2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579356491; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tpN4IRBHIRExpdzj4SxAzDbrcO2tKnut1MuvxDBCogA=; b=b0lCyih2NXrVR0g99K+RSov9dkSaCPlCmrHbkLjwwk8mdluGQg7mQ6dYF9tY0opTmNgyUtnlwwBbSuF1mzeR52X7gJiRvSYUCEtx7znVv+YvRXToegDyzWIkx5OIq2D6hEmAC83ojTyzLvZDoytFTSRAlDd+K3ksugZhKzo960c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579356491681449.97042096448513; Sat, 18 Jan 2020 06:08:11 -0800 (PST) Received: from localhost ([::1]:40636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isolm-0001W2-BG for importer@patchew.org; Sat, 18 Jan 2020 09:08:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45311) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isokR-0000Bk-AY for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:06:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isokO-0007ZI-J0 for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:06:47 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57433 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 1isokO-0007Yo-FV for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:06:44 -0500 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-162-chb9026XMdu-_Fs9hYtncQ-1; Sat, 18 Jan 2020 09:06:42 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 34FE0100550E; Sat, 18 Jan 2020 14:06:41 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-59.brq.redhat.com [10.40.204.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 365CA5C1D4; Sat, 18 Jan 2020 14:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579356403; 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=tpN4IRBHIRExpdzj4SxAzDbrcO2tKnut1MuvxDBCogA=; b=ToKRqFpeXbY5BlvcKBFZEw8YO8gMvGFSWpoM5KV9ZtYm13ZWeotw3zc/gp7KvaNrMlTlVP OD+rgT+PWONZ0zbv+f42iDzMkIKCa6Qz04+FInV1WXmkhZMXu8jv3U6/ClZ+c4GWULs6qT pQrGJ7t+J/TlkdWBpTOmYPgy5SHoNw4= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Riku Voipio , Laurent Vivier Subject: [PATCH v2 2/6] Makefile: Clarify all the codebase requires qom/ objects Date: Sat, 18 Jan 2020 15:06:15 +0100 Message-Id: <20200118140619.26333-3-philmd@redhat.com> In-Reply-To: <20200118140619.26333-1-philmd@redhat.com> References: <20200118140619.26333-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: chb9026XMdu-_Fs9hYtncQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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: Thomas Huth , Eduardo Habkost , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" QEMU user-mode also requires the qom/ objects, it is not only used by "system emulation and qemu-img". As we will use a big if() block, move it upper in the "Common libraries for tools and emulators" section. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- Makefile.objs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 7c1e50f9d6..5aae561984 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -2,6 +2,7 @@ # Common libraries for tools and emulators stub-obj-y =3D stubs/ util-obj-y =3D crypto/ util/ qobject/ qapi/ +qom-obj-y =3D qom/ =20 chardev-obj-y =3D chardev/ =20 @@ -26,11 +27,6 @@ block-obj-m =3D block/ =20 crypto-obj-y =3D crypto/ =20 -####################################################################### -# qom-obj-y is code used by both qemu system emulation and qemu-img - -qom-obj-y =3D qom/ - ####################################################################### # io-obj-y is code used by both qemu system emulation and qemu-img =20 --=20 2.21.1 From nobody Mon Apr 29 03:57:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579356578; cv=none; d=zohomail.com; s=zohoarc; b=doYOxX8pZeb3I2zooIFa1Qdhip6nly8JAcG9YJUnGUXDZj2GdWyq+RMooxtCb3tlEjeUz2bdtDd0A4KEIsKg1MqEfTuU3JyUz9z9okR+5d79kQjfenMqCrXaTAg/RK5eDGH7rj+SBDIlTG/fAsX4U+NwZjtyaQfpqr2VpealsYI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579356578; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MZj2pvblHJa9UwEi0es74uPfzOzPt0N71PoumxhKULs=; b=Q679wRl84lf3Fmh+ELOVMbuLw97F8ZSJslH9EiVDvaG0JDjnKgbIK10bywasyUcen2TGcaWB+VxNU8DmXzD58AS6EFQ6qmW9k/wUJCYCSQJ1ftrA8D4JbzLm74Vr3O4Hpezwdf6Ovcb8cExqOxA5fAkXpg2zOAaapdMNha/ge8Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579356578012353.836433565745; Sat, 18 Jan 2020 06:09:38 -0800 (PST) Received: from localhost ([::1]:40660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isonA-0003m3-Hw for importer@patchew.org; Sat, 18 Jan 2020 09:09:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45331) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isokW-0000J9-RL for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:06:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isokU-0007cI-22 for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:06:52 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:55202 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 1isokT-0007c4-Us for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:06:50 -0500 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-418-CaQLed4zMDmJYfrlD8_28A-1; Sat, 18 Jan 2020 09:06:48 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E89C800D48; Sat, 18 Jan 2020 14:06:47 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-59.brq.redhat.com [10.40.204.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A733D5C1D4; Sat, 18 Jan 2020 14:06:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579356409; 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=MZj2pvblHJa9UwEi0es74uPfzOzPt0N71PoumxhKULs=; b=irNcaoWfV0jONPj8ocUp3m4MkLrxqkbwekwY++Q/ZPlbrJMI6ZIUbo3fbDUO+mR5+5ggRV TNrIwt2AniUNfoWfRB6JdW2KZLScdqWheoYyeGq+9J8ml57v8hoVwtIBP2c1sdWABGwaBa 5DFiS+HSIOTLb3S09FV5zVJgnVU5/SE= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Riku Voipio , Laurent Vivier Subject: [PATCH v2 3/6] Makefile: Restrict system emulation and tools objects Date: Sat, 18 Jan 2020 15:06:16 +0100 Message-Id: <20200118140619.26333-4-philmd@redhat.com> In-Reply-To: <20200118140619.26333-1-philmd@redhat.com> References: <20200118140619.26333-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: CaQLed4zMDmJYfrlD8_28A-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Thomas Huth , Eduardo Habkost , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Restrict all the system emulation and tools objects with a Makefile IF (CONFIG_SOFTMMU OR CONFIG_TOOLS) check. Using the same description over and over is not very helpful. Use it once, just before the if() block. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- Makefile.objs | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 5aae561984..395dd1e670 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -4,16 +4,15 @@ stub-obj-y =3D stubs/ util-obj-y =3D crypto/ util/ qobject/ qapi/ qom-obj-y =3D qom/ =20 +####################################################################### +# code used by both qemu system emulation and qemu-img + +ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) + chardev-obj-y =3D chardev/ =20 -####################################################################### -# authz-obj-y is code used by both qemu system emulation and qemu-img - authz-obj-y =3D authz/ =20 -####################################################################### -# block-obj-y is code used by both qemu system emulation and qemu-img - block-obj-y =3D nbd/ block-obj-y +=3D block.o blockjob.o job.o block-obj-y +=3D block/ scsi/ @@ -22,16 +21,12 @@ block-obj-$(CONFIG_REPLICATION) +=3D replication.o =20 block-obj-m =3D block/ =20 -####################################################################### -# crypto-obj-y is code used by both qemu system emulation and qemu-img - crypto-obj-y =3D crypto/ =20 -####################################################################### -# io-obj-y is code used by both qemu system emulation and qemu-img - io-obj-y =3D io/ =20 +endif # CONFIG_SOFTMMU or CONFIG_TOOLS + ###################################################################### # Target independent part of system emulation. The long term path is to # suppress *all* target specific code in case of system emulation, i.e. a --=20 2.21.1 From nobody Mon Apr 29 03:57:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579356697; cv=none; d=zohomail.com; s=zohoarc; b=ho01MUkNxTxDIKsDEufTexRAdhI8Xbi1ZLCbrktit9oHHlHo7dWedm2AQiUdxR3cPjoeZxTjb/gouD65Iqq+MmRzU3AqrnhlYSyxDxc2tk0BhBaAXeY2p2iAjXZLBGKg6kBURarSPLuzEgQGeK2HH7pzSEtaSXFjr6NWr1BUFrk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579356697; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/VNUfzxXqcHuILcW1VKvscxZ//xM4OxDV8QQYNvQ7dw=; b=DB1yuz83bGClrtszPDk0CACaIwxTsRn3rHj1ueSW1p0GcI2i7x1OAzo7/R7Rxo/qX724BUQUWuQfFGB+kwmH51o8OhSCO5M8rTbc3bpPvLa6AfCOZnxfxGldewrszuPHfCanigIJAAE1GNYSIKN2Kg7tZtVOPH40viyHMdBuDU8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579356697334539.3117599257178; Sat, 18 Jan 2020 06:11:37 -0800 (PST) Received: from localhost ([::1]:40694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isop6-0006X3-7e for importer@patchew.org; Sat, 18 Jan 2020 09:11:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45401) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isokc-0000RO-O8 for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:07:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isokZ-0007iw-OI for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:06:58 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36512 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 1isokZ-0007il-KK for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:06:55 -0500 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-88-MAZvt9-QNrik0xxkmF_XXQ-1; Sat, 18 Jan 2020 09:06:53 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8E85800D41; Sat, 18 Jan 2020 14:06:52 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-59.brq.redhat.com [10.40.204.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ABB3B5C1D4; Sat, 18 Jan 2020 14:06:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579356415; 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=/VNUfzxXqcHuILcW1VKvscxZ//xM4OxDV8QQYNvQ7dw=; b=gpgChz5xEvyH1OmNjdlVmC4IZKDmke7bG7hly8t3/pMaBrlk7tTMA0Lg/numyJp6CHX7GJ VkBx6FEfFN8x0v/dGnXAX9oagX1sXEfBOfZ9O9a2PwFzitIUmdp8Erg00tnCwmQXsmnNX8 UhyMyYM2+RHiqMkZ5w4FPkDn/wXDQf8= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Riku Voipio , Laurent Vivier Subject: [PATCH v2 4/6] Makefile: Remove unhelpful comment Date: Sat, 18 Jan 2020 15:06:17 +0100 Message-Id: <20200118140619.26333-5-philmd@redhat.com> In-Reply-To: <20200118140619.26333-1-philmd@redhat.com> References: <20200118140619.26333-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: MAZvt9-QNrik0xxkmF_XXQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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: Thomas Huth , Eduardo Habkost , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" It is pointless to keep qapi/ object separate from the other common-objects. Drop the comment. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- Makefile.objs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 395dd1e670..c6321d0465 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -71,11 +71,9 @@ qemu-seccomp.o-libs :=3D $(SECCOMP_LIBS) =20 common-obj-$(CONFIG_FDT) +=3D device_tree.o =20 -###################################################################### -# qapi - common-obj-y +=3D qapi/ -endif + +endif # CONFIG_SOFTMMU =20 ####################################################################### # Target-independent parts used in system and user emulation --=20 2.21.1 From nobody Mon Apr 29 03:57:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579356578; cv=none; d=zohomail.com; s=zohoarc; b=QaWO1N1BvTBeDwf9yMuXmri38UWVGdYkviCDVhwJefQEiPb5pc9jtZjhbESl8CrqC5LfNwYxxRBsq11e9nYN1HQnB1TWoaaQ9vC9EC0YMYdlMxIOo1qRoRxmZI6BK5f1Ts/msO23Oko17fG89ll85C7NO+uPmfQveosh1IPgo4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579356578; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zDCt9Bi2hR5JkW4+eYNC1QAsa0F0QBngHASotyuklBI=; b=DDcUUStUyvPtbNQ6Na3GUXYl8o1V9xhAFSjPyUPAZmjpAVnTOOxkcuLTrdNVJEpWhH27EFBX4qtPXuO9z+FKTOg9Kgk20HA1VcHKI6lgNiSjscOjKaghRN7GxOFQ6Gk7OrrEc5RFUQBQNc90N2kjbVq3cOa0NID6IqL+SKcJakE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579356578746557.7476018618805; Sat, 18 Jan 2020 06:09:38 -0800 (PST) Received: from localhost ([::1]:40658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isonB-0003lA-Bd for importer@patchew.org; Sat, 18 Jan 2020 09:09:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45447) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isokk-0000Us-U9 for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:07:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isokf-0007o3-Sv for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:07:05 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:50441 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 1isokf-0007mm-Fs for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:07:01 -0500 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-256-Clwrl9ITNxy0QClZRXIrhA-1; Sat, 18 Jan 2020 09:06:57 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 91259100550E; Sat, 18 Jan 2020 14:06:56 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-59.brq.redhat.com [10.40.204.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CB6A5C1D4; Sat, 18 Jan 2020 14:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579356420; 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=zDCt9Bi2hR5JkW4+eYNC1QAsa0F0QBngHASotyuklBI=; b=d6MhoPS71WfnzTmQr5wgYrYU6LdPPwBeCdCw2J4efTrcPR5sQmlWdq5rOMtWU3vLgmptT/ 8jIleqgB0QlKxIGLC+GlixvDwE14GnGf4eCFUd8orSL2taXgplpz3/hedMnDdiOICbkWvN ZwG41SDtAbMUM4MkGr3kaYn1cwuup6M= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Riku Voipio , Laurent Vivier Subject: [PATCH v2 5/6] hw/core: Restrict reset handlers API to system-mode Date: Sat, 18 Jan 2020 15:06:18 +0100 Message-Id: <20200118140619.26333-6-philmd@redhat.com> In-Reply-To: <20200118140619.26333-1-philmd@redhat.com> References: <20200118140619.26333-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: Clwrl9ITNxy0QClZRXIrhA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Thomas Huth , Eduardo Habkost , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The user-mode code does not use this API, restrict it to the system-mode. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- hw/core/Makefile.objs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index 0edd9e635d..2fea68ccf7 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -1,6 +1,7 @@ # core qdev-related obj files, also used by *-user: common-obj-y +=3D qdev.o qdev-properties.o -common-obj-y +=3D bus.o reset.o +common-obj-y +=3D bus.o +common-obj-$(CONFIG_SOFTMMU) +=3D reset.o common-obj-$(CONFIG_SOFTMMU) +=3D qdev-fw.o common-obj-$(CONFIG_SOFTMMU) +=3D fw-path-provider.o # irq.o needed for qdev GPIO handling: --=20 2.21.1 From nobody Mon Apr 29 03:57:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579356763; cv=none; d=zohomail.com; s=zohoarc; b=QZgfLSW/WY/m+Qx6XNAN0Y2g3S/IyaNMPsftEs95y/pcM4dTF2z27pfGBeYpnux8qPms4HG5WTgF/5EVoWoG22m3pe7GjWS17LrKozKzMH186HMcHV3pb7afEJjxIlAafyHAwfODjVuxpO+oogCC0H2oqNDm+egYBDqvxkFTn94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579356763; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HBMzoS3skNu2fovt8Nh1IiQc4riv5LcvrvmHGH5Oq2k=; b=m9Cyxg/ivMxpiIyEmAtucVhTihckjgJ5fSHnzmt7WuwzlXkspAPy5fDIX7IkiD/Fa25t3DaBdGP8k4SRxe3zMqpY+tNS4EI6ynhIicSpdbBdH6Q47KbVYQAdtoWPSRmONOQIZXbXCzJQ91f6wusXFk1r7HSf7PLAL0ynNEDyzHg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579356763218364.0458731538955; Sat, 18 Jan 2020 06:12:43 -0800 (PST) Received: from localhost ([::1]:40708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isoqA-0008B4-6f for importer@patchew.org; Sat, 18 Jan 2020 09:12:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45460) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isokn-0000Ww-Lj for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:07:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isokk-0007rS-JW for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:07:09 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46611 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 1isokh-0007p4-K0 for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:07:04 -0500 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-76-UBxmNiA2NPKgIVNP9ajBcw-1; Sat, 18 Jan 2020 09:07:01 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0EC49185432C; Sat, 18 Jan 2020 14:07:00 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-59.brq.redhat.com [10.40.204.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0CA8A5C1D4; Sat, 18 Jan 2020 14:06:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579356422; 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=HBMzoS3skNu2fovt8Nh1IiQc4riv5LcvrvmHGH5Oq2k=; b=QIODOp1Odq0bVxzx0TNeLgW/dVMgR9MUacRziXyvdgqZyiV4d/cZLAo9UgfGN5C7uiw1Nk HgZmbzjb9yIA+JputhngAIffwndyjwCMXLOxKCITgZHHYm/3mt7WQKvp2ZHBDChUuI9K8Q BLbB8jp7LJ2w0Ao2PvED//OTNNOKk/o= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Riku Voipio , Laurent Vivier Subject: [PATCH v2 6/6] hw/core/Makefile: Group generic objects versus system-mode objects Date: Sat, 18 Jan 2020 15:06:19 +0100 Message-Id: <20200118140619.26333-7-philmd@redhat.com> In-Reply-To: <20200118140619.26333-1-philmd@redhat.com> References: <20200118140619.26333-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: UBxmNiA2NPKgIVNP9ajBcw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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: Thomas Huth , Eduardo Habkost , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" To ease review/modifications of this Makefile, group generic objects first, then system-mode specific ones, and finally peripherals (which are only used in system-mode). No logical changes introduced here. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/Makefile.objs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index 2fea68ccf7..a522b7297d 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -1,32 +1,32 @@ # core qdev-related obj files, also used by *-user: common-obj-y +=3D qdev.o qdev-properties.o common-obj-y +=3D bus.o +common-obj-y +=3D cpu.o +common-obj-y +=3D hotplug.o +common-obj-y +=3D vmstate-if.o +# irq.o needed for qdev GPIO handling: +common-obj-y +=3D irq.o + common-obj-$(CONFIG_SOFTMMU) +=3D reset.o common-obj-$(CONFIG_SOFTMMU) +=3D qdev-fw.o common-obj-$(CONFIG_SOFTMMU) +=3D fw-path-provider.o -# irq.o needed for qdev GPIO handling: -common-obj-y +=3D irq.o -common-obj-y +=3D hotplug.o common-obj-$(CONFIG_SOFTMMU) +=3D nmi.o common-obj-$(CONFIG_SOFTMMU) +=3D vm-change-state-handler.o -common-obj-y +=3D cpu.o -common-obj-y +=3D vmstate-if.o +common-obj-$(CONFIG_SOFTMMU) +=3D qdev-properties-system.o +common-obj-$(CONFIG_SOFTMMU) +=3D sysbus.o +common-obj-$(CONFIG_SOFTMMU) +=3D machine.o +common-obj-$(CONFIG_SOFTMMU) +=3D null-machine.o +common-obj-$(CONFIG_SOFTMMU) +=3D loader.o +common-obj-$(CONFIG_SOFTMMU) +=3D machine-hmp-cmds.o +obj-$(CONFIG_SOFTMMU) +=3D machine-qmp-cmds.o +obj-$(CONFIG_SOFTMMU) +=3D numa.o =20 common-obj-$(CONFIG_EMPTY_SLOT) +=3D empty_slot.o common-obj-$(CONFIG_XILINX_AXI) +=3D stream.o common-obj-$(CONFIG_PTIMER) +=3D ptimer.o -common-obj-$(CONFIG_SOFTMMU) +=3D sysbus.o -common-obj-$(CONFIG_SOFTMMU) +=3D machine.o -common-obj-$(CONFIG_SOFTMMU) +=3D loader.o common-obj-$(CONFIG_FITLOADER) +=3D loader-fit.o -common-obj-$(CONFIG_SOFTMMU) +=3D qdev-properties-system.o common-obj-$(CONFIG_REGISTER) +=3D register.o common-obj-$(CONFIG_OR_IRQ) +=3D or-irq.o common-obj-$(CONFIG_SPLIT_IRQ) +=3D split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) +=3D platform-bus.o common-obj-$(CONFIG_GENERIC_LOADER) +=3D generic-loader.o -common-obj-$(CONFIG_SOFTMMU) +=3D null-machine.o - -obj-$(CONFIG_SOFTMMU) +=3D machine-qmp-cmds.o -obj-$(CONFIG_SOFTMMU) +=3D numa.o -common-obj-$(CONFIG_SOFTMMU) +=3D machine-hmp-cmds.o --=20 2.21.1