From nobody Fri May 17 07:47:24 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=1711376031; cv=none; d=zohomail.com; s=zohoarc; b=X5ezc7iw7JfOcArJWgbJ+cUpg3eL5s6PLvXqK4upE6mO9TSckeBV0Z/BjwEsLovlkjohLAG8Vz2T7D9GLJnmG0zY5Rp90rwPMUvEI/Qq10bgXm9oEsgMC9gXQ4H7/ABKV3gYyPYymVz/RSuofrRv1q+sDrymRGFbCiKPGJSU8jg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711376031; h=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=TC7zX4WQgoLSn6ZIKyojaDdAE/R2hLhtQDyrGtIDMkU=; b=Hruy+ih46Dd9Jb5aeubJ1n2Ns6Rx/bkkk64nbkXIrzutjUVpuNhe1Ejf5y6HoBKtsYxuyqNL66qKHPYOjAJeypsFlFUn2KQtwA0IXpVTWisBqu2u5D5hvFBEIsihjzmX6uJ/HfKpshDRtpYHL40K65wxDw9Ahhjdq+K5a5uHjSo= 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 1711376031314130.754891386214; Mon, 25 Mar 2024 07:13:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rol48-00032k-8H; Mon, 25 Mar 2024 10:12:44 -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 1rol45-00032R-F9 for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:41 -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 1rol42-0005mn-9t for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:41 -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-499-oPEluuF7N6OAOmjxTxtPSg-1; Mon, 25 Mar 2024 10:12:35 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 062A328EC11D; Mon, 25 Mar 2024 14:12:34 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32D463C20; Mon, 25 Mar 2024 14:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711375957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TC7zX4WQgoLSn6ZIKyojaDdAE/R2hLhtQDyrGtIDMkU=; b=W664l9gp/DT4/kHTxj1eK58pxM2it9r9i4lstVYkzazixks8ispPVulUkPYccsV8FkshbX sBlfcbEdoJ0EVFNs7Glfi4a46hUyqzOnN+BvNBW9ojgO70G9UGTvqCV6yQO8LJN4+jd+5N S2nCXvXTlGw5bSA4QxFDtnALgKSQ1as= X-MC-Unique: oPEluuF7N6OAOmjxTxtPSg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 1/9] .travis.yml: Shorten the runtime of the problematic jobs Date: Mon, 25 Mar 2024 15:12:02 +0100 Message-ID: <20240325141210.788356-2-thuth@redhat.com> In-Reply-To: <20240325141210.788356-1-thuth@redhat.com> References: <20240325141210.788356-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 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.065, 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 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: 1711376031955100013 Content-Type: text/plain; charset="utf-8" The "[s390x] GCC (other-system)" and the "[s390x] GCC check-tcg" jobs are hitting the 50 minutes timeout in Travis quite frequently since a while. To fix it, we've got to drop a lot of the targets from the target list in the jobs to make them work again. With regards to the "check-tcg" test, we can move the check with "s390x-linux-user" to the "user" job instead which also builds the s390x-linux-user target. And while we're at it, remove the "--enable-fdt=3Dsystem" configure switch (since this is not required nowadays anymore). Message-ID: <20240320104144.823425-2-thuth@redhat.com> Signed-off-by: Thomas Huth --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 597d151b80..a8d1e12190 100644 --- a/.travis.yml +++ b/.travis.yml @@ -184,8 +184,8 @@ jobs: - genisoimage env: - TEST_CMD=3D"make check check-tcg V=3D1" - - CONFIG=3D"--disable-containers --enable-fdt=3Dsystem - --target-list=3D${MAIN_SYSTEM_TARGETS},s390x-linux-user" + - CONFIG=3D"--disable-containers + --target-list=3Dhppa-softmmu,mips64-softmmu,ppc64-softmmu,risc= v64-softmmu,s390x-softmmu,x86_64-softmmu" - UNRELIABLE=3Dtrue script: - BUILD_RC=3D0 && make -j${JOBS} || BUILD_RC=3D$? @@ -225,8 +225,8 @@ jobs: # Tests dependencies - genisoimage env: - - CONFIG=3D"--disable-containers --enable-fdt=3Dsystem --audio-drv= -list=3Dsdl - --disable-user --target-list-exclude=3D${MAIN_SYSTEM_TAR= GETS}" + - CONFIG=3D"--disable-containers --audio-drv-list=3Dsdl --disable-= user + --target-list=3Darm-softmmu,avr-softmmu,microblaze-softmmu,sh4= eb-softmmu,sparc64-softmmu,xtensaeb-softmmu" =20 - name: "[s390x] GCC (user)" arch: s390x @@ -240,6 +240,7 @@ jobs: - flex - bison env: + - TEST_CMD=3D"make check check-tcg V=3D1" - CONFIG=3D"--disable-containers --disable-system" =20 - name: "[s390x] Clang (disable-tcg)" --=20 2.44.0 From nobody Fri May 17 07:47:24 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=1711376048; cv=none; d=zohomail.com; s=zohoarc; b=VyOB0U5W19H7jsuSKXHI477eRqYixnjqDngdtUvP8JUAqgDNyewS9J/DMtSeHxmOIF3Opd7ThZuulAOniCr43DybcycaE/DPE3cWOA20l/2JiReRKoGxQwLx7uDzl/SILbM+qr8tAJxpNnx3ip0t0mO+7T38JOy0syLeqlGQUR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711376048; 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=lhNSQyTbVfldoaIJmJGMUPP6GipDIdrS4xIXkiYc7XA=; b=fwZ5tsxnrAz945gsXFXuaAjWVsDGgl+o1klpZY25Zy9qcA148nuR9SeraxWx/pwzA4zWj7AXx8XRG3/8SrGRMSMAKsY6JxL2cjxaMDyH5XImzYEuNT/cfvHYPZmvIHKsQyQVZoyfRB7cPHzzWvbufieKvZ83/MFRL/FdKQxvT3Y= 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 1711376048729967.5297374973698; Mon, 25 Mar 2024 07:14:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rol4C-000340-50; Mon, 25 Mar 2024 10:12:48 -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 1rol46-00032d-HK for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:43 -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 1rol44-0005n7-6M for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:42 -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-690-jiZiz9FqMWa0f8mGsCX8FQ-1; Mon, 25 Mar 2024 10:12:36 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 C56483CBDFC6; Mon, 25 Mar 2024 14:12:35 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F55A36FF; Mon, 25 Mar 2024 14:12:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711375959; 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=lhNSQyTbVfldoaIJmJGMUPP6GipDIdrS4xIXkiYc7XA=; b=O2SogpXRagqt73HVOhL7Gx1cyMLccrCcoc/VxsRef1CzSuk/R7ehon9pvUbnHtS5Y07B/U z58D8TVETwyK0ORpCmW8VGmWOAdTUa1WrBYQFd2AInHInxdTKlYM3HEH0PUXrSn+wai2g/ bG5U/q4BiQJEu8xGLERfoEd6a/wIAOw= X-MC-Unique: jiZiz9FqMWa0f8mGsCX8FQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 2/9] .travis.yml: Remove the unused xfslib-dev package Date: Mon, 25 Mar 2024 15:12:03 +0100 Message-ID: <20240325141210.788356-3-thuth@redhat.com> In-Reply-To: <20240325141210.788356-1-thuth@redhat.com> References: <20240325141210.788356-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.1 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.065, 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 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: 1711376050036100001 Drop the "xfslibs-dev" package which should not be necessary anymore since commit a5730b8bd3 ("block/file-posix: Simplify the XFS_IOC_DIOINFO handling"). Message-ID: <20240320104144.823425-3-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a8d1e12190..8a3ae76a7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -220,7 +220,6 @@ jobs: - libsnappy-dev - libzstd-dev - nettle-dev - - xfslibs-dev - ninja-build # Tests dependencies - genisoimage --=20 2.44.0 From nobody Fri May 17 07:47:24 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=1711376033; cv=none; d=zohomail.com; s=zohoarc; b=Dg42WrY/ukbGNiia6pkSX+e870kNZHQ/nWBclvR9qhkTjnTFJpz1sDeYgk4uQ1FFag5swj/vukw3EbgBoG2OO+bGThp7UctTpHy+MIuOCnxq51GD7p85FhvtFNBq+LBmEGSrrR/e+mKvQi/SMpVR33rJUQ8q/zbOXTYLhH3ODmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711376033; h=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=hSBKxzfQGIXmvWUvXlWhdYTTE+D3xnVPdnyercmVvxo=; b=Len+w0gN6TqhquIkGXMBsnmTHjJY/gOpzE3yG4OhEiHPHn8mrwp7pg9iyOQzy/bk1Q9cdJZ9io7DHW27RYU6P7WBu68HdctpPqZOJgeYaDZlbaZq7g3zrvNl6Uxso8R9w3QbAGwzbemiYQ5lxwRhgtsWRgkAHPYSxgHCbkgKFME= 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 171137603370990.46409681662249; Mon, 25 Mar 2024 07:13:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rol4D-00034E-Jw; Mon, 25 Mar 2024 10:12:49 -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 1rol47-00032i-La for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:44 -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 1rol46-0005nS-4A for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:43 -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-130-18KdrlPVPGioAW7iaBc8lQ-1; Mon, 25 Mar 2024 10:12:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 016281C0152A; Mon, 25 Mar 2024 14:12:37 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DFF748D9; Mon, 25 Mar 2024 14:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711375961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hSBKxzfQGIXmvWUvXlWhdYTTE+D3xnVPdnyercmVvxo=; b=NH7GcbRF832F4Tz6DQtJ/3H+HLCj7nKt1UmffEqaF/ei4/ktQG8KURbuQQeT7vpy4VBx0s QD/gMsyS7so4D94AgkxsjL9J+M5hgurrabMm5cdCVZ2MSfBP7JiVIKSYg7qzEaeH1BnKIt MTCnq4okvyvRfAHP39+mdJjxgbMSVGI= X-MC-Unique: 18KdrlPVPGioAW7iaBc8lQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 3/9] hw/microblaze: Do not allow xlnx-zynqmp-pmu-soc to be created by the user Date: Mon, 25 Mar 2024 15:12:04 +0100 Message-ID: <20240325141210.788356-4-thuth@redhat.com> In-Reply-To: <20240325141210.788356-1-thuth@redhat.com> References: <20240325141210.788356-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 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.065, 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 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: 1711376033946100017 Content-Type: text/plain; charset="utf-8" Using xlnx-zynqmp-pmu-soc on the command line causes QEMU to crash: ./qemu-system-microblazeel -M petalogix-ml605 -device xlnx-zynqmp-pmu-soc ** ERROR:tcg/tcg.c:813:tcg_register_thread: assertion failed: (n < tcg_max_ct= xs) Bail out! Aborted (core dumped) Mark the device with "user_creatable =3D false" to avoid that this can happ= en. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2229 Message-ID: <20240322183153.1023359-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- hw/microblaze/xlnx-zynqmp-pmu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pm= u.c index 5a2016672a..1bfc9641d2 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -125,6 +125,8 @@ static void xlnx_zynqmp_pmu_soc_class_init(ObjectClass = *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); =20 + /* xlnx-zynqmp-pmu-soc causes crashes when cold-plugged twice */ + dc->user_creatable =3D false; dc->realize =3D xlnx_zynqmp_pmu_soc_realize; } =20 --=20 2.44.0 From nobody Fri May 17 07:47:24 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=1711376078; cv=none; d=zohomail.com; s=zohoarc; b=Si3YBhiAHCJcN4EnQUOYgo7KV1MPIcEQgs+qwaPY07tagD8B/qyR2iH8GDApjK5lLM0Wj+ZLp9JlohdMFHRExVsX2+ISxjX8ViIQooDOVOrXCJG3KVkl4Wdaragd77DXXxsl6gpCnebORyC1kyQ8ZbHDiiLEmO+L1fS3rlXJM9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711376078; 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=ycGmDfvDeFicWZJFBS1f9ILM3U5NokHMksdsoOEEHJI=; b=Ir8iUcB1QJ232waEgIKXdpxc/tGtas5mtAqA4BojReSIV9NcSQ9JlwL81jrtj3vYkmsaaF6d8dGXc9xnXtqh41zpla31MIq8hcz7u6fpAAgreA31MgwbNZG2lrTsTtRDahq8/5/zrLjr5afKxmbUMF5XwUZXX2XcecqTtTAX0Ow= 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 1711376078669936.5832937630951; Mon, 25 Mar 2024 07:14:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rol4G-00034o-40; Mon, 25 Mar 2024 10:12:53 -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 1rol4B-00033s-M4 for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:47 -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 1rol4A-0005pe-4S for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:47 -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-538-rimA6MAfNDCyE6oL0zYbsw-1; Mon, 25 Mar 2024 10:12:39 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 4213E3C0C483; Mon, 25 Mar 2024 14:12:39 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 791A1479; Mon, 25 Mar 2024 14:12:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711375965; 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=ycGmDfvDeFicWZJFBS1f9ILM3U5NokHMksdsoOEEHJI=; b=QJWkHp1iyjL/HFmlFEh5WMQyrOg24uT3axpBleiGS/Iuy7s6zBTZo1xJWmn4njkCidDv14 fJIe3byb40OeeIZf/5p8Xs7cRc9Sv340sm2By4bkhVsYUX2m4UP/AxOW22UjrBYNiaEhCT Vzq1b4059AU/SO/s5/70xEGvpq6oUpo= X-MC-Unique: rimA6MAfNDCyE6oL0zYbsw-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 4/9] aspeed: Make the ast2600-a3 SoC not user creatable Date: Mon, 25 Mar 2024 15:12:05 +0100 Message-ID: <20240325141210.788356-5-thuth@redhat.com> In-Reply-To: <20240325141210.788356-1-thuth@redhat.com> References: <20240325141210.788356-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.1 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.065, 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 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: 1711376080160100003 From: C=C3=A9dric Le Goater Aspeed SoCs are complex devices that can not be specified on the command line. Fix that to avoid QEMU aborts. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2227 Fixes: f25c0ae1079d ("aspeed/soc: Add AST2600 support") Reported-by: Thomas Huth Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20240319150903.413662-1-clg@redhat.com> Signed-off-by: Thomas Huth --- hw/arm/aspeed_ast2600.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index 174be53770..31713de74a 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -656,6 +656,8 @@ static void aspeed_soc_ast2600_class_init(ObjectClass *= oc, void *data) AspeedSoCClass *sc =3D ASPEED_SOC_CLASS(oc); =20 dc->realize =3D aspeed_soc_ast2600_realize; + /* Reason: The Aspeed SoC can only be instantiated from a board */ + dc->user_creatable =3D false; =20 sc->name =3D "ast2600-a3"; sc->valid_cpu_types =3D valid_cpu_types; --=20 2.44.0 From nobody Fri May 17 07:47:24 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=1711376027; cv=none; d=zohomail.com; s=zohoarc; b=dZwjuwul+vx5aspp7ePxJz9Iy3n2/5Am6kOs7TAtp0XzReHSX29wc0RpLiekZ2879EhyS++o+JxAiZwxNiC8DB7VSFMzJKZ/Bg+zaqIMyxeKsFvgpll/zyHyDMdXqvAG8GD4h9fMszzF+EHEdvNvJL9RPsTygGSe8jHn5x8ipJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711376027; 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=0ktztwGv8ypFXJjxcOhjStnaCo/UPh9jx5Tv1NRsv80=; b=CXxkuItMIDqWKqwAUknfc7iJ3BfL83mSMCNphvWl4EOmg8DZmy2azw4imlSJxSfRJL3gYUZAnNrUVE8ACVRwnAEVn+8sFNLn5mamj6Ux08TPuWpkfJUD+8BIzNRBjRcCjK+vt10qDRBxhqtcBGvFNH6GW40H2p9Tup5nNJG/T8o= 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 1711376027625381.7344642891778; Mon, 25 Mar 2024 07:13:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rol4H-00035A-St; Mon, 25 Mar 2024 10:12:54 -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 1rol4B-00033p-Lv for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:47 -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 1rol4A-0005pf-6I for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:47 -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-594-151oRp74MVSloN4wgYY-4w-1; Mon, 25 Mar 2024 10:12:41 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 28AC53800BA0; Mon, 25 Mar 2024 14:12:41 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 837033C20; Mon, 25 Mar 2024 14:12:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711375965; 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=0ktztwGv8ypFXJjxcOhjStnaCo/UPh9jx5Tv1NRsv80=; b=Hl8wk/KvCU5XaDaa+pO0ihrOOeKaP/Y+zmIS9dUsHisIM8zgXN2MzOpvNMoMOLZlSmyeBr JE9nzmrdji/D2KI7SNVaG2D4S9+dSun8RHxUeN+o4aq5gt94sY7XMWaVuE3L37X/j96rER q5emJOir+nT1asdqp56efJhCpzPFSX4= X-MC-Unique: 151oRp74MVSloN4wgYY-4w-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 5/9] aspeed: Make the ast1030-a1 SoC not user creatable Date: Mon, 25 Mar 2024 15:12:06 +0100 Message-ID: <20240325141210.788356-6-thuth@redhat.com> In-Reply-To: <20240325141210.788356-1-thuth@redhat.com> References: <20240325141210.788356-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.1 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.065, 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 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: 1711376028004100001 From: C=C3=A9dric Le Goater Aspeed SoCs are complex devices that can not be specified on the command line. Fix that to avoid QEMU aborts. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2227 Fixes: 356b230ed138 ("aspeed/soc : Add AST1030 support") Reported-by: Thomas Huth Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20240319150903.413662-2-clg@redhat.com> Signed-off-by: Thomas Huth --- hw/arm/aspeed_ast10x0.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/aspeed_ast10x0.c b/hw/arm/aspeed_ast10x0.c index 2634e0f654..9f98ad8e87 100644 --- a/hw/arm/aspeed_ast10x0.c +++ b/hw/arm/aspeed_ast10x0.c @@ -424,6 +424,8 @@ static void aspeed_soc_ast1030_class_init(ObjectClass *= klass, void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); AspeedSoCClass *sc =3D ASPEED_SOC_CLASS(dc); =20 + /* Reason: The Aspeed SoC can only be instantiated from a board */ + dc->user_creatable =3D false; dc->realize =3D aspeed_soc_ast1030_realize; =20 sc->name =3D "ast1030-a1"; --=20 2.44.0 From nobody Fri May 17 07:47:24 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=1711376027; cv=none; d=zohomail.com; s=zohoarc; b=Rx3oBnaHXp+2FB1xw9+tbSHfWwd9RSKuswpLlt/MMtM1ubG7i5iUxhXoOz2iplNt//wA3l6meKsM8qpn0sYh3b4yN9MG2mgAiGGzgm5Vy/2begEDZuZwOnC4LecAc7GeQgfFe3TT0MQp8CXW1FD4/NPe62hfrRUSqm+x6gmY4bI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711376027; 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=MawEXWhzbd+c1s6u1XPJ6zLV6a+85Rfk9ax3gmrnPNQ=; b=dUypWoLwErrqGK5Y1Gha3c+h7+UAgwQAh4RYTGLguTa9HjLNUlBmz2W7tMCwxWzzzRJxeZCIs3T1BjK62SkxFz/fnquPZ0PN79pZE4LhnBZvZPTFOuCMxTix0y3/P1YW6Arri9f5IsS2kAAwufWD4gxU3dVIWURje7E+o8HMMZQ= 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 1711376027919192.14570208352563; Mon, 25 Mar 2024 07:13:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rol4X-00037V-Md; Mon, 25 Mar 2024 10:13:09 -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 1rol4D-00034H-E8 for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:49 -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 1rol4B-0005qD-1V for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:49 -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-642-YheAiPtLNHSKM4saOGtG4w-1; Mon, 25 Mar 2024 10:12:44 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 D989985A58B; Mon, 25 Mar 2024 14:12:42 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C2063C22; Mon, 25 Mar 2024 14:12:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711375966; 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=MawEXWhzbd+c1s6u1XPJ6zLV6a+85Rfk9ax3gmrnPNQ=; b=DE6Ea84J+QyFQJ2Bo7OXZmKvpyTbjljCnOudCyiawjyecSqEADn2nKynM6VHR/YrWptbpd +bm4WDVH2FW8W17PROPN8DXEMSXgkIewr4GFydUoAcJpwOyMd+Fv1WXY/Tks/C5Yiu3JGf FfEIWV2Wajk5qCivVeDAkgAFuxOWryU= X-MC-Unique: YheAiPtLNHSKM4saOGtG4w-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Glenn Miles Subject: [PULL 6/9] misc/pca955*: Move models under hw/gpio Date: Mon, 25 Mar 2024 15:12:07 +0100 Message-ID: <20240325141210.788356-7-thuth@redhat.com> In-Reply-To: <20240325141210.788356-1-thuth@redhat.com> References: <20240325141210.788356-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.1 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.065, 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 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: 1711376030061100011 From: C=C3=A9dric Le Goater The PCA9552 and PCA9554 devices are both I2C GPIO controllers and the PCA9552 also can drive LEDs. Do all the necessary adjustments to move the models under hw/gpio. Cc: Glenn Miles Signed-off-by: C=C3=A9dric Le Goater Message-ID: <20240325134833.1484265-1-clg@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- MAINTAINERS | 4 ++-- include/hw/{misc =3D> gpio}/pca9552.h | 0 include/hw/{misc =3D> gpio}/pca9552_regs.h | 0 include/hw/{misc =3D> gpio}/pca9554.h | 0 include/hw/{misc =3D> gpio}/pca9554_regs.h | 0 hw/arm/aspeed.c | 2 +- hw/{misc =3D> gpio}/pca9552.c | 4 ++-- hw/{misc =3D> gpio}/pca9554.c | 4 ++-- tests/qtest/pca9552-test.c | 2 +- tests/qtest/pnv-host-i2c-test.c | 4 ++-- hw/gpio/meson.build | 2 ++ hw/gpio/trace-events | 4 ++++ hw/misc/meson.build | 2 -- hw/misc/trace-events | 4 ---- 14 files changed, 16 insertions(+), 16 deletions(-) rename include/hw/{misc =3D> gpio}/pca9552.h (100%) rename include/hw/{misc =3D> gpio}/pca9552_regs.h (100%) rename include/hw/{misc =3D> gpio}/pca9554.h (100%) rename include/hw/{misc =3D> gpio}/pca9554_regs.h (100%) rename hw/{misc =3D> gpio}/pca9552.c (99%) rename hw/{misc =3D> gpio}/pca9554.c (99%) diff --git a/MAINTAINERS b/MAINTAINERS index 409d7db4d4..a07af6b9d4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1549,8 +1549,8 @@ M: Glenn Miles L: qemu-ppc@nongnu.org L: qemu-arm@nongnu.org S: Odd Fixes -F: hw/misc/pca955*.c -F: include/hw/misc/pca955*.h +F: hw/gpio/pca955*.c +F: include/hw/gpio/pca955*.h =20 virtex_ml507 M: Edgar E. Iglesias diff --git a/include/hw/misc/pca9552.h b/include/hw/gpio/pca9552.h similarity index 100% rename from include/hw/misc/pca9552.h rename to include/hw/gpio/pca9552.h diff --git a/include/hw/misc/pca9552_regs.h b/include/hw/gpio/pca9552_regs.h similarity index 100% rename from include/hw/misc/pca9552_regs.h rename to include/hw/gpio/pca9552_regs.h diff --git a/include/hw/misc/pca9554.h b/include/hw/gpio/pca9554.h similarity index 100% rename from include/hw/misc/pca9554.h rename to include/hw/gpio/pca9554.h diff --git a/include/hw/misc/pca9554_regs.h b/include/hw/gpio/pca9554_regs.h similarity index 100% rename from include/hw/misc/pca9554_regs.h rename to include/hw/gpio/pca9554_regs.h diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 8854581ca8..93ca87fda2 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -18,7 +18,7 @@ #include "hw/block/flash.h" #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_eeprom.h" -#include "hw/misc/pca9552.h" +#include "hw/gpio/pca9552.h" #include "hw/nvram/eeprom_at24c.h" #include "hw/sensor/tmp105.h" #include "hw/misc/led.h" diff --git a/hw/misc/pca9552.c b/hw/gpio/pca9552.c similarity index 99% rename from hw/misc/pca9552.c rename to hw/gpio/pca9552.c index 2ae13af35e..27d4db0680 100644 --- a/hw/misc/pca9552.c +++ b/hw/gpio/pca9552.c @@ -15,8 +15,8 @@ #include "qemu/module.h" #include "qemu/bitops.h" #include "hw/qdev-properties.h" -#include "hw/misc/pca9552.h" -#include "hw/misc/pca9552_regs.h" +#include "hw/gpio/pca9552.h" +#include "hw/gpio/pca9552_regs.h" #include "hw/irq.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/misc/pca9554.c b/hw/gpio/pca9554.c similarity index 99% rename from hw/misc/pca9554.c rename to hw/gpio/pca9554.c index 778b32e443..affc9b2d61 100644 --- a/hw/misc/pca9554.c +++ b/hw/gpio/pca9554.c @@ -11,8 +11,8 @@ #include "qemu/module.h" #include "qemu/bitops.h" #include "hw/qdev-properties.h" -#include "hw/misc/pca9554.h" -#include "hw/misc/pca9554_regs.h" +#include "hw/gpio/pca9554.h" +#include "hw/gpio/pca9554_regs.h" #include "hw/irq.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/tests/qtest/pca9552-test.c b/tests/qtest/pca9552-test.c index ccca2b3d91..7474957692 100644 --- a/tests/qtest/pca9552-test.c +++ b/tests/qtest/pca9552-test.c @@ -12,7 +12,7 @@ #include "libqtest.h" #include "libqos/qgraph.h" #include "libqos/i2c.h" -#include "hw/misc/pca9552_regs.h" +#include "hw/gpio/pca9552_regs.h" =20 #define PCA9552_TEST_ID "pca9552-test" #define PCA9552_TEST_ADDR 0x60 diff --git a/tests/qtest/pnv-host-i2c-test.c b/tests/qtest/pnv-host-i2c-tes= t.c index c635177252..7f64d597ac 100644 --- a/tests/qtest/pnv-host-i2c-test.c +++ b/tests/qtest/pnv-host-i2c-test.c @@ -8,8 +8,8 @@ */ #include "qemu/osdep.h" #include "libqtest.h" -#include "hw/misc/pca9554_regs.h" -#include "hw/misc/pca9552_regs.h" +#include "hw/gpio/pca9554_regs.h" +#include "hw/gpio/pca9552_regs.h" #include "pnv-xscom.h" =20 #define PPC_BIT(bit) (0x8000000000000000ULL >> (bit)) diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build index 791e93a97b..a7495d196a 100644 --- a/hw/gpio/meson.build +++ b/hw/gpio/meson.build @@ -2,6 +2,8 @@ system_ss.add(when: 'CONFIG_GPIO_KEY', if_true: files('gpio= _key.c')) system_ss.add(when: 'CONFIG_GPIO_MPC8XXX', if_true: files('mpc8xxx.c')) system_ss.add(when: 'CONFIG_GPIO_PWR', if_true: files('gpio_pwr.c')) system_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c')) +system_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c')) +system_ss.add(when: 'CONFIG_PCA9554', if_true: files('pca9554.c')) system_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c')) system_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c')) =20 diff --git a/hw/gpio/trace-events b/hw/gpio/trace-events index 9331f4289d..b91cc7e9a4 100644 --- a/hw/gpio/trace-events +++ b/hw/gpio/trace-events @@ -13,6 +13,10 @@ nrf51_gpio_write(uint64_t offset, uint64_t value) "offse= t 0x%" PRIx64 " value 0x nrf51_gpio_set(int64_t line, int64_t value) "line %" PRIi64 " value %" PRI= i64 nrf51_gpio_update_output_irq(int64_t line, int64_t value) "line %" PRIi64 = " value %" PRIi64 =20 +# pca9552.c +pca955x_gpio_status(const char *description, const char *buf) "%s GPIOs 0-= 15 [%s]" +pca955x_gpio_change(const char *description, unsigned id, unsigned prev_st= ate, unsigned current_state) "%s GPIO id:%u status: %u -> %u" + # pl061.c pl061_update(const char *id, uint32_t dir, uint32_t data, uint32_t pullups= , uint32_t floating) "%s GPIODIR 0x%x GPIODATA 0x%x pullups 0x%x floating 0= x%x" pl061_set_output(const char *id, int gpio, int level) "%s setting output %= d to %d" diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 265b2c2627..86596a3888 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -3,8 +3,6 @@ system_ss.add(when: 'CONFIG_EDU', if_true: files('edu.c')) system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmcoreinfo.c')) system_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c')) system_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c')) -system_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c')) -system_ss.add(when: 'CONFIG_PCA9554', if_true: files('pca9554.c')) system_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c')) system_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) system_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c')) diff --git a/hw/misc/trace-events b/hw/misc/trace-events index 7cab1d5cb5..5d241cb40a 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -327,10 +327,6 @@ grlib_apb_pnp_read(uint64_t addr, unsigned size, uint3= 2_t value) "APB PnP read a led_set_intensity(const char *color, const char *desc, uint8_t intensity_p= ercent) "LED desc:'%s' color:%s intensity: %u%%" led_change_intensity(const char *color, const char *desc, uint8_t old_inte= nsity_percent, uint8_t new_intensity_percent) "LED desc:'%s' color:%s inten= sity %u%% -> %u%%" =20 -# pca9552.c -pca955x_gpio_status(const char *description, const char *buf) "%s GPIOs 0-= 15 [%s]" -pca955x_gpio_change(const char *description, unsigned id, unsigned prev_st= ate, unsigned current_state) "%s GPIO id:%u status: %u -> %u" - # bcm2835_cprman.c bcm2835_cprman_read(uint64_t offset, uint64_t value) "offset:0x%" PRIx64 "= value:0x%" PRIx64 bcm2835_cprman_write(uint64_t offset, uint64_t value) "offset:0x%" PRIx64 = " value:0x%" PRIx64 --=20 2.44.0 From nobody Fri May 17 07:47:24 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=1711376027; cv=none; d=zohomail.com; s=zohoarc; b=gRFRbeebfciwmjsJ2Hk9TpPqiWZJ6AKIywWgMafbp7KJyY8ONt459bhgT+QefC9tSU60uudcvhGZuiR8WEgBFt8s3pKEfXzPdyKJrMEQm+GmCzLFksJHm8tVa1t37AMDtP7wlwkgbQcOXlR5qN6BqVr/jzfhNP1REhkTCt7eYd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711376027; 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=rxz6eqe82dStmQUwcjm1hBlQoThuAwMk0wigGLvJYPY=; b=bt/ZqtY0Hq3CJO9wcr452er9cNSIAx9uPJQy6LBEmy379TzimiW69+r40foq+V1A9xcMXcKCx/IQwh+ZgmOd/Evuwg3xzrYr94xJ8XJZg74aIxkX5Cw9OguRHkYX8xxV4zx2erV+Kk6Eyd30aXHiqZEwJZVbSJAsbEWFl0L+BpA= 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 1711376027886562.8061155050962; Mon, 25 Mar 2024 07:13:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rol4J-00035Q-KW; Mon, 25 Mar 2024 10:12:55 -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 1rol4F-00034l-C5 for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:51 -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 1rol4E-0005so-16 for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:51 -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-650-KjWBPmGlOsGjz760YwZjeg-1; Mon, 25 Mar 2024 10:12:46 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 DCD261C008C6; Mon, 25 Mar 2024 14:12:44 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2840E3C20; Mon, 25 Mar 2024 14:12:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711375969; 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=rxz6eqe82dStmQUwcjm1hBlQoThuAwMk0wigGLvJYPY=; b=gYoDPpmcIdOBqLgYjagLDsQFnZj30hTnJu+/72yv7hVWXxpMwyOPkQo5EdBWjij/iPZn/u tj4nJ2uhIw4FKZF0te+YuUe2u+GxJW82n3Uvd7b6Vb2ojSwlVettb6EEl9T1Ft4LEBhojI p6zbc0X7Iim3P2VUf8pcSO7D0aQWo7c= X-MC-Unique: KjWBPmGlOsGjz760YwZjeg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Zheyu Ma , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi Subject: [PULL 7/9] libqos/virtio.c: Correct 'flags' reading in qvirtqueue_kick Date: Mon, 25 Mar 2024 15:12:08 +0100 Message-ID: <20240325141210.788356-8-thuth@redhat.com> In-Reply-To: <20240325141210.788356-1-thuth@redhat.com> References: <20240325141210.788356-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.1 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.065, 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 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: 1711376030030100009 From: Zheyu Ma In qvirtqueue_kick(), the 'flags' were previously being incorrectly read fr= om vq->avail instead of the correct vq->used location. This update ensures 'fl= ags' are read from the correct location as per the virtio standard. Signed-off-by: Zheyu Ma Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Hajnoczi Message-ID: <20240320090442.267525-1-zheyuma97@gmail.com> Signed-off-by: Thomas Huth --- tests/qtest/libqos/virtio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/libqos/virtio.c b/tests/qtest/libqos/virtio.c index 82a6e122bf..a21b6eee9c 100644 --- a/tests/qtest/libqos/virtio.c +++ b/tests/qtest/libqos/virtio.c @@ -394,7 +394,7 @@ void qvirtqueue_kick(QTestState *qts, QVirtioDevice *d,= QVirtQueue *vq, qvirtio_writew(d, qts, vq->avail + 2, idx + 1); =20 /* Must read after idx is updated */ - flags =3D qvirtio_readw(d, qts, vq->avail); + flags =3D qvirtio_readw(d, qts, vq->used); avail_event =3D qvirtio_readw(d, qts, vq->used + 4 + sizeof(struct vring_used_elem) * vq->size); =20 --=20 2.44.0 From nobody Fri May 17 07:47:24 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=1711376059; cv=none; d=zohomail.com; s=zohoarc; b=T/pL3c+GgnuKtUHJ+P43+hEkkvEWupbWMrfridbY2eJViILAgFLNUPopxeNrUQ501JDrgTd8Yl41DisE5ijdG4j1x1bHKl4x/572U+nRKWxvHeRjAt8x/TV5ygIS+wLM5WofKhKj+VIBS5iMppySb+DZowWyVevJnZv1fz5yIfc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711376059; h=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=jvtDnRWzDZsJoUkIlOW0ywPJ2i2CMssnW163x/f5Cwc=; b=VE9U57PFIxZli/NT0uV7Yfl2t2BV8JokPPxNmejf5mACcn7O5eiBHuM+7VfaidtwmLx5vQBGhfjLxm0WuJkq8hwuVnjGrkNaHDypxG1PkUnsR+dzjKFAVyn4ZMD9XjpPk5ZMc7U2HLtMma9W0Bwmco88A5kZGE/JNgp4F59FMLM= 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 171137605921251.992743045881525; Mon, 25 Mar 2024 07:14:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rol4R-00036i-1x; Mon, 25 Mar 2024 10:13:03 -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 1rol4I-00035O-U7 for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:55 -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 1rol4H-0005tz-Iw for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:54 -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-490-tUoWFmSBMV2H9ZkoCJnvYA-1; Mon, 25 Mar 2024 10:12:48 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 B0987822487; Mon, 25 Mar 2024 14:12:47 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 416873C22; Mon, 25 Mar 2024 14:12:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711375971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jvtDnRWzDZsJoUkIlOW0ywPJ2i2CMssnW163x/f5Cwc=; b=FRmFUtWonkhU8wQGFgu8CYaR8jXnPAuOSw9me+lpAf16KzRPAzggSTohcARGknjifKPo7V RvDbKOZ5YkEFNU6MD4SYzgjilro0Fa/ldXZTyh0ZEQkUlxbQ0PmIi1sUgTu/B0EieyqeJv XuvWh6gRSuaX5AFPK+lNAZ1GZfy/0PM= X-MC-Unique: tUoWFmSBMV2H9ZkoCJnvYA-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Ido Plat , qemu-stable@nongnu.org, Ilya Leoshkevich , Richard Henderson , David Hildenbrand Subject: [PULL 8/9] target/s390x: Use mutable temporary value for op_ts Date: Mon, 25 Mar 2024 15:12:09 +0100 Message-ID: <20240325141210.788356-9-thuth@redhat.com> In-Reply-To: <20240325141210.788356-1-thuth@redhat.com> References: <20240325141210.788356-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 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.065, 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 autolearn=unavailable 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: 1711376060043100004 Content-Type: text/plain; charset="utf-8" From: Ido Plat Otherwise TCG would assume the register that holds t1 would be constant and reuse whenever it needs the value within it. Cc: qemu-stable@nongnu.org Fixes: f1ea739bd598 ("target/s390x: Use tcg_constant_* in local contexts") Reviewed-by: Ilya Leoshkevich Reviewed-by: Richard Henderson [iii: Adjust a newline and capitalization, add tags] Signed-off-by: Ido Plat Signed-off-by: Ilya Leoshkevich Reviewed-by: David Hildenbrand Message-ID: <20240318202722.20675-1-iii@linux.ibm.com> Signed-off-by: Thomas Huth --- target/s390x/tcg/translate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 0d0c672c95..57b7db1ee9 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -4781,9 +4781,10 @@ static DisasJumpType op_trXX(DisasContext *s, DisasO= ps *o) =20 static DisasJumpType op_ts(DisasContext *s, DisasOps *o) { - TCGv_i32 t1 =3D tcg_constant_i32(0xff); + TCGv_i32 ff =3D tcg_constant_i32(0xff); + TCGv_i32 t1 =3D tcg_temp_new_i32(); =20 - tcg_gen_atomic_xchg_i32(t1, o->in2, t1, get_mem_index(s), MO_UB); + tcg_gen_atomic_xchg_i32(t1, o->in2, ff, get_mem_index(s), MO_UB); tcg_gen_extract_i32(cc_op, t1, 7, 1); set_cc_static(s); return DISAS_NEXT; --=20 2.44.0 From nobody Fri May 17 07:47:24 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=1711376058; cv=none; d=zohomail.com; s=zohoarc; b=efprQXscE3J9+jWS747n67+1UwhYq0OJg42LH2KU9XJ1s6H8X3ScEiQFNTpaEsQtSpLxkbf/AH1UhGobPITtaMASF2XZePw29Wb+ybIRarqL781708CR8/XK6Mc9fUg2nxD2T9osjjXJu0r77XllJ8d7JLyTJVEdkvy4Z1NIwJ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711376058; h=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=e/ndwUAIAghUSD679D4fKjCND9j9K0f5xXqvUEDwxA0=; b=JEHMFE/q0PgTsFDvIyLO9DDNZJ8ZBSLIc4DQg7u0yxq0MKIsbpB8gTBjmuU5G4Hb7tTu3KjiJpgJ6MwRuw6iSbuecJw9MJslzuUDy0TML/VyoPcpPBYPLGdJSOh5kkSTHVHWY9nTe9kAJ2rBLt2HLV5kjsczmwXZuhJC8yNAgvs= 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 1711376058460531.2025798406623; Mon, 25 Mar 2024 07:14:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rol4R-00036h-1k; Mon, 25 Mar 2024 10:13:03 -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 1rol4J-00035P-2C for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:55 -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 1rol4H-0005u1-K1 for qemu-devel@nongnu.org; Mon, 25 Mar 2024 10:12:54 -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-625-NNTYa60gPiaIpdLoIZ1m-A-1; Mon, 25 Mar 2024 10:12:49 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 5BAC9800266; Mon, 25 Mar 2024 14:12:49 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0196A3C20; Mon, 25 Mar 2024 14:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711375971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e/ndwUAIAghUSD679D4fKjCND9j9K0f5xXqvUEDwxA0=; b=BTtYQEKJ5O48Lvi0jlkOaNmIWSc+1W9u+IMBaBB8WU/lYmiDnhl6Eeimiu2lVl5d/DqPwr bs2FCSh8+KwCYxKllYqH8b63QLHUkgRETUNN0mMIOnrmw+Eu2Nb9FbG8IOXaTKKsTleQzv OEYegl3H+en7LNvLDvA8052FCI3vdmQ= X-MC-Unique: NNTYa60gPiaIpdLoIZ1m-A-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Ilya Leoshkevich , Richard Henderson Subject: [PULL 9/9] tests/tcg/s390x: Test TEST AND SET Date: Mon, 25 Mar 2024 15:12:10 +0100 Message-ID: <20240325141210.788356-10-thuth@redhat.com> In-Reply-To: <20240325141210.788356-1-thuth@redhat.com> References: <20240325141210.788356-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 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.065, 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 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: 1711376060041100003 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich Add a small test to prevent regressions. Signed-off-by: Ilya Leoshkevich Reviewed-by: Richard Henderson Message-ID: <20240318202722.20675-2-iii@linux.ibm.com> Signed-off-by: Thomas Huth --- tests/tcg/s390x/ts.c | 35 +++++++++++++++++++++++++++++++++ tests/tcg/s390x/Makefile.target | 1 + 2 files changed, 36 insertions(+) create mode 100644 tests/tcg/s390x/ts.c diff --git a/tests/tcg/s390x/ts.c b/tests/tcg/s390x/ts.c new file mode 100644 index 0000000000..441faf30d9 --- /dev/null +++ b/tests/tcg/s390x/ts.c @@ -0,0 +1,35 @@ +/* + * Test the TEST AND SET instruction. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include +#include + +static int ts(char *p) +{ + int cc; + + asm("ts %[p]\n" + "ipm %[cc]" + : [cc] "=3Dr" (cc) + , [p] "+Q" (*p) + : : "cc"); + + return (cc >> 28) & 3; +} + +int main(void) +{ + char c; + + c =3D 0x80; + assert(ts(&c) =3D=3D 1); + assert(c =3D=3D 0xff); + + c =3D 0x7f; + assert(ts(&c) =3D=3D 0); + assert(c =3D=3D 0xff); + + return EXIT_SUCCESS; +} diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.tar= get index e2aba2ec27..a8f86c9449 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -47,6 +47,7 @@ TESTS+=3Dadd-logical-with-carry TESTS+=3Dlae TESTS+=3Dcvd TESTS+=3Dcvb +TESTS+=3Dts =20 cdsg: CFLAGS+=3D-pthread cdsg: LDFLAGS+=3D-pthread --=20 2.44.0