From nobody Fri May 17 20:55:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647343615547477.63504541877603; Tue, 15 Mar 2022 04:26:55 -0700 (PDT) Received: from localhost ([::1]:42356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU5KI-0001DX-A1 for importer@patchew.org; Tue, 15 Mar 2022 07:26:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Ee-00019p-C9 for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:27165) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Ec-0008Ux-3d for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:03 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-48-YtBECityMVaRttHRrg4_lQ-1; Tue, 15 Mar 2022 07:20:58 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 03E10801E80; Tue, 15 Mar 2022 11:20:58 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F86AC15D49; Tue, 15 Mar 2022 11:20:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647343261; 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=zs27lXjGCOQcVhnxnQAhB1+LhwcAt6lEF4LzuDcpo0Y=; b=VXQz0IUlbjRVfnyI27DvPzYjY7R73cQ7XGWIzDcEKc7JUNd1ngocvKsEnFQ3CBjKIFHiB5 h7tBqFfIRjot5APdC6EwAbDhmjNSSKvybLvVGcX/bRB3z9+u3kmST75TuOP7v4Z9o8dQxr NdKsi5V82O2KX0j5/mPlSl3AuS12qM4= X-MC-Unique: YtBECityMVaRttHRrg4_lQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 1/8] tests/tcg: drop -cpu max from s390x sha512-mvx invocation Date: Tue, 15 Mar 2022 12:20:45 +0100 Message-Id: <20220315112052.515467-2-thuth@redhat.com> In-Reply-To: <20220315112052.515467-1-thuth@redhat.com> References: <20220315112052.515467-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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_H5=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: , Cc: Peter Maydell , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647343617569100001 From: Alex Benn=C3=A9e With -cpu max we get a warning: qemu-s390x: warning: 'msa5-base' requires 'kimd-sha-512'. But dropping the -cpu max and it still runs fine. Signed-off-by: Alex Benn=C3=A9e Message-Id: <20220309112248.4083619-1-alex.bennee@linaro.org> Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Tested-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/tcg/s390x/Makefile.target | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.tar= get index 257c568c58..7aa502a557 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -34,6 +34,4 @@ sha512-mvx: CFLAGS=3D-march=3Dz13 -mvx -O3 sha512-mvx: sha512.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) =20 -run-sha512-mvx: QEMU_OPTS+=3D-cpu max - TESTS+=3Dsha512-mvx --=20 2.27.0 From nobody Fri May 17 20:55:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164734402892652.29715596798792; Tue, 15 Mar 2022 04:33:48 -0700 (PDT) Received: from localhost ([::1]:55112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU5Qy-0001fo-7R for importer@patchew.org; Tue, 15 Mar 2022 07:33:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Ef-0001Ee-II for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:25606) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Ee-0008VN-0e for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:05 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-540-Bzq285tGP3W6M-xFs5T8wQ-1; Tue, 15 Mar 2022 07:21:00 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 17355102F208; Tue, 15 Mar 2022 11:21:00 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79E99C15D42; Tue, 15 Mar 2022 11:20:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647343263; 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=pDRU4sD5GnQEg2ri1oYPP6vxvKR/iOXTP6+yTknwpXw=; b=Pa+e5/sqXw3I6tnYpSmhmHMm/istzBDeUe9CELqjNY+nbzsUcHmJ3JE/tBLfEg6J8Oprt0 J3RSU/onUldq7na6lKF0HZK2rbRpKNQ50p+am2SkZdKF0KfOgrQ63M50PhVI0RDxSmB0Dd GkIB4LGY1ey4SFF0SFU2a2Bcb5Td1Rc= X-MC-Unique: Bzq285tGP3W6M-xFs5T8wQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 2/8] s390x/tcg: Fix BRASL with a large negative offset Date: Tue, 15 Mar 2022 12:20:46 +0100 Message-Id: <20220315112052.515467-3-thuth@redhat.com> In-Reply-To: <20220315112052.515467-1-thuth@redhat.com> References: <20220315112052.515467-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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_H5=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: , Cc: Peter Maydell , Richard Henderson , Ilya Leoshkevich , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647344030572100003 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich When RI2 is 0x80000000, qemu enters an infinite loop instead of jumping backwards. Fix by adding a missing cast, like in in2_ri2(). Fixes: 8ac33cdb8bfb ("Convert BRANCH AND SAVE") Signed-off-by: Ilya Leoshkevich Message-Id: <20220314104232.675863-2-iii@linux.ibm.com> Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- target/s390x/tcg/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 904b51542f..41c8696185 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -1597,7 +1597,7 @@ static DisasJumpType op_bal(DisasContext *s, DisasOps= *o) static DisasJumpType op_basi(DisasContext *s, DisasOps *o) { pc_to_link_info(o->out, s, s->pc_tmp); - return help_goto_direct(s, s->base.pc_next + 2 * get_field(s, i2)); + return help_goto_direct(s, s->base.pc_next + (int64_t)get_field(s, i2)= * 2); } =20 static DisasJumpType op_bc(DisasContext *s, DisasOps *o) --=20 2.27.0 From nobody Fri May 17 20:55:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647344195898776.0703174833799; Tue, 15 Mar 2022 04:36:35 -0700 (PDT) Received: from localhost ([::1]:33390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU5Tf-00069Y-6G for importer@patchew.org; Tue, 15 Mar 2022 07:36:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Ei-0001OC-6Y for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:53931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Eg-0008Vf-Mc for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:07 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-121-OQIPNt5BOMWTPwZnqv_c_A-1; Tue, 15 Mar 2022 07:21:02 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7DD2A29AB3E9; Tue, 15 Mar 2022 11:21:02 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CC71C15D42; Tue, 15 Mar 2022 11:21:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647343266; 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=0Avuwsuk1U2eZCHeC98SX/kGMJoxmPFGiCdO8xwV4d8=; b=Zp4x/P2X0c27BSykZmuuXfDuO2Pg1lZjQXOsAgyxIr9KXD5glhZ4KEW6claxxtGKhRVAqo 0PW5SY3JhrWRj4VkpXcpWvumtTf9dmdlZa+YyMzik7eZPx/ZnSRVboz86TxfoK/F/ZwCs/ e5QJvXelSl2y8T+uQ6NZHRNbtTXsQdA= X-MC-Unique: OQIPNt5BOMWTPwZnqv_c_A-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 3/8] s390x/tcg: Fix BRCL with a large negative offset Date: Tue, 15 Mar 2022 12:20:47 +0100 Message-Id: <20220315112052.515467-4-thuth@redhat.com> In-Reply-To: <20220315112052.515467-1-thuth@redhat.com> References: <20220315112052.515467-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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: , Cc: Peter Maydell , Richard Henderson , Ilya Leoshkevich , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647344197129100001 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich When RI2 is 0x80000000, qemu enters an infinite loop instead of jumping backwards. Fix by adding a missing cast, like in in2_ri2(). Fixes: 7233f2ed1717 ("target-s390: Convert BRANCH ON CONDITION") Signed-off-by: Ilya Leoshkevich Message-Id: <20220314104232.675863-3-iii@linux.ibm.com> Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- target/s390x/tcg/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 41c8696185..5acfc0ff9b 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -1201,7 +1201,7 @@ static DisasJumpType help_branch(DisasContext *s, Dis= asCompare *c, bool is_imm, int imm, TCGv_i64 cdest) { DisasJumpType ret; - uint64_t dest =3D s->base.pc_next + 2 * imm; + uint64_t dest =3D s->base.pc_next + (int64_t)imm * 2; TCGLabel *lab; =20 /* Take care of the special cases first. */ --=20 2.27.0 From nobody Fri May 17 20:55:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647343409761911.9323778503314; Tue, 15 Mar 2022 04:23:29 -0700 (PDT) Received: from localhost ([::1]:34450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU5Gy-0004KV-GZ for importer@patchew.org; Tue, 15 Mar 2022 07:23:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Ek-0001Vb-TG for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:47298) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Ej-0008W0-9Q for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:10 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-637-wmXGxNW4N5CohWg0MYPo5w-1; Tue, 15 Mar 2022 07:21:05 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BFA50801585; Tue, 15 Mar 2022 11:21:04 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECF36C15D42; Tue, 15 Mar 2022 11:21:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647343268; 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=vFXH84FyGSV6KzVJTVpiYHCQWqf3bzd2r0vOu3GR05A=; b=g3g9l4FpyBv/L/um59ZxNJyOKjvzzPw4RqhrD1SmDRN/3vI2GaouS/huA2ESU8XLqa3iEL RLJl0pOnTMl4mmLNvtRqxg2piofiFDgtbXKnSV7cTT9N2X3n+W4qrfX6LM96tvRyEKvmWA ZD7PaMIiW1QBm0Ld6F81ssBUhEW6/f4= X-MC-Unique: wmXGxNW4N5CohWg0MYPo5w-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 4/8] tests/tcg/s390x: Test BRASL and BRCL with large negative offsets Date: Tue, 15 Mar 2022 12:20:48 +0100 Message-Id: <20220315112052.515467-5-thuth@redhat.com> In-Reply-To: <20220315112052.515467-1-thuth@redhat.com> References: <20220315112052.515467-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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: , Cc: Peter Maydell , Richard Henderson , Ilya Leoshkevich , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647343413913100001 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich Add a small test in order to prevent regressions. Signed-off-by: Ilya Leoshkevich Message-Id: <20220314104232.675863-4-iii@linux.ibm.com> Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Signed-off-by: Thomas Huth --- tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/branch-relative-long.c | 68 ++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 tests/tcg/s390x/branch-relative-long.c diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.tar= get index 7aa502a557..f0d474a245 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -15,6 +15,7 @@ TESTS+=3Dmvc TESTS+=3Dshift TESTS+=3Dtrap TESTS+=3Dsignals-s390x +TESTS+=3Dbranch-relative-long =20 ifneq ($(HAVE_GDB_BIN),) GDB_SCRIPT=3D$(SRC_PATH)/tests/guest-debug/run-test.py diff --git a/tests/tcg/s390x/branch-relative-long.c b/tests/tcg/s390x/branc= h-relative-long.c new file mode 100644 index 0000000000..94219afcad --- /dev/null +++ b/tests/tcg/s390x/branch-relative-long.c @@ -0,0 +1,68 @@ +#include +#include +#include +#include + +#define DEFINE_ASM(_name, _code) \ + extern const char _name[]; \ + extern const char _name ## _end[]; \ + asm(" .globl " #_name "\n" \ + #_name ":\n" \ + " " _code "\n" \ + " .globl " #_name "_end\n" \ + #_name "_end:\n"); + +DEFINE_ASM(br_r14, "br %r14"); +DEFINE_ASM(brasl_r0, "brasl %r0,.-0x100000000"); +DEFINE_ASM(brcl_0xf, "brcl 0xf,.-0x100000000"); + +struct test { + const char *code; + const char *code_end; +}; + +static const struct test tests[] =3D { + { + .code =3D brasl_r0, + .code_end =3D brasl_r0_end, + }, + { + .code =3D brcl_0xf, + .code_end =3D brcl_0xf_end, + }, +}; + +int main(void) +{ + unsigned char *buf; + size_t length =3D 0; + size_t i; + + for (i =3D 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + size_t test_length =3D 0x100000000 + (tests[i].code_end - tests[i]= .code); + + if (test_length > length) { + length =3D test_length; + } + } + + buf =3D mmap(NULL, length, PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0); + if (buf =3D=3D MAP_FAILED) { + perror("SKIP: mmap() failed"); + return 0; + } + + memcpy(buf, br_r14, br_r14_end - br_r14); + for (i =3D 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + void (*code)(void) =3D (void *)(buf + 0x100000000); + + memcpy(code, tests[i].code, tests[i].code_end - tests[i].code); + code(); + memset(code, 0, tests[i].code_end - tests[i].code); + } + + munmap(buf, length); + + return 0; +} --=20 2.27.0 From nobody Fri May 17 20:55:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16473438692011002.4120249540197; Tue, 15 Mar 2022 04:31:09 -0700 (PDT) Received: from localhost ([::1]:50126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU5OG-0006ce-8H for importer@patchew.org; Tue, 15 Mar 2022 07:31:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5El-0001Wx-Ba for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:32429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Ej-0008W6-LB for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:11 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-407-I5AMYqF_MSeZLPRzaes48g-1; Tue, 15 Mar 2022 07:21:07 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C27B7185A7B2; Tue, 15 Mar 2022 11:21:06 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26F05C15D42; Tue, 15 Mar 2022 11:21:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647343269; 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=wzgsHecDCryL0horxdwhUCRlTvQKQU0CwB/u7KekZzU=; b=XTs7sdbEPpkD/LUmN+f+5sjqoRdvHXKNnIybtfJK5bvty56LBFq5JRM0WePmrIQ99fuPQ5 LsxdtSWV1yt3vNthLqe/8va0l5yRBQK80gKS+MH2ADIDNer4VUVFzcN44wYqz3ZUcPNmOQ oLXvO7NDvxoE7RmeBTIhLzmpP8D0IIc= X-MC-Unique: I5AMYqF_MSeZLPRzaes48g-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 5/8] tests/avocado: start PhoneServer upfront Date: Tue, 15 Mar 2022 12:20:49 +0100 Message-Id: <20220315112052.515467-6-thuth@redhat.com> In-Reply-To: <20220315112052.515467-1-thuth@redhat.com> References: <20220315112052.515467-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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_FILL_THIS_FORM_SHORT=0.01, 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: , Cc: Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Beraldo Leal Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647343874313100001 From: Beraldo Leal Race conditions can happen with the current code, because the port that was available might not be anymore by the time the server is started. By setting the port to 0, PhoneServer it will use the OS default behavior to get a free port, then we save this information so we can later configure the guest. Suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Beraldo Leal Message-Id: <20220311171127.2189534-1-bleal@redhat.com> Signed-off-by: Thomas Huth --- tests/avocado/avocado_qemu/__init__.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index 9b056b5ce5..ac85e36a4d 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -18,7 +18,7 @@ import uuid =20 import avocado -from avocado.utils import cloudinit, datadrainer, network, process, ssh, v= mimage +from avocado.utils import cloudinit, datadrainer, process, ssh, vmimage from avocado.utils.path import find_command =20 #: The QEMU build root directory. It may also be the source directory @@ -602,9 +602,6 @@ def prepare_cloudinit(self, ssh_pubkey=3DNone): self.log.info('Preparing cloudinit image') try: cloudinit_iso =3D os.path.join(self.workdir, 'cloudinit.iso') - self.phone_home_port =3D network.find_free_port() - if not self.phone_home_port: - self.cancel('Failed to get a free port') pubkey_content =3D None if ssh_pubkey: with open(ssh_pubkey) as pubkey: @@ -614,7 +611,7 @@ def prepare_cloudinit(self, ssh_pubkey=3DNone): password=3Dself.password, # QEMU's hard coded usermode router address phone_home_host=3D'10.0.2.2', - phone_home_port=3Dself.phone_home_port, + phone_home_port=3Dself.phone_server.server_port, authorized_key=3Dpubkey_content) except Exception: self.cancel('Failed to prepare the cloudinit image') @@ -625,6 +622,8 @@ def set_up_boot(self): self.vm.add_args('-drive', 'file=3D%s' % path) =20 def set_up_cloudinit(self, ssh_pubkey=3DNone): + self.phone_server =3D cloudinit.PhoneHomeServer(('0.0.0.0', 0), + self.name) cloudinit_iso =3D self.prepare_cloudinit(ssh_pubkey) self.vm.add_args('-drive', 'file=3D%s,format=3Draw' % cloudinit_is= o) =20 @@ -635,7 +634,9 @@ def launch_and_wait(self, set_up_ssh_connection=3DTrue): logger=3Dself.log.getChil= d('console')) console_drainer.start() self.log.info('VM launched, waiting for boot confirmation from gue= st') - cloudinit.wait_for_phone_home(('0.0.0.0', self.phone_home_port), s= elf.name) + while not self.phone_server.instance_phoned_back: + self.phone_server.handle_request() + if set_up_ssh_connection: self.log.info('Setting up the SSH connection') self.ssh_connect(self.username, self.ssh_key) --=20 2.27.0 From nobody Fri May 17 20:55:14 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=1647343630; cv=none; d=zohomail.com; s=zohoarc; b=C8B++slueeDftla427McVD4RBZtBdFHcA30G1yOmiCUDFcMN0wrJ5WjC9NRMCg/7SexbDvGMrCJZjpfQbJPu6hYPueBY3TCWlYPFigInfVcpsgOuhSnVaQv7A/AS46eyh9L4arv0KUuk7cpN+/QZqMkRBhXq6SWhtOjr8Irzc4M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647343630; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ca+pHvCOjERUQbNwmMptZh33fVUgMeYIPp8MFO0isMU=; b=RYvS+/hz4p4dRUlZqUKcOLg0mtFBWFJJNhLi+wQkRS8bQtInLe7IJH7vn5HLIyQXge61N/qlw/ZV3LMx2+C9uV3+jyPVZAfyVtCibzY74NVxlj86UFtD6tFf49l2emzAJZp5c+Z/I5fVMriTzKlbzpeaPvV/Ymx/Xq93STdF+ww= 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 1647343630263889.0601000586353; Tue, 15 Mar 2022 04:27:10 -0700 (PDT) Received: from localhost ([::1]:43020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU5KX-0001gF-7W for importer@patchew.org; Tue, 15 Mar 2022 07:27:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Er-0001q8-3p for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Ep-000058-AN for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:16 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-270-V03cCSwqPQWXEz1569Kbkw-1; Tue, 15 Mar 2022 07:21:09 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2D00E29AB3EC; Tue, 15 Mar 2022 11:21:09 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57C82C15D42; Tue, 15 Mar 2022 11:21:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647343274; 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=ca+pHvCOjERUQbNwmMptZh33fVUgMeYIPp8MFO0isMU=; b=Pm6GrBLKggpgJWwq7Eq3fo7+4ibSU/lXNsafaugUoo5EL6ImBkBZkG1yACe9Ymea/LG+CC n47Sc2FaL0D0aJBCpZRJzQAC8F9/wZvEGlIevtGYahzQv0hit3SBN6j2og/ybDLuQN2TpM DLj5rk8nZmYHg48qMuSVPaUKxIIaOh0= X-MC-Unique: V03cCSwqPQWXEz1569Kbkw-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 6/8] accel/tcg: Fix cpu_ldq_be_mmu typo Date: Tue, 15 Mar 2022 12:20:50 +0100 Message-Id: <20220315112052.515467-7-thuth@redhat.com> In-Reply-To: <20220315112052.515467-1-thuth@redhat.com> References: <20220315112052.515467-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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_H5=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: , Cc: Peter Maydell , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1647343633391100001 From: Richard Henderson In the conversion to cpu_ld_*_mmu, the retaddr parameter was corrupted in the one case of cpu_ldq_be_mmu. Fixes: f83bcecb1 ("accel/tcg: Add cpu_{ld,st}*_mmu interfaces") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/902 Signed-off-by: Richard Henderson Message-Id: <20220315002506.152030-1-richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Thomas Huth Signed-off-by: Thomas Huth --- accel/tcg/cputlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 3b918fe018..2035b2ac0a 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2174,7 +2174,7 @@ uint32_t cpu_ldl_be_mmu(CPUArchState *env, abi_ptr ad= dr, uint64_t cpu_ldq_be_mmu(CPUArchState *env, abi_ptr addr, MemOpIdx oi, uintptr_t ra) { - return cpu_load_helper(env, addr, oi, MO_BEUQ, helper_be_ldq_mmu); + return cpu_load_helper(env, addr, oi, ra, helper_be_ldq_mmu); } =20 uint16_t cpu_ldw_le_mmu(CPUArchState *env, abi_ptr addr, --=20 2.27.0 From nobody Fri May 17 20:55:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16473440679191009.6244523624089; Tue, 15 Mar 2022 04:34:27 -0700 (PDT) Received: from localhost ([::1]:56638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU5Rb-0002ha-8E for importer@patchew.org; Tue, 15 Mar 2022 07:34:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Ep-0001kd-8N for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:22206) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5En-00004t-IL for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:14 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-303-9D2x_RHqOxqP_gHVtzTEGQ-1; Tue, 15 Mar 2022 07:21:11 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7DA0E899EC1; Tue, 15 Mar 2022 11:21:11 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9AD1C15D42; Tue, 15 Mar 2022 11:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647343273; 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=ZXoNdUpTiMthQVSttgoCcJ/jv1ogMBPQ8wmx4rw4RVU=; b=bp11z/1e9LdSx03mp5eV0CxvViYcwfsd8iFYTTW5RwNlKz5K18rr2FWmc6/nz3NXAXUGfJ pMUJXxEwdRFxpd09jk/qZsfBcng3jMGqeSm9kkXNZBFRIskAjVuvy53V0ZNJOnmPc6welB kxfSdWTXZKpBVcDCATW+8codCMljZRE= X-MC-Unique: 9D2x_RHqOxqP_gHVtzTEGQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 7/8] softmmu: List CPU types again Date: Tue, 15 Mar 2022 12:20:51 +0100 Message-Id: <20220315112052.515467-8-thuth@redhat.com> In-Reply-To: <20220315112052.515467-1-thuth@redhat.com> References: <20220315112052.515467-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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: , Cc: Peter Maydell , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647344071013100001 From: Philippe Mathieu-Daud=C3=A9 Commit e0220bb5b2 made cpus.c target-agnostic but didn't notice the cpu_list() function is only defined in target-specific code in "cpu.h". Move list_cpus() declaration to "exec/cpu-common.h" because this function is not softmmu-specific and can also be used by user-mode, along with moving its implementation to cpu.c, which is compiled per target. Fixes: e0220bb5b2 ("softmmu: Build target-agnostic objects once") Reported-by: Max Filippov Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20220314140108.26222-1-philippe.mathieu.daude@gmail.com> Tested-by: Max Filippov Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- cpu.c | 9 +++++++++ include/exec/cpu-common.h | 2 ++ include/sysemu/cpus.h | 2 -- softmmu/cpus.c | 8 -------- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cpu.c b/cpu.c index d564886149..be1f8b074c 100644 --- a/cpu.c +++ b/cpu.c @@ -35,6 +35,7 @@ #include "sysemu/tcg.h" #include "sysemu/kvm.h" #include "sysemu/replay.h" +#include "exec/cpu-common.h" #include "exec/exec-all.h" #include "exec/translate-all.h" #include "exec/log.h" @@ -266,6 +267,14 @@ const char *parse_cpu_option(const char *cpu_option) return cpu_type; } =20 +void list_cpus(const char *optarg) +{ + /* XXX: implement xxx_cpu_list for targets that still miss it */ +#if defined(cpu_list) + cpu_list(); +#endif +} + #if defined(CONFIG_USER_ONLY) void tb_invalidate_phys_addr(target_ulong addr) { diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 7f7b5943c7..50a7d2912e 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -158,4 +158,6 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr, /* vl.c */ extern int singlestep; =20 +void list_cpus(const char *optarg); + #endif /* CPU_COMMON_H */ diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h index 868f1192de..b5c87d48b3 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -55,6 +55,4 @@ extern int smp_cores; extern int smp_threads; #endif =20 -void list_cpus(const char *optarg); - #endif diff --git a/softmmu/cpus.c b/softmmu/cpus.c index e1d84c8ccb..7b75bb66d5 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -728,14 +728,6 @@ int vm_stop_force_state(RunState state) } } =20 -void list_cpus(const char *optarg) -{ - /* XXX: implement xxx_cpu_list for targets that still miss it */ -#if defined(cpu_list) - cpu_list(); -#endif -} - void qmp_memsave(int64_t addr, int64_t size, const char *filename, bool has_cpu, int64_t cpu_index, Error **errp) { --=20 2.27.0 From nobody Fri May 17 20:55:14 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=1647344148; cv=none; d=zohomail.com; s=zohoarc; b=KVEDJIJhKRPyrCJ+mWlQjy8eAQtssuqJs25/2TXi6EcE8S1FGK3e4HwmmKLNH51fRjpcLprPvASVuDzIIh7PpJG19Jwug95Xty22HEX4d2m0axt7vWdBNqjQcgwOKsbSjPuRUP917xMAAeOBGsmW2w0nTW8udj/pMRhc5chvP7I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647344148; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xMos71vUp0zmKkr4Wk1mN1pAv4zyr5X108yKXEe+tb8=; b=IqeLG3l21zA6ZRtc8VfN42EBNlYE94Aqcv5+JcoWBQN579ZCLJfQxp1dMDb0saWuSn9HiyTBp9L1A8X3nFdG0zPtwRNYYmmxQTnJ+Mrde+MUq6jYIOXUQrGns9DIGFxcr1XGQWSaqjG/40e9S5EL2Er+2XedlKLQmjUqBv5kkrQ= 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 1647344148342278.21090201271727; Tue, 15 Mar 2022 04:35:48 -0700 (PDT) Received: from localhost ([::1]:59702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU5St-0004kI-FP for importer@patchew.org; Tue, 15 Mar 2022 07:35:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Es-0001w0-Dc for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:39901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU5Eq-00006j-Qg for qemu-devel@nongnu.org; Tue, 15 Mar 2022 07:21:18 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-375-7G64___8M8SEfw64QRKtvw-1; Tue, 15 Mar 2022 07:21:13 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C4970899EC2; Tue, 15 Mar 2022 11:21:12 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id E26DAC15D42; Tue, 15 Mar 2022 11:21:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647343276; 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=xMos71vUp0zmKkr4Wk1mN1pAv4zyr5X108yKXEe+tb8=; b=QRAUffVv28q/uuenKntA8c8qf+GFxwhLl+0hGS/jA5NBjqr0T8gTzxpM+ZTDg7GRkxhspM vlDVaIYE5DBc5U+NVseGJyEOeRmvH6zyqowhexCDrlqg6sJ1Alf2pBxILkzN3AVkrGhO7l nehEBakVrAn39UAP/dJFy4iaV96IPPY= X-MC-Unique: 7G64___8M8SEfw64QRKtvw-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 8/8] meson: Update to version 0.61.3 Date: Tue, 15 Mar 2022 12:20:52 +0100 Message-Id: <20220315112052.515467-9-thuth@redhat.com> In-Reply-To: <20220315112052.515467-1-thuth@redhat.com> References: <20220315112052.515467-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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: , Cc: Peter Maydell , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1647344151054100001 Content-Type: text/plain; charset="utf-8" Meson 0.61.3 contains an important fix which helps to see the output of failed qemu-iotests on the console again: https://gitlab.com/qemu-project/meson/-/commit/7534cf34f83b9c43 Acked-by: Paolo Bonzini Message-Id: <20220315093220.407895-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- configure | 2 +- meson | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 886000346a..8e3c41ff92 100755 --- a/configure +++ b/configure @@ -1286,7 +1286,7 @@ python_version=3D$($python -c 'import sys; print("%d.= %d.%d" % (sys.version_info[0] python=3D"$python -B" =20 if test -z "$meson"; then - if test "$explicit_python" =3D no && has meson && version_ge "$(meson = --version)" 0.59.3; then + if test "$explicit_python" =3D no && has meson && version_ge "$(meson = --version)" 0.61.3; then meson=3Dmeson elif test $git_submodules_action !=3D 'ignore' ; then meson=3Dgit diff --git a/meson b/meson index 12f9f04ba0..5cf5575a7c 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit 12f9f04ba0decfda425dbbf9a501084c153a2d18 +Subproject commit 5cf5575a7c76746935dcd9a9e380803c85023c04 --=20 2.27.0