From nobody Sat May 11 13:19:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710784712; cv=none; d=zohomail.com; s=zohoarc; b=KIYMUAIYEBbYFv6mgjNOit7+OEhV1rD+UW4gSK0KzUwqJnMaIU8tkJoAu4DODCYhqQwHslof9/mPotzQ0g1akDZp0l2taDlIkNa6RWeusAPAUO8BtBuLZIl0B0nHfNSizJ0MkmhYEmTw6vq0Q5kLbh5S7knBSqJB+AdDK1Tmvsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710784712; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/FdiF6Ay0Y//kEppiR8e/bNkgh8x74HG5F3qOJ903Cc=; b=mkjQasQjkWjF3tWS510T90dUIz6PXgxGtGuJQj567e8le7IepqB09LgFCvkNG3amuljuR3LNWYG+b/SiQgg9PelOaKTyA9uQOTKFJ1mKJpcmC4SQmOXWg0gy3XxIRfDMo4sgDC9trKO0/HD0UQLoaLc1jSBZfya/8+hEnxvdOrQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710784712923824.5967841715593; Mon, 18 Mar 2024 10:58:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmHEW-0000VN-Oc; Mon, 18 Mar 2024 13:57:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmHET-0000Tm-Nm for qemu-devel@nongnu.org; Mon, 18 Mar 2024 13:57:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmHES-00077n-7m for qemu-devel@nongnu.org; Mon, 18 Mar 2024 13:57:09 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-198-dWQPopGVOFSVcJpxmYIW0g-1; Mon, 18 Mar 2024 13:57:04 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C7B3B185A789; Mon, 18 Mar 2024 17:57:03 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.155]) by smtp.corp.redhat.com (Postfix) with ESMTP id 027892166B34; Mon, 18 Mar 2024 17:57:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710784627; 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=/FdiF6Ay0Y//kEppiR8e/bNkgh8x74HG5F3qOJ903Cc=; b=W25HwQM5wKO3Ejco9q5f5YJk770JzKy1xzRNwXs9xq6b9D+8OR+rt1i+l9QjQUzPgzwzC5 2Blv5ytXvQlUmv5wLZgC4LruWzR7Cowh29ZhIcnqqMixmjhqFPlGmWjwKy0jcn67RazVG/ LbvuYtsT9gIh21SveWpCVmflSOAUFbM= X-MC-Unique: dWQPopGVOFSVcJpxmYIW0g-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Claudio Fontana , Nina Schoetterl-Glausch , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 1/4] docs/s390: clarify even more that cpu-topology is KVM-only Date: Mon, 18 Mar 2024 18:56:52 +0100 Message-ID: <20240318175655.756084-2-thuth@redhat.com> In-Reply-To: <20240318175655.756084-1-thuth@redhat.com> References: <20240318175655.756084-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710784713837100003 From: Claudio Fontana At least for now cpu-topology is implemented only for KVM. We already say this, but this tries to be more explicit, and also show it in the examples. This adds a new reference in the introduction that we can point to, whenever we need to reference accelerators and how to select them. Signed-off-by: Claudio Fontana Message-ID: <20240314172218.16478-1-cfontana@suse.de> Reviewed-by: Nina Schoetterl-Glausch Tested-by: Nina Schoetterl-Glausch Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- docs/system/introduction.rst | 2 ++ docs/system/s390x/cpu-topology.rst | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/system/introduction.rst b/docs/system/introduction.rst index 51ac132d6c..746707eb00 100644 --- a/docs/system/introduction.rst +++ b/docs/system/introduction.rst @@ -1,6 +1,8 @@ Introduction =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 +.. _Accelerators: + Virtualisation Accelerators --------------------------- =20 diff --git a/docs/system/s390x/cpu-topology.rst b/docs/system/s390x/cpu-top= ology.rst index 5133fdc362..d5b506ee5c 100644 --- a/docs/system/s390x/cpu-topology.rst +++ b/docs/system/s390x/cpu-topology.rst @@ -25,17 +25,19 @@ monitor polarization changes, see ``docs/devel/s390-cpu= -topology.rst``. Prerequisites ------------- =20 -To use the CPU topology, you need to run with KVM on a s390x host that -uses the Linux kernel v6.0 or newer (which provide the so-called +To use the CPU topology, you currently need to choose the KVM accelerator. +See :ref:`Accelerators` for more details about accelerators and how to sel= ect them. + +The s390x host needs to use a Linux kernel v6.0 or newer (which provides t= he so-called ``KVM_CAP_S390_CPU_TOPOLOGY`` capability that allows QEMU to signal the CPU topology facility via the so-called STFLE bit 11 to the VM). =20 Enabling CPU topology --------------------- =20 -Currently, CPU topology is only enabled in the host model by default. +Currently, CPU topology is enabled by default only in the "host" CPU model. =20 -Enabling CPU topology in a CPU model is done by setting the CPU flag +Enabling CPU topology in another CPU model is done by setting the CPU flag ``ctop`` to ``on`` as in: =20 .. code-block:: bash @@ -132,7 +134,7 @@ In the following machine we define 8 sockets with 4 cor= es each. =20 .. code-block:: bash =20 - $ qemu-system-s390x -m 2G \ + $ qemu-system-s390x -accel kvm -m 2G \ -cpu gen16b,ctop=3Don \ -smp cpus=3D5,sockets=3D8,cores=3D4,maxcpus=3D32 \ -device host-s390x-cpu,core-id=3D14 \ @@ -227,7 +229,7 @@ with vertical high entitlement. =20 .. code-block:: bash =20 - $ qemu-system-s390x -m 2G \ + $ qemu-system-s390x -accel kvm -m 2G \ -cpu gen16b,ctop=3Don \ -smp cpus=3D1,sockets=3D8,cores=3D4,maxcpus=3D32 \ \ --=20 2.44.0 From nobody Sat May 11 13:19:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710784679; cv=none; d=zohomail.com; s=zohoarc; b=nzKBtSbjd5r16NawlbxUzvOd3tAGzV0o6lds/qE41m6pZ+a2dP971taOapPm8sCw9qsHD4lE4cTr/jVNVuYj/Hw9hk8kcmmRxn9rG2FgOIG8WLEg1WNdw/MSQJOFDHw4twrVYcQeNooj5IGCgDXU7q0N0tnStHCpihXDBPzIUWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710784679; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pyDG1697yNmOLATZpCsmYF7vOjj017X+KxrJDV4ddsk=; b=mi45nBa0XX4nPoRGFwguZFJm5aOdMH9ysr2AQMU+yplWCV31gkCW6PtG7doElUi+B1QAF/IhZujh43BnaYoQ8Mo9BCpoYjj4xY7o3ynEjNOgLBQsxtWSiTqRen1SmonG0WGXXe/aXzfeVxaENG119eGGowPlJReQB/Sesp863SM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710784679628439.4688317801788; Mon, 18 Mar 2024 10:57:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmHEU-0000U8-Lc; Mon, 18 Mar 2024 13:57:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmHET-0000Tr-Tn for qemu-devel@nongnu.org; Mon, 18 Mar 2024 13:57:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmHER-00077e-VJ for qemu-devel@nongnu.org; Mon, 18 Mar 2024 13:57:09 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-111-Kv3nalYPMsGJLiyH9nYbMw-1; Mon, 18 Mar 2024 13:57:05 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 51ACD800262; Mon, 18 Mar 2024 17:57:05 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.155]) by smtp.corp.redhat.com (Postfix) with ESMTP id 489172166B34; Mon, 18 Mar 2024 17:57:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710784627; 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=pyDG1697yNmOLATZpCsmYF7vOjj017X+KxrJDV4ddsk=; b=LK1OM9LMSdoki4h6/YpiJX1QccmzUwzOlvuTJqaCjLoOE+GenU+/0cFcAPzdOJXlPI7PXc zpKGDTjMnk4ahCr5ksD19Fl8tFObWEazErF370DYfklczpPG9LbOEyGIMLqCl2oJ3tH+fE O9z6CwshrasB8Bln1Q0kwHb0ft0q6mU= X-MC-Unique: Kv3nalYPMsGJLiyH9nYbMw-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Nina Schoetterl-Glausch Subject: [PULL 2/4] target/s390x: improve cpu compatibility check error message Date: Mon, 18 Mar 2024 18:56:53 +0100 Message-ID: <20240318175655.756084-3-thuth@redhat.com> In-Reply-To: <20240318175655.756084-1-thuth@redhat.com> References: <20240318175655.756084-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710784681904100003 From: Claudio Fontana some users were confused by this message showing under TCG: Selected CPU generation is too new. Maximum supported model in the configuration: 'xyz' Clarify that the maximum can depend on the accel, and add a hint to try a different one. Also add a hint for features mismatch to suggest trying different accel, QEMU and kernel versions. Signed-off-by: Claudio Fontana Message-ID: <20240314213746.27163-1-cfontana@suse.de> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Nina Schoetterl-Glausch Signed-off-by: Thomas Huth --- target/s390x/cpu_models.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 1a1c096122..8ed3bb6a27 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -500,6 +500,16 @@ static void error_prepend_missing_feat(const char *nam= e, void *opaque) error_prepend((Error **) opaque, "%s ", name); } =20 +static void check_compat_model_failed(Error **errp, + const S390CPUModel *max_model, + const char *msg) +{ + error_setg(errp, "%s. Maximum supported model in the current configura= tion: \'%s\'", + msg, max_model->def->name); + error_append_hint(errp, "Consider a different accelerator, try \"-acce= l help\"\n"); + return; +} + static void check_compatibility(const S390CPUModel *max_model, const S390CPUModel *model, Error **errp) { @@ -507,15 +517,11 @@ static void check_compatibility(const S390CPUModel *m= ax_model, S390FeatBitmap missing; =20 if (model->def->gen > max_model->def->gen) { - error_setg(errp, "Selected CPU generation is too new. Maximum " - "supported model in the configuration: \'%s\'", - max_model->def->name); + check_compat_model_failed(errp, max_model, "Selected CPU generatio= n is too new"); return; } else if (model->def->gen =3D=3D max_model->def->gen && model->def->ec_ga > max_model->def->ec_ga) { - error_setg(errp, "Selected CPU GA level is too new. Maximum " - "supported model in the configuration: \'%s\'", - max_model->def->name); + check_compat_model_failed(errp, max_model, "Selected CPU GA level = is too new"); return; } =20 @@ -537,7 +543,9 @@ static void check_compatibility(const S390CPUModel *max= _model, error_setg(errp, " "); s390_feat_bitmap_to_ascii(missing, errp, error_prepend_missing_feat); error_prepend(errp, "Some features requested in the CPU model are not " - "available in the configuration: "); + "available in the current configuration: "); + error_append_hint(errp, + "Consider a different accelerator, QEMU, or kernel v= ersion\n"); } =20 S390CPUModel *get_max_cpu_model(Error **errp) --=20 2.44.0 From nobody Sat May 11 13:19:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710784704; cv=none; d=zohomail.com; s=zohoarc; b=isMDlOWhdhw0xVXA+nY4eMa0SS2yQFTnm1BXXm8DayKRfKNArfiX7NtVwl8wzEE+t4k7jZCRSOoXkuOCTssRnbh3Yw0SEgdwtbAPyPgPmFqzSJWvPlTM1GSxJofCVuLu3mbCVHAml3gKvznAgYqt/lzxrSBGypVaDFkGNyFkKCk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710784704; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IlmCn9L0BVplQdOy/vjL33uKo/SSaW9NaQF26dxzgn8=; b=AjkhOHxr/sgeZeq2Y8TigDVTI6/bTFd91WxmLt+wEg23f7DfU0/82S00Q7J5KO1K94xTxB5fopcT88QInm6bwl/fGLehpfogHcSbULSQIIuYcQmESJuO5w9q0Uz4I/yR3h8y5GVIh057THrfNLU6072gsUvMfjOCuwQhO7e9yts= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710784704724712.4933645024352; Mon, 18 Mar 2024 10:58:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmHEW-0000Vb-D8; Mon, 18 Mar 2024 13:57:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmHEU-0000U9-Pm for qemu-devel@nongnu.org; Mon, 18 Mar 2024 13:57:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmHET-00078C-Eh for qemu-devel@nongnu.org; Mon, 18 Mar 2024 13:57:10 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-ygQnxjG0Nfu5fF6jDceHAA-1; Mon, 18 Mar 2024 13:57:07 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C582929AC036; Mon, 18 Mar 2024 17:57:06 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.155]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0D222166B32; Mon, 18 Mar 2024 17:57:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710784628; 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=IlmCn9L0BVplQdOy/vjL33uKo/SSaW9NaQF26dxzgn8=; b=FzUvHHL1rEY7mYbYnKnd91o+yJoojRoRjZ41Z/Pbhf9tNvQ1Fqd3kuY9YSzfT/v+puwWzr jCsQmxHrCNFIEsNSluHnl061gtlA4l1VORs+XhVuMQ/6yn1JaaBGYmW5NZer78HUlfOHNI pPX7c5n3KtF40XWG29O9ZFv4QtMOlHY= X-MC-Unique: ygQnxjG0Nfu5fF6jDceHAA-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 3/4] target/sparc/cpu: Improve the CPU help text Date: Mon, 18 Mar 2024 18:56:54 +0100 Message-ID: <20240318175655.756084-4-thuth@redhat.com> In-Reply-To: <20240318175655.756084-1-thuth@redhat.com> References: <20240318175655.756084-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710784705757100006 Remove the unnecessary "Sparc" at the beginning of the line and put the chip information into parentheses so that it is clearer which part of the line have to be passed to "-cpu" to specify a different CPU. Message-ID: <20240307174334.130407-4-thuth@redhat.com> Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- target/sparc/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index dc9ead21fc..e820f50acf 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -574,9 +574,10 @@ void sparc_cpu_list(void) { unsigned int i; =20 + qemu_printf("Available CPU types:\n"); for (i =3D 0; i < ARRAY_SIZE(sparc_defs); i++) { - qemu_printf("Sparc %16s IU " TARGET_FMT_lx - " FPU %08x MMU %08x NWINS %d ", + qemu_printf(" %-20s (IU " TARGET_FMT_lx + " FPU %08x MMU %08x NWINS %d) ", sparc_defs[i].name, sparc_defs[i].iu_version, sparc_defs[i].fpu_version, --=20 2.44.0 From nobody Sat May 11 13:19:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710784688; cv=none; d=zohomail.com; s=zohoarc; b=LSYwgLkHvcHS+R4+N/z3g5EGW7IdWYskm3x1KvRakettMl7fwdhNJuLEKiOQvQLd8R/srQI15VYwDuMdvs2V6DYhy9vKbfMeeTnzy3rMs0al/Bq/vb0ceEUHyxrTiJ18XljcKac3lYKb6ckwBJqQmc9SZwl2dzJ3LB1oC69Tb5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710784688; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xz5P+39VQaj/6mPsDDXaLw8Q7b0zW3e8IuF4GuVzrt8=; b=jLCP83Cf37ELj1ZtaPdTUnYA6VZaYmVE0m4WxuuOtSsOJhja+Pd899IcCoWiHCj0tnavmcT/jZm8LM20bIf1E1rYTEWwllplXPEHsTgqXiRU0XLFOVGanDReMDkxB/77cWVUNHLgZMLrynbNSh+HIGmvS5x5CTX9VAOepZzLWro= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710784688458807.060491333447; Mon, 18 Mar 2024 10:58:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmHEa-0000YM-Ut; Mon, 18 Mar 2024 13:57:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmHEZ-0000Xy-6p for qemu-devel@nongnu.org; Mon, 18 Mar 2024 13:57:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmHEX-00078t-QB for qemu-devel@nongnu.org; Mon, 18 Mar 2024 13:57:14 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-256-9mQP87XKOa2J5vJUlnhrKw-1; Mon, 18 Mar 2024 13:57:08 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 66C7D282D3C8; Mon, 18 Mar 2024 17:57:08 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.155]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CA812166B34; Mon, 18 Mar 2024 17:57:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710784633; 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=xz5P+39VQaj/6mPsDDXaLw8Q7b0zW3e8IuF4GuVzrt8=; b=WaaTa2iY5P/htlOe8LixL+ZqgcLYIBp91whgR7l4gUVCfDrvmNuYHXH4Ff+VbjIENa11Y+ 8utHZb+mXaQElTDcgWOaFxRIDxumlWUjOSQWDfdZkBaOU4w2h1mEP7G1NgT2Io7oDJ85yK oXQz0cGx2ZFxBjbwip1zP8xMQo+NxJk= X-MC-Unique: 9mQP87XKOa2J5vJUlnhrKw-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 4/4] travis-ci: Rename SOFTMMU -> SYSTEM Date: Mon, 18 Mar 2024 18:56:55 +0100 Message-ID: <20240318175655.756084-5-thuth@redhat.com> In-Reply-To: <20240318175655.756084-1-thuth@redhat.com> References: <20240318175655.756084-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710784689710100003 From: Philippe Mathieu-Daud=C3=A9 Since we *might* have user emulation with softmmu, rename MAIN_SOFTMMU_TARGETS as MAIN_SYSTEM_TARGETS to express 'system emulation targets'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20240313213339.82071-3-philmd@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76859d48da..597d151b80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ env: - TEST_BUILD_CMD=3D"" - TEST_CMD=3D"make check V=3D1" # This is broadly a list of "mainline" system targets which have suppo= rt across the major distros - - MAIN_SOFTMMU_TARGETS=3D"aarch64-softmmu,mips64-softmmu,ppc64-softmmu= ,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" + - MAIN_SYSTEM_TARGETS=3D"aarch64-softmmu,mips64-softmmu,ppc64-softmmu,= riscv64-softmmu,s390x-softmmu,x86_64-softmmu" - CCACHE_SLOPPINESS=3D"include_file_ctime,include_file_mtime" - CCACHE_MAXSIZE=3D1G - G_MESSAGES_DEBUG=3Derror @@ -114,7 +114,7 @@ jobs: env: - TEST_CMD=3D"make check check-tcg V=3D1" - CONFIG=3D"--disable-containers --enable-fdt=3Dsystem - --target-list=3D${MAIN_SOFTMMU_TARGETS} --cxx=3D/bin/fal= se" + --target-list=3D${MAIN_SYSTEM_TARGETS} --cxx=3D/bin/fals= e" - UNRELIABLE=3Dtrue =20 - name: "[ppc64] GCC check-tcg" @@ -185,7 +185,7 @@ jobs: env: - TEST_CMD=3D"make check check-tcg V=3D1" - CONFIG=3D"--disable-containers --enable-fdt=3Dsystem - --target-list=3D${MAIN_SOFTMMU_TARGETS},s390x-linux-user" + --target-list=3D${MAIN_SYSTEM_TARGETS},s390x-linux-user" - UNRELIABLE=3Dtrue script: - BUILD_RC=3D0 && make -j${JOBS} || BUILD_RC=3D$? @@ -226,7 +226,7 @@ jobs: - genisoimage env: - CONFIG=3D"--disable-containers --enable-fdt=3Dsystem --audio-drv= -list=3Dsdl - --disable-user --target-list-exclude=3D${MAIN_SOFTMMU_TA= RGETS}" + --disable-user --target-list-exclude=3D${MAIN_SYSTEM_TAR= GETS}" =20 - name: "[s390x] GCC (user)" arch: s390x --=20 2.44.0