From nobody Sun Feb 8 17:13:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601419447; cv=none; d=zohomail.com; s=zohoarc; b=GdMNciB/vKee4J7MfIDZ+KoWVqgVOADwyfznmz+M5HQf267BFKfD4xYoO3MYGvkr92HRjTY7JQiZxxfBqjgoPSr41iHdWrJiI5iA3GcmJlTf3oiHpByIhMYSna53pz1WwFzy8rLd67Rpz6sz4x1Mb73E49uCNjrYIcgnJmBL52k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601419447; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=66DSIrlhCeV+xyo2otn2L+hQAxSXyWg/ic5Sp/vZwto=; b=lZ6ELuYk0aJPEs1BO/crahRpxg2DabY9f1HcfAxxITxyv72xCyJnEFHHhfLSjnFAzk6ksNJkq4PCEVicUlVtkcUEsp1PnUfOSOJifT2k3ml/KPsnvxNR5EuUfZlhSGd+f7LHDD/cvuPaebkVl4QTnqP5U6HkGj+FmlpRoQq7mYY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601419447445478.25673687438905; Tue, 29 Sep 2020 15:44:07 -0700 (PDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-64-ekqL8M0DMfWgp9sW4ZyeBw-1; Tue, 29 Sep 2020 18:44:04 -0400 Received: by mail-wm1-f69.google.com with SMTP id 73so552887wma.5 for ; Tue, 29 Sep 2020 15:44:04 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id t202sm7798963wmt.14.2020.09.29.15.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:02 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419446; 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=66DSIrlhCeV+xyo2otn2L+hQAxSXyWg/ic5Sp/vZwto=; b=P2gRsD4zgeBbihXz4fdnsT263Af1b1iWdxljRPd2Imco4dBS/Q97k+XbZjEvctfXCOp+BI ErFSt0zN/xtYeIgiPkbAYakV7L5o9vvFA30drPAr221/duEBx6LopbDz5XMS2XUD2eX6Wi mSw05E4yybQ1YlC4YHpdYERyC9wgkes= X-MC-Unique: ekqL8M0DMfWgp9sW4ZyeBw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=66DSIrlhCeV+xyo2otn2L+hQAxSXyWg/ic5Sp/vZwto=; b=arLDTgFTs+1KBenOqru8MXYc9ymmDFdwhgTkEX8DNnL6HPBsaj2QgUnTnhoAAYkyNC P6x5GElFK5I71IUWheDZyvPpuNLJJxcZ9uT997CB4uXDOeh+Pn3hSRLLx1vi4IRc651v YUpZhp7v95VSJBZFMMisg4Fu1U1luS1etsVIs7DeE9dw3fcsjZX0/e6mZ6VFbOVuMwM/ fYg6PTUo6E4QSemp3h84xJgMtgfD5JGqIbRsiSwZCt0gQOskR8fMea7R5BskYQYP5NJT TAzrYIDoSM3U9hB1cvOyqrCTLT0cAVhB+n/e2IbQ82E266WDQ1z56bUO8pj1UDhOJOUK KR4w== X-Gm-Message-State: AOAM531vg3Jl6Mb2j71ONg573wN2uTYglpVkfHgGFeCGl8svBfXIozJr cXyR4x2udGO4+pEgaUsiq1hvHhgWPnv0IVlA2e6OOfBQPyDd0NN9RksnV5ZyQacMAs+GRDOAKye yedwoXndc/i2X5Q== X-Received: by 2002:adf:efc9:: with SMTP id i9mr6933026wrp.187.1601419443106; Tue, 29 Sep 2020 15:44:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/JFirmQq0FLOkZYRppQAwyrCFiFhW/sOaJqe1ygyRV//BqkXnJHjtm0eIPBJooqWr+G3TNQ== X-Received: by 2002:adf:efc9:: with SMTP id i9mr6933012wrp.187.1601419442929; Tue, 29 Sep 2020 15:44:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Fam Zheng , Peter Maydell , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Keith Packard Subject: [PATCH v4 01/12] accel/tcg: Add stub for cpu_loop_exit() Date: Wed, 30 Sep 2020 00:43:44 +0200 Message-Id: <20200929224355.1224017-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Since the support of SYS_READC in commit 8de702cb67 the semihosting code is strongly depedent of the TCG accelerator via a call to cpu_loop_exit(). Ideally we would only build semihosting support when TCG is available, but unfortunately this is not trivial because semihosting is used by many targets in different configurations. For now add a simple stub to avoid link failure when building with --disable-tcg: hw/semihosting/console.c:160: undefined reference to `cpu_loop_exit' Cc: Keith Packard Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- accel/stubs/tcg-stub.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c index e4bbf997aa..1eec7fb90e 100644 --- a/accel/stubs/tcg-stub.c +++ b/accel/stubs/tcg-stub.c @@ -29,3 +29,8 @@ void *probe_access(CPUArchState *env, target_ulong addr, = int size, /* Handled by hardware accelerator. */ g_assert_not_reached(); } + +void cpu_loop_exit(CPUState *cpu) +{ + g_assert_not_reached(); +} --=20 2.26.2 From nobody Sun Feb 8 17:13:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601419452; cv=none; d=zohomail.com; s=zohoarc; b=P0Dr52Wv/T0V5N5yXvf3VQR70a88RIMNFyHrjY9mWLpXa4/yAqCI0x+eq9puOtOiyBn0Byfoe+uTJwtXSFc6pLHYQ4C8Eeb4s9LQ8t6zRohPSRKahbftRh4eG+FC0EYaXTAKh7xGFSMgPcJSHCzgBpOFxmuAK0LXsbK5HXpw0Eo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601419452; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=fnVaKlxSjgosYNWUZ3C9BB5KnUFHrX+zW6dbopznvYU=; b=OiO2N5bBF/lWjIoePoJi6G5D6k0x2C/F2jMJQCLhVNGKeaSdrMx933Ey4zWE1oNfOYL9zQvwFvuhY6tD8yuLIssZBtqY8a/sGiHrA/LICJKXeNVALHvwIyGpyHbm/W1lehehvjHH8kiU/QRsrSmbE5RONJ5/tt1NiVz+mmjvi5w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601419452727290.53057292335643; Tue, 29 Sep 2020 15:44:12 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-224-WtfQdemJMZOEnf6hidKkpQ-1; Tue, 29 Sep 2020 18:44:09 -0400 Received: by mail-wr1-f69.google.com with SMTP id a2so2345695wrp.8 for ; Tue, 29 Sep 2020 15:44:09 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id e13sm8276536wre.60.2020.09.29.15.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:07 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419451; 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=fnVaKlxSjgosYNWUZ3C9BB5KnUFHrX+zW6dbopznvYU=; b=MVZaWTj3uuEWiAJX7mnLgvCR1qJdqbNF7Nh0l4y4x/JPJrz8tRNUAuG6j33lDKNGvmWG2G daNojlzfhWL7Kmw6Pq3P6/F8zJ90dEURNaiaEeB+rcIrVqXHwbZ7nUxo76h2bXdHpavGdR mrDR+0DUrG8Yr5Fo45KvI9Bd2gamV4o= X-MC-Unique: WtfQdemJMZOEnf6hidKkpQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fnVaKlxSjgosYNWUZ3C9BB5KnUFHrX+zW6dbopznvYU=; b=pJPDajAaZ9emUB7qoO54F/bWJ+u20bK8N0VW1jz6RM0J77NyF4pYPIsLsKEmkMrBFO MK4v62ntCzE4xLnQTzHId1WjnkWjfdctNkG3N3o+b6zaQIakmvcnlS91uIpi98c+FDV8 NEx8xmvxNs4tSCmnVr7eH6H/iTlBfVGHVvWNSHQ/aRs22z7wtmuda4td4yYCD7HBGEvX GczBG0olM4EIeayJMOoG2jvmrqCtqLHmR5htje3tiQFzgtSwI+V1LJ5A5tXooDcrL189 xiViHhyOuQP+M+z5QXllk69cQrcuDet9FF6Z3LCiZD03ei/GlgzUSrl6x68k21jY5aN7 uHVg== X-Gm-Message-State: AOAM532fVFFE/TZ3Ymf9VibxucKD7+uQZFPNXO9NN09buJaZ4TJipnkx RaeU/Agv7bNMmH5RNgiBDbQ0Wxjm3MBFvSlvH0KSlWdFlFxQf/PgXSlW0J677tD6ZS06tIeSrhO 4F3piN0PRckTHkg== X-Received: by 2002:adf:f2d0:: with SMTP id d16mr6386591wrp.332.1601419448302; Tue, 29 Sep 2020 15:44:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz32LQg/FraBPNB2aGTQWNffth7R+ByzmBlrprh0rhJbQuVc73LtYh8e6YQu2ibVKmeTxTjoQ== X-Received: by 2002:adf:f2d0:: with SMTP id d16mr6386570wrp.332.1601419448124; Tue, 29 Sep 2020 15:44:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Fam Zheng , Peter Maydell , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Claudio Fontana Subject: [PATCH v4 02/12] meson: Allow optional target/${ARCH}/Kconfig Date: Wed, 30 Sep 2020 00:43:45 +0200 Message-Id: <20200929224355.1224017-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Extend the generic Meson script to pass optional target Kconfig file to the minikconf script. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini --- We could use fs.exists() but is_file() is more specific (can not be a directory). Cc: Paolo Bonzini Cc: Claudio Fontana --- meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index d36dd085b5..9ab5d514d7 100644 --- a/meson.build +++ b/meson.build @@ -529,6 +529,7 @@ kconfig_external_symbols =3D [ ] ignored =3D ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS'] =20 +fs =3D import('fs') foreach target : target_dirs config_target =3D keyval.load(meson.current_build_dir() / target / 'conf= ig-target.mak') =20 @@ -569,8 +570,13 @@ foreach target : target_dirs endforeach =20 config_devices_mak =3D target + '-config-devices.mak' + target_kconfig =3D 'target' / config_target['TARGET_BASE_ARCH'] / 'Kco= nfig' + minikconf_input =3D ['default-configs' / target + '.mak', 'Kconfig'] + if fs.is_file(target_kconfig) + minikconf_input +=3D [target_kconfig] + endif config_devices_mak =3D configure_file( - input: ['default-configs' / target + '.mak', 'Kconfig'], + input: minikconf_input, output: config_devices_mak, depfile: config_devices_mak + '.d', capture: true, --=20 2.26.2 From nobody Sun Feb 8 17:13:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601419459; cv=none; d=zohomail.com; s=zohoarc; b=FtJcj1LRkQUKfUFOI0YdBLMNSjvUKoqEzbJ5k49g85R2jCnIaRo/GyiL3O1jG3TqSSVgz16Y3CHlg2QnJeEa24h7/SCdEVRra64DmZonKNcMaISO7L8bvK1d2egeUyDuCJwTvL/OijGzP+Jpw+Sr5FwLqKbvh0nStHMHma55Th8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601419459; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=fVtzhoPQ9oRe5A4whgi5/tX3r24KuxvOyig0n+4hw6k=; b=KGoQgbukAVL/owtdu1vrp/eJh7D2IXP7bbbMv3P+BzSdo5Q/H072vIhs+9+58cNb11alNmzdsseTuFHfjTotYM4hs0JJ7n73nrw+ZoeqNEkWihis9Z2NRwWD3p3/3bsN1+t/cgM681Uof62/OYtCAl10MR19N+8pFVynzbIPtKM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601419459673817.8423138626003; Tue, 29 Sep 2020 15:44:19 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-586-DHn-1WwBPLee-QaGrKCSsg-1; Tue, 29 Sep 2020 18:44:14 -0400 Received: by mail-wr1-f71.google.com with SMTP id w7so2370181wrp.2 for ; Tue, 29 Sep 2020 15:44:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id l18sm7902646wrp.84.2020.09.29.15.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:12 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419458; 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=fVtzhoPQ9oRe5A4whgi5/tX3r24KuxvOyig0n+4hw6k=; b=XFf2SnG6KsBZ1frdBrJIbLUpjdZTD8vI/2e4xSFjnP3Na/VyxWzJ9v4Q5FT3eC5by0ljbi y1B7ARtJ+P5huaTYJM0N+euVBJdvcmBOuuZx3NEPycC/Hw1QgBF9xrYaeoOEXfKplK3aDw 0H/LpYKo9rkRvB+48Fn1PJ/5j0Ud73w= X-MC-Unique: DHn-1WwBPLee-QaGrKCSsg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fVtzhoPQ9oRe5A4whgi5/tX3r24KuxvOyig0n+4hw6k=; b=gFlX2v1KYBKk0c/rr9IkXFRk6kyqBz4mc7kisE7x5Z2uzGDkoU+46PdrLGPBWf6M2D kvUIbIusvuITbQ1Is+rdsQ9C8C+QeuQXYQQQ9MLKThWRRMFhubQ8VlqehEq+4VaTG/kT LP3yjVaqpOKIhPogp8xagBfppY5q4bbOxwb3XBTUwvte7t75+qq1oPVdYBedJVidlAFD C3CkZcgWku8j3O14wXEpFMl7wA9fL1GRIbVLJYAJ+cobjUBoEeTQy4jXyEvqayYgpDeU HQl0/LlOPO3rS4iu3vHGBfZBrGuDyVOrjvCi/hHGLplE9z1dNZCSWN6g+CrrWQuMhcva WtEA== X-Gm-Message-State: AOAM533FeiJKHD71DM/ejqxZZYG8UjBc4uZQBEzD6yadnwbAYwY2LXSb JjZ7fUOrgEkEQbUOK5rERgYlpFG5jpPv2/CEitjOvi1DMvm6z+d+0Iv2TZWmG0sbEGshVIb6ZRO /QFUoUyB0WQytjg== X-Received: by 2002:a5d:5261:: with SMTP id l1mr6619437wrc.193.1601419453412; Tue, 29 Sep 2020 15:44:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeOEbx68Td8hBaYyIFzxkCzoKhQ+EE4XU8IG3LB8RbTCWtKeOlhoOS8sgyI3yT3aeSBndgRw== X-Received: by 2002:a5d:5261:: with SMTP id l1mr6619416wrc.193.1601419453250; Tue, 29 Sep 2020 15:44:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Fam Zheng , Peter Maydell , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 03/12] target/arm: Select SEMIHOSTING if TCG is available Date: Wed, 30 Sep 2020 00:43:46 +0200 Message-Id: <20200929224355.1224017-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Add a kconfig entry which not explicitly selected by another entry, but which selects SEMIHOSTING if TCG is available. This avoids: /usr/bin/ld: libqemu-aarch64-softmmu.fa.p/target_arm_arm-semi.c.o: in fun= ction `do_arm_semihosting': target/arm/arm-semi.c:784: undefined reference to `qemu_semihosting_conso= le_outc' target/arm/arm-semi.c:787: undefined reference to `qemu_semihosting_conso= le_outs' /usr/bin/ld: target/arm/arm-semi.c:815: undefined reference to `qemu_semi= hosting_console_inc' Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 target/arm/Kconfig diff --git a/target/arm/Kconfig b/target/arm/Kconfig new file mode 100644 index 0000000000..972d9a1b9a --- /dev/null +++ b/target/arm/Kconfig @@ -0,0 +1,4 @@ +# arch-specific rule to select SEMIHOSTING if ARM && TCG +config ARM_SEMIHOSTING + =C2=A0 default y if TCG + select SEMIHOSTING --=20 2.26.2 From nobody Sun Feb 8 17:13:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601419462; cv=none; d=zohomail.com; s=zohoarc; b=Z0PfjxClquxm9prQm5+Uaj+3fBpQG//tE8iPC7KHBEeHvRwlhqe2IT7x3k1k+GVyQ0Qpu8JLdJU8V3DsuCSncsaxCMtLH5mTtwzBqCXHplhSHKJNYxLR93fuzae2Rcexq99r1FyFHqHYeBk1MWe85xjoVWlazKX2UnFiwlTMEFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601419462; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=9dR9Nk0eM9jSf6djV760qyeufq0GIQie0fmgNB3aO7w=; b=UvfAWFOWsyTdi7UwsW5kyINF1PXwsZvIlSd/VWANyvZB2zGk2WcZ1Z7Tj+SP+ThItB24yntTPeumckiqy8awsGr1IMiFwUK5DIKS2HwQN/dx13Ib9RnadlZCWVuzHGN7Zy/3zRNbSbgebTDm2cB42ZrMj6E84zWuZby0jXjJsUI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601419462816707.2833573074508; Tue, 29 Sep 2020 15:44:22 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-264-8qPIFFPCNMGnbMRLiCsTcA-1; Tue, 29 Sep 2020 18:44:19 -0400 Received: by mail-wm1-f71.google.com with SMTP id u5so2420093wme.3 for ; Tue, 29 Sep 2020 15:44:19 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id y1sm7440740wmi.36.2020.09.29.15.44.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:17 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419461; 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=9dR9Nk0eM9jSf6djV760qyeufq0GIQie0fmgNB3aO7w=; b=ABzl7VNu1PaIwvHqYBjXD9sL92SzShanvI7/wPHo5VkZ/djlfFseeq/RaRxhCGK9k45Fpo Qfdj6qsoHQnDoMYZD2S6+G38u8rIzApA/r7q8/O6F2MBrdjUebf3HXzIgWbHjqR3+p7O2v s+8IWxyVrC/kJxl5I5wAcrwgBcf5PkQ= X-MC-Unique: 8qPIFFPCNMGnbMRLiCsTcA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9dR9Nk0eM9jSf6djV760qyeufq0GIQie0fmgNB3aO7w=; b=oE2W6vUPMBVwe2iWTk75vBVI+Qrl0EsM2szPx/YEjYchj9dXvLFmC5ChYqLaHtDrxp i3mxWH0KBEoJy5w3+zYHr5LyMYNzHtrIC3UplKG38wlS9TyTCWezORB0LIzPjGcCp2WC 4TIGeSfi80k8FeTLuw2vISegzF5VOKr0EH1yfxwVBIYZWOFNR0AANLcSU8ZffDhdTgrv +Cq/CgDGh5Uep+/SOFs/FiQ+s49kfoJtKreQKEgNm2agBnWftZGcLgksJI97bLL8go5t Rz5WMkrZduBYzVuJA2ML+k8pbI6sI7BCrLM95R6RAOb2z6xb1DyL4VTF9UQhlSvRDvDV RFRA== X-Gm-Message-State: AOAM533CM+31+rLD1jy1Gph8fOkkUS2L5suxVcdWeCjusCTKcCfzBExl h03FmcW2pnRPLIZyGjz0Qcre/xI/jc2fLiN4qqsT18IjRNh4YNWE3VQvzmzBdGLqL8S8chkA85H Q21KqBp36d9rBTw== X-Received: by 2002:adf:fd01:: with SMTP id e1mr6312405wrr.44.1601419458524; Tue, 29 Sep 2020 15:44:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwh51NEq7twr61W/5e9Rg5U9losDLPsHpgTL0nTFBNwMoNiIws2/CzkKqcV0aZDFoO9xffGw== X-Received: by 2002:adf:fd01:: with SMTP id e1mr6312389wrr.44.1601419458354; Tue, 29 Sep 2020 15:44:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Fam Zheng , Peter Maydell , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 04/12] target/arm: Restrict ARMv4 cpus to TCG accel Date: Wed, 30 Sep 2020 00:43:47 +0200 Message-Id: <20200929224355.1224017-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) KVM requires a cpu based on (at least) the ARMv7 architecture. Only enable the following ARMv4 CPUs when TCG is available: - StrongARM (SA1100/1110) - OMAP1510 (TI925T) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 7d040827af..b546b20654 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -1,3 +1,7 @@ +config ARM_V4 + bool + select TCG + config ARM_VIRT bool imply PCI_DEVICES @@ -30,6 +34,7 @@ config ARM_VIRT =20 config CHEETAH bool + select ARM_V4 select OMAP select TSC210X =20 @@ -244,6 +249,7 @@ config COLLIE =20 config SX1 bool + select ARM_V4 select OMAP =20 config VERSATILE --=20 2.26.2 From nobody Sun Feb 8 17:13:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601419469; cv=none; d=zohomail.com; s=zohoarc; b=QHFwGJz+4/S+gckF5a9ymZTe5QStrypGEy9OGTadCMhx76zt77gBQnZB45WpaTzB668DbD+RV7bj8G5jIZ6WI8+MgGm3LxRA5kAqQ8JYO6SwOrZnOZPy2c7GMYOoDJCTrrAuR8gCGG3CI09T+ZPG2LHs8O1zk8IxQi7EMAWBYMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601419469; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=o4HjcXP3qwr6X7IJP4D/f1xvLwTdd8bPvM5GyTvUpNE=; b=j86hhgnCfmjtbbW2hEhFe132Yh0oyWLXpjbzUG4jrlczGW+afWQm8GgX32zEmOgZLgS/f+TPHHcY1TDrj9snDurcosvwXRgmJTINDP6Tbl75wUbPCo7jWcNQCL96qBoSz/rODC8U6WdQRW9wZ0mXbl3rOyYc9NTh4OHbvKV2JWU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601419469161758.3870023270033; Tue, 29 Sep 2020 15:44:29 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-37-sh5MBfOFP5GBxehc8xJSsg-1; Tue, 29 Sep 2020 18:44:24 -0400 Received: by mail-wr1-f69.google.com with SMTP id a10so2314179wrw.22 for ; Tue, 29 Sep 2020 15:44:24 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id l4sm8483138wrc.14.2020.09.29.15.44.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419467; 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=o4HjcXP3qwr6X7IJP4D/f1xvLwTdd8bPvM5GyTvUpNE=; b=EQjuJfL50jf/iOcpUPi5/lR86CRfbIgfyuuuW1bgilxwjRWY0kfqN+oOtXR3nlZlNiP+yr AJjvnQlvg9ayVMvCw1uv5xDRUPpp1jBMuLYBReNQxRe4E3zeV2Q7/ZIeaEW60BSyewRALx UgOuqz61/BZRRoTWtOvXhkK6TX9LcGg= X-MC-Unique: sh5MBfOFP5GBxehc8xJSsg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o4HjcXP3qwr6X7IJP4D/f1xvLwTdd8bPvM5GyTvUpNE=; b=mVmxCS3sqmDfJDpkrUnUtOofdzbe1ypCR7XCGhE5huyl1cqEv6nGPFYOnCo3D2tjLG lZZWHLSESvvu2mlrrAWoT4HgEt60WBQ2U1un02G4v9W9EKvMjXzD00bBTappW0EV3H1d Y4b+UTQ3Wj0huQG6XCoR0+5ZUOEpPKdMr8FEgfkY82RN4FsRe2ZN5vUcOiQOXBsOPQCt 32tmDpDDqyIkclwjzYFpesUwRMs6RS8//0YQitWoDuPOMD0WhPJ3IlBKhh0QlfFEVkHL yWHtBB5sltmPa00c8xAPJDPfCRE9sMIxKZeh10ws1Va6TG5vrk3d/mI1fjG3y6QL04ih phOA== X-Gm-Message-State: AOAM531RYCpTfdhVI3CWAGWjy0s0s2gYRtrzTKj9gcPYzkz1YAwd3jfx 9IHvrI/16y6/2Bsdnm04wCAjgtZQ/5PFEcq/1bBRxzG02VtysvVPVeTRF9uZI7xnNHltIRgh7rf LRV8X1FX2VwYQFQ== X-Received: by 2002:adf:83c3:: with SMTP id 61mr6487529wre.287.1601419463553; Tue, 29 Sep 2020 15:44:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiKG03zq+uHxa3VA+7jIh3VXyDityJ8NdNAGTWh+0EeM/7OentrHFt37Qc69GgvEZbvFzI7w== X-Received: by 2002:adf:83c3:: with SMTP id 61mr6487523wre.287.1601419463375; Tue, 29 Sep 2020 15:44:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Fam Zheng , Peter Maydell , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 05/12] target/arm: Restrict ARMv5 cpus to TCG accel Date: Wed, 30 Sep 2020 00:43:48 +0200 Message-Id: <20200929224355.1224017-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) KVM requires a cpu based on (at least) the ARMv7 architecture. Only enable the following ARMv5 CPUs when TCG is available: - ARM926 - ARM946 - ARM1026 - XScale (PXA250/255/260/261/262/270) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/Kconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index b546b20654..d2876b2c8b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -2,6 +2,10 @@ config ARM_V4 bool select TCG =20 +config ARM_V5 + bool + select TCG + config ARM_VIRT bool imply PCI_DEVICES @@ -44,6 +48,7 @@ config CUBIEBOARD =20 config DIGIC bool + select ARM_V5 select PTIMER select PFLASH_CFI02 =20 @@ -73,6 +78,7 @@ config HIGHBANK =20 config INTEGRATOR bool + select ARM_V5 select ARM_TIMER select INTEGRATOR_DEBUG select PL011 # UART @@ -99,6 +105,7 @@ config MUSCA =20 config MUSICPAL bool + select ARM_V5 select BITBANG_I2C select MARVELL_88W8618 select PTIMER @@ -138,6 +145,7 @@ config OMAP =20 config PXA2XX bool + select ARM_V5 select FRAMEBUFFER select I2C select SERIAL @@ -254,6 +262,7 @@ config SX1 =20 config VERSATILE bool + select ARM_V5 select ARM_TIMER # sp804 select PFLASH_CFI01 select LSI_SCSI_PCI @@ -373,6 +382,7 @@ config NPCM7XX =20 config FSL_IMX25 bool + select ARM_V5 select IMX select IMX_FEC select IMX_I2C @@ -399,6 +409,7 @@ config FSL_IMX6 =20 config ASPEED_SOC bool + select ARM_V5 select DS1338 select FTGMAC100 select I2C --=20 2.26.2 From nobody Sun Feb 8 17:13:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601419472; cv=none; d=zohomail.com; s=zohoarc; b=PYCurdmVCaCOxcfQzC5rS66ki9Hd0d4odD0LytJLDFcIB8V6+/mVT9Zd8BrHEdxYcrheSMlxhhEUXPgucGG/sViXNg9XjQydDd3pWcuFwFcZqkNxAKSWPWvITRgQ36DONuLqqVdtSgRK0IpxtNka9EZjrIQGRpz9eiRbtehtL98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601419472; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=i7QZwS1vfY6pxc/yL3I5YaiK5BX/yKl7ag6KjP4fakU=; b=goNtD4cihO2r0AD6RqJTxTT1zdJYn73x2s1vDLfYf13DazMsZ8eA1zB0aGCBszObvhDhHNtKe4wK2kAeNN1dA2EH7ZmESOJytqrtTA7v/GtZ8fmdq0s2JqYV5jBl18Am4mgLDJH6lNdCwW4C2V6SB/VQj+n7QZk+ZRP8BsAhm/g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 160141947286814.968116785765005; Tue, 29 Sep 2020 15:44:32 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-19-LUP03Sg2OCinH1ShlqyRmQ-1; Tue, 29 Sep 2020 18:44:29 -0400 Received: by mail-wr1-f69.google.com with SMTP id g6so2366665wrv.3 for ; Tue, 29 Sep 2020 15:44:29 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id j10sm7850036wrn.2.2020.09.29.15.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419471; 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=i7QZwS1vfY6pxc/yL3I5YaiK5BX/yKl7ag6KjP4fakU=; b=GpG+b/lWH5CaNRA7+1GUQ57KcLCLoLgqp74gvQPvjXvBHIwc/RKgzni9R7q1xtS0MLzQlI eGIrcgR3ShObSxtLSWOAjvjdp0jyLP7MY8SqrOtt+0k/45lAyhZO7AGuINbmKq44QCFSAk sSYEwiL6MNKOCWrLN8Eyz4j3Mky8uww= X-MC-Unique: LUP03Sg2OCinH1ShlqyRmQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i7QZwS1vfY6pxc/yL3I5YaiK5BX/yKl7ag6KjP4fakU=; b=WKmiKNGb3umMLlPeWS9pmD1kDLnIbf7D0dzzbZkfjMJ6MR9ItWvxS49ARXFm77hBpi GbzPg8rbX0pc7BNjPpZ0cK6HssFxGg2MPLtiwwenJ21iNu+QZ1XyQNSW/EptqmIdZKwS is8ceYVqbKWsFfYcyGVPMCeYI9Lq/rOiQDDbrxXO9Oaw4dO/MuZD4UzWC4kIVK/xM9/E 98lUKZ8L896ncrH0IgaDoNSnejw6U/a/IFnbAVHMqsasgXJ3xGrRZwGyuYy52P6fa+H9 FATwRvrxetoiBOoNa318haUJAePrzgZmv27OgNBOhAbLFvngrFLcgmgDnFUHX3qpFuVu rqlQ== X-Gm-Message-State: AOAM5307ViguiboKwpNaKBcUOXgx2K9l2WD+umJedcxsYeGoM3Bc93HW zT8TWlLexZCKMhowciU0qZk5reXCLmWviBLDPz2FSwV+Wc9SDYhMYiifDWhbM5xN3Ca+lZAYfiH k1ao5yvijkcFnMg== X-Received: by 2002:adf:dcd1:: with SMTP id x17mr7104477wrm.150.1601419468593; Tue, 29 Sep 2020 15:44:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweTjjV4JKSEFC7bdGe1az/c9DKmrvmR/EC6wrTRHkRT+Xz0xLKGZVKIrTri3by7ejJMMBAyw== X-Received: by 2002:adf:dcd1:: with SMTP id x17mr7104459wrm.150.1601419468383; Tue, 29 Sep 2020 15:44:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Fam Zheng , Peter Maydell , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 06/12] target/arm: Restrict ARMv6 cpus to TCG accel Date: Wed, 30 Sep 2020 00:43:49 +0200 Message-Id: <20200929224355.1224017-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) KVM requires a cpu based on (at least) the ARMv7 architecture. Only enable the following ARMv6 CPUs when TCG is available: - ARM1136 - ARM1176 - ARM11MPCore - Cortex-M0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index d2876b2c8b..e01eb55bc0 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -6,6 +6,10 @@ config ARM_V5 bool select TCG =20 +config ARM_V6 + bool + select TCG + config ARM_VIRT bool imply PCI_DEVICES @@ -123,6 +127,7 @@ config NETDUINOPLUS2 =20 config NSERIES bool + select ARM_V6 select OMAP select TMP105 # tempature sensor select BLIZZARD # LCD/TV controller @@ -391,6 +396,7 @@ config FSL_IMX25 =20 config FSL_IMX31 bool + select ARM_V6 select SERIAL select IMX select IMX_I2C --=20 2.26.2 From nobody Sun Feb 8 17:13:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601419478; cv=none; d=zohomail.com; s=zohoarc; b=EFXfnW5+xQFIqyw7o2czywjKcFg5Zb/uJfRJz+nCAGeVszu7sxn/W5CWk59H6ohe1Oaq6juYecy9OyJ2+R5JdotkVvPKsKfV3YJoQ0W2sis7dDi+f6D99AhsN+nwNb5/OMbUK7V0+oVz/MInwt9O/2JayMrXUCYZ4qiu7B6zApo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601419478; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=O2ptRm8f/lOeml0jS1cRqmJHNlSkXaKtAQigKfi/TLU=; b=C4JTFIkuvNLIFViGueFV/7CSY8h6m+W7uyiH9mSEoW3e9HCEpAM/ri+BxSt9nC94CENYYiJuwd5cw5tJSmFltcbDp398ffnW/iltVwPAS1HjNqLzy7IiGPbTDXpUKNQYXRny+415mNbuztvr5S3tao9d3POKSMh9XQ3P5qahxBs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601419478421426.57701264423383; Tue, 29 Sep 2020 15:44:38 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-345-mjgDi2L9NNqt5sJxt_YCiw-1; Tue, 29 Sep 2020 18:44:36 -0400 Received: by mail-wr1-f71.google.com with SMTP id g6so2366729wrv.3 for ; Tue, 29 Sep 2020 15:44:35 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id m10sm7056524wmi.9.2020.09.29.15.44.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:33 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419477; 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=O2ptRm8f/lOeml0jS1cRqmJHNlSkXaKtAQigKfi/TLU=; b=dEdygl9eht6elF45afhIPLeZQKeAsv95AIysp8tAUKvpKsdL0BGI3+nvV7EEBUIszmtyZv Bkg3YX+LZawmGBbfFmTWiqryQYzJMNhBdnw6jFp8GkH6eILYHk5a/XvmzeKhoYTuQshj2g 6Zv4Su6LR3lFmeghkWO8Z79X+r5hqXQ= X-MC-Unique: mjgDi2L9NNqt5sJxt_YCiw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O2ptRm8f/lOeml0jS1cRqmJHNlSkXaKtAQigKfi/TLU=; b=evPltdMD2M57tYUkjvf2/55/epsvBIwNEQtNCvtt/QnzP901Xn5bQSvAmTRwjCotDn GudM/XitmA7SBf5RkayHwz8942cN1qjgltOGOt5EbZYctN1QJG9n9RldumAqTl8PXe8T 9OlhcJ10Gki1jiIm9IhKBKbSWZpNgVBmXW306gRDD5LgOd7qz8VTYtHtXe6s69oew3k8 Whv8zowrva3SqlP1bwnW8CJ1W28Fxs6+ruftbzEsJBWy8Cnugg6V9d0Y3o1RFx01IUiM mWoFCE8+SmQnAfCB728LjS2ov/E8eZu0D1Zcx5CbBKmKWQC9z4yPbFpDVHcc2DQsoNb9 785Q== X-Gm-Message-State: AOAM5321HV4VjSbKha8sEVDjbRc8j1l9yT6wk9IS7mmdAkDsXr91O3LM A/pK1xu8rOanbHOXXnPCeqYoolHE7HqAM2HK4i8QQi+yXu/ZoGMrQQ0LDfkAzu5ZzQ137sYgedM L9HdtX/SsS+mxjA== X-Received: by 2002:a5d:444b:: with SMTP id x11mr6634820wrr.402.1601419473913; Tue, 29 Sep 2020 15:44:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4aaS54Wk933OJIRQKbP4cZ/YFPBu2pchNU62vp4qGrFYgoGCxMVfKfqvmCyuVMDLcMh8vXQ== X-Received: by 2002:a5d:444b:: with SMTP id x11mr6634802wrr.402.1601419473707; Tue, 29 Sep 2020 15:44:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Fam Zheng , Peter Maydell , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 07/12] target/arm: Restrict ARMv7 R-profile cpus to TCG accel Date: Wed, 30 Sep 2020 00:43:50 +0200 Message-Id: <20200929224355.1224017-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) A KVM-only build won't be able to run R-profile cpus. Only enable the following ARMv7 R-Profile CPUs when TCG is available: - Cortex-R5 - Cortex-R5F Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index e01eb55bc0..7f19872722 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -10,6 +10,10 @@ config ARM_V6 bool select TCG =20 +config ARM_V7R + bool + select TCG + config ARM_VIRT bool imply PCI_DEVICES @@ -358,6 +362,7 @@ config XLNX_ZYNQMP_ARM bool select AHCI select ARM_GIC + select ARM_V7R select CADENCE select DDC select DPCD --=20 2.26.2 From nobody Sun Feb 8 17:13:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601419485; cv=none; d=zohomail.com; s=zohoarc; b=ln/1un52SX6HhDsgXLYU0gSYV/lsH0mh+BM9a+WCfW0LjiujHLFsRZJyno4t8bHJLgEgmHjJIRQH5+HTOaIaKaCLPw+GZXWwmZ4FyI7PH8Jn07vxM++h/iTgse10st8H5uu21HPPada8bFz7aRBSSkuu1daDjIlpSdSGJE8X9AM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601419485; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=VMKffrN5obKOm6UxS550K4u6DmnYBBMm9AG93ufLP5A=; b=f94yDh6f+Rox1DUE0iX+QK9bTbyARHOJ18cIsKyoJmGEP80b0bxQeOjC4pJ9FnuhpKWjX87CITHmoah2l9nDkLrsnrxvdXARpUYJ8awOrkzcfko94dI4heiwqlGAgIk7fbsPf3iBaPZWqGJ31nrdJEzbMEQp0A1ewjc9MjK5M+U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601419485184364.4830995117503; Tue, 29 Sep 2020 15:44:45 -0700 (PDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-574-OjThG59cNOiTJ4cInZw11Q-1; Tue, 29 Sep 2020 18:44:40 -0400 Received: by mail-wm1-f69.google.com with SMTP id x6so2427331wmi.1 for ; Tue, 29 Sep 2020 15:44:39 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id l17sm6922065wme.11.2020.09.29.15.44.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:38 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419483; 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=VMKffrN5obKOm6UxS550K4u6DmnYBBMm9AG93ufLP5A=; b=YtpuFudePOltjaINlIOzJRfpPIqF+lOCT8jECN3o0JLJIri5hBftASfa9kg0IRbQq4xUh5 SY4ThrKF4fqizjl9dzI1V90NqNrsevsmWnsys2La3JaiYfd2noPA1NNSHj3OJH+oZlaRkC Xn2QAxKWHc5dEq1Fj3vemdBIgjo1abE= X-MC-Unique: OjThG59cNOiTJ4cInZw11Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VMKffrN5obKOm6UxS550K4u6DmnYBBMm9AG93ufLP5A=; b=mJqUavaJkLUHTtjnpvDgZicBtRcfMAcD/OxxHPV3PwqVC0czlxl6n1wYAJHaSfqiWC toEkMJiTFBLz20i9ttqnzr7N4pcmS7AK6Vz2SL/mlTeoSCEIUo8Xzdvz3kC/Ju7vOd6+ UPhmxv1z61RdEUj71d5SVXXnTi+SQBeUVHgDTFEN99fEti8s6a66WL/hdOaOe3CQps0W 21Eq6MKCcW5HDd1zx3DM3JAEOw6Cejlps7OTJsdkxsfQV7v3aR3ZjuG7CbDjayUVRpeR UHZW0UdIh3TxCs84zmqruDvYE8zxKfcrAUd9tmND4yJ8QXAiYXFwheiZ1p5gC5WXQ+rA Ndpg== X-Gm-Message-State: AOAM531W8nX87EoJWsg7wwcAQupftINiiRpmpxhpDGftHwU7Mq3+Q7UH zecfAhT2FcWIeG2do5NUUV94aTiCvFolXBpIOQ3IKDOVEsQeJv3zYP9MyOur8ZLEcNBSNAatSW0 oaguOuqape6EytA== X-Received: by 2002:a7b:c76d:: with SMTP id x13mr6762363wmk.10.1601419478956; Tue, 29 Sep 2020 15:44:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxd5/l6Pz82+iT32jI8EMtGES+WPwtktxL0xH6iDe0EYmyk+iEByXkfuzuL6KdhyW+6NVNK1w== X-Received: by 2002:a7b:c76d:: with SMTP id x13mr6762351wmk.10.1601419478789; Tue, 29 Sep 2020 15:44:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Fam Zheng , Peter Maydell , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 08/12] target/arm: Restrict ARMv7 M-profile cpus to TCG accel Date: Wed, 30 Sep 2020 00:43:51 +0200 Message-Id: <20200929224355.1224017-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) A KVM-only build won't be able to run M-profile cpus. Only enable the following ARMv7 M-Profile CPUs when TCG is available: - Cortex-M0 - Cortex-M3 - Cortex-M4 - Cortex-M33 We don't need to enforce CONFIG_ARM_V7M in default-configs because all machines using a Cortex-M are already explicitly selected. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 3 --- hw/arm/Kconfig | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 08a32123b4..002c97862b 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,8 +1,5 @@ # Default configuration for arm-softmmu =20 -# TODO: ARM_V7M is currently always required - make this more flexible! -CONFIG_ARM_V7M=3Dy - # CONFIG_PCI_DEVICES=3Dn # CONFIG_TEST_DEVICES=3Dn =20 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 7f19872722..15faa2f2d7 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -14,6 +14,10 @@ config ARM_V7R bool select TCG =20 +config ARM_V7M + bool + select TCG + config ARM_VIRT bool imply PCI_DEVICES --=20 2.26.2 From nobody Sun Feb 8 17:13:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601419488; cv=none; d=zohomail.com; s=zohoarc; b=dKK5JZ3Y7zfXHssHxCDHQkobk1ZiH+whdl8FsspCBnbwU8L9wce+xOAJG+wkAcJmMkyst52xRZ00DWyfow9F3JSZGH2BZ+BUVpViAjcuBi9gDfWJZwciVKTzfC5hQeCXedvWTWWRbOIjPQGH4fl1YlYBjJ7PrXqlf1ib/2A2NGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601419488; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=p7uLIKQXb5D6cyBHRbAjul4kYmamhdwITN6LVBpYWc0=; b=AsQq5b090Lnl4WVI/9/n3LdXPZ7VWJhTTdCuVCQLHlcmtPC0Z6pWaIGWuH4UmOBXzoO6uq5HTlOxsZmekVwcSeQt4dcBGgU80NIO2enkYUk2Wn8pyS/fq7qnjG3LPlkCud1FnWRC8qVzh18wpU5t+Dy7qNf7MgGJ9Z96eFJCt6s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601419488195667.136343679842; Tue, 29 Sep 2020 15:44:48 -0700 (PDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-328-sFi8Qz1OM8CJdxi7Hg6kYA-1; Tue, 29 Sep 2020 18:44:45 -0400 Received: by mail-wm1-f70.google.com with SMTP id m25so2429429wmi.0 for ; Tue, 29 Sep 2020 15:44:45 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id 70sm7516873wme.15.2020.09.29.15.44.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:43 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419486; 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=p7uLIKQXb5D6cyBHRbAjul4kYmamhdwITN6LVBpYWc0=; b=NEJmwD5URJ2F93kKpH/93UgKtvkTbk2flyvDspyUtJ/bK1EyONBHsVWZymmPu6bcEwn0oj cVCfViSRn6owvT54NGKgw//ErkZEzIj5Sccy1m1os86vUeU+S/kNs4/qVuSyDG2sixJLTU UuxB5rPp9LA9LKc68xjCH7saSaPY5rc= X-MC-Unique: sFi8Qz1OM8CJdxi7Hg6kYA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p7uLIKQXb5D6cyBHRbAjul4kYmamhdwITN6LVBpYWc0=; b=HVeB96vL37KBQMHZwtZ6sjTUmE/z7IopTVvShEIUwdCD8SUDMPaTSxU5VYL6jmNU2+ dX97ZQ3BvKLQ8OGqT3M/kt+QoknjOfNTgAfRxciDTsjz3GoG4ubKwqceVVBC789nVGNZ xh1AheDcL2M2XAkK8xWOPS2gvml1AAhQ6/eOwKssNCfa/WS4dcO0iB76jFvzZvrPxGxO AP1cMdtya+HiLiTbaZnAiOn3sYI1MxKepyKCnCi2qybUvgPTI4+hM5qEYaoWK4MW3Lao qhLXGPX0QoRE5apeb/R1qO2VIx3cRVbpwmVbujVlPjcpEwXJVPWJMIujBR1oKmw2Q38Z llJg== X-Gm-Message-State: AOAM532nac+OtB0ydUWkgrusRy6/mKqF0tzeMOVaew5TJciZMaOimMki /fkM+lBfpGYUdgMW2lDIrmQ/3Ab8Yq9YZW6jUD7kw/7JhEV5VgMGaVw8qLyDkrEb1wGqXdLm8+4 FeoBk1SlYbXw3sg== X-Received: by 2002:a1c:7215:: with SMTP id n21mr7195512wmc.154.1601419483961; Tue, 29 Sep 2020 15:44:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9RqoWhYxxMGceyGdVBz1Ep153XBWsJa08idXxAaedi/xi2UMsikdfSG5GMUTBNffkCC6uig== X-Received: by 2002:a1c:7215:: with SMTP id n21mr7195501wmc.154.1601419483746; Tue, 29 Sep 2020 15:44:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Fam Zheng , Peter Maydell , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 09/12] target/arm: Make m_helper.c optional via CONFIG_ARM_V7M Date: Wed, 30 Sep 2020 00:43:52 +0200 Message-Id: <20200929224355.1224017-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Thomas Huth We've already got the CONFIG_ARM_V7M switch, but it currently can not be disabled yet. The m_helper.c code should not be compiled into the binary if the switch is not enabled. We also have to provide some stubs in a separate file to make sure that we still can link the other code without CONFIG_ARM_V7M. Signed-off-by: Thomas Huth Message-Id: <20190903154810.27365-4-thuth@redhat.com> [PMD: Keep m_helper-stub.c but extend it, rewrite the rest] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Rewrite since v3, therefore removed Richard R-b tag. --- target/arm/cpu.h | 12 ------- target/arm/cpu_tcg.c | 4 ++- target/arm/helper.c | 7 ---- target/arm/m_helper-stub.c | 73 ++++++++++++++++++++++++++++++++++++++ target/arm/meson.build | 4 ++- 5 files changed, 79 insertions(+), 21 deletions(-) create mode 100644 target/arm/m_helper-stub.c diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 6036f61d60..c5f4c1b181 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2117,12 +2117,6 @@ uint32_t arm_phys_excp_target_el(CPUState *cs, uint3= 2_t excp_idx, /* Interface between CPU and Interrupt controller. */ #ifndef CONFIG_USER_ONLY bool armv7m_nvic_can_take_pending_exception(void *opaque); -#else -static inline bool armv7m_nvic_can_take_pending_exception(void *opaque) -{ - return true; -} -#endif /** * armv7m_nvic_set_pending: mark the specified exception as pending * @opaque: the NVIC @@ -2228,13 +2222,7 @@ int armv7m_nvic_raw_execution_priority(void *opaque); * @secure: the security state to test * This corresponds to the pseudocode IsReqExecPriNeg(). */ -#ifndef CONFIG_USER_ONLY bool armv7m_nvic_neg_prio_requested(void *opaque, bool secure); -#else -static inline bool armv7m_nvic_neg_prio_requested(void *opaque, bool secur= e) -{ - return false; -} #endif =20 /* Interface for defining coprocessor registers. diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index 00b0e08f33..563b0e82bc 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -15,6 +15,7 @@ /* CPU models. These are not needed for the AArch64 linux-user build. */ #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) =20 +#ifndef CONFIG_USER_ONLY static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { CPUClass *cc =3D CPU_GET_CLASS(cs); @@ -38,6 +39,7 @@ static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int = interrupt_request) } return ret; } +#endif /* CONFIG_USER_ONLY */ =20 static void arm926_initfn(Object *obj) { @@ -602,9 +604,9 @@ static void arm_v7m_class_init(ObjectClass *oc, void *d= ata) acc->info =3D data; #ifndef CONFIG_USER_ONLY cc->do_interrupt =3D arm_v7m_cpu_do_interrupt; + cc->cpu_exec_interrupt =3D arm_v7m_cpu_exec_interrupt; #endif =20 - cc->cpu_exec_interrupt =3D arm_v7m_cpu_exec_interrupt; cc->gdb_core_xml_file =3D "arm-m-profile.xml"; } =20 diff --git a/target/arm/helper.c b/target/arm/helper.c index 88bd9dd35d..5196a17bdb 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -12653,13 +12653,6 @@ int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx) } } =20 -#ifndef CONFIG_TCG -ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate) -{ - g_assert_not_reached(); -} -#endif - ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el) { if (arm_feature(env, ARM_FEATURE_M)) { diff --git a/target/arm/m_helper-stub.c b/target/arm/m_helper-stub.c new file mode 100644 index 0000000000..6d751424e8 --- /dev/null +++ b/target/arm/m_helper-stub.c @@ -0,0 +1,73 @@ +/* + * ARM V7M related stubs. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include "qemu/osdep.h" +#include "cpu.h" +#include "exec/helper-proto.h" +#include "internals.h" + +void HELPER(v7m_bxns)(CPUARMState *env, uint32_t dest) +{ + g_assert_not_reached(); +} + +void HELPER(v7m_blxns)(CPUARMState *env, uint32_t dest) +{ + g_assert_not_reached(); +} + +uint32_t HELPER(v7m_mrs)(CPUARMState *env, uint32_t reg) +{ + g_assert_not_reached(); +} + +void HELPER(v7m_msr)(CPUARMState *env, uint32_t maskreg, uint32_t val) +{ + g_assert_not_reached(); +} + +uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr, uint32_t op) +{ + g_assert_not_reached(); +} + +void HELPER(v7m_preserve_fp_state)(CPUARMState *env) +{ + g_assert_not_reached(); +} + +void write_v7m_exception(CPUARMState *env, uint32_t new_exc) +{ + g_assert_not_reached(); +} + +void HELPER(v7m_vlldm)(CPUARMState *env, uint32_t fptr) +{ + g_assert_not_reached(); +} + +void HELPER(v7m_vlstm)(CPUARMState *env, uint32_t fptr) +{ + g_assert_not_reached(); +} + +ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate) +{ + g_assert_not_reached(); +} + +#ifndef CONFIG_USER_ONLY + +bool armv7m_nvic_can_take_pending_exception(void *opaque) +{ + g_assert_not_reached(); +} + +void arm_v7m_cpu_do_interrupt(CPUState *cs) +{ + g_assert_not_reached(); +} + +#endif /* CONFIG_USER_ONLY */ diff --git a/target/arm/meson.build b/target/arm/meson.build index f5de2a77b8..f6a88297a8 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -21,7 +21,6 @@ arm_ss.add(files( 'gdbstub.c', 'helper.c', 'iwmmxt_helper.c', - 'm_helper.c', 'neon_helper.c', 'op_helper.c', 'tlb_helper.c', @@ -30,9 +29,12 @@ arm_ss.add(files( 'vfp_helper.c', 'cpu_tcg.c', )) +arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false:= files('m_helper-stub.c')) + arm_ss.add(zlib) =20 arm_ss.add(when: 'CONFIG_TCG', if_true: files('arm-semi.c')) +arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c')) =20 arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_fals= e: files('kvm-stub.c')) =20 --=20 2.26.2 From nobody Sun Feb 8 17:13:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601419493; cv=none; d=zohomail.com; s=zohoarc; b=Ym876YqaI3lBJJyHsCkLMNTwbuO90QNjMDjHziJ8AEd90nW3nClbDnC7zhYzZfURwVFSdD44sepWaBShBa0Z9OcIZPloGDcEZZeGzhK2WgUfskJ9k5eixUTg5JjO8e/Ma44ZyI7FVwiE4ACF4cztljrnzyTvRwnfhlGdTjy7h+w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601419493; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=HavTR5jlyYY+4DgutSw3BluUcAU3B5yxPF0wWIdw1vM=; b=Ith/naPdiUfc7Mh8HSPMwus6LO5VKBMqRFVTRNweSApIsW1FSQ4HyMAMUfCJ6kwrqoiUnQa16A6w4b8njgSL/IMRCdQo2laRVqALbY4l8aHR6U4HB+VOwwgn6k7UgXERq0H56gjENVtndOUPiNish93kpnW0U9GxkVA8bBWAPe8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601419493700994.540329481162; Tue, 29 Sep 2020 15:44:53 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-550-BuR3s6SPPqycYNPg7NO67A-1; Tue, 29 Sep 2020 18:44:50 -0400 Received: by mail-wr1-f69.google.com with SMTP id l9so2330741wrq.20 for ; Tue, 29 Sep 2020 15:44:50 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id t4sm8074682wrr.26.2020.09.29.15.44.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:48 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419492; 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=HavTR5jlyYY+4DgutSw3BluUcAU3B5yxPF0wWIdw1vM=; b=hIY5RPFr1cyNnrvMKqn85Q5vz47n1KJcDmnKn9pwPPbKw7ZNZPPNwreoXSHgak6nQcvuyh ep5jT6kKQ2rqEVyewJpnDBV5GAeLot6Fs/90zjsZvsznDNTKmM/HBTynaJA1XlLPml4vGj JRX2zBt+LVXOM1oGNSL2lxUpa11In+I= X-MC-Unique: BuR3s6SPPqycYNPg7NO67A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HavTR5jlyYY+4DgutSw3BluUcAU3B5yxPF0wWIdw1vM=; b=QUWamu7eL/zhnHwtCApB0rHPtZzIeT50YXa90QJVzAEBql85y6nURwrQl89ZhTjdqh 4vF+7pwMIBObBi/KUBlXU72EcRjIN6pFT1qQS/HIlOCvGrxrKO+G0snbTY3ggztRpgBQ hgqcdJr83CxBlq8TF+t75v0QDv22UEUK7nuqewqq04HcJLGHFUn/P5XzJ0Vr5Ii3pEuV HeijY2/8kYCNOJhBzJVxdeGYaKzp+3BMMkXr0DQmJRl9baS4HWMP2/mHfSVtBjXLBGVC /7SxrCt8IwsKdF15I1CTWDYkh8EH6pSEPxSfE2Do3tGJuKpFeUS0d/RJHaG3KylQT9QD 6Uzg== X-Gm-Message-State: AOAM530W57CYfVbwuJ7SG+gaK2HTDWdXfg9exZ/TYQAnVEr6CX0wT1gH 3HHhNNMuX5IyeuFZ17Yyauhr8BvZ44y4HbU9aTbP8ygSQAkulq2et31f2JsXQfFOC1tZUfL/6OW G9t7H8EXOrCM+uA== X-Received: by 2002:adf:f552:: with SMTP id j18mr7126146wrp.128.1601419489040; Tue, 29 Sep 2020 15:44:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8PSYX9/XyNa0d4ovucJYi4QupKVwuKDBSqVqoLbQhr626hwpDLMGmdduFj20kYY9OEgIMog== X-Received: by 2002:adf:f552:: with SMTP id j18mr7126125wrp.128.1601419488887; Tue, 29 Sep 2020 15:44:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Fam Zheng , Peter Maydell , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Samuel Ortiz Subject: [PATCH v4 10/12] target/arm: Do not build TCG objects when TCG is off Date: Wed, 30 Sep 2020 00:43:53 +0200 Message-Id: <20200929224355.1224017-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Samuel Ortiz We can now safely turn all TCG dependent build off when CONFIG_TCG is off. This allows building ARM binaries with --disable-tcg. Signed-off-by: Samuel Ortiz [PMD: Heavily rebased during almost 2 years then finally rewritten =3D) ] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/meson.build | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index f6a88297a8..9b7727d4bb 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -16,24 +16,29 @@ arm_ss =3D ss.source_set() arm_ss.add(gen) arm_ss.add(files( 'cpu.c', - 'crypto_helper.c', - 'debug_helper.c', 'gdbstub.c', 'helper.c', + 'vfp_helper.c', +)) + +arm_tcg_ss =3D ss.source_set() +arm_tcg_ss.add(files( + 'arm-semi.c', + 'cpu_tcg.c', + 'crypto_helper.c', + 'debug_helper.c', 'iwmmxt_helper.c', 'neon_helper.c', 'op_helper.c', 'tlb_helper.c', 'translate.c', 'vec_helper.c', - 'vfp_helper.c', - 'cpu_tcg.c', )) -arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false:= files('m_helper-stub.c')) + +arm_tcg_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_fa= lse: files('m_helper-stub.c')) =20 arm_ss.add(zlib) =20 -arm_ss.add(when: 'CONFIG_TCG', if_true: files('arm-semi.c')) arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c')) =20 arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_fals= e: files('kvm-stub.c')) @@ -41,6 +46,9 @@ arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'k= vm64.c'), if_false: fil arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'cpu64.c', 'gdbstub64.c', +)) + +arm_tcg_ss.add(when: 'TARGET_AARCH64', if_true: files( 'helper-a64.c', 'mte_helper.c', 'pauth_helper.c', @@ -49,14 +57,16 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'translate-sve.c', )) =20 +arm_ss.add_all(when: 'CONFIG_TCG', if_true: arm_tcg_ss) + arm_softmmu_ss =3D ss.source_set() arm_softmmu_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', 'machine.c', 'monitor.c', - 'psci.c', )) +arm_softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('psci.c')) =20 target_arch +=3D {'arm': arm_ss} target_softmmu_arch +=3D {'arm': arm_softmmu_ss} --=20 2.26.2 From nobody Sun Feb 8 17:13:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601419498; cv=none; d=zohomail.com; s=zohoarc; b=nAT3FENCtvhl7d6WVRKU+VwQ5syhYTFegwRSCSe3JA7auUnmzBeVsVYMS4WTRZN1gvyEffWAaaTp3Mvv27IBSUapPGF4Us/wmXzLiExuS4gtrHCOo+LvCx1y0/yqVt789hn6Pu+zIvo5wWJQXtqPWFpJJ+kU6V6Ilf4uEo2q8QU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601419498; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=mwQAv7GT5EoZ2YwHLMCVUEVsXLr1pwlweOoW7BxG2J0=; b=eptysUg2smQzSSKSB7ZPOngig+j2CTsdeNOFaTvX1O2NOiReBKTw50MsAoYj7aj0qP1AnmcTahMFdv1uUpGmr+ow8I3YsGD1z/cYIAZ8TqlI9eLxuGB5IbR58ef+NT8tp2MXi/II/SUzj6lz2QdNoz6ywJZD08Y/T5VjuN2fFMw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601419498175468.47314296072113; Tue, 29 Sep 2020 15:44:58 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-429-QNHOeEWsOrK1I3ZiiETqxw-1; Tue, 29 Sep 2020 18:44:55 -0400 Received: by mail-wr1-f69.google.com with SMTP id a2so2346271wrp.8 for ; Tue, 29 Sep 2020 15:44:54 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id u66sm15214592wme.1.2020.09.29.15.44.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:53 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419496; 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=mwQAv7GT5EoZ2YwHLMCVUEVsXLr1pwlweOoW7BxG2J0=; b=SVGoPejg+bie8mbth1G5nm1BuvywCCMQlBwene5VCwFe1KD//ysh2MDbX3queh7o7JJVi1 nHKWiBY0LGYiJJrdpJXRx1ctNTry/FLLPT26dEfd06PBsOhcjN5ik2IH/8ck4qFEXuPdeU OTF5KWJVkOfpbq9dEyOLwMCILOGaO10= X-MC-Unique: QNHOeEWsOrK1I3ZiiETqxw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mwQAv7GT5EoZ2YwHLMCVUEVsXLr1pwlweOoW7BxG2J0=; b=hLLfxKrtX0/6Zu6kh0uxm+JqaZpegkqpk6WCBxzW4RyrzCzdL5r25g0YSMX84eYsyF ubjAMVHm8LpKs9WACjhjP0AZlKfcFdqouqMoA7mpjD95r1AUjNsJJNmxTrXMtzrSssGP sldQsULxciLX/cA50RMqXQrQ8hNgUntMJPicJVnkG633WG55xtolyvRPRHH6I4YK0auU HKM3OxzrtKNUjsCLKEnOoH/IQLlvmzXR5wd4+wZUzMqCq0zCnV6KtJgOjXqGAopwMpIC wA7flvzFssxTDiofvZvyQOJVQ5QzicORBCjfjTlfe+XT2HuajTX6JfNxJu5xO18SdbMH 2RfA== X-Gm-Message-State: AOAM5313ApSu37u6vF5o2ywmWHckFQGiLNX0Q2rYx2EKxyQOwUd3A2A7 iQXnJrjACnMj7wX9jOebKvRl8JhS4D/O0OC/eKC6Atu1fORoX0WcAqSLT+HuABkBoXSI40WIvGq v7NClO/4gHUKlOw== X-Received: by 2002:a5d:680b:: with SMTP id w11mr7120256wru.73.1601419494004; Tue, 29 Sep 2020 15:44:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaezhlYa4iLWEZHwZ0kS7XLDzMCgEOlneNy29+EtQChDtpMkw2+jc9ZW303waN+0a4Rlb8Xw== X-Received: by 2002:a5d:680b:: with SMTP id w11mr7120247wru.73.1601419493850; Tue, 29 Sep 2020 15:44:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Fam Zheng , Peter Maydell , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 11/12] target/arm: Reorder meson.build rules Date: Wed, 30 Sep 2020 00:43:54 +0200 Message-Id: <20200929224355.1224017-12-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Reorder the rules to make this file easier to modify. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- I prefer to not squash that with the previous patch, as it makes it harder to review. --- target/arm/meson.build | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 9b7727d4bb..341af8f2ca 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -14,6 +14,7 @@ gen =3D [ =20 arm_ss =3D ss.source_set() arm_ss.add(gen) +arm_ss.add(zlib) arm_ss.add(files( 'cpu.c', 'gdbstub.c', @@ -21,6 +22,13 @@ arm_ss.add(files( 'vfp_helper.c', )) =20 +arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_fals= e: files('kvm-stub.c')) + +arm_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'cpu64.c', + 'gdbstub64.c', +)) + arm_tcg_ss =3D ss.source_set() arm_tcg_ss.add(files( 'arm-semi.c', @@ -35,26 +43,16 @@ arm_tcg_ss.add(files( 'vec_helper.c', )) =20 -arm_tcg_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_fa= lse: files('m_helper-stub.c')) - -arm_ss.add(zlib) - arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c')) - -arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_fals= e: files('kvm-stub.c')) - -arm_ss.add(when: 'TARGET_AARCH64', if_true: files( - 'cpu64.c', - 'gdbstub64.c', -)) +arm_tcg_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_fa= lse: files('m_helper-stub.c')) =20 arm_tcg_ss.add(when: 'TARGET_AARCH64', if_true: files( 'helper-a64.c', 'mte_helper.c', 'pauth_helper.c', - 'sve_helper.c', 'translate-a64.c', 'translate-sve.c', + 'sve_helper.c', )) =20 arm_ss.add_all(when: 'CONFIG_TCG', if_true: arm_tcg_ss) --=20 2.26.2 From nobody Sun Feb 8 17:13:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601419504; cv=none; d=zohomail.com; s=zohoarc; b=KE4gH3fE+ren1HLhHepO5KQbDevifHXbu6LaeOW08DEg4WpKfoIoxcaK67WYzU6enVDXuV4Z4AJi0zGCewMleAVD0abm36UBhauE0ZDEUfQk3atyXGpGzL5ikDfN9/0blIsFuwO7pw2IYJtEeDXuWJatxPh794QNkLdGd5JY8t8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601419504; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=LDAC3FC/MEaPD4LUvl2bkbirLPCAiqLo/YtDEMBCclM=; b=YDnJgUE+46AhS1mv21VDsy8ehWSsepyqxhf2dGGWEyUZPQNUSA8ff6JIRQfH48mt6wMEAqENBuQNA81VZa5RgdOPNtjWuafDnSr0yWH/lqpXo8OT5e7KWAUhCfC7cCIEaA3S25qArraPXqiPsU8q87nsSbX9nS5l8lBKfab+RMw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601419504890568.5185687810973; Tue, 29 Sep 2020 15:45:04 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-84-LnM0pbnGN1C0C60v_Ool6w-1; Tue, 29 Sep 2020 18:45:00 -0400 Received: by mail-wr1-f69.google.com with SMTP id w7so2370789wrp.2 for ; Tue, 29 Sep 2020 15:45:00 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id 76sm7666468wma.42.2020.09.29.15.44.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 15:44:58 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601419503; 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=LDAC3FC/MEaPD4LUvl2bkbirLPCAiqLo/YtDEMBCclM=; b=WiLCU42sDZHRBHzrhMjXI7Oy3FQbOA9RQ7DQtr4PPDOWdYsZQ9Fhfv/CV1m28R8tLHWTJ+ 5jKdl8jkxEaUyj3sitQXjJgkYCZ0M8u8Ph2FTOKyrSMekVDMdFOqlRNCxK6gyfQD5cQ03z TwTAU/Uok45MMIlKfNBq3YQTKE6rz5c= X-MC-Unique: LnM0pbnGN1C0C60v_Ool6w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LDAC3FC/MEaPD4LUvl2bkbirLPCAiqLo/YtDEMBCclM=; b=TYznbtv2whXrY/qfcwgJA4EFr+4mL1me1aXrF0vnTS5nSvsJZ0CkIbvSjigD8HDWh3 LhEGLlmwoeQ/yo59Ux1OFG5mHcwtEHX3lPG+82S7ec0TQ+TvPv8xrNOZfrcpftoJnru8 RIvbkaPkYiy4b4VvlFCgh0rbwPkWkRmFZgMYdGIHPGYFYnvBQKR1gUmzqlAwZoNQ7Nok gD3dQ0603owrjYWVada+onzakWNvijKYRbpfQmdVqAJSgaxyQAvgssHlTNe9GVqBktlb w3oiqZagMASnM66FY7d1xx82PM6K4EhRRfAHkleOyWLD+4yKt28YQq5VdSHQibif/IGt GjDw== X-Gm-Message-State: AOAM5308/fz4xMdPolwAjPPK2+wttKLAnKDyByI608TQIeuyt3CMzcJn s8jdccAH88M8SkJHk4p55fRenC/VHLKZaq8WFYKuexDeWS1kZZE/X21Aayxg7GOpCV19M3vd/K1 OYCUnoyDM7BHZYg== X-Received: by 2002:a5d:43cf:: with SMTP id v15mr6808321wrr.269.1601419499106; Tue, 29 Sep 2020 15:44:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwH+Rg1xe9gd9DlTZs7Ar3VzsQvPodRcCF6Ci4iIpufBqC6fONYRBje8t5F8NeD4ocLB3USiA== X-Received: by 2002:a5d:43cf:: with SMTP id v15mr6808303wrr.269.1601419498855; Tue, 29 Sep 2020 15:44:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Fam Zheng , Peter Maydell , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 12/12] .travis.yml: Add a KVM-only Aarch64 job Date: Wed, 30 Sep 2020 00:43:55 +0200 Message-Id: <20200929224355.1224017-13-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com> References: <20200929224355.1224017-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Add a job to build QEMU on Aarch64 with TCG disabled, so this configuration won't bitrot over time. We explicitly modify default-configs/aarch64-softmmu.mak to only select the 'virt' and 'SBSA-REF' machines. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Job ran for 7 min 30 sec https://travis-ci.org/github/philmd/qemu/jobs/731428859 --- .travis.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.travis.yml b/.travis.yml index c75221dca3..cad65cf181 100644 --- a/.travis.yml +++ b/.travis.yml @@ -402,6 +402,41 @@ jobs: - CONFIG=3D"--disable-containers --target-list=3D${MAIN_SOFTMMU_TA= RGETS}" - UNRELIABLE=3Dtrue =20 + - name: "[aarch64] GCC (disable-tcg)" + arch: arm64 + dist: bionic + addons: + apt_packages: + - libaio-dev + - libattr1-dev + - libcap-ng-dev + - libgcrypt20-dev + - libgnutls28-dev + - libiscsi-dev + - liblttng-ust-dev + - libnfs-dev + - libnss3-dev + - libpixman-1-dev + - libpng-dev + - librados-dev + - libseccomp-dev + - liburcu-dev + - libusb-1.0-0-dev + - libvdeplug-dev + - libvte-2.91-dev + # Tests dependencies + - genisoimage + env: + - CONFIG=3D"--disable-containers --disable-tcg --enable-kvm --disa= ble-tools" + - TEST_CMD=3D"make check-unit" + - CACHE_NAME=3D"${TRAVIS_BRANCH}-linux-gcc-aarch64" + before_script: + # Only use the 'virt' and 'sbsa-ref' machine which don't need TCG. + - echo CONFIG_ARM_VIRT=3Dy > default-configs/aarch64-softmmu.mak + - echo CONFIG_SBSA_REF=3Dy >> default-configs/aarch64-softmmu.mak + - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} + - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.lo= g && exit 1; } + - name: "[ppc64] GCC check-tcg" arch: ppc64le dist: xenial --=20 2.26.2