From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432012; cv=none; d=zohomail.com; s=zohoarc; b=lcnFvV1lKAMVaw5HByNT1H0PFyryoZEsv7oxw/TntVvRh2TJdmxlufzjMR9G08KsA44tVN9kda5k97I5JMZ/CLcllK6V+JWYNZvGEg0D/ryIyiN2P79HQ1ofi9BXnsXrM8PWTX9dmU4i/6z5ZXaWdoDnGlLkc5rQG2kfNVHG7B0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432012; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=+hA21VIYFSsJ97/MLiNGmGBD+2APEfUHCnq5ULE3qWE=; b=ZugKEkVVtNELi5vPs5+rf2cofTpkwifNJBRe1PpzPmqhme3YFcxUzIj1k22sGp1z04UNy5kGgxhYg9JIM2S+kcOgih8sWoWhugkVKbSR6QvP9ar1NOTr52khXZrmFxhXDifecX8qzp/FMYOQBbvvTQY47v5rOAFqFpYC7q0OHFQ= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432012623280.48642120976797; Thu, 3 Sep 2026 03:40:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24rH-0004RU-LH; Thu, 03 Sep 2026 06:39:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24rF-0004R2-PW for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:39:49 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24rE-00069I-3A for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:39:49 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHKsG162990 for ; Thu, 3 Sep 2026 10:39:47 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf6tx049p-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:39:46 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-9393ac4961fso162327585a.2 for ; Thu, 03 Sep 2026 03:39:46 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448ed38cfsm11883102f8f.19.2026.09.03.03.39.43 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:39:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= +hA21VIYFSsJ97/MLiNGmGBD+2APEfUHCnq5ULE3qWE=; b=JUlntdyZCkLGXPTT N56PQaLT+vx3u5jkxQrvs5QkSW0Sb4OfiCOt90D/IdD94ffSaOwEwo2xhrZ40gol rOTNAAZhHcFW+sOAD+R7vtWZhZGEuH9ezL4xzX3K3O/LUYlR+NziVsvWXuPJrT/d yU8gBnnIyYrwK7MMzS0KxzOiHVeEIvBafGPSCVk4w9oAusYF52Xuzf2r+ZcuqC4c yKAv4sKMwTQWPgTuSFunK0DSQPju3e/Mg1ZQkW6dhSs84qJgHaPSVNdGv7I+ydmw W0CQXkXqdH05zsLbaf0r4oWNQjlN8gw3WkCT+woF9OiI1xWVjP/YNeejeL0fFViC ibc/Ng== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788431986; x=1789036786; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=+hA21VIYFSsJ97/MLiNGmGBD+2APEfUHCnq5ULE3qWE=; b=LEHDs2L7BRiIMW+VEl0CLWGwa3xeXPYq8A/Bg1pLN+M9IvejjybeM/7MFFlvyrm4dp jNFOwVdT+HGihYTkluvqmu43v12AwTVwbCznr/0ofq31Hyu439iAVQvOfPEHLsPDAYzn GcFTFN88jOr1P7M3krptdI5rHEtztdSgj7qZ1vWZCR1Y2+TsiuHZYn+drqSgHFqxYppM oN5zuSXjeaDIn/n/nbUt5rTf3M0h73e0aXkv8MgV/6j6JrzfbJFYgAzOpeuMj87GBBZy yzMSAYy/bJfc2+tMEQUmUPpc9Uvms0XKKYZC9pdE2z3/7yCEidoN1FguTWY2QojZDLT0 saVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788431986; x=1789036786; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=+hA21VIYFSsJ97/MLiNGmGBD+2APEfUHCnq5ULE3qWE=; b=JoINxQEom9ZaL2h5nOiDFuVZ5ZEDc4P/55Xv+6QWek0Vz4fM5QTGwhv9S3f7joCfWy 0F2NTTPP5cKTsJTgFrAXGil7LaZEGvP6W5wLA735xwvEhwXRF6xQadRsBKVuDx73/8lF dCdEJcqwlJKx4lRkDDcTeF9mkDuyw3CDEMaQh6xeAcWrpo1m+Pu6A9e3TGkwGdvQxW5n 3U/WKDBbB9q06c9x1to6blUuDXSoQXoN1kvs/NSfJ4r2FI4Lhr2Pt7KYhkaLS3dGAQSs 0MiHC15esrdr+1L5gG8V5lrEu+x50lU6tTlYuekGRepP5LmvhIZWkMBfERlrklqQfuRa qY+A== X-Gm-Message-State: AFuF++lN9dxVLa+tjtf7Hv410bRpBSrgoIBfpVyN8q/LnM1MdrBVNlWQ HjeaCR/fXF9X3a+Kp/AGornHag9TzvcsDZG8W8LmrZrhA1vCFhk0euQvydMd1UeRiTrpyML/6gs YMPSf0trYzqOQ8kWxWsJix0MuEPRvhbX84S7UCh2TSoBBHRmMAnkBd0kWJHi1RUaYdA== X-Gm-Gg: AYBFou3dbNgP7+unNY3tAmE8pIBe8CuCIDeGkfPQ6IHNPGOOBmPbdz5dTNqojnGzHME NO8qa9fFsavOx/uqrqZA7Q/tsmgepi2AGu3nKUKFLbe/uW1YWJW5w0zYHTLAAQPjvcShxRGM37p P8gy2G1R2FwEYltsQ7CXLBoVN2Cz7mvL2306expNY0dzfwtcFqDAkBvqmsVCOpG1v7jWBsQ9E2q agUpMkKC3u7/K8P+F/Gh/Hfw9PsYHq/qnY6Myek1B2KlNXsoKID5VcTsP+ptDTSEZXy+0ZzoT2f pFcp2EGpU+RIGwVpUZ1Y8aJNf5ujR8Lhnz9qOWVIbEV82/ag3plvMm+/GS/hI0KQ8pqKzdKTqfG xXqZu+KKvBZ5Ax3mvghu+EaN9J6wFcpAaA7ehkBOa X-Received: by 2002:a05:620a:4151:b0:939:fa7:8df8 with SMTP id af79cd13be357-93960de3a2bmr1289747985a.11.1788431986296; Thu, 03 Sep 2026 03:39:46 -0700 (PDT) X-Received: by 2002:a05:620a:4151:b0:939:fa7:8df8 with SMTP id af79cd13be357-93960de3a2bmr1289744485a.11.1788431985780; Thu, 03 Sep 2026 03:39:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 01/51] hw/sd: give the RPMB vmstate subsection a name of its own Date: Thu, 3 Sep 2026 12:38:45 +0200 Message-ID: <20260903103936.62355-2-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: Eba_l5JxiNfpPQ4_GeNIFsike51a7qI2 X-Authority-Analysis: v=2.4 cv=TqjWQjXh c=1 sm=1 tr=0 ts=6a994e72 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=5RHtEPMUJtLrCEOe:21 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=6rqHouBjAAAA:8 a=69wJf7TsAAAA:8 a=EUspDBNiAAAA:8 a=Oy2_cJ1RsVdzQtVqsEIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=Hx1yvPaMooE3kwe23bt7:22 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-ORIG-GUID: Eba_l5JxiNfpPQ4_GeNIFsike51a7qI2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX4sUHN1vOhwmE ps1jsvy3vINqxlI/5RJS5zFfPaIGidr36RN1loltqtRIsLC0E7xw9a2SjASDDpFLlggMIm1ahsX IKER9QQvG/wkdJG1wV0QQfq8sk99ROcNsmDd6iPP3kzaWsWsmb3IUB6JSUxDb6MKWoyCIXf8Jpt 369D+fCsJ7pBDKMCS8KzdHbcH/W9+cQFgyyAX6LWsCgdfEoOrturGYoB9cgZncVPFyrNAv+Q8mz NzhEcgTY6H+K8O1Ov6PnvfT6RctG0ndCLNgvRNFXQssHdh9gw+DOn4scnvfs3mcyqUmYcXA4bV6 R2sjQyLdvfmZO+wJ60E8MxxbKX0HdzGZIhP1adcgdHtPdgcsWWAAcAn10g04IVGwE1qdZ7e8rnx n5Iddr8UwGXoOwI0gu5jFWffUiFf1sCqt+vBTgDxIoRAf9iG0lMYAfPhBk3gqxSBi9x+Mgpygjx +Ui5XDiTppMNiFyPj8g== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX/2dX3nowF+3q vZMaVP6TnLMKHhJgBD4iZF1HKAbbFcndODDRa7AFiuiA4kJjZf37PtzeVf4Onl8h8O2kmUkvEiD IwDnAEPjxnsRVg4wI2uN2RETOlVkdQI= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 suspectscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 malwarescore=0 spamscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432014327158500 From: "Denis V. Lunev" emmc_rpmb_vmstate and emmc_extcsd_vmstate are both called "sd-card/ext_csd_modes-state" and both sit in sd_vmstate.subsections, so a card with an RPMB partition sends two subsections under one name: 192 bytes of ext_csd_rw and 353 bytes of RPMB state. vmstate_get_subsection() returns the first entry whose name matches, so the destination parses both of them as emmc_extcsd_vmstate. The RPMB section is 161 bytes longer than the fields being loaded from it, the stream is left mid-section, and the load fails: (qemu) migrate file:vm.mig ... on the destination: load of migration failed: Invalid argument: Section footer error, section_id: 38 Reproduced with qemu-system-x86_64 -M q35 -device sdhci-pci,id=3Dmmc \ -drive if=3Dnone,id=3Dd0,file=3Demmc.raw,format=3Draw \ -device emmc,bus=3Dsd-bus,drive=3Dd0,rpmb-partition-size=3D131072 Name it "sd-card/rpmb-state". A stream written by an affected version cannot be loaded by any version, this one included, so there is no working format to stay compatible with. Cc: qemu-stable@nongnu.org Fixes: 8ef4260a3f ("hw/sd/sdcard: Add basic support for RPMB partition") Signed-off-by: Denis V. Lunev Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260814183859.4034017-1-den@openvz.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index a30c541df07..674ca09b49f 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1022,7 +1022,7 @@ static bool vmstate_needed_for_rpmb(void *opaque) } =20 static const VMStateDescription emmc_rpmb_vmstate =3D { - .name =3D "sd-card/ext_csd_modes-state", + .name =3D "sd-card/rpmb-state", .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D vmstate_needed_for_rpmb, --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432046; cv=none; d=zohomail.com; s=zohoarc; b=S5UbNLU0UO7et+ePPz7NONypGMfi349Fuj9cryt7jRhh+9aIkp9LLJ/llb6cK5axuG7/i4mnGcty1Hi3ZTruDofd8bw/Zx/DVGoDpv2lZs8tLofIjO1NbEURYjPW9G3fMACS8TeUGWS5j6g6aX4BHRdw3qCpciiDoKo/Ok94CaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432046; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=rj9HFNqOvL6W+iuHT3IkTS3/R63iSdtXObzNE9q86hI=; b=g6dGmVCm3Nb2F2ZSLa3cM8nrSUFCsMpS+BZTn6CtC2E0/rXqK8/HzJ+tyouCEJc0ZAQ2Z2wfOU//kXdFcjxXxFnDtxbfvzgmqL6JnIA4PYmXjO7Z8BQwQqH3rUN9kqiBqMlIw+xDN83TDOyCp65KUgxispNQXVrepN33ul+qP9o= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432045970456.83460840386715; Thu, 3 Sep 2026 03:40:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24rZ-0004VS-Ec; Thu, 03 Sep 2026 06:40:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24rO-0004Rt-KT for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:39:59 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24rM-0006AZ-ME for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:39:58 -0400 Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHAs2212400 for ; Thu, 3 Sep 2026 10:39:55 GMT Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf1pyhfka-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:39:55 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-9390a2c895bso579064885a.0 for ; Thu, 03 Sep 2026 03:39:54 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e72c28sm13900890f8f.6.2026.09.03.03.39.51 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:39:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= rj9HFNqOvL6W+iuHT3IkTS3/R63iSdtXObzNE9q86hI=; b=AuHn1PX1GFl0/QMN 2k/YDsyG0qYYB9cNXVEOyvdp1G79mjX8kVU4OyihHa/QyjgUrnp+tVa6Rq33yba7 cISRN6pspSk0FpXHURfEbk4mqfa4n3+jQpJ2SMo8qlfyLDZEzDlQgO9DjjXjZFp1 OSZnkiuox2H40FjF2oMWw9CtJokuBWdRvOkecvWMCpRIuDrjTvakcUpPqDQUCtzr nCU5uw92T9T2L/V891+B1E86Pkp3BW4R6Bu5tysXQWA2XQhPrLY3g7sA6NUjd+eG 3wQWoAMLiZerjCrARGiiufdusrsmtwoVFMPJaX1mSJ6f+2h/bJZHMSXhhQ/bxU2f 44wMWg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788431994; x=1789036794; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=rj9HFNqOvL6W+iuHT3IkTS3/R63iSdtXObzNE9q86hI=; b=Esi3XnHeggb8ywL6u5m+HuvnSA1p7yhTgYDhDNJXJhZFzv1h3qAjP39mFjBeEM5cCp V/hIoVpmjlwyDYWFsUxIrqyAg3c8ULuK5aF29dH+AWNJTb7hEVVWeYMdqyR3OyF0YwKI R/+d/jQMSQqqIS0+bMRov+EF+D8CUImh71MoZfD0THPKB4rMsVTAmPTv6quiBYZgLDDH y80ngOlmh43RBvPunyvd3tMFfKBvB4WMvWLiPOVuZ3yy2l9EPivkcEWSW9tUAD931l6W 6Wf7iHiqHXx6bhQlUn0+Iw4YtxnGaAJLXKiRnvpI6I0CQFJcWxSXE5DDQAEJmhHi/uHt 6axw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788431994; x=1789036794; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=rj9HFNqOvL6W+iuHT3IkTS3/R63iSdtXObzNE9q86hI=; b=RrW79H3HGZXc8ptiTjDuMvFzgm/SRZHaL6cX3gjOEFLHDwkD1g3dbi/hp8UaUc2Wjv D1lvsZhV5MixcUo3QmgXj9hCovCVpedSC1lLSFcr2cuCVBRHS6oPMRyvDAYZiUydmoDt Snl/u2Gr/0DSlEDC0/WeFtlDpE5zboquJTSOOQmLgZ8NwTwdzrZ3/mHHO6oP47QHmoem RtTil34G9DNUC9TUUaMhNQa2M9O6KE75WWb1LBjpXyJ+oOlccEvD5rUls+1TDfeGM1tc Uy4WvlIz8Sc5AajlrM38s6Knj/b+wd7G9UFB9wtRdelhjpVdJPma2WEzha03Sq2fAqEj e7ag== X-Gm-Message-State: AFuF++mUcDU6aEifh/KQw+SUxlfR20ycNQ2VRwDaSbwW/N8iPQC0XOwT t6IP8z40PbYd81kut3pdoH7L6ZOfzWOR2kksyGpxd/DDeyhdTVZ0kYdFcfqqvGcO3bbkzFRoh7B 1VjFYJea46K6CQArnsbYIMkD2rHZeLTnxwABPmxSSXRDvBaiNHEyMx2rxkqq6hT86Ew== X-Gm-Gg: AYBFou3JPvZnuLONTCBN6RspAopQ4L5tBRFBVIhq+l/ES3Je+N3bPKbHxeAFsyar0Pw ArmJOIzf5ayK4PoiYtcUzYCpVrUw6m38wyc5sG0vQKFPaKhkdkcfvC0FeBgeK9HB9IhyeV0Q5ca HaKUUi7ha828MuWYQTUcbXsDWidCje2jv3DABdq0bpNVbN8OmQZRHZPY+HQEOtVjqake+4Pn8C8 QvhTTVTRV4hL5POFNH9TFe1de4WZhBUTWJbVyWBTzeOJjcx9jjeSHGqFdU+2GQWq+ONCKr2r+sk d5CtOW7VaKCg5lmHTECrrVQqDsqmGkWQpLPhz61aZNLUSuSgX6sAvmEBoAXB3/EkEsMmPSb195Y K4fVG8bmxZOODb/w/LJ7oa2dUH29n4Yt8ZFnRgJIq X-Received: by 2002:a05:620a:2992:b0:939:7835:8f87 with SMTP id af79cd13be357-9397835926dmr134622085a.17.1788431994002; Thu, 03 Sep 2026 03:39:54 -0700 (PDT) X-Received: by 2002:a05:620a:2992:b0:939:7835:8f87 with SMTP id af79cd13be357-9397835926dmr134617485a.17.1788431993328; Thu, 03 Sep 2026 03:39:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 02/51] hw/sd: sdhci: Fix SDMA boundary bug Date: Thu, 3 Sep 2026 12:38:46 +0200 Message-ID: <20260903103936.62355-3-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX78akgPch3n55 OA4I7xfXn1wlkcr7QgDq3nKB5DzWR2dSPFQszBpW/ExkNrWNbISUzMzBSGMdJzo19sBQ/Z9o9XE MbGGvOpg1AsHu4rTqsIugbx8x82lna7mcpba7xKQETyiz7dH1Yxe70pzVJiHsIT5Ap1Xe7NNn+H Ho/miLfOn9LEJrXg5/dHke5S4vYt/4k8br3N+w2cpPYv96TQFCArGnqiPNNPVFVNhS3TRZIOPbS qgM4eBmRgGU3VMXDPAT0j4UfZv2jt3E+kNif6OonqsN6WKRENybm200xgZtEosXa5ZnKXCyxlSi +1ZYvv3SUtWllNcclvy19KRsLNiN9VwPHdlHyd5OpAlqjMbCHDmWui4u/NEy4LvjgIhUXPtt1/8 wuwly+ivSWm2MWub95iByJNnIQCs4UzHDwvfV3CdSXRYklrlfUGtVM1E7dGh+gIZT0Xwqeux7cr 9udCMJU6haNycvFVLdQ== X-Proofpoint-ORIG-GUID: dnXmfqhdS1LbU7PIsy2HqXJkZ3ztWh_S X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX3zrT0I4PlMTG hbU2Ub68tj8FiOe8uTJ/TkhnYk/roos3wXtOMLiCqD1cEJdX5fAC4xdfS1coEV89qwHae/bNSwL 8LY0g7jydANim04ErEOtxv75VvtrEJY= X-Proofpoint-GUID: dnXmfqhdS1LbU7PIsy2HqXJkZ3ztWh_S X-Authority-Analysis: v=2.4 cv=DMO/JSNb c=1 sm=1 tr=0 ts=6a994e7b cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=Byx-y9mGAAAA:8 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=fbXbqCvtxzTOMWPQE0UA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 bulkscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 suspectscore=0 adultscore=0 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432046382158500 From: Tao Ding During SDMA transfers, the controller raises an interrupt at buffer boundar= ies to request a system address update. The host driver will rewrite the SDHC_S= YSAD register. (according to PartA2_SD_Host_Controller_Simplified_Specification_Ver2.00.pd= f section 2.2.1) However, the current code will ignore write operations to SDHC_SYSAD. To fix this bug, when SDMA encounters a boundary, a state is set to record = it. In this state, SDHC_SYSAD can be written. In other cases, it is still prote= cted by TRANSFERRING_DATA. Meanwhile, a subsection has been added for migration. Suggested-by: Bin Meng Signed-off-by: Tao Ding Reviewed-by: Bin Meng Message-ID: <20260715160731.29969-2-dingtao0430@163.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/sd/sdhci.h | 2 ++ hw/sd/sdhci.c | 54 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index a9da6203fcb..c485277744e 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -103,6 +103,8 @@ struct SDHCIState { * to be protected. Set wp_inverted to invert the signal. */ bool wp_inverted; + /* Indicate that SDMA transfer is paused due to hitting the boundary */ + bool sdma_boundary_paused; }; typedef struct SDHCIState SDHCIState; =20 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index e58a6103970..02f09187272 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -307,6 +307,7 @@ static void sdhci_reset(SDHCIState *s) s->data_count =3D 0; s->stopped_state =3D sdhc_not_stopped; s->pending_insert_state =3D false; + s->sdma_boundary_paused =3D false; if (object_dynamic_cast(OBJECT(s), TYPE_FSL_ESDHC_BE) || object_dynamic_cast(OBJECT(s), TYPE_FSL_ESDHC_LE)) { s->norintstsen =3D 0x013f; @@ -414,6 +415,7 @@ static void sdhci_end_transfer(SDHCIState *s) s->norintsts |=3D SDHC_NIS_TRSCMP; } =20 + s->sdma_boundary_paused =3D false; sdhci_update_irq(s); } =20 @@ -681,6 +683,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) if (s->blkcnt =3D=3D 0) { sdhci_end_transfer(s); } else { + s->sdma_boundary_paused =3D true; sdhci_update_irq(s); } } @@ -717,6 +720,15 @@ static void sdhci_sdma_transfer(SDHCIState *s) } } =20 +static bool sdhci_sdma_transfer_active(SDHCIState *s) +{ + return TRANSFERRING_DATA(s->prnsts) && + (s->trnmod & SDHC_TRNS_DMA) && + s->blkcnt && + (s->blksize & BLOCK_SIZE_MASK) && + SDHC_DMA_TYPE(s->hostctl1) =3D=3D SDHC_CTRL_SDMA; +} + typedef struct ADMADescr { hwaddr addr; uint16_t length; @@ -1164,6 +1176,7 @@ static inline void sdhci_reset_write(SDHCIState *s, u= int8_t value) SDHC_DATA_INHIBIT | SDHC_DAT_LINE_ACTIVE); s->blkgap &=3D ~(SDHC_STOP_AT_GAP_REQ | SDHC_CONTINUE_REQ); s->stopped_state =3D sdhc_not_stopped; + s->sdma_boundary_paused =3D false; s->norintsts &=3D ~(SDHC_NIS_WBUFRDY | SDHC_NIS_RBUFRDY | SDHC_NIS_DMA | SDHC_NIS_TRSCMP | SDHC_NIS_BLKGAP); break; @@ -1185,7 +1198,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val= , unsigned size) =20 switch (offset & ~0x3) { case SDHC_SYSAD: - if (!TRANSFERRING_DATA(s->prnsts)) { + if (!TRANSFERRING_DATA(s->prnsts) || s->sdma_boundary_paused) { s->sdmasysad =3D (s->sdmasysad & mask) | value; MASKED_WRITE(s->sdmasysad, mask, value); /* Writing to last byte of sdmasysad might trigger transfer */ @@ -1464,6 +1477,31 @@ static bool sdhci_pending_insert_vmstate_needed(void= *opaque) return s->pending_insert_state; } =20 +static bool sdhci_sdma_boundary_paused_vmstate_needed(void *opaque) +{ + SDHCIState *s =3D opaque; + + return s->sdma_boundary_paused; +} + +static int sdhci_pre_load(void *opaque) +{ + SDHCIState *s =3D opaque; + + s->sdma_boundary_paused =3D false; + return 0; +} + +static int sdhci_post_load(void *opaque, int version_id) +{ + SDHCIState *s =3D opaque; + + if (!s->sdma_boundary_paused) { + s->sdma_boundary_paused =3D sdhci_sdma_transfer_active(s); + } + return 0; +} + static const VMStateDescription sdhci_pending_insert_vmstate =3D { .name =3D "sdhci/pending-insert", .version_id =3D 1, @@ -1475,10 +1513,23 @@ static const VMStateDescription sdhci_pending_inser= t_vmstate =3D { }, }; =20 +static const VMStateDescription sdhci_sdma_boundary_paused_vmstate =3D { + .name =3D "sdhci/sdma_boundary_paused", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D sdhci_sdma_boundary_paused_vmstate_needed, + .fields =3D (const VMStateField[]) { + VMSTATE_BOOL(sdma_boundary_paused, SDHCIState), + VMSTATE_END_OF_LIST() + }, +}; + const VMStateDescription sdhci_vmstate =3D { .name =3D "sdhci", .version_id =3D 1, .minimum_version_id =3D 1, + .pre_load =3D sdhci_pre_load, + .post_load =3D sdhci_post_load, .fields =3D (const VMStateField[]) { VMSTATE_UINT32(sdmasysad, SDHCIState), VMSTATE_UINT16(blksize, SDHCIState), @@ -1512,6 +1563,7 @@ const VMStateDescription sdhci_vmstate =3D { }, .subsections =3D (const VMStateDescription * const []) { &sdhci_pending_insert_vmstate, + &sdhci_sdma_boundary_paused_vmstate, NULL }, }; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432025; cv=none; d=zohomail.com; s=zohoarc; b=BU7eYYKdRk1hgLArUcFdMHY2WFPYA8Ij5lG6a/+mYo0H3Db10GbF97DyHusJqxCxfmajc0dGSFNw6IK6snh+8vhy2v9I58AA9QlTQ9em/ubf7+iPIkZX2KR9J9b0tFDcG9XmID3/tySU0ozBHYMGE4BYKdRUFdhOV77JYo83m0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432025; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=qlErpaH7JSpV+B6q0S/Zw9ryoIsN9bGE2gC3f1JdMlg=; b=bDjq7yBUsBHCH40bR7Wp94eIm/ZZc1OVasQAmEYMo/SfX6jU9kJEe81PGdGiGxI/+JZwGOvOEeWSKjTSG4MJ3+eLbR6hejFD444+5sV0RvAkgcxjOomCBz96q4z0cCLseyDN+Jl3umrhBlPrAu/icAsxmEqGZ28/M5tHz/sczKk= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432025365954.9199706592597; Thu, 3 Sep 2026 03:40:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24rf-0004no-Fm; Thu, 03 Sep 2026 06:40:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24rU-0004VH-VX for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:05 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24rS-0006CE-VH for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:04 -0400 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHAH8440122 for ; Thu, 3 Sep 2026 10:40:02 GMT Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf6p705sx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:40:01 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-93917f4ccb4so306008785a.0 for ; Thu, 03 Sep 2026 03:40:01 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448ed2edfsm12602786f8f.23.2026.09.03.03.39.59 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:39:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= qlErpaH7JSpV+B6q0S/Zw9ryoIsN9bGE2gC3f1JdMlg=; b=OxwoNPutolMRqk19 KwR1sR4u7ES2oZ9LF9zkZcbcdZrf2xe342Wz6P/jrSTaCPYklAM5hqsAGdTita6U aNovlCpL++b+d+FFCnL1GYelz4SvkHD3g6w0Hf4mbtqg6IC6T/JnMLqRyVetbP/g +f7Dk15rLIeknnhRzBdvlJKwWbjj54KXcoYTQo4QIEC+WswwqQsvfyni1y05omwH FcAk6PGUa83yQOR6lLGL/fpUEIOzD2AHSNcTebidyn4Lbu+zyHy0UdE9l7eziClU L1evkVowJvl5nO3TAhfl/SbVA6dEO/NCyAW9c810mMLnZ5n/FZYtiYHeXekXz3gY Wp2ukw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432001; x=1789036801; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=qlErpaH7JSpV+B6q0S/Zw9ryoIsN9bGE2gC3f1JdMlg=; b=OVZHG3sMPd+Eh6LPXLvu8CKz7K8MkOIbDq765vYCYfE1s45CxjV3pHQe/M3wnb3sI0 nY3ttCjcZnMPmwvC5Xe8tCQY1pkfd6eKFjQUVGxZoUAHxaEz9AGgLMKOus/PVuFHtknx iKWHbu9fXbnnjA0Ligpz7ziO5pfaNikNJwdpUEHE+pdzfEr3YRYaP8te45OWE2LVoduW JRCcSyzCFKXHkK/m/hFIBnjG2xWdH5dYI6nMI4AC8fj+yJczd427FCtuIepa1kgX5CGy 4bzZqn2NifJX4eq6nawB1dq746vIpALJCoR5wruRkQ2tYbIeQM2PpOOQs0jACfWSrXKH XGMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432001; x=1789036801; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=qlErpaH7JSpV+B6q0S/Zw9ryoIsN9bGE2gC3f1JdMlg=; b=OwIUjyeGV5jn85OyXVCvFBwyYAPLOXpB9KP4HgiQ0d4XY9LbyZSN9Kb2SGNMsE1d4h VpocAmXEWBFtb9Uq22Ak4SWjF+ZARABvYBCiR5IAkaIWKCtJKZYBnYiGsOL0sru0MiDj hqdLPbOSG6WStaBOUjP9Lp9A7Q34SlPmwezPpuTTSinx7nZrrNqmGnc3BYtm4pyiEPhX Hjkt8Icnti6SLtABCPITKAJNi07DzbvUyNE28KiQ+lBl8FVLrFYQU9NWr21G+je9K9So PWBETom/6FIz2hcI4rEJExKSmL06FB4Irk9b1klOTd5u3dd6z8GSbDMc2XhwFjlZLvUl NERA== X-Gm-Message-State: AFuF++nsyRo4X5CwiHOdQm+xfVITBgeQQ5E5wHxJqPwEvt3WUtnK8l1Y FYYy+viI0EpW92k6eB3Fz/xLHZG6E54kL12rcSjR6M5hOGO2Q/SocLfwkzjoHuB5/krzEKBWk1K yU4/YP1o+VQ2yXqOKSUHjSE6eRZYiIz9+E0O+Pk8Ei2ZI8aUTKnSoV7OPohSxHmCy3g== X-Gm-Gg: AYBFou1Vm3BugJ/Ru6KFQKSorspod9p7rSwYLMBLLOAcHJ6sWfNWC6KFgau8namW7vR psigqpy9kMPTkTXuyo5DkzXCx0q0fuMBSlYq0lyBFD9tH17iPdNZlZRhOJCQrjM/BhvGRN9e2vg gZaJs2YFkVEMdAwhORSrZKu1wuevrbcsBoqhM3Yvxpk+C+GX8czHY16KwgVXMBHQ2WctG/A3WUY FEGQaRRO3N+M61KVgW2RMJhRGCV8WO+sjaKn1K2j26nPCqcImVAzbXJPk0dB0ijKdi6DxczIrjT b8D+z185IqVEvztqXpzsEbjZBWx/EyQYMYwG8ycwNm9cAraipmA9kCY0vIzgknkmmd/Lw5DLtAR SNlhjMUB9zn3ByHzVDO/oon1IJiHumArdeCViNCAu X-Received: by 2002:a05:620a:7f4:b0:936:b923:4828 with SMTP id af79cd13be357-9396e07ccb9mr454182785a.31.1788432000886; Thu, 03 Sep 2026 03:40:00 -0700 (PDT) X-Received: by 2002:a05:620a:7f4:b0:936:b923:4828 with SMTP id af79cd13be357-9396e07ccb9mr454176885a.31.1788432000256; Thu, 03 Sep 2026 03:40:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 03/51] qtest: add xilinx-zynq SDHCI sdma test Date: Thu, 3 Sep 2026 12:38:47 +0200 Message-ID: <20260903103936.62355-4-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: UsDV48G1S-zZVk4pBvCCxRqMAyarQyZG X-Proofpoint-ORIG-GUID: UsDV48G1S-zZVk4pBvCCxRqMAyarQyZG X-Authority-Analysis: v=2.4 cv=OZyoyBTY c=1 sm=1 tr=0 ts=6a994e81 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=Byx-y9mGAAAA:8 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=Pn4tuoQj9NfIQUoY1QkA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX4fMk7g7vfAIt Kv4dWMCzHGUEkw6wxnKnfRxK6u8YFJOeqGND/XFisoTK/tvv6NS0uZnaJdM36B7VRdMN87BqhTl cOhMNeBtZjM4aqzO9QvZ7i/xWqw7jZ8= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXwo870PXSTpjD 1GeY1IeZqdJdVrFbpATowWfzdyCNaoXKcABvN0QLCdVwGTs++1Uuv+YWEo75RZEqoXhCUwbtr4Z scjxSlonXngBrM8Qgs/Gx/n0/y9BPdTdXtNsyaikSCTb1JxKCZ8sgCPyOrE4CIbB5g3hbyuAxVO MqCLi2Kb0pY02KpX/JgPJ0B3ql4QbBp840ErwqYfFMuU63R9Qse6fUu+/y2Xg1GS8r31TNgDPgL T2D4Djl0XpbdvYvcwFx/YgJHV5uC21+20EO10SmY1G0siFvBKDkBiL25mo0blINoQIsSP0hKYrf ck9RYz3S3TPCmu8QILTT+d3OZFKvfPoT/cHDTneqYv3kdfiFSd2O2EbsvOtU260y/lWbuICPy+T wIRoPmY4dld3qyk9LnNbzVI2x482QulmypqLw2hO6tUdDcqflFJPFZkkPpk6XR87KnLyYodYFmT /mqZtuDljv+3gIx4pLA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 bulkscore=0 suspectscore=0 impostorscore=0 clxscore=1015 malwarescore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432026350158500 From: Tao Ding Add a standalone qtest for the SDHCI controller on the xilinx-zynq-a9 machine. The test covers the SDMA boundary continuation case for a multi-block read. After the controller stops at a boundary, software updates SYSAD to continue the transfer. This verifies the generic SDHCI behavior that previously failed when the continuation SYSAD write was ignored and the transfer stalled. Reviewed-by: Bin Meng Signed-off-by: Tao Ding Message-ID: <20260715160731.29969-3-dingtao0430@163.com> [PMD: Write file using GLib API, cover file in MAINTAINERS] Co-developed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <048bfef9-53dd-489c-be73-85e2c9f759a9@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + tests/qtest/xilinx-zynq-sdhci-test.c | 185 +++++++++++++++++++++++++++ tests/qtest/meson.build | 1 + 3 files changed, 187 insertions(+) create mode 100644 tests/qtest/xilinx-zynq-sdhci-test.c diff --git a/MAINTAINERS b/MAINTAINERS index a1830cdad15..a898162cea5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2417,6 +2417,7 @@ F: hw/sd/sd* F: hw/sd/ssi-sd.c F: tests/qtest/fuzz-sdcard-test.c F: tests/qtest/sdhci-test.c +F: tests/qtest/xilinx-zynq-sdhci-test.c =20 USB S: Orphan diff --git a/tests/qtest/xilinx-zynq-sdhci-test.c b/tests/qtest/xilinx-zynq= -sdhci-test.c new file mode 100644 index 00000000000..7957358cf5d --- /dev/null +++ b/tests/qtest/xilinx-zynq-sdhci-test.c @@ -0,0 +1,185 @@ +/* + * QTests for the Xilinx Zynq SDHCI controller. + * + * Copyright (c) 2026 Tao Ding + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/sd/sdhci.h" +#include "hw/sd/sdhci-internal.h" + +#include "libqtest.h" +#include "libqtest-single.h" +#include "libqos/sdhci-cmd.h" + +#define XILINX_ZYNQ_MMC_BA 0xE0100000 +#define XILINX_ZYNQ_BLK_SIZE 512 +#define XILINX_ZYNQ_TEST_IMAGE_SIZE (1 << 20) +#define XILINX_ZYNQ_SDMA_BOUNDARY_ARG 7 +#define XILINX_ZYNQ_SDMA_BOUNDARY_SIZE (512 * 1024) +#define XILINX_ZYNQ_SDMA_BLOCK_COUNT \ + ((XILINX_ZYNQ_SDMA_BOUNDARY_SIZE / XILINX_ZYNQ_BLK_SIZE) + 1) +#define XILINX_ZYNQ_SDMA_TRANSFER_SIZE \ + (XILINX_ZYNQ_SDMA_BLOCK_COUNT * XILINX_ZYNQ_BLK_SIZE) +#define XILINX_ZYNQ_DMA_ADDR 0x00100000 + +#define SDHC_MAKE_BLKSZ(boundary, size) (((boundary) << 12) | (size)) + +static char *sd_path; + +static QTestState *setup_sd_card(void) +{ + QTestState *qts; + uint16_t rca; + + qts =3D qtest_initf( + "-machine xilinx-zynq-a9 " + "-drive if=3Dsd,index=3D0,file=3D%s,format=3Draw,auto-read-only=3D= off", + sd_path); + + qtest_writew(qts, XILINX_ZYNQ_MMC_BA + SDHC_SWRST, SDHC_RESET_ALL); + qtest_writew(qts, XILINX_ZYNQ_MMC_BA + SDHC_CLKCON, + SDHC_CLOCK_SDCLK_EN | SDHC_CLOCK_INT_STABLE | + SDHC_CLOCK_INT_EN); + sdhci_cmd_regs(qts, XILINX_ZYNQ_MMC_BA, 0, 0, 0, 0, SDHC_APP_CMD); + sdhci_cmd_regs(qts, XILINX_ZYNQ_MMC_BA, 0, 0, 0x41200000, 0, + (41 << 8)); + sdhci_cmd_regs(qts, XILINX_ZYNQ_MMC_BA, 0, 0, 0, 0, SDHC_ALL_SEND_CID); + sdhci_cmd_regs(qts, XILINX_ZYNQ_MMC_BA, 0, 0, 0, 0, + SDHC_SEND_RELATIVE_ADDR | SDHC_CMD_RESPONSE); + rca =3D qtest_readl(qts, XILINX_ZYNQ_MMC_BA + SDHC_RSPREG0) >> 16; + sdhci_cmd_regs(qts, XILINX_ZYNQ_MMC_BA, 0, 0, rca << 16, 0, + SDHC_SELECT_DESELECT_CARD); + + return qts; +} + +static void write_pattern_to_image(size_t offset, size_t len) +{ + gchar *buf =3D g_malloc(len); + GError *err =3D NULL; + gsize bytes_written; + GIOChannel *chan; + + for (size_t i =3D 0; i < len; i++) { + buf[i] =3D (i * 13 + 7) & 0xff; + } + + chan =3D g_io_channel_new_file(sd_path, "w", &err); + g_assert_no_error(err); + g_io_channel_set_encoding(chan, NULL, &err); + g_assert_no_error(err); + g_io_channel_seek_position(chan, offset, G_SEEK_SET, &err); + g_assert_no_error(err); + g_io_channel_write_chars(chan, buf, len, &bytes_written, &err); + g_assert_no_error(err); + g_assert_cmpint(bytes_written, =3D=3D, len); + g_io_channel_shutdown(chan, TRUE, &err); + g_assert_no_error(err); + + g_free(buf); +} + +static void wait_for_block_count(QTestState *qts, uint16_t expected) +{ + int i; + + for (i =3D 0; i < 1000; i++) { + if (qtest_readw(qts, XILINX_ZYNQ_MMC_BA + SDHC_BLKCNT) =3D=3D expe= cted) { + return; + } + g_usleep(100); + } + + g_assert_cmpuint(qtest_readw(qts, XILINX_ZYNQ_MMC_BA + SDHC_BLKCNT), + =3D=3D, expected); +} + +/* + * SDMA stops at each boundary and requires software to update SYSAD + * to continue. The bug this test covers leaves DOING_READ/WRITE asserted, + * so the continuation SYSAD write is ignored and the transfer stalls. + */ +static void test_read_sdma_boundary_continue(void) +{ + QTestState *qts =3D setup_sd_card(); + uint8_t *actual =3D g_malloc0(XILINX_ZYNQ_SDMA_TRANSFER_SIZE); + uint8_t *expected =3D g_malloc(XILINX_ZYNQ_SDMA_TRANSFER_SIZE); + + write_pattern_to_image(0, XILINX_ZYNQ_SDMA_TRANSFER_SIZE); + + for (size_t i =3D 0; i < XILINX_ZYNQ_SDMA_TRANSFER_SIZE; i++) { + expected[i] =3D (i * 13 + 7) & 0xff; + } + + qtest_writel(qts, XILINX_ZYNQ_DMA_ADDR, 0xdeadbeef); + qtest_writel(qts, XILINX_ZYNQ_DMA_ADDR + XILINX_ZYNQ_SDMA_BOUNDARY_SIZ= E, + 0xcafef00d); + + qtest_writel(qts, XILINX_ZYNQ_MMC_BA + SDHC_SYSAD, XILINX_ZYNQ_DMA_ADD= R); + sdhci_cmd_regs(qts, XILINX_ZYNQ_MMC_BA, + SDHC_MAKE_BLKSZ(XILINX_ZYNQ_SDMA_BOUNDARY_ARG, + XILINX_ZYNQ_BLK_SIZE), + XILINX_ZYNQ_SDMA_BLOCK_COUNT, 0, + SDHC_TRNS_DMA | SDHC_TRNS_MULTI | SDHC_TRNS_READ | + SDHC_TRNS_BLK_CNT_EN, + SDHC_READ_MULTIPLE_BLOCK | SDHC_CMD_DATA_PRESENT); + + wait_for_block_count(qts, 1); + + qtest_writew(qts, XILINX_ZYNQ_MMC_BA + SDHC_NORINTSTS, 0xffff); + qtest_writel(qts, XILINX_ZYNQ_MMC_BA + SDHC_SYSAD, + XILINX_ZYNQ_DMA_ADDR + XILINX_ZYNQ_SDMA_BOUNDARY_SIZE); + + wait_for_block_count(qts, 0); + + qtest_memread(qts, XILINX_ZYNQ_DMA_ADDR, actual, + XILINX_ZYNQ_SDMA_TRANSFER_SIZE); + g_assert_cmpmem(actual, XILINX_ZYNQ_SDMA_TRANSFER_SIZE, + expected, XILINX_ZYNQ_SDMA_TRANSFER_SIZE); + + g_free(expected); + g_free(actual); + qtest_quit(qts); +} + +static void drive_destroy(void) +{ + unlink(sd_path); + g_free(sd_path); +} + +static void drive_create(void) +{ + int fd; + int ret; + GError *error =3D NULL; + + fd =3D g_file_open_tmp("xilinx-zynq-sdhci.XXXXXX", &sd_path, &error); + if (fd =3D=3D -1) { + fprintf(stderr, "unable to create sdhci file: %s\n", error->messag= e); + g_error_free(error); + } + g_assert_nonnull(sd_path); + + ret =3D ftruncate(fd, XILINX_ZYNQ_TEST_IMAGE_SIZE); + g_assert_cmpint(ret, =3D=3D, 0); + close(fd); +} + +int main(int argc, char **argv) +{ + int ret; + + drive_create(); + + g_test_init(&argc, &argv, NULL); + qtest_add_func("xilinx-zynq-sdhci/sdma/read-boundary-continue", + test_read_sdma_boundary_continue); + + ret =3D g_test_run(); + drive_destroy(); + return ret; +} diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 50a1a5272fa..17870e339b4 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -255,6 +255,7 @@ qtests_arm =3D \ config_all_devices.has_key('CONFIG_MPS2') ? ['cmsdk-apb-watchdog-test']= : []) + \ (config_all_devices.has_key('CONFIG_ASPEED_SOC') ? qtests_aspeed : []) += \ (config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \ + (config_all_devices.has_key('CONFIG_ZYNQ') ? ['xilinx-zynq-sdhci-test'] = : []) + \ (config_all_devices.has_key('CONFIG_GENERIC_LOADER') ? ['hexloader-test'= ] : []) + \ (config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test',= 'tpm-tis-i2c-swtpm-test'] : []) + \ (config_all_devices.has_key('CONFIG_VEXPRESS') ? ['test-arm-mptimer'] : = []) + \ --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432034; cv=none; d=zohomail.com; s=zohoarc; b=AQld5Gywno/mEuwY0sfFDp5B7wwoTyQySU5pPfJH0NQuuD8AXbX5J4edm/znWKW6AF8nVsoZFkgKnkfjT8itBZQSdtkli5Kbk7vb6MuNmEVeF6uPaoe0sB5PRSjUDiY8xAmrWhN94uc+gzLTLE3pYGBmO7eyLqIchfz3woEz+mA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432034; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=dne/OGC4mh9pyhzlIkAn9W4ObefJYz0B+1JlIG0OZSY=; b=C6Ba/RFpeMGq2nq7Rn1hWxeMnyoXGNNgKfj+HpceTI5lpK63sAviQsbBFyq9Wylr/2zOwgWSxR564gxLvHZuTyh7uPtuXIpx+UXcOJq5//q9Pg8trbhodzWzJtAcKaBCPI1fKzObCY2wrj3y5Tr/m718O5DEJ+wFvp7Ge2vob08= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432034697336.9473557464827; Thu, 3 Sep 2026 03:40:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24rl-0004v7-Vn; Thu, 03 Sep 2026 06:40:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24rc-0004gv-1P for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:13 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24ra-0006P3-59 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:11 -0400 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AH79B3203906 for ; Thu, 3 Sep 2026 10:40:08 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf5d10h6v-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:40:08 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92e53b8a302so440549385a.1 for ; Thu, 03 Sep 2026 03:40:08 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee6024a8sm60064285e9.6.2026.09.03.03.40.06 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:40:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= dne/OGC4mh9pyhzlIkAn9W4ObefJYz0B+1JlIG0OZSY=; b=hInlDRKI7Z1maLlY ZeWZ017SS5jGTZV1K61zsk7IvlQHkY1QWzf2iyRpCbuUATWdCQTaVEh/PlNQfXE+ SM5iqu1C7uC5X1JSzevzlYwwNuxYJfx87TMXNGTaZ4oU8ehHY2blZU78HP7MphHZ M+2xF9JmZb63E8aoeYLbJ0bPmnhLtXDkN8YtjwHTGpkhdpzkoRyZcAvK3KvQcNpi UCGawf2moqurd5hkO1ahKQ+jWS8XwGKlJ8z6BnO8fxPT23tWtYY48BvGjXg9Ih6x Y0WVqQFsf0bVftI/7yaV2HtHv7ENF+uOSqZQnNXbzgRtl/2hoAhkIe0bPyy6sI1/ Bqy+lA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432008; x=1789036808; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=dne/OGC4mh9pyhzlIkAn9W4ObefJYz0B+1JlIG0OZSY=; b=PNaB14/NmjXpwrw8696zC/ahV9Ez3tZIMOQHuRx/FIOMR/toNgeX8ia2gYT/x3FZPC Qsf6YgGAekOX3sw5o9uhbV6Au0BB3N/MtUfezKwiqkYzyPt8H8i7mn6Fynp1DwnVw3jJ zZkFWOOSHkejAvZREH52fJGZZvlwl/FpKHRVq8tMxD+3tWTkVZG2O5Ou6ue6Obn4/osk j/v7fFhsEYk9+20PQMzSCXIGl3bHd+u3hfO4ldS5LmZW1t0Y1T1/jkXbGvSPmB08IjCi 3iJ07qoI0kPayjZwlH79mp1C81Sq0+rKLmPu6XR0QHd/FhUQUyWxq6YSvgfiSgBdj85e KdSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432008; x=1789036808; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=dne/OGC4mh9pyhzlIkAn9W4ObefJYz0B+1JlIG0OZSY=; b=PKWY905PObX6HdIkTRXZwrhEVVZ/07FAGqnfFAtcGytcYvyJGOhqIJ/jS6NDjjWdBL KTAIgBdUS4nBuY92fJPFbpG43jt7gGOFqcqG0rQRiBA4lz8Fc6q37lTcEeqMJmounD6B tAUt8DnLGGF2OGr1A2TIAMPabR1xZA88AaTcCB+8EzibcbWu2kdIXGD+P3gkFP6bQYIB LmYaDc8K2pLsugsMmweUFJYfaio7fV4N9g5XRfW0Xff91QXvtv+3nosmS6cSKGVFiy0g 32zc5F3aPF22tzL0+KKjQjb9CK5eJlGsB5PiZGtXdVYOy1gnOMqkA8QRWevZ+mIefLZA 0Quw== X-Gm-Message-State: AFuF++mf36fyRilNncwxvaZ7bPuU2VkqoR7fagCX3CmZeTety+lDk4Hn R+pSb9CXMjNCRIcTnjqmv/PXJeQXwwzwAmI5MblEfEzMjzLBrfgSWH1qSs60c02P3okdx7zfmyw zb4iiSZZw5wfjSFtuZGgdz1TinyWQvNwHepGpfkkxIKO6771m+XVZ7HNy+iTN2esYNA== X-Gm-Gg: AYBFou1lfPzbQszXhaZc/gQPyhPEgROe759pTYi7nwINv3OUscIvqyHv00HWOmdwTmT /2tiduZIK3jCUBXCklLt7TpfbpagX+lUQmSoEtdHo6iDcgHrttFv66OhmiV8Ha4AiZLnYog4IpG uHsBej85E3xYNOGcDzK0HwipMmFavzA9cuGXexhsn4bnxi+5YYl8tzOTKv8vh4lkH4qD/qj+xWi vcLeUdxf2mmH5oIQgiqtm4r2tiDx56NxFdS8bpYfbnMkSKrLeAnHswy+WSwfwpjF57+Zd7uNKHp IOAb/ml5n5swWDoVKmx/SquhCvrVyzKeKb8IuYnI8ktAoCQzd2MZgQl1EzdNXgaGW5hUGhRRpXJ wRsSKIQiOdm7wx9RVftbFv1vjq8cD/ubO5LgBoc1x X-Received: by 2002:a05:620a:4109:b0:92e:5f90:c0de with SMTP id af79cd13be357-93960f28e64mr1282459285a.22.1788432007668; Thu, 03 Sep 2026 03:40:07 -0700 (PDT) X-Received: by 2002:a05:620a:4109:b0:92e:5f90:c0de with SMTP id af79cd13be357-93960f28e64mr1282454285a.22.1788432007020; Thu, 03 Sep 2026 03:40:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 04/51] hw/sd: sdhci: Migrate the Host Control 2 register Date: Thu, 3 Sep 2026 12:38:48 +0200 Message-ID: <20260903103936.62355-5-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX7gEElIVCTfxX gtZ3f4FMMOeBfWbPn48z6qKMUvghUPyOnNjVdoZzhYvVyRT+ZhqugW0nT/5EmSrWDlxmv+QEw1I xodJeftgkWfYqhcrHh65tQ6c3AMZmas6zKoAnNicM6sClPmxI+Ha9aHcn2Dzc0YCuAAL5oYeKfD uK/yE3blY6BwQDDJlkJ7CLMdsmsysYYUlw2cRkWyS3VirP3Kwv3c6erd/4cG5f0kN+9F8/mo7fM DCxCPDB58WfUdaFg6X4Rhe7uI0Cm0YiRKDDkLUINJZlnuKHv+6/17HP6YtX9I5d28fFAq9+M9AU Iqq/oZoALKN+1jA1C64UPB5WScxL3smNswhx/dti4ER4oP2wUDgPPSiRd1oeyl4m/iThmQfOSbW 57sQs2mekTBjwBuepMamwL99ZQ7wv8he/CwVmd6EoI8DD6MmOrJxkgt0+T8kO+K4hM4jh0jIU2E gvolEUrElOsFo70IlVA== X-Proofpoint-ORIG-GUID: Rj0E6PwT7BMm3n_ln5AmlILBUjSO33Wt X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX/x4MDzwLf1zU hYsrbcMBKkdnI0HlUSkyoHYe6v2ovVrSEXObtHMGSz4ce5N5mrYhME+Ooagx9nh4ReYsbCOHvMo dgyyolsjR9XMIKPvyqGBNLa02CdhVGM= X-Proofpoint-GUID: Rj0E6PwT7BMm3n_ln5AmlILBUjSO33Wt X-Authority-Analysis: v=2.4 cv=J4GaKgnS c=1 sm=1 tr=0 ts=6a994e88 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=FRSEYCzRAAAA:8 a=EUspDBNiAAAA:8 a=pBWpA1RrDOO-fWdppnUA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=H4N_Y-AU75W7NKDNhZlT:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432036269158500 From: Bin Meng The Host Control 2 register has been part of SDHCIState since its initial implementation, but it was omitted from sdhci_vmstate. Migration therefore resets the register to zero and can change tuning, voltage, or DMA behavior. Migrate nonzero values in an optional subsection. Clear the register before loading so older streams retain the reset default without changing the main stream version. Fixes: ea55a221bfc0 ("sdhci: implement the Host Control 2 register (tuning = sequence)") Signed-off-by: Bin Meng Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260723151853.2143177-8-bin.meng@processmission.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 02f09187272..101fbcf2ff9 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1470,6 +1470,24 @@ void sdhci_common_unrealize(SDHCIState *s) s->fifo_buffer =3D NULL; } =20 +static bool sdhci_hostctl2_vmstate_needed(void *opaque) +{ + SDHCIState *s =3D opaque; + + return s->hostctl2; +} + +static const VMStateDescription sdhci_hostctl2_vmstate =3D { + .name =3D "sdhci/hostctl2", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D sdhci_hostctl2_vmstate_needed, + .fields =3D (const VMStateField[]) { + VMSTATE_UINT16(hostctl2, SDHCIState), + VMSTATE_END_OF_LIST() + }, +}; + static bool sdhci_pending_insert_vmstate_needed(void *opaque) { SDHCIState *s =3D opaque; @@ -1488,6 +1506,7 @@ static int sdhci_pre_load(void *opaque) { SDHCIState *s =3D opaque; =20 + s->hostctl2 =3D 0; s->sdma_boundary_paused =3D false; return 0; } @@ -1562,6 +1581,7 @@ const VMStateDescription sdhci_vmstate =3D { VMSTATE_END_OF_LIST() }, .subsections =3D (const VMStateDescription * const []) { + &sdhci_hostctl2_vmstate, &sdhci_pending_insert_vmstate, &sdhci_sdma_boundary_paused_vmstate, NULL --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432088; cv=none; d=zohomail.com; s=zohoarc; b=e50t1TCJTd1q7+wfUuqFvexoudtThh8zM7WRgZPcNeVq6a5/zL6TAqhcIsolL8WBSXVju+BV+/lf5K08P2TOEysmhTYl8lY9aHmc676952UnCVF2wgX/ykHq6iggz013nycIdcUu889CgBT7ppbl/hrdIxJCTOa117lY0pTjRL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432088; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=yqIoxY4uvE/iA/VLE9haMr+T3JBp59A54zo4MolHNbQ=; b=RkvxS0lGs5/ZsQTT5hge/AFXYDlbaerZ9H+PUjHepoab7h0Wmk0FyOsxafU/mv0ljWuG7+LIk/rgO92n4FGm2y9bRxl1KMtn0PWKd5JoBnIZkmuV69pMUCeO1D5Owsw8laIDsVzOv8ZRfsyCnVCl0OENXlE8c9gsVhNPrcKfwow= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432088790252.9345589864149; Thu, 3 Sep 2026 03:41:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24rp-0004xm-Ai; Thu, 03 Sep 2026 06:40:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24rj-0004uS-QT for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:20 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24ri-0006QL-9p for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:19 -0400 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHIFV3782479 for ; Thu, 3 Sep 2026 10:40:16 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf5pdrfqe-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:40:16 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-9396e0515dcso58581385a.1 for ; Thu, 03 Sep 2026 03:40:16 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5d9db2sm63117615e9.8.2026.09.03.03.40.12 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:40:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= yqIoxY4uvE/iA/VLE9haMr+T3JBp59A54zo4MolHNbQ=; b=n3XouhB1GLgV9odK JAKgcmM03iNr4JmEY+tsHFtMMkXzVq2hM4Rh/uf2ru1dBMtw3L4wtEOZTDgOQh2O UOc9bL13xRhGgeAAXAaLm8Coot8YluUiXEH+coms/7CSn5DeApUk2ozEVMXD4AvV BEnxn3Gi+HhW2/D04Zc5F3G26GsgIinuZ5SSWkePGazBFu84OEa1T0sYqXT3mivU GO5+8V8HJdbS/boan0u6ylTKnT8fVXDxGpuiUr5dLTohTqz13KiVyM47S64mLzDr W57Edeqc1SuH1goa6hs17WetgNyoKzYJ6uT35x+htw8kNHXwAtI6sYurCQznynQR oCTRSA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432016; x=1789036816; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=yqIoxY4uvE/iA/VLE9haMr+T3JBp59A54zo4MolHNbQ=; b=OwLTAj6IMEkV+xjcTj/p6otL9nSK+AZXH7sExAI+QdJI4xB+kKDOUSKvzTP8gHcNfx DVHOpKsLO6SieHwXoYNk4XmvkOK7k9mXei+unAiwyPwZo/pskSGd/g94U0aKwBgWCIhN nWeG0N0JL5lT/ovM0SrmimeysmiXJfyUNMU8Sv12BgX3c/TIWCPkENqN/PcHLg/bKGQZ VkEMKYxj65X/n5KoWJrOfByiWWul1xapb178qJBgAB9rjsN7kZVDpx4VcX5p3h3NSehg LFFjWuLXJxuMvNFl8NC4oU7QOT4kHfq4DQE1MuOKIUHJ6OACl7SLiqwrzZMWxAGadqNn l53w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432016; x=1789036816; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=yqIoxY4uvE/iA/VLE9haMr+T3JBp59A54zo4MolHNbQ=; b=AqnL83+mi9FjX5RKZcSQRmPsTxcBd9+LBRr0fGnjDMCOeHoVahgJgQur3mICroCHDR DWSQC1SkrRcxNw0Bmfn0Gd1l0dnQHloDEpq4r6PfBpmLStQTF0gSiU5G0kMrGJWPKk5X v0BFJ4M0DLciTtPjOmuYzYKPcaS8gc0nre0Pr0EXxZxIFRm8/0hqAs7BlSoM6PrC2ZME g/yuEvlPL3xxoIk6svPPz2P3344UMT9r2sf4SklQa/pICm0GGy/9j0mskLBwSkFzKzYM KNDPo+ZKuLsfitvaavph4MdN+T3bN8ZTkzUp33wiI4v09SDU7BB4mvvzQIld1ruTFdzA cAJw== X-Gm-Message-State: AFuF++n+XVB0wMMqfr5ydLiNejpH2uvKEBtB9OU9Tx0cmRpMdb3GyaQc yNkE1WM5nR6NJGvHKzxrfp/2c72sJa5EgLjQ7EGtOmzWqWX/EhooVdE4PYJjXhuFRDXx7eKqDs2 xooXsxY14aja46a2pP9DBlw9kRZgIezj80zGezDHwDAmo05T8Y43sCcQP9o+iQxkZ6w== X-Gm-Gg: AYBFou02TljgIehmP0xu+1wy8MfE4qPc3muBpOYgQW0USDorQHu1WSKfm13H1hmI5VM 52/lLtKX/ejXuhmERLYJxLKfrO2rYL1Tf0BjjCZD15pvRt0mxQK/srpY0jJ4i8p7IqeQxc8owCh 0OZNeElzllijPd/0YFIqyEQiFYN7anjQdpcC0SPJxi4lGQgReS+++t8KzUP+aJ+HMqXmu6RGMeA NwYBU7EQOWvVhpnJIPIA92s2H+zW+OJpBKI154Qxdgx9StAy5Igy0oJEd+aqt5+eZK6uPGakQD5 jiuJaI17V0mHPBlG+JcSJvZsDBDiwhGVYtqZJWAX9+AGPtU9mgFSpeGHobH8Sc/bnACVkQ5JiGv 5LiEd/MHUS63jpzYrVovDnLwdrLlOvHVMKyjdDv9s X-Received: by 2002:a05:620a:934f:b0:939:820:2e71 with SMTP id af79cd13be357-93960f871c8mr1032652085a.33.1788432015586; Thu, 03 Sep 2026 03:40:15 -0700 (PDT) X-Received: by 2002:a05:620a:934f:b0:939:820:2e71 with SMTP id af79cd13be357-93960f871c8mr1032647285a.33.1788432015011; Thu, 03 Sep 2026 03:40:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 05/51] hw/sd: sdhci: Accept version 4 enable without UHS-I Date: Thu, 3 Sep 2026 12:38:49 +0200 Message-ID: <20260903103936.62355-6-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXz/PhzFAiciij 0qi9ZHP4EpixhR+n06wWoROg/7RxlYlSFrJyAUh8YO9dcB7xKcT4gjYSLSGsSA1qUzeGU/LJ97h TJfOqNxAH1p85gE+I6HupyG+Vj2HySw= X-Proofpoint-ORIG-GUID: x6cJfWYhZO6KzU6wNCcqzD8JAfktiiFg X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXzLDIgtfis/E3 8xmDlxW353i+nL7G4RAqXChzpw0pK7Sl0hCZQfg99IIccU0gko6JjsPx7CjeYV2Pgk5RGkgJR/U +Wtpx3OIt74Qnf7KLsea7wP8GgnXMSeGg8U0u8BOJXlQEeHUxNLkjR5OZjQuCXUnXhNdfmWLmZE e8Bh8bpxtu/egv+k2Cwf6UyENE9+3MjNRDdaBm5/yL9r26NO3BCIK6nIqFRRG6cttS8PVqCfBT4 TDKsC1zwiGzaumouyKb1a308Xv5ZVVwmVxUF1xJ6uKuwXRLRi8ey5c4GydKsANnLu2RwHAXJe6X LbuR9NUQU7FTmu6O4GltX/Qp7K/ZcGgdQFWJ+tK99CxdVeaYX+wXxPj1PN3ViFz72GwZOnBBoUH uuCdhbdGPIW2gqbQLmpM3m6ACK3PQU1KmnbJ9xRPQFso8Fin0wQjkaR3QW4PNVxH8uCNhCLKcQM LDokt0L08bo9KmzmCZg== X-Authority-Analysis: v=2.4 cv=RsL16imK c=1 sm=1 tr=0 ts=6a994e90 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=FRSEYCzRAAAA:8 a=69wJf7TsAAAA:8 a=EUspDBNiAAAA:8 a=cecaVjzdulOwRCAQsNoA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=H4N_Y-AU75W7NKDNhZlT:22 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-GUID: x6cJfWYhZO6KzU6wNCcqzD8JAfktiiFg X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 priorityscore=1501 suspectscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 malwarescore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432090804158500 From: Bin Meng Host Control 2 writes have been conditional on modeled UHS-I support since commit 0034ebe6ee31. Host Version 4 Enable does not control UHS signaling, so controllers without modeled UHS-I cannot enter version 4 mode. Retain Host Version 4 Enable independently of UHS-I while continuing to reject UHS-specific fields and keeping voltage changes UHS-gated. Cc: qemu-stable@nongnu.org Fixes: 0034ebe6ee31 ("sdhci: implement UHS-I voltage switch") Signed-off-by: Bin Meng Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260723151853.2143177-9-bin.meng@processmission.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 101fbcf2ff9..586e4680bee 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1358,11 +1358,24 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t v= al, unsigned size) } sdhci_update_irq(s); break; - case SDHC_ACMD12ERRSTS: - MASKED_WRITE(s->acmd12errsts, mask, value & UINT16_MAX); - if (s->uhs_mode >=3D UHS_I) { - MASKED_WRITE(s->hostctl2, mask >> 16, value >> 16); + case SDHC_ACMD12ERRSTS: { + uint16_t hostctl2_mask =3D mask >> 16; + uint16_t hostctl2_value =3D value >> 16; =20 + MASKED_WRITE(s->acmd12errsts, mask, value & UINT16_MAX); + if (s->uhs_mode < UHS_I) { + /* + * VERSION4 is writable even without UHS-I. Preserve all other + * Host Control 2 bits when UHS-I is not supported. + */ + uint16_t independent =3D R_SDHC_HOSTCTL2_VERSION4_MASK; + + hostctl2_mask |=3D ~independent; + hostctl2_value &=3D independent; + } + MASKED_WRITE(s->hostctl2, hostctl2_mask, hostctl2_value); + + if (s->uhs_mode >=3D UHS_I) { if (FIELD_EX32(s->hostctl2, SDHC_HOSTCTL2, V18_ENA)) { sdbus_set_voltage(&s->sdbus, SD_VOLTAGE_1_8V); } else { @@ -1370,6 +1383,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val= , unsigned size) } } break; + } =20 case SDHC_CAPAB: case SDHC_CAPAB + 4: --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432071; cv=none; d=zohomail.com; s=zohoarc; b=aKdCxSBeCLJ2c8o5QhWwc468CnRvrMwsLfqTggBB9rQKFNHE5YtH10bNwwjv6K+JmlpS4w9PUiIbR/Jz1sfrwrpm218Z3rY3f3bD4XG2QezDGylT4A4xv1OorDv55eQ2a5hxJxwEHDEsbu3/NmLYxNa8KBYXnplrACIrtpL+eis= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432071; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=5m+bdfXDGjMSrjZN0mTqDRdt7Sb7Otfs6JWBNkXvRP8=; b=nxLd04Z+tfWoj1GxQJaG7UWZEbrGjMLNXGwwj2/OXwqNyJGkxqr/nM175AwkOvVyhZo4B8UH+9iFT68kzWPfUoDQFVVxAhpK2lyptXnSc8laReeQRd7sPH92KeUOtAuWszbF2WpM2ak1JpcjXN5HWCeY+jFm25wVEkkIZJ0zwpw= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432071171822.5566758968209; Thu, 3 Sep 2026 03:41:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24rx-00057H-Uv; Thu, 03 Sep 2026 06:40:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24rr-00053B-CG for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:28 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24ro-0006RR-KS for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:25 -0400 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHAHC440122 for ; Thu, 3 Sep 2026 10:40:23 GMT Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf6p705ur-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:40:23 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-93909014c85so403475785a.0 for ; Thu, 03 Sep 2026 03:40:23 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e72f02sm12645249f8f.3.2026.09.03.03.40.21 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:40:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 5m+bdfXDGjMSrjZN0mTqDRdt7Sb7Otfs6JWBNkXvRP8=; b=ptz74bg5QNF+Gh6d shlt+vne5n8pjzqxeukNo4iNSg8L1wsaRIfCHUbwpMOyuk9XS1gNXuVjd+k+CtA6 r42ZfrDSlYoUxiuPjJiskXusCetQxm2wIMu9me0rZNRlLUXJYACQRGdOQeYBUZxX wwLSj0VeMCaL8Xvtq58V4iLNZ9ixxWR5RsnAoz4EAiqdV3pZZgmw0/Bpsb/Y+GvP I4X8P2kE2FCVoXrdc3UBI3sVxLxkI/pHnciKRvcM5B39Dx9DWCO3NXy5ahhYww93 aSYpKCwX/+QCHDZ5IhcH97QG8bMj8xpzATWAVVXU7hP6l9FwlnTe5v7CrFXDfeIC 8PABWw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432023; x=1789036823; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=5m+bdfXDGjMSrjZN0mTqDRdt7Sb7Otfs6JWBNkXvRP8=; b=M9xhfYBsVUUy+4fHGSpL8gB7PNU3dPDLr+rTX2dZ9IztsWr/vxeuWQncRG5FsDhHxE jCuyslMNN9sqYe3cqkAbsa9L1vVESHFAj29Ncx+T+6FOx+gSKf14jFRMRYsQi0bHRSWe Vjs5oyQ6H9Q/I+TGW5Awybuv/x2Q/CpmYgxvhV3RYdqMlzFV3c3IaHqWy4vAaK6E9PLj 11RSXxNkSm8LcDlcH+iR+PEAmEE+/4K+cC97ikePOQlUJMeFFp3fD8Tm61DAqXQ/jLod VXRe7EV0AWIhIdZLCjj34aT9/5i8VI74k5tubjzKsMEVKcd+r3gtGDzac6jCtrZg3xEo MuLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432023; x=1789036823; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=5m+bdfXDGjMSrjZN0mTqDRdt7Sb7Otfs6JWBNkXvRP8=; b=S52PurWuae67vXYbj2wyzJle45eYNND2CRsUI5RRfboUx+HO9FXN7idVBsrJ4uUS5Y zhv0V5f3ONSoV+Z0LyHgXxA/jx+EIK5Uf8sYW6o00s9jln4WZIMJKaTf5vyF2Sx1f/vi w1lS+5Fs3j3m7ArmnQs48mt+XHOOh9yroONGaEC03Js/DR9hfLIYh1CS3G5R6g08w/T3 Sy12ROVlOeMGwtJoYJHqNHRUhjZ5Mtu+bhMeRuQp5nDErQIimWKFl7UtOUnUH/wa/V9O 1FuLPwqpMPOLMKLn4Ml5u0YL8X1CMQwa1075Uno3khM8QPNjq2+yjDO+g5AHz1QCV+Sj YdEg== X-Gm-Message-State: AFuF++kiY5IniDabqGGviKyAcmYKKZO60Kv97bFf3fnVtlmt2WEKOn8w SVFglp0in4N2Rz4XzS4A/kN4dLx0fVB5/oIGxyDI1M613on4jViGMvUj3YJBolJVE81jlOt/hw9 ls6JSFTsdgEQumtpuVMQWwuJKB8mKCgZKyqEMzJuQsd8A1yMbC/m6gjvONkcK69tbyw== X-Gm-Gg: AYBFou2E3CorDgHzrx6585KJJJRlbDOyjbMjVCYgyCKNfJRBJAWu93p6dhQh9S1OdHY gpmi4XIyXRgnoMv21WN2M5gXWmyp73N4sAJQraUxyTapaDJmljVk+IavrvfwQd6MYpBAdXz3uMg 7x+yqdOba9F9xKeXKWOifZcWoV6VWM2crZqXnlnxbfhLBmktmnqvA/mzjzwoqSRKza02bIyO7X/ RuFpH0bRfH1k6vq7v+HqGbVIDU+ofhq83Kh+lLWTKhtwKMcKmUvNSs7hHzy0SS2sSiAyHAIyYsR FDYeMoEs7PF7wnQCHNzozDbEwkrOLDckCVIZAkHQH3QAQ7o9X6ZwpB6yWAj5c7l0NCIR1npYAoO VEMEksi375a35mx7vbhUxiaEb4NgBuHhQFDGHr9nK X-Received: by 2002:a05:620a:6592:b0:92e:7d53:8e8d with SMTP id af79cd13be357-93960f3887fmr931769985a.27.1788432023083; Thu, 03 Sep 2026 03:40:23 -0700 (PDT) X-Received: by 2002:a05:620a:6592:b0:92e:7d53:8e8d with SMTP id af79cd13be357-93960f3887fmr931767785a.27.1788432022638; Thu, 03 Sep 2026 03:40:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 06/51] hw/sd: sdhci: Factor sdhci_advance_sdma_address() helper out Date: Thu, 3 Sep 2026 12:38:50 +0200 Message-ID: <20260903103936.62355-7-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 04Yeef8tNXDByUF4l3viNmQ8-QkvuAtQ X-Proofpoint-ORIG-GUID: 04Yeef8tNXDByUF4l3viNmQ8-QkvuAtQ X-Authority-Analysis: v=2.4 cv=OZyoyBTY c=1 sm=1 tr=0 ts=6a994e97 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=FRSEYCzRAAAA:8 a=EUspDBNiAAAA:8 a=I8W03weja4XGKiVTSTMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=H4N_Y-AU75W7NKDNhZlT:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX5/kHlYydrXNg e2yIXlRlZtyqfUaEEJlw42a8Vesywa0VOrenhsO7EMyvXnGFe2NQJdOF4g2kbtVDsOuDfHjaVeu K1soNLVIBjCAfOH7YKEW/X908lReNTQ= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX9I+LMcGaK7h/ 6GRKtRK6ydJ9jYWeQslbuN+dN6f24BzDY7z11iG5ucG1//KuNId2QoFTqu0QUSAlojJLyyX/Jdw iLQF4bzdOLzltULFjEJnkznOrVM6NpVmpzkMTMsccY6HDhEepZbXZu3C+747bFn1sjFRRWI7tdU vaqZRci8Cf2wQcvlJ8VHWKDzLwHL1EscYAVTB6kmCyxXiZMt5k41Tir1bjwza2uJ/nCq7gLQCxL zZehbNgYKubsNxes8F9OrcTXXwjPUsaveWwR7uZy2HB9c89iHvVpjyZD8NDJxUp/IZ1J3gQFYFP BIrLeV9sql2SZxL/DZDnErT+RbbzdGl+WD0/4B534/RLdukFqKBvb1cPqL2l3S9rmCVYQZlY9cZ g0RAxQtzYb1NuV/+i12KiXJ/ZGCvcEPA7dGQkWFg5boRt06QxGrTZuXb8MGcGAp8nIKoj9F+f9f jqzrtObj0o9p4QkVIew== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 bulkscore=0 suspectscore=0 impostorscore=0 clxscore=1015 malwarescore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432072496158500 From: Bin Meng Signed-off-by: Bin Meng Message-ID: <20260723151853.2143177-10-bin.meng@processmission.com> [PMD: Split of bigger patch] Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 586e4680bee..ad370407c6e 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -598,6 +598,11 @@ static void sdhci_write_dataport(SDHCIState *s, uint32= _t value, unsigned size) * Single DMA data transfer */ =20 +static void sdhci_advance_sdma_address(SDHCIState *s, uint32_t bytes) +{ + s->sdmasysad +=3D bytes; +} + /* Multi block SDMA transfer */ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s) { @@ -641,7 +646,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) } dma_memory_write(s->dma_as, s->sdmasysad, &s->fifo_buffer[begi= n], s->data_count - begin, MEMTXATTRS_UNSPECIFIED= ); - s->sdmasysad +=3D s->data_count - begin; + sdhci_advance_sdma_address(s, s->data_count - begin); if (s->data_count =3D=3D block_size) { s->data_count =3D 0; } @@ -662,7 +667,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) } dma_memory_read(s->dma_as, s->sdmasysad, &s->fifo_buffer[begin= ], s->data_count - begin, MEMTXATTRS_UNSPECIFIED); - s->sdmasysad +=3D s->data_count - begin; + sdhci_advance_sdma_address(s, s->data_count - begin); if (s->data_count =3D=3D block_size) { sdbus_write_data(&s->sdbus, s->fifo_buffer, block_size); s->data_count =3D 0; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432061; cv=none; d=zohomail.com; s=zohoarc; b=nQrKVjvukgWu8mTKs0L4Ie2Gc6U00l/MSwqufJF8VrVbdubwdeklwgPDSXgmknssRGAKhYuZfZiaXaA896dPWQ92ajSDJRrXJJGUOtIcIfO9En26pIPJLjP+N4nCl5sLEEmheavNBimNxDHxzvlHBWWjdRjv8Ke8OXEGuxyXmKM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432061; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=nyvi1a/tYYIkqUcnBE7VItdo02ESrel1JJPaNj5VsJY=; b=IuBdVXOo/jguuXKIIrwyUOd/UVOgWyqrw0FVzCBzn2jOLMHmGh4CwXmgvmHLg/c9Ah0epv3nDvkgMoGeprwtphTDpAJQJbjoPT0KuTPjTd7Djnq7F59QQVP5o7zFCLwUbh1vqyHKvL4xCN3mEfgtZ/WnDNulAX/hgbPCaNSSgBs= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432061857323.2603443927502; Thu, 3 Sep 2026 03:41:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24sC-0005RC-0S; Thu, 03 Sep 2026 06:40:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24rz-0005De-6v for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:37 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24rw-0006SB-7F for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:34 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHKTQ055412 for ; Thu, 3 Sep 2026 10:40:31 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4genrdvgkf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:40:31 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-936708f129aso348444685a.0 for ; Thu, 03 Sep 2026 03:40:30 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e80388sm14506014f8f.14.2026.09.03.03.40.28 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:40:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= nyvi1a/tYYIkqUcnBE7VItdo02ESrel1JJPaNj5VsJY=; b=EugqUSMrat/V0Oap bOygq2KKW6CEJ/+Yyjra/qvo3htGGsA7IcsFMMe9jYbe3HJs9xpDLpAgVRl9oFc0 f16yS/b39pElS+ZjXXNbJGTxLoxjTeiXqoMSe2m9W0mhHtxCtNvNjwto3ilXRR2U Cw4l9cY7QP/WAHzBg1HVnF7FpPagckZqy4YPraQNLB0pfFx3KEubrX1qfGvjzTaQ rb95G/Tbc16qa/zUuMfH7vjOg3SxKupmcx0rmUqRM0kCI3nnk0Ou5mWKfd+tTSqW d7q4qO1tsxKV8WCKGsgl1/y1/fuCCnyucs6n83pmYXcf7jwvNs41Td6eWUshcyX4 5UOc4w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432030; x=1789036830; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=nyvi1a/tYYIkqUcnBE7VItdo02ESrel1JJPaNj5VsJY=; b=izKHQrF2yRfuFKtNc7sdn+bAna0bvJMtmLaPWBvr1foaVKE6XxRLEf1m3IGSy8xhxW VVTRjIqKIWSeJvh7mwRpbqvCsS43/mVc9fUOk99craTn88uYOpbGtsANkSUEJGQqX6P/ 4pq30tGZAjcFamxpgYqM7v+XBqJ+dtzF7MwIPYirfvC8V3cXUFMf+L7gKgfQA3HBRWiH ZFf8NQorujVs7Afdhd74vfsUDRf/V32pNgeSWVtbuqgjqSXVYrLnhy0JUXvxWhvUon91 7R5qRM+zSNC68Sm9eSMm2aUonFRk3rbnY+e/A2/bghtE7Msu5379OCwg78oFZhQYdHZ7 eTvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432030; x=1789036830; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=nyvi1a/tYYIkqUcnBE7VItdo02ESrel1JJPaNj5VsJY=; b=CLOluaX/53FK1DDmxx2MqC+DNgL+x/0j6Cbb8DOxoh+aXMBHwyzfDJgTSi2djXFFb7 1A93BGLkC7Wh/GB5BjfPpbQHl+ezVJZ3Fe8nMcEdY+zxskdkw84bMPCb470i9N7H6nrY t43MzrZhHPqSZSwW8hdikk0i504+/NyHPc25p/Mg67VAUJ9PtfcpXjT3FGXM7ZThWF5G qzHI4FYW3P6XkwKsOG5C9EmAAKADbxFF3qaapA4d0inDB1GEKbizKNvmZQMf7zU41luQ 8Lf+DxZwAc+tPoItVD55vciKj5AWT9DyvUNU4S2FhUUXFqPmVmQqX0/1emOK1txHMbeR e4VQ== X-Gm-Message-State: AFuF++mnUaf7/DYIpb3ifUZlczuULnxD8swKogsuoYlZl0x2J5DPtDZT 2V2WwVm3DX0KNNiM1WFMSQcUdrpgvICVItWhb0xHPHxHZ/wZajeP/xO8ed7s+M9zb7QyBhJTJoS qiKDOnvaOrc10wbW6AEwFvGalefz9p71DTNPf9/Vw1mdYEZqAykFo4oPufJviu/D3WA== X-Gm-Gg: AYBFou0lJIp0SrqETAp6wCzQyQmCSITBAxnuSigq10ebWWvkKHv6aOeqS4VuL0E4Iny Z8jvTpwdq4bDOZ0bArWdqOBi6DCjZp2mHjKHe2Feo1ql41BKmIYed7241W6ihxRYNu1F2q1XGC5 Prtw6aVk2TlZA+l/Tj5qnKOhea2dQsVRFHScDLyMdFpQhMLCA4QBpdPdpbZo+lELmlUTCuRyBOb 8vJxCZaItoqq7IrIMnUXshn0VLax1kPt008NB1ZeohwcWGuCr91xLmhFbYRDKsYTg1K0cs1lVBZ x+CHv41ixRccjUMPSYHfdDdZV0XK8lt4K/CJNMtPJKSvIORNZSRHrNvQ/LC7fCzn3DjzWKcd4Gw ToZSao1aQjOc0+GC7ZqrV2e0lJ86lZMgpBUcuWGSg X-Received: by 2002:a05:620a:72cd:20b0:938:61e0:20a7 with SMTP id af79cd13be357-93960c6ca10mr992242285a.1.1788432030201; Thu, 03 Sep 2026 03:40:30 -0700 (PDT) X-Received: by 2002:a05:620a:72cd:20b0:938:61e0:20a7 with SMTP id af79cd13be357-93960c6ca10mr992238985a.1.1788432029656; Thu, 03 Sep 2026 03:40:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 07/51] hw/sd: sdhci: Factor sdhci_sdma_address() helper out Date: Thu, 3 Sep 2026 12:38:51 +0200 Message-ID: <20260903103936.62355-8-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=H4/rBeYi c=1 sm=1 tr=0 ts=6a994e9f cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=FRSEYCzRAAAA:8 a=EUspDBNiAAAA:8 a=1EIJZlbp_TTgYt2UKbcA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=H4N_Y-AU75W7NKDNhZlT:22 X-Proofpoint-GUID: 9zAnt8vzYcnG2L_EhlxpBio6XDDq0q30 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXzE3ocqOPSIAv 1TBLpaBKX2trHqMyHlc7G5OvNuO+hIhQVqB+RKe6NIrvBr503a9coqVHdG1+W5Id0L+zFWtYsL2 eZ+0mbKWg42oXJY69TbPQsZ1EfRWv4AiBycCI7dsPQVaPgpyNY65tcx2R1fklN4wZoUzU3XxLg3 JgiinC4Ms90hgALTiX+9x1SUZvQjbKn+QtUa9IHeicb1XcUiejOp4/5R0P+RbppeQrX1RJSaZ8c S6VdoRqZUjLHCzen6Gson2OX5s/54N4pzGVF0LpbS358H3BbxEuW/X5whhwTEU5zsQmBfdc+exq 2U6SoQbe5MPyWXaBayDoHswNkxsYQs+4IPxmoAfVki1BpPMjJVdxC644CjmRBw64ru4NLjx0VWm K+wDvPpkpctLRijapFr8vd8+pVsObGmCK6IfdipZZzrKa7lRqKnkcNFrFGVHHI9DVJ2sRFhOyRi m3wgQwAccU2VZtkO7EA== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX5GApgNIBbzSO otQ9+dlAhEBPo8Xgu4bVD2YQMHB+3WGWPuJisxMQPJTsbA9Fk7T3e5Nnl0XVRSH7LrWGxxQsvjr BL40icSdObOaWUCAtHVb6gYCRM5pUiI= X-Proofpoint-ORIG-GUID: 9zAnt8vzYcnG2L_EhlxpBio6XDDq0q30 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 malwarescore=0 spamscore=0 phishscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432062450158500 From: Bin Meng Signed-off-by: Bin Meng Message-ID: <20260723151853.2143177-10-bin.meng@processmission.com> [PMD: Split of bigger patch] Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index ad370407c6e..93e1687dbe5 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -598,6 +598,11 @@ static void sdhci_write_dataport(SDHCIState *s, uint32= _t value, unsigned size) * Single DMA data transfer */ =20 +static uint64_t sdhci_sdma_address(SDHCIState *s) +{ + return s->sdmasysad; +} + static void sdhci_advance_sdma_address(SDHCIState *s, uint32_t bytes) { s->sdmasysad +=3D bytes; @@ -610,7 +615,8 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) unsigned int begin; const uint16_t block_size =3D s->blksize & BLOCK_SIZE_MASK; uint32_t boundary_chk =3D 1 << (((s->blksize & ~BLOCK_SIZE_MASK) >> 12= ) + 12); - uint32_t boundary_count =3D boundary_chk - (s->sdmasysad % boundary_ch= k); + uint64_t sdma_address =3D sdhci_sdma_address(s); + uint32_t boundary_count =3D boundary_chk - (sdma_address % boundary_ch= k); =20 if (!(s->trnmod & SDHC_TRNS_BLK_CNT_EN) || !s->blkcnt) { qemu_log_mask(LOG_UNIMP, "infinite transfer is not supported\n"); @@ -622,7 +628,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) * possible stop at page boundary if initial address is not page align= ed, * allow them to work properly */ - if ((s->sdmasysad % boundary_chk) =3D=3D 0) { + if ((sdma_address % boundary_chk) =3D=3D 0) { page_aligned =3D true; } =20 @@ -644,7 +650,8 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) s->blkcnt--; } } - dma_memory_write(s->dma_as, s->sdmasysad, &s->fifo_buffer[begi= n], + dma_memory_write(s->dma_as, sdhci_sdma_address(s), + &s->fifo_buffer[begin], s->data_count - begin, MEMTXATTRS_UNSPECIFIED= ); sdhci_advance_sdma_address(s, s->data_count - begin); if (s->data_count =3D=3D block_size) { @@ -665,7 +672,8 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) s->data_count =3D block_size; boundary_count -=3D block_size - begin; } - dma_memory_read(s->dma_as, s->sdmasysad, &s->fifo_buffer[begin= ], + dma_memory_read(s->dma_as, sdhci_sdma_address(s), + &s->fifo_buffer[begin], s->data_count - begin, MEMTXATTRS_UNSPECIFIED); sdhci_advance_sdma_address(s, s->data_count - begin); if (s->data_count =3D=3D block_size) { @@ -700,10 +708,12 @@ static void sdhci_sdma_transfer_single_block(SDHCISta= te *s) =20 if (s->trnmod & SDHC_TRNS_READ) { sdbus_read_data(&s->sdbus, s->fifo_buffer, datacnt); - dma_memory_write(s->dma_as, s->sdmasysad, s->fifo_buffer, datacnt, + dma_memory_write(s->dma_as, sdhci_sdma_address(s), + s->fifo_buffer, datacnt, MEMTXATTRS_UNSPECIFIED); } else { - dma_memory_read(s->dma_as, s->sdmasysad, s->fifo_buffer, datacnt, + dma_memory_read(s->dma_as, sdhci_sdma_address(s), + s->fifo_buffer, datacnt, MEMTXATTRS_UNSPECIFIED); sdbus_write_data(&s->sdbus, s->fifo_buffer, datacnt); } --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432102; cv=none; d=zohomail.com; s=zohoarc; b=L7pV1YSNZEX2kefnxzzEhdbgbfrno9saC2xWa33XpQtxFBhqcskbO4ms4eFG+980+A+BbXWjIVbhTX2On2c9H8XZ4odnGpFLBXLwys+0+NyEyv8p2cCuVvII/UsxX0XnheaF49WJfVLwXq6kuaHXw9a/fusJU/o1GH5BYiVqD3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432102; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=WQdXe9MM4hmlY6rO1rmXlFqwn9nGfwpDH0QN/wNZ1rU=; b=euU28LKA9UUrM5SRSJug0b3avGKTMSO7bpLollHCLIhqYtwuGuJ0fAYXm+FavO820mg9XNiFn+LvgAy/XWvDlIu+tLLbc9/utMPdR3QErWmsobVIkLBv3Fx2ltw5IjLcUL/39TV/++z0gh5XAOYnf8lpKP19sYp4bV5+Wb9p6rM= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432102100803.3980946484131; Thu, 3 Sep 2026 03:41:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24sM-0005dQ-1x; Thu, 03 Sep 2026 06:40:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24s5-0005Np-K8 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:42 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24s2-0006Sm-PB for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:40 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHKsO162990 for ; Thu, 3 Sep 2026 10:40:37 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf6tx04dh-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:40:37 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-93771aa0379so597157985a.1 for ; Thu, 03 Sep 2026 03:40:37 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5d4938sm61133225e9.2.2026.09.03.03.40.35 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:40:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= WQdXe9MM4hmlY6rO1rmXlFqwn9nGfwpDH0QN/wNZ1rU=; b=UaQCxSgM3CATn8ra QaNkLhj4xVgUO8BQBQ+ddAIRYvdU99bLb236wy6nJw2aYYRUoCjQl46sqtAZPI5d NGxxAY3S8EQo3OE15Jwftk5KXPiWyNhyo1SaHx9l5pBLIWPHYwWoxyYm8Kseesm8 NtbEIQeEkcm1ImpSoT88lwkSVOsftPYmxcn+yg2gwqVaUBacAq6iX78xbpT4DH8o FFM7ewPN0n2q5v+BNrpCuJqhh79g7IZHU4VPVszxduAPRd66PQ1gcywCGmO0Q51q 0TIBB7VG+W5QWtFIVmAjt9vb6XDz8sikdN+VZ8r02HV4Xs5MsIr/AlqqlSTSF0/c Y2Tc1g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432037; x=1789036837; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=WQdXe9MM4hmlY6rO1rmXlFqwn9nGfwpDH0QN/wNZ1rU=; b=OHSsW++oKTxVTGayb3Mer4Knr2A/qxoV0iZsr8thg6krdVfFKa0eu8Ihua5APOd0ge CQMWRZ6e76Gb1Uavhgfc+Q36m59r9Ak3TjiKalV6dcLzsNVNYNA50mP5lR+OSVbf4MEJ 9aRtOCkhpTAjQwKLw3Gmg6a9kE5gCsIWknQiwTRxYs9ngMTOIYesm9q5bXD/jUtgyDKY gy7thES0ikTZ3Ar4r4wUOktvJTmr+5xoS0EdUhoYjBQ8kjtii32RstNuLsGpFh4lVAoD UX9TMkWC7wDLhSzPFudV/ECMayuFTT5lgt8peXg4nYGaxKDcH7cPyNfbDuhiieGnB2Gb fZrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432037; x=1789036837; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=WQdXe9MM4hmlY6rO1rmXlFqwn9nGfwpDH0QN/wNZ1rU=; b=CayrgmunPcjWkTPjeCzTUFK3Hab3TVpYx20qaTtgsNl5e18Dt5N1bA6iS0izjc3H19 DnAqhuYEXtol9zV/PUFmRCZnckAodXbtTbyqMAqg55fE3FWVh6W5o37MItxaz1m7l9L0 QOE5sflfUBo253mrMc/YFyu3FDeZ0DBTTyElAdu4TYi1JprEzqPs4/FCnevXG8qDJ6C4 LiOrAGXZnuMw0JAlwVYc29wXy8UsyixHsEEt1goWcldIqyL+Ove+Gwqv+xhNYnzQlXPJ aS66iaVkPPMJjJurmJCLFTZuiyJGEVMhxOokCInYw1k3KUVp5gV0owGerXDf9KnXWl3d E2xw== X-Gm-Message-State: AFuF++n+CNGGolBfDqm6vXlgGyeL4U6OsEWSNldJO658gcQADjISanVw YLE2vinX6YFzEAZyMmEyxfH6xtdAduMhofiN2cm0Qz5SzwiUKFjGGGku3T5ezPSjCoMziLOclNF 0JzjHmRRPXoH7w6mR9JaZYpERw1PvwypHY0HGJbr3H9glyP69QTMKqw7TpHgKwPN+iA== X-Gm-Gg: AYBFou1lMtUpC3qs5ou4suPi7BwymRsjmAo4a6/eXdiQQKto1WhFWaNgDGR65YxpLwv gDORoRsPLJUZE9dFI/V1LmYEhvbe4XfSkNp+Jobil5jIjw/vSf6TRy9kbKZcUL3Ju7kEcyHTCJf sScEBbiSmu68uF81rO6WuFxd20xfKH932HEpq+kPmXPJFtpk+Zdlz6LvfVNfyXkjBq8+QE+wGdS XrQtT/2HzJivBBKUiubFEalNvThrFL6z/heL0tAtbuMyrMNsS4a1mTGuMznJeHFm4tPxKGmBEcd 9laUkHyeZ1099QnmohCy2uF1JFjjsWuMDbX8kgSEdD51GawmMvNuIWG9MleHL+sKOQkphdMvYVw n4AFP9f7IwVjR/s+ibkwb0p68IoYuvt0WD2kyVw4k X-Received: by 2002:a05:620a:2682:b0:939:1459:efb2 with SMTP id af79cd13be357-93960ef3c8amr1346666685a.24.1788432036993; Thu, 03 Sep 2026 03:40:36 -0700 (PDT) X-Received: by 2002:a05:620a:2682:b0:939:1459:efb2 with SMTP id af79cd13be357-93960ef3c8amr1346662785a.24.1788432036524; Thu, 03 Sep 2026 03:40:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 08/51] hw/sd: sdhci: Use version 4 system address for SDMA Date: Thu, 3 Sep 2026 12:38:52 +0200 Message-ID: <20260903103936.62355-9-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 4yQSffL8jmkFI6aus3UqBjmWBZMEsQwy X-Authority-Analysis: v=2.4 cv=TqjWQjXh c=1 sm=1 tr=0 ts=6a994ea5 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=FRSEYCzRAAAA:8 a=EUspDBNiAAAA:8 a=RSTeruuXXq40PE7alSAA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=H4N_Y-AU75W7NKDNhZlT:22 X-Proofpoint-ORIG-GUID: 4yQSffL8jmkFI6aus3UqBjmWBZMEsQwy X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX9CNNDR4z6rRH VQwvQS89iIy80111ea5ovuS9YfP0ftfz0OV9TG6HnIPGE7EWsuLxFPQgSd4NLZ19r8x5yKFP1Sw qBRBAyh3CsensXM5Wheup5q/JLIhhGR34jUV+xyVHOWf74EQVZAI4XKwjiv/+e3rEfxKq1zkMLm frkLwGxArMErFcS/mrF3yxxLytuh1mFGjkQRQWmM3x/19BFA9zfFz9RXa+W5JiqGeRxCbGkmkHx 4CwXJc0MF/4OarsKqtl6gzRtXcFAcSOF/Uej+lygOYMLiGqt2U30aLVFoUvR2CtJ+UYAQelHoPv mNDZlTKhRkptfSqtaadRXSGz41AGff2chx0wCx9PxpqCrIlWFWihGVEBnyZR6kTOEdCG7Kyg2qR YDuf5ALSFJ9yCX8waJCYKUinhdTW/1Z1vnAcGAhVr1aX3BQ/tYlUy1BHUlvpK1u0uJjHp0wRQgO sepMKQF5noJ1QmkVDOQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXxLpo1U/2CfH0 pPbQPzfuA4Yb4SatO63D72QZAM/vjdbLGmbF9OXxafX9V1dwpxg/jB8D1NWy9x5rTzXqqk0agaA 8Y6lx5Q2hsz2ehbJ5pPL02IGLwkPOic= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 suspectscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 malwarescore=0 spamscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432102672158500 From: Bin Meng SDHCI version 4 moves the SDMA system address from the legacy 32-bit register at offset 0x00 to the address pair at offsets 0x58 and 0x5c. At present QEMU always uses the legacy register, so guest SDHCI driver with version 4 mode enabled uses an incorrect DMA address. Select the address register from Host Version 4 Enable and honor 64-bit Addressing when reading and advancing it. Keep the existing offset 0x00 behavior when version 4 mode is disabled. Signed-off-by: Bin Meng Message-ID: <20260723151853.2143177-10-bin.meng@processmission.com> [PMD: Simplified extracting the previous trivial 2 commits] Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci-internal.h | 1 + hw/sd/sdhci.c | 32 +++++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 4aeed120bf1..2116995dcca 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -201,6 +201,7 @@ FIELD(SDHC_HOSTCTL2, UHS_II_ENA, 8, 1); /* since = v4 */ FIELD(SDHC_HOSTCTL2, ADMA2_LENGTH, 10, 1); /* since v4 */ FIELD(SDHC_HOSTCTL2, CMD23_ENA, 11, 1); /* since v4 */ FIELD(SDHC_HOSTCTL2, VERSION4, 12, 1); /* since v4 */ +FIELD(SDHC_HOSTCTL2, ADDRESSING_64, 13, 1); /* since v4 */ FIELD(SDHC_HOSTCTL2, ASYNC_INT, 14, 1); FIELD(SDHC_HOSTCTL2, PRESET_ENA, 15, 1); =20 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 93e1687dbe5..3fba3970d4f 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -598,14 +598,39 @@ static void sdhci_write_dataport(SDHCIState *s, uint3= 2_t value, unsigned size) * Single DMA data transfer */ =20 +static bool sdhci_version4_enabled(SDHCIState *s) +{ + return FIELD_EX32(s->hostctl2, SDHC_HOSTCTL2, VERSION4); +} + +static bool sdhci_64bit_addressing_enabled(SDHCIState *s) +{ + return FIELD_EX32(s->hostctl2, SDHC_HOSTCTL2, ADDRESSING_64); +} + static uint64_t sdhci_sdma_address(SDHCIState *s) { + if (!sdhci_version4_enabled(s)) { return s->sdmasysad; + } + + return sdhci_64bit_addressing_enabled(s) ? + s->admasysaddr : (uint32_t)s->admasysaddr; } =20 static void sdhci_advance_sdma_address(SDHCIState *s, uint32_t bytes) { + if (!sdhci_version4_enabled(s)) { s->sdmasysad +=3D bytes; + } else if (sdhci_64bit_addressing_enabled(s)) { + s->admasysaddr +=3D bytes; + } else { + uint32_t address =3D s->admasysaddr; + + address +=3D bytes; + s->admasysaddr =3D (s->admasysaddr & 0xffffffff00000000ULL) | + address; + } } =20 /* Multi block SDMA transfer */ @@ -1380,10 +1405,11 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t v= al, unsigned size) MASKED_WRITE(s->acmd12errsts, mask, value & UINT16_MAX); if (s->uhs_mode < UHS_I) { /* - * VERSION4 is writable even without UHS-I. Preserve all other - * Host Control 2 bits when UHS-I is not supported. + * Version 4 fields are writable even without UHS-I. Preserve = all + * other Host Control 2 bits when UHS-I is not supported. */ - uint16_t independent =3D R_SDHC_HOSTCTL2_VERSION4_MASK; + uint16_t independent =3D R_SDHC_HOSTCTL2_VERSION4_MASK | + R_SDHC_HOSTCTL2_ADDRESSING_64_MASK; =20 hostctl2_mask |=3D ~independent; hostctl2_value &=3D independent; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432089; cv=none; d=zohomail.com; s=zohoarc; b=Jd/XoL7R4x5QcK2n3l+WR1ANFxBFRsrT+X+xnHIkASVN0G9G2RvLpW0DK7ouF9IiMckNZmBm+QnXFtq4eGA8/qkmPB7BJ/tr8C4jPvDfBaMO/46CH0Dkz5MYB3Aw1iYzW7GIXg30v2uUmY6Mp7pIcMWX8LXfCJ9t+Lr7i8strEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432089; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=XyuN6PFVWKFuf1ZjipgLX6cblWICVka9Ua8+99l39Aw=; b=Gxbrli4kQJ9ZUvBti5EN4XvIJ0SDCjH5CP1SvM6BOA7sRHqgrnNUQJQECBA3tUlArBOlRmKav/UbbphXcB0J8k54OChK8xchwXKebB41qOfEmHEk/7DfPOWqJJbQyXsxEyChOldOQsu9M/NU9HGSRiexIQh3QKZRItKgZjDkt8M= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432089277362.83259656119697; Thu, 3 Sep 2026 03:41:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24sQ-0005nf-FD; Thu, 03 Sep 2026 06:41:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sG-0005aU-V8 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:55 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sB-0006Ti-Rd for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:50 -0400 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHBMn3782254 for ; Thu, 3 Sep 2026 10:40:44 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf5pdrfsq-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:40:44 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-939665a1ae6so413957185a.0 for ; Thu, 03 Sep 2026 03:40:44 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e81718sm12733262f8f.16.2026.09.03.03.40.42 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= XyuN6PFVWKFuf1ZjipgLX6cblWICVka9Ua8+99l39Aw=; b=AMSCOYRWYg3C6eE5 0App834HVvU28DkWa62jyaow5t+2R/9FYsOyEaz6+eXwWwXQO0PaPPLXIeO4IBUQ YfKa+/R6YDeOf+ES721CcFHS2EXL1mfOTmWA7RyOwBNuE802vx+0YuqqFzLu254N 3acuHmdoYFBoGTM946GGD9O/NAhgOkJUX2IePG2sFDopSeQsB2pjbJfK5YxuyVuH 6AyfmSmBXXrhaQJvRB/N4TXJgMtkb45NDd/kz3aIKs96t0Pa7fk/YJZAMPe/Z23r 8BIXq1O/8zEBSmh7soBZcPCvGudPuGv4rqDc8s2e7iTWCbXiam5Tr7jWV1ljPITX 5JRxsw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432044; x=1789036844; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=XyuN6PFVWKFuf1ZjipgLX6cblWICVka9Ua8+99l39Aw=; b=MKbMf7fp8dyBLiTVyG55LEqeyHIEzNxaHYl4dGENmiCacsIMTvIp155NbkDufablB7 zOjOUn1XSaRDg5EuOmukJBMRoLlFxhPOrKxKQ6IrkVaV6oipW7bcFEAddpLXQmBywCGt 4meyUMgsY0slz5CBP806EIbXv0Nj4tWXHdJNW7JymiJbCYLUrltBfrEvXhUtaR/0DJy3 QfjHkfdSVJn5dF+g5drG3WRPB9ya+NhRbttraPqMLsEl0xeTOrPgqoMMH1njkxcHw/r3 6cyA9+QI9RKXda7GXs64dwaIkVkiPjv1nXrCKeklz/NAUU4h6x06bP38N6Th5XPQ/aIi z90w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432044; x=1789036844; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=XyuN6PFVWKFuf1ZjipgLX6cblWICVka9Ua8+99l39Aw=; b=RmzOONs+beslfg0avb47AZKe0PaOJbE8eK15c0zeKagctoqlfmQBiOyo24EAmhfECc 3BRltA4DSssZN12mcyIw+dOY2iHvRFgjTgR29sRfm9ZmEo2otK8rg1v2LmsoGkEoWoRg 4FdMCaS/Zj1uh49rFO6GLEm1Iqk2dctfm+c5jDsOslaOfTCIz9ihBrKg7hDn3kS/x6Ak QBcf12201EqFg+2mN6yUSQhaDDA79lmg/B1qKWPAo5guHAiiwcw+A5e1ZRD19n46T29A BH7MPS4sCMbeyrllXMgq3JjKP9tZY6qg+fVZ46MSPNUBRa4JKl1cTuh+aKqwA9JosOQt uXuw== X-Gm-Message-State: AFuF++mmJv41X4/pxhALCc64dr45WDBaMZMInPHzO13EJq4vWwQyqnHw QTbWkCC2xu/I2cO89Apa4vrCkDM99lQAtNCdYpnodzw2AbA4TTTJTfdHcRdZ+IfR2gQfgGS+Ggl McVIq/dR9d0HAp2iq/nQLVMDRByPy4VQKW2bZrtGsbtVuC8tW480Qrod6DF4ID2ts+g== X-Gm-Gg: AYBFou1Bt7ayAiDdIMc7HwD650lPJjNaYfw4TvEWBSl5vJ1ZrIFms/2l+jVBkQlOtsi 4cw4PETROEdprlP/V+yk4n/U/+ULU5rhH9bQa+7iN2+1VQWFuclIQVhSCljchy1BEd+Bep0R3Zl NYpibOH4tqsDiGNAm9l/BG13je+jNZXJQew45Xmwce8EnCW7a4ZQIEq2qV3jZWG4efS6+xzyywm zFnKM8J99F9k4yCsG/e2D4Wl2BzEZXOYTDA+sKydyrwQQYKaeRfvlVWK1ylI9WEDYw2ahrXpKYe /b68byeuc2BWIZqy7GdcWYvexi4+oNf8w0gVicAsJwuf7xImdL8jEnGJBUBFg0L2RgopImF8urf xeNZlVVhKAS/vvW30Z5Hq2wnR5IDYY5pYrqYSR03l X-Received: by 2002:a05:620a:2886:b0:939:4891:6799 with SMTP id af79cd13be357-93960decb8fmr1347671585a.11.1788432043777; Thu, 03 Sep 2026 03:40:43 -0700 (PDT) X-Received: by 2002:a05:620a:2886:b0:939:4891:6799 with SMTP id af79cd13be357-93960decb8fmr1347667685a.11.1788432043303; Thu, 03 Sep 2026 03:40:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 09/51] hw/sd: sdhci: Support version 4 ADMA 64-bit addressing Date: Thu, 3 Sep 2026 12:38:53 +0200 Message-ID: <20260903103936.62355-10-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX9VJ7Jy/dOXGZ 4b7Una7q+FbJcnXbEw1IiX8FM5vb44xDJMYKzO2w2avWvgt2WUDiKBSaILIPfEXgSzOkpH5GXIB YGkEk92ZVZZusYu2kBaYK/744iX+mhk= X-Proofpoint-ORIG-GUID: KAt9pfBB32njghQMbmdTSaRHjHnc0RVo X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX21srroKqRSr1 +7v49RL1gCNnvL4OKelW7r0XqPOvB/a9K+1BJ5wNZSuI8kzhlR57fPDHZUqgzcdoJAu5XBAYVCt VxVK8qX7wMGIwEfHz/zTSxb4qSfA8rB93lLVo92PYYq7e1CLKGgFsa/ntVW5f7ZQTJY1Dh9Nsxc AumwvP6wY2pW/omdL8Jr9cb6WA4tzEzKHHsBlI/y7DVv8AwsYceRe2njqkXqeLNBo62VpbciY+c cgLX1aBmtVaPjTpUL4HZIipixbKMQkNgZC6m3yvsyFTNiNBWAG9TfnqoenUqT0ItjKw9MD3UHnK B5XdLYaIR7mIcaYrP1+79Q/I9VblyvJRFWxFRuVvylaVFK2N1l2qVFNz9c3V5aCbjYz+MI3jtAI AhBR6tB3XtD3TiuP4TMEHbfPMwxsAdQJeV6BdmTb2cMDRRWyhIyW0wiD2t39Y/82wamtsoyyrML 2Qep3aFNt+3xijXZq9w== X-Authority-Analysis: v=2.4 cv=RsL16imK c=1 sm=1 tr=0 ts=6a994eac cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=FRSEYCzRAAAA:8 a=EUspDBNiAAAA:8 a=cecaVjzdulOwRCAQsNoA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=H4N_Y-AU75W7NKDNhZlT:22 X-Proofpoint-GUID: KAt9pfBB32njghQMbmdTSaRHjHnc0RVo X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 priorityscore=1501 suspectscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 malwarescore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432090807158500 From: Bin Meng The Cadence Linux driver enables version 4 mode and 64-bit addressing in Host Control 2 but retains the ADMA2 encoding in Host Control 1. QEMU treats the transfer as 32-bit ADMA and uses 12-byte descriptors because it only decodes Host Control 1. Resolve the DMA type from both control registers and use 16-byte version 4 descriptors. Preserve the legacy 12-byte ADMA2 64-bit format when version 4 mode is disabled. Signed-off-by: Bin Meng Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260723151853.2143177-11-bin.meng@processmission.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 3fba3970d4f..f0ba5c11dfc 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -227,6 +227,23 @@ static bool sdhci_update_irq(SDHCIState *s) return pending; } =20 +static uint8_t sdhci_get_dma_type(SDHCIState *s) +{ + uint8_t type =3D SDHC_DMA_TYPE(s->hostctl1); + + /* + * In version 4 mode, the legacy ADMA2_32 encoding selects ADMA2, + * while ADDRESSING_64 determines its address width. + */ + if (type =3D=3D SDHC_CTRL_ADMA2_32 && + FIELD_EX32(s->hostctl2, SDHC_HOSTCTL2, VERSION4) && + FIELD_EX32(s->hostctl2, SDHC_HOSTCTL2, ADDRESSING_64)) { + return SDHC_CTRL_ADMA2_64; + } + + return type; +} + static void sdhci_raise_insertion_irq(void *opaque) { SDHCIState *s =3D (SDHCIState *)opaque; @@ -781,7 +798,7 @@ static void get_adma_description(SDHCIState *s, ADMADes= cr *dscr) uint32_t adma1 =3D 0; uint64_t adma2 =3D 0; hwaddr entry_addr =3D (hwaddr)s->admasysaddr; - switch (SDHC_DMA_TYPE(s->hostctl1)) { + switch (sdhci_get_dma_type(s)) { case SDHC_CTRL_ADMA2_32: dma_memory_read(s->dma_as, entry_addr, &adma2, sizeof(adma2), MEMTXATTRS_UNSPECIFIED); @@ -818,7 +835,9 @@ static void get_adma_description(SDHCIState *s, ADMADes= cr *dscr) MEMTXATTRS_UNSPECIFIED); dscr->addr =3D le64_to_cpu(dscr->addr); dscr->attr &=3D (uint8_t) ~0xC0; - dscr->incr =3D 12; + /* Version 4 pads 64-bit ADMA2 descriptors from 96 to 128 bits */ + dscr->incr =3D FIELD_EX32(s->hostctl2, SDHC_HOSTCTL2, VERSION4) ? + 16 : 12; break; } } @@ -998,7 +1017,7 @@ static void sdhci_data_transfer(void *opaque) SDHCIState *s =3D (SDHCIState *)opaque; =20 if (s->trnmod & SDHC_TRNS_DMA) { - switch (SDHC_DMA_TYPE(s->hostctl1)) { + switch (sdhci_get_dma_type(s)) { case SDHC_CTRL_SDMA: sdhci_sdma_transfer(s); break; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432070; cv=none; d=zohomail.com; s=zohoarc; b=GBjvs9SwiWBi4nZaGfn4+see+V9717ZGyQ6+zSCABLX+DtU0l1vbZmEPh8t+Q4EIuFslt07A2XytPi7I5oNiUA3Ey9OwOjB1aJyBLU2jHk/S1hCiLtVPKp0X7E9P+Pe8ZkWZGHH4KKem2c1Tf8HBgMxRweFnvp/6AzrgpbcZe1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432070; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=KhITqIJMF343IsucLQepk7vttbDnaMQQ3wYnSIoJank=; b=aDPCwKIf24eP6DNPRzB8z/ACkgCkyri3G62R5Iw2+4grMiG4Yt52KuKTgTTT3Q7oOobgY9cMGhqmV+TOotBxIRznDjjCV9TTpsdBgR6Oq4eaPj5kRQ2K6NROYGj55dcRN/6tlqkG3TNOO24UIAKlGaTP49abqC/yQLCuvELKAhU= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432070537993.8398301303722; Thu, 3 Sep 2026 03:41:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24sQ-0005lP-F4; Thu, 03 Sep 2026 06:41:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sJ-0005bQ-Qi for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:55 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sH-0006Uh-6X for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:40:55 -0400 Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHEMF327166 for ; Thu, 3 Sep 2026 10:40:52 GMT Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf4ekgtfs-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:40:51 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-9390ca1a9abso354821885a.2 for ; Thu, 03 Sep 2026 03:40:51 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448ed38cfsm11889296f8f.19.2026.09.03.03.40.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:40:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= KhITqIJMF343IsucLQepk7vttbDnaMQQ3wYnSIoJank=; b=juNVDDmry+DsEjmT TAa2ueDCGtjWSI4DrcCMZxV+9IHGmf2jA7LybzojMGVYni+alzNIcA16bavrbE6u +EsNlmbZ127KKYC/kG3LhZkBdfa0zHTI3LhXy0y0OtnYaEBvsEjVd2CrnLNhk9PH PAQUPAaevPslFmX2ptkEWIilg28MNzm6gGqog6i00b+UAwL8m0FtJC/K+73+I6q/ zqnGvVOsUkQUGvJJzKvuRJEL6TWXchhgZe4bl5SrqNLcPKIfB9GNt05CQSgnTpA3 ooAPajusaLHh7b8t1qcSt0Vu1n9kl6c9+3IhNZn09RsMRCT/2MxK12aEi4AALfTR RG/aWQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432051; x=1789036851; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=KhITqIJMF343IsucLQepk7vttbDnaMQQ3wYnSIoJank=; b=VDQkhzO665n4wKrqtmg0K9CUXO0lSe//FBmhHXDYwi3TkFyG3fJV9X12adITa0HjLU R6jlkhbe52FGzNwTub1QX/pG185tXvx68dobHTMxajRFKlOtYJ2qPXMMjJIBu3JUC4Uv TXVoZ34NZPF1KlLY+vRyjo/oy4lbgjELTt/Ip9VGd87JHQG09mHhjCAgaABoNjctZ/Ws Jszhb0QuUyyKxOH0d7kczl3+a4EWoRSf62CcOo/cUn7/gL94CG1v7maHG6hOxACEcvXU f3ZjrVxvSPH32oikhy2PYe9dah9Qe4BJHqXZV13tEtHwHVR0fIrPB5BQ2zNNiFe0u0rX KNWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432051; x=1789036851; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=KhITqIJMF343IsucLQepk7vttbDnaMQQ3wYnSIoJank=; b=LF2n/B8s3GHrjiV0qIyjKBEBR5zbfMOZRzBBtz15YepYTh2WJ8P4fPDbPG/xV0nhuy V7lrfPlSr6TAmsxYxuDo23b5KW/ox+Ay7sOq3zjEQI1zXjXgCl39rq7DzyrSxcjrcYu6 mO+Za/CWPh6s78K23MSvBFa0GUcHkwgJyUYEotyJGbr8LifL8GBxoZ677ldlXQFVvj9i LD/1m5POskPPdEpgf8Uh327/nXaChypa+vNMZhJPxbKNKCfo2dQXbuEN5tJI1hCZDv7L 7Y7j13mUUvFer7NByXyWavs8WW8bYdw3JZVJK8STcHOG8u5LYDaXxJd6f5foX/PyTByu Zx4Q== X-Gm-Message-State: AFuF++nnwJUtzOyTh6neiFCsP1xDiamr04EVfrcGdf9cz2WVtGU1w5pg 9zEFzFpEptGjhqCO7RPJu2FjnPRalFWtoijKZ6pweodYUvLemO8Wmm5Uift/z02uMUFfFBdNC0R /5Fw8QJIy3b9IXaL43wGbIis4Hzt5M97+XCC2aHQdC3gUOatJGujBidyH3bWMWbfbTg== X-Gm-Gg: AYBFou0098+rg3iPQv5lP2MuERa+iL+aGz3BSWBqLSM3OdiWrknk+kgDT6OpHTQ6gbS hEEK3MIXOirBkdluY2LGLw5Cxns9op66v1fIrk8wvcNBz5oXrcigVHT4/nOtDo4Z6Lz3l+ZFT6D GhuSTZUqWkt1jDGIIzfvsZjCx2MICzGfBX+m4MbcGnzC30tS/E74Z6V9iT940eqo+HIIA6s2N1s 266u7LcJsO5uj9Wq0LsU+jijxLej9MO6JLmZWqlvr7oJncIrqMQ5GR6spIv1yZAQKdamvacrDLJ SSjYEIgK8pl75OC9vedrxgyuF2s9qFR+5eQr1wv4Tt1+AfQiWFEEgje/trfMlRes92DWyTDAfF2 WJto885kB1NOBPiQGgI0cqC41zQclVxHdtKyrHLF6 X-Received: by 2002:a05:620a:40d5:b0:939:3571:bb90 with SMTP id af79cd13be357-93960f2b49bmr1274579685a.24.1788432051186; Thu, 03 Sep 2026 03:40:51 -0700 (PDT) X-Received: by 2002:a05:620a:40d5:b0:939:3571:bb90 with SMTP id af79cd13be357-93960f2b49bmr1274576385a.24.1788432050713; Thu, 03 Sep 2026 03:40:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 10/51] hw/sd: sdhci: Resume version 4 SDMA at buffer boundaries Date: Thu, 3 Sep 2026 12:38:54 +0200 Message-ID: <20260903103936.62355-11-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: PtICKcjJHwMBcUJQ3j4K17IsSX5mXZZf X-Proofpoint-GUID: PtICKcjJHwMBcUJQ3j4K17IsSX5mXZZf X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX56ApJS6e1lK3 wQp2MZ5H46nuCojibl8g1EsvoFkH8KHtzcIx1HVWwjSqrpryhRNhjhav9FiCyEY3hy3rFlzqjin WWK56HPlVjygmM3d+WpWEEVW065fgIAn+zfR0ZiWSA5X9IsQTH9/Kv8u1BAmlXNpAE6j6ZaTR0z HWsisNCXiKoterC8elPSaisjH3KfDcfXaJF/gvUNUHFe9MsRQZrIn/yt13ax32EI+IoQTorTZch xF3vLskZ3cZ9nP/G5QnLymzLuCLynaqyPSMCxolvCoAECkd2Amk/9IPQRF2giauSunVk7EJpsdA FY4J2lCTjZEfG+hhbWllkBF4tdIS6ua5d3CGKLLZee5Y6UOZDqaV9t0XzvC41lAW4L4wQeKZJDj EC1sZ8StOXpO54uV2WV3EM4VN1idU8Ha0xTSdr/hAD/4w2Mda+z90rfbSvmqg4tieVHuEBcSImW 4cw0yfswvSWsJS+AcAg== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX+COmYYC5RZLl kokmlN9pTsKBgcXA4MLuh6Jj07Elg6MC2+IhnaEgK8Pi+CmoN2H1dYEhNttwTk7kWnDoRN3/sAc Nu2eM6nVDvot8xXf8VYJSbVS7I1Iynk= X-Authority-Analysis: v=2.4 cv=PKc/P/qC c=1 sm=1 tr=0 ts=6a994eb3 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=FRSEYCzRAAAA:8 a=EUspDBNiAAAA:8 a=3YG1UsAA5NaYTQao5CoA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=H4N_Y-AU75W7NKDNhZlT:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 bulkscore=0 clxscore=1015 phishscore=0 suspectscore=0 priorityscore=1501 spamscore=0 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432072498158500 From: Bin Meng Version 4 SDMA selects its system address from the registers also named as the ADMA System Address registers. Updating those registers does not resume a transfer that stopped at the configured SDMA buffer boundary. Resume 32-bit addressing after an access completes the lower 32 bits of the ADMA System Address register. For 64-bit addressing, wait until an access completes the upper 32 bits so software can update the low half before the high half without starting from a mixed address. Signed-off-by: Bin Meng Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260723151853.2143177-12-bin.meng@processmission.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index f0ba5c11dfc..bd74c60f728 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -786,6 +786,12 @@ static bool sdhci_sdma_transfer_active(SDHCIState *s) SDHC_DMA_TYPE(s->hostctl1) =3D=3D SDHC_CTRL_SDMA; } =20 +static void sdhci_resume_sdma_transfer(SDHCIState *s) +{ + s->sdma_boundary_paused =3D false; + sdhci_sdma_transfer(s); +} + typedef struct ADMADescr { hwaddr addr; uint16_t length; @@ -1257,14 +1263,15 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t v= al, unsigned size) =20 switch (offset & ~0x3) { case SDHC_SYSAD: - if (!TRANSFERRING_DATA(s->prnsts) || s->sdma_boundary_paused) { + if (!TRANSFERRING_DATA(s->prnsts) || + (!sdhci_version4_enabled(s) && s->sdma_boundary_paused)) { s->sdmasysad =3D (s->sdmasysad & mask) | value; MASKED_WRITE(s->sdmasysad, mask, value); - /* Writing to last byte of sdmasysad might trigger transfer */ - if (!(mask & 0xFF000000) && s->blkcnt && - (s->blksize & BLOCK_SIZE_MASK) && - SDHC_DMA_TYPE(s->hostctl1) =3D=3D SDHC_CTRL_SDMA) { - sdhci_sdma_transfer(s); + /* A completed selected-address write resumes stopped SDMA */ + if (!sdhci_version4_enabled(s) && !(mask & 0xff000000) && + s->sdma_boundary_paused && + sdhci_sdma_transfer_active(s)) { + sdhci_resume_sdma_transfer(s); } } break; @@ -1401,10 +1408,23 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t v= al, unsigned size) case SDHC_ADMASYSADDR: s->admasysaddr =3D (s->admasysaddr & (0xFFFFFFFF00000000ULL | (uint64_t)mask)) | (uint64_t)value; + if (sdhci_version4_enabled(s) && + !sdhci_64bit_addressing_enabled(s) && + !(mask & 0xff000000) && s->sdma_boundary_paused && + sdhci_sdma_transfer_active(s)) { + sdhci_resume_sdma_transfer(s); + } break; case SDHC_ADMASYSADDR + 4: s->admasysaddr =3D (s->admasysaddr & (0x00000000FFFFFFFFULL | ((uint64_t)mask << 32))) | ((uint64_t)value << 32); + /* A completed selected-address write resumes boundary-stopped SDM= A */ + if (sdhci_version4_enabled(s) && + sdhci_64bit_addressing_enabled(s) && + !(mask & 0xff000000) && s->sdma_boundary_paused && + sdhci_sdma_transfer_active(s)) { + sdhci_resume_sdma_transfer(s); + } break; case SDHC_FEAER: s->acmd12errsts |=3D value; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432090; cv=none; d=zohomail.com; s=zohoarc; b=XRu7VtPniehGe8Rb0t3cJWF9W2mStGyKIWCXg6/JB/UxmkPw2OTLlMuRr2aMQdDpknqkXgyLBBCrZ6b4XWCXjX0nivVkFtMDiy2e/NCkRKd+VRLN82xCEARtNXo4rFeUvxqzthiWM3jNFLIk4d2ssGO6P1c6erXvccmUlbWouz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432090; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=4+tQhWxttEbmnMB8F0bWj+Xxz+Cc9Lzqzfqz7/+hjpg=; b=hY+4al6e+GeUdRO8bqRQy1eHvMPHZ8QX7+haoRl9YpotOmxV0jfIeDtHVCTR2rcsGY/Q0qJHzNO9mXdyClxefTF6ZWGkQD6sWDpzox8lWeOofTmiW9K8ElAEEZqwVlPpKAjcc2kwgM8UXhHQOytDyJtIhgTFqKXJj7+h1A7y94g= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432090938900.9314629112802; Thu, 3 Sep 2026 03:41:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24se-0006Ga-F3; Thu, 03 Sep 2026 06:41:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sP-0005nh-N2 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:02 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sN-0006Yf-NV for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:01 -0400 Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHE1v327174 for ; Thu, 3 Sep 2026 10:40:59 GMT Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf4ekgtg7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:40:58 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-933023a5980so487750585a.3 for ; Thu, 03 Sep 2026 03:40:58 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e7315bsm13149315f8f.7.2026.09.03.03.40.56 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:40:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 4+tQhWxttEbmnMB8F0bWj+Xxz+Cc9Lzqzfqz7/+hjpg=; b=hBkOXqCWQiyqwBPS e/kRXIDQyYrmb4O3Cl4KjOsW643L1ynxhdWqUSTyV3ZLYeOOoMBiiO9+RPTIfKMb nZOyr6Itb01EAmNC4cj3pOyxuTgk43OHkJ22ko47geL2XrPVancpfwHs25JUAGyI Hs4/Qu4HBerPG34A9IS9drQz42Qgv0pOJRFLhPuaq7wtVXNgG0IuwetFGCiyrf+X Ew3DoJxAevPuPrZ2mj8JuD/kGnl/o257aU6vmW5YbvYiJm4dWvPQBlDL+KOnB9Dy Y9WJL+XF/afTdBxdJBFqjvilQWV4hLQ12BCQcC76GO6Yxg1ilZuNVZxhelCK+T3+ /72yvQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432058; x=1789036858; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4+tQhWxttEbmnMB8F0bWj+Xxz+Cc9Lzqzfqz7/+hjpg=; b=VDxdJwG6o+JPWU3yrElVbdsx9c+ZJA23jpFKE2uyR2MJDEqc2W+TDs9+uYt82btxYB K3D5VSTWMheybkx8cVYLnC3hajmK9APkxm+c2A64YrHAH5xjVhbRFBrO617dWSUMUzYJ 4c3kkgppU1X/DtpfgF1hMffc1othct4qPgReBBCxVNfw3xrR0QjlOoljP9hse+yNYAT+ 1mY0V9SoZXA/VwLV2GhQxI0EWhKJdSi81MAUvKO+tZIKWp//dOIKkKY3hJ8iAD54r5S2 iMUIzpXC22txFOfqmktuKW1Hiw4eG/R8x2C0oBFV9H2tkQGFIyccHABNSOKgXXUsgyhl AxRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432058; x=1789036858; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=4+tQhWxttEbmnMB8F0bWj+Xxz+Cc9Lzqzfqz7/+hjpg=; b=paffH931gr7MB/0Vpm/mWNou39Dm3K1N0QIiUS4HdlWN30QE6R7XVF10Gpr99NLjET ThzDZ+HAXKsZzNPnmGqrT0uY9JtBd4pGs02B/eYPKqvC/OWpXAGgefO2r5VSqkToJvKl XgOFb7uNd4S3fw3J9MTYgi4I9KjV+KndGfCBG0hd1Tev7RcGiDD49wY75pPmQZkL3bMl ENld45qvtQOcxYsMEiPzdPrLfyyumqaIzcCKOr7exDoJnRCAAbhg72cBgKivNF6My1c7 3Yq096oWEXUgKBQk2/WhO1sEKZRIHPMDmUyM8gErjZi6MyajYyW9wqpqX/7xGzzEwJE/ lX9g== X-Gm-Message-State: AFuF++k8rAPt6SAnQDdb+JyS/YYhWN+LmFnr9mfla3mmVnK6pC0Pi/7g 6YM+JBnu4Irthsno8H8ikDF2ExJ8qO/5JpkxYOXNSPVSLq2MEHmGbWvog3unh9UDLeubXQ4e0Xz MjOILGS7Q9cBFBmYnf1j5Kg8cA4tLNi4eyLuS6MUXMGhzGHY2LynPYGIjke/NZRZ6TA== X-Gm-Gg: AYBFou2CEpnt31sbgxRpbrIFLhAwstL5WD6BQv1Y2tizwbGmyLZ4V9rFLyX5Eg2nwdJ n2l2WHd7x5SrsMrIbDXFt9E7t40mLcMf+dHf90LC8u/xfMCVVJxw/6APDwG4fbww5+S1hv/Vgba idDYMUgOTHX0ZfVsepRHWP4TzmBbrZwNadbuiL0k72HuqlGYmyp4gdzPoMAgDh/DLnKqUKf4OQb G72+DNgP7aa279k8f1Z3Bpjgvm65CAk8ZFV8RJpCYXEH2hIkbQayyDl3VPp6v2jcqAA+BOUfo4s ryR/tjqZhoOmwc+zonmzU6DKduEBrg77IxZmM5+aSDg47/2ySmfAwbPa1+VnkJFYlbANe9jG3PI OCpIt8AFYJbc+qzg15D/vdChH4HkqdST8YzOgcZBV X-Received: by 2002:a05:620a:d8c:b0:92e:ef09:f8f3 with SMTP id af79cd13be357-93960c91ccemr1287826385a.2.1788432058100; Thu, 03 Sep 2026 03:40:58 -0700 (PDT) X-Received: by 2002:a05:620a:d8c:b0:92e:ef09:f8f3 with SMTP id af79cd13be357-93960c91ccemr1287821685a.2.1788432057578; Thu, 03 Sep 2026 03:40:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/51] hw/sd/sdcard: Register device ops in drives without media Date: Thu, 3 Sep 2026 12:38:55 +0200 Message-ID: <20260903103936.62355-12-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: ZX7yiwFUeo83m9sr5GnjDButvU-UKB87 X-Proofpoint-GUID: ZX7yiwFUeo83m9sr5GnjDButvU-UKB87 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX4RJNmFQ586DS tNoG+RPC8hOhcedvrasQc8YYkdBgk8e12XWnLYQHaufMYxolkyrSS7xRMDrO1D8063zOklSlzvZ K6R738cSePt6XXAyLQX50qzZmZ5Q8RaOARsyaKqwmKdSZyv97TSgbeNKNGxncKDFI6VWmha90vf 73BopIkN5+H8bi1cjICKpQIUpLiKvbVADotyOYok6luYW9w+gv3k2Jgbsy5DFBpVY1Hdlqv2Fgh PViGnJV4qcCgkX9H+GjuOrAmXYtdwndh4AAuENZ3oH0bz81VLRDVf3w9H5mfsV/taCSmDO83a8u lRcOQII3zWOjfvZ+L0MsU+Jw9Ghuyinl1hq0YiyBr38S8k+zoJqKBQY0EHE1bPPXRWqfkt5L+/j Uzbp1PKvtOJV94c7LiIHUxvjM13hY2LCtw1xNqVW7AHhTUKo9k0z71g3qJ3rN1VNMUsCIxM+zrQ PXk9X1fBbXB79DWOLUg== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX1Q4sLM31vRCB 0CDUkMXjiF9Lphx0cKkINdPt1eAo+TmTw0/TjaXNE7pW9t9vBI1szzoSX7hQeotir9rGc16bjCz I2jyj/gZbl2cdeerS0PTC7e5Hgkwgjs= X-Authority-Analysis: v=2.4 cv=PKc/P/qC c=1 sm=1 tr=0 ts=6a994eba cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=V2sgnzSHAAAA:8 a=69wJf7TsAAAA:8 a=EUspDBNiAAAA:8 a=WMtZ8JWQ2dOPEG_3IIAA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=Z31ocT7rh6aUJxSkT1EX:22 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 bulkscore=0 clxscore=1015 phishscore=0 suspectscore=0 priorityscore=1501 spamscore=0 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432092619158500 From: Alberto Garcia Commit a362b19a39 ("hw/sd/sdcard: Fix size check for backing block image") accidentally moved the blk_set_dev_ops() call into the new 'if (blk_size >=3D 0)' block in sd_realize(). Because of that, if a drive is attached without a medium then the condition is false (blk_size =3D=3D -ENOMEDIUM) and blk_set_dev_ops() is never called, so the drive is registered as having non-removable media: $QEMU -device sd-card,drive=3Dsdcard0 -drive if=3Dnone,id=3Dsdcard0 (qemu) change sdcard0 sd-card.qcow2 Error: Device 'sdcard0' is not removable This patch moves the blk_set_perm() and blk_set_dev_ops() calls outside of the 'if (blk_size >=3D 0)' block so the device ops and permissions are registered when a drive is attached. Cc: qemu-stable@nongnu.org Fixes: a362b19a39 ("hw/sd/sdcard: Fix size check for backing block image") Signed-off-by: Alberto Garcia Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260723205847.137001-1-berto@igalia.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 674ca09b49f..b1b3b1226a7 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -3100,7 +3100,6 @@ static void sd_blk_size_error(SDState *sd, int64_t bl= k_size, static void sd_realize(DeviceState *dev, Error **errp) { SDState *sd =3D SDMMC_COMMON(dev); - int64_t blk_size =3D -ENOMEDIUM; int ret; =20 switch (sd->spec_version) { @@ -3118,32 +3117,32 @@ static void sd_realize(DeviceState *dev, Error **er= rp) return; } =20 - blk_size =3D blk_getlength(sd->blk); - } - if (blk_size >=3D 0) { - blk_size -=3D sd->boot_part_size * 2 + sd->rpmb_part_size; - if (blk_size > SDSC_MAX_CAPACITY) { - if (sd_is_emmc(sd) && - !QEMU_IS_ALIGNED(blk_size, 1 << HWBLOCK_SHIFT)) { - int64_t blk_size_aligned =3D - ((blk_size >> HWBLOCK_SHIFT) + 1) << HWBLOCK_SHIFT; - sd_blk_size_error(sd, blk_size, blk_size_aligned, - "multiples of 512", errp); + int64_t blk_size =3D blk_getlength(sd->blk); + if (blk_size >=3D 0) { + blk_size -=3D sd->boot_part_size * 2 + sd->rpmb_part_size; + if (blk_size > SDSC_MAX_CAPACITY) { + if (sd_is_emmc(sd) && + !QEMU_IS_ALIGNED(blk_size, 1 << HWBLOCK_SHIFT)) { + int64_t blk_size_aligned =3D + ((blk_size >> HWBLOCK_SHIFT) + 1) << HWBLOCK_SHIFT; + sd_blk_size_error(sd, blk_size, blk_size_aligned, + "multiples of 512", errp); + return; + } else if (!sd_is_emmc(sd) && + !QEMU_IS_ALIGNED(blk_size, 512 * KiB)) { + int64_t blk_size_aligned =3D ((blk_size >> 19) + 1) <<= 19; + sd_blk_size_error(sd, blk_size, blk_size_aligned, + "multiples of 512K", errp); + return; + } + } else if (blk_size > 0 && !is_power_of_2(blk_size)) { + sd_blk_size_error(sd, blk_size, pow2ceil(blk_size), + "a power of 2", errp); return; - } else if (!sd_is_emmc(sd) && - !QEMU_IS_ALIGNED(blk_size, 512 * KiB)) { - int64_t blk_size_aligned =3D ((blk_size >> 19) + 1) << 19; - sd_blk_size_error(sd, blk_size, blk_size_aligned, - "multiples of 512K", errp); + } else if (blk_size < 0) { + error_setg(errp, "eMMC image smaller than boot partitions"= ); return; } - } else if (blk_size > 0 && !is_power_of_2(blk_size)) { - sd_blk_size_error(sd, blk_size, pow2ceil(blk_size), "a power o= f 2", - errp); - return; - } else if (blk_size < 0) { - error_setg(errp, "eMMC image smaller than boot partitions"); - return; } =20 ret =3D blk_set_perm(sd->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_= WRITE, --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432098; cv=none; d=zohomail.com; s=zohoarc; b=kxR/xAd6gR8pLkl1041pw1G3YKtJe3BX3hriBOobQnOSFQymGaLlj5r2sufzCpZ5gx3oTS4KAln1125L70V2GEmfOLx+0TuVvM8GqGfdZ5W6/tYIaJdXIUlmOCJAwPSWmuAuLLQ8pnT96ZIWxgOjos3t7y3WD1fkI90jXF4rjT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432098; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=OwfosKO+kwb+j/x9ZXToNhbIX/BpKhbQ6Dr+/Zkhuxc=; b=Zd8PETiUhEaV2oGMNZ7R9nUmCKdG8WiEaqOjZOK6G1FzoPVEpVLNuUhGEPpo25zl+I0By1IYgzEfM45jw1IYMpJTFHsMgbQy5BH0EpFZj6L+uBcDlOD/2ouONMx48MxaxfPiGA2eD0eHUcY25j+TOV6/6KxL6DadZk3Ad8xSuug= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432098477969.5023321068271; Thu, 3 Sep 2026 03:41:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24sm-0006US-Rt; Thu, 03 Sep 2026 06:41:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sZ-0006EI-9o for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:13 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sW-0006dj-Mj for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:10 -0400 Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHDPx212469 for ; Thu, 3 Sep 2026 10:41:06 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf1pyhfqf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:41:06 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92e5e38fbc5so409033485a.2 for ; Thu, 03 Sep 2026 03:41:06 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cf2abe1basm30389585e9.10.2026.09.03.03.41.03 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:41:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= OwfosKO+kwb+j/x9ZXToNhbIX/BpKhbQ6Dr+/Zkhuxc=; b=THtTySsU2ECjsSws jmZXoMxLkculCz15grjrEDJWUsAxAAoJkW1nfwH3f2rYtW01qdhuNArHjP2t768j kCGhpq31HUcc4mqWBnOD3cSfbu/9V+jgYY49gFl+LPsHtIwdj1YGdYgHSVdHF6tY mbdWoYy9VY4JJ4S848Pc9up6phcR1MeFwJTDOfxP4iGo7zCeChT6vNDbFhKrSRnC Ppr2wZRYZfVX3AchGSyCvCoGSw9K93G7+k/QfVj/yZn8muwudKPjrUfPRKI1frc2 8QEF3IPJOCVDM2BFU6oseA0sj1NcqU8HgpaCkhgctFlaDJMU3hC1GaUiuMSPP0v6 hcgyUg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432066; x=1789036866; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=OwfosKO+kwb+j/x9ZXToNhbIX/BpKhbQ6Dr+/Zkhuxc=; b=XXzdDrleoOG4IpHPephBmGoPyWc5UsTYLKQS7eqw32HV5fD2QNnq1wkWjSfeHep45t Ljv4pWvu+spFRSyjAM5Yf8c8xJJCKeINAEhuF5GrBviNyu2pjfYSpOC5MmkJ4lNAOCo6 ebWiFg4F2Bi/wq/HLFn2MIeFDk1YOORzt0Zzgtnx/MFk1wLJ49AvfiaXFkIqlwtNfOZB j783rVX/Pbh3eqslT3FdXlmUyj0b8DPDPkxOPiAeLYiFsupWoCwMURWzsXsXbcViStL6 QphqUwGQZtuCEsuh6rGK4h0/rXSk1iPmtxYOJw/wdpwpmvkKonm+heVUwH7yy2Myb6fS v1dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432066; x=1789036866; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=OwfosKO+kwb+j/x9ZXToNhbIX/BpKhbQ6Dr+/Zkhuxc=; b=Kg8GcTCSrtjAq2aAtZ9pI0+mcBIMAdwOHvkEWbejbITaEV68XIuUghNdUdl2+0dupj fremWokvaYXbbJ6Hwrswa63/bVWULfujBx2WYx4WTyjq9nQB9dKpycWjRA+qMneIDsTs zGMR62TXm+BYzVz4TdhkXejqJ7wuQlCatH8wNnfkE8oQlwe5iKt5gbIPQC5+6krajH/z f/Sem31FktuPen/GTyadEsVYbY1yemjvYy7t8TBWfOEZ1U2cPcA8DyPqYDQy7l9IutVd 1jOyGa21CbTzJVwHiOdC+0Eu5T9DNT7bubIOEvzZ+3Qtabsvhnj7jOT6pqUtfvkXG5XA 3vOg== X-Gm-Message-State: AFuF++lYOwztedGvQwXfc1Jz8KMDghBGGoiY0gZY0EhxjFQZzGd9OGw9 EpeRadD91Qzlqwfeff6UaOlhJCdPOuGEFPZB33oQSu2BsqG9BTfbUIwiNn56GIkEw5p42PEk4p5 FctzcqRu8gAT1cC1IOAT4ILOxMz9FyAsG9q37FwiOoznIiZYKnOIK0HaU9sxsxyEyAQ== X-Gm-Gg: AYBFou0SUo/4EllxOl/eg2bEXFCmXBJJQR8l/XnzwUK16Eun6OOkBK/nrP6YwzkNBR/ 5RqDnIuixa7K2xRgt0MLRDkbEpuQYiLyf/Dk2CEbWWLvyU95ZyniS93bwJe06OT6VtCo94dbWZU gniVJDDz3PujE/DPwJ0ndSWApE2l7YorMIhMIx1DHIW2v26QWC8xCNRBh/o3TlPgAHqB5R84QT3 7RL7mQ8xMb7BgQNmwvIrHVRAsH//n8hx5BRDxBBgpBozY1L1mpHNM/opSVOnaOo/eVmYJUA7AcL zOtTeOnZ7opEUMv4Cs+jniRdc4I299xViIWPngaP8KeWlhmEfOFyKA82UYzLDxPX20lRsWnKJDJ kySKZN/kIB/QQrwoX2W6T42mnlYBHLLwEev2cMmqt X-Received: by 2002:a05:620a:2881:b0:939:34c6:a333 with SMTP id af79cd13be357-9396100e7e0mr1059369485a.40.1788432065692; Thu, 03 Sep 2026 03:41:05 -0700 (PDT) X-Received: by 2002:a05:620a:2881:b0:939:34c6:a333 with SMTP id af79cd13be357-9396100e7e0mr1059366985a.40.1788432065187; Thu, 03 Sep 2026 03:41:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 12/51] hw/cxl: fix timer leak in cxl_destroy_cci() Date: Thu, 3 Sep 2026 12:38:56 +0200 Message-ID: <20260903103936.62355-13-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX2oo8jLSQBfYp ZEHApDkLOUV+0mKeGAhM3MjK6vRiwLJ8sH+RzoF/SDTibzoAFBmjZ5f3yCGMvrhicjdBra11jhY +kfsiHfqT37t/yV/Fr2HOGNJrX5zUccgRr2SWz864z5LzwTOxlSuyoUZ3hznDPYw3ceOtX1HZGl CjOBnctu45SqCtGotw7bA6zzjKRcqDgbhfv/TRAwXlDmYLabAcNtFhvltdZqDMA9goLoP0MnIO1 rfTnZ6iilyjja1uN9i4Om+srkGtAKuoqHqb2dYih5mQ50720pev8H3fo+Xpgr5PcUqq782xGppH zCsx2HZHuAOwcQXGPnifzK+MnryuSMrvxbZvFue/1erHmmHSmf/nU7BO7NeR210s6beRwQl2AOz evd13ZC/1KDRYsL/fYx7MfwniovK7gzeQjruknNCmPT4TtyY/XjxuH3dkPbW8tIMIVr2aTYZwpw eRlKE/BbgadgtmgC78w== X-Proofpoint-ORIG-GUID: JOzvO1U1sUNPRG91IMTSBBSU4u90cK86 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX2IamfwlRpWOq UeBhHjZOcbshY5zEqw7x2nIYahKaJOdwlKgMYnav3mBqknmzFRwIkrTjT43Pozvx9Q8duIKid99 eonsyHcOnWa43u0v6oo2NXhqi5k7YjA= X-Proofpoint-GUID: JOzvO1U1sUNPRG91IMTSBBSU4u90cK86 X-Authority-Analysis: v=2.4 cv=DMO/JSNb c=1 sm=1 tr=0 ts=6a994ec2 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=QyXUC8HyAAAA:8 a=69wJf7TsAAAA:8 a=EUspDBNiAAAA:8 a=PgTHkcLAMzWx5aaXWEMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 bulkscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 suspectscore=0 adultscore=0 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432098640158500 From: Junjie Cao cxl_init_cci() allocates a QEMUTimer via timer_new_ms() but cxl_destroy_cci() never frees it. This leaks a timer object on every device exit path and, more critically, on every device reset cycle since the secondary CCIs (vdm_fm_owned_ld_mctp_cci, ld0_cci) are destroyed and re-initialized each time ct3d_reset() runs. Tear the CCI down in the reverse of cxl_init_cci()'s setup order: destroy the mutex, then free the timer. timer_free() cancels any pending expiry via timer_del() internally and tolerates a NULL pointer; clear the field afterwards so that a repeated timer_free() on the same CCI is a safe no-op. (The function as a whole is still not idempotent: qemu_mutex_destroy() asserts on an already-destroyed mutex. Callers must not invoke cxl_destroy_cci() twice; the .initialized guard added in the next patch enforces that.) Cc: qemu-stable@nongnu.org Fixes: 98cbac128f1c ("hw/cxl: Support aborting background commands") Signed-off-by: Junjie Cao Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260729144645.1552511-2-junjie.cao@intel.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/cxl/cxl-mailbox-utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index ec18338b423..603677a97bb 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -4795,6 +4795,8 @@ void cxl_init_cci(CXLCCI *cci, size_t payload_max) void cxl_destroy_cci(CXLCCI *cci) { qemu_mutex_destroy(&cci->bg.lock); + timer_free(cci->bg.timer); + cci->bg.timer =3D NULL; cci->initialized =3D false; } =20 --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432093; cv=none; d=zohomail.com; s=zohoarc; b=bmFFgr25ijf3DY145+oUfKW7tQJQqVwr3qkySYodK1JqrAmjsMtJwJvyzH0c1Vuh2T5oT7DEMMUh162ZVCoM4Nt5aIDL2e8AzB/56+sYP/xUNErvaODttH5T/kGTCJjohPMCrR08mFBcMjWLwPA4Ee8/7tahRu9Ke7d5NWmyznA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432093; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=LJzMQEeZwuyLRZ794iT9ittOkktIM5KJ5hP5aA3wxVQ=; b=jQ35PIUWUOzKgXv+XuqSvp38Xpv2tgaVBJg8gEI/Xh3g+RzLb4HFzP6YzfTEiG26eiHKv1+guk1vTJv//SWqNaoX4Z4mS6sjcM44oUkB1KRwCYvJDH8hOVB5v3vQIR9oxm9SdOf0bv6ybJigDOgbq3uKbGbXcMbR4NMj/lRWssg= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432093196840.7311223513658; Thu, 3 Sep 2026 03:41:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24sn-0006cB-HX; Thu, 03 Sep 2026 06:41:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sf-0006PK-4V for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:18 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sc-0006ik-7B for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:15 -0400 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHBDT3782255 for ; Thu, 3 Sep 2026 10:41:13 GMT Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf5pdrfuf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:41:13 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-92ec3146553so614234585a.1 for ; Thu, 03 Sep 2026 03:41:13 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448eea5b4sm13248317f8f.27.2026.09.03.03.41.11 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= LJzMQEeZwuyLRZ794iT9ittOkktIM5KJ5hP5aA3wxVQ=; b=JpLwleicmkC6d7Yv Sj3Hez0tZePZJHshIIxqs3tgls4baRIYxjiSkJnKlLC3pAwoD7oKGoFvEYL/oJ98 tjqYOWjuG4c4TUwSZ0NK41bnpVAbAIPZXN4y15X7/7PgTrhlvXJwANBsX/HwMF6+ dgo10ZL6be3vi0ziMKRLRPGR7yVsil65cBZD4w+V5xf5EBlIU4Dn0X81CCLfgQul Z+q5uO3o5ASZkeqmQpvuysk29Sd7KlRWOVyUo3XtyiLYvBBFaGL5nWoznFMUu0XE qKjhSWvP0gHL4RGLtgUJ5QtDTWcquhWde2hO08fQYk39qMXt5cVuX30+6SWyrrZc 4fXiQg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432073; x=1789036873; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=LJzMQEeZwuyLRZ794iT9ittOkktIM5KJ5hP5aA3wxVQ=; b=UoqX7/R1XBQ/11xeBOLKiZHm0k7eT+89q11hX5kl4gAtBV15rCmUHLUqz8EweNlB0F aztpSXBOS1cxTroaPreD6j8iuPQDD8a9G7owP6EPyb/dqnCnoWLoP/7LI7ufvYJxqspG 9KpJWEnAOUxKhHFCds2kR0CQ59U/NlGeU1a51dOEegi1RGixBFFqoFvx1p1c9Y8+gLvh aAt5mleniWES1KykCLaF4XbJRFx6txX16ABSUpiGCL7UsFenbhEVbDvF6cwUSCayDIXe HRvPHLlpqrp1t/XcueKdEdTjB51b+BRqHxwVN73/Jdu6sfzIquDV4rCN+aBypebCcann aiMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432073; x=1789036873; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=LJzMQEeZwuyLRZ794iT9ittOkktIM5KJ5hP5aA3wxVQ=; b=B7aF5xTp8IHUiURSI6Fn2DWlej3R48tRtHEx2DmWyx6iwytzG9AvfZY+wprm4v15i9 m8Sfd5F4R8ZjleYssImDZQ3TNAhgo4qvlz68jIDHZdR1oUIKtFJ2AZbLCLc+U6OvvzLR ytGidBPZJnR6B3PYDgu6LGKHZSyAvA3ES8mFyR0LXCfh6EOPU4OTm3E+EKUcIeDFSvcl 4DxtsiBRxb8EiRD0Eb4BDhl+/LnSAFUHkk0mkymI8uy1rNTUZkitBQ8bR9mKNxI1hgeU v2/eK5dRqgAJVRYyEZ6Y9NIObBmFwYyA3j4V7xMpIwdq1EarmzrwdZtmAPwOjG5MP8xt y45A== X-Gm-Message-State: AFuF++nD6XAzyLgPnSVzrR2Dck64gU2xY7/CvQbMNpGmCk9WbGB7uVw9 tYlLnnE5OuV3R5qF9MznOD1jbT45q83gVcP4qdv4o1/FPW0aFMA5YoeeFMk22gxTeVEo6skljot qydZYXbIbx5d2M8HQipBeXJOcXATSu3RCb8LjftFhy6lMBlHvXwnypLIUy/2mtpsbgA== X-Gm-Gg: AYBFou0RJpUN9jdSNiY1TmlJQOXuP4kFWIVVImWaeHU8TolRoRnv+fcANzkrz+P0qTj TD2+lsTrCRb1wkMhgh9MmdB6OFin5zopb7d5U2VNpQNVRTgGKqluquiTeb0gfeXWH++n3LZsD+S unXiqOnNersg/94dYYN1mctnqgpIyxR+WnuPmORAmRYJ1/LxGTUUJE2MGRRt4GAizLRkOJ5ZdAq DB8xnt8d66Jl5eUjxpSa6vRmQ2ybZLpG/eot/9sVanPFwtxBvbjZtZUQ+WTGeDhM9zE6pW2vc9D O1nclrhBMTUTZ85Wyjig4twwoAhBfhUGF7foxo171Fcn1Ny+81R/5j+YnizQ/xr08D1Lh+eGkgT QdbqaGSefgdQ0mgMwVyuMhpLcUP9k0AzorgQChcST X-Received: by 2002:a05:620a:172c:b0:936:77d7:55a4 with SMTP id af79cd13be357-93960e5324cmr1234609285a.19.1788432072753; Thu, 03 Sep 2026 03:41:12 -0700 (PDT) X-Received: by 2002:a05:620a:172c:b0:936:77d7:55a4 with SMTP id af79cd13be357-93960e5324cmr1234605685a.19.1788432072234; Thu, 03 Sep 2026 03:41:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 13/51] hw/sd/axiado_sdhci: Add header guard Date: Thu, 3 Sep 2026 12:38:57 +0200 Message-ID: <20260903103936.62355-14-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX+3BKhvXhNwVn T8fZxeul07VwTg5ytad4ZNbA/ZFpNVerVOpTAWhPiVER5RXIIlv8AiesHCl6y8m9inB4yGGv0At TxXBUx9LTFBtM8PhYgRrf+fbsQ0WD8A= X-Proofpoint-ORIG-GUID: wKCADhAoyLmXh-6xBMkknm-VQoupP4n0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXy6bWwPXkN0ak 6DGL+nLBZmBuGzV73pvDSNyH1A2RgOL2ArctCKULqEaZ4dhgcSOA8LIllephQZ/CjyXBWRkHNwT NCZnGBZKeC8tL3dmtJoiEEEiCmLTQ14g3JzvF8VuJqZezLeEAgfcRqtKzybKAUFMdhHMC7ekOIm W0Qrn/gUldAk6HJeE0n+p35v4JcP5oZn431WO+G75mWFw7oNxqtC0b2gKO12eoBVjsrS8WbqPfV d0UEi9fPTOO7WJjJeWW+poTueUCkiDZBABgY9if+MoHLqkss/Nun+ZhsGYa82J9ymwu3SRedTOm vfOm75anLhygNvk6+kRDxfjCaM7LmIUyd3DkCVhomWVWmLNMWH9Kfb6jXRcqNzglNZkodNQ5Zrw azI73BCDpT82+JIqN1C8OBtY47tKnIEXxsJxyEAICM8E72lR8hBv2A+B+adtvCLaCNtoS0HI9fz OZafEtIasu2yTM85IgQ== X-Authority-Analysis: v=2.4 cv=RsL16imK c=1 sm=1 tr=0 ts=6a994ec9 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=440cDlBIAAAA:8 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=1lr7JO5igfqhUGZHbYQA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=d9D1X1bx8dWolqnE4HNT:22 X-Proofpoint-GUID: wKCADhAoyLmXh-6xBMkknm-VQoupP4n0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 priorityscore=1501 suspectscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 malwarescore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432094587158500 From: Kuan-Jui Chiu Add the missing header guards to avoid re-definition errors when this header is included multiple times. Fixes: 8c55a630c5b ("hw/sd: Add Axiado SD host controller with eMMC PHY") Signed-off-by: Kuan-Jui Chiu Reviewed-by: Jack Wang <163wangjack@gmail.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260826074635.2850931-2-kchiu@axiado.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/sd/axiado_sdhci.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/hw/sd/axiado_sdhci.h b/include/hw/sd/axiado_sdhci.h index 85afebad931..ab52eb8185f 100644 --- a/include/hw/sd/axiado_sdhci.h +++ b/include/hw/sd/axiado_sdhci.h @@ -6,6 +6,9 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ =20 +#ifndef AXIADO_SDHCI_H +#define AXIADO_SDHCI_H + #include "hw/sd/sdhci.h" #include "qom/object.h" =20 @@ -19,3 +22,5 @@ typedef struct AxiadoSDHCIState { MemoryRegion emmc_phy; BusState *sd_bus; } AxiadoSDHCIState; + +#endif /* AXIADO_SDHCI_H */ --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432091; cv=none; d=zohomail.com; s=zohoarc; b=V+R8OJ20pQY6IooTulrTRH/xsms04UH/lc+SXv5vL2eQHYMYNIWQIC/RwdwCPswUU920YnM5zcUAX9d88B5NtrfRji3cf5MNX4GM0PXQuDaCfpOaD1Ho4KnuxRonlFAGNKBPSbMI+Gs4erK/Lpq/0M8laf+r7T4JG/QbY2rSInk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432091; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=lMpMDOZz/xhb8buMJRrQzEca60fKY7on9gIqwrt2+FM=; b=en0ErlCr/VWhQbOgRWBLk+47oG7j0Lqpe5dnCpWvOcw5NTQ6KNljfh+Qq7TF5N5q8skSCz7mfJOsR+aJCOhxrjjxAexkh14fjLTz36mRF4DfyyDeXZ3gjipDAnHFBozNIDHEUFVamaYJJVXe4wiWW5GjpEh6ORgYRX2J9PIdRXA= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432091265831.370360803526; Thu, 3 Sep 2026 03:41:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24sp-0006uc-Er; Thu, 03 Sep 2026 06:41:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sm-0006XD-8b for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:24 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sk-0006jP-JU for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:24 -0400 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHB4D3203946 for ; Thu, 3 Sep 2026 10:41:21 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf5d10ha4-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:41:21 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-92ec3146553so614263385a.1 for ; Thu, 03 Sep 2026 03:41:20 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-484492cdbfbsm12872311f8f.33.2026.09.03.03.41.18 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:41:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= lMpMDOZz/xhb8buMJRrQzEca60fKY7on9gIqwrt2+FM=; b=bggAhws6Rat5o87L OsBWXXaKgdLjd7QvLTMX70W7KaKS7S/hBpHEXPqlt2HeJ5oj95pHS2W7ANCtzZnD xzSRSzd5gDnvaveGuWflR5PW1D5Eg/yIDt20qprJK09kQSeBxU7IjDJ81sKd8yiV Ycvq46Zx9TSo60Rn3p8/Ftfc0yuOYKw0Yh5hTgN/IMM9wivMEd9W4u2Dt73BZr85 AQHySFw8V7nzlWhJvaN5yquiEjJ0w0gA2T420mszL1HKcbI/6n82/EoHJ5Fyc1xQ MzMv11QjPe2Oym9swRZp6GKXbSvdkzDBwH3Zi0BBr1RzA3UxpjkP9UEua4zi2fza OwblhQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432080; x=1789036880; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=lMpMDOZz/xhb8buMJRrQzEca60fKY7on9gIqwrt2+FM=; b=e6HfEvlPS+joXIx3Ibqaxfxd7CE05gWx7yMJ0ihj4rQZBQyO1G/nZ8spvuMMnP+uoa jysA2ZnQWBT882s1LiQgai1LlgQ3Xd3NEYtEJO6FIPWWQZpujTwr0W2513hD4aUaUmGD AvrwtY4xPQT3C5ReyQro9gZs6idYiZC9wanpJ+IF2RDzpSnpSI/bdoA+xsOJwsuuzzHV aov29QkIkaEjAr7XfVrQaUWQg6i3EmdkXLMM+0/yWrCJxY3lyMdjmKUCCoeDmc1wpy6R 8JEX6mjoYxbolV1HVZDQPpim7ULalvXNa0pbTdBTSOxSHK94aNT+0SXrvWuC8O7oBuxf 2oCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432080; x=1789036880; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=lMpMDOZz/xhb8buMJRrQzEca60fKY7on9gIqwrt2+FM=; b=hlP8fWwARo3QjsqVZ/HGbTPNMXezRTztTm+5wTEIHgDkEAUNtl/dONSgdQTFdPehMJ ZKJdMcuAJjUTBGA8e4kEp75jlDyjc0/y+/5H5MvAB6vFcF72y/sAS/dY6goWsVrzzAvY hNYCxnv3EWtxPsB5B7y2hDqAq4R8BgKo/Eh4s5hJUNssNiMLcscryFzF7OfQeTXldtpU 5kvivhGBzzz3yw2ecINXqE83jW6Eo84pYAfGWLaJORXRyeMp6ecg0f9YLfE53J8yqt3B Mz7r5JYwHA7GCsY6TGPn4K6WPWJhGiZxAbS6YAB+1AyEDJNzR/KE3r20zkZrCD1NyZL5 hDpA== X-Gm-Message-State: AFuF++kkCg+dTHpo7lXFKqXR5gw/YH4VQhh7Qxru108Gdn+C+vSCdM6q wkBsODT/sZW/KYOKdEpjnOjmShdG1FryUYqW96JHZNlujyer69saoabv/KeGsbNi8F1UYEjLpk7 r/6jd1CKZCGhNU6paq+ESGBnOfaY4xsnI+Kr8UIBkjg7oc94QMNo/wr2agSiSn5cb+w== X-Gm-Gg: AYBFou3ygNn4SfqtrgCRlDm8Vb2OdzrJE3S0h2ZlGHa+zZiIvJGmy/CtghZvYgDlpjN JNQ/WGNgtMQgJr8F4bkBR06AOXXmg+vnzjfuqbaJHOh8p64YdZI6VvgR9yYjpzJ789X+WACg06N ROzTgihhGNiEtQbZtHSCC0NV4r9xWmJRQh9bCJSi270ORjmwsK0QVjEs/BgUVVaSxsKYJgqNEDM mgsMgM8YfHsdAP2KQG477Vhni7/VS95Hjo3N/enUffEPOzGo00tupqjJbz93hijhX/TcHCp+Jol sPHY+Ah7GlGod9JDqUnshnX8DvPuUFvWHBH+NVwIfSFhUy/U77wAYAXpiLylVbBz2sIxgwv7771 AwcOa/5ksSRBXuq+MtCFkmG3EFcXd8KDO5YUZizAh X-Received: by 2002:a05:620a:6e88:10b0:939:5b7c:98a4 with SMTP id af79cd13be357-93960e0525dmr1032221385a.15.1788432080113; Thu, 03 Sep 2026 03:41:20 -0700 (PDT) X-Received: by 2002:a05:620a:6e88:10b0:939:5b7c:98a4 with SMTP id af79cd13be357-93960e0525dmr1032217285a.15.1788432079664; Thu, 03 Sep 2026 03:41:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 14/51] MAINTAINERS: Cover pflash QTest in pflash section Date: Thu, 3 Sep 2026 12:38:58 +0200 Message-ID: <20260903103936.62355-15-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX+TfnZQ9zL5UM 5HOrP+JUdjq91DWclU06go0CsDn5UJ9VMbP8vty6eCDD4yRGZeKk+I3gxWRQIwMAisAuFSvYazg 6IMHancBAlKkBLe7f2+LaWrImuYnfyPtwQu3u2J9zTHZPhsbXb+L8Ebiez9GTeFpQ9t82txHh8z C9fi3nN9FZpn8ynL6aA+aiFiAyBck5fPR7FyB0uGpnuJWUQIVNvSXjO3lGTycsqfKPHeqStxg0z GfaGLr223J0zP5sw3gqS07CedWIRxBlDGAPRMCri+U+cAbWa8vnpbAXemH/yHAb7vIuOfn0qICe Ia4Ubauw4dVYPEQ8wiN41/otFz3p0Ihp1cmXjAT0l9vw7bCumQ5CBdi0PwHO2h8ISFSCA79C3mA UOB/z3eU/0+aGeNEsSlHOV01rsl5sS04gTHu9G3lw75koydNFCJYjA5LYFDuhJjq/bAKtnoADAv 89c3qPD4hACrP2lildQ== X-Proofpoint-ORIG-GUID: 3luRI8iluCpt7ZqbAJ4TTg5ZHZ-2v66F X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX7QdrkUkIE2EM w114lsY7yjoU7Mr0vuzY6zbLDWo+3xx54B+VlG0zOZZYvf48yU7i3jYWa0m7S2l9GGWQlFNPXLM yNoyEw+tZ6hXKW63awmWCx6q4MCIJg0= X-Proofpoint-GUID: 3luRI8iluCpt7ZqbAJ4TTg5ZHZ-2v66F X-Authority-Analysis: v=2.4 cv=J4GaKgnS c=1 sm=1 tr=0 ts=6a994ed1 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=S56xvJB5AAAA:8 a=tqVpZ52y12xuJfn1US0A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=MH9Ivq0PDQRhlrFuIVvX:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432092573158500 Include the pflash-cfi02-test.c test in the "Parallel NOR Flash devices" to be notified when patches modify it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260820142212.27537-1-philmd@oss.qualcomm.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index a898162cea5..e3f91ff1cab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2377,6 +2377,7 @@ M: Philippe Mathieu-Daud=C3=A9 S: Maintained F: hw/block/pflash_cfi*.c F: include/hw/block/flash.h +F: tests/qtest/pflash-cfi02-test.c =20 SCSI M: Paolo Bonzini --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432121; cv=none; d=zohomail.com; s=zohoarc; b=juj3xwQbF0+RuvBF7O5cSqS/e7o5JYD0dM5nv32ym5KCuEL0BUJD3uZ990gia5KL6DZvrk6XBNXHMES2uxPtRliv1wcArrvt0p1JknETCnthbCBfh8hllkoWbCMCJuQh3+fs18N9ELxizAhQzakq2kNzszST6P8lWzIQU3zfwNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432121; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=N0jc/6hIRKAeFm/a8kLXzoMAX33cJ/awb0zvbJDkwIw=; b=DzlU25P71NnCEpAlBB3CI9MtV5ceSyK3vYJNtAkQhsmuX3OSz17VeL7GQiVzXoN0hl+QUIjhEOVVA4BCiIX/ebVaOnB0K+3Bdo2mYOXkURXSbcFEgeA1fFz/e4DIxTbdeDNhrU94MXSk8zDj8aH6kS2T6c9xmJnkcziMYt1wdEY= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17884321213921001.5256059749872; Thu, 3 Sep 2026 03:42:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24su-0007jE-Ke; Thu, 03 Sep 2026 06:41:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24ss-0007Ub-Iy for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:30 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sq-0006k1-Mh for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:30 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHKTZ055412 for ; Thu, 3 Sep 2026 10:41:27 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4genrdvgpp-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:41:27 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-939665a1ae6so414171185a.0 for ; Thu, 03 Sep 2026 03:41:27 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e72b5bsm12773785f8f.4.2026.09.03.03.41.25 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= N0jc/6hIRKAeFm/a8kLXzoMAX33cJ/awb0zvbJDkwIw=; b=dqk/5lKZO/x/8U0k 8gwmCfwSAO8AfO4t9QahcfSj0OIHqu9b4N8cO28TUthMYr38rGw0K1Zk7Vmw4L1z tnVjzd0qn5xWbvv6coroofOY2Y8dsDBXvJn3hofAQEcXhj0ghUl7E2WvI5HXrTCW kaBMu5jZVFwpFdjKn95iVsYqAfqwYUrrk5ek5xEGHEFaCiK03SbJoGg6MrJ8dwsu /g4NsK4GvprnndD99ER22ykuL32ZO5fSlquG3npzvRtMXGNBsa7l8Yn774AENLAS +0Jpy+441FJcGnP1PZADNIb3VW8/5itxB2/FN54GQdW9eg8fVUobVj82tpEa7RPt XcldqA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432087; x=1789036887; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=N0jc/6hIRKAeFm/a8kLXzoMAX33cJ/awb0zvbJDkwIw=; b=cYHPRgF5OhGgJ2yyDoiCOXK0w3WpOx69DIvo5hEff9ZBLdjsDiS4ovegU0ma+Zl85P zPQuP2zchEXo0bGsX5g6HnWypEcGeA/bhecZDM3QNXgOYkMgeSBRdzcZJsxMY4tv9Pby YH1h3sp2y/6C6nHVf32XK+GD6BZ+ZA12+ExiDMhRwhtPp1PxP9BmGzDWDbgx1dFjDICy rrWAuSiqourbXFOdnQimgFNTDDIyNnIH2XGaLtxl03EVGjM7ezLX04Tf3tqFoSa/LmHD yGeb1jVioZEOSspoiRSrhJ4OiVuhI3BdvT3/W2emWlqveEgl2Vu1WXFGYCPqedIS2GHe RmQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432087; x=1789036887; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=N0jc/6hIRKAeFm/a8kLXzoMAX33cJ/awb0zvbJDkwIw=; b=samXExgw4IaiSBd1LBcEUxqf3WMWqKrUPnHXhznuNQ/U2CCmD561gPsmhE/1uRSRMY ApQ6zLQtkxkSoqihI1ZGndzD2e6zJ5u69t1gbyoQ+yQ3+aTSh0oMW0YaqhQcOWJUroAE ubQ/ijCPJ8fC6TaEFhk2ZAzqW9vt7buGpcimDaaPI4r37pwkSsu46E9YzN/GiQnvRL7z Tx7IO+vIpPplIaxEpQF1r8YKOBpw9/DTa6bGNc+IDDdOGP7CKPUvu9L+kZ4+bhRtXFK3 LEA6BqHiL73LhjZzdNZI3uL7G0MGXZB/FyWRNl2VGYTCWzxkIY5wKpN0GsrKOuxnZ8fM gqtw== X-Gm-Message-State: AFuF++movN6eyeq5uJk8xmGJdhznQDSRANv8FGbPjYzMj1levgdTgilF 1CHFNGlrOmH0Y4vks/WW+rqYjP06FceXIHtmLpYcDKhGw8D4IxEd2c3SdACKYCehsIIJ6ypXsYi SLlZttPDgRJmb0ez96dyZxwipKUz5PLjMGZ2yLc754kqvqmAnvM44J/rPd1G93fT2NA== X-Gm-Gg: AYBFou02FSl9kolkcdJ5ff22F+e/SYMHjDpZFPO4nBB+NQfY61P8ZJ+Jq2oE0lURGC/ 4qN5R4QiRZUemAKfrJNI8rmIGYh3iB5zSujDJRQDIeDgrBWYLiwOJBQnPV3XiqdBPeXjnr+KiF/ MWjTttvVi81Ql/xYMxCO30JpFmYQQKjpeaNJk5ZZTqa/DScg4EYAuRL3NoWjd7rlgF+dEA0DL0Q j4h53QVDeYaP76+6dzOgK+7m3SdZWPDV2arMMbDinUJSXkQETVb9mHbDIQeOlbmC6qtU6HPkZ5Y 7Km+JhCwYjMqKNYqwQVE0zQ3HIg+48VjR/+imIlkAhejaxqVaeF1gHy3SpW9EqAgA90ardMkhql p1guupvPmq5Aq6vRF51/X58fSuajBKNhAFM2YRum2 X-Received: by 2002:a05:620a:3d16:b0:937:7836:14ff with SMTP id af79cd13be357-93960f780c9mr925640585a.33.1788432086845; Thu, 03 Sep 2026 03:41:26 -0700 (PDT) X-Received: by 2002:a05:620a:3d16:b0:937:7836:14ff with SMTP id af79cd13be357-93960f780c9mr925636585a.33.1788432086338; Thu, 03 Sep 2026 03:41:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 15/51] hw/block/pflash_cfi01: Always set romd mode when clearing wcycle and cmd Date: Thu, 3 Sep 2026 12:38:59 +0200 Message-ID: <20260903103936.62355-16-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=H4/rBeYi c=1 sm=1 tr=0 ts=6a994ed7 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=fur-dfHGhdaOEbT7ATMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: Jc8KTyQ8RSTBLLbKghPuRm6Kr0uKo7A_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX08TpUnTDThc3 9TEtnHbbpKvnLusETA/UCdKmWnZrnP27w26XSf+FI1KHegbX+u51nM4s2agbwiWPhFlATsNIYPn 3IxB1fgg01AcYOQE9HgC6ecoa/yezuZWvQ6v1xveKlNJIB3YXF5xZNS6NvluMdUVKFFfIBzaypu YLi41yCFOw7mrSktriOzy+MFC2RTv+xLw2fC9nBWHetwj2FcX6YqaBwOnTZnaKrdZ9E+ARusOQU 6vtQAuCT6HOkHhaE3drfW4rr6eoEsTFtq+RIkW166fUqwH26TUNJS6WRK7jXHvdL7LGCVxqsy25 Q5AXLGEFU0N6mSsxL9gX3454pS4IY6GKwLkVJxnufAddtlV4NTxuXVJYbDTilzaed4dbziOIzsT dILwltBLkhIxTswEnJ3sVGzxbIuWuZq+zY0MB20wx957ntXFHvrvc6uJA7xoF6eu0LaWz9uldCQ 5SxkXzRz34jKhoq46cw== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXxLYh8xCCfiVi ms/qxjqzDOjSN0mYckF6WNfcLMN2ho1hQIf/m/QdkJA1wdAFXQnNd1nAIB4Nc+Wk4mHA9ar/09e DgRZZr5YB708i3oF+ytmKHAiga4ZXGk= X-Proofpoint-ORIG-GUID: Jc8KTyQ8RSTBLLbKghPuRm6Kr0uKo7A_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 malwarescore=0 spamscore=0 phishscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432122744158500 From: Peter Maydell The pflash_cfi01 code has an invariant that the MemoryRegion is in ROMD mode if and only if wcycle =3D=3D 0 && cmd =3D=3D 0. We rely on this for setting ROMD mode on an inbound migration. There is one corner case where the code clears wcycle and cmd without also setting ROMD mode on the MR: in the "should never happen" code path in pflash_read(). As the comment notes, that code really is unreachable (unless an inbound migration feeds us a bogus pfl->cmd value), so this isn't a problem in practice. But it does make the code a little trickier to analyse. Pull out a function which does the "clear wcycle and cmd and set mode to ROMD", and use it in the three places that need to do this. This makes it clearer that we are preserving our invariant, and tidies up the loose end noted in the commit message of 60d010f66f2ad7 ("hw/block/pflash_cfi01: Restore ROMD mode after migration"). Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260818115742.2268257-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/pflash_cfi01.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index a13b91967ed..486fc6350d8 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -243,6 +243,18 @@ static uint32_t pflash_devid_query(PFlashCFI01 *pfl, h= waddr offset) return resp; } =20 +static void pflash_set_to_read_array_mode(PFlashCFI01 *pfl) +{ + /* + * Reset the flash device to its "just read the data" mode. + * The command 0x00 is not assigned by the CFI open standard, + * but QEMU historically uses it for the READ_ARRAY command (0xff). + */ + pfl->wcycle =3D 0; + pfl->cmd =3D 0x00; + memory_region_rom_device_set_romd(&pfl->mem, true); +} + static uint32_t pflash_data_read(PFlashCFI01 *pfl, hwaddr offset, int width, int be) { @@ -270,12 +282,7 @@ static uint32_t pflash_read(PFlashCFI01 *pfl, hwaddr o= ffset, default: /* This should never happen : reset state & treat it as a read */ trace_pflash_read_unknown_state(pfl->name, pfl->cmd); - pfl->wcycle =3D 0; - /* - * The command 0x00 is not assigned by the CFI open standard, - * but QEMU historically uses it for the READ_ARRAY command (0xff). - */ - pfl->cmd =3D 0x00; + pflash_set_to_read_array_mode(pfl); /* fall through to read code */ case 0x00: /* This model reset value for READ_ARRAY (not CFI compliant= ) */ /* Flash area read */ @@ -652,9 +659,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offse= t, =20 mode_read_array: trace_pflash_mode_read_array(pfl->name); - memory_region_rom_device_set_romd(&pfl->mem, true); - pfl->wcycle =3D 0; - pfl->cmd =3D 0x00; /* This model reset value for READ_ARRAY (not CFI) = */ + pflash_set_to_read_array_mode(pfl); } =20 =20 @@ -873,13 +878,7 @@ static void pflash_cfi01_system_reset(DeviceState *dev) PFlashCFI01 *pfl =3D PFLASH_CFI01(dev); =20 trace_pflash_reset(pfl->name); - /* - * The command 0x00 is not assigned by the CFI open standard, - * but QEMU historically uses it for the READ_ARRAY command (0xff). - */ - pfl->cmd =3D 0x00; - pfl->wcycle =3D 0; - memory_region_rom_device_set_romd(&pfl->mem, true); + pflash_set_to_read_array_mode(pfl); /* * The WSM ready timer occurs at most 150ns after system reset. * This model deliberately ignores this delay. --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432109; cv=none; d=zohomail.com; s=zohoarc; b=TF+0HC1CYH+pWGVBUO8SUo9B/2vSq3lnwOT1Ra1jfhPNPg32HwI2qf0cbfemEjPZQFcUrt+wWcCRVwqCb0w3L0IaB1iLuqjL+bygCMVAIkKbNa61YSdoacGPV1QdSgkPQCtfosG1tRxFY9IeGYrxSrnxh79IHSh6+yXt4iB7by0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432109; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=kEBWd/ayFsof74WCIOTxV6+HUGj/T0gNOXc2AnKzipc=; b=log5gT70dbQEyoTfVieg8z3NIluZLBk1SgacQKR8InkKKTDgEzVLk51hggZlbT6G61h4na74pJwmXYldT22lGN7snSBs687q5gCq7AQCSg5XqPieEl7Uh9ZdX4SBLv8RdUjZMC5tTNR8qG9459lGGv0Yu57EeiRf+QBRZDSnrQw= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432109391200.70445435011834; Thu, 3 Sep 2026 03:41:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24t4-0000Op-19; Thu, 03 Sep 2026 06:41:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24t2-00008M-2h for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:40 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24sz-0006ke-Rk for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:39 -0400 Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AH3ZB3720177 for ; Thu, 3 Sep 2026 10:41:36 GMT Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf0gjsqdc-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:41:36 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-9396e0515dcso58713885a.1 for ; Thu, 03 Sep 2026 03:41:36 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ce4761dd1sm83639875e9.0.2026.09.03.03.41.32 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= kEBWd/ayFsof74WCIOTxV6+HUGj/T0gNOXc2AnKzipc=; b=LQXDQSmmCQijiMoC Hdx1SHi0zPIuR+CGERoeXii0J1tO97dbhscCndt99xokogUKVY18+gWwuF+Iq6Fp zqBpqcgYETD5l3BdeP6+pUaKxE0/I/Lrv3idTjA0c+YVCNvWU98wtyPCqSDO036d 4WDYXaRQf/4JqXcgsr0uzuJffyfsyGv2zPr9FvrQAYyfzKP6oWaeIzmFZEKPF3ab w3+fZoMVx4tN41U9lhU8cPva/RQYjdy8B2Wj+v1W44CXj3av9b7K2TteU+W72gmC WI/pcXe960jg7vwFRArK49PoPhB7Ntx5qGjbsG9MMMyMo6KSqh7QdJTgNB9UbZ8q h3VD9A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432095; x=1789036895; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kEBWd/ayFsof74WCIOTxV6+HUGj/T0gNOXc2AnKzipc=; b=aJvbsz/jmrN2VTXgcUtZkEd+lcvjdh4b8UTJVpnsi6sp3ZmdgAA0kLGs3Ij6bwRwQJ 1gbBaccboBNfg3Sz/ioTOCvVGVS6H/0zKH4JU1qurHGuTrjErbw9PnMBEJxiJDSRacYH cmcb9uWTPC/FVIAI4SRpbMgKgxxvC9NEQZolhOA1fMnhRhAAyO+qW93rUiEDvoVZoZZ9 Ps7f7Mv7zqxNYAmZ6zqR8JrsW0skBbHAoasxqBtBRgUJw/Rx1opQ+4Cokw/1YveLMfdq zmYF8CXQuMswjuXX1VLieXqjqlH6uSgKYYHVwmn1+o7zuOfEhxFx33l8VXi7Nb/OEmIU TSvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432095; x=1789036895; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=kEBWd/ayFsof74WCIOTxV6+HUGj/T0gNOXc2AnKzipc=; b=Ev7JtQ9XcAP7Qd4nXcblez8nARBxQYlw8xZxXqRghCWkXEYhZMEcTVhasINkovx7AX vOdQUGJUZ2GfYDvnViF6SSUQXVTi1VaPvscqCDUiki+fhJjKSaI1+NDFOPMw4fjWgrEu i+/wPBMTv5JCdxx5214wcQy+Tpt5pQIEr+3pOV6Q9CzPWDHArFF116joSlKDxhMcRaca z5/H+BE9+28MkragyJ4b3HuUK2z6t2y9OIze34h9QGkdQ0Mi2xbbp+z4slwDxBr4cyJs C8T3kLhLqdpM/Ck15Zd3/6rGSuZQHBqkGrXqI1v2R8g2sGmGYrDMcIq0R8+YwB0WN7xQ rWdw== X-Gm-Message-State: AFuF++mTbFkOi45MD8bcHxX+Fw3YQeLXLOu0zB4A0A+GD+o5MdHD0GvV tV7i5AJYJfKj3l7X/boHS6dtjb7RJQm19uOn2coMAJPnBiyy1Jm4uMdjFkbJB/Zuwfz5bpWRtt3 474V3wwU5kTajAc3QMpHNIhxYp+Zj3sSSj/79+cdoHjHi5pACL7Stm/eTFrQuyY+OFA== X-Gm-Gg: AYBFou2Bt85QjdwTITqpwIElXa+N6Aej8CE6vXilfTxrCd5Hi+VlUxuxWxw806cSMwa dV9bZ5bMqUrxZt2sjlN0utb9aAgLwi02qdu8uOio/2qXvBqDB0RtAHrGcA0LLHEltJp/miXRHV8 gfYQUTjaRD8CsA3n98+zEQdww6F/owcNaLdz/C0G1k0CZ+94pHWRv5GmLgWzdPlJSFGBXFSXOgE 7GBhggBTfOfxz4m05GHuFtXMigEuLvyOEJIHrNqGhLxVWSnlxrCH3qAesziA+xNG0vyuNFmY2Q3 nOL7dxjM4Oadm+bvMynakYwXGuBVXRy/crH1g2dFrRtRkEjsS4/MAENgS83cTOlOaAHE2k5YsBj 9jNtCwqKwY7GvsVgCKc9KPviKJWnfO4KRLRrX+12o X-Received: by 2002:a05:620a:7112:b0:939:4890:98f6 with SMTP id af79cd13be357-93960f18106mr1328575985a.22.1788432095334; Thu, 03 Sep 2026 03:41:35 -0700 (PDT) X-Received: by 2002:a05:620a:7112:b0:939:4890:98f6 with SMTP id af79cd13be357-93960f18106mr1328571885a.22.1788432094802; Thu, 03 Sep 2026 03:41:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 16/51] hw/block/pflash_cfi02: Add migration support Date: Thu, 3 Sep 2026 12:39:00 +0200 Message-ID: <20260903103936.62355-17-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXwHFk1w+A/k1s rIobJ1Ju23lJPdCQt2Z7VeIJf3/FxhRBnSPbDqSUasKg0snkPSJcGIgNT7elGpfVF3nAAeEAJN4 8BCEodK0IcsHD8annKzlUL8Qvk7SnFEdVIeD77yTfvP5Dedh0ies57XSiLCn/ZAI5f7Vjv8m4F7 YEgcYBDRMdTSkj45KKptgUD5++/T8aEOzDEDnApAoQICVnxBkLE3wxl82v+zI+Yv2uSaeRjM8Q3 RkKmUW3WkRfmbtLK66iNDIYZHDnNNV0ziCfPb8FCqe6hEGiQrv8fLiygXWqHkkjUhJwwezPu96F zAiZLtqaFC3QtDXct3fAc/PNa5EAM7LvepdLQeNAD66jgNQnyW7poFL0VlUgjQA1wjZBISM+qgL cGr4q64jk482nL32GJqcrccONHEPWA74QwtqIWXpHps1aOsV/xoqOvWidEseAME7QM2ZYLwpnR8 0fGe1k8LlIggK6kb8ZQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX4pRrwO8vz0/f COgY1Y3I+hAgeYFBWt1lC3L+gQdyCKO1LN/Exy8qDXD2Ekijw8FNXfZO4RApYWgftIGM7pfHZKO 5RJ5srEsW40kJHnGLiBa5nPyTAZMHfQ= X-Proofpoint-GUID: BbxemrYbooOHry_RNLG6jpf41CPQtNq_ X-Proofpoint-ORIG-GUID: BbxemrYbooOHry_RNLG6jpf41CPQtNq_ X-Authority-Analysis: v=2.4 cv=LZ4MLDfi c=1 sm=1 tr=0 ts=6a994ee0 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=p0WdMEafAAAA:8 a=pGLkceISAAAA:8 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=S0GvZrwMS1Fw2x4e3gIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 bulkscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432110736158500 From: Om Barkare Device did not have migration support, which would result in its internal state being lost during migration or saves. Add VMStateDescription to serialize state and set memory regions romd_mode to rom_mode field in post load hook total_sectors was changed from uint32_t to int32_t to satisfy the VMSTATE_BITMAP macro's _field_size argument, but that is OK because it's a value is calculated using the size of the flash and it will never be large enough to overflow int32_t The only boards using pflash_cfi02 are the sh4 r2d and the arm canon-a1100, musicpal and xilinx-zynq-a9 Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4157 Suggested-by: Peter Maydell Signed-off-by: Om Barkare Reviewed-by: Peter Maydell Message-ID: <20260827193942.69406-1-ombarkare123@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/pflash_cfi02.c | 52 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 6f952fe7de0..4f72c438c0c 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -46,6 +46,7 @@ #include "qemu/module.h" #include "hw/core/sysbus.h" #include "migration/vmstate.h" +#include "system/runstate.h" #include "trace.h" =20 #define PFLASH_LAZY_ROMD_THRESHOLD 42 @@ -71,7 +72,7 @@ struct PFlashCFI02 { BlockBackend *blk; uint32_t uniform_nb_blocs; uint32_t uniform_sector_len; - uint32_t total_sectors; + int32_t total_sectors; uint32_t nb_blocs[PFLASH_MAX_ERASE_REGIONS]; uint32_t sector_len[PFLASH_MAX_ERASE_REGIONS]; uint32_t chip_len; @@ -107,6 +108,29 @@ struct PFlashCFI02 { unsigned long *sector_erase_map; char *name; void *storage; + VMChangeStateEntry *vmstate; +}; + +static int pflash_post_load(void *opaque, int version_id); + +static const VMStateDescription vmstate_pflash =3D { + .name =3D "pflash_cfi02", + .version_id =3D 1, + .minimum_version_id =3D 1, + .post_load =3D pflash_post_load, + .fields =3D (const VMStateField[]) { + VMSTATE_INT32(wcycle, PFlashCFI02), + VMSTATE_INT32(bypass, PFlashCFI02), + VMSTATE_UINT8(cmd, PFlashCFI02), + VMSTATE_UINT8(status, PFlashCFI02), + VMSTATE_TIMER(timer, PFlashCFI02), + VMSTATE_BOOL(rom_mode, PFlashCFI02), + VMSTATE_INT32(read_counter, PFlashCFI02), + VMSTATE_INT32(sectors_to_erase, PFlashCFI02), + VMSTATE_UINT64(erase_time_remaining, PFlashCFI02), + VMSTATE_BITMAP(sector_erase_map, PFlashCFI02, 1, total_sectors), + VMSTATE_END_OF_LIST() + } }; =20 /* @@ -976,6 +1000,7 @@ static void pflash_cfi02_class_init(ObjectClass *klass= , const void *data) device_class_set_legacy_reset(dc, pflash_cfi02_reset); dc->unrealize =3D pflash_cfi02_unrealize; device_class_set_props(dc, pflash_cfi02_properties); + dc->vmsd =3D &vmstate_pflash; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } =20 @@ -1028,3 +1053,28 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base, sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); return PFLASH_CFI02(dev); } + +static void postload_update_cb(void *opaque, bool running, RunState state) +{ + PFlashCFI02 *pfl =3D opaque; + + /* This is called after bdrv_activate_all. */ + qemu_del_vm_change_state_handler(pfl->vmstate); + pfl->vmstate =3D NULL; + + trace_pflash_postload_cb(pfl->name); + pflash_update(pfl, 0, pfl->chip_len); +} + +static int pflash_post_load(void *opaque, int version_id) +{ + PFlashCFI02 *pfl =3D opaque; + + if (!pfl->ro) { + pfl->vmstate =3D qemu_add_vm_change_state_handler(postload_update_= cb, pfl); + } + + memory_region_rom_device_set_romd(&pfl->orig_mem, pfl->rom_mode); + + return 0; +} --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432527; cv=none; d=zohomail.com; s=zohoarc; b=cjI3mKNhiFShoLHiCmVuqAZDv3LwI9OP8w3WtZHnGitzbM6Usp4XxLMQ/HZz1qneuh2TiSwPypfkE1ApVfdXbfYlhNOYhQ6/rqWjUKAjuuVfAXLIn4ypJm46FyluSsGzbgAN1qvBGXU+pYYkQK/N67aZK0fzAejM2kAaAWf+AvQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432527; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=2QmxAHslsMVVO7vZIIhDNu6DarVmqq7mCxKoaRSZYL8=; b=XyMd+hwXvpVwH/S7z8wW0ZT/FPBrLgkPEhhIx00wv6XUj4MdRCzseBHalrSR94AXLZnsEUBhdmxB3bY7oe9p/ERwng5+irRB2RLrHDEJLk6xDZPzpUUzU6JoXZKgQs0X3gT92DeBZCO4wMCnLabZJl1nNtVbqr+uxNknvYDsyOc= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432527287144.60740111670668; Thu, 3 Sep 2026 03:48:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24zo-0006SO-8Q; Thu, 03 Sep 2026 06:48:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24zn-0006SC-Cg for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:48:39 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24zl-0007vb-5t for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:48:38 -0400 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHCtB3204013 for ; Thu, 3 Sep 2026 10:48:35 GMT Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf5d10j1y-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:48:35 +0000 (GMT) Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-4b28deb7ee3so2221354b6e.0 for ; Thu, 03 Sep 2026 03:48:35 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448eeabbfsm12264807f8f.31.2026.09.03.03.41.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:41:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 2QmxAHslsMVVO7vZIIhDNu6DarVmqq7mCxKoaRSZYL8=; b=V5VzdrrvGGHZbvlx VCIwmgBwRgHJwMAMby7RwWxVRaH6kesaLE42vBbsIlGd8T332f1TUimUaUyKTG5j FNRkkY2LfJVUS09wcoxir5+u54SPFKN+8LNqe3T/BhQHUVD7vgu9D9EahZpBR4BX 9BMOVmpEd7wDL+76Qu3nVxfyNS69BhlhBXBAi/aVAlS6NbnMq6H85WfQGtq5m0ND H5R4Tie83X8Bh1hjjwMSwJe02Dr7qIq6FuFqmvFXvxx40X0IUiJ2z75w1uCeOeMr 6YL04esDmU3CwsplZvuSSneCAQiYJO90yEMuommxE46na6+U9brAKAwzuzzb8LXr Zsd0Wg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432515; x=1789037315; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=2QmxAHslsMVVO7vZIIhDNu6DarVmqq7mCxKoaRSZYL8=; b=UTAedju9IiKgGfqVptWpZZiBs0p4AxIGlAAqxrnD5NDtuwNdzUNZ/H1zX4mS13YB8e KHI41zNlzKw1fhE+8q1W3cQVubX6swOvDRVpMCd8Bs3+N6VnmYVIxvdoc0mc/SsInwi9 ax/RNq63HQpyV9nRJKgbv9AUpaqMzaqMEsS8LQ86SMH5/2JG9l2pL0YflMuulWyMhys7 8ztR4txzm136cWETyOnlSvYkjSXkgNvCpyupWOaGhC1Az2zO/Uryc2MdvJlWYdIEIlhD 7HYgv4b43ynVLJxSHpk8FH16sDS88H0aSXlgL07Ho6wejtKsnd8mRm9b28bHM88w9PZe cijg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432515; x=1789037315; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=2QmxAHslsMVVO7vZIIhDNu6DarVmqq7mCxKoaRSZYL8=; b=QNoro6rgop7UJjmRlNlTIy8KRPLubSQOYq3aLDa5L6v//tOTQ0gy3CMHO8DmApTZSr 4QMQveyZrMOquxs2LJPkP33HIvZzmSDeFvAEFhc/TntEp47dGYkxAzbcwayyBDgZ51jw IK2iNsXT/YyMufxMCAN6wfLnRqDOpGtFddXtVg5m8sYn7ekrXyZU/wbS6owJvNqEZRRj hE4H8y/t2zuO4YSKKoOPIZXoYWDAeEyaCTC+B4BUP22t+k3/5OE+TVDpMOMm6YJxtE25 hGOX+DQwcQeqL3NxfZPoXAgqibuTsCX76HYfQbSO6wN54jF+Sch3gTEAayYYNHKO4y3O iIXA== X-Gm-Message-State: AFuF++nPXJq4Xc9B7LnjBr88S56vkmUEHifgMAm5Q9KoYEXEIAR0bzjk ytEXtJpwiz9jY0q0P1xy+ZLdvoEcGTGetDJkxPPTIEZjBFsKrreIfYZDszc7npWrIF4ZP3YD51T p29LYvIY3hw0LvtKjbGotNIwjf0rer9qvsvIw7hvfSGDRnCTwayCw19r46gu7VburBQ== X-Gm-Gg: AYBFou0YNQPQI7Q45thaG+4wck50ZOye1i+ddkYQKuapnvuPohiOWLzsQdd0pfhtTvG K1OW+BxJgt92Ki4l2guyDg2toi7EVZJAwLbDdoUM1IIcdxWs/CfaN8fLmQyfhSJvCw6uA1fB/Ef IO3BxzxCBKZhJLosSrDSqaU7rx8M//D8HRzZQoIG0XHjOqNvM8Yp7FFjOhtxDI//boH2Ua6ACvR w+1R33wsPcqXOi8cNXqFjZq0vgdWzenIwTjfRvMyGZZ9GqGiS00yFPxuXiwBbZUwyyOdi5Z/JaC ALBCAy1iICd8CfXYR8lD8s3kSDXULAXxCrsFqEIvic4HoI85CW6Mi+GpHj1UdHOvSwcbJjFySvh xW7IHLcfcbpZq817UqJ+WZLi+axQN10a57nX8i5lX X-Received: by 2002:a05:6820:1789:b0:6b1:b23c:2142 with SMTP id 006d021491bc7-6b47bcc15a6mr10105209eaf.1.1788432514621; Thu, 03 Sep 2026 03:48:34 -0700 (PDT) X-Received: by 2002:a05:620a:f0c:b0:939:6dec:55e7 with SMTP id af79cd13be357-9396dec71a6mr574645085a.48.1788432102472; Thu, 03 Sep 2026 03:41:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 17/51] accel/tcg: Rename for exception codes named @ret as @excp Date: Thu, 3 Sep 2026 12:39:01 +0200 Message-ID: <20260903103936.62355-18-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MyBTYWx0ZWRfXyWIJSGOFGjsC wwc5JW7FKyJtuOmBWKLfnXCzZpqHlatYIiZkMi12E5RTp/Wy1VcQ1Bc3GCw+3NuWoVW07EeDV5Z BjHTJ/EPKlB9jRS75xucngG/5W5mkjqS8ovN3JmactzXAR6DPlMuiFKXr4fhXi4msYyBOEwiNC6 VgOeefb7gp+PGviecQXjBj6crbP7CMkco6j1SHlH68uiPEWr17UThVeXhNsVYn0FoI43NZm1tt2 KbwAkUV5ohn1HuI+HF5BKfIoJGx2zJSB4X0SGOG0C3EtPHJ4qVsSlt9pL9ReB7VFIsyJEN48/ow goJ2N9INBX/BoqHXu/Ksqrnl266lWbN74pO5weSPd+2fZKtjnkH7BpNWYN33KMU/sk4ygKfZgSM VHZFUST3xHOG23cG+nxpBrSxt3+m3zqGWX1/ekViQSl9I/2+RwbxdUlLd7cHxYagkXpEbG+2YUe WYhCmROwEKpB660I2bQ== X-Proofpoint-ORIG-GUID: vGKIxq-KyR0KjMnJ3z__9k9qywwAUjVS X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MyBTYWx0ZWRfX9Z1eGYhAO6yQ Se4XwHZLhEuBaiFeKFG0X3+OAc3djmMaZF0qH36i7h9WTI/6RfReMrazz2e5eppGq3782V1KGVq cc0/93hY5nlRVrQB7ByxT+kj7RA06Mo= X-Proofpoint-GUID: vGKIxq-KyR0KjMnJ3z__9k9qywwAUjVS X-Authority-Analysis: v=2.4 cv=J4GaKgnS c=1 sm=1 tr=0 ts=6a995083 cx=c_pps a=yymyAM/LQ7lj/HqAiIiKTw==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=_j5oqwj-hJjEN08MGkoA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=O8hF6Hzn-FEA:10 a=efpaJB4zofY2dbm2aIRb:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030093 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432528198158500 Rename meaningless @ret or @r variables as @excp to directly denote the value is an exception. No logical changes, purely cosmetic/clarity improvement. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260819145649.23439-2-philmd@oss.qualcomm.com> --- accel/tcg/cpu-exec.c | 24 ++++++++++++------------ accel/tcg/tcg-accel-ops-mttcg.c | 7 ++++--- accel/tcg/tcg-accel-ops-rr.c | 8 ++++---- accel/tcg/tcg-accel-ops.c | 7 ++++--- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 257211235db..53d90c400d5 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -687,7 +687,7 @@ static inline void cpu_handle_debug_exception(CPUState = *cpu) } } =20 -static inline bool cpu_handle_exception(CPUState *cpu, int *ret) +static inline bool cpu_handle_exception(CPUState *cpu, int *excp) { if (cpu->exception_index < 0) { #ifndef CONFIG_USER_ONLY @@ -703,8 +703,8 @@ static inline bool cpu_handle_exception(CPUState *cpu, = int *ret) =20 if (cpu->exception_index >=3D EXCP_INTERRUPT) { /* exit request from the cpu execution loop */ - *ret =3D cpu->exception_index; - if (*ret =3D=3D EXCP_DEBUG) { + *excp =3D cpu->exception_index; + if (*excp =3D=3D EXCP_DEBUG) { cpu_handle_debug_exception(cpu); } cpu->exception_index =3D -1; @@ -720,7 +720,7 @@ static inline bool cpu_handle_exception(CPUState *cpu, = int *ret) if (tcg_ops->fake_user_interrupt) { tcg_ops->fake_user_interrupt(cpu); } - *ret =3D cpu->exception_index; + *excp =3D cpu->exception_index; cpu->exception_index =3D -1; return true; #else @@ -738,13 +738,13 @@ static inline bool cpu_handle_exception(CPUState *cpu= , int *ret) * raised when single-stepping so that GDB doesn't miss the * next instruction. */ - *ret =3D EXCP_DEBUG; + *excp =3D EXCP_DEBUG; cpu_handle_debug_exception(cpu); return true; } } else if (!replay_has_interrupt()) { /* give a chance to iothread in replay mode */ - *ret =3D EXCP_INTERRUPT; + *excp =3D EXCP_INTERRUPT; return true; } #endif @@ -935,10 +935,10 @@ static inline void cpu_loop_exec_tb(CPUState *cpu, Tr= anslationBlock *tb, static int __attribute__((noinline)) cpu_exec_loop(CPUState *cpu, SyncClocks *sc) { - int ret; + int excp; =20 /* if an exception is pending, we execute it here */ - while (!cpu_handle_exception(cpu, &ret)) { + while (!cpu_handle_exception(cpu, &excp)) { TranslationBlock *last_tb =3D NULL; int tb_exit =3D 0; =20 @@ -1006,7 +1006,7 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc) align_clocks(sc, cpu); } } - return ret; + return excp; } =20 static int cpu_exec_setjmp(CPUState *cpu, SyncClocks *sc) @@ -1021,7 +1021,7 @@ static int cpu_exec_setjmp(CPUState *cpu, SyncClocks = *sc) =20 int cpu_exec(CPUState *cpu) { - int ret; + int excp; SyncClocks sc =3D { 0 }; =20 /* replay_interrupt may need current_cpu */ @@ -1042,10 +1042,10 @@ int cpu_exec(CPUState *cpu) */ init_delay_params(&sc, cpu); =20 - ret =3D cpu_exec_setjmp(cpu, &sc); + excp =3D cpu_exec_setjmp(cpu, &sc); =20 cpu_exec_exit(cpu); - return ret; + return excp; } =20 bool tcg_exec_realizefn(CPUState *cpu, Error **errp) diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/tcg-accel-ops-mttc= g.c index 69560fdb9d8..e7edd1945f2 100644 --- a/accel/tcg/tcg-accel-ops-mttcg.c +++ b/accel/tcg/tcg-accel-ops-mttcg.c @@ -90,11 +90,12 @@ static void *mttcg_cpu_thread_fn(void *arg) qemu_process_cpu_events(cpu); =20 if (cpu_can_run(cpu)) { - int r; + int excp; + bql_unlock(); - r =3D tcg_cpu_exec(cpu); + excp =3D tcg_cpu_exec(cpu); bql_lock(); - switch (r) { + switch (excp) { case EXCP_DEBUG: cpu_handle_guest_debug(cpu); break; diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c index cdaa3e11808..d6c2fc019c9 100644 --- a/accel/tcg/tcg-accel-ops-rr.c +++ b/accel/tcg/tcg-accel-ops-rr.c @@ -277,22 +277,22 @@ static void *rr_cpu_thread_fn(void *arg) (cpu->singlestep_flags & SSTEP_NOTIMER) =3D= =3D 0); =20 if (cpu_can_run(cpu)) { - int r; + int excp; =20 bql_unlock(); if (icount_enabled()) { icount_prepare_for_run(cpu, cpu_budget); } - r =3D tcg_cpu_exec(cpu); + excp =3D tcg_cpu_exec(cpu); if (icount_enabled()) { icount_process_data(cpu); } bql_lock(); =20 - if (r =3D=3D EXCP_DEBUG) { + if (excp =3D=3D EXCP_DEBUG) { cpu_handle_guest_debug(cpu); break; - } else if (r =3D=3D EXCP_ATOMIC) { + } else if (excp =3D=3D EXCP_ATOMIC) { bql_unlock(); cpu_exec_step_atomic(cpu); bql_lock(); diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 560fe2554ba..9c3d2214162 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -77,13 +77,14 @@ void tcg_cpu_destroy(CPUState *cpu) =20 int tcg_cpu_exec(CPUState *cpu) { - int ret; + int excp; + assert(tcg_enabled()); cpu_exec_start(cpu); - ret =3D cpu_exec(cpu); + excp =3D cpu_exec(cpu); cpu_exec_end(cpu); =20 - return ret; + return excp; } =20 static void tcg_cpu_reset_hold(CPUState *cpu) --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432130; cv=none; d=zohomail.com; s=zohoarc; b=ePhizdQNezqesBMPwUXvoHMrgwB70kxn7B45+k7hpYBGARKnPQo/7mA+Af886MtOlLRBDopScAV1VAUtwePJXCzJJknLEAeKa/31IvmC3JAWSCkdZQhk4mPbotbYRePYvb7P/mKv0Ayj6AyiyXD0afpFvnMXoMLPqcNPim1U5LA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432130; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=WCN81CZzwMk7AOciJnUEDqrfGM35rVyGbmBye/Wi1XM=; b=I3PuLkMEJccAOwxE7rOu2fmizjxuWJUI5mTCjK7QBhBrCfH9ek3eJW61+YoTW5CUkIbgWTD1RvtLnQTngk0HZ/sTOfyVyzOwk6eN/df1R65ILOxe9hSpEL6jWVg/AtaQdgphKJchtPYmMFNiNL6MIhfsjZKbJV/wEK/B5xyroHo= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432130088307.0972914620303; Thu, 3 Sep 2026 03:42:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24tQ-0001cW-N3; Thu, 03 Sep 2026 06:42:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24tF-0001O7-Ut for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:58 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24tE-0006mI-DL for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:41:53 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHKOl055433 for ; Thu, 3 Sep 2026 10:41:50 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4genrdvgrg-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:41:50 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-92e82060977so153862285a.1 for ; Thu, 03 Sep 2026 03:41:50 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e80798sm12284003f8f.13.2026.09.03.03.41.48 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:41:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= WCN81CZzwMk7AOciJnUEDqrfGM35rVyGbmBye/Wi1XM=; b=I2kFSdE75aKuBoY/ jxzkWcRkJPndesAjwEr1XQFu69/9Ir3FDcjkQMrjhzqTgrt/9vv0TmeE9T6+IGH3 NU8tzcyIXlT5cQHSm9haUP06BJa7qKn3QqQ7CfqMQxtGyMybvBnWe5hbxA3RKllg WUd6gQK1ox0RwP5a5O0Kp5t6cQ4SEyENn2zQLImUKjPe0SHizt2ke34P1z+STqkp PYf+49vjWXlHdrWkmn+ABbj8QzwV5iKXoiLEcIuLfee1LlaCdMJrHO8axmiHWev7 IfZK4fGUIayD7kbrFnPxwDS4lpTWGOg/y5YnLKUWYEVrAaeZkNmtBVJ3K2r+fSLe q2xYEg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432110; x=1789036910; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=WCN81CZzwMk7AOciJnUEDqrfGM35rVyGbmBye/Wi1XM=; b=VtSPoxKjZqYLt2EtO65wOIeQhUamhxbCmPqeSN9pSJxlwXJtwfX+Zyn1KpCyCDYBSN +A8H82TZwfec/u5lExA2n8CWQwjkSRn6CGJFmHhGrvcSeEi24SOXZyEAFy8E7FrTWYG3 oSU1Jr4C2GG6AoXB4kL5DM7kTp1H6m1mYe5pPMMvVsFXjPVOdjD4LwwW+JxmK4S5fWiQ 9L/fQQagiGru6ebYl7itkgGHc2yQxnAh1SlHCU/dpz0ucCh0SgiDxkLL/NyhHQLAq1td TFsjmgfu6QmadGbz2bgG63m2H5/PaI6N/Tljj3Dv15nfYoepaXIbTmASJ0yOQmdjf0vf vXCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432110; x=1789036910; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=WCN81CZzwMk7AOciJnUEDqrfGM35rVyGbmBye/Wi1XM=; b=Bmdi0BSuUDm3bxEQpWCfWsP30US/SqlZD4nDUc1f65FCS+wI9tkfxX9dxboN0a5ICY +QkbNDG+Z21Dm+WsjthF06JgZh8raVU9Wwr7S+Mll4/FMQARwfgSQT4h56MMYtKxFKOk Bl6ELU2G3+IyO2TvQYZb+2JzYr9JyvX5drNuz3lYa+lzTB8v92/DswS53+H4UM7kIEIH qMb+gf0HV82ZKum1IKUSQ2zlACvR52NU8E0o29TGXbGHOOr/uceGcioRFTOvqYHwuppq 0omud3Gp1W8M2leUK6KzbZCxEt7r1jj+8HMdbCexJh+js5eFW9H/gb0yRT/whc+/c+Ai pP+A== X-Gm-Message-State: AFuF++nd+3v6tr76Rzsd1dd/fKgGGKABOhjjyoehSsD+VD6YIib6AkT8 pj2vgtV1sxlCJk0HSP3tw4IjPslfFOe1zjjkPJBvdY0BS9K7cv/ALJSnuBE8q5W4wWSA8b8QMMe OtEgyuUqN8P+mKPXiTWCGtCLq9T5lDRngdVPt5nEiLuatL+sSmWGgu0N1SecSuQ7RMg== X-Gm-Gg: AYBFou3MrP+Ui3gdWJrBmKJOnmMdcgIxQ+f4GNUsMgFsfu626GZ8mID+5qIZEVbQ00G XLtfUYN/gmrVbrZqHoQ8ZE4tS9Y+bo5LophT6zBUnzF8epL4jVECkLVtJL9eaOOdzoFf+uMUX+e VP79CZnqZojsAuiDmDM4Usd6EeMNOLoiUzU9TTyea39uX0mPLVnf9VCwwNOh0FmlmMH9nhNdLHi mLEBTDdUyKTr1q4QEFHsv3YxvDswnAh4nNoGtWMDrW0y5hfsdoTUB/79DYqCTc1TXE/bF6UfaKw awnGXdNy8LNimzndt+1+gItc20sEsfPrzYfJ7nmGTOWgiiVuXhw9pgePO2LYVc7UCwVWeAJR5Fs Ne/tuOS+wJCM7SynsB+C/S2bDipDxTV9tvrbtp6rc X-Received: by 2002:a05:620a:1a20:b0:939:72cb:baee with SMTP id af79cd13be357-93972cbbc65mr212878285a.37.1788432109989; Thu, 03 Sep 2026 03:41:49 -0700 (PDT) X-Received: by 2002:a05:620a:1a20:b0:939:72cb:baee with SMTP id af79cd13be357-93972cbbc65mr212874385a.37.1788432109483; Thu, 03 Sep 2026 03:41:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 18/51] accel/tcg: Restrict EXCP_HALTED handling to system emulation Date: Thu, 3 Sep 2026 12:39:02 +0200 Message-ID: <20260903103936.62355-19-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=H4/rBeYi c=1 sm=1 tr=0 ts=6a994eee cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=-hA0-U2ujmm1-e6JBJcA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=O8hF6Hzn-FEA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: emcWzRgbHP80xdAy5F-lWLwfvvvroyEY X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX16CEWTUrVQ9K pmB99v/uGAMb5s0KC8zCFaX8Fw00+1nR2P5kxCvlGXJb12oiCZEERySe15qGqdb2pAL2uNrqLA6 c6Io0aQApHcwenfexk8qbmQ5ajb5Ig1OvXBmPqta4rAFB9ezlq1loV1KSBNtDmMoRuUnmo8o40N /DXinFylEzcHev9bKfy52aDpeA5PnFRLuiQ9zYpQfwZ38QLnrfVMfBsZBNCXN95PyU6E5E0irtc 3zurH8NS6iKwSgW8H2WYPfNKJR/aManF7gusxek2OV5IUZi0UKk0HY0fDO7vX0wFrcjs3DnuWEa LjxxquE+PE+cIX9vjuZkmTOscaqBVqREmsq/sgZWIMKy8MN+9dWSZu9sWqZgP3HLjNZUKlVPLmw deRyn4puwgVdan21aAHQwyULU3WL+lJtDvJlAToha5p+nq8TY6sEARr8rNFg8+OV6uXZ6r58H5R ByXH+638YXw3z8Xthmg== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX3HWL6nLbumW9 gk1asXdWfkp753aekgjkRz2JkacS8mHNGtGHZHDaat8pdqdSSUiuhlZFRMZuGuRcgR9hVp0kEBT UdOVeSNWVAQDfkw9kcIKfdFOnV0uM2U= X-Proofpoint-ORIG-GUID: emcWzRgbHP80xdAy5F-lWLwfvvvroyEY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 malwarescore=0 spamscore=0 phishscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432130773158500 EXCP_HALTED is defined and documented in "exec/cpu-common.h" as: #define EXCP_HALTED 0x10003 /* cpu is halted (waiting for external event) = */ Since vCPUs can not be halted in user-mode emulation, guard the whole block within !CONFIG_USER_ONLY section. No logic changes. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260819145649.23439-3-philmd@oss.qualcomm.com> --- accel/tcg/cpu-exec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 53d90c400d5..69207301d1d 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -653,9 +653,9 @@ static inline void tb_add_jump(TranslationBlock *tb, in= t n, qemu_spin_unlock(&tb_next->jmp_lock); } =20 +#ifndef CONFIG_USER_ONLY static inline bool cpu_handle_halt(CPUState *cpu) { -#ifndef CONFIG_USER_ONLY if (cpu->halted) { const TCGCPUOps *tcg_ops =3D cpu->cc->tcg_ops; bool leave_halt =3D tcg_ops->cpu_exec_halt(cpu); @@ -666,10 +666,10 @@ static inline bool cpu_handle_halt(CPUState *cpu) =20 cpu->halted =3D 0; } -#endif /* !CONFIG_USER_ONLY */ =20 return false; } +#endif /* !CONFIG_USER_ONLY */ =20 static inline void cpu_handle_debug_exception(CPUState *cpu) { @@ -1027,9 +1027,11 @@ int cpu_exec(CPUState *cpu) /* replay_interrupt may need current_cpu */ current_cpu =3D cpu; =20 +#ifndef CONFIG_USER_ONLY if (cpu_handle_halt(cpu)) { return EXCP_HALTED; } +#endif =20 RCU_READ_LOCK_GUARD(); cpu_exec_enter(cpu); --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432130; cv=none; d=zohomail.com; s=zohoarc; b=gqfbSESJ4ArtfqD8XZxoncKBqRLcKDDWBpLn43HcQTgbUY2gNyn8zGEAj7CLC8eKer77VKpToJ6VRpyzmv067G1aWJkfrJB4sfCeH9s2hyf+2exE0lM8o1is0xtwZdJr1FIoc7eUpgdPjVcVCP5g1ePHBV8HGrurnC6LubmlRek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432130; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=fuM8ZAZQF356rzx0icKWrBqwhMkt0ZBFMTqhAkvZu3k=; b=lfo8SbCoHGxRKYqSzZdC5f8+EXEeRvjukRD/AJMR2YtKPRef/CSaDsPcHIr3pDpGjXZI5D9gEhF+mqICXsyKdgHOX8EnXDF/328dK+Vf7eE9lwh9vW3R+7ORrfwkA52lVnf5eDa7gbyDvZnqwY+2TvLtaX8FJP1ACzLl5jd9gLs= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432130313125.8498787699748; Thu, 3 Sep 2026 03:42:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24tT-0001mY-91; Thu, 03 Sep 2026 06:42:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24tO-0001Zl-JU for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:02 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24tL-0006nT-T8 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:01 -0400 Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHEMQ327166 for ; Thu, 3 Sep 2026 10:41:58 GMT Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf4ekgtkg-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:41:58 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-93975d63ffcso53806285a.3 for ; Thu, 03 Sep 2026 03:41:58 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448ed2edfsm12612949f8f.23.2026.09.03.03.41.55 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= fuM8ZAZQF356rzx0icKWrBqwhMkt0ZBFMTqhAkvZu3k=; b=TwjHLJqQuTn+1LOs tFSgnkn2Ba1ONt+suQrsOvvpW5IngvxNNc0DGvXc68/Un8MA9wyuCGl8f9gv6ciZ /BKVhi3JrTTPlnCzW2QDw5epNuM7MXPTxavKwqquzalg8JOzyOv0ui1Y3eEKGCQA XiMnMwlnBhZUYAnjqmSE1lAiBXi5aPWT3P2VdRcFjYjIVs7Z2J8kiUwuJtC3Vrm+ GjxlCKecHKFZ+/rh4WTdGWFKtGuUgdNqHOop+8qkixGhe2pSZTNvDdbjjQDItVnJ jXJ1r4UWD67UeWD9vtHJFy3a3+uxc9oRRW1a9rZuI5jOZxaSqQTukx2HKAZETxEw I8XIzw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432118; x=1789036918; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=fuM8ZAZQF356rzx0icKWrBqwhMkt0ZBFMTqhAkvZu3k=; b=TszqLVV3eeuw/Z1bpZOhbU6CVO/1WPiGnFWmfd6dtx7dR1luEmpK5H9kqYcM08fXqt nkMRjIHrZ2vcBAGpYffkuq+JcZ563PIx3ZDrqbxxjES9TLxMFhzNZUAHSxil/+72mzNX INe6EP1K1Nde3tGHcbSeYzX+t10cevY3TXIMRwTvon2y7dqXHPxdpFG+BmbqYUSpEHuY UnQmwvem+x4CrZAy/ipZHoYx5kPWPDikxFtz8KH0/2BH1eJ34315gKgPVyJjOOdq+/FX nbl4tmTjREWVtmW1FpVOMSfAjv/MkFCGTCvVOucQ8YPDVvsqRm4hOXoGsh85X+lv4ndc LGzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432118; x=1789036918; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=fuM8ZAZQF356rzx0icKWrBqwhMkt0ZBFMTqhAkvZu3k=; b=r119/w7uMqi/fwS//jpiZwUqVl2wMvdl0Pn0e76NaHyxvLtsrg75UBSIPmsyZJQzqZ o458JNCt+cWYso44rQsIaQ7e655pNFUjzYsToGnmjaByJooRxohBjdbMASpNL8KDUAyh 5Qpx6uqHIbP3AGUcDsUhOl5xK2d7GG58yOepoYYWTOKDdQ6pDtOCl8Nu4CoHZ+JoBveb MsjImb1G975MgWg1G9+GvhSjzZX4nUUPQzvs96pXNLqMa7FKqlIrDL2L/JvCHa2ZCCn2 MqMmiR9laAEW7crbevqscmUoDYCZrYaM6TAQ95W26aSWh8w9SFE38an8i2gHGYaaYMXk YhDQ== X-Gm-Message-State: AFuF++kysZcOYA05AH4by/jRCJ8aAJt13sRM2mtSgbTnhrFu13fYE5+S 17ESW1M7h1N/3wJgNpxi3AvthYnxDEsXNA8H/ixT5O2gYItgl8DgZ7vX0qwQYzM7h5sLu9GwEgR PAS7c9U21Gks19kFw90NUNpbif8eo8tXVgCF/IHEI8Wt7IIQZ3m3ViBP886UZa5CpGw== X-Gm-Gg: AYBFou2RDSP5LCTbiFVVBgnaRufXHAqJfE9UdG1Pi13bUWPcEjTpU506q9R4FXJrDW8 jBwmhcMDnF0a8qTtnFZLKt9UrFGn3zB2AvcECtqxTmFZYjVQmqP5Y3er4Q99gLMsXpZ0j9+akag xhIFgAO8hFiuXAZDwLrC7mZH0qDvHdVHkOpWaRd1VOja7sN7kSn5oLVwXJgyMeZ2L0oPGqBrxxu dbi4iKgT+Kx4tIj/3+6N3ZJRL1P+qt0WyQSUtkGFqQnYsk6ZVzIgtVt+IdBHhnLu5nvNsakEBge t3LNryM/zcCvgNJKd+8LxunJQktfODzVeWPyRnMo38Vp564JVvsWw0AyOFn4i7qRMXVk9cINNo3 mD0exbyHl7dH1s4ZHTlpVJqFkVVTQujCQLlkGuiJi X-Received: by 2002:a05:620a:2794:b0:939:1464:db90 with SMTP id af79cd13be357-9396f21efc3mr493672185a.18.1788432118186; Thu, 03 Sep 2026 03:41:58 -0700 (PDT) X-Received: by 2002:a05:620a:2794:b0:939:1464:db90 with SMTP id af79cd13be357-9396f21efc3mr493668985a.18.1788432117771; Thu, 03 Sep 2026 03:41:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 19/51] accel/tcg: Check %halted field in cpu_handle_halt() caller Date: Thu, 3 Sep 2026 12:39:03 +0200 Message-ID: <20260903103936.62355-20-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: hIrBnX8jSj8DixY8T-rUXaypU2ua_FMB X-Proofpoint-GUID: hIrBnX8jSj8DixY8T-rUXaypU2ua_FMB X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX0SnzVIIe6SiK d475eNhikNbw/oDJgpcXwoNzc090LHu5ussqyvGV3jOJtfgasnEg7Nsx7sDERBA2XR/avWTJ07a xV153lCbBluz6xl4G0wT0PvsjeuJotofjPlCCesACwoDl7eWR/anK74hBZbuEKNE0xkMt1ZBa5d K1pm2utzqzc1VbZmWcMymaOduHb94hmvMOcSoYd5oFyxHggqXMQRwy8K9MM/6mhPQ1gdMJ/oNC8 CV2HvcUGy1p6kgW6Thc727+lHk52VvsP+f8RgrYbZ/FB/DJH/5ZfksQjOJMzKqoYN57M9zBqyqh 8PD4EvPi4f9Ya4TuvvsBc7ibUfbSpjmYoKQxAD0zwv5JyWy1lMwGEWou44nRuzguKYiCGWpMMdd b8su0nqKKwoDNvNUp4aX7rsDYYZsObCVq/Ad7Ri13Qu3OatkiLi+02gCn63YZV3Pm2D4MCC8KkM MxhsS1HvPR5ykHMuNPg== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX+/pqNlA1RuRU jPoBJsd8JHE4NnFF6DsSpO2jjLlQsb0GN/sdvXtAZogxgsxRph9Ca8VUcT6UVI9BljZtJnagB8J N+Hw7IbFfCCzUyRl1Oc9D6cBBxmFfhc= X-Authority-Analysis: v=2.4 cv=PKc/P/qC c=1 sm=1 tr=0 ts=6a994ef6 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=snbnvTbt-5-dSQZ-83gA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=O8hF6Hzn-FEA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 bulkscore=0 clxscore=1015 phishscore=0 suspectscore=0 priorityscore=1501 spamscore=0 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432130773158501 In cpu_exec(), check CPUState::halted field early before calling cpu_handle_halt(). The logic is the same but allow to simplify the async event processing hooks that will be added in the next commit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260819145649.23439-4-philmd@oss.qualcomm.com> --- accel/tcg/cpu-exec.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 69207301d1d..46b723cb734 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -656,17 +656,15 @@ static inline void tb_add_jump(TranslationBlock *tb, = int n, #ifndef CONFIG_USER_ONLY static inline bool cpu_handle_halt(CPUState *cpu) { - if (cpu->halted) { - const TCGCPUOps *tcg_ops =3D cpu->cc->tcg_ops; - bool leave_halt =3D tcg_ops->cpu_exec_halt(cpu); + const TCGCPUOps *tcg_ops =3D cpu->cc->tcg_ops; + bool leave_halt =3D tcg_ops->cpu_exec_halt(cpu); =20 - if (!leave_halt) { - return true; - } - - cpu->halted =3D 0; + if (!leave_halt) { + return true; } =20 + cpu->halted =3D 0; /* allow execution */ + return false; } #endif /* !CONFIG_USER_ONLY */ @@ -1028,8 +1026,11 @@ int cpu_exec(CPUState *cpu) current_cpu =3D cpu; =20 #ifndef CONFIG_USER_ONLY - if (cpu_handle_halt(cpu)) { - return EXCP_HALTED; + if (cpu->halted) { + if (cpu_handle_halt(cpu)) { + return EXCP_HALTED; + } + assert(!cpu->halted); } #endif =20 --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432136; cv=none; d=zohomail.com; s=zohoarc; b=bFrvos+3mu2lzOj2HxFlFpaJ5pKreGeZ7Rb2ksGNeGLwRQKARn7cKoi7W1+SolDn89OoGI8ua1fvbqUaokJQjdgcxwfQnMzqklD645Vee0Dixl6GFhtREAOt7Y7jFa3CLMyzHVd5XKU0sx/GqH0w9hcf5LAd0sZ1G8mKC4iD3+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432136; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=LaNrput5HtIAIsWU9/zzKncb0OXi/vfI9KgofgDlVGY=; b=aAghg/mkmwDrb+hwIkmy10mQBhP70Dl8+80WW6JpqOiPbG5vLiRdztoeyAxhda+lZqfpfhW9lgvd0/L984gujV6NcukXyTu4704B7CjaRL+IHPs8FVakho56xndWU2wUUj/jrkST2wglIVGUwfCtEfhLivCw5Bu7N23osvMfIoA= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432136795258.43734094936406; Thu, 3 Sep 2026 03:42:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24tW-0002FM-TC; Thu, 03 Sep 2026 06:42:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24tU-00022i-Qz for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:08 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24tS-0006oL-Lb for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:08 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHKFK055418 for ; Thu, 3 Sep 2026 10:42:05 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4genrdvgs9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:42:05 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-92e5fc4c7e9so165935585a.3 for ; Thu, 03 Sep 2026 03:42:05 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5dadddsm70598645e9.9.2026.09.03.03.42.03 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:42:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= LaNrput5HtIAIsWU9/zzKncb0OXi/vfI9KgofgDlVGY=; b=KFScd1TheCn0renZ 6zZAigXub0XL/KvbQiJ1PZ5VrwA9s1yPL7bCUTXZ96f2NaF/RwRlxMRyrvPf12s1 2Ear50Czr3meXI+OSrd/IrzROw/hikOhStbQ8lND8LUk4WRY0xZ1ZeFtoCWEGctj UmJGCB+98vjEM3A8AIRd8/XJPvcLQcTr7XI6v2pyIrZIJgD6I0GJg3tKw2Ekh5Nj yAUvp7ilHNafK3gciTIqig0TcFbg9n2Xv2zAimKhAgzt+Lk0y6JtWz6DEe52Ss/b 3v9iu2t9/h5D3azc3Gw2JX44TdBkgZh0CN7AkEhd3G/dBiQshel92dCjB6ppUwI2 NhcyPg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432125; x=1789036925; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=LaNrput5HtIAIsWU9/zzKncb0OXi/vfI9KgofgDlVGY=; b=J1rDvTewqPWJHQyxT0O3XJwOTjqMtdkNOPjJDBMw9VUG/kEx5WkWlK4vbPKcqhvruI Sj16PSaDM4nEaNKvuhJ5N+zzpgo7+ig0GlefDMBbkbM7DEi70Ro4WikJgvTUiAtwEbr5 Z4u6Kmn+tlouLPLtVsK34lcuW4VQm9chOeHC6N6iFJgiH8unvro7poruk80UUH4Q85qK 7w15RgaATWiBIYDf9GE+fPoIqL8YaXToLUCIkSIE9x45cznY0Kh71sc+w4UfA24NH2rN gocig0QIPKc4xt2GtK48/sPt7pwrpy8r9T/hoZ0Yd4WA80JlmnnyypWO7Iy2gQLTe4oW KwGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432125; x=1789036925; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=LaNrput5HtIAIsWU9/zzKncb0OXi/vfI9KgofgDlVGY=; b=K0BfNFqkYMp45AdlMbILEcQlDKbozxH+Y36xqEs/mRYQZAfCeDDuopvcmP4Z+Tism3 szNTH2p9rzBB0hnzRRu8rbRrT66BrYstHQN4zIBToiFNdoVD2clcJUY22/okXAN64MNm 1wYdi1YPKgfnXvb8H6VkbUW3o07eupM+H8ssoPx5aM5li8biqbra/NgcAmB7iVWEY3GH V73e4Q/Cjy8kBSYSy3Yn4EJpCpmdSc5eEQdklrpiZotB4MCDnxDYmdh3JpzzrEAfU4Le f+ma+v5xtM4a0/jQyjRoyOvQnNHsQ+n7V8ly/TiRaF6UXbLsXwFZ19AKbVyPKI9hk9cO oqBA== X-Gm-Message-State: AFuF++kaxN5v7RkuweizFplybvY+0kq6iAzcfo1cR0zLjtdTan1cium7 FOUMXWtvBvdwccr9DvMdskt+/qUiypy93zx+vu7F87yGEfJ4iQMrL46fKLHO3FtLp5ITPzt4yNA Y3yb+cNfgmjjo913k2z38EZyXy3KrT3xjWF3nXa49bC0A0b02YY5q4pUQ3NMMjd7OOQ== X-Gm-Gg: AYBFou1qKBjlJQrmWslcPiPIbjEvu09Vy2RS5RBBiNaPLOgXovIvslzupATkmfENV82 f70SBE6J8opd75VHC0V5f5XNTw+cs3pTThdp2Xilo3casilM0oppvWjI//lhjdVYgRhy9e5j+H3 Fd2J0AoRiVc/qrHmKVcICl+iIko6PVx63fZXRK+MIRH45QMntnP5OqDzswRxn2nj5kVhSNWs+Hi p2k4cdLlUCcruJ3SPWiCqaXiFR0sUDBccIallVlZRTLTCXbcF8IZf7eMhjratGXZRUsnRSUFuFP XB5uAl/mmOAbTZfE9uoOtkludLEU27b4ZLDctemcLF2dWcs4p4lsjf3JzNfeGjps7sBJgfg9F04 HOt4r4uvkcCT00yCdHyAQ5I8ibM04mVEKbjdHbk2y X-Received: by 2002:a05:620a:7112:b0:939:4890:98f6 with SMTP id af79cd13be357-93960f18106mr1328827885a.22.1788432125045; Thu, 03 Sep 2026 03:42:05 -0700 (PDT) X-Received: by 2002:a05:620a:7112:b0:939:4890:98f6 with SMTP id af79cd13be357-93960f18106mr1328824285a.22.1788432124549; Thu, 03 Sep 2026 03:42:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 20/51] target/i386: Remove const qualifier in ptw_setl*() Date: Thu, 3 Sep 2026 12:39:04 +0200 Message-ID: <20260903103936.62355-21-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=H4/rBeYi c=1 sm=1 tr=0 ts=6a994efd cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=20KFwNOVAAAA:8 a=EUspDBNiAAAA:8 a=6zyGMrF3NIoAil_mprYA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-GUID: 7121vG-S-SdcWGAkQ7_TxRnWyIrR92sc X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX6AlVMRfUADZh x7AzPPmZnOkIWtTNz+dpTBWIpKcdaddYjObMct1aA1TJm0z4qRdZ0yqJ6pRNajNJSKWislo+qGP gFTbqwKdkH5q858GU60U5px600vaX7QJccDVDcBnOsxnzZVHTd065eLDFCS6G7ZiWmy7LDap63q 6y3p1NYUeX2U93Qw8X12uMXq7Ce8H1aJVGHVMxEDT9lkcYIIRRy4lvGYWFbm55OY6GXIvYYg/Ac /pVhRl+ZHwbjXht//3kkMFxXkX4EqX9ITKY5AWdEFqyHrBE+95+epedJgLajVkIjjv0+XVUPkYM NEfGG+umgLajNBcD1Anzw+0UsjA/Ijq5k56OGcTYgAl1jJQQtzjjFHBeMKKjfope4YivtyYUmWU XstkJGnq5R0CX4Z+0/HTVG9iY/2U1doHy1jx0uBuPFYsQNZIP1sTBJhh3vYt7jMuwRdiYnAuptv QfKvjOuXGasvNyc1U2A== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXzIT4wXE0HZlJ kRtBzWsQXXiAnLyRgdHzd1cGnP+r1t8RcwnZ+R4o6WYoYSW3wwZVU+UWwGsTjq1+hgxNxXz0rTk HxjgFlRFGcjVcwpGrdZYypJS0gg/EKw= X-Proofpoint-ORIG-GUID: 7121vG-S-SdcWGAkQ7_TxRnWyIrR92sc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 malwarescore=0 spamscore=0 phishscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432138945158500 Both cpu_exec_start() and cpu_exec_end() take a non-const CPUState argument, however here we get that argument via PTETranslate::env so @in->env can not be const. Remove the const qualifier. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260901095229.72018-2-philmd@oss.qualcomm.com> --- target/i386/tcg/system/excp_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/tcg/system/excp_helper.c b/target/i386/tcg/system/= excp_helper.c index d7ea77c8558..44be98a3c92 100644 --- a/target/i386/tcg/system/excp_helper.c +++ b/target/i386/tcg/system/excp_helper.c @@ -106,7 +106,7 @@ static inline uint64_t ptw_ldq(const PTETranslate *in, = uint64_t ra) * even 64-bit ones, because PG_PRESENT_MASK, PG_ACCESSED_MASK and * PG_DIRTY_MASK are all in the low 32 bits. */ -static bool ptw_setl_slow(const PTETranslate *in, uint32_t old, uint32_t n= ew) +static bool ptw_setl_slow(PTETranslate *in, uint32_t old, uint32_t new) { uint32_t cmp; =20 @@ -125,7 +125,7 @@ static bool ptw_setl_slow(const PTETranslate *in, uint3= 2_t old, uint32_t new) return cmp =3D=3D old; } =20 -static inline bool ptw_setl(const PTETranslate *in, uint32_t old, uint32_t= set) +static inline bool ptw_setl(PTETranslate *in, uint32_t old, uint32_t set) { if (set & ~old) { uint32_t new =3D old | set; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432150; cv=none; d=zohomail.com; s=zohoarc; b=NSBxnv4I3UlCHu0PZu6bMRj5q2CXcN9I1NYBYwJXMO5zixmO9xQF2LvpzCGh+H//GqevYA3g71RhowuxoL3qousVcJudr4iOnpIZAPc/PxTndYr0DwS0dMztyNWXP7bfct3dmszP9Z2y+PS53SyKn7xx3DjVbtg8R0//v9uGN6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432150; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=o/0+Uxr6/ZY3JhK/GkDs6id+76A1kYT7Zsx+XZ3AK0Q=; b=bzKjNRB/+95Sjm7pUBW78fs/sYiLg1QXV5O9fmHZYRRoD/PgO4fxMjwKuzo9/68/3uV4O1jj2uMjNabEaJuPQO1cxMiCzq9i/FwdEkhOL8uZXSY8creNajaBmOdM7TGLrREJEOuR7VggTO8e4BuQIH7zbbvapYfFQjTQAz18Xs0= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17884321503831005.887109334209; Thu, 3 Sep 2026 03:42:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24th-00033Z-2y; Thu, 03 Sep 2026 06:42:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24te-0002w0-Lg for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:18 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24tc-0006pK-RU for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:18 -0400 Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHR1r3852489 for ; Thu, 3 Sep 2026 10:42:15 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf51m0nb4-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:42:15 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92e4f946461so457201385a.2 for ; Thu, 03 Sep 2026 03:42:15 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448ed30c0sm13195916f8f.24.2026.09.03.03.42.10 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:42:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= o/0+Uxr6/ZY3JhK/GkDs6id+76A1kYT7Zsx+XZ3AK0Q=; b=E2gJbo2MdiWioXHX mVYsOqXNbPZKdja6JTyM6eVJwwPrA4SW69TpzIrWFG4oYPmou0vlv2QR1xOtpuiK uJFcqOLEDT175BzGA6msODADYPEGSdiW92aaTaHcb6MMMHgFc0jkJcCepTNNnJqs OtmGMJgOGdzyEU6U+K3k1s5A23bJgpH7c2k4QDfOHuS2C3Mtdys7VWf6Vb21Zaj+ xYggEsMiz2yoXh1diMMcl+bInBtT0+Y7zO+ygnTUJ5wK1HtljUKOs+UhQA/9QexN i2zg50FLfVtZX/jkNAGmc6g09qSSIFfnavZK64r5694jOVmD3w97ufEnxJU8s2Jw t6EipA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432134; x=1789036934; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=o/0+Uxr6/ZY3JhK/GkDs6id+76A1kYT7Zsx+XZ3AK0Q=; b=OOGdZYICgBG+cJcetT+skKr70JIwoDf6XzdA9GjFKiVfWCK6hC9A+hHFoO+1uQoSdc sF3d4lN79Gan0u9QofoXTZGoY2UuRdiKyI6SwW3GS3QOzxgcSp1KWi0tWvNYt9y6eeY/ Hwbsc6iiVLwgDywVfdupSs28dLcET32AlxEdXZMKWlOldU2rjFGgUHXv7FgLUqihIIEq wGakb0sUQN44fUtO66U3EzQaE0fAStr5TT3UJkGXx+qcf09vUccJgJbR8u4oB2ZajcWd 5IW0RmNqyiue0uw/poQt+5BhcXzb5WP5tVOu7S5C6Bxk6E9QIayS089d+WneqwbLpMAW AtKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432134; x=1789036934; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=o/0+Uxr6/ZY3JhK/GkDs6id+76A1kYT7Zsx+XZ3AK0Q=; b=YkoFuPoetGY5kD4ZpnYXGDnCbrWF0jTJy0OckORegKxf1GH+06JPhrJG2NSp4z6eYt +RD1oKJeGKJ7PDLb5uEYqRSp+zFVNtW7sJyxPPNeysNgrvKzbYuRYDWCVfLa6kU7JkCe b5HdeQkJ02rSFE5YwaqKGyeewCYfJHsEIiuLoIcFuAjTRFVbe6zagEI8bv4j2Ahbj5f8 F5zGI33M/pM7g8MrtOJMj3fOAu85edEqp6bi3BNW5Hfh7E58rc7df4IYh2OoWqKvYoDP a+xb1wjTtRc08WrkjDj7nDY/CaQP6XYA5pLA4zgqHOF8YjLUoJnZL4CMFX4lf6fAkw1w P5oQ== X-Gm-Message-State: AFuF++kUEig7B4iszt1ncqF8tPzZ7Ypjyz45USPjm1wUy/VRVcdGWZkQ KwQMIOrlVFXxEPIYbFcYiRAoiKXq5Bf8pkpQRtcGeXyOj7Jg2TNMqeue6ooR+O6Ch8Yp+cZ4N4S Ocg4nyLl8ZuHK77WaqTzGsE0DB2mP5cyeOd0vO49BidCUNGdT4NH1LGsr4QDmSzWBbQ== X-Gm-Gg: AYBFou1cHYjwaBfUBGMfMFONzGlbYxK9kICejcBCi1F4G63fErHED65MSnJb2NDdY9H 9fwIDKLL/fqRm+GRPG9HS73aShlLeu99aKAy6AH85lS+CGpcorckW0/K0qs5LSheqSEGsAQCiZJ gJEFnO4GBxEnAHGl4uZ4/JMToA8vihiw430+7MYvoLnZ2g1OF+7ouNmJo1/rC/bOi+MJdyLZzQ/ g6kh2PF27tdN2cOKUZAC0eWlJJgGTnDsN1F53PsswyWC03QYMehlK/jjfdT80JCP6a3XdHbsDrk tkTpHp+1a/3pe2F6AH1fw2gI3Rxi4pn+/4aBlr/0NtcApgqd38FtHQSzQD/62uWV+7P1/sBnVjZ Y+kIJ0kJ+800WXmMjnsRRY1/K1DoIeEilYfE+iFbQ X-Received: by 2002:a05:620a:4904:b0:939:6de7:a624 with SMTP id af79cd13be357-9396de7ccffmr466201585a.48.1788432134166; Thu, 03 Sep 2026 03:42:14 -0700 (PDT) X-Received: by 2002:a05:620a:4904:b0:939:6de7:a624 with SMTP id af79cd13be357-9396de7ccffmr466198085a.48.1788432133644; Thu, 03 Sep 2026 03:42:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 21/51] linux-user: Uncast void pointer argument as Object in target_cpu_free() Date: Thu, 3 Sep 2026 12:39:05 +0200 Message-ID: <20260903103936.62355-22-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 8gKP0iy0dOyeCaQHsy9u9TeeBsdclqpA X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXxWoPYHvtYkKG 1oc7PU2jc8O8t6LI4kdIjgFJ7XVBnm2pdB+Ax73SfJTrs2U4Hx3yTgijRPtluXkPtJFoS2srjIr 1ihPZrEF2D5lWqfEHVsd0gn9zxsAqOOFP0623TVfEGniKPA2wgLtCEk0e0ooSv9Z+b1FUsceO6P /OMNpzt9jGS0xDTErC8W2kIdxVlEm9SkE9MplAjHSDQR8/U5ipRZRU+8qZXVcOLrn8rU2KEC565 nQAy2DcTuXUZMoKkSK078NswP+J9YA5UgB/cdp8i6bka9jPcbJV64yOCkfp/ineYG0+ilzz0gTg swAJ1Wj09Lhb7bXxiV61MxIYsfjTKXROoB0AHR118EWsInL4T8zUDoGcKYwjZvohvNhce8OmBMP zYq83S9oyJaFDhHhvGwI+zPg/mE40BaDq2xxB/xG72Krim5UC08sfQ2cnPVAhx6wvSfNq+vJf5T 8JJm/YBLr9/JvySftPA== X-Authority-Analysis: v=2.4 cv=X8Ji7mTe c=1 sm=1 tr=0 ts=6a994f07 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=2RGiIWwp3e7TAFkeQGYA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX9DW+z3chZzy0 02OfmI40eMKUJQ2gHsVCwwgygg+Xp1RE4xHnHiEPlcSsW6+CNzYMVXQCQo/li7YKJ+JDBOtNzrd fcKzvmHS3Ohz4S4kvXT6MCLRqk8t3KU= X-Proofpoint-ORIG-GUID: 8gKP0iy0dOyeCaQHsy9u9TeeBsdclqpA X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432150876158500 init_main_thread() is registered as Object::free() hook, thus take an Object* argument. Uncast the void pointer as such. While now cpu_env() accept any pointer type, next commit will restrict it to CPUState* type. QOM-cast the Object to CPU type, otherwise we will get: ../linux-user/i386/cpu_loop.c: In function =E2=80=98target_cpu_free=E2=80= =99: include/hw/core/cpu.h:604:31: error: =E2=80=98_Generic=E2=80=99 selector = of type =E2=80=98void=E2=80=99 is not compatible with any association ../linux-user/x86_64/../i386/cpu_loop.c:331:19: note: in expansion of macro= =E2=80=98cpu_env=E2=80=99 331 | target_munmap(cpu_env(obj)->gdt.base, | ^~~~~~~ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260901095229.72018-3-philmd@oss.qualcomm.com> --- linux-user/i386/cpu_loop.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c index fe922fceb5a..2f733b0b477 100644 --- a/linux-user/i386/cpu_loop.c +++ b/linux-user/i386/cpu_loop.c @@ -326,9 +326,10 @@ void cpu_loop(CPUX86State *env) } } =20 -static void target_cpu_free(void *obj) +static void target_cpu_free(void *ptr) { - target_munmap(cpu_env(obj)->gdt.base, + Object *obj =3D ptr; + target_munmap(X86_CPU(obj)->env.gdt.base, sizeof(uint64_t) * TARGET_GDT_ENTRIES); g_free(obj); } --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432160; cv=none; d=zohomail.com; s=zohoarc; b=jKPofTo3ed/sXKIftWfV1S9N0vzOLpvndqEkyDXaS5eJnA3rOidqT+W/gglZhoXf7AWnvPbyQFtvcf8edfRjxnuYzrohXQbPIx5/znyknXkD/mS7t/RGCyNZ8bt61Qjx5cqwuZE2L4JJ20FyrIc5N8gBzjxU2kNQddlzSX8RPm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432160; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=CCa4c+fD8c9Ts0U5IK0eUH215QRLO0qDv+6PoeJ0FYY=; b=KK4ydYZhUwujmlkGmEgJpveSDKDdYORk627elHEbcwLniGN0CdNKmjgY6uFYRXicEURTdf2yGw0HNzrfO+zk/fuaoftNRfOip9vG/qLZYj44PX4+b3SS/A44oBoNYGJc3ec9qWAT78a9j4RJhN0wyNbJnPqzL5Oqm0tmvwjsJpE= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432160145318.3647642870917; Thu, 3 Sep 2026 03:42:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24tn-0003Un-KQ; Thu, 03 Sep 2026 06:42:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24tl-0003K2-8c for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:25 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24tj-0006q5-CT for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:24 -0400 Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AH7MC1328087 for ; Thu, 3 Sep 2026 10:42:22 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4genrnmm4x-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:42:21 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-93771aa0379so597681285a.1 for ; Thu, 03 Sep 2026 03:42:21 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448ed3716sm13961164f8f.22.2026.09.03.03.42.19 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= CCa4c+fD8c9Ts0U5IK0eUH215QRLO0qDv+6PoeJ0FYY=; b=TDDmkJifG5BWKOml vVadhms0jTnvAm05v5FPsAKtff53/lJMAWMrgJfLf2jRUuX3WtSRUoB3OHJpWQlX NAgMEcquBp8zF0cn/it+GOdCbtaHGTAo/nl2EcAtEg+Nil/oquCaqhIgugbYWr4z 4qMyx1LV0KbpRv0wNpmqfy0qfC70z63TcZVmeWpP4REWBpf+pbpZjJheVCpj6hs1 fws3i6vDjXYxhyKF8NzBHtA3U6DaxAv4bO7gfdnnIir8of/oYcQ8NhmXZ50/PoiD Pn/yR6FoZ1tI9P2GEwe1dbvooaVBL1S3OJPC9v4pMrtX65jHI1zU+1KKd1uCFLh4 I4zwhw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432141; x=1789036941; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=CCa4c+fD8c9Ts0U5IK0eUH215QRLO0qDv+6PoeJ0FYY=; b=QnXHl8hYGFyBP/KVo+C6ALf1eKFp6pxdRt9SaEfd37+U0CbSjAT8vPK6c6qI+YTDvt shg97dLG2kfhFjK1d7PFNcc+iaPvNfhELUINloqzv5vUwlcme1W0k8K4RmfLaxYOmGRi KoapevpZMFkz+hFJtaXfIegZnWZh5E8USXY3o8Spl7N0HUOIO9yYoxShclwAkFBcnT9L hbppxRBOXARvTcDctTcCEOk0l7bQJvRi938KWTJX9d02ZbLzVzgZBpxPnIvLYLuz3JnB 60uQvMyetdHU7y7o29WQGowN4u+suICrQfTzD3Dovx0Co7ooAYRBwMM7gUcOEnpdLz0D P0gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432141; x=1789036941; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=CCa4c+fD8c9Ts0U5IK0eUH215QRLO0qDv+6PoeJ0FYY=; b=sO5Pmb6vSKx2X/n3d8bqOu1p5zgHq9nNpAD3gMetUKu2yuAgH3aQrDR3GSzpBjb+59 LM+uR/ppnXwaCpa9fOmP8CQS+xNxfd19erkjCHMdaxeAva32hf/zpaBfAF42Dbv5s8wf R5WLWN1dQ/NLguMvkgUKM4M/z3JR6NMItlFQi/INNq11D/ELvFf5U7g6kbEcgWu4cngC J5QGp1RdQ2dAj1pz6nhdT3KTtWkiloBlJkCYPxjcC/QhwF7IgsF2vcQTkMpHmDsoSHWx F5qtsULOZBAznG2MNF5KoNV0qKoXCrzrVU2GFkMUHvcpEgCHtKTB4s13DZy0+OoZ+ejf 9goA== X-Gm-Message-State: AFuF++kRelXkzdjs9YTG9zsu2sXRhuU7I3SBHM3BVnDRXv5JHQSY/N73 fNj2lYwsKDPAS40gTpIgLMOjOQ5nIGkI8zDNgRTxyKIXzujWK0p1Dnc+trv58G/j6nzmI0oC17v 7M10q1Gan+NWkXkmyUuO1/+Vc9l1RW0c5FkPUjLa6A12UE0rLxPacQjyfApfsy4exEw== X-Gm-Gg: AYBFou1XMdigvBZPuKUUwrfI4R1LQO5FJxJmAeHRvdW4qKBdGyO2WU+Q/cPs+fQ0JHD jTq0AvTkkLvIHAjyUIkQCVyM4CXdt8Tv10OrByKgZr5yYxlNvJO7J5x0teey1hXlZ0X6wjcuZyw DWjH3PdWZaBKOsTfurN2sFhZn8490WRdS8k1EvCmaY1SzxjzVqWHC+aFvcYLM1WB3K85qUJn3C/ B0kncN3uv2vM1viuJCc8SQDh7ZPMV1+hdvb3o6qjP9C8mTOBZQOvoUtLyqQjmjaoZiFubJGi+iS QhWr7gq7I2oev7qGTBhZDlO7uieOrYDVUKoy3LyUZi3Xy3z9/FgCiuDUyshA8EGcdl9RjdI+MIx p5vpwXGKHS+AIUhY7rtdvg6dELli9QkZHYcGJax05 X-Received: by 2002:a05:620a:3d0b:b0:923:7821:dc0d with SMTP id af79cd13be357-93960f786aamr917885885a.33.1788432141006; Thu, 03 Sep 2026 03:42:21 -0700 (PDT) X-Received: by 2002:a05:620a:3d0b:b0:923:7821:dc0d with SMTP id af79cd13be357-93960f786aamr917883785a.33.1788432140545; Thu, 03 Sep 2026 03:42:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 22/51] cpus: Add const-qualified CPU environment accessors Date: Thu, 3 Sep 2026 12:39:06 +0200 Message-ID: <20260903103936.62355-23-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: -vxnXcyQ-3EDE30-J4yV7_E09XZXlD86 X-Proofpoint-ORIG-GUID: -vxnXcyQ-3EDE30-J4yV7_E09XZXlD86 X-Authority-Analysis: v=2.4 cv=YKuvDxGx c=1 sm=1 tr=0 ts=6a994f0d cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=x16qC-9I3E3lrIGWYX0A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXwAScA2Ma4tYb x08S/+YF6PU1eE6eDkLZ19A4JeRNQl1qJJACaAEiVQd5btCRhvuIgVagxTivlY4t4qconu8YZ58 6LfdS/o16aY85c/sOXBa7E/TU71/WRfoRhEPhIXSKC4hLgG2f/RpX92+sKWXxj0u3nYy7UMAdOs 57aZKNwghljwtzywusmEBWSQfXazlngwVooP9jTFdedQZfHM8J6vuMczBxQkGG2as0luhiWHarH E6Mj/uvZrS6ZnyWvkAYwR3cnlYVs5s6lFLuTnufCkFCpOEx0eCA8tiMK5CwW1fhfNtAbTs4Whkq pk0npaFnGTqfpMvEHc6BHfClTz/cvJJGif45Ra//BQr9dxXB4Kd4XCcwU/hPQplRKoKZBd7OOyg JKEcpjjWssuVMiLvFWJTPP24OfmaAzRyCiLzaXOWY7FLyE1a+A6vWvNRqGBTCeDOqFBcrkEHlK5 P+cBEYC6YR70n66EtUw== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX/PTP/WJBucsD DinwZ6spWmpZ+tZZZA2x1c+mmCGDu1i5cXJKDgeDKAl9auokXv9UnanYuO/w0bNpzbM+vV7bqNm HooOPX3+2yyC6RXaG4PiQ6qo7zAG6ms= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 adultscore=0 impostorscore=0 malwarescore=0 phishscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432160987158500 From: Philippe Mathieu-Daud=C3=A9 Use _Generic() controlling-expression to add the const-qualified variants of cpu_env(), env_cpu() and env_archcpu(). This allows to safely access CPU architecture state when it should not be modified. Alias env_cpu_const() which is still used. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Richard Henderson Message-Id: <20260901095229.72018-4-philmd@oss.qualcomm.com> --- include/exec/cpu-common.h | 30 +++++++++++------------------- include/hw/core/cpu.h | 17 ++++++++++++----- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 6594f7fa1be..60997628cc6 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -85,21 +85,11 @@ static inline bool cpu_loop_exit_requested(const CPUSta= te *cpu) * * Return the ArchCPU associated with the environment. */ -static inline ArchCPU *env_archcpu(CPUArchState *env) -{ - return (void *)env - sizeof(CPUState); -} - -/** - * env_cpu_const(env) - * @env: The architecture environment - * - * Return the CPUState associated with the environment. - */ -static inline const CPUState *env_cpu_const(const CPUArchState *env) -{ - return (void *)env - sizeof(CPUState); -} +#define env_archcpu(env) _Generic(env, \ + CPUArchState *: \ + (ArchCPU *)((void *)env - sizeof(CPUState)), \ + const CPUArchState *: \ + (const ArchCPU *)((const void *)env - sizeof(CPUState))) =20 /** * env_cpu(env) @@ -107,9 +97,11 @@ static inline const CPUState *env_cpu_const(const CPUAr= chState *env) * * Return the CPUState associated with the environment. */ -static inline CPUState *env_cpu(CPUArchState *env) -{ - return (CPUState *)env_cpu_const(env); -} +#define env_cpu(env) _Generic(env, \ + CPUArchState *: \ + (CPUState *)((void *)(env) - sizeof(CPUState)), \ + const CPUArchState *: \ + (const CPUState *)((const void *)(env) - sizeof(CPUState))) +#define env_cpu_const(cpu) env_cpu(cpu) =20 #endif /* CPU_COMMON_H */ diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 81af7b9ee1a..18970ea39f5 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -594,11 +594,18 @@ struct CPUState { QEMU_BUILD_BUG_ON(offsetof(CPUState, neg) !=3D sizeof(CPUState) - sizeof(CPUNegativeOffsetState)); =20 -static inline CPUArchState *cpu_env(CPUState *cpu) -{ - /* We validate that CPUArchState follows CPUState in cpu-target.c */ - return (CPUArchState *)(cpu + 1); -} +/** + * cpu_env(cpu) + * @cpu: The vCPU + * + * Return the CPUArchState associated with the CPU. + */ +#define cpu_env(cpu) _Generic(cpu, \ + /* We validate that CPUArchState follows CPUState in target-info-stub.= c */ \ + CPUState *: \ + (CPUArchState *)((cpu) + 1), \ + const CPUState *: \ + (const CPUArchState *)((cpu) + 1)) =20 #ifdef CONFIG_TCG /* --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432170; cv=none; d=zohomail.com; s=zohoarc; b=aIHd2ZmaN51P1nEP75So39WO4y0YuxA5GAObWD+mPk/kzslMccLDiuneElmqI+qnLk3K/FWuldQISGSkOrqCTrROL1ewQAVNkbioXnYaPbmj67p4BPRxp4wKIxv1+KkKJQeEsJIk4cEfrs5QGuTVzgbnxNa55XGD+4TcWVjDnHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432170; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=ERReEaXdeWam22GR8Ul5fOsg6IlyleQvlAQu5a4eTpU=; b=X1MIkxHIlcsDJ4XPgEwB5H0O98SgcoYV9ULmHpdO6MpdyTm8GoDSgq8fQdM3r3Ien9MqPUWBXAhwzUx1anzVusTOH8Snf0dLtPlTQt0L01HEgXKfMYEC6Z/skZIQgZnBQVTerdhme7ilUuwzlRsFICfWiLsxlMkQZU4LRG3utas= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432170061628.099490353972; Thu, 3 Sep 2026 03:42:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24tu-0003iK-Ig; Thu, 03 Sep 2026 06:42:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24ts-0003gX-GX for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:32 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24tq-0006rM-64 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:32 -0400 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHH603782437 for ; Thu, 3 Sep 2026 10:42:29 GMT Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf5pdrfyy-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:42:29 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-9102f07f2fdso15339466d6.0 for ; Thu, 03 Sep 2026 03:42:29 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5d4938sm61255935e9.2.2026.09.03.03.42.26 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= ERReEaXdeWam22GR8Ul5fOsg6IlyleQvlAQu5a4eTpU=; b=GVVhtHFj2eZT364v RKHuTd8C/BeHiZ9z6ABYRVMjLiVXk5GeaqOU6e9MkDD0motZwsvlWS9oO0QalCpm yUiGYOZCPX6yzmd9QxoJzOFQMg4kLlOMO2RHspTqrv9n5bD1IoMZVAJZRNckStM9 teEW1qH53jAMLWT3ODvAU0QPVYGQJES+KO5mEIDapwI0huy5aaK0dKFu3FY1o70K cgDawwkyNRkadG6ypofUGqUDgJnMAFuGiHqDsYdoe/Y655XuqCCW7IZeym2drOYo 4TdWWxm3Wv6OALtdoj3Q/1Hrc7ZEzhXSwWhwDVWDstKXKa10b1rPtdF7NLW+g2Rt Jtct3Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432149; x=1789036949; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ERReEaXdeWam22GR8Ul5fOsg6IlyleQvlAQu5a4eTpU=; b=OHDlunb0OCkAip7euOpp3aODRTqGze+AzSRqRnK/Rrbcs/MOCbZfA2HQrISxcGo8kR hr6SgTJF7YaApoAzeKHoCuQcNRH9K8WAfJSVs1VaYK9Sq/dbm2lqBP3/K2HXd/g5Y0Ew jMa0V9sf0Tq5ma4Ml7MdGVtMBaKi3nl1N755/V+Gv1wCR/fnED7xm46KVgvLNbRMp5cr 0CD7fxBJqzz5xFB209NR1kv6+z4cpj0xkBZuuZ8jAUOeRfQ8Pu8SWWE3/500Ad+aZ4d0 7NMnG2OUq5kKauA6ioMacYdfh1z6IgmTBuSHM6r7yWA6wSXyh7fkiM52d8+s2fm5t7Sr Eljg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432149; x=1789036949; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ERReEaXdeWam22GR8Ul5fOsg6IlyleQvlAQu5a4eTpU=; b=IkaqAfa5iswNC//EJsOWK6nzcuEqo+FqDTqX6Qn1hqCnCJFWeB1pYIv3jYGpIIso6x u3Fw/OUqYbk6utUwSQ/cXFCi2N1joqBAuGfQbG9cE0MQF9GqSSeFj6/CHpbAc9+L7mwD OfR2Q+jo906dcd/qSbpeiwEz/0yYTTa16td70e3FRpZiGm4Q6YZ2ownAWK4ibRz2gmHu 7WdbYTCSOELq3Q6CeDRrYu/8KPS3NzYnyrTQr4cWTCS7I2hnZXWevgq3xWhnoVZZOo3n N+eXO9d9uJPyH3bWgOdypWJGcOUpw91zOfqjfHBR860Yuq9DRXfwu1Mzsceb/Re00C6q XP/A== X-Gm-Message-State: AFuF++nD2sxTV0IuCUQXFZhOYpilBuaATDbIGyMiMJ/iFgaAbzIut4ZM fn43b67DompM2q0M5KyMhuNx6nXb/u4YDc4e8Q+kEVIgUz2c8BuKi7X1xAIMoCChhKlKHaB0066 kMFN5BKAkXVGq+ZABJtYHqDypxQWLYlzcfRLH+w3YScY7pjOhNZ3JvUQGOQ+6+pkvVw== X-Gm-Gg: AYBFou1C6b6+OGrxpyQx5yLIxAf+4eoFXKhwcHUexPrPZpilUsg4bvaj6U29vzCXrpV P9OCxOTwB/gBVBEHgPpIaduNPG1HbYCUIqztlBQxQOLb/6Z0CejonMZGboTU6lYmKsOJPCvQLQ5 HRaol0EK/Qc2m6m2EW967WPLt0QdkgmcGpoom4vTWL1UkQkNyqK52dMmYNdZqcWI3eo8jp1gbiG i6vnTse6gga5W/nZ7QadSC526h+U3li6nQ4MVIvUV3ueeySTc6r2/rTJAG7V82QhdmblXhyqLST YyF/VdFHeb5bkkMvQEEc0+rsRu5ovM2r2QRXUigEMbhhjZVAvquUxpsMedKHeMhl1cgo0D7tirN s8hD1VGWjKFgOesqk/p+74dmzEkrkYUSIPlG8uA7b X-Received: by 2002:a05:620a:28d0:b0:939:72cb:bae6 with SMTP id af79cd13be357-93972cbbcc2mr193211385a.29.1788432148628; Thu, 03 Sep 2026 03:42:28 -0700 (PDT) X-Received: by 2002:a05:620a:28d0:b0:939:72cb:bae6 with SMTP id af79cd13be357-93972cbbcc2mr193209085a.29.1788432148167; Thu, 03 Sep 2026 03:42:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 23/51] linux-user: Replace env_cpu_const() by generic env_cpu() equivalent Date: Thu, 3 Sep 2026 12:39:07 +0200 Message-ID: <20260903103936.62355-24-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXw9+15UtHi+cI uRMh6jYiePa+2K7hQUfP78eyFM0b+2ujeasV7Y+c1flTybH/VBGG97Vk+Yt36ybsrdq4pMYtVCV zf/3FZ/nJkp+dAEC6cGIsQvm8+p1Edc= X-Proofpoint-ORIG-GUID: DCPXinijXfkygppVesPZIq5EbbsC1b4x X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX0neysQhuDJRa nY78O3G4s59KdVOu/YLJPHBnNtEOmvlex2EmvdPDYhdfwcQ881OmUfI+SVfQdYOnoQ9NfAoVFJM mR3SKHovsnyfYoNrMh35dBPEcc4S0UgGbmHuFFOnWICxIjcZmHubvUa7xZ1NC92MeuzjaRDE96h ElbHLO2kYMKCMB/3+2TjCksQ7LvgTywBJ+bCZWxbdD2Nrt5mky0650n2JqBkef3sBkF6A/p+EYU 6lGPP013yY1E3vvSj9nDAgcIrlpulpnQKblpCcYyjd2411Zkxd692IcDsngr5j8jB2mQOGM1C0b 5PqQAeQ2JbyKn5j8kYOlApsP9jee3YVxZ1h1njPRAu5Cul4SiKr4o3ta1nidYa8iFKAS2vjKSiQ cukggr+RRRR2snWUW+IM0+BfKrE58UtXMnFiaUiuI6MpUKxJcxYalsPvPTtzmHg+VM9NhjjQ0R8 jIHSuIVW2/nGnGe7Kmg== X-Authority-Analysis: v=2.4 cv=RsL16imK c=1 sm=1 tr=0 ts=6a994f15 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=xWu8-Agft_6X_INOG6MA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: DCPXinijXfkygppVesPZIq5EbbsC1b4x X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 priorityscore=1501 suspectscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 malwarescore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_CSS_A=0.1 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432170977158500 Use the generic env_cpu() macro introduced in the previous commit and remove the few env_cpu_const() uses. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260901095229.72018-5-philmd@oss.qualcomm.com> --- include/exec/cpu-common.h | 1 - linux-user/elfload.c | 2 +- linux-user/i386/elfload.c | 2 +- linux-user/x86_64/elfload.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 60997628cc6..c14362f780d 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -102,6 +102,5 @@ static inline bool cpu_loop_exit_requested(const CPUSta= te *cpu) (CPUState *)((void *)(env) - sizeof(CPUState)), \ const CPUArchState *: \ (const CPUState *)((const void *)(env) - sizeof(CPUState))) -#define env_cpu_const(cpu) env_cpu(cpu) =20 #endif /* CPU_COMMON_H */ diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 88508deac50..c4bdaa146a7 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2128,7 +2128,7 @@ static int wmr_write_region(void *opaque, vaddr start, #endif static int elf_core_dump(int signr, const CPUArchState *env) { - const CPUState *cpu =3D env_cpu_const(env); + const CPUState *cpu =3D env_cpu(env); const TaskState *ts =3D (const TaskState *)get_task_state((CPUState *)= cpu); struct rlimit dumpsize; CountAndSizeRegions css; diff --git a/linux-user/i386/elfload.c b/linux-user/i386/elfload.c index 26b12001a3e..2e10f38a412 100644 --- a/linux-user/i386/elfload.c +++ b/linux-user/i386/elfload.c @@ -38,7 +38,7 @@ void elf_core_copy_regs(target_elf_gregset_t *r, const CP= UX86State *env) r->pt.es =3D tswapal(env->segs[R_ES].selector & 0xffff); r->pt.fs =3D tswapal(env->segs[R_FS].selector & 0xffff); r->pt.gs =3D tswapal(env->segs[R_GS].selector & 0xffff); - r->pt.orig_ax =3D tswapal(get_task_state(env_cpu_const(env))->orig_ax); + r->pt.orig_ax =3D tswapal(get_task_state(env_cpu(env))->orig_ax); r->pt.ip =3D tswapal(env->eip); r->pt.cs =3D tswapal(env->segs[R_CS].selector & 0xffff); r->pt.flags =3D tswapal(env->eflags); diff --git a/linux-user/x86_64/elfload.c b/linux-user/x86_64/elfload.c index 49a6f6180e0..121a8167acc 100644 --- a/linux-user/x86_64/elfload.c +++ b/linux-user/x86_64/elfload.c @@ -59,7 +59,7 @@ void elf_core_copy_regs(target_elf_gregset_t *r, const CP= UX86State *env) r->pt.dx =3D tswapal(env->regs[R_EDX]); r->pt.si =3D tswapal(env->regs[R_ESI]); r->pt.di =3D tswapal(env->regs[R_EDI]); - r->pt.orig_ax =3D tswapal(get_task_state(env_cpu_const(env))->orig_ax); + r->pt.orig_ax =3D tswapal(get_task_state(env_cpu(env))->orig_ax); r->pt.ip =3D tswapal(env->eip); r->pt.cs =3D tswapal(env->segs[R_CS].selector & 0xffff); r->pt.flags =3D tswapal(env->eflags); --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432174; cv=none; d=zohomail.com; s=zohoarc; b=KlO1ywGQLCj6dRcNIoNXbT1je9WKgqh2le6D8BijaPdrZkYDQevGvtk6fuUJURhdz0f0JB7QI0ty0gOf8vgS6c00tJ8u9G+dGW1Y5rHvuXGmm/gCRLI3WXktzflkIk5MUcFsnXOABcz3vlg1yyDu2o8XyNru8OF6vOuhi0kXvVs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432174; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=RO2EfpG4mTE1iadWqUmeTkOisJSC3FV4nL89VzJtdF8=; b=HDLExplgkX0Ezjlbpgos/7cSa+jnMhrF+S8Cyq5hLF82Fe/S5oAIqwPK1qM/x7ugDBmAEXFeu6z9vPJ201N0Jsmtg6kfAQIv9xxbgHEsj6uQJ9cDZlLAkYNR4CFmtLyIeoAcSXCx4diaYpfekEj+blqE2ZxTr9m/CpIERseYXFE= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432174332267.62253764702666; Thu, 3 Sep 2026 03:42:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24u0-0003oP-FR; Thu, 03 Sep 2026 06:42:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24ty-0003lG-V8 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:38 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24tx-0006sQ-8F for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:38 -0400 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHGQF3782424 for ; Thu, 3 Sep 2026 10:42:36 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf5pdrg0f-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:42:36 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-93903622880so159383585a.0 for ; Thu, 03 Sep 2026 03:42:36 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5e589bsm56835855e9.13.2026.09.03.03.42.34 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= RO2EfpG4mTE1iadWqUmeTkOisJSC3FV4nL89VzJtdF8=; b=nEZtjmnqETDEs4KW oC34tSIoifp9zcIka1J8KZHlhIkcA9oOPnYPJaUrUnaDNQf98Vi0QgJEhlG2F+Z5 /z84JCgsdyT9TwpHsrWU4maUPm8JgijOkL8fs4voSh7UOECN02739Zj6ymYkx53p hvh90SVicb7Nv4mAVfkG0ntKhSMt2EscNFg1LXwtZPg4rny6F3UYJs078EKvVWUB kq+znNc/Yhy897nOhRXL/yLK95CXGZcp6pvxbYvfNy6yge/uAVtmJU97YV1UwHTV BVuxYx1yxR2bNJgNsp46/Yc5M2trJ6FLRnwK1djisqlm50CxeGJsNk86qYWwZr4v c1bZzw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432156; x=1789036956; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=RO2EfpG4mTE1iadWqUmeTkOisJSC3FV4nL89VzJtdF8=; b=K4XTt/K1Cd7yHxotvJqv5Xx4iOOV7ArCqsip2/Fb5u3pJjFQ1hjXdVJPRqoOxATl/K tLbov2jVGabpeLf6b+EKNgZv0yENgZZokOXZVSm8lMX4u6uJurWEyEuEqfFQ+uy2Jbvs hSKZfm7kxKc3Ljof8mMaM1Zn3NvNe49qbnSPVeH0Ic7R+PFIPr5UsuSlznNyE8MorE/m uT/rkEAKWiSUbXD7ac4beqorU+X1QG1DSNBTXoqogXfJmt9UVoOVzdfrmoRiZv+so2F/ Q7/+yLVLZw++bpKSoWORkKv9eU5j3DMQMYrn9uY+hxf+A1+4S9T+TKxsm6ZqDgaVOATV 1fSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432156; x=1789036956; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=RO2EfpG4mTE1iadWqUmeTkOisJSC3FV4nL89VzJtdF8=; b=kf3+sp+z3LnxDFM0fSUE558TjhkHFdQQ6olb/Z1LggTadUvg1g3cp1mVSriA5qzMpK rRcmsy8UKKIjJVeq9j8XeLIXlr9HPALpCDwUxC3CqOUUyadjg4CAR07yOc4glO9gbyIK ledyS1LIIoz2wGgD1dWnvoJSds1fLd2x+IeCtyhqLchrGAVDquOkRvFReP+IISdeLtMO oBnuK/p1nV2f+Kp8scbPHJgTU+YtA6LPmVenTBUHH7HoMTlg6rUe3ybqrqymrkl2IsSJ XqOjFQ/AvTBeuIly9YsUcVJOTEOau7y196N2piIsDcWCPk8+6E6/nWN1emCKjqjEQCqg 4q0A== X-Gm-Message-State: AFuF++nYYWa6gEhzl1e4UFGF/UDTej/NNxRUDd2Uilr3b4/MnX5A1TU2 stGYMBeygA2wNGOiowVpZ8JmNHKGIK81MNTpsFP69+3ybKkt6YVzwkjdnKNfRwgXICdjA/CUkvi FIS3Ux4OVefq7QBzqSA/SvQfHDEJ8u4E5XQho8Rs2L87sOWztJvnaaosyAC92XEfcBw== X-Gm-Gg: AYBFou24ZlBjFk1qic7tXPXLFiYRYHbdyRKbBHleyFIV2COUgocH+E9K+7g3D2kIWF+ tJzO/4DMgvHkaZ3WAxf6cEHHmXGRPZ5j/dsyLfzAaR/Wz87Hz7elQ4COu2cAsHptIxrr3FLpM+B f6Sdpb5fE3f7LKFA6ZqCGCtC8LXVY2JRfOwNh7fMTHLFtKtc29ZZWcrsLF91ZvKuaGEEWGHdwFv V9VtM7Zgp2WNkoK6Ezx4GZA/CA+9fa8ZFyXBF1xOA6NhQgH66jEgm/HjR5n9JKkYdLpS6099b7E If7/SLBuV4YLbvyHSiuD6USqCqK90AIlJxHUky0PpKbags9LlrsZ53z3kAfjCrPBaIxdw2C0z1F RtkU1vxGEvM8EgqdVG6DpcDlwlQYf1I+5BMtdAwTT X-Received: by 2002:a05:620a:a70e:b0:934:b798:c245 with SMTP id af79cd13be357-9396e07a2bdmr446354685a.16.1788432155633; Thu, 03 Sep 2026 03:42:35 -0700 (PDT) X-Received: by 2002:a05:620a:a70e:b0:934:b798:c245 with SMTP id af79cd13be357-9396e07a2bdmr446352685a.16.1788432155115; Thu, 03 Sep 2026 03:42:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 24/51] system/cpus: Constify various CPUState arguments Date: Thu, 3 Sep 2026 12:39:08 +0200 Message-ID: <20260903103936.62355-25-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX+mKynu2VemHh adxEkJIUoAPaYjVr3hJeCF1oxR3UQXW9SjZ5GCfeP9Ca9CabniCRQPwF6rGPU1AmlnCfxZaENaT SKfvbszVI1HXC7GMRggjWP3/ALDFrv8= X-Proofpoint-ORIG-GUID: iKYWwzY0keFhLyE0owMOGWGqq_LRNLay X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX60vFA4KykfjG f9IL9IMCXbtGARR0iMibNxhqSL6wBzzQjsUO4M0KnVNcfnKainIJY1dnNozWam+aoeSx3CV4E3/ 3QH6YR8FmrTp8Wy/5Z/1KMosyveGp0Qj9/QxHacFEGNfOsqlIkAt6ElePjzuCYF17acd0Aak4o4 ++Sm3IEWG686kq90GZ5RbkL+iTy9mLz+mpTS05rNMTGiZXLudd1rSXpnz7yuGGf8OlbUjQ8u4f8 eGLkirnEvItqiUiNB0CQQEuKDIGgr2fn+D4I49OvhViCESWQml+Avfasg92yNCAVmAQKgFt5hx2 z1Yaqv/kon9MJTI7BOYi/lT76lJ9ahld5vXQywyexkizovdMyeMbjiM2yYXTEgtTMzucnaOBuud +sHcBc4xQNCpyqfAea1z1licONbBu8TxqB/L1xJ29fBeA4jmEEyp62OJc7lJZbtREOEchw9DE6S G/ifsyV4hrCzK/DNzNg== X-Authority-Analysis: v=2.4 cv=RsL16imK c=1 sm=1 tr=0 ts=6a994f1c cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=xPOHbBPGvMiCLs31fh8A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: iKYWwzY0keFhLyE0owMOGWGqq_LRNLay X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 priorityscore=1501 suspectscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 malwarescore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432177021158500 Mark the CPUState structure const when it is only accessed read-only. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260901095229.72018-6-philmd@oss.qualcomm.com> --- include/hw/core/cpu.h | 4 ++-- include/system/cpus.h | 4 ++-- system/cpus.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 18970ea39f5..328e30045ce 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -900,7 +900,7 @@ void qemu_cpu_kick(CPUState *cpu); * Returns: %true if run state is not running or if artificially stopped; * %false otherwise. */ -bool cpu_is_stopped(CPUState *cpu); +bool cpu_is_stopped(const CPUState *cpu); =20 /** * do_run_on_cpu: @@ -1007,7 +1007,7 @@ void cpu_interrupt(CPUState *cpu, int mask); * * Checks if any of interrupts in @mask are pending on @cpu. */ -static inline bool cpu_test_interrupt(CPUState *cpu, int mask) +static inline bool cpu_test_interrupt(const CPUState *cpu, int mask) { return qatomic_load_acquire(&cpu->interrupt_request) & mask; } diff --git a/include/system/cpus.h b/include/system/cpus.h index 508444ccf1c..bf36b823769 100644 --- a/include/system/cpus.h +++ b/include/system/cpus.h @@ -13,10 +13,10 @@ const AccelOpsClass *cpus_get_accel(void); #define VCPU_THREAD_NAME_SIZE 16 =20 void cpus_kick_thread(CPUState *cpu); -bool cpu_work_list_empty(CPUState *cpu); +bool cpu_work_list_empty(const CPUState *cpu); bool cpu_thread_is_idle(CPUState *cpu); bool all_cpu_threads_idle(void); -bool cpu_can_run(CPUState *cpu); +bool cpu_can_run(const CPUState *cpu); void qemu_process_cpu_events_common(CPUState *cpu); void cpu_thread_signal_created(CPUState *cpu); void cpu_thread_signal_destroyed(CPUState *cpu); diff --git a/system/cpus.c b/system/cpus.c index f37e215c586..e11a5aab6a6 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -69,12 +69,12 @@ static QemuMutex bql; */ static const AccelOpsClass *cpus_accel; =20 -bool cpu_is_stopped(CPUState *cpu) +bool cpu_is_stopped(const CPUState *cpu) { return cpu->stopped || !runstate_is_running(); } =20 -bool cpu_work_list_empty(CPUState *cpu) +bool cpu_work_list_empty(const CPUState *cpu) { return QSIMPLEQ_EMPTY_ATOMIC(&cpu->work_list); } @@ -271,7 +271,7 @@ void cpu_interrupt(CPUState *cpu, int mask) cpus_accel->handle_interrupt(cpu, mask); } =20 -bool cpu_can_run(CPUState *cpu) +bool cpu_can_run(const CPUState *cpu) { if (cpu->stop) { return false; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432179; cv=none; d=zohomail.com; s=zohoarc; b=XPRHIOsCO3tthg5TfGjCDZbxMVXEDXM2zImCE2/qme/SKjYC4tR9AmLELXDa9lbvXA3zuYbcj4RGm53QhIzsS0XUPQjvQjOycrBYAG1iHOMtwImuKT+dMJXGs2lK4YAyleNANRmFS0lfbs5exX/FRu0MlXa4ExThLOtWX+bJEk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432179; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=T2IQzbtiIHH/wrbXe+4eGZPBx+zyjlpzsymxWhUzKuA=; b=h7yqZyMs/G1kwinmB8TdV3z6EAuLyb+np1wN80IlfdPTcaveB0geYi0hgAwsmsKF9Zs7/lvAwdUyDaqV4Ec10Szxu4DtJNqGl6vlqoBjvO5U4xwgHvmUYGvAw5RW+zR0bMOagkh0AYX9Jow6jf2+oAFI7RdjgOfl5H2rAFHjEL8= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432179926753.9323789634453; Thu, 3 Sep 2026 03:42:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24u7-0004F6-FP; Thu, 03 Sep 2026 06:42:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24u6-0004AF-BD for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:46 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24u4-0006te-Q7 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:46 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHMOP055453 for ; Thu, 3 Sep 2026 10:42:44 GMT Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4genrdvgu5-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:42:43 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-9390ca1a9abso355144885a.2 for ; Thu, 03 Sep 2026 03:42:43 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e72df2sm13692068f8f.1.2026.09.03.03.42.41 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:42:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= T2IQzbtiIHH/wrbXe+4eGZPBx+zyjlpzsymxWhUzKuA=; b=cZDONQ1a2FAGJkRy TsxXthKQ0ivIyjalfVrKKug98oXYbzBMUg4sxoH33OVJEtq8CKkLP7VLyQxgoep3 iCdy3XotrCzdNTJNY0Qwl5wqqDPt6/4+n+4h6rWobdTiBDzAywIaZG8zfDj6Rntq eV7ZXfvxPKuyvbbUR6OewpRvFK9d67ysH3LwVz9D00rErbIXlh4ifNpX5nPDGorN kkgJMfatYgLipHPcvjXJTXPRuV01UUJmVa7LzpxuaJneUJtRq/dnr0Vk4PgIEdJR oYFRcyCMuuBX5ZzS/03vENO01eH1kyLgRUvQsVZf5c2CREfACI2EMpVG94ZDk9kP cfFHAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432163; x=1789036963; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=T2IQzbtiIHH/wrbXe+4eGZPBx+zyjlpzsymxWhUzKuA=; b=ADvy9CbE0nBU76Vw5SB2bHv2sh3EfF05PG6Uzt1mLoeY8OqgMtkHNLKcZHj/kpTVj6 ZK+TGGI1LE3ZZ7AGiSZrsrfm7YeJCYidrN3Cx2IlRRSrxYBXDwAA38uLkpy/ZgkMO5eA V/dkB/ODkA8mRw3tLEBTJwYr35dmEDVFoiMnienZdjlAs+FcVD2PvBWt6+3e7S/Pk241 0itjf7HhATX/Ue4jY3Jer8xqw5xGV75KW7XDeB8QTsB3Ys3EqmtMT+bI36QXjHgT7mV3 6iDFUPIbZkIo4P4opQVVjBQ39I/+aZ6TPrQahqT5ihpvCyg+3+B8ohCdNIIzr2w+xBYy AQKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432163; x=1789036963; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=T2IQzbtiIHH/wrbXe+4eGZPBx+zyjlpzsymxWhUzKuA=; b=JsjDO7MxQUkSwbcNGyQU/fF1xvOzFsTicNpK4CZtKaRSF2dNnuN/vaL3GG2Y1IG6X2 Ag646qChQeHxIfZGul9UXhQa9CxRUXLYoxnRblw5s2wzCYZ4kRYkYODDXLEcgp1htHXO 23KK9deZsX2IFCKF/jl0HR6QtDt/kMJdVNgbkQeCJ/7OkG/L3s3Kv2CcmA6dM5uvFQm+ /xANNDxa5HFl0CHYYhF2t8N3aJqJ/Z2GrQyy1JgAFLgqwJuqr1mNmK1J8fYhxZFESMrX c2l9cCo31LRUPOd9hmqy/eIlZ00Ss62QJWwmce+T8SV0DgtiUU1+02p9fVhgRfEJd1eL SnJg== X-Gm-Message-State: AFuF++lKjonzExw/FDBhH2FlweGfodi6a4hDXQlnfv1K01oO8Kw1YnLI 7Ly9CQDygU8Buc2OiB5lgRrCvz2y2Bqf0+lNpC1yWQW4FuJsamJ26zmNPLxJc8mcT83euBZ72i2 fqVUdoXucIWwQxIxCa/ImDmlNb+/Hc3ULn48xGnGTxdMa9aCRFcL1f9GWPTwCaDCq3A== X-Gm-Gg: AYBFou0mpNL/k9rqIqFZTS0tx7OesaebrDvaT4GBLRrHhL0SbJj6XYpmKo7IUTqxtBS plw9Rpyjo8bUIFtpcpl2g0qRm14kWiHj1zcrO7+l5yoM9e8seN/FLKQFVHtWsRmxaGhkJ0yoeDE yEYGuDqrkbJnSjWo4gPkGo3ITgKpiZ9nik7Djt3OkUEzzGDWfXcDeEwfnXM8xp+Z77PT9V6mlhY 7EuMCGFNI9pswp9lIT6dTLIo3lQ0MvGGaZD+Qsf4YuCwkdDW1woqfA/X86Btc3kmvzEgIO2m4fQ M+SCdQW8GLWy5px9tZXSnB01XAhcXzuwX0Xf6EQAO/Y/tVHvg2074w4bqPx2smCT+hcPwduh0g8 PSuSAdSAgqm2kFmZk7ARPb93UvLxhI2MSGnsvN9cG X-Received: by 2002:a05:620a:379a:b0:937:e422:85cd with SMTP id af79cd13be357-93960cb8415mr997264485a.7.1788432163288; Thu, 03 Sep 2026 03:42:43 -0700 (PDT) X-Received: by 2002:a05:620a:379a:b0:937:e422:85cd with SMTP id af79cd13be357-93960cb8415mr997261485a.7.1788432162784; Thu, 03 Sep 2026 03:42:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 25/51] target/avr: Constify CPUAVRState for some cpu_*() getters Date: Thu, 3 Sep 2026 12:39:09 +0200 Message-ID: <20260903103936.62355-26-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=H4/rBeYi c=1 sm=1 tr=0 ts=6a994f23 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=064F3_fa85QpgnnSfTgA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-GUID: boJgpaLCSfWHHSexorlnKHQR-fmirgEO X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXxnMVz8PXRsGy op52oapCJc+hpqZXteVGd5DBmmp2n6XBXi53DdOmxEZNAGkIJJrVeBl0z5ZOrh4z0VisiPxfSs2 WnLJ0fwFn8qnOE9Q+jomOu/RC84hE9n5/ZaqkZYu2Q0CIB1cj4s1dcEoBldGECpnHlCpeg0Ws/4 vj1XrXvos9uukaW9hUxmiM+sRXqnBtZcTCoAoFfzE3sW87hppKtc5+d4mGen59NnuO/rOzU4ZBG QMfueCJ4vRBSa1zD1XMLixVOWifTgzRIpAOGLRAspI4PdNZ0g2Vv1ksZ7VdtwFiGP57qXvFoGln 3P4SLrZmTIGaZbvmYxgfKwTAww+UW9+OQ0jzmF0RLQGQdWWXFnWMkl9Skb5+qj0Z+9V67FrsUhc xBer/SPTStwkgTX144th58E1CXVSGmVLjdLH3zWlODMSgruG+LvoM4ECP0T++Xc3taDNoGoHV10 Z0KATKaJPHq7YpAbgPg== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX5c/Cptua7d9c x6yRXRU5OiGmwPcFMKQsPlaLloUlJEb1KaJBwgQwa5QkPhj9wuiaqClAexk9oeIY/Ogcd16o91Q OuBJBZFsA0WJUTRBLEPzSZW2fJegS6A= X-Proofpoint-ORIG-GUID: boJgpaLCSfWHHSexorlnKHQR-fmirgEO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 malwarescore=0 spamscore=0 phishscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432181013158500 Add the const qualifier to CPUAVRState when the argument is accessed without modification. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20260901095229.72018-8-philmd@oss.qualcomm.com> --- target/avr/cpu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/avr/cpu.h b/target/avr/cpu.h index a818db753b2..1e4e839bd83 100644 --- a/target/avr/cpu.h +++ b/target/avr/cpu.h @@ -183,7 +183,7 @@ int avr_cpu_gdb_write_register(CPUState *cpu, uint8_t *= buf, int reg); int avr_print_insn(bfd_vma addr, disassemble_info *info); vaddr avr_cpu_gdb_adjust_breakpoint(CPUState *cpu, vaddr addr); =20 -static inline int avr_feature(CPUAVRState *env, AVRFeature feature) +static inline int avr_feature(const CPUAVRState *env, AVRFeature feature) { return (env->features & (1U << feature)) !=3D 0; } @@ -204,12 +204,12 @@ enum { TB_FLAGS_SKIP =3D 2, }; =20 -static inline int cpu_interrupts_enabled(CPUAVRState *env) +static inline int cpu_interrupts_enabled(const CPUAVRState *env) { return env->sregI !=3D 0; } =20 -static inline uint8_t cpu_get_sreg(CPUAVRState *env) +static inline uint8_t cpu_get_sreg(const CPUAVRState *env) { return (env->sregC) << 0 | (env->sregZ) << 1 --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432184; cv=none; d=zohomail.com; s=zohoarc; b=MbyCa50Olqk4zBq1zhgRupCGFB6ExqhJdgCVICZCnySr+NMjQ2mx7CRAkqKVUX/a4cXelCsYFCu6MmEPsE2WgcXjmqoliLctDzp1TagDc9d4YsPJOZLLKM2XIq+DdrpYasU9S9AiL1ejNTP8fhI4ETbOb3MbFFAe86XeixNuN/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432184; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=24k+NmDlKHqucu5k9Mwo/WIRUV6E4FqHBbmZ6C0Ahw4=; b=j4mCxmQUqtQCHJbHp5qA365hYcKA20TbL+ABOZjzzDx3hSt21rZW0AAMNnyCZhhjCnBfC0/S7iG+NljF29ocxctg/vWHxpUCbMyZp+rPrJI13LaQ1StgKZsp8/4XOSupniglXbJoxbORBdDMjfG4CsWgVo3Fr7isvnyTtcJBnq8= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432184615746.5159577320701; Thu, 3 Sep 2026 03:43:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24uE-0004X3-2X; Thu, 03 Sep 2026 06:42:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24uD-0004VD-AC for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:53 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24uB-0006uB-Hf for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:42:52 -0400 Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHHOE327193 for ; Thu, 3 Sep 2026 10:42:50 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf4ekgtpv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:42:50 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-934963b2bc0so420284485a.3 for ; Thu, 03 Sep 2026 03:42:50 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448ed3840sm13725034f8f.17.2026.09.03.03.42.48 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:42:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 24k+NmDlKHqucu5k9Mwo/WIRUV6E4FqHBbmZ6C0Ahw4=; b=L3MAdmM8deU8POtB TPAELd5dRpEmS/0XcyCi73QRYUP6USndB2mrupealrSL42+Opf+eAKriNQmcWup1 h3IPnxuAGMPaOV6cXMJ6524GscKMvrbv7fVU3iBXYNMttp+LSg7mdNRJM1Ihi4qx kI4qDD1cnjS4BC7RZ7Lb3a1Bnk+ZjDBnzm2BlmPLhXQi/4PL1Qs440jcAcE6PKWa 1Xs6AulI83w7I1OWoZ49sRXTnOaqEh4fIZmplzmTIX8Fo/EyOcVgXMQJ4EF5/sbz qOTFO3Q2nY8pyQiaXhUc4Kbf00HxsTewmmq65l9FOS9cJ266fyeig6wydbuK8w9M 6PhK+w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432170; x=1789036970; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=24k+NmDlKHqucu5k9Mwo/WIRUV6E4FqHBbmZ6C0Ahw4=; b=DbVAUDruHClqBB41LtnVi/XUWQ+7t+2jTcqpotH06dacV/N4p/IpPXUm6Q6jpRlXOQ dUxccYHXrtD2P0BQNocQYvmy2HR/BGhpUlweourvqjO1VVt8Ux2WcBvuqzvqoLpceuBT F6Yie4/E4HowFWgkDj/r3yFCvkhrWGCfYQRV+heeXHcgEwnoDw4OabBPx8q3r8alvku/ Z17cl9FcUYmCKADB27jLd+XVm4K/uGCW8fNtEuQPjV56M4I8tq8r9HscWZz1Ae3PkuUD 619Mm9gUM865ClNqCkdReLZA1maHKf7DcjZeWEvt7QxxriIXWmF1S52ice7OD+kAQhQ0 vpvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432170; x=1789036970; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=24k+NmDlKHqucu5k9Mwo/WIRUV6E4FqHBbmZ6C0Ahw4=; b=q3vhW357Ko1fjcHsFj0b/Eq7XdDi/z2Wg9XTkuugeA/yJp4/UZ7SgBK3K4FH6Ey/uH M6rpyajr2wys1gz+sKVytG2Q0LYAYNbZizWFYchIZL2ScfW/NWmwFUnO8VRbLc1Z2f0Z KrmNcbo3/5Pr2ii+bW5zzuZmDzVF7LIzYbVz3f2Az0xlsis7ewJDqAUalMfFvrsCsKTv 2tGTadCPVGIGIfWjJFSdX6P9lNTIo6vlIOv+86AIEa4b4sNna3Y1rLe7u3eFWKXI18ki bO3s0iTnv3QuzNiAAlcJU+9ugp/W1sMols7wvTb5rJu65DZFGPI+OM8HJXyL4S/779i0 L3qg== X-Gm-Message-State: AFuF++klBZ5B3O22cbz7bHrjiadC2hLbIYcQb1oE+Bmtxl7BLBULTWcZ r8EKDo5XADjfzAZZA+VMhpbDwJEO0eciYKZ/uKJJYsVry93+a3U2bTR9vvzUz1Zgb9i3atDCxc/ 9ixfzdfZp5DIiUOlIF5vWsMVnV2Ll8mdehXJKRim8LF7As5ZsQtFH/fDEqAP36pWp7Q== X-Gm-Gg: AYBFou3V2YHJTVklKGTRRI+6aPiQ7QA3ecRbLchycXWz9s3xTJaRsFMmuqoEKI2VKU3 mpq0sbJh9Gc0HPe7gwf+Yin05Px/PT8St1XDbQpfuUb1TjhwH3AmvjNEHNbJ5089NR/heDDAr9B JWOpSNFeUfgckPs3Ra8aTusUoBMSSfC1PtmvhlDwq0M4xl0ul77Iy65RVXhaLKL4PRSwgok/Tsy mgi6+VK3HAXD8Y4UlVR/vipr7Tx2smeylJRXynXQ0YlIyLlBc7PpuHFApATXzP7jUNT563UoZjV jup/HAYS7IQiDUGJvKR0iRSDQIFIKqPH3zFAYoMYNDiz7fkx0+Z4yKKr09mG+MmjTbvovvwxIUr 8FjYA0HiW1Op3Mqfh0m6uIqw6H7p/9Os06ROFXRrc X-Received: by 2002:a05:620a:a190:20b0:939:27b1:66b4 with SMTP id af79cd13be357-93960c6c960mr1016085085a.6.1788432170029; Thu, 03 Sep 2026 03:42:50 -0700 (PDT) X-Received: by 2002:a05:620a:a190:20b0:939:27b1:66b4 with SMTP id af79cd13be357-93960c6c960mr1016081985a.6.1788432169598; Thu, 03 Sep 2026 03:42:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 26/51] target/hexagon: Constify CPUHexagonState in hexagon_thread_is_enabled() Date: Thu, 3 Sep 2026 12:39:10 +0200 Message-ID: <20260903103936.62355-27-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: FF3shs8I-BVo0L8hvZ1LxcFDTxEt08m5 X-Proofpoint-GUID: FF3shs8I-BVo0L8hvZ1LxcFDTxEt08m5 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXxsbxW39Bxroi s2J2iDrGAGb1ufrphdhn14gGRmS+oyvV4hcpQmPUswRn94NPoE3cAUaomTAIOQ3KBVIUoXjPiqj RxKYjyeSjA9Cv7rRwm+lpVFFCopJrgqdvZ4XnRTzWws1ancwlL1vrudGsRf2/HgiHHV5lkIPhB/ vu2H1Pxd0ItRq1j1HJdKcpfEVXk0jQBuCod2d+PUBtTK2WiexG0Sl0i05SlUSFeXv5nXpwahbSA yDN9vwXM+U9K6D6hKJDvz8glNNt76OqElWWZFJmZltofZv+fbPlFsqhE9Ig2TK3tvxNLJywXjAa ZRDTdEBjxC931V5MuDUvkZWol6P5yGJFenQSYMtw+NTbNva/IxrWE86RUjodmX56foVuZYL63ls Xisqx+I3o6LWvp5e9w+FqYGBvQjQrQckQoedptHCyeXCf44RmA/vzrBI6m86h/f7JzgRFL1KuMl KiGdVzxQOb2mm6E84Bg== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX8RYLz6Xjvz9w 1X2hDBFYpxmijeblNUeNsirtss+vhHsKwT/63a18g1KDL1cwbIZ7+xsR2JrF57NCXLk9/CbYQnw dQt/e2pWswIHevNJ6jXfEdPqa4lCppw= X-Authority-Analysis: v=2.4 cv=PKc/P/qC c=1 sm=1 tr=0 ts=6a994f2a cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=XxrlQHdRtCO5bKJNttYA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 bulkscore=0 clxscore=1015 phishscore=0 suspectscore=0 priorityscore=1501 spamscore=0 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432185092158500 @env argument is accessed without modification in hexagon_thread_is_enabled(), qualify it as const. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Brian Cain Message-Id: <20260901095229.72018-9-philmd@oss.qualcomm.com> --- target/hexagon/cpu.h | 2 +- target/hexagon/cpu_helper.h | 4 ++-- target/hexagon/cpu.c | 4 ++-- target/hexagon/cpu_helper.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index ed5671abe5c..8a4a81dc26c 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -217,7 +217,7 @@ G_NORETURN void hexagon_raise_exception_err(CPUHexagonS= tate *env, * @return true if the @a thread_env hardware thread is * not stopped. */ -bool hexagon_thread_is_enabled(CPUHexagonState *thread_env); +bool hexagon_thread_is_enabled(const CPUHexagonState *thread_env); uint32_t hexagon_greg_read(CPUHexagonState *env, uint32_t reg); void hexagon_cpu_soft_reset(CPUHexagonState *env); #endif diff --git a/target/hexagon/cpu_helper.h b/target/hexagon/cpu_helper.h index ca2e13ab1d1..12512efd74f 100644 --- a/target/hexagon/cpu_helper.h +++ b/target/hexagon/cpu_helper.h @@ -15,8 +15,8 @@ void hexagon_peek_memory_range(CPUHexagonState *env, uint= 32_t start_addr, uint32_t length, uintptr_t retaddr); uint32_t hexagon_get_pmu_counter(CPUHexagonState *cur_env, int index); void hexagon_modify_ssr(CPUHexagonState *env, uint32_t new, uint32_t old); -int get_cpu_mode(CPUHexagonState *env); -int get_exe_mode(CPUHexagonState *env); +int get_cpu_mode(const CPUHexagonState *env); +int get_exe_mode(const CPUHexagonState *env); void clear_wait_mode(CPUHexagonState *env); void hexagon_ssr_set_cause(CPUHexagonState *env, uint32_t cause); void hexagon_start_threads(CPUHexagonState *env, uint32_t mask); diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index 0530ec3ca96..4a7b76e3bcc 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -346,9 +346,9 @@ static void hexagon_cpu_synchronize_from_tb(CPUState *c= s, } =20 #ifndef CONFIG_USER_ONLY -bool hexagon_thread_is_enabled(CPUHexagonState *env) +bool hexagon_thread_is_enabled(const CPUHexagonState *env) { - HexagonCPU *cpu =3D env_archcpu(env); + const HexagonCPU *cpu =3D env_archcpu(env); uint32_t modectl; uint32_t thread_enabled_mask; bool E_bit; diff --git a/target/hexagon/cpu_helper.c b/target/hexagon/cpu_helper.c index 17d6b4eb2b4..9ce260d7448 100644 --- a/target/hexagon/cpu_helper.c +++ b/target/hexagon/cpu_helper.c @@ -316,9 +316,9 @@ void hexagon_ssr_set_cause(CPUHexagonState *env, uint32= _t cause) } =20 =20 -int get_exe_mode(CPUHexagonState *env) +int get_exe_mode(const CPUHexagonState *env) { - HexagonCPU *cpu; + const HexagonCPU *cpu; uint32_t modectl, thread_enabled_mask, thread_wait_mask; uint32_t isdbst, debugmode; bool E_bit, W_bit, D_bit; @@ -488,7 +488,7 @@ static int sys_in_user_mode_ssr(uint32_t ssr) return 0; } =20 -int get_cpu_mode(CPUHexagonState *env) +int get_cpu_mode(const CPUHexagonState *env) { uint32_t ssr =3D env->t_sreg[HEX_SREG_SSR]; =20 --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432189; cv=none; d=zohomail.com; s=zohoarc; b=g5zZX9Asln/zzDAUbqDRBjAWI8dzaCmcXosi1aVe84INvWdmWpQesT/st+hOgY/NUHo9ylpwfnmuG3/ik3niBA1LzU5lKBkfhqWlZKz6onyJztFZWBdqJNB05rzyL+Qq4/8usXq2Jg1B/ODKMJMFleN164Q16nknGQwMfkAb5xk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432189; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Dr+UHkFO0LKPym6+nEOMInKURmEN//Y7+d3LTmdX+hk=; b=hjictMLOyd8WEvARqS9cCUUuse+J8q09SMdazsdP4SPptPLr7+EeX5DAhqgq3RL6NauRddO+bvRl74thTzyvN2V8rWU8zoH32mZ+nJJBRdBiHofg6l8cmL+ytxGhDJ4MYvHlYIALYeT5ZTKJF+Kh8GKiuNPkjsjelbE61Ydtv9I= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432189727685.2599610587533; Thu, 3 Sep 2026 03:43:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24uN-0004uk-Js; Thu, 03 Sep 2026 06:43:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24uM-0004pK-3v for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:02 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24uK-0006vD-GX for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:01 -0400 Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHMku3852435 for ; Thu, 3 Sep 2026 10:42:59 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf51m0nda-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:42:59 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92e82060977so154162385a.1 for ; Thu, 03 Sep 2026 03:42:58 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e72d2asm12204806f8f.8.2026.09.03.03.42.55 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Dr+UHkFO0LKPym6+nEOMInKURmEN//Y7+d3LTmdX+hk=; b=Pr6rF7ARSQXyuj1X wfqUKqB7VWdCztKy7c6JLdTLC3CIne3FqdHG8F/0xmkX+KnS0iNdAZozK9Cdm80L SYcwPvkxnekNDMYXHxge7OZtZp6HQa//YfGWB9S2Cj/5cNGSgSiZK5uIg+Fzdnto vmFX86GCtWjtWyqh0lMUoQfIzf994tAXvVc2IEm8QzA4j+IU52dyXFr2PTW8IhwD jo5OqPWJ6gFzUZuNbnMmLdBoT7HoRPx26eI4CiJoEUA0KhrsmMpvG5Uc6W7mWv6+ +bqiqG1PbSAuPil+DIFP/3wuwZ2g/kh1jkcb1M83vu1FMqDhMkvo5XGzp5F6qOiX 8y4x2Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432178; x=1789036978; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Dr+UHkFO0LKPym6+nEOMInKURmEN//Y7+d3LTmdX+hk=; b=JEvvkfbs7AXcgdUCXnfWTJiL5FlD0X8ZXYTj245viIlVd/XiRHe1ys+mbXkzUiQetf yDmlRO8rQpbaHK2EKi+pkryeuMJPfJ24PJAvGi7d5+NlKlPjX4unyg9EcX3ExUpTRsdX kH8cwn2rhz78DuunkP8MqjIftLgaX8adYOy8BKlOug6t0IdEluwD2z8yEJyyAEBW0442 e3xku4jWK4TdYpF35NuBzSzta0lTaj3SlIAkPOhcpuy5+PtEfLNXGb6RY5CcVT1Fsh+8 cv/c8vMIEExDZ/wlqDT0kWdESH4zgAkER6QXOO2HEGGzm9U47t2Pa9MvXlii26o7WTpo QXow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432178; x=1789036978; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Dr+UHkFO0LKPym6+nEOMInKURmEN//Y7+d3LTmdX+hk=; b=StWdQJyzgJ+NRSi/4Nh1Eiu2djfkt//dnqeS1pV7+VOfMYrST8tci62RbXIQGTuQKk v28zIDklF4WvJpklo/urgYo67TnZVSZX/zkPFNu0xpKsa4Ikyl634FA/K0/KP7A95YcM EpYp+I+ozX3KGjjjrh2mzx3rKjfDSRcTmjwiDpvZU+e1QTOQT1vng01WFC5Dy5Rr4Vp8 JtVK+80X2jFokO22RKuzrkSQMBemdRNeCqy05V67iDx8QqcYuiInxMmh2YUbVLxfbESL IGcZe8snfMUJyXqPS59Awg0TwiZ6hw8n6edgqt8akyokek0ZOGF3neSdZOj9H1orzsgO FL/g== X-Gm-Message-State: AFuF++n7cRbuFFschJ8/mNe1VRoc3eOMHPOZj5GHY9m99Sk2jNORT0Rm B+snO5BupmkdiY8AeLlw6Gz8xvJjWippjj4ePIpPpDQIAm/sXEZMvxwd76zOkbYsqvS3iwbf7Iy jarX9MKm8mLgwCZbsDoMp2esahhZA2spoaGMwSyjIcio9otffQccG1qYLb3Ty9dhiag== X-Gm-Gg: AYBFou2nCvKzpF0PBFoDqNh0ZzwTE0WJ8XWxVtBg0df75ZeFtPHYwlyuNXxM5fo7u2Q vtl+wfKkaaQu2m6ZQahnLlGk4U56ftBA1zSyW9njLRElbjUpsRlbPBn82w3UHNO07+Ws2P9vO/9 b1aOI46UbZ5xr29t3XSzYqSfUfMOS54NzUHUd/z2EPtESGycE0Zpfau+BNx4WybV26TCxyPYChs VqyoR0gBVdA3uoQbQ/ROJQeP85ojXUNyPt+q8Ka8SWgi+hxob+R8yyCRDum9cklgiEQ16Bk0w3p wXMMZyqdktxLZswmzui0TDEwSms6JrNqmv/D4kW571EFXqWKadDSmWcaijLuNn3Jou4XUqdlVD0 jzWlOayyBWSY+5p9lI3eiFJE355we+bxmQFk94oXp X-Received: by 2002:a05:620a:a90b:b0:939:319f:d6e3 with SMTP id af79cd13be357-9396deadfa0mr420166485a.5.1788432178149; Thu, 03 Sep 2026 03:42:58 -0700 (PDT) X-Received: by 2002:a05:620a:a90b:b0:939:319f:d6e3 with SMTP id af79cd13be357-9396deadfa0mr420164485a.5.1788432177675; Thu, 03 Sep 2026 03:42:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 27/51] target/i386: Constify CPU*State for cpu_*_interrupt() getters Date: Thu, 3 Sep 2026 12:39:11 +0200 Message-ID: <20260903103936.62355-28-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: CL7OrMrtGt8nm7BobhlYpr8b1XajkDFU X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX5ego1L7XstQg I1NjV/NBSN0arXOTrZp1FnLnrl1Wgw+LQ5bbnjdkz3VgzxNQZ69oYuchuvM8sVQoBt0QK9K6dj3 NPB5uttd8BmJ9GbpcpjxLj8zcfU/JOCFcwQmNCdO+H75buJAm+c2vUi7JnOyqDy9K7FnD+ceo0+ nIEcK7aa2d8y6V4gge3D2HR5UBFak8P0m6YJ0HQGxVrowVDAV+iBDoCjzBm1/74anL9S/MrPSoE YOdj11DeTE8CCUOeNa9eoxr2r9CRhUEM3ZA+f8wNWa+eone2Blih68cbC5GYqOoj3UaPSM77CQH o9HA4QMTTeS866+LwbQPNPrM1sCKCLo56d9m1Lv2DwSdb9PtBKleDMxikNB+m/tXRN7AQZOD+xd dVLagEQ2SPsOzYpMBoOQrmhw6a9n0TMFwMQoxBY0ILnS4YWOOCzcG3wKfg+gOX5ZC4hqyWyy4rW Su3vphTJpPqRrkVo4Xg== X-Authority-Analysis: v=2.4 cv=X8Ji7mTe c=1 sm=1 tr=0 ts=6a994f33 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=xq8iPuMcQuy4J_Iq5XIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX7H8Lzn2iSPQO fpt0jHbWEaUY0fFWwHwXpTJvAzV7fWcSqOn03AOThO80BxqzFzjFdzW9Uy1OYYDGNUvIDEXL+Su Z05sQJz0ZKivcj2lXPG+bSLmDUi7t5Y= X-Proofpoint-ORIG-GUID: CL7OrMrtGt8nm7BobhlYpr8b1XajkDFU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432191074158500 x86_cpu_pending_interrupt() and x86_cpu_interrupts_enabled() only read CPU state without modification, add the const qualifiers to CPUState and CPUX86State parameters. Simplify directly using cpu_env() in x86_cpu_pending_interrupt. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20260901095229.72018-10-philmd@oss.qualcomm.com> --- target/i386/cpu.h | 4 ++-- target/i386/cpu.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index dc5047cfb25..9ce8ca00381 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2596,7 +2596,7 @@ void x86_cpu_gdb_init(CPUState *cs); int cpu_x86_support_mca_broadcast(CPUX86State *env); =20 #ifndef CONFIG_USER_ONLY -int x86_cpu_pending_interrupt(CPUState *cs, int interrupt_request); +int x86_cpu_pending_interrupt(const CPUState *cs, int interrupt_request); =20 bool x86_cpu_translate_for_debug(CPUState *cpu, vaddr addr, TranslateForDebugResult *result); @@ -3104,7 +3104,7 @@ static inline bool ctl_has_irq(CPUX86State *env) return (env->int_ctl & V_IRQ_MASK) && (int_prio >=3D tpr); } =20 -static inline bool x86_cpu_interrupts_enabled(CPUX86State *env) +static inline bool x86_cpu_interrupts_enabled(const CPUX86State *env) { return ((env->eflags & IF_MASK) && !(env->hflags & HF_INHIBIT_IRQ_MASK)) || diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 84e805ee85e..d01ff1948e5 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -10601,10 +10601,9 @@ static vaddr x86_cpu_get_pc(CPUState *cs) } =20 #if !defined(CONFIG_USER_ONLY) -int x86_cpu_pending_interrupt(CPUState *cs, int interrupt_request) +int x86_cpu_pending_interrupt(const CPUState *cs, int interrupt_request) { - X86CPU *cpu =3D X86_CPU(cs); - CPUX86State *env =3D &cpu->env; + const CPUX86State *env =3D cpu_env(cs); =20 if (interrupt_request & CPU_INTERRUPT_POLL) { return CPU_INTERRUPT_POLL; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432196; cv=none; d=zohomail.com; s=zohoarc; b=UzJJR3cknpW5ypGJPEXp7XpCuoqpor6+3NnIsRT53jEhgH8oPb/nUad0fCQjDxp/J2xSjx5s8ivSBDWu/PwVTM4piV+9EIaiiahCMdnDF7MEGQccOdGNd1fs25Qj6DHoN/z+bEXAUb0F2mr8LHSRPl4+A/tUtZPiNWiGuTxFaqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432196; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=kO7CM3FFkhGWOoPl2r+T8Du9X4KEmq/gC7/+tfEWtuA=; b=Uo4QW5Ji0VoiAAkthFPipXMubWdmUorDRbQ+W37AhBQE6bom05q2w7o6aixtZFuIy+IM299YzQ1bMKciCIhXD4NQdx/kMBfEFBHB+FEK9jHCyiYxvJm0rBt+DALxHN05oxVsahJQZc0Aju7rltz6hLr/tDHhahsO9HXhZHlhqms= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432196875546.0950087848249; Thu, 3 Sep 2026 03:43:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24uU-0005N6-4x; Thu, 03 Sep 2026 06:43:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24uS-0005Ec-Ed for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:08 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24uQ-0006vt-ML for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:08 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHJDJ055336 for ; Thu, 3 Sep 2026 10:43:05 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4genrdvgv1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:43:05 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92e5e38fbc5so409555185a.2 for ; Thu, 03 Sep 2026 03:43:05 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e80745sm13043953f8f.15.2026.09.03.03.43.03 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= kO7CM3FFkhGWOoPl2r+T8Du9X4KEmq/gC7/+tfEWtuA=; b=H/2gtcdtVonr/FBM eycBex6oaqDri7m7rLs5+AZQqlXfK0XloGScTX6KF7RW6RNPxecWwmyZr9a24CGr k0bZbItiN4mkhyKSZLZ+Dvg84Kr5mUpB5Un+x8I2XyZsJH0pWiIftkbYnM4UHqUs GGMZH7XGqBJenA4acLruxm6SnCpvpC8AIqUkcyPIkKJo0aYuUCf2tWpxe++7fZPS wlcBLOWDT6i90lVMK0ZSOy6ktrL3qnx2pJF49Fglm2JHu5fsWbxgyMNm0Qm/DMVq a4x1TuEf7lzmvXkMsQu+mySWLRo/XR4WhzsPRVImyYnQsc6vz10LHlfG63N1eYoI Ezah2g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432185; x=1789036985; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kO7CM3FFkhGWOoPl2r+T8Du9X4KEmq/gC7/+tfEWtuA=; b=KDNIAvO9EdMNdzEeBFvae+gmU6TXNcFeyH5NUyKTyIzn97pEGyyzhIRdrPN/exkfWl PQ0KQ7IFzfuNVytm5WtqxJsMewtVyoOXcSQ0WnheOzTijqSyvlc0ZHmN/chEExfGexaD Zi3RgXWpcHT3NTU1X3DLLjLu9+Ze9T3BIP6XatOt5F/A6i1ODC4PYodI9cAySsj8ose2 IrrAVcn79cWE0UPIRAtdaeiB/9IMdXU7rm5x30KxyNg4VG4kScy11ukRUx+3BbJCavJu SGSUrIrnNhAQZpcyGqd/EAgBrGZ7SJRIs6N3Ei0q9OXX6YWsc1HoLyjIAyUVv62Afa9P kclQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432185; x=1789036985; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=kO7CM3FFkhGWOoPl2r+T8Du9X4KEmq/gC7/+tfEWtuA=; b=APJKvcLpQrtmugqFPqCtMMqsIGBMTyUNVVgEpIPw9dN6GgX2LMc1Tgf2qHoJ7NGnuo zl51upCWbTLryBy1P1pNg039vYl48jBsKa8Td9k0T3vf638oZebSj/YKNwvUPVDL7DL1 CiZrrymmL3X+9M/Fuci8NVRM7QzdhHNRKelg/REg5mmWVAgQLfqGMYIjEQ4GoASIbIYf j928FknqcNsBsL105Dk2gnpwvcYV/ByDa2z1FHsi2n0QbglwL44qFhM30ZceiVSdIlx5 ittE6CoX24iXRQrSPcCLGWGP6tPC3Ob+Q1O5h7b5kQOZRSgwWja2yVkPYVZcNX467NQN dfBw== X-Gm-Message-State: AFuF++nT+DmWy3Q5SyOxI+uWA4rDZBonW0xfeRDi5lBNvf9XKT2k63Qi GbsgV9XGGWfv0xTDPTR4DLkSJXFFtVKAZbrs7qj1nBiQiZ1gQzycNBPGLggMv2rWWbiG//TsU4i 0dPyCDXUKt+yZJQgBWetA2zapP5yOsAx7RKo0h3ZXnksqpViqp/WhhtbilSP94CgyUA== X-Gm-Gg: AYBFou2rCxiRpxKuDPKbu1/ygQHa5t1x7/hBadHrFTWlthKkGx8d7VKQ/KK8CHRpQfV 6lfQY45O0rMZD8Qaaxq1FOxpSLXOg2jaewkzyujcsyNER0rwySFbnRaWE6OWyeb/RSOVZnJOdo6 GShi0n4reNWknvFxwdBcK6UzqJyp2S0XHAv2wPZncVR3T6bnpgiK9lnpjtL7obeVD7jgm6mb+g1 4IyKo6+UYKy6wGnsOECwSIiBqF4Nh4YXYC+zbJUOr/wjkxicDysm3f8fQHjA4iDdOsVorNRE93W xLHY0T6V0urjspQqSr/I8EhqtFE7+kh91owV6sw6otewpRHn0TEtsY218EUlGg+g1QSexw56VNv s7WQJ75e2F2tL3sJXBKusxEnNczGs5i4+v0wCKB1z X-Received: by 2002:a05:620a:8084:b0:939:191c:cac7 with SMTP id af79cd13be357-93972cbb0c3mr303118985a.13.1788432184968; Thu, 03 Sep 2026 03:43:04 -0700 (PDT) X-Received: by 2002:a05:620a:8084:b0:939:191c:cac7 with SMTP id af79cd13be357-93972cbb0c3mr303114285a.13.1788432184399; Thu, 03 Sep 2026 03:43:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 28/51] target/loongarch: Constify LoongArchTLB Date: Thu, 3 Sep 2026 12:39:12 +0200 Message-ID: <20260903103936.62355-29-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=H4/rBeYi c=1 sm=1 tr=0 ts=6a994f39 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=a6ClGZL5xczCKn2Z3mQA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-GUID: 1msfcXQaMQB9K_XNeT-ULSDkc8ru9MAD X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXyhLaMjJkTSKh +gQ1KFqpAUddziTO8LM1ohqzbVtsdVAAxb6FDEO80ssItjwvfPOU0Q6caMaHIHTxTtVwhJhRi1i ri4GdpcsTxanu80Z28ORW8b0LrZAiILsMDjBg0xJs+bd45bM+m/l6bkG90DNSJqaxIlhG/OXcQZ vfDtEsPZkk6jPNT3F+ykFUgRh950Hr5GK4jLJdjUJzR/Y8tEuUU5e57Y/I2z7enMuqryt0uY2Au KaQ55hHhQaM9ikUeh5NhkEBgRNEgWnmaqBC8mD29CcgIGg5xbQAaRUCkjkHS5YAs1QlPjUVY+Ha RS8J+h3SF0G7qDJ/Kq0HH0B4/tTZfBw4JoEHyiuVyVZy1KPjBQgWtZO/OjXvGoS49oPDi3BSMQa c2XZv3fLOdgXkoauSnRBkrvcocezNciz3IzpoHDcl2rraMGPk6YCqS8UtaUfmF6b+tse3jpIt60 pMcQq1SgjdBOk7JlNLQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX/8MuOBo+oyeZ GH2Myub8AsFN+c8kJKHHeXuj5rcHoqWVAgoQK9rjjLnRoo20HqrLeZPYroG8ax8GRRjpjHR8+RR h3YfKqKucP4uMCWqaGTP2mLLaYbzfW4= X-Proofpoint-ORIG-GUID: 1msfcXQaMQB9K_XNeT-ULSDkc8ru9MAD X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 malwarescore=0 spamscore=0 phishscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432197132158500 The pointed LoongArchTLB is only read, not modified: mark it const. Reviewed-by: Bibo Mao Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260901095229.72018-11-philmd@oss.qualcomm.com> --- target/loongarch/tcg/tlb_helper.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/loongarch/tcg/tlb_helper.c b/target/loongarch/tcg/tlb_h= elper.c index a4b90beca65..40cc0764248 100644 --- a/target/loongarch/tcg/tlb_helper.c +++ b/target/loongarch/tcg/tlb_helper.c @@ -238,11 +238,11 @@ static uint32_t get_random_tlb(uint32_t low, uint32_t= high) * field in tlb entry contains bit[47:13], so need adjust. * virt_vpn =3D vaddr[47:13] */ -static LoongArchTLB *loongarch_tlb_search_cb(CPULoongArchState *env, - vaddr vaddr, int csr_asid, - tlb_match func) +static const LoongArchTLB * +loongarch_tlb_search_cb(CPULoongArchState *env, vaddr vaddr, + int csr_asid, tlb_match func) { - LoongArchTLB *tlb; + const LoongArchTLB *tlb; uint16_t tlb_asid, stlb_idx; uint8_t tlb_e, tlb_ps, stlb_ps; bool tlb_g; @@ -296,7 +296,7 @@ static bool loongarch_tlb_search(CPULoongArchState *env= , vaddr vaddr, { int csr_asid; tlb_match func; - LoongArchTLB *tlb; + const LoongArchTLB *tlb; CPUSysState *sys =3D env_sys(env); =20 func =3D tlb_match_any; @@ -594,7 +594,7 @@ void helper_invtlb_page_asid(CPULoongArchState *env, ta= rget_ulong info, target_ulong addr) { int asid =3D info & 0x3ff; - LoongArchTLB *tlb; + const LoongArchTLB *tlb; tlb_match func; =20 func =3D tlb_match_asid; @@ -608,7 +608,7 @@ void helper_invtlb_page_asid_or_g(CPULoongArchState *en= v, target_ulong info, target_ulong addr) { int asid =3D info & 0x3ff; - LoongArchTLB *tlb; + const LoongArchTLB *tlb; tlb_match func; =20 func =3D tlb_match_any; @@ -842,7 +842,7 @@ static TLBRet loongarch_map_tlb_entry(CPULoongArchState= *env, MMUAccessType access_type, int index, int mmu_idx) { - LoongArchTLB *tlb =3D &env->tlb[index]; + const LoongArchTLB *tlb =3D &env->tlb[index]; uint8_t tlb_ps, n; =20 tlb_ps =3D FIELD_EX64(tlb->tlb_misc, TLB_MISC, PS); --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432199; cv=none; d=zohomail.com; s=zohoarc; b=cpT6QDYx6b+G1gEvmYhHJ4z0UDFxmkAU7+axqeTaJ2D2nz9y24VrfuvlMJ3dYDdfff5SAFoRDfwAjFg1eRAIpRHy++2voMLqXBFq30+6Nboo8i3Lwzd5msUZ72gER6ZhbCesP3/+BhXM9BaqnvvfbvzNmxq2rNtXy/MihOWuMvE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432199; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=7LN5/bTTppSoZfmkwWBxvOGxhVP9lcaCbEvP3eVz2+s=; b=ZzECQH0Q4kL5hSomFlBFe6KoACNB9g2ua8k+M1VsM4wPdgHotY3lxbOQVmy4ZIWLBOgb1KynaWx2838tBYZ52A1P/dAV+Heq1X4f3dFEfH3p9YefGT5M0Vv31yio4AjnHBzFTq03dOsN3IlKgOcLk8AM7Y/6h+PcDTMIAaoNpso= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432199548566.2655503732112; Thu, 3 Sep 2026 03:43:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24ub-0005Wq-2E; Thu, 03 Sep 2026 06:43:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24uZ-0005Tt-Lc for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:15 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24uX-0006wp-Uj for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:15 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHCs9162798 for ; Thu, 3 Sep 2026 10:43:12 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf6tx04p4-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:43:12 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-9393ac4961fso163213785a.2 for ; Thu, 03 Sep 2026 03:43:12 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448ed2edfsm12619799f8f.23.2026.09.03.03.43.10 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:43:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 7LN5/bTTppSoZfmkwWBxvOGxhVP9lcaCbEvP3eVz2+s=; b=RLzhBv7R5HFDgBU7 ejLRfWlcs/pYiRkc0yJnlB+ZSVLL1RnFmxSyZx40BUgJMQfRMOFnt+2YfFSaFnmO W/RULbhbR/v71tvpkMoHaYDG8n0b4xcjS+llwyLRPGjl7GKWksu7tU2tGPf8LKwe ozFCssVWq7LCvDS1nJHre9CUnQYDQw1yxFkiWCc34XdiRBl2UIOupby+IRVgQJ0Y xMts89CCKWiePIh4WyQbCdxrMVrpDaLUgGukXazIj/ZewK5hYQFP5JSAr1HGkABj vNxPV4cOHqI0h4MfOGP+hpNs5fpnBneQa1wFtySwVyOWey3vlTiQKh5HI0iYYYPJ cD9y5w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432192; x=1789036992; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=7LN5/bTTppSoZfmkwWBxvOGxhVP9lcaCbEvP3eVz2+s=; b=SMRHOwXu6i40ehJZfQsvjqv791qCqW0CLzm3btDmjlDUkRH716uJhjz8v+TZZcJ21n wP4URiRucRQTnKoZpRVXlWFNM9vF5bjhE6fymvOhW9V79ndiZhoB01bTk8LRJkXtcxS9 sHSZkq7SNUcSwIjhvcAc2gGF34uPGkd1wuWR21RpJ2/TJrZ7fGenONupjLyA34PFkqt3 sOZBg1EzR3BoeamlNh034/zH3F1H3505g7gw1/rrVRHZGIYlcv4o6Cmyx5lv4Z10y+0L 5l816PUypLhAbooOxTx+TBKFn/PzcY0YttHn9LLHdsyqaSjseGE25SYn3pF4pfsCieM6 OpBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432192; x=1789036992; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=7LN5/bTTppSoZfmkwWBxvOGxhVP9lcaCbEvP3eVz2+s=; b=jSOyL3+1vUKZdFT553XruqP33kHnC5iwWbg09Rwao8EMX5gEZfZAMkqL3gkJRjKMOs 1w3gTO8s7n/YrTaynbMOa1Q5j27rGjTXWaH+TOl14SMWP7X/yVvX0IfygDakGbGt0qM3 m+kwfv5JZDYM3JfPx9pfS+2XUXHIV+F159mm/rd6aNFBHlzX4vajfKCOpHoGhgMHedUI 0E2X9AoAXLzK9EFcA9DD/Jx5gSCmYDRJzO7CTIiq/9LFU4J4t0h0Zdz6yBD5iQEyKWWD Du3weMCV40cvJBCFD5rtgp3xVifM/5iRyMBCC6Jsja5DIGhY8H8RPC4+TzihLc0NxmD8 3WUg== X-Gm-Message-State: AFuF++mkoCF7narT84MmtPrOwHV/HqLKTjXPI+jI9WKMGLPTXzc6yZE5 vYyo9OOe8gJq/+vAoRT/kqBiG2GYa+bIAAqXGnyFIiNqkw0X9AGpodgKLRYcsF0m7nrwKXE2W3S 6totauvQG6j9pPR2wvap45cPokH3R7Q9xPupfssW0bn/K2N7yYxvVEmXPg9+m78YwCw== X-Gm-Gg: AYBFou1oHM2L+OpqcRAH1V2q3p+xiNoaj5IPHfatwri2DDL5PKAVqRcw1CDrdfJuq0A nYEsayl21dL61rrMHKs4Z3xc6oKVWBaflMALNx/FkF/UupYo+vnKm/0Rjbhu9P8uyvzXAr1pusS CJHkwvxFiW0QmcQuRuIAANxbbIxK6JNtsey6FkSRIGlh1tb+2soU+j36SpASTmdRMAi6kRGORCF KwjTd73F+k5ZJduAWwo2ATVCa3GichcW1Wvy3kHhsuGwfmZLnYSO8hy+SjvJ+gHOnEHllPnqD0N dpGE1pXHjB4FI6CSP0OSOD8StDsFAt+P278v9+HWRboub8yZliS11nVx/7DJGc0JcEWUufuKHtC rqB0ABq7+UghF33Eet7h2BHaseq4Jgwh1NmkHrp4I X-Received: by 2002:a05:620a:648a:b0:939:353c:cddd with SMTP id af79cd13be357-93960ca2320mr1094233085a.9.1788432192134; Thu, 03 Sep 2026 03:43:12 -0700 (PDT) X-Received: by 2002:a05:620a:648a:b0:939:353c:cddd with SMTP id af79cd13be357-93960ca2320mr1094230285a.9.1788432191557; Thu, 03 Sep 2026 03:43:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 29/51] target/mips: Constify CPUMIPSState for various cpu_*() getters Date: Thu, 3 Sep 2026 12:39:13 +0200 Message-ID: <20260903103936.62355-30-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: Y5GC14r0BrrG4hTbyu-vCgFKtN4pW7IG X-Authority-Analysis: v=2.4 cv=TqjWQjXh c=1 sm=1 tr=0 ts=6a994f40 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=h4i2fRRWLofFFTjKLt8A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: Y5GC14r0BrrG4hTbyu-vCgFKtN4pW7IG X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXxV+BHNi3CMrg lLS5o3xgE18yG3SW9I3eWiCSq8DYmm3PkD/BspiB5d6eR9V1hIOFvebcxukPtqzLijDFlOT+TZp hZHXTQbpiC3d39zeJbhwDmO/641S2alHz/Yc1DPRNM/V3mah/mJGJctj7r7LyuObiCQTWnVEnHk WrVLZOuD0HaqVuyeQMjnBYdhAijoluaxiPEztnoo83sWrkzqxGSmlRiCT1xHFLw5099H8/sGjpF Nu/wNjdXUc5WVzZ0r8NKlOxQxPlzOInl+1r1zthoLHDEJzRD+wb3teMXNuD01Bo0M0EbsGSvqH1 Ydx8gW9V/bOfDFqEjqtYYuh55qUdbyD4x96ULUaf+hIDaF8eEPV446PRle9cXNgtsCoFqCQ+9d2 3mkDr19TGQ5B/378lswY+nMleRGjKd8NKr0uBpGrMlme7K16viE08ZHQoCVtPP62wTv23smlgd4 xr4CfT6ep79+zx+C9QA== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXwsYKSDq+Hv6q +uiJHSJkw6h8jYWCPZ9QXfh4Xf7O+JjNGjExIZE2RpPocjv0FXSwekidiYh7L9i5zyF4gOmnuX9 mpSe43uTRJ/qcObfhj2NNwsVZB0h6nU= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 suspectscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 malwarescore=0 spamscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432201165158500 Add the const qualifier to CPUMIPSState when the argument is accessed without modification. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20260901095229.72018-14-philmd@oss.qualcomm.com> --- target/mips/cpu.h | 8 ++++---- target/mips/internal.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 319147a948c..32549791a18 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1300,7 +1300,7 @@ static inline int hflags_mmu_index(uint32_t hflags) } } =20 -static inline int mips_env_mmu_index(CPUMIPSState *env) +static inline int mips_env_mmu_index(const CPUMIPSState *env) { return hflags_mmu_index(env->hflags); } @@ -1372,19 +1372,19 @@ static inline bool ase_3d_available(const CPUMIPSSt= ate *env) } =20 /* Check presence of MSA implementation */ -static inline bool ase_msa_available(CPUMIPSState *env) +static inline bool ase_msa_available(const CPUMIPSState *env) { return env->CP0_Config3 & (1 << CP0C3_MSAP); } =20 /* Check presence of Loongson CSR instructions */ -static inline bool ase_lcsr_available(CPUMIPSState *env) +static inline bool ase_lcsr_available(const CPUMIPSState *env) { return env->lcsr_cpucfg2 & (1 << CPUCFG2_LCSRP); } =20 /* Check presence of multi-threading ASE implementation */ -static inline bool ase_mt_available(CPUMIPSState *env) +static inline bool ase_mt_available(const CPUMIPSState *env) { return env->CP0_Config3 & (1 << CP0C3_MT); } diff --git a/target/mips/internal.h b/target/mips/internal.h index c5c286872eb..7dba22300b1 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -165,7 +165,7 @@ void cpu_mips_store_cause(CPUMIPSState *env, target_ulo= ng val); =20 extern const VMStateDescription vmstate_mips_cpu; =20 -static inline bool cpu_mips_hw_interrupts_enabled(CPUMIPSState *env) +static inline bool cpu_mips_hw_interrupts_enabled(const CPUMIPSState *env) { return (env->CP0_Status & (1 << CP0St_IE)) && !(env->CP0_Status & (1 << CP0St_EXL)) && @@ -180,7 +180,7 @@ static inline bool cpu_mips_hw_interrupts_enabled(CPUMI= PSState *env) } =20 /* Check if there is pending and not masked out interrupt */ -static inline bool cpu_mips_hw_interrupts_pending(CPUMIPSState *env) +static inline bool cpu_mips_hw_interrupts_pending(const CPUMIPSState *env) { int32_t pending; int32_t status; @@ -247,9 +247,9 @@ static inline void restore_pamask(CPUMIPSState *env) } } =20 -static inline int mips_vpe_active(CPUMIPSState *env) +static inline int mips_vpe_active(const CPUMIPSState *env) { - MIPSCPU *cpu =3D env_archcpu(env); + const MIPSCPU *cpu =3D env_archcpu(env); int active =3D 1; =20 /* Check that the VPE is enabled. */ @@ -281,7 +281,7 @@ static inline int mips_vpe_active(CPUMIPSState *env) return active; } =20 -static inline int mips_vp_active(CPUMIPSState *env) +static inline int mips_vp_active(const CPUMIPSState *env) { CPUState *cs; =20 --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432208; cv=none; d=zohomail.com; s=zohoarc; b=fDdLKwkXCs5L79v+T0dlQkI11l9amFO70iIVMi5fntb0vOdV8hWYSEpFt/drGIUBGkZTLX1c4P9jt/8CjGy30+cfqggUbld+HBWSMyVdSnIPWsmZt2b1nZhmh+SeBOenVvNBtLo0bhz5tfsHIsvcrLMYcgorchO13XBTrgMFlns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432208; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=f0Skn+8bjf9L/XrkfsB3LtkwG3OP3OS/jIMH/4fHdro=; b=JbM0rvCkqJOhLP59A27cj1D8Is6QWUeasBONy/7nNT6DSeM+HRkebtxZe2Vs+0ruF+RR+Z7+MKNpaHjLM8d4AA0pcQQxFcYS9JmzZU5fbvKx0Epf0zOVUtAzdmPKF6ESdB1vxYt6J+/ET2U8rzAiJeSbPIZXtuKAkXD08THoeOE= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432208213861.0255497998832; Thu, 3 Sep 2026 03:43:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24ui-0006KT-Ne; Thu, 03 Sep 2026 06:43:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24uh-0006BY-Ge for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:23 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24uf-0006xr-LV for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:23 -0400 Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHHOR327193 for ; Thu, 3 Sep 2026 10:43:20 GMT Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf4ekgts0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:43:20 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-9394ad7f64aso430070485a.3 for ; Thu, 03 Sep 2026 03:43:20 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5d9db2sm63340755e9.8.2026.09.03.03.43.17 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:43:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= f0Skn+8bjf9L/XrkfsB3LtkwG3OP3OS/jIMH/4fHdro=; b=luTCsDC4vRMBoPKT SUhO0+qlFciICkEaVSrtEXAj0eCMrgShBsn7wa58tRin50lWETIFzFhgkKUEiLqD EF3wDOUvLIsjgG7WgqR8+8Hwen/7TJf95aIcjP3QbXKMlXC71no2Y7mGUozzNSQw N2dfsb6CWavrrDLqFsuY7wm7cwIbagUbcphVc9GkpZxd1aV/hmMlTbjnxUSS2vqn 7LgxO2473u7MtmEgx44H6hdb78Byp36w7TWf/poA7RkeAd0oJssXDOqMjUH1y4Q8 PrB3I68C+KRIXq2EPlGUXLeByZQuGAC9nfTwf3pS9j8vKvy1sXjt7tTCUfEBKvyZ 4dRnlA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432200; x=1789037000; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=f0Skn+8bjf9L/XrkfsB3LtkwG3OP3OS/jIMH/4fHdro=; b=YdAdDXZnxHUV3ZZWWSeXP+wyhG/j5hKurAXgqCitEAAj9p1Ai0cKH061iGIMPcf9x2 qt5mZSe6x+cN2vyz03AsG801Nc3URMc+vveri9ercFHd9SNhZi34IsxRFZLFNu8OPpG9 JKS/RnrJawmFhEcIzgoJrZsvl5dkFmHmastQh6yQkk7YBrN9VU1l1s7+sL277tTmzFZo 1ZVBQ30GXQeKvhHpZ7hNEvkj/J6q2Wbm2srLZJLHoZB+c3WIaqh5nGEInMwiosxSeyW/ DyNamkIY3dkXuoao9t0eiMWO9YigQaoR5n65Lw2gJKc+fiCe5kyhXsoSJwMBgnbhg00f AIWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432200; x=1789037000; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=f0Skn+8bjf9L/XrkfsB3LtkwG3OP3OS/jIMH/4fHdro=; b=sQEcswhXAd16MyNUH1vX4N3HbBYRy59z6FyOu5CNThpKVa7HCDrdUdEpEfxwzqW8yp BEEISJ4l6/XT+g7wp1V3CjL3W6IMk2jmHyYlQUCYr5ZVkmzbwkNfDIvCMc2RCz+nnc+r RI6STDZizsJ5y9dYxl2Np4WDVRFb8CjuNa/hi/KvTAwJPLSnh+relckjrJ0T3wI04yny HyknSc3U7PDfiZx9yvT3ESb3QTBN8MxY74Ud0K8mlX8NFmfF1mvAGHglIE3+KNl/szFz p6FVgEstYTiNGXVWIZW1vtoL5gdpMQ573BnbVhqlIP6GH2oQTrnSVndHgw+xoqN0GNGw UiEw== X-Gm-Message-State: AFuF++mkI4uVdWFzsP1QRc28MLFA8Aaj6B2BWUFlvANmzkDeOf3fMUUr iU7GOZS8bR24Jy4K3s+Ai0i8n94vcYMOz37u/CgdFec4hwCORXCm8TttHLAV0CSFDAgnIg6q+QD 6CBOVP3HZ4dAuqTwXwF9Z+QfWXRlaeaPiwLPefwgi3tbT6+4PVqCLmdZ6Q1FE39S9zA== X-Gm-Gg: AYBFou1BavcqDw/UwmxYxr2EZFPRYxP11Z6IBYeOLCQgZtJo8c33sKtk0caXZL59Kca Bts/MZPv/e0eDVrywAPsvdUvlFkT/AemVotDu4ekauDuK5SJZZsqpKH75fuKIo602vJ3O9A+nh9 V+PqEQBiExnF7dmheYLlE/0TZm2tV7+SOK3akgEw03VeSW2ftKFZbMLgKKDxJ/ZNCN2oGWFGy4z eh/6lEWp3N68GGSibUiq9mGcAgTmM6adelHlcXItry3+EO+6NtCd15uSY8XuvI84IvonOS6Bfuk CFrQKADUcRPxhSBkKnp0XqKAYH36juCPcFrcRr1pIHdBJK+XP3/UuUamD+S27ZWBxgDoEjvT7Jz wwyRkY0E0nba9CjRRkahIPYAh8kuXuS0VZwxkAkWI X-Received: by 2002:a05:620a:398f:b0:938:fd9b:c615 with SMTP id af79cd13be357-93960fdc482mr920186985a.40.1788432200018; Thu, 03 Sep 2026 03:43:20 -0700 (PDT) X-Received: by 2002:a05:620a:398f:b0:938:fd9b:c615 with SMTP id af79cd13be357-93960fdc482mr920185485a.40.1788432199612; Thu, 03 Sep 2026 03:43:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 30/51] target/s390x: Constify S390CPU for cpu_has_*() getters Date: Thu, 3 Sep 2026 12:39:14 +0200 Message-ID: <20260903103936.62355-31-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: PHvLMalNfNowUmzkCfO-5uwotJhjf7rQ X-Proofpoint-GUID: PHvLMalNfNowUmzkCfO-5uwotJhjf7rQ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX2wfmZXDCQLKT vZhnhwtzbJBJlkUDTM8RcCYEihZKgblgWUSKu0up1omRCDto8h6t9Sl8nWrEzQ0SUOQu3CCwVa0 RMUq9ygCePSPgb6OHN2a2z6+viEAxLMziQCPSBn1kcUw11nDyETTwICiAI9gwhb+WiPzN1RiMh/ X9vqwJgKzIaT+xHXIoQAYLZ7jyPlHF45OIDcDxeRgV72eEZ+8RYVIe5/jx4fJplxODaPza7KnHs U+aHQpYvvvltk3VkJ/u5ePYu0f7eA3+fpP+2E0vAOltDBCOlADagTS9Mii1KQMlmYwxB6pMfVoX ximu55X5qsjNG1S+yXg0rV3MU5FK1vLLuGwSuc25rwJe2dgB630ChjeowBxmsyJAX3CibQzemxJ JyIDiive0IZbwvxeFwcnMiyuRcPU8KHt4idQOQcKRcP1OlmpiT13m0PicuD9x2u8r6GOs2aG4tx VTsohS6ZCzubsUiTK7w== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX5rQVHDvPlH3i GfHnzaVutX/GjNGeuF23llPQRN4EH7/QRTEJByDQCliWPqn5QnfDJfv/IErMecXpumSXdJhyAcW WXKSuaTQUGEwEen07n6XqJsRYergkEg= X-Authority-Analysis: v=2.4 cv=PKc/P/qC c=1 sm=1 tr=0 ts=6a994f48 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8 a=mU8mmpTTODwToQi1tsoA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 bulkscore=0 clxscore=1015 phishscore=0 suspectscore=0 priorityscore=1501 spamscore=0 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432209226158500 Add the const qualifier to S390CPU when the argument is accessed without modification. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich Reviewed-by: Marc-Andr=C3=A9 Lureau Acked-by: Eric Farman Message-Id: <20260901095229.72018-15-philmd@oss.qualcomm.com> --- target/s390x/cpu.h | 2 +- target/s390x/s390x-internal.h | 12 ++++++------ target/s390x/interrupt.c | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index f55b79ef8ac..998bbb0d7ff 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -854,7 +854,7 @@ static inline unsigned int s390_cpu_set_state(uint8_t c= pu_state, S390CPU *cpu) return 0; } #endif /* CONFIG_USER_ONLY */ -static inline uint8_t s390_cpu_get_state(S390CPU *cpu) +static inline uint8_t s390_cpu_get_state(const S390CPU *cpu) { return cpu->env.cpu_state; } diff --git a/target/s390x/s390x-internal.h b/target/s390x/s390x-internal.h index 81da207a5f4..da60b2b1fd4 100644 --- a/target/s390x/s390x-internal.h +++ b/target/s390x/s390x-internal.h @@ -334,12 +334,12 @@ void cpu_inject_clock_comparator(S390CPU *cpu); void cpu_inject_cpu_timer(S390CPU *cpu); void cpu_inject_emergency_signal(S390CPU *cpu, uint16_t src_cpu_addr); int cpu_inject_external_call(S390CPU *cpu, uint16_t src_cpu_addr); -bool s390_cpu_has_io_int(S390CPU *cpu); -bool s390_cpu_has_ext_int(S390CPU *cpu); -bool s390_cpu_has_mcck_int(S390CPU *cpu); -bool s390_cpu_has_int(S390CPU *cpu); -bool s390_cpu_has_restart_int(S390CPU *cpu); -bool s390_cpu_has_stop_int(S390CPU *cpu); +bool s390_cpu_has_io_int(const S390CPU *cpu); +bool s390_cpu_has_ext_int(const S390CPU *cpu); +bool s390_cpu_has_mcck_int(const S390CPU *cpu); +bool s390_cpu_has_int(const S390CPU *cpu); +bool s390_cpu_has_restart_int(const S390CPU *cpu); +bool s390_cpu_has_stop_int(const S390CPU *cpu); void cpu_inject_restart(S390CPU *cpu); void cpu_inject_stop(S390CPU *cpu); #endif /* CONFIG_USER_ONLY */ diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c index 1dca835c5d8..d7e3fd45e4b 100644 --- a/target/s390x/interrupt.c +++ b/target/s390x/interrupt.c @@ -139,10 +139,10 @@ void s390_crw_mchk(void) fsc->inject_crw_mchk(fs); } =20 -bool s390_cpu_has_mcck_int(S390CPU *cpu) +bool s390_cpu_has_mcck_int(const S390CPU *cpu) { QEMUS390FLICState *flic =3D s390_get_qemu_flic(s390_get_flic()); - CPUS390XState *env =3D &cpu->env; + const CPUS390XState *env =3D &cpu->env; =20 if (!(env->psw.mask & PSW_MASK_MCHECK)) { return false; @@ -157,10 +157,10 @@ bool s390_cpu_has_mcck_int(S390CPU *cpu) return false; } =20 -bool s390_cpu_has_ext_int(S390CPU *cpu) +bool s390_cpu_has_ext_int(const S390CPU *cpu) { QEMUS390FLICState *flic =3D s390_get_qemu_flic(s390_get_flic()); - CPUS390XState *env =3D &cpu->env; + const CPUS390XState *env =3D &cpu->env; =20 if (!(env->psw.mask & PSW_MASK_EXT)) { return false; @@ -199,10 +199,10 @@ bool s390_cpu_has_ext_int(S390CPU *cpu) return false; } =20 -bool s390_cpu_has_io_int(S390CPU *cpu) +bool s390_cpu_has_io_int(const S390CPU *cpu) { QEMUS390FLICState *flic =3D s390_get_qemu_flic(s390_get_flic()); - CPUS390XState *env =3D &cpu->env; + const CPUS390XState *env =3D &cpu->env; =20 if (!(env->psw.mask & PSW_MASK_IO)) { return false; @@ -211,21 +211,21 @@ bool s390_cpu_has_io_int(S390CPU *cpu) return qemu_s390_flic_has_io(flic, env->cregs[6]); } =20 -bool s390_cpu_has_restart_int(S390CPU *cpu) +bool s390_cpu_has_restart_int(const S390CPU *cpu) { - CPUS390XState *env =3D &cpu->env; + const CPUS390XState *env =3D &cpu->env; =20 return env->pending_int & INTERRUPT_RESTART; } =20 -bool s390_cpu_has_stop_int(S390CPU *cpu) +bool s390_cpu_has_stop_int(const S390CPU *cpu) { - CPUS390XState *env =3D &cpu->env; + const CPUS390XState *env =3D &cpu->env; =20 return env->pending_int & INTERRUPT_STOP; } =20 -bool s390_cpu_has_int(S390CPU *cpu) +bool s390_cpu_has_int(const S390CPU *cpu) { if (!tcg_enabled()) { return false; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432220; cv=none; d=zohomail.com; s=zohoarc; b=ZO9EjvWBUEn9Z5DcK0z64wahgWwPUe5LjFz1ORDFEldk3oy1oGpB5DbDj6+0Yhk85Tup0TuKLKyvzpge7+B2AkW8GZrVi8Q661AL5MXcc1V3OAXukia29oair3AwCAR9hZtT9OSlD67PMUkc2R3NjseQkLZ9N4OifUliHbMEEjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432220; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=r1ILxo6mmx63aRLirfFj6dx57ZFPx3gOEtU3qssEgDM=; b=Ql1ZrZad6bJKESGEIhOgA2gCvMcOzjwM3Ih1l0zHPgefub/t5p1DcL6FVWw2YlGXmy32DUivFgQD5bQHj+BBYe9JwS0jtNCoyloe7drQhZ/UZwF/63zap+9szJiOltOHh2d7vysvhi3DgC6R9gdf9RbInYeNLqvGvdq9nqyxxdQ= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432220137772.7653960664298; Thu, 3 Sep 2026 03:43:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24uv-0006is-J7; Thu, 03 Sep 2026 06:43:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24uu-0006dF-13 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:36 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24us-00070h-Al for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:35 -0400 Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHBW3212433 for ; Thu, 3 Sep 2026 10:43:33 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf1pyhfyb-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:43:32 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-9382f9430deso412511785a.1 for ; Thu, 03 Sep 2026 03:43:32 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5dec54sm73066395e9.12.2026.09.03.03.43.25 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:43:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= r1ILxo6mmx63aRLirfFj6dx57ZFPx3gOEtU3qssEgDM=; b=jAh7ae+5CWXKHK1t 1a4yvT160RLKuxkao5LIdElR+eMNWzYW5banlmw6u2yw5710k6htEIPcMJoWwQDH 8rwcdcbdi19hCuzOj54ewGQp9QMyCJBMZOlXNrK2PRGxSsnOe34vpomixnSNNeZc D3Tkoua5bVJcY6cx4/rj6sqDE3FPVAEpkfGVmIklWiMXoj/8eA8rh4VCtm79070p lsanJEXlBpBx0CAVg2VNupQqIicZxg3tuy43Ry1UnMyCkrVdOkZh2PtAIqJbSeqL ljnPKj9YjLjLbyGAbZlcrNpvz3MeQuEgqd6vXs2OJ1/LSU7ZsuXQJXA+YxWphdRp IRCXvg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432207; x=1789037007; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=r1ILxo6mmx63aRLirfFj6dx57ZFPx3gOEtU3qssEgDM=; b=Ks9BzIMii6QjuEjqhDg8BHexJ6Hhku5bnF86cKQbUPaQfXKlV7dfwh2HFRpbP7gN0N tftx+IhykCFMSYBNQouKtQH4kZsz7cHHXiWMLYDwN25gvP2iMzcS2jJZDk+cGxImK6NB lsOQsB80P+pYmaJX46+sUPanSTrUBtCIdR74x/kZf/os/AScvKbD+lUwD/GXkXQuAlDL p+juks4w0/K+ZhTkUq0nkDLg1D2/5k2fsA9UBiD+EM9Pw32MWdyzB6DLjQUo8d9m2pro f0EuOrpsH0M+yo7+3cjsrJrUt2Cu6rH/KBi2dH4AM1CgjiODK1IoCBS5RnvL5MhsG7FC SLFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432207; x=1789037007; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=r1ILxo6mmx63aRLirfFj6dx57ZFPx3gOEtU3qssEgDM=; b=aazOPzkSVner1uCUumVe3Jk+NTZw06wtuN1mDocJiYsojEGZ9LU1QouBlaZ420hsvo xbrrJMyMjtvw5tcvrWOSMmwcKtXmOSV3uhPFEbRuD0Gy71zbe1AT/8KrvK6agRSF81kq HNL5RS7oiwb8hZv8bQfTEqV2Bguq6DJzRYDHFsDaiBZVknQ/cMjRoPc/te3o9W3kSfp6 f0CDFwqKUuYmu/WiUMb21h5Rg9TRnxY83DsgFe2fA2a8ClAHaKAwc+4iXhFMohWJ8CMt S53wdxyWk4SKgYMUJ85YdyWlGBoZLfvxBiUVwzXRWYoxHHkeZ0SZWD8Rgk/NAPyGAUkX q/Ag== X-Gm-Message-State: AFuF++kkzjR144fotaFmp5rgE0PUZ5yTfqCOBC9a9+4yvCaTloFQM9FD KEi88/tRK98qA0OeGQTwV9HPBqwezBtJW9alb+Z6ge9a21qzt3vCF8keVYzeizlooytersxS035 P/0b7tZjzpW6F7/vsFNoxUKGfrOkDzVUcwlfjdKKiFaOgMOQgTVFgjfjhbKzD7aT0wg== X-Gm-Gg: AYBFou12zwYCZzSL1EB6qdKu6zQl1amroX1ztAon/X6nYrv+A4q1YdyTuu2ufVVBV3R yXT3YjOVQ0JSmECOKnBrY0EeY0rTQ1djKbZMe6W4nwe25NdNydWeww3Ei3eCV7mrDnKzMQiKy0c QNDkXgOISHouLlSCyULwkj6492CRd2ofg04aFfwnMarJgVARpXbtcRIfz9YeqWG/MHKZHq43H7e b+wtBDNLB4Zg+tP1IxkQfIEF59udFkGzAP3VP9VMFMLnjtsUTGx4riMKkYKS1T2OG85qe35J40S fV7dwY6Dk6gpFwHEaIkdzpHLBDTB37oIggD3NCFHAQoI+MtOlXDHdSYgNjiBQsZDBlC0Ld3RAsE lVvz7w88pIWd2Fob98P5mkDvWP4OR9nJpJ50/7/iU X-Received: by 2002:a05:620a:178b:b0:939:1d67:2231 with SMTP id af79cd13be357-93960fb087emr1271849085a.34.1788432206803; Thu, 03 Sep 2026 03:43:26 -0700 (PDT) X-Received: by 2002:a05:620a:178b:b0:939:1d67:2231 with SMTP id af79cd13be357-93960fb087emr1271846285a.34.1788432206377; Thu, 03 Sep 2026 03:43:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 31/51] target/riscv: Constify @iprio argument in riscv_cpu_pending_to_irq() Date: Thu, 3 Sep 2026 12:39:15 +0200 Message-ID: <20260903103936.62355-32-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX3VtSuyMZYK1f RuO8CVgAXpTil7BDkiCv3dEKN9KI/US2f/KU8fFUDyyXM06Rt5mHtfbf/2lqHJx9SL8nI+uroM8 TumRGXJc370/TRcAK0l959VoLyMqvFSOl6Pzdg7GTONr9QxoU97JMyIqjVg04+kmK77tWaE1scW YNzYekjRFilxGvioh2JjgvRL4Ksg79kzz5iHWGp83N6lukeWunmDA/RhKWVUXSbB58m6csM3b7b /iBO+KFo2S3+xJTBSj+bi1ODK14kV7+FYzH+7mumKtH1nttquELh9d1y/wBTlC3WOInPSgtYSyT 1cbyFlmUU2ANJB8tMryGxbPxyUGFsMbtSAUO+8IFI+TaYO0Gsu5bNxdgKk9sX7E1D1CJryEGdIg nkuHJbSFqcTsxfkHFbkhsWNZ48DYu4b0xlnNByLYaeT7g1t368/IIEg5fVFUb+Oq/lvQMcaviQ5 YKjx2wInQmMcqzva0xg== X-Proofpoint-ORIG-GUID: e52UG_jE55gw-9JM-MoHGtlpkXA4EHh4 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX21v4QQwblD4+ gptOLq2W3kqDtjpHmABK+A8zOBtb9lQ3TsJpKDJHpDAUZqEk1bea3R4uU34UbrefKT4eY6L7o7/ wDEPGEFMfkyFKUiyygzHtm1MF4Eu0Ec= X-Proofpoint-GUID: e52UG_jE55gw-9JM-MoHGtlpkXA4EHh4 X-Authority-Analysis: v=2.4 cv=DMO/JSNb c=1 sm=1 tr=0 ts=6a994f55 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=tlxghdvPRZsVr19qFskA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 bulkscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 suspectscore=0 adultscore=0 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432221221158500 @iprio[] is an array only accessed read-only. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20260901095229.72018-16-philmd@oss.qualcomm.com> --- target/riscv/cpu.h | 2 +- target/riscv/cpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 718b66487a2..b974c2f4b4f 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -646,7 +646,7 @@ int riscv_cpu_sirq_pending(CPURISCVState *env); int riscv_cpu_vsirq_pending(CPURISCVState *env); int riscv_cpu_pending_to_irq(CPURISCVState *env, int extirq, unsigned int extirq_def_prio, - uint64_t pending, uint8_t *iprio); + uint64_t pending, const uint8_t *iprio); =20 =20 bool riscv_cpu_fp_enabled(CPURISCVState *env); diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index a13177b7b77..fd1afbc7fe2 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -869,7 +869,7 @@ uint8_t riscv_cpu_default_priority(int irq) =20 int riscv_cpu_pending_to_irq(CPURISCVState *env, int extirq, unsigned int extirq_def_prio, - uint64_t pending, uint8_t *iprio) + uint64_t pending, const uint8_t *iprio) { int irq, best_irq =3D RISCV_EXCP_NONE; unsigned int prio, best_prio =3D UINT_MAX; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432229; cv=none; d=zohomail.com; s=zohoarc; b=RE1kW5KJMsbeATqYdPgJrkq06UD2Sz3ddPktOS8TqJi0DZmoULSx+55gIHyNjkn/PFEynyVRXvuBRq8sgWirPO6PpMY2LoU/5UysIWFsI0Lpx0ARgR/S75UkFKjR0TG0irQNrMNWFHsesX5zfyRIje6NLL265KClMaJRxZD65kY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432229; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=EAUhIK1JkAGqLZ5TD60PsAmyu+TeqQmuqksGcGfIMK8=; b=JFNB0rkjjl5wiH5VnIkFuruL01wa/l4pJQY6bahmioQhz1zZKajqVumtfPnBmIpTOKogGKlGHHJiAeyJotUnlJlTuxb8B2TIPCcuYJs1pBplazkT0wnILzZ98imEPAG6Ld/gF+ZyPgX+blBtYKCiQmKCo2E/R0qEeM9dLovdoqA= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432229682500.7290417798371; Thu, 3 Sep 2026 03:43:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24uz-0006qA-A6; Thu, 03 Sep 2026 06:43:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24ux-0006p7-Ra for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:39 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24uw-000718-9y for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:39 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHJDU055336 for ; Thu, 3 Sep 2026 10:43:37 GMT Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4genrdvgx9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:43:37 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-92e5e38fbc5so409694985a.2 for ; Thu, 03 Sep 2026 03:43:37 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e72df2sm13697179f8f.1.2026.09.03.03.43.32 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= EAUhIK1JkAGqLZ5TD60PsAmyu+TeqQmuqksGcGfIMK8=; b=S2dBhCvQiG8wzrLt 3pyEpzoRB3VzqhPu6RSTHGLLUvGt3/EOFiAKSKo3QhQKgrEmDHb6c8GZsz6v08qF dScVBaEQ8jcQfJZLQKcSlqLvFRN7mq+sYjGVy3POH6mgxv2/mZHYdus4eSYFllQp FNcq/4Sp2cv6CFJ8TDHcjCEFv+Hw1VdvCPh7Lz8N8M44mRZyeCx+ZCviVEUQRclQ AQ6p4cxOwUyL2PKA4RfTtCjVtktEz2DPbOrUwszSM6ux5Gg76EGbxTEDbQCIPvz7 gdj6C0Zwr5ZsWGk3y6vxhz58T5jYSypj5EyoS3Af7lnCt31IDXHuwddkWpX0p5U4 AwNTxA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432217; x=1789037017; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EAUhIK1JkAGqLZ5TD60PsAmyu+TeqQmuqksGcGfIMK8=; b=XGFkquHeoy5BaObGKD9e0Rlw+MZsq6muDN9b2tOuDqRFnAtWdO7RTO5Mn6epdcWSE7 vSRCAUTvyarDfnmqkaAEFAXFa4bZ8iz3tRBVbtOunDkafMNho6aY9+Sam2fvL5dCfI3V 44LvTre3QUT618Bx1qL86rxMv+iIpmReVXKRripYZFEk3ZkXdhOckaaYdYQax9oK3OkV 4q8Kvvw6EjVY20PmoAa1qRklUKZXMvvXLNJ4SMJ5QVDhGmLNaT+dHMf582QsaFTkES1o Lg6BEPPbzn2Fy8JyxZF7tbNzhxbTGW8/BUiESWwgUOup+MS8dvZ+3vOBRW9cjWDRv9MW p0yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432217; x=1789037017; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=EAUhIK1JkAGqLZ5TD60PsAmyu+TeqQmuqksGcGfIMK8=; b=sRV8NHz9tuuv09wiHpghc3eskpTk360HKiKZeiWwltQ3Y1D/JquQ/vDsjmhH3M7PdS VjGjKsl15JEZCt+4SOOlmoZ/2r5cfQ45bFOoDr7YzwZ7T6b7kSNKdeQYAaKq5Da5OmYq ZfK5NFH0NApPcoCgDHsDwBet+HHbWyG7gus3GFuMY6DW3V2s5LMsCNBi39nYpwPtLhn2 FcwZYZyVhA0N9NlSutge2C+Ix1RKYEPzgeZO8E/2RdMhM33Hk86pwu0/f4iucujFA1fi Q0353x/ILQo6ZnQIg375hGOXo6Hqdb+Gt2uu65ftYSY3mA5/M4x5ilNt8gqM2OYADrkT CCMw== X-Gm-Message-State: AFuF++kYCzI6PSgRPn7Wii88BaTzSdXCeo6XS6T4rZk/gbkG9qmoiUUq AjZ9fPMteNic/eUPfAB0/fWwM0SOQp4Zqf80rdDx0MIanY4rLwb5IlutZHT78qM/8Wrjtl3ASnn rPjdR0V0D7/rrcMefuSvF0rb1wfgfck4ts8UPUAolpsC6WidUl+O4RTL465JJfMwwxA== X-Gm-Gg: AYBFou2lfJDQT7PpOt4OS58+aZL4J7b9f8SuygNaUO4s2eOR+DYCV1XC1QQFBeTcbN7 fkvFh/RbNckODnIWTt+5Fa8twQeWudWG/x/U74SKzNUctmPdhEUNVSa6CeexZnSeY4THRtrOlWn nmR1jQFm75pPc4FRGsdsm1OYIcTEwGqUOKnYOdKSq1811cr3H0XLFQQo7R+lAM/fTx7ZKIRa/RQ eKJhUUheTZ70yuwF/pRu1RB7N6YB7TndDJP7oCv+ur8xK1JBYA8YCuXifmfJpObEkWpS9enhCDs OCDi7hIswjxJJy5EE6Y1wJUGMS8aRyEalWSxL/mu0gngYIDF6EnYB/ZgmPCIsmkscZ+DpyK7lD2 6UmsAWw79ud79zr3dMhpQuQoFkbdz5OEbG9ArDML6 X-Received: by 2002:a05:620a:3c97:b0:939:6dfa:db9d with SMTP id af79cd13be357-9396dfadf02mr424665585a.50.1788432216623; Thu, 03 Sep 2026 03:43:36 -0700 (PDT) X-Received: by 2002:a05:620a:3c97:b0:939:6dfa:db9d with SMTP id af79cd13be357-9396dfadf02mr424663285a.50.1788432216136; Thu, 03 Sep 2026 03:43:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 32/51] target/sparc: Constify CPUSPARCState for various cpu_*() getters Date: Thu, 3 Sep 2026 12:39:16 +0200 Message-ID: <20260903103936.62355-33-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=H4/rBeYi c=1 sm=1 tr=0 ts=6a994f59 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=tlxghdvPRZsVr19qFskA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-GUID: cuj5w2Vbm_w-ah7WHGDY9oNuyzCdRgLp X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX2rqrfI4QNMr7 7z8ZfidHqIykLn9L+kVMnO14judXVLcvPCPUQVAchvb40JWSjoAT8qALs0fyW5/DridrOBwruMs sFt9/qsNQqmd1fQELuw/zRNp3bjQbBP6/etINROIInt3y33DbSWL/DaUA8p7P7d52WJoDkAiAat DlLo5nUeZbOaVBD2179inpE5zV4nQrJTFl4FxANNw74JMdrYfcwgCrJzTWdmbRhhjJe/5DKrxy5 6W1sqsvJY1CbLniLBAwVE3goDuJEhdGOvfYzDjhJOt1IaT3M3yCGWp99hRbe9tDnfpkkL9yOEi0 tmMvtFnMeDm3agicRGiDtbsF9NVYT9zmRsQE4e73kNuajo+nS8661LiAXPuUsfB0Sd2Tj6jveni dIWwwp3guXgpmbeqeAcTitBvEBhBF5KOUGEFFy91UauDhwp3U2Fz7mUT1qOA4+YPVkE+Zg5R+eX imXY3OgIv9wNfBDOXxg== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX38cFwiGEMOpB yv8emJkPnIMtRWPNZtFpuLZmfsOBDPpJXm10kj8o7sSMIs8UxuCvhLO9gXbBMtRamkgMxK9IZhn B9vj7p76aHbqTZu5iyDuUfN81bN9NhI= X-Proofpoint-ORIG-GUID: cuj5w2Vbm_w-ah7WHGDY9oNuyzCdRgLp X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 malwarescore=0 spamscore=0 phishscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432231323158501 Add the const qualifier to CPUSPARCState when the argument is accessed without modification. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20260901095229.72018-18-philmd@oss.qualcomm.com> --- target/sparc/cpu.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 5f583ed9de2..31a16c2af03 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -680,28 +680,28 @@ hwaddr cpu_get_phys_page_nofault(CPUSPARCState *env, = target_ulong addr, #endif =20 #if defined (TARGET_SPARC64) -static inline int cpu_has_hypervisor(CPUSPARCState *env1) +static inline int cpu_has_hypervisor(const CPUSPARCState *env1) { return env1->def.features & CPU_FEATURE_HYPV; } =20 -static inline int cpu_hypervisor_mode(CPUSPARCState *env1) +static inline int cpu_hypervisor_mode(const CPUSPARCState *env1) { return cpu_has_hypervisor(env1) && (env1->hpstate & HS_PRIV); } =20 -static inline int cpu_supervisor_mode(CPUSPARCState *env1) +static inline int cpu_supervisor_mode(const CPUSPARCState *env1) { return env1->pstate & PS_PRIV; } #else -static inline int cpu_supervisor_mode(CPUSPARCState *env1) +static inline int cpu_supervisor_mode(const CPUSPARCState *env1) { return env1->psrs; } #endif =20 -static inline int cpu_interrupts_enabled(CPUSPARCState *env1) +static inline int cpu_interrupts_enabled(const CPUSPARCState *env1) { #if !defined (TARGET_SPARC64) if (env1->psret !=3D 0) @@ -715,7 +715,7 @@ static inline int cpu_interrupts_enabled(CPUSPARCState = *env1) return 0; } =20 -static inline int cpu_pil_allowed(CPUSPARCState *env1, int pil) +static inline int cpu_pil_allowed(const CPUSPARCState *env1, int pil) { #if !defined(TARGET_SPARC64) /* level 15 is non-maskable on sparc v8 */ --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432234; cv=none; d=zohomail.com; s=zohoarc; b=QE42QrEWvBB+OdE6PYGWCH8gKS9KA0QDR9FiEm0Sp0gtG1+o0KDBZPG8OphE+xQ2szddlfF1OhcQ8LCCdfVmKYPAa23QmfaXir6ybMTqFwU3VQyEBak10NGi8obhuzP8Ez1yuP7hJ9Bvqqfbwm/39UborxVxumjZa2pd+tYCcv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432234; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=KhMUYnU0GhpQTEi05uKBCrfQABtBR3iYAtjXF2lGB5Q=; b=RmE3EeBAAnw0G5Hxjn8wFYYGM/NkTDsuksyxi2AaagmeI3ZIKgojXDg5vCAREoA12q4pHOmzQE3N2yl5LKm1k1g4f/LO5DyHlx7kowTq3calwHzzahsR7K4sxuLUMZ+/Vt/0uQCDLXhrWxI1ICN5CMZC9yX3vm+dC5Sij4QCC2c= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432234549587.4202437307258; Thu, 3 Sep 2026 03:43:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24v8-00070k-7w; Thu, 03 Sep 2026 06:43:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24v6-0006wp-OB for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:48 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24v5-00071k-2l for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:48 -0400 Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHATP212401 for ; Thu, 3 Sep 2026 10:43:45 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf1pyhg00-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:43:45 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-93903622880so159659285a.0 for ; Thu, 03 Sep 2026 03:43:45 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5d2019sm60380095e9.2.2026.09.03.03.43.42 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:43:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= KhMUYnU0GhpQTEi05uKBCrfQABtBR3iYAtjXF2lGB5Q=; b=YjD+55wIHnUpytYM k9/Gx0kPNxptTSDAftFfWCIzPW+wgpfOLBQWsUZuD+rWC1flNUPUZmrB67wlgyk+ oY9ZV2dVpxi9X4D9BAPTRy0mjjx2vTbpb3VL1w6S64n6M0VocTV/cW/Jn5O1Hi5C uX3/VW+oc6LtJqFYg2j6JglyZAm6p+dTeaWnaFsyDTCQtRXTs/wcIXPhayJNeCRv jR5aTyrdFMIuD1vNdLIVusbB1VQeScPeNGvxiD3YQUJDNluuTBNT+kAst65uO0zR ZCyTkt1tLsT62wAN0Wy7tOgZjQwCgmC97pG4FedyquMEcelr1venBaMXk9TSzhQq O3Wttg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432224; x=1789037024; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=KhMUYnU0GhpQTEi05uKBCrfQABtBR3iYAtjXF2lGB5Q=; b=N4qzcMPgxgqfUpp4tw5W8asdeT6R10EYsmbssrTW6piTS9EpsSsFgvjtoTfn7K3XCu OeUlwigHX4A2EwsPekS313zoN1AlRERtK71hhCAfkx82ufPwTZ/I/sEFpc1yykxQk2K9 ARv7if5JKPkUseE+yrdEb3i2pYZ99wM0IjDnJ/FDuES1M9vnDi4aS+SkYd03xE+utaoF N4/PT8RY18118gkhTf7Goo4B5FcKle7dDUmDRiBTxS79+gyUF58inxj06ZzSz62KmL9l wopc6kM/Kbrxc91WqgiccUUUpjbwNr/cpENo2VCEPen/fc2Xm6PfUn8TgfsYo3Ijv5bh SCrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432224; x=1789037024; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=KhMUYnU0GhpQTEi05uKBCrfQABtBR3iYAtjXF2lGB5Q=; b=VvvDu18Aj3h+AhybdB3sQn7fQjRnQVUC1QuRVVuPbV74rtHdlvBGnkvliNcg6/KVQ7 ucWgrqSqN7W0ucyFkvVPBOqi087Te922d/Bt8SVbdS7QHVD4m3hDWY2w0I3PdXM0k3nA gi/8f+AtMe+sEeE55qYid8mLHFzbAWl97+AmzXyTrRlPCjBXKiSwGh0xj8uJZL5Jg/k0 QmNeOqFj2iwJc+OdmAJAGw6GPLpx4hBuEBv7MCMimX6/hBHTK60tLPOSax8x81Fr/7w1 9noCgllgovKCDZDNT9uc39f4SR4Uu0weJSIa+HfPEJ7JHwdGkSunOGT+uGDr1tncZVgu FOSg== X-Gm-Message-State: AFuF++ne2/iyQAI5uEWGo9KT+fdWVFCiP6rX9ZuAn6aDcEecR/aztgwD ahaL52tMQR9z2a0Gr84Q09YOTQb/gOQs/EYQbeIAtHrAfp8RMYFJDUbdWrPTOK4MTFrT0mGju+N jFLuPDS3kU3hsBTzS10JM/owB4+C0VxPhPrsA7yqulxH9toFWqCIugGBHRluBb92JYg== X-Gm-Gg: AYBFou1R1MsQhVXwNTcNuRVe5HzL3ypngAL3G/scaF/Lx4pCAyZ+7PscM/9txJmbCHZ 4H7UroihYj+ZEEuz4uNU5VMfVOOxd3BCqpLMnIm3aPWagCdnV6uW2sZ7FUD7wQAcLZTPEx9JNaK LB0HKxLhrThXX/7IZ+rHFtePpddNM9KxnmuOzGMmceFphoxaQVnObfS5XYzHwmlUqlb8ApcgLwc odpgH3USylm8tSu6VrxgZU1pADSEGdnIhpkAufQ3Wzp/1jqCWCzySDuk6fWvBYhFfDZ+1Wdi2ak x98zAb0oegN2Lj8lzJRteBBlwIsazdjCfOpvaXvp6pyGUBwv0hiL7xNhVXuIDw5Gnb5bSv2qzTs jsbVAzTzs/xP6x0MvbDHdw1eUqVlnMqple9CcLybn X-Received: by 2002:a05:620a:bd5:b0:937:4550:96c9 with SMTP id af79cd13be357-9396e0e1302mr516594985a.21.1788432224527; Thu, 03 Sep 2026 03:43:44 -0700 (PDT) X-Received: by 2002:a05:620a:bd5:b0:937:4550:96c9 with SMTP id af79cd13be357-9396e0e1302mr516592885a.21.1788432224115; Thu, 03 Sep 2026 03:43:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 33/51] target/tricore: Document architectural interrupts as not implemented Date: Thu, 3 Sep 2026 12:39:17 +0200 Message-ID: <20260903103936.62355-34-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX7tlttqKhAAVN haOqEtblyI5MdYLgCBVBvHZxmJFkSiPoSyWwNysjYrNaH6QWojxmDGTgSRu47UtjBA1stHScZ0T 2tSlJURLBDrtgE6aYEc79GpPMvAZf4FPrQsmiCdE6JRMJQeojlXoJeUbd/NTv5ewoXZu+tcRx6J 4WGVAmNzDgr7BrVU3K/QyqeC56BxJYaJO2td3S0ZCKZVoNNsuMMOHkQI7xJxutRYa95mnnWmp40 tPlu8ZvBruMDkYreKwmzQ4ilgl0kM+vA3fakQek8/uF3GUmiqG5pnjmFZGh2L/YWVNAL9auerFy 9gWde755QJYQQqJSRXz5hYm9R9PoJ2ICY5AjxfrcevxODsEaiKSrDYHbSE2eKUqSsfb45lnDOE3 dn0AZ9Sevt0tcBiFANDxygq6yl9sFLFgKmpvkEtjsDx66vS6x9tdYjPaeodj+8yjX45r7x3PyE9 3VyMh3jla41H1r51aYw== X-Proofpoint-ORIG-GUID: 4CEZ0jIGszlgik78gWg-5d2QtByMwPws X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX0R8hEuw47ckB rrvTmg0VDjpVnC0vOrcCoPhbopt9fBhoz/BTorZafKd21RBOXXm6m9cj5rJ2vnHcYldpN9lrFeO 9bbxE6qsMa15BRzKYO6mEwELkcbm5Yk= X-Proofpoint-GUID: 4CEZ0jIGszlgik78gWg-5d2QtByMwPws X-Authority-Analysis: v=2.4 cv=DMO/JSNb c=1 sm=1 tr=0 ts=6a994f61 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=Cu_OB6cER5A0ZMY7a4UA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 bulkscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 suspectscore=0 adultscore=0 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432235297158500 As mentioned in commit de680286b52 ("accel/tcg: Make cpu_exec_interrupt hook mandatory"): > Tricore doesn't currently implement the architectural > interrupt handling. Add a comment to help understanding why this SysemuCPUOps has_work() handler is simply always returning %true. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260901095229.72018-19-philmd@oss.qualcomm.com> --- target/tricore/cpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index dcd5c5065bc..84a05e3d363 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -113,6 +113,7 @@ static void tricore_cpu_reset_hold(Object *obj, ResetTy= pe type) =20 static bool tricore_cpu_has_work(CPUState *cs) { + /* Interrupts are not implemented */ return true; } =20 --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432244; cv=none; d=zohomail.com; s=zohoarc; b=EQo65cLfFRTtKrcvhW1q2xNH2s9ijeIW3ilGN4VSAT1ISsI752SjSkp4nETaOu1/9bG2VOQgvJpZ4aLi3+FVxo0LrgCoeSHEbBNlztbZZ4xSrDhIMpUqnJ9e0nyX/8gp3cqeqprm+5qctwarExTYaSwxDS9dHdl3X+zrUq/uZBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432244; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=NKbvep5Em2quy29io/1xtBX6QfJ2hLwOCn9Q6oahR1s=; b=h0vSARIffAn6B6kfnCgrdQ4ZvdHrcfkxE41kxBTthVTTEAXkCoqdfFm6w1pngRB+1KXbRWY8OYq/tpUejR6cF84Lx7HriMsfpunQvn/VM98TLUNiRolIuYgnypX5xqUycfLZaSAs5AxIA0ywIqA1w7Hk2+Fkcl7MPGpQkIMYCWc= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178843224421392.66026508681216; Thu, 3 Sep 2026 03:44:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24vG-0007gu-6o; Thu, 03 Sep 2026 06:43:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vF-0007es-CK for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:57 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vD-000730-PF for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:43:57 -0400 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AH9S43203931 for ; Thu, 3 Sep 2026 10:43:54 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf5d10hj3-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:43:54 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-93918756165so542232785a.0 for ; Thu, 03 Sep 2026 03:43:54 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee131fcfsm44360325e9.4.2026.09.03.03.43.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:43:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= NKbvep5Em2quy29io/1xtBX6QfJ2hLwOCn9Q6oahR1s=; b=ZxmVSUQhK0buxSky HNdBcmkIgKydDg2jValiaxM62QXZ2/ezXvtoS5TTkVtD6KxxIF3KKxKd8pg+0VBS pAylhsOtnV7DchtdJj25IIxvS0k0Q7SIrB7ZChfnixHyp2+ahTz3AZbmhEMY/1f4 c2EG5g0zYX3MRtv9o9Nlfwtl4kOMHeqVN7/Xtb3usCQDUCrlMI0djmFLNcpzRVIa ac4ZEM9w+L+02fOAf6h8jWkatjpuv1umBzzHw8+epvQgSM0OmfA9SAl9ncrodCZL hLmzHwCfImaJeTNldPsAvCYQGDbJGQ9IsPgE72AGxcTEz6av6dnsS7tPB/6Xl8Qs mGY7bQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432233; x=1789037033; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=NKbvep5Em2quy29io/1xtBX6QfJ2hLwOCn9Q6oahR1s=; b=i4A4j8SvuF0gkn0UAwCi/Hygk/9ECJn83hLbOXpLrvS+Cca7cv6XBwvYwGF5m4RD78 jrGVILT57I/cpdU5PIuwYlayC2t1WLEfFJcRuG8bb8OFtU31XaHyY9/0U0ye7jY5bxd5 OHoXWPHa0KfnCxPfiQIb7xKDwXaExhZ0ZTzWQR6UKQEM4+dKrRfjLu9dfHpFt8iuQ7B2 EZkYXHtQ3/RTE2gIaOcI36/MfIksBHI3y8gMQjTivWINj+6dyeGA3Chznf5e+iCOMtJL 4LQFell20Ee1SFemcX38msScg2LsjpNlFkdY4f+dLSE+94rf1QISh56ydx2C2N26iGgK QUWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432233; x=1789037033; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=NKbvep5Em2quy29io/1xtBX6QfJ2hLwOCn9Q6oahR1s=; b=YFAC+CtzKRY3SO5peLJEsgtPEsuEZ8mkybbFIU1NLhbAUR0tUjiJAoPtHjjKVABMhr KIHjAWB2pJiDoY0WRci2xG3yGspSKXC40ZKXLc6OqxAdomY1Zq62zDev9a+QPOEYJp4e r98R/1WCBss2Sv/9Pvq4PirLPez4RlXxCNS3Cl7DNjEOcKA7SqdcjKivROhsTGJvdC9c wUV0k6Tqb1aQh5m464DUWWuY+9FuQa0ZvBvf8VsL4lH2jPrRbowEr9RAzniowILwnW+R 72DIWS+FFDNKa1wNi/Ep8pERNoxEzMIVMc8H+FmXQ/ffnOcqKpD1HbKul/AvFf5Dt55l vb7w== X-Gm-Message-State: AFuF++npBV1LzgfehMjsE8lZf7INGdTBphxFZPD0KqMOjnATSTnUQBr1 85wz9N1KZNlOwt5q+lHy+M9qo6MVDTYS8ahAHtPKwzob+kjM+XJ7/bRtIIs/60omiF5ncg9UjGl v+3FykFq+dD/2QeZ2qWL0mm6entwA+GZQiPv/imO3ujOa+jE/i7EkJwQK/S20RjtnEQ== X-Gm-Gg: AYBFou3RW+53Ze/rxW5TqmtELUWd7n0pmZDIL6aWRHFZfPQCYKOjbHUvnvBTpOxwvZG UbUE2gb2iIJ/oBwojhx43N2V+vRtKn5tjlZy3eR7SyZPmCMRM0FHCTxvpsjI1QBDv1faCpxdVce hCBWCmm6HHhMInTwYLyG/h+a/TugWA7Df/dKvUfiqvP/Mba8M4n0l1awrY6QxjThf3oZs1x/Qhx dEKlnCWJC2bhNXBfnXh3g2Yr7mwc51t4Yq83b1sMAriZ5myM5CL0LQqmmDktLdLlUvJzPxoJPrr SCy4t7EQOaNkzrS5yiGLYoa2BLH7/IfG3l/s2pEud2w6N/xWY4W6g7jXembBekZf/DjtwpKe+HB M146ughpTxN3GN7vz+UWn4F8J8qinUz+ItQ6HZP2o X-Received: by 2002:a05:620a:4442:b0:939:6de6:951a with SMTP id af79cd13be357-9396de69720mr633009985a.49.1788432233432; Thu, 03 Sep 2026 03:43:53 -0700 (PDT) X-Received: by 2002:a05:620a:4442:b0:939:6de6:951a with SMTP id af79cd13be357-9396de69720mr633006285a.49.1788432232958; Thu, 03 Sep 2026 03:43:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 34/51] target/xtensa: Constify CPUXtensaState in xtensa_replicate_windowstart() Date: Thu, 3 Sep 2026 12:39:18 +0200 Message-ID: <20260903103936.62355-35-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX3Kc9ankfVyak ht+8gWCqCc2yCCMPJqk0OFFvFRbnLK6ILV3XuY56uMsbrkqUyH5bDcuh3TZmixULmTIRlLVkKNx lPxY7pN3KADbNM0XgJTxGZwKRVcfNhGYUyHoZsJviYwiqc4/Wth7pU2C48Wk+nGu8Q9W/8EAtkx DwG8VBF9IWJ/uizl/ceuzBL7r2ZB8ijSHVFU4ZBlmMUd9yBxaNjd6spV5Nyb0s6jZGXGKBse31t CdlPt7W0LorhO4O4DzCotNySxJCJAb4ObnxWuGZHHp8PBM507npssa0xqhc9O5lBfizk3kZzyzv VUqntXet0QL5PE8+D+4wrd51bFiQut5cn99ZaDVf+XTyolqV8qpS3UW7iNlPgxQ9/Y9CfKMU3ql CC+PYnJnga7Glkif0XrbabnIzh9G0+K6/mXu/akAa+0e5hI96xQ2baKeXQBdYCGthqI9SqAsxB5 ACi0GVpLpIyo9cpqaSA== X-Proofpoint-ORIG-GUID: 3lgt92T1POEdWYZrb-HRgaB2rtC7PoQu X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXwkVZ6/h/SoT9 /BVVjpyFh6E1qqjGw3TYQPH5Dz7jbcwjlCRda+NOfPrzjZD0OvuiwxQ03ZKI08MYZlQ4lZYNTbd tw9v0pn2TjGMp/YWRghud0sy/cu8sx4= X-Proofpoint-GUID: 3lgt92T1POEdWYZrb-HRgaB2rtC7PoQu X-Authority-Analysis: v=2.4 cv=J4GaKgnS c=1 sm=1 tr=0 ts=6a994f6a cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=WyWAz_IcRkS63iEfKG0A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432245362158501 Add the const qualifier to CPUXtensaState when the argument is accessed without modification. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Max Filippov Message-Id: <20260901095229.72018-20-philmd@oss.qualcomm.com> --- target/xtensa/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 442e98bd1ba..49d6ad9083d 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -708,7 +708,7 @@ void xtensa_set_abi_call0(void); bool xtensa_abi_call0(void); #endif =20 -static inline uint32_t xtensa_replicate_windowstart(CPUXtensaState *env) +static inline uint32_t xtensa_replicate_windowstart(const CPUXtensaState *= env) { return env->sregs[WINDOW_START] | (env->sregs[WINDOW_START] << env->config->nareg / 4); --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432253; cv=none; d=zohomail.com; s=zohoarc; b=LZgE+yA4GXCDRf/yBxbSmSK2IqB0cUU+6zIcD41EZzy6JKSMvwYbYKUITZwcffLmnlG+pfPBrp72LE79p5WlyQmr7aGeItIh2wc720ZgQn7m5/caL/9OGqguY7e+YaF0qXfibdIO9ZGu0JhOQaSAnHkhJe9vjuFRkhE5sasf/Z4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432253; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Deu+jmw96z1aDyam445k/RrNymHVFSDqbsg5lCU6QRI=; b=GRMqxbM6X497ZmhHEPLVnaLNEpgHqLaOy4HaxpAvy2FrtzCSMCPN8TANymZV/QIaHWQAxxSm98dvwBqEulW3FXPA+nD9ejGTgnvBNKGwXKAb9hgY+36T5QYyOJSde810Sn/uK0iMu/I2V3SU5C4GBeP2cu2xXwJYenU4O+2r1IQ= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432253731292.7158697160701; Thu, 3 Sep 2026 03:44:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24vN-000852-Rz; Thu, 03 Sep 2026 06:44:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vM-0007wm-6Y for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:04 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vK-00073s-Fx for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:03 -0400 Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AH2Oi3720073 for ; Thu, 3 Sep 2026 10:44:01 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf0gjsqk9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:44:01 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-939694871aaso254339485a.2 for ; Thu, 03 Sep 2026 03:44:00 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee6024a8sm60328485e9.6.2026.09.03.03.43.58 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Deu+jmw96z1aDyam445k/RrNymHVFSDqbsg5lCU6QRI=; b=ZIvEJ6sGMN9fL5F5 xwirsUVjF6p6r1sO4KxH8Kn+Tq99gSaW5fKnC7iF06/bYxXh+Q0JFq3O37Zjujcd dMFVsQlmcVknIxJf820cxa9DoO3k8AJ3bvmjzJJBPXD9g3jt+aUi6tefCrLIFJsR tHc9tmNJArRfI1KsP19bUNiYOivfwNEXJykc6EqcYgcQ07QTzPez8jCGV3AKQypp tvdVx0PCtUvGV+jhpXOVvfTdx6YG5EeTtMVlZyjv/TDZEZ2GEFmyW76OdaJwz2LS m49rdzuG/BM6xeue7uAT1h3CHduFhSxlxQw9BEmPLYcSiJIP8CxxyIQPmWJcj42/ Ab4xjg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432240; x=1789037040; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Deu+jmw96z1aDyam445k/RrNymHVFSDqbsg5lCU6QRI=; b=DOyfCLWB2UKK4ocZsOBcT8RD/8F7dODzHWqdfxjFhVUW7yf7ied0LmGqm0p8GHk6eZ wS3pNej/2HOesRw5DLKLSjHzqYDso6h6MrXsQHyjP3Ck1cXMaQCuuDdBxxE8mzdkWoCZ 7/LRlRKZIlUY/DXs2hiF7Ye3z4Gfe/7cPPQkFjcgxi70jTnngoeijJq61hloP46eso6z LEsZi6zBMibWv1sv6KcS7gdbwlhuRCuCL4YfGDOuBrL8eURmR9lA4JtJIuRRq0WGIaEB 7WYmnOOjSeZ39X2/CkPOkIOwcIdoW6Kkq7RK0dqU+KyBh87cydm5VySyCwTjFjX6B6GC 8hUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432240; x=1789037040; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Deu+jmw96z1aDyam445k/RrNymHVFSDqbsg5lCU6QRI=; b=YTqp9gUQjIoFuZw94UN7JtQo61XU7B/St2eXZAt8NCBAu5FGAC1ZbJWut9oJQueEE4 pv2djzVCUNnVemEl0fZX1NrH1kD1/hGW2mhSkmR17x6+GUP8fGYomTsslEvnkFakEuYp QN6aqwZMS4IciDkYHe4QKIoAYaFGbSNRBs125eCuq4mDEifAf40NgAUQK1PhhkMzwaAd iuQvT6NVIUPbIV5pdGs9OIwr+iMkDTzHPjd5zi6y6Ts8HIVoVe4IZb1L3aUE+nkE4ifA DX+TfEoC/8Kv1r2RdBDj6aVACy7lX39ghQXsamxvNx8elcGOK9bFIRkF8LF946Ro4Jb7 k9uA== X-Gm-Message-State: AFuF++kiR5ytx1w1syjEOrchtzkNMEyeWP4ep7vwk9Y+JqjwyQ6O2tif n0HwQ2pZKmUBameaDB15MRaUsof2DFgL8y2WZ/7okycz4sl1CzyEgdl63ZrFFPm/bIohzeEJ6vG pvLEt7JoPA2HoRAd+2ekEh4m+e2pxGIl7HkINZAiUzyN51mQiI1gqto+A1pDcQo3TEw== X-Gm-Gg: AYBFou3YEVrRAaYnPuNL75xpysM61O75x7hG6P0bbIK2JURIZz717lKEAeEpflfMZ8G uuQZMXdnERFBZrBiGNipApALyBQKsLXbzOq2KJu2Sqy5vdJc8/1xZqalFeJ5+oNUIQBjX4iXBpa x6D7mg1PEUwikSntadqcKCml98+kwfZ122IMmexe5aBz81lwwNAk7/x/Mbf/x18GsGGeQ+ayHd6 hF/PR0/G8+2x7WjUGiTutGHo3vF5HT2fezePL1u01WV7uTkfBbUoM1DIOqezDphKyC8uyGL7lnY RRLxh8o0nIPhE85Yula+CFe2vnoiyQb/TFg6uO9eo+0MrPCIygzyhsJ8euSxjshhbjknhOk3HzN ktglAVtqG0Febk4CG9Mp1AoZQ0x33IxxKX3cT/+EN X-Received: by 2002:a05:620a:27c1:b0:939:2bbb:b266 with SMTP id af79cd13be357-93960ccd7b1mr1352547185a.8.1788432240204; Thu, 03 Sep 2026 03:44:00 -0700 (PDT) X-Received: by 2002:a05:620a:27c1:b0:939:2bbb:b266 with SMTP id af79cd13be357-93960ccd7b1mr1352543585a.8.1788432239727; Thu, 03 Sep 2026 03:43:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 35/51] target/arm: Return immediately on error in kvm_arch_init() Date: Thu, 3 Sep 2026 12:39:19 +0200 Message-ID: <20260903103936.62355-36-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX7yqhQk0cVIZP LYqf+JonpnD1KLfsNi5iOWkhzA9N4QTewCAhFMqLdXJzElREDMYXU0tDmixN7YHk5elATBgIJfg Wf0ZUGEhOOea9s1YAbu5rU1Ay1fy01XokR6orNfvWa9i2iCnCtASGd+CJrgtRge4YQcURGJwAv9 YUxRm0rmuFA7xGAngEiR0ucx8oh4doZHwxTpiQv46LXTWtTwAoc5wyIespFNJi06wpnupnhqVPa xS427t88/kgOWuAgEYn2UM86RWhu8y62l8te79aSVonMsRauJY/yPKCpitJK7PybdOrNNEljLKR 33vNJJwlfveaOhI2jnaFcRankC0FT1Vtuo+evHt9KOKVxtYQ8WnAVDFeqzjQRScABmZaHJ1323Q F3pRLEmdux/mr0Ao5S371ND5hhwV/5kacguXCeRb1J6VdmcRjcBZzgpqasMItqwV+D0wPZ3alAK 6k41e3GPVvA6q07X0PA== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX6GHu5yyxiLfY XtDmunxbTDt2NetfUiQAvOP33tLWe5hfkSmKvk64jxVosmeQNmShlL8S93zqq3FDFqZ3RtBviPl nlvJ15GaRQl3cMUSWRKl3N8in1K9WR4= X-Proofpoint-GUID: rFA4eg2sk0a0hzDMHUbxC_CiGqGNOFkR X-Proofpoint-ORIG-GUID: rFA4eg2sk0a0hzDMHUbxC_CiGqGNOFkR X-Authority-Analysis: v=2.4 cv=LZ4MLDfi c=1 sm=1 tr=0 ts=6a994f71 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=vqajonI0KEcA7s6tbs4A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 bulkscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432255433158500 From: Jean-Philippe Brucker Returning an error to kvm_init() is fatal anyway, no need to continue the initialization. Leave the `ret` variable in the function scope because it will be reused when adding RME support. Signed-off-by: Jean-Philippe Brucker Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Mathieu Poirier Message-ID: <20260825220101.3443954-3-mathieu.poirier@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/kvm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index d40a6a98591..ed99be7fd80 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -596,7 +596,7 @@ int kvm_arch_get_default_type(MachineState *ms) =20 int kvm_arch_init(MachineState *ms, KVMState *s) { - int ret =3D 0; + int ret; /* For ARM interrupt delivery is always asynchronous, * whether we are using an in-kernel VGIC or not. */ @@ -618,7 +618,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) !kvm_check_extension(s, KVM_CAP_ARM_IRQ_LINE_LAYOUT_2)) { error_report("Using more than 256 vcpus requires a host kernel " "with KVM_CAP_ARM_IRQ_LINE_LAYOUT_2"); - ret =3D -EINVAL; + return -EINVAL; } =20 if (kvm_check_extension(s, KVM_CAP_ARM_NISV_TO_USER)) { @@ -640,13 +640,14 @@ int kvm_arch_init(MachineState *ms, KVMState *s) warn_report("Eager Page Split support not available"); } else if (!(s->kvm_eager_split_size & sizes)) { error_report("Eager Page Split requested chunk size not valid"= ); - ret =3D -EINVAL; + return -EINVAL; } else { ret =3D kvm_vm_enable_cap(s, KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZ= E, 0, s->kvm_eager_split_size); if (ret < 0) { error_report("Enabling of Eager Page Split failed: %s", strerror(-ret)); + return ret; } } } @@ -659,7 +660,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) hw_breakpoints =3D g_array_sized_new(true, true, sizeof(HWBreakpoint), max_hw_bps); =20 - return ret; + return 0; } =20 unsigned long kvm_arch_vcpu_id(CPUState *cpu) --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432257; cv=none; d=zohomail.com; s=zohoarc; b=k4GT9XrQvprLnn9XZCX829e06qvyyjVba0Ig4PRrvbAD2ccwq9yTY77kwvqbcTsF09tFqrFE+6UbRihV4ioAcNFc9p1XJCBUNlZgisvIDqZJAtPhs1SVqz5JRoP5pRLbjXinRIRlEAVpecftZrhFgLCWLp5unvHtElQ1iFV4AeQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432257; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=hA3ien2PAEPF4LFUutqvJSyo93SVzDHV3/mOyRZE5PU=; b=BQST0Oh+wNM7jJZSVZYkLV7NKFCyaoOKSrCfjRkloiGCQ3gqZ5eGITZzSaS0s/HY9MM8uFvSpK8W9RmDRErTortDoASdl5zmXs5DqewWR+VQRLXZmx3yMbnwABxoTwdpTLDw/oyzMIWRzSzywXwJaCxUsfidrwxHjSebPCc0vlc= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432257273166.23041227393844; Thu, 3 Sep 2026 03:44:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24vV-0008PB-O4; Thu, 03 Sep 2026 06:44:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vU-0008I2-C2 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:12 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vS-00074r-LS for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:12 -0400 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AH8ZQ3203919 for ; Thu, 3 Sep 2026 10:44:09 GMT Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf5d10hk0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:44:09 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-9390a2c895bso580385685a.0 for ; Thu, 03 Sep 2026 03:44:08 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cf2531232sm36130955e9.7.2026.09.03.03.44.05 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= hA3ien2PAEPF4LFUutqvJSyo93SVzDHV3/mOyRZE5PU=; b=pYc2WFlbqtRTvWVR iBi2QIP7eoPbUEgdN/1tRHFrzN+EKU0BjPgswXtEjYkJ9twn/wwKKbLth4RDpzIH 9kXsdzaWRQdN3yCBi4XafZRMBl3xuG5qFsEI/AK1+gZTsVZFdvZOZEVgPULjZSXZ LiSUgiTeDyVBUwNGDKM4QwmqPGENDEdWAHbbP+p17GioUBVaOUvtvLhfOFc2qb1p pCkyPuEHTxfuw1iU9rOMyWU3DanaLfgShBaONQzKuFZ0DHZCOlz9zNyR6afw3Mza uxiuQykzhRe+lag9ILvSHf69GdLAu7zjTv3J1bPANCPDcIwzYosRKzjXTmgVMT2M N2HUDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432248; x=1789037048; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=hA3ien2PAEPF4LFUutqvJSyo93SVzDHV3/mOyRZE5PU=; b=HsGqYk7L8aRkU2f7DXiAdtgZ12o0zTQ3AQAKVfdYRWlEhdT7d4vq4lAXGEPs/GhN2i UEfWBrCZ/dZxDlikjW5sf+y5kl58/l8X0Ag+tPJZXMwZD1qjh8uk6MnzMnUAvOKl+QvA 2KUnszg6FbrtPY3P99uaGbGb8kMnLpd8fQKEpJTaTLW+L7QjcgCQsTAq+oqWsbVHmWbK HlYzrotIQi/njE8x0aHDf0zLa49i467e86V8Vj8e2GW0C4KidHRFmPSqp3IC7WZ12lJI AKpysUukyjM6aV9FLSDY/yPlPYh1ES1Rn7HWVUck6E/QSKnA/Mc8QZbIX46mLiEt/2SL y0EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432248; x=1789037048; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=hA3ien2PAEPF4LFUutqvJSyo93SVzDHV3/mOyRZE5PU=; b=cC8RSda/OxWyKDb2BK0icxrPxsLdzu6x69IG5MDrS/eSi/OfWaG/ERsYtsYLIUNKMA ExS5tKhggbnhUr55iGDJj4MU2JDP5Rihi+x9CHwZUhKZolwFcJsQfe8J1/asCfsHT+IY 39/licJ+4FaNnV+RjFQ3uDAWM9vDLHEwIm5QrOtmPb6kRMosp84vC1wGXdeilndm05Sg 6sdIGXVuhsydu16EIH5M2pXppMH/I2RA9dJQIXJmVihonb2oCjoDrDP5ELkG4KC17M0x 8+KHmNpB7U9JS/zGPfURSTEUsXZIE0zXDuyeOicYiHQ2coR9gIk++pR9hS42VLB5IC6C hB7Q== X-Gm-Message-State: AFuF++lWltE818tzszryh2QTaaa0ES8HVNmBUv7ac3g85BMZnHssJREz mbtBailTV9yGRr3hHKArsH7RDDXHY/GVdIvQFiCWRQ9B8ILvfPpEAsOy81Yi4IJFIDCG+pMUuAU oIcPEbqBvWI/g88Ku9bA3vIH3SuNYWE3aANbSRrRGPZ4kSkk5+lbsYcVhrUX5fQytvw== X-Gm-Gg: AYBFou2zhAeG0oKXhWmfHj4gsiUPF3gtWPTELhpn2LXBVlPktFPdvkVZ86gYR/4q+Rp YjAtQaCxB/r+NGP2BqEzojBdQt6ulk/IkbzXKShprzTtJ/7M2bTVi+YWaKCRXtHT4WG+WIcYuoC mM1ymPq3fyuuG+50eXgM+wFU38VXX9L0/+QY/OpBrEBX9zzhLsr0yn57bqCvZOSW3heVkDhCCki W3VkKtWIaGfKuKyw9v1G1lTDd+lfgAuT1ewyGPSXzLrMVH7/u8mgwCp4aoRWqqoi+YTXwP6J23i i1K3olAqNNW0M0j43gFIGC8CcfIBSpN2JIFPSuR2k/EGEERiFLSP8/QYBANEY/mZ53HwMIp5ncq b5Plug155Hc8426Ly1ghKX40WiI5qhnRBMcd7fbyz X-Received: by 2002:a05:620a:19a1:b0:936:bcd8:8650 with SMTP id af79cd13be357-93960ff3badmr1140388885a.38.1788432247855; Thu, 03 Sep 2026 03:44:07 -0700 (PDT) X-Received: by 2002:a05:620a:19a1:b0:936:bcd8:8650 with SMTP id af79cd13be357-93960ff3badmr1140386985a.38.1788432247390; Thu, 03 Sep 2026 03:44:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 36/51] qom/object: add is_available callback to TypeInfo Date: Thu, 3 Sep 2026 12:39:20 +0200 Message-ID: <20260903103936.62355-37-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX/6n6n+mCZpkF rsgxbzj+AigbubVvgiQ8zSWXQnFCCNc715RqfmPsNgS25V8P60G3d2H5oPmFG6ohvjZ928rPFsU YmmbsZhlQzwYBcyRgzs6bK6y9zQroHQBdxiA8dcQH3L11viyrsQPz/pQ7nSO4qKi64mIbI6E96e YS5oT8gDBZNHcyOCgwm3v5kSMkt8WG033Fo+D1SziPezHCgY2Lnur1xohIZhx5F8SWinY7k7VeB z6GW2reExksvV/O5R0VlQndA6ERaZLxb50q36NB1AplmyJEWZzDhE8b+rgq/n1+fxXpVdi54jeL Xz6aBNNpXaYQjgdx8RVdOeEh+SmHy7vqctjivorBjOMHo+nyncD41d9GRScZIdUhawhjEGKpFIQ 7507HL6WiFwmiIVJAbmz+uwNz3uNaaYV3xMj9GizXtK4ZZn9ACwgEFLtGctuWMNDUDrGL0v6hNZ uT2gD7IBXsEeTR1SgNg== X-Proofpoint-ORIG-GUID: rnniKiEB5ETzwFniYy93ZQetOaJ2BqR6 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX7/e3GaaGc+/8 fohEjAwAfJT7BaLnqSXBbf3p6Bfbia5TydiImBD9S+hxnxa7J4ZteHJbBcyu9B8SUQuyfQaBsWS bgnhNJWFtTLVb/e++S4ikKu7xVi4oyk= X-Proofpoint-GUID: rnniKiEB5ETzwFniYy93ZQetOaJ2BqR6 X-Authority-Analysis: v=2.4 cv=J4GaKgnS c=1 sm=1 tr=0 ts=6a994f79 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=AB6Ai_UoB1uFYp04BLIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432257433158500 From: Pierrick Bouvier When removing target specific sections (#ifdef TARGET_X), we started exposing types for different targets in the same file. Previously, we implemented a filter based on interfaces, but it proved to be too cumbersome, requiring duplication across architectures. To simplify it, we add a new callback, is_available, to TypeInfo, that will replace the existing filtering mechanism. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260901202043.26532-2-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qom/object.h | 3 +++ qom/object.c | 4 ++++ rust/qom/src/qom.rs | 1 + 3 files changed, 8 insertions(+) diff --git a/include/qom/object.h b/include/qom/object.h index e24f0a2b2d0..7ecd0f210fb 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -469,6 +469,8 @@ struct Object * @class_data: Data to pass to the @class_init, * @class_base_init. This can be useful when building dynamic * classes. + * @is_available: callback invoked at registration time, to dynamically ch= eck if + * this type should be available or not. * @interfaces: The list of interfaces associated with this type. This * should point to a static array that's terminated with a zero filled * element. @@ -491,6 +493,7 @@ struct TypeInfo void (*class_base_init)(ObjectClass *klass, const void *data); const void *class_data; =20 + bool (*is_available)(void); const InterfaceInfo *interfaces; }; =20 diff --git a/qom/object.c b/qom/object.c index 85bbd7f9fe1..b1834a57cc9 100644 --- a/qom/object.c +++ b/qom/object.c @@ -163,6 +163,10 @@ static TypeImpl *type_register_internal(const TypeInfo= *info) abort(); } =20 + if (info->is_available && !info->is_available()) { + return NULL; + } + ti =3D type_new(info); =20 type_table_add(ti); diff --git a/rust/qom/src/qom.rs b/rust/qom/src/qom.rs index cc00ddcfc98..bbb485e2cfd 100644 --- a/rust/qom/src/qom.rs +++ b/rust/qom/src/qom.rs @@ -691,6 +691,7 @@ pub trait ObjectImpl: ObjectType + IsA { class_init: Some(rust_class_init::), class_base_init: Self::CLASS_BASE_INIT, class_data: core::ptr::null(), + is_available: None, interfaces: core::ptr::null(), }; =20 --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432262; cv=none; d=zohomail.com; s=zohoarc; b=eWb4MljsSByjtQ7XktW84+mTOEjdekGjPPp/jz20bllXx/sxe1vO0S5qI/xSuRxwdgA2i2eJlSY4xx8Rk3tTWLGnyJrDWYzFpuQZAKO4CDy/4m8AjPDtLdAieeqYzU7IodyQmymunSmbfujNJxWgxsoc98dblY8z8pifQ/nsUTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432262; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=pzUcGy0V1UtYmJH5fdlplTX3XLz53u46+IIgjzDeWHs=; b=nnMuMa3FllMX0MPiog2Q1r/RoTszzHzIYPdr1WO0n7rDxiwdaVoGfzCeKqqL3fJqMRs80X8Sqs8UhmurogcSmNi2XlPfBuehfKq2pgLyfB3oGFbsC+GN3Q0mAWU3C6NgNjEu8Ko9qoy67VPXudUjrRci4DhWmyLOEn1m3CDkUiA= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432262668206.06653547720987; Thu, 3 Sep 2026 03:44:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24vc-0000Q9-GF; Thu, 03 Sep 2026 06:44:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24va-0000I5-TW for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:18 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vZ-00076F-5Q for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:18 -0400 Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHAtv212404 for ; Thu, 3 Sep 2026 10:44:15 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf1pyhg1v-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:44:15 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-9375d92d8cdso491321485a.2 for ; Thu, 03 Sep 2026 03:44:15 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee3acf2csm58833575e9.0.2026.09.03.03.44.13 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:44:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= pzUcGy0V1UtYmJH5fdlplTX3XLz53u46+IIgjzDeWHs=; b=Nnky2ku2sMVj7Ddr NfhV9IWqJHKHowQgDBuRgsjpq7HWFHTWTwI0gqkZ09wTofUXDQ352+zSaqheSMmL 1RYWtobmSLxicL7RCvzRJnE17WdWlvVLzG03kk6Rk4zY5aRHGnN/RCCLqpEFahW4 bnJZ1Tax11pqjwlMElsk8WYhjEOOib4t3HNNPhtVtsU6B8O8wG85ev+FpMQQ2Y4u DFgJmboKMNZoMJWxJzS5hI3QDOl2qGSETg9c4Ep4nReRBUwa9Pp5ieeeHq3VBGMN dVR35fAqNpbltiPkwgLNP5HEE29KZ/NP9wXZfnqusPb2EwWFYod8yK21tLDXs1U+ Se3kZg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432254; x=1789037054; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=pzUcGy0V1UtYmJH5fdlplTX3XLz53u46+IIgjzDeWHs=; b=BC4kmtxZbc7+ormqZmvvOuqayZXNyFD7i2Qiv1kkry6/pUEkqJnajW80XQD0s8VJSM JXKueC92dN7+uHqJLckwdZ1vsQ6B2CTi/91N4hvngyz0VcfBwckHbMtgwsmtlUWNUuSE Ul1D4taV2em8NTXc3RbkdLsu9KSxACm1KBg2rRX1gzNZbeZdzXww+/rj+qSW0hUWV0sd L00bgKZ8NKRWWuTX/BPdHVarE5EeP8Q5nrXn2Lxz0jEDHTbuZvcQI4tgFhOLm1q7DCLi Opg7yTAw7JSpOBXHhNsXEv0KMoB+ogCOBnvruuI6V6WoWKXfl4FFh0dHi6YzWtNGtJrt leOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432254; x=1789037054; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=pzUcGy0V1UtYmJH5fdlplTX3XLz53u46+IIgjzDeWHs=; b=GtGrsmBcabuSpnLncwTKTcpGHHXsGGMFf6mOi69xXHlr2kpn1KHzPsWZG6TGcYzWxc yHSPhlP/OWdi9jA6AqHdfdL0bA12XDYLm7Udro+b7Xp/DEp1SGm6LHIBzc8sMnUz1Rwr Ic+/8QDd7qInRhquayv+bhdWMsyHyTGYQ1lh2m5GGqY5YQGQrNehSfwrKzcKvR7kEvcA CFf//K6SepjRanhLRRgaotBdBJ0Kgbqy+cBMq484sx13miB2csR2bBC6UHuXz2Ygi5Xp E2rAgi/FphyjGB6YcAZZ89ipIGknVaJX315t30LV1ZaKWVlDm3nIyn1h44GI/wW5HVfv XS1g== X-Gm-Message-State: AFuF++l4WCRJZBh01VYNnWl2EoOhLhRWPVBXIp0vSlyfp4OZbPB9nJmr V8de0pqpI19Z465tIZKK122gW5EeGfgXW2W9jBwkADPtdtefUfuGwJyvJyUQvPm93r03opaMG76 L4lM5V2nW8oCPoLO1sGMy0z3MBTBtkBGyj9P9+q2v2yxM1+2MvsKkuEGJQSozwoVsow== X-Gm-Gg: AYBFou30OQCVMFwIRCdo4SPhJsdOeysBvk0lZ7g3Lz+3/JEY5GhLQMNugIJP4PPRImI 5JhPQEgd68EBT8FbLMOM3usyPXotNi4cG82SXbTcmNssBLfcvtXAD0yFdJwIqlfjkv4MASMFTtY Js9VLJmmlVpyLyg1A3+7CNQlAH1CijT3K+q7DcorzFrYi7VD0rbqjmQo6D24ayBzA5GVQtsnw6O /BIMtwfBfkoS8UZkbIqDSXFi0f2ARpiKH+/3FRpS7t3rKzhZC/MdLeHYZhOo5rlfLrdki6iQrkI IS90vq6XxLyjxn5fHDbKuq91dgUjD4CYcyTEsKYZRAbwmBDYe9spnwjgQRQbZQcXIfR20xdxkun L15DN8QWCTCR4liANHRr4BuCGbs6m/E1kxV5yb9mx X-Received: by 2002:a05:620a:27d5:b0:939:6dfa:4a7d with SMTP id af79cd13be357-9396dfa4c5emr584891685a.52.1788432254550; Thu, 03 Sep 2026 03:44:14 -0700 (PDT) X-Received: by 2002:a05:620a:27d5:b0:939:6dfa:4a7d with SMTP id af79cd13be357-9396dfa4c5emr584888185a.52.1788432254059; Thu, 03 Sep 2026 03:44:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 37/51] hw/arm: filter minimal set of machines Date: Thu, 3 Sep 2026 12:39:21 +0200 Message-ID: <20260903103936.62355-38-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX5p0z336hPv/F 6EH02sY2H7N3mdoLrMVZ2rLnRk/ifUowYW+23qg3x0x41O7ufWC1Gpj32Jm+389wqr7zSiRcGWP Of7bKOOliXmcRmB0P8OxIjcTKOkyhwx0V23gAsz22axhjpdcOLrSKxVdaa0QG51vLosUax+fDOO qWBsM48QEGa+815pSkLgELMtqw38HNIxJKH2BU461VD2go9LpjiwqgIUoNbGMfSTXIJ+XpJCb+u /ye49+9NuyakbOvqzsjOoPQAxzH5QLjqy9+p8dM1IvG6/HNezW9C96/SBuWjVnfmC1U3MyXIMKa 7BHx5+Ah89AzzAqSk+tGlCyCWPaw3Dcz2dkiQAe4vAvXCsj3eyBLYv0NZ4Xm9vc75x0pVRD2oEA P7oP8gGwO1Op9ofoNv+fIrtd54adNjHEhEKUt0ViR2QBPgwmpzNTAlwBgIerOpJ2T4x3se+kAty +wMGNA1ScGH40ezklQg== X-Proofpoint-ORIG-GUID: bP-lbqtAJuo5o7ZC_zgYlx6iZ75XUmbR X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX+OiwSHJ3q5AF orkOpd2d3EXcdMK1bpZugCJRrDDuXdfN4qjqG2h5Ny8llDlxkkzbS+O+FK29hiatGVNeOKgEPXo CmtsowXHeoDgBJp6o1xarR0j5sXhGwg= X-Proofpoint-GUID: bP-lbqtAJuo5o7ZC_zgYlx6iZ75XUmbR X-Authority-Analysis: v=2.4 cv=DMO/JSNb c=1 sm=1 tr=0 ts=6a994f7f cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=h_r1GPaHZSNDaGzxDFMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 bulkscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 suspectscore=0 adultscore=0 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432263487158500 From: Pierrick Bouvier We are about to change the filtering logic for machines. These boards are impacted and already are conditionally available. To not break existing binaries, we need to filter them accordingly with new mechanic. From there, we are free to remove the previous filtering mechanic without changing any existing behaviour. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260901202043.26532-3-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/aspeed_ast27x0-fc.c | 1 + hw/arm/aspeed_ast27x0_evb.c | 2 ++ hw/arm/raspi.c | 2 ++ hw/arm/raspi4b.c | 1 + 4 files changed, 6 insertions(+) diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c index ceeae336df1..54230aa92e6 100644 --- a/hw/arm/aspeed_ast27x0-fc.c +++ b/hw/arm/aspeed_ast27x0-fc.c @@ -235,6 +235,7 @@ static const TypeInfo ast2700fc_types[] =3D { .parent =3D TYPE_MACHINE, .class_init =3D ast2700fc_class_init, .instance_size =3D sizeof(Ast2700FCState), + .is_available =3D target_aarch64, .interfaces =3D aarch64_machine_interfaces, }, }; diff --git a/hw/arm/aspeed_ast27x0_evb.c b/hw/arm/aspeed_ast27x0_evb.c index 0ff1bebeb0e..2b767808e12 100644 --- a/hw/arm/aspeed_ast27x0_evb.c +++ b/hw/arm/aspeed_ast27x0_evb.c @@ -76,12 +76,14 @@ static const TypeInfo aspeed_ast27x0_evb_types[] =3D { .name =3D MACHINE_TYPE_NAME("ast2700a1-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a1_evb_class_init, + .is_available =3D target_aarch64, .interfaces =3D aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("ast2700a2-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a2_evb_class_init, + .is_available =3D target_aarch64, .interfaces =3D aarch64_machine_interfaces, } }; diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 3f99e87428c..bbaa20bd630 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -407,11 +407,13 @@ static const TypeInfo raspi_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("raspi3ap"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3ap_machine_class_init, + .is_available =3D target_aarch64, .interfaces =3D aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi3b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3b_machine_class_init, + .is_available =3D target_aarch64, .interfaces =3D aarch64_machine_interfaces, }, { .name =3D TYPE_RASPI_MACHINE, diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index e1595a875fe..2ad561fdcfc 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -126,6 +126,7 @@ static const TypeInfo raspi4b_machine_type =3D { .parent =3D TYPE_RASPI_BASE_MACHINE, .instance_size =3D sizeof(Raspi4bMachineState), .class_init =3D raspi4b_machine_class_init, + .is_available =3D target_aarch64, .interfaces =3D aarch64_machine_interfaces, }; =20 --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432274; cv=none; d=zohomail.com; s=zohoarc; b=nKNeaU8/X70aUw2qjBex0FgNOh8xlP9N4O1awfthqjzTw4xA4lNz7zSAeDOJpZkgzrpo/ZAeeJeg/mDQk7vE42B1A4VeCI1FWrdWIVRWWbUd2p6rXhgXsJgbRHqcsc42g7Duu2oFhbzy3RJ7ieQHntBjQbMqc7M3hgeojZteb7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432274; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=geJzwEBHBK+t1Jv8sVUgFO70Oj6wqINaQuajPVPregs=; b=G3/j8D8GjKtMvXnQ+B5Swo4FwIGwdzjll4eQ3IVqsOgNjhSKLMlg9qp4xTO1O6l18Du+ucG5Gx1V35ZN2ou6t0p2ohX59ZMCMkZV04t8HlwL8qXQhIQl95qhJmwrGqea3j2VgrQ8qd/PH5cc7KOt7XrD7UzHIrEG6kwBukgwjhE= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432274903704.4330875280772; Thu, 3 Sep 2026 03:44:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24vk-0000p9-Ac; Thu, 03 Sep 2026 06:44:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vi-0000el-1u for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:26 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vg-00076s-Aj for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:25 -0400 Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHAtT935180 for ; Thu, 3 Sep 2026 10:44:23 GMT Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gerdnbvk9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:44:22 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-9390ca1a9abso355478085a.2 for ; Thu, 03 Sep 2026 03:44:22 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ce58da3acsm242537555e9.0.2026.09.03.03.44.19 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:44:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= geJzwEBHBK+t1Jv8sVUgFO70Oj6wqINaQuajPVPregs=; b=V5tCV6AVhhOpX99/ pwNErAjTHL5XsO9mjA3BdNDuOC39GzYeGMGRaX9DLGvB7qDcV7BFZ3eqAlYJ17mJ wteBiZbA4v7F6foHR0/cXi3chhU5K7b0seWcYVNPbmX4fbhOn4S300qePD9rpGfb Jrq14l7janMw8BZBY7/PB6s/4TwgLG3XwQ4iu6H0o3FUQRypJPJSJKLhnsj2JRh5 dCtWY8ekZMNo0Ha3YVql6pliodlQ0pYDl/bctp0VDqtE8h5h7wFG90KslnlxdFU2 t1YnolLX4dOAV5BboHfactdFUwrj81r2iJE0u/Leo3QY18qTa+5pPmGjTtIZZnxh 1r3Gzg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432262; x=1789037062; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=geJzwEBHBK+t1Jv8sVUgFO70Oj6wqINaQuajPVPregs=; b=IWY+z2MzXXC+503/RT8SwRyf/wOwTDgFYI8v99Fq/C002naClyjf7WCWLEEIeyXSm6 Q1HboGRHzjjvd3adswtjzastqz1BG0bCFaIGSssO31+tXJgB/Vnj+mFrrl/4Qmq1tJpG DajUupNBhwLbo2EyeY6mVXwas4TPAq+5kIAXbKDklzTXFenvLKiexID2G9m5gHJg+8qb JBCAZvPuSePXHuam3svoZnAjYo/ErBvX+vzTe5N3GEDABGuvOuKQ0R2Bhh0t6LU8X3hJ Mtd2S1HlSVt45jHrmkqIL/xBsK7HVu362BngW1RqOpXBLjapkOvGD+JWxYLWgIgGQ/Y2 2FaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432262; x=1789037062; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=geJzwEBHBK+t1Jv8sVUgFO70Oj6wqINaQuajPVPregs=; b=f85DCNuoJe58U1OI0AbacinqsNFM8bc4AJu6Ta15RRlLwkBqFnhLLdwz1zWBYOKKOP Ec5OIDvP10R8HB7jOPz27A6nbun6y6CroA1lbYdIQ4SRXE6IpEyZTv5Y8NTVE62YyS/D ZlpVUTpZ+PZvZdeMaVYzRU09v7e2uHBWizA+bkkR1gGIjuPxWqxyJUhWlBFKq6Mycnyj /eQAFK4WAA9jNem3nALWy/hNqYXJRSFGBckGFdoU6owMkpMfEYMCaHNbkz76PF0qmaxc T6YYzMLY1kakHy33vM5BATSf9UjbVCKwe2/M7y6aXcQl8il7B992OW5A8xIkKstHFmTy r4PA== X-Gm-Message-State: AFuF++m56s/FbQnww7p1ZOJ3FcK5XNMhBSEKMpDzn4Z4QoyvebDTjKKN xYvpjiWPLuvpN7bxrHxLNRoqwQV/vZLV0xEwd5eK3UJnND2wznqB7DQQFjcIz6h8tN/mUBPzKKA 6nP4ygmqur0NJrMi/CAtq8QH0xicJaTCRa4T0hM/rkd0eJWATnS2GDIh3qYs5X11F7w== X-Gm-Gg: AYBFou1ZJzkTNa5lA8QBdau3yA9ZkHZZo6bxPGyOJz++TG7cdpRKjtkpLnSGTRV1B6I AcBVZ1Gdgz7EhJge6MZxz8/X5T/Z6bTdOVlLrvJ6nGCdY8eS7Avgil9jTJpHdsj7kKrs7O4ThNJ BnT4qFsengO8DhzYbl95PUXuxuLwHHJabY/VTHdxk5/DVk4ya2GnvGPyO4PtRQung3Q1xv1XvDc aUnrVWK7dknsBxVEckD418V9/dzJw9zxpKXOYOhLLFdwTTs/4kwG3o5qQuWr9l1IGKGhzuTzU+t 7a5V3Db6B5p1DQWtd0lw5WXTuGJOGi+UegQE9Grv4AqhDSD6R+Edr0fUYawAn3hMczFRw1tXvAX E3ymv4iwb86hiCvip+DCgkzSfXOHzQ4t5t+lmO4CQ X-Received: by 2002:a05:620a:8399:b0:936:9f46:cec8 with SMTP id af79cd13be357-93960f29cb6mr1287797585a.20.1788432261815; Thu, 03 Sep 2026 03:44:21 -0700 (PDT) X-Received: by 2002:a05:620a:8399:b0:936:9f46:cec8 with SMTP id af79cd13be357-93960f29cb6mr1287794885a.20.1788432261391; Thu, 03 Sep 2026 03:44:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 38/51] system: query machines using TYPE_MACHINE Date: Thu, 3 Sep 2026 12:39:22 +0200 Message-ID: <20260903103936.62355-39-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=YcmNIQRf c=1 sm=1 tr=0 ts=6a994f86 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=r4SdTxa7mPobecY91-8A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX+/LFiio28vwl wxwjli/QiObiBgCrBh6ML8hXYDLTvGznwNdNQqEoFJfERQFP0KXySChyjAhYmGdLENDLWg2aV+M fU3ParPCROCkAog7pjTEJCJH4HHvpdI= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX3ys8QJ/uAJcF LPHWb8J8eCT+7vHICPcEBMn9F8XzlOXfhbxvuePOYBmiBrA+4ssn2i+zhdCoJl7D++GlpXhObXV HfCR3qtjJUQz5Q6nZyW+/l/pnV8dr7SMYcLd03aNDnv7DxE3KpjToWBjgDFcUP+Z85Veb3LDbIh HsAXwF8UO8kRQ6c7DIYlGWMZbjt7fypniHFNgNKW8L7cbYytUepL/UPmqEiOPA88Q4qMgBmiCNr dAmPePrX0HjCsdrWTs8M/R//ZfMgLEQ3dQ5KW8Njfs/TF44sCMK3oBPAVIGDvlfCvOkgqGUT/K0 GnTmze4caHe9lTOuKtcTmUWR99wf/AAoZwolPAHaevrjb0U+qGQ7rGSGJydrxDM3CSxvlXlWxkI sAhWliiTIk/DCgV48A1elIhc/haTmIQxawU4wKhDYwyMe9e/CPhfZ3FIau28xpH6aX93h8RZaI8 caVPMk/T6CA4IhzWv8w== X-Proofpoint-GUID: jcj4N9Xy5OrwD24s97t7R4KoYW3_kzoh X-Proofpoint-ORIG-GUID: jcj4N9Xy5OrwD24s97t7R4KoYW3_kzoh X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 phishscore=0 impostorscore=0 spamscore=0 suspectscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432275538158500 From: Pierrick Bouvier We drop the target_machine_typename() we introduced previously, and revert to using TYPE_MACHINE. From there, we'll make sure only the right types are registered at startup time. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260901202043.26532-4-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/machine-qmp-cmds.c | 2 +- monitor/qemu-config-qmp.c | 2 +- system/vl.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 1aa5f262298..543dd3201b5 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -99,7 +99,7 @@ MachineInfoList *qmp_query_machines(bool has_compat_props= , bool compat_props, GSList *el, *machines; MachineInfoList *mach_list =3D NULL; =20 - machines =3D object_class_get_list(target_machine_typename(), false); + machines =3D object_class_get_list(TYPE_MACHINE, false); for (el =3D machines; el; el =3D el->next) { MachineClass *mc =3D el->data; const char *default_cpu_type =3D machine_class_default_cpu_type(mc= ); diff --git a/monitor/qemu-config-qmp.c b/monitor/qemu-config-qmp.c index 29801023564..a680c9feca5 100644 --- a/monitor/qemu-config-qmp.c +++ b/monitor/qemu-config-qmp.c @@ -129,7 +129,7 @@ static CommandLineParameterInfoList *query_all_machine_= properties(void) ObjectProperty *prop; bool is_new; =20 - machines =3D object_class_get_list(target_machine_typename(), false); + machines =3D object_class_get_list(TYPE_MACHINE, false); assert(machines); =20 /* Loop over all machine classes */ diff --git a/system/vl.c b/system/vl.c index eded498fa7e..1b22a358d23 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1570,7 +1570,7 @@ static void machine_help_func(const QDict *qdict) GSList *el; const char *type =3D qdict_get_try_str(qdict, "type"); =20 - machines =3D object_class_get_list(target_machine_typename(), false); + machines =3D object_class_get_list(TYPE_MACHINE, false); if (type) { ObjectClass *machine_class =3D OBJECT_CLASS(find_machine(type, mac= hines)); if (machine_class) { @@ -1682,8 +1682,7 @@ static MachineClass *select_machine(QDict *qdict, Err= or **errp) { ERRP_GUARD(); const char *machine_type =3D qdict_get_try_str(qdict, "type"); - g_autoptr(GSList) machines =3D object_class_get_list(target_machine_ty= pename(), - false); + g_autoptr(GSList) machines =3D object_class_get_list(TYPE_MACHINE, fal= se); MachineClass *machine_class =3D NULL; =20 if (machine_type) { --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432278; cv=none; d=zohomail.com; s=zohoarc; b=IRnGpFHvscGU+ikaGfjvC/F28og/XsFrScSSfX/rzbYMVlYuHKE0DJGBCznV2WiBg5l4w638+OkvyKAUEX3ob8YXt7mBIQ5pqgyFtIiPbGNAuwHP9LX4AWVolaK/mgqPNEqpejm4N1xTHzATg18yvOHc1LsUwmYHY9/GmC3QUIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432278; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=EuNxuW6DmxZK4+8e+ht4Jx/6CqG794mpV6iO2sy/uNI=; b=h+X8KTKPzP2rv5Ee5xqSEmc3GupguZ8d6jS3p9r8zJXTTidBXPREdodYCmRT2Xt4EWDdoT5TkKrspqXYKu2jhYAXEUDYPcc/NHUb6T7W/cWqFJPU8y4qWFnlYX2lD2F6fWEyJPPjvPPEY7Lb98JoUch6sdLMvnjIjhgVYN2K/8E= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432278683946.687691503372; Thu, 3 Sep 2026 03:44:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24vq-0001Bh-Rw; Thu, 03 Sep 2026 06:44:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vo-000156-SG for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:32 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vm-00077m-R3 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:32 -0400 Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AH6VV935123 for ; Thu, 3 Sep 2026 10:44:29 GMT Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gerdnbvkn-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:44:29 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-9390a2c895bso580483385a.0 for ; Thu, 03 Sep 2026 03:44:29 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5d1fa6sm66229575e9.1.2026.09.03.03.44.27 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:44:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= EuNxuW6DmxZK4+8e+ht4Jx/6CqG794mpV6iO2sy/uNI=; b=SDm0gANOQQWARhxd xuKwNkjThQshOb9pvPiNRJvCp6kuJRzVUIQMJKxILeE1Fn4cAzIgEsYMtpktGKWb 2UQmSzqmRCouFxkbt+b7Lg/Hlxg8k2ne9YeAUYaS2c8LRWoN8wSNXN4zgorgLtBv nyYgTxSt87mUFHoYvy8CZI0IrtpgRyFfANrLteDpQiG6vhrsD2rhtkY7RpQORjm/ nPo06YqVNdDhPBUIeXz2k5tCgttyKa1Cya7gBE+ZXezWI/f3MSvmmHCRgTH/WTB+ yxPE2Q/CKDi1TUiIaJsiQ6AQbMjE4Fzwj/4tV8LHN4xWYFQ0eBqQtB8pWQh0LLtE C7Ze8A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432268; x=1789037068; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EuNxuW6DmxZK4+8e+ht4Jx/6CqG794mpV6iO2sy/uNI=; b=jisQcHk+1rfGhHdJkKYq61QoBCNV+rTNvi7hJ68h/AFoOEFsMDupzi2EzNI+q8ChxE vpbAp3dwVQtDpl7RorAwo1clmznhLhHB745h/8LFb2/hh/1MRU9/ecHJeQ5Mz4GCxgKT FbF9MzAMIqhQ/7HmEpFe/LOYfmire21T34bRF2PFxqNa7lv9GGood+bx0TnWSRDQhZCq 7AEkU6VHx5KpAm9c822A6hfAWKDyOmgtq8dcgjqZgekXpBusbtayatpqe3pMclFxrEJ2 bFdk6VDkDXDfp4YWccGtd5FpsJwJ7CM9F8NalcH6/bhf1MP0Z30enIFJ6TyVZ21L0iHk Y3Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432268; x=1789037068; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=EuNxuW6DmxZK4+8e+ht4Jx/6CqG794mpV6iO2sy/uNI=; b=O/BlaTVCfCGhmTxdegv+r7rJ643EEturFJYX1eNZ7GF9Pvtcwxyay8iXnsWOaWYwdF oSQFWeG46Lzz5uP1/f6RZA/Rbrii4msN55IniDgXHwna47YTiFKE4pEA/BZVxIPERV9V ov9SWqHUV7YaqQBBrzIReH/fDOwH3OotzAnBngFU/f3rvcwhADqPwVZ2Tbbbed7rXVW0 xe+xSeHd0f6oCDGi7/dHMG0lA0X9vGYb8+PZ113K58B+mMB0iL4eJCjEvm8SM7tm/T5m JKiOAF4Tqzo6X1mxJ1nHfgd9c6n5X9+4JUgegZ7l7iDfSXvfbn66wY9+mivTn54m+xIo cTvQ== X-Gm-Message-State: AFuF++myo8g0yUTl/wPuW9DxsKIrWDOoN9Cq904GxbVV4j9ANWLVAL+U dWJUrwUliL2TkxeB5nJTRF+b2OGpDQBPfzQ8uX6cZJv2E6IiQzYeaP0RfomWZG8OEtHTKGPgqYJ +DfkT0xfvnG+Lkj30IzsXyu8JV6q5mbqnEgEPrRWPDgoXxxSioOeeCjdn+LMHnSv4pg== X-Gm-Gg: AYBFou1LlX/3oadFQMEeoNIEn22zq7FaTWBeP2fFE5iuSMzkF+vu4gQlQZA9g9RIrmV VtkeufnHqq0+d3ZcampQ+nF9+QcP/QcAW0LXMUoNA1qyQN+MnWz3mnX+gfREZs1ygukFtWRsQ9y yRoBOAykNOgHLv40e9qm8qVvmwz1QwJ++NYFB936vTC4+1fQ/THXHTTRyPrHPgVQHP9sWf7/fhk JBGmA4jSywtOyumNxZ9ytu3getrjm17B1sVA3c6l5fIUL1lQp8V+/1oAiNRF0xKqQjpfWf7kdfx QJhYC69LzdPSIKAGw6/lPAp59EIcSkBSjX2i99VuR1WSnP8vnOJWxkcy2xXp7ao3xkUmSkx9pDB zGSDTfMRie4bMev6QLa4I2f7uRRxs1q/LNRHlBClk X-Received: by 2002:a05:620a:28c1:b0:939:492:20ce with SMTP id af79cd13be357-93960fdc49fmr1186138185a.1.1788432268495; Thu, 03 Sep 2026 03:44:28 -0700 (PDT) X-Received: by 2002:a05:620a:28c1:b0:939:492:20ce with SMTP id af79cd13be357-93960fdc49fmr1186134485a.1.1788432268025; Thu, 03 Sep 2026 03:44:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 39/51] target-info: remove machine_typename Date: Thu, 3 Sep 2026 12:39:23 +0200 Message-ID: <20260903103936.62355-40-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=YcmNIQRf c=1 sm=1 tr=0 ts=6a994f8d cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=qKhv0Rusv1ucPuRBWVoA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX2vwISp1xDcBs 3ydvoNTlosxM1m1BUrZMvhIci1Si1Gd1G65l9HhXafhLdh58Ng23rj3/+T2J3nk8+8MyvmexoY2 ICTc/cXZZtXDk2qUheS8UMw1g8e0Mx0= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX+xGE3/iW0/2u KBFiYbn4o+MDsaohRYn30hDSBaWnrKbDKI0gE4I5OOPR3W2STxetFggGdrZi2uqFpMvOKGSZuu5 1rANAcrZpTGuNPR0W6hzGEt9Tu+5Ucxz3EINykgcBdpj/TlZCGNCSbgx9AyZfbp3HQUjkExg91X jc0HMpRhq000ybpdQrd6+jpIu95lC0ZImiy41hxKzSEkFB8wl412i9xTYcKiO/FquuKf1Mv31K9 Qi+3lSbViYE3hbBz+q2raWAG65+kxiJ+xiHNkPvm689B0KpYNoOEay3lsC+/tM8VOGcq0AGgPGf MRFAkLgw5VzH+kIeGhbp0eFhEUgv5U9ira/7LP+6KO9yKhLPSFR5iKu4/Ghl0HXrKg15OUapbbb jZVq9exMmc9mTBRdHsv9JVeft/4mpwqw96MtHPL6BXDuUtfZwGZVsMocV3dwVAMr0vcwUSHLD4H R65uHlaCb2tTV8p9RoA== X-Proofpoint-GUID: ax6vtBXaUmJVpnwuys-jBFLEMIN7dkaf X-Proofpoint-ORIG-GUID: ax6vtBXaUmJVpnwuys-jBFLEMIN7dkaf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 phishscore=0 impostorscore=0 spamscore=0 suspectscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432279549158500 From: Pierrick Bouvier This field is now unused, so we can remove it. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260901202043.26532-5-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/target-info-impl.h | 2 -- include/qemu/target-info.h | 8 -------- configs/targets/aarch64-softmmu.c | 1 - configs/targets/arm-softmmu.c | 1 - configs/targets/riscv32-softmmu.c | 1 - configs/targets/riscv64-softmmu.c | 1 - target-info-stub.c | 1 - target-info.c | 5 ----- 8 files changed, 20 deletions(-) diff --git a/include/qemu/target-info-impl.h b/include/qemu/target-info-imp= l.h index c917d546eab..cf42aabbc8b 100644 --- a/include/qemu/target-info-impl.h +++ b/include/qemu/target-info-impl.h @@ -21,8 +21,6 @@ typedef struct TargetInfo { unsigned long_bits; /* runtime equivalent of CPU_RESOLVING_TYPE definition */ const char *cpu_type; - /* QOM typename machines for this binary must implement */ - const char *machine_typename; /* related to TARGET_BIG_ENDIAN definition */ EndianMode endianness; /* diff --git a/include/qemu/target-info.h b/include/qemu/target-info.h index 6c5b714288e..b23e5bc5865 100644 --- a/include/qemu/target-info.h +++ b/include/qemu/target-info.h @@ -23,14 +23,6 @@ const char *target_name(void); */ unsigned target_long_bits(void); =20 -/** - * target_machine_typename: - * - * Returns: Name of the QOM interface implemented by machines - * usable on this target binary. - */ -const char *target_machine_typename(void); - /** * target_cpu_type: * diff --git a/configs/targets/aarch64-softmmu.c b/configs/targets/aarch64-so= ftmmu.c index 75d95b0e743..2200a4f19e9 100644 --- a/configs/targets/aarch64-softmmu.c +++ b/configs/targets/aarch64-softmmu.c @@ -18,7 +18,6 @@ static const TargetInfo target_info_aarch64_system =3D { .target_arch =3D SYS_EMU_TARGET_AARCH64, .long_bits =3D 64, .cpu_type =3D TYPE_ARM_CPU, - .machine_typename =3D TYPE_TARGET_AARCH64_MACHINE, .endianness =3D ENDIAN_MODE_LITTLE, .page_bits_vary =3D true, .page_bits_init =3D TARGET_PAGE_BITS_LEGACY, diff --git a/configs/targets/arm-softmmu.c b/configs/targets/arm-softmmu.c index 73546fa5737..9d558a0c1a1 100644 --- a/configs/targets/arm-softmmu.c +++ b/configs/targets/arm-softmmu.c @@ -18,7 +18,6 @@ static const TargetInfo target_info_arm_system =3D { .target_arch =3D SYS_EMU_TARGET_ARM, .long_bits =3D 32, .cpu_type =3D TYPE_ARM_CPU, - .machine_typename =3D TYPE_TARGET_ARM_MACHINE, .endianness =3D ENDIAN_MODE_LITTLE, .page_bits_vary =3D true, .page_bits_init =3D TARGET_PAGE_BITS_LEGACY, diff --git a/configs/targets/riscv32-softmmu.c b/configs/targets/riscv32-so= ftmmu.c index 752c813077e..c1d94679c7e 100644 --- a/configs/targets/riscv32-softmmu.c +++ b/configs/targets/riscv32-softmmu.c @@ -18,7 +18,6 @@ static const TargetInfo target_info_riscv32_system =3D { .target_arch =3D SYS_EMU_TARGET_RISCV32, .long_bits =3D 32, .cpu_type =3D TYPE_RISCV_CPU, - .machine_typename =3D TYPE_TARGET_RISCV32_MACHINE, .endianness =3D ENDIAN_MODE_LITTLE, .page_bits_init =3D TARGET_PAGE_BITS, }; diff --git a/configs/targets/riscv64-softmmu.c b/configs/targets/riscv64-so= ftmmu.c index 5150f0fe9d9..f648a5c8944 100644 --- a/configs/targets/riscv64-softmmu.c +++ b/configs/targets/riscv64-softmmu.c @@ -18,7 +18,6 @@ static const TargetInfo target_info_riscv64_system =3D { .target_arch =3D SYS_EMU_TARGET_RISCV64, .long_bits =3D 64, .cpu_type =3D TYPE_RISCV_CPU, - .machine_typename =3D TYPE_TARGET_RISCV64_MACHINE, .endianness =3D ENDIAN_MODE_LITTLE, .page_bits_init =3D TARGET_PAGE_BITS, }; diff --git a/target-info-stub.c b/target-info-stub.c index 22b7911201c..d121b8c0170 100644 --- a/target-info-stub.c +++ b/target-info-stub.c @@ -29,7 +29,6 @@ static const TargetInfo target_info_stub =3D { .target_arch =3D glue(SYS_EMU_TARGET_, TARGET_ARCH), .long_bits =3D TARGET_LONG_BITS, .cpu_type =3D CPU_RESOLVING_TYPE, - .machine_typename =3D TYPE_MACHINE, .endianness =3D TARGET_BIG_ENDIAN ? ENDIAN_MODE_BIG : ENDIAN_MODE_LITT= LE, #ifdef TARGET_PAGE_BITS_VARY .page_bits_vary =3D true, diff --git a/target-info.c b/target-info.c index 04c69c41f8a..012b384036d 100644 --- a/target-info.c +++ b/target-info.c @@ -32,11 +32,6 @@ const char *target_cpu_type(void) return target_info()->cpu_type; } =20 -const char *target_machine_typename(void) -{ - return target_info()->machine_typename; -} - EndianMode target_endian_mode(void) { return target_info()->endianness; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432297; cv=none; d=zohomail.com; s=zohoarc; b=cib1xiKHs2a0cfdWvJZeaQYWyED+qT+1QTWTbzknf/Gs/kAxM7BeGxFjHU4kAsZ1nIabz9edaUPWP9mvwpFGjdWAbc9wnh8taIXxfn5uSnONaENWQZIG+nBQdzhXT5kCVN4DzNA4uQCtrrXpOpP03rOu50IhALXL6e1N3UYWqVc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432297; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=zHQmDVzoj0QvSmQe65ZGl3crIuQWtg913g8PCZTy/lk=; b=KHM4jZosuk1Cd84aXipfLM0bYNUN08MZUKVuc/7kuKzqyh8rm5f7h5+Sc2k1Efzu5gMVhuz9lHPLczdz4IZdlFJ4oOW25BQbpVpIi/aW9qUQNf3esMKioy/nOfEVt2rK9x6gOuagLBEHt0M71SsT19VEjHIRWlGIOfcGunFtLoU= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432297020606.4658921661576; Thu, 3 Sep 2026 03:44:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24w1-0001Ku-Jp; Thu, 03 Sep 2026 06:44:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vx-0001J8-GJ for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:41 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24vv-00079F-Ph for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:41 -0400 Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHMck3852414 for ; Thu, 3 Sep 2026 10:44:38 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf51m0njr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:44:38 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-934963b2bc0so420714085a.3 for ; Thu, 03 Sep 2026 03:44:38 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5e6115sm63664525e9.14.2026.09.03.03.44.33 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:44:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= zHQmDVzoj0QvSmQe65ZGl3crIuQWtg913g8PCZTy/lk=; b=IPzLTagN4fcFTWbW xI2Wqg+vFWZzoj4waAMVmxCtbJos8nGnlbeR/9pQdBTCksv1uijHwwqtIm143C40 EdBePFXWbrRhI31cZ/CYnxH8appJzfYHKJGEsyrioNdIPVUGcgK689U/ucP5NgS2 2CuBh/2lANEs5q8hlATV0iwqu3aQm8DLvMPNvNMJfh17QUwdbxNp+Ne0FlqVB6lW cPXvkGCi8N8B/iXEDEmPKBTecO5BtDbjSPLQGgBft0ALMqdbW/29SNBKySshgxjb 8RNrz8KRRr2RJRV50LCj6f9GD7kOEPwlGMNTtxmdohZxyDwih/2SepPn9tk9SCZ2 +BbfXA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432277; x=1789037077; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=zHQmDVzoj0QvSmQe65ZGl3crIuQWtg913g8PCZTy/lk=; b=h0fWvw1LsfEDWWScLk2fjANa5F2dqqeug3pyO1aOoBWV0Ywc48q+yC5HglFD0/XD6/ y05LjUtAKaYNQvD7Nex8NxKGyfi1qOolOyWNLw85jhCIRildADMBYESYt05wh8KgACMo ANdHCpSHdvLcvQozdPTB9+/RO21KyZdrshO6dZmQDCYRmFqhz8x0FFqFHrx2oMSjVP01 jXPAZbAJ2+qOKmpNCj7OdCBawgp5xYadjRfRSmMhyK/DUeUqB2HqeLo2Iwqstn3waaji vQunb9UIaXT70eiuGhqkSC2GgO23qQUpqAjdjegzWJ9bMuEqEeMWOnnXxxxQlCnsbIMj WKAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432277; x=1789037077; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=zHQmDVzoj0QvSmQe65ZGl3crIuQWtg913g8PCZTy/lk=; b=i5qqSq5zVBDwtgTfjuB/6ZhObsE+/UOXlk5RPojQvTzwA+eupdgJVcb6QDNCK4Wsrl 96kgfvdRcUCeKW/2DqZ5tMrYh7RWgf1wRBveZTx4VRLq3Z163Kwbo/dPkfom4pyiIIlM dCA38g9QjDFhsQlP9CCkqKviGzckUMbmpqFJc5xV3Kkod8tIlLT+E2imxyiDKoELwt93 0MiBjPGcMbnioCL/jNsiU6XYq18YOK10aBwjU6/qYteBkVCWifZgcI2UNZvr7d9k/eQ+ UFBWb/8qjUp30N9QO4NtWt40Sb5cmobXJ5xkLgyotmPRQgGHBzu523/l2Wwl4nVbe8NC 2Wkw== X-Gm-Message-State: AFuF++nFDj9sIYRBfXybG9pJRdojhzj8/WKQmL0s4YGiJoj2uUPxnRon P/Amsdk1mQC4pfrngRDIf6iORZ/Dp1Bf0iPxlCIlT8h3MkjXo+FfVDEwONY72vJd9oFNYU7gCk0 Ke1ohMFLd9si6vdm6/0g78gUDkuuyyoSjokSX4h5H7HAXwL0yHaNA5goOxTQNcOkx/A== X-Gm-Gg: AYBFou1Jd40kT2P1nk9tsVs+/CQ9PN6njfTEuMcQlpnJmvXnBZrOmMCMmldmZjv/aW0 Mmrijwpd27eDPUI7W1wpO13FVGeVcr82aIKyNeW0kPnE4xRzQ3V0X85bhmkcWys9BSsbNBYbFf7 D/57qCL6TB5vlIvssBMoNtBQq+rlmRVXlDnd4OVdsy2+QWvvKkCcqOb8xE5fxHoaNmD3I1v3o2N hQ5T7ct0ASIN2PEskKwaKeY/9j2aMaMfIUNBVcj25Vh3kYbyfQ5Zt7oU1nrsm4407BR7QDQcvbZ PtlhGxpEZR7grz1AcHE7X6YLq7SlQgjb2d09o3s21UpZ77H/W529uZdAG4X4XVfpYPXGdyDSj8J CkyGncyA0udG6+hZdNh5X0QY2V2Mhp0tKGtTOUNG7 X-Received: by 2002:a05:620a:6019:b0:939:7c8:78b1 with SMTP id af79cd13be357-93960edcf5cmr1415015185a.24.1788432277526; Thu, 03 Sep 2026 03:44:37 -0700 (PDT) X-Received: by 2002:a05:620a:6019:b0:939:7c8:78b1 with SMTP id af79cd13be357-93960edcf5cmr1415011285a.24.1788432277065; Thu, 03 Sep 2026 03:44:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 40/51] hw/arm: remove TYPE_TARGET_{AARCH64,ARM}_MACHINE Date: Thu, 3 Sep 2026 12:39:24 +0200 Message-ID: <20260903103936.62355-41-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 7q5jXCUJ1oh_rwEBo_P-7anNeRFI-pWQ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX8eeI7RCGM/Fk vtdbQ0X/S8QKq137sNIwMcLQk0dBeF7jiKCEIwv+McS0KiY+NUhdG2vciKk4AxOaVHj/u1GdHa7 /lODVrVtVTFpX7VAPDu5YsGGNQ+O0Oe7vhuOC+IntY2bebmJvaEqGQt6CYH2HPvm1TjcUIZ6Wib dzBjZ9fg+ht5lTrbz7ISPkvbhfIrFR1608rmW99uvZaMZZYgqNKXrTl9S+n/gYdFXhtyiVmPBH3 9tPpLR/0ur2xmCVLenFs4Hmo7/3hN0P9D07QQydTM3ZxsVBBvdV8Gjv9Fn6Jvx2LwjFzzdTW4RI yh+mtRy354Y09YLTkvl5TCK7sagB5OjDjVe9WtLrTXrBh06sYocBWhoy+xgVkmInGVTxK1C/Oay fNdAF0mafqeBghba17FaPYRZbk1UncZQgmO1E86bBFf0nbV0DTC+dd1nLkzn7YMWE/6lU10KGhd P/tG7NgDEoAjfC1wu0g== X-Authority-Analysis: v=2.4 cv=X8Ji7mTe c=1 sm=1 tr=0 ts=6a994f96 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=h_r1GPaHZSNDaGzxDFMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX/0Njq+VXs8UN Gf+XOxly8Hno9zUR0NmVNsX98aL+YpUnt5R96rma9AWeRG/WVGJ1HFBDnv67QANM02QiAdelmOm 5C/QH0NizZY6VzSzk8jx3q/0p/aE97Q= X-Proofpoint-ORIG-GUID: 7q5jXCUJ1oh_rwEBo_P-7anNeRFI-pWQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432297704158500 From: Pierrick Bouvier We don't need those types anymore. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260901202043.26532-8-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/machines-qom.h | 6 ------ hw/core/null-machine.c | 2 -- hw/nitro/machine.c | 5 ----- hw/remote/machine.c | 2 -- target-info-qom.c | 8 -------- target/arm/machine.c | 5 ----- 6 files changed, 28 deletions(-) diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h index 3ed39384e59..81ffa434303 100644 --- a/include/hw/arm/machines-qom.h +++ b/include/hw/arm/machines-qom.h @@ -11,12 +11,6 @@ =20 #include "hw/core/boards.h" =20 -#define TYPE_TARGET_ARM_MACHINE \ - "target-info-arm-machine" - -#define TYPE_TARGET_AARCH64_MACHINE \ - "target-info-aarch64-machine" - /* * A machine filtered with arm_machine_interfaces[] or * arm_aarch64_machine_interfaces[] will be available diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index f132a7b89b4..c1ecf3214fd 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -58,8 +58,6 @@ static void machine_none_machine_init(MachineClass *mc) } =20 DEFINE_MACHINE_WITH_INTERFACES("none", machine_none_machine_init, - { TYPE_TARGET_AARCH64_MACHINE }, - { TYPE_TARGET_ARM_MACHINE }, { TYPE_TARGET_RISCV32_MACHINE }, { TYPE_TARGET_RISCV64_MACHINE }, { }) diff --git a/hw/nitro/machine.c b/hw/nitro/machine.c index 8849959359c..bb8878299bc 100644 --- a/hw/nitro/machine.c +++ b/hw/nitro/machine.c @@ -262,11 +262,6 @@ static const TypeInfo nitro_machine_info =3D { .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(NitroMachineState), .class_init =3D nitro_machine_class_init, - .interfaces =3D (const InterfaceInfo[]) { - /* x86_64 and aarch64 only */ - { TYPE_TARGET_AARCH64_MACHINE }, - { } - }, }; =20 static void nitro_machine_register(void) diff --git a/hw/remote/machine.c b/hw/remote/machine.c index df08f640199..6580e0d9683 100644 --- a/hw/remote/machine.c +++ b/hw/remote/machine.c @@ -149,8 +149,6 @@ static const TypeInfo remote_machine =3D { .class_init =3D remote_machine_class_init, .interfaces =3D (const InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, - { TYPE_TARGET_AARCH64_MACHINE }, - { TYPE_TARGET_ARM_MACHINE }, { } } }; diff --git a/target-info-qom.c b/target-info-qom.c index 7958a5cc685..eb9491338ca 100644 --- a/target-info-qom.c +++ b/target-info-qom.c @@ -16,14 +16,6 @@ #include "hw/riscv/machines-qom.h" =20 static const TypeInfo target_info_types[] =3D { - { - .name =3D TYPE_TARGET_ARM_MACHINE, - .parent =3D TYPE_INTERFACE, - }, - { - .name =3D TYPE_TARGET_AARCH64_MACHINE, - .parent =3D TYPE_INTERFACE, - }, { .name =3D TYPE_TARGET_RISCV32_MACHINE, .parent =3D TYPE_INTERFACE, diff --git a/target/arm/machine.c b/target/arm/machine.c index 89127e5d83c..42a1427fa16 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -1348,18 +1348,13 @@ const VMStateDescription vmstate_arm_cpu =3D { }; =20 const InterfaceInfo arm_machine_interfaces[] =3D { - { TYPE_TARGET_ARM_MACHINE }, - { TYPE_TARGET_AARCH64_MACHINE }, { } }; =20 const InterfaceInfo arm_aarch64_machine_interfaces[] =3D { - { TYPE_TARGET_ARM_MACHINE }, - { TYPE_TARGET_AARCH64_MACHINE }, { } }; =20 const InterfaceInfo aarch64_machine_interfaces[] =3D { - { TYPE_TARGET_AARCH64_MACHINE }, { } }; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432299; cv=none; d=zohomail.com; s=zohoarc; b=Qv3e9LAlYt6i5IkrwJUY2i36A2Utd6+D+itQxwGznMqgJDV0pItk3vDWQbZmn9ColSe7e8848DBX6HjPBTeUHI28YFImRylbBVrw5qVuKBy1zmAxjeh12YjSp6prDfcLXlhSuzCrwX9M+mS659n6D6stUWhoUDvCbV6n9YeVRRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432299; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=HA+XJSWbjcHb7R4u/tuv/6HM6wdwZlyrREk/MyyWZfM=; b=oAvZ8tt2z4zCkM2z5rWwHFtN1wVwNmj2kgRLoOH1+mcjHaUZouN3nAveBM7TQgBoC2th6Xnx7ubFPx/q0Q2Cks/0CGwixgyNLiEmPYQHh92eNPMQOCqZRWLPYikmQ+9zRvyTMklzyTi8n1rrD1e7UHmY5aRq7LRLkbMjn5GE8u4= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432299428712.510162685807; Thu, 3 Sep 2026 03:44:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24wC-0001kA-He; Thu, 03 Sep 2026 06:44:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24w9-0001Xn-2i for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:53 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24w4-0007AF-TP for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:52 -0400 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHB4q3203946 for ; Thu, 3 Sep 2026 10:44:46 GMT Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf5d10hn7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:44:46 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-92e820609d9so447692085a.2 for ; Thu, 03 Sep 2026 03:44:45 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-484492cdbfbsm12900853f8f.33.2026.09.03.03.44.42 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:44:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= HA+XJSWbjcHb7R4u/tuv/6HM6wdwZlyrREk/MyyWZfM=; b=Bu3OIJvMRIL+Lkdv nVcuXEpRwPAUmm5NwKzIL4yWb2yi4J5SbQWUERpelJUsK4BlH+lBSgwDRi/CwdC8 0a33cX128/e4wKMRr7k0Q1U43un0pmDDSaCYS1bMPJxKeGSK8WNOzRafARVzd5jU Yhv2lKGgOIc+UjojIDJ7in6ypJ27HLGoGoAukEwg4XQzeRmTxDv24PNK6FTWKCRK z/GzHips79qfeXLFsdiRnyixH/lbkSu/yeCfmE67pSlEJxlbsvPIKzJhVzD0wTrq bfmBe1XHpQQjc8opn5VtaCDnINkzvhjR6FThmE5ROfQwJILWvi7CcFPRyYvB2QLz dfltdg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432285; x=1789037085; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=HA+XJSWbjcHb7R4u/tuv/6HM6wdwZlyrREk/MyyWZfM=; b=eS2BqGa3cLULd6OJCTyblzJeqhsRnC7iyhfZ6POuOygHBtviqw2GEFX+c4/+vNY39S 4HTkHqKgNv90YmAIdGPb3ujndszoLul88SMksF4P+2UWbhZLODyX9orqlXByqwFNcX1E m2ax0w/p30h7JTX/Be7p6YvwQtQmRHohNs5qge4xe85gh/kMVC5ysH4mHx9WLD/tmAMv H/y5r+zxAdR5wTvX6IuELGDdEeIjo4bCT+h1RC9X8cBnWRee1SOHkmrJ29mq3z2JOSEG 57/kLIzThSWhZV/OrR1Ns06R5o9u1OF35jSjUL3fVecsnr+BtO2V5sFkTQe2Zzox0x6T ij7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432285; x=1789037085; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=HA+XJSWbjcHb7R4u/tuv/6HM6wdwZlyrREk/MyyWZfM=; b=CTtIYx/ppAWiSfVbFyi5QS+3JgTWKiLcXswmSf5dzOhyhjftIKRU3N6jCbUFQgT9+v KYmtERyEISbWPoJO4K623mMBMrwl1TouKoUMgKP7HNU1DfefLRcWU8IBjZAXLCROc7Ue ZafQskJR2q6ZeZ3T6uWl3LDLmYmXWJ9pMGfc0JmhwLCiiHdwrryA7zy5NQ3gBrK6R38W E+IIO60j4fvQ1o12LKmp5hqTiJaJth/Mj6kckrPWaPjxlYRGy8m+LUPyAHB1XvXRFNSq 0JoLNJWRqIikNe6kssQsCNbc6+WHwre0pZxXRPxOpvRoERMlP4KUoqdyNEkzVzThpKYG 7HSg== X-Gm-Message-State: AFuF++m87SoxYb+Smj+nBZaOpZ+lEqVTtGjx8wnlqXDv8oYHt1dA2bvK +MaduIpWIc5qDB3VfmXLTfJ2zyv7WvX/0FgY6Fio9wbsXGwt+CTdScrSa1oZtRm51XcY/0ZNg/i U2GciJJejrMmSZnc5tlYiKoegcjQIbluNC4R+FK9KwZ6q/G3XRM9KLZZJTzOqbf+kyw== X-Gm-Gg: AYBFou2RdoQBmcAxC69yQWP2d4+9F0tYM6Cp1OArB/cIaPQgXzAZqbAfu5mojyqaq/V 2nuPvz4gaJ/zsefcw9xN9muW0WhHKY151Xyze5I/BmIZ4LEnjeQWDZHBI/J1/WhVDBslLP405OD z0QUXc0uUDxkyx/gb5qsdGprwW36gZizaot7VFLBl+cOxHRRFZ9NhnYs+W7zrt+p+NdrH/Y6OJs MwNV1HKYnvOP1yhwntbYMUK0HzynnI05HTAQcfFKZrprjDdyW5n7GWoE5tkQGCLJWw8YHl8yRQP kplZHEeApEQun3NjEoKgkiAOABzmCs8GEKxuQxvhe+CmRVmnWOLzcWraOlxpsnv+GYCqBthgv+6 GnQzm3msPW66iXA8SlnFJyZWkxQa/sTh38TllTx9/ X-Received: by 2002:a05:620a:916d:b0:939:6de6:9515 with SMTP id af79cd13be357-9396de696dcmr513869485a.44.1788432284817; Thu, 03 Sep 2026 03:44:44 -0700 (PDT) X-Received: by 2002:a05:620a:916d:b0:939:6de6:9515 with SMTP id af79cd13be357-9396de696dcmr513862985a.44.1788432283916; Thu, 03 Sep 2026 03:44:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 41/51] hw/arm: remove {arm, arm_aarch64, aarch64}_machine_interfaces Date: Thu, 3 Sep 2026 12:39:25 +0200 Message-ID: <20260903103936.62355-42-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXzk2eB1Y2CStg Ywcfi5GJXd+TUb4zOP9q1HCXLwBzQxNDMSead2DVCduxbf565pdzEwNL6kbH13rpEnr1qDpJPWb /vSdb+Q+wQSUlXR8xo9UggpjclpXvkYFEd8Ib1VEEPa7w+EwkyNOLPP4xxfMzS3HPCbGRLOUkVI ra+aga3Srgg53+dC+mksm4qhJUwcDGA8rnBJ7RQJ4hBW93z7A1bsjbJCWpHxWF4mV4TFAobnH9u QwYDvJTzNt+U7FSPzRCXNnQIXUtTG5pNwbHc1/lhU9O8IWqidypBjcsO4dpqtILvWNzB/4fdiUu +x1/tXzsmwacpgizl9OlXNokGTN5b/75R8WrOra9k+xAYdwdca363Nyb8xAQO5QEK19cWc9EAZ2 GVojB6i8f0BsX94Jz/IPvocqQkir3ObdESdTYl7DysyNn4O05mp77J4BQ+4nje2S0ZtbYxVMF2Y qTpe4x/ZEmGAQKRZYkw== X-Proofpoint-ORIG-GUID: NtNJbiWVhK-kTChrnoD84QfehyFMIxuO X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX2xuaevbZQVZT wHhQbPnxYf4s+wCzYJZ5sj3/V5FbtlSDHbTckXCo/zCO5dpdgc+lavqos3bcbDxNflV21/ERx3i 6IxrP5LGoUMWYAjXlrAhTE9KGXSTZmw= X-Proofpoint-GUID: NtNJbiWVhK-kTChrnoD84QfehyFMIxuO X-Authority-Analysis: v=2.4 cv=J4GaKgnS c=1 sm=1 tr=0 ts=6a994f9e cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=zJ6Mc8Ub0I0eiHxM4GwA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432299808158501 From: Pierrick Bouvier We can now remove those arrays. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260901202043.26532-9-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/machines-qom.h | 16 ++-------------- hw/arm/aspeed_ast1040_evb.c | 1 - hw/arm/aspeed_ast10x0_evb.c | 2 -- hw/arm/aspeed_ast2400_palmetto.c | 1 - hw/arm/aspeed_ast2400_quanta-q71l.c | 1 - hw/arm/aspeed_ast2400_supermicrox11.c | 1 - hw/arm/aspeed_ast2500_evb.c | 1 - hw/arm/aspeed_ast2500_g220a.c | 1 - hw/arm/aspeed_ast2500_romulus.c | 1 - hw/arm/aspeed_ast2500_supermicro-x11spi.c | 1 - hw/arm/aspeed_ast2500_tiogapass.c | 1 - hw/arm/aspeed_ast2500_witherspoon.c | 1 - hw/arm/aspeed_ast2500_yosemitev2.c | 1 - hw/arm/aspeed_ast2600_anacapa.c | 1 - hw/arm/aspeed_ast2600_bletchley.c | 1 - hw/arm/aspeed_ast2600_catalina.c | 1 - hw/arm/aspeed_ast2600_evb.c | 1 - hw/arm/aspeed_ast2600_fby35.c | 1 - hw/arm/aspeed_ast2600_fuji.c | 1 - hw/arm/aspeed_ast2600_gb200nvl.c | 1 - hw/arm/aspeed_ast2600_rainier.c | 1 - hw/arm/aspeed_ast27x0-fc.c | 1 - hw/arm/aspeed_ast27x0_evb.c | 2 -- hw/arm/ax3000-boards.c | 1 - hw/arm/b-l475e-iot01a.c | 1 - hw/arm/bananapi_m2u.c | 2 +- hw/arm/collie.c | 1 - hw/arm/cubieboard.c | 2 +- hw/arm/exynos4_boards.c | 2 -- hw/arm/imx8mm-evk.c | 2 +- hw/arm/imx8mp-evk.c | 1 - hw/arm/integratorcp.c | 2 +- hw/arm/mcimx7d-sabre.c | 2 +- hw/arm/microbit.c | 1 - hw/arm/mps2-tz.c | 5 ----- hw/arm/mps2.c | 4 ---- hw/arm/mps3r.c | 1 - hw/arm/musca.c | 2 -- hw/arm/npcm7xx_boards.c | 5 ----- hw/arm/npcm8xx_boards.c | 1 - hw/arm/omap_sx1.c | 2 -- hw/arm/orangepi.c | 2 +- hw/arm/raspi.c | 5 ----- hw/arm/raspi4b.c | 1 - hw/arm/realview.c | 4 ---- hw/arm/sabrelite.c | 1 - hw/arm/sbsa-ref.c | 1 - hw/arm/stellaris.c | 2 -- hw/arm/versatilepb.c | 2 -- hw/arm/vexpress.c | 2 -- hw/arm/virt.c | 1 - hw/arm/xen-pvh.c | 1 - hw/arm/xilinx_zynq.c | 1 - hw/arm/xlnx-versal-virt.c | 2 -- hw/arm/xlnx-zcu102.c | 1 - target/arm/machine.c | 12 ------------ 56 files changed, 8 insertions(+), 107 deletions(-) diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h index 81ffa434303..449592beda0 100644 --- a/include/hw/arm/machines-qom.h +++ b/include/hw/arm/machines-qom.h @@ -11,18 +11,6 @@ =20 #include "hw/core/boards.h" =20 -/* - * A machine filtered with arm_machine_interfaces[] or - * arm_aarch64_machine_interfaces[] will be available - * in both qemu-system-arm and qemu-system-aarch64 binaries. - * - * One filtered with aarch64_machine_interfaces[] will only - * be available in the qemu-system-aarch64 binary. - */ -extern const InterfaceInfo arm_machine_interfaces[]; -extern const InterfaceInfo arm_aarch64_machine_interfaces[]; -extern const InterfaceInfo aarch64_machine_interfaces[]; - /* * A machine defined with the DEFINE_MACHINE_ARM() macro will be * available in both qemu-system-arm and qemu-system-aarch64 binaries. @@ -32,9 +20,9 @@ extern const InterfaceInfo aarch64_machine_interfaces[]; */ #define DEFINE_MACHINE_ARM(namestr, machine_initfn) \ DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - arm_machine_interfaces) + NULL) #define DEFINE_MACHINE_AARCH64(namestr, machine_initfn) \ DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - aarch64_machine_interfaces) + NULL) =20 #endif diff --git a/hw/arm/aspeed_ast1040_evb.c b/hw/arm/aspeed_ast1040_evb.c index 2b93d4dfbc5..dd68f9e25c7 100644 --- a/hw/arm/aspeed_ast1040_evb.c +++ b/hw/arm/aspeed_ast1040_evb.c @@ -81,7 +81,6 @@ static const TypeInfo aspeed_ast1040_evb_types[] =3D { .name =3D MACHINE_TYPE_NAME("ast1040-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast1040_evb_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast10x0_evb.c b/hw/arm/aspeed_ast10x0_evb.c index c19563d1f0a..f377e955adc 100644 --- a/hw/arm/aspeed_ast10x0_evb.c +++ b/hw/arm/aspeed_ast10x0_evb.c @@ -119,12 +119,10 @@ static const TypeInfo aspeed_ast10x0_evb_types[] =3D { .name =3D MACHINE_TYPE_NAME("ast1030-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_minibmc_machine_ast1030_evb_class_init, - .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("ast1060-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_minibmc_machine_ast1060_evb_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2400_palmetto.c b/hw/arm/aspeed_ast2400_palme= tto.c index 776aa43a45d..f4918683c3d 100644 --- a/hw/arm/aspeed_ast2400_palmetto.c +++ b/hw/arm/aspeed_ast2400_palmetto.c @@ -73,7 +73,6 @@ static const TypeInfo aspeed_ast2400_palmetto_types[] =3D= { .name =3D MACHINE_TYPE_NAME("palmetto-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_palmetto_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2400_quanta-q71l.c b/hw/arm/aspeed_ast2400_qu= anta-q71l.c index 42ad2a2303f..e1ddf682315 100644 --- a/hw/arm/aspeed_ast2400_quanta-q71l.c +++ b/hw/arm/aspeed_ast2400_quanta-q71l.c @@ -79,7 +79,6 @@ static const TypeInfo aspeed_ast2400_quanta_q71l_types[] = =3D { .name =3D MACHINE_TYPE_NAME("quanta-q71l-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_quanta_q71l_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2400_supermicrox11.c b/hw/arm/aspeed_ast2400_= supermicrox11.c index 88cdb01fc76..86d49fd1dee 100644 --- a/hw/arm/aspeed_ast2400_supermicrox11.c +++ b/hw/arm/aspeed_ast2400_supermicrox11.c @@ -74,7 +74,6 @@ static const TypeInfo aspeed_ast2400_supermicrox11_types[= ] =3D { .name =3D MACHINE_TYPE_NAME("supermicrox11-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_supermicrox11_bmc_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2500_evb.c b/hw/arm/aspeed_ast2500_evb.c index 8b5cb67be9b..5f616252e0b 100644 --- a/hw/arm/aspeed_ast2500_evb.c +++ b/hw/arm/aspeed_ast2500_evb.c @@ -60,7 +60,6 @@ static const TypeInfo aspeed_ast2500_evb_types[] =3D { .name =3D MACHINE_TYPE_NAME("ast2500-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2500_evb_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2500_g220a.c b/hw/arm/aspeed_ast2500_g220a.c index 3f979a78e57..3c654c62dd6 100644 --- a/hw/arm/aspeed_ast2500_g220a.c +++ b/hw/arm/aspeed_ast2500_g220a.c @@ -85,7 +85,6 @@ static const TypeInfo aspeed_ast2500_g220a_types[] =3D { .name =3D MACHINE_TYPE_NAME("g220a-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_g220a_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2500_romulus.c b/hw/arm/aspeed_ast2500_romulu= s.c index 91b660e74bb..b2ed623f680 100644 --- a/hw/arm/aspeed_ast2500_romulus.c +++ b/hw/arm/aspeed_ast2500_romulus.c @@ -55,7 +55,6 @@ static const TypeInfo aspeed_ast2500_romulus_types[] =3D { .name =3D MACHINE_TYPE_NAME("romulus-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_romulus_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2500_supermicro-x11spi.c b/hw/arm/aspeed_ast2= 500_supermicro-x11spi.c index a2450aa9623..77fa028b096 100644 --- a/hw/arm/aspeed_ast2500_supermicro-x11spi.c +++ b/hw/arm/aspeed_ast2500_supermicro-x11spi.c @@ -70,7 +70,6 @@ static const TypeInfo aspeed_ast2500_supermicro_x11spi_ty= pes[] =3D { .name =3D MACHINE_TYPE_NAME("supermicro-x11spi-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_supermicro_x11spi_bmc_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2500_tiogapass.c b/hw/arm/aspeed_ast2500_tiog= apass.c index 186dbc1da30..1771f376480 100644 --- a/hw/arm/aspeed_ast2500_tiogapass.c +++ b/hw/arm/aspeed_ast2500_tiogapass.c @@ -83,7 +83,6 @@ static const TypeInfo aspeed_ast2500_tiogapass_types[] = =3D { .name =3D MACHINE_TYPE_NAME("tiogapass-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_tiogapass_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2500_witherspoon.c b/hw/arm/aspeed_ast2500_wi= therspoon.c index 28d437fec08..4cc349c3236 100644 --- a/hw/arm/aspeed_ast2500_witherspoon.c +++ b/hw/arm/aspeed_ast2500_witherspoon.c @@ -105,7 +105,6 @@ static const TypeInfo aspeed_ast2500_witherspoon_types[= ] =3D { .name =3D MACHINE_TYPE_NAME("witherspoon-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_witherspoon_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2500_yosemitev2.c b/hw/arm/aspeed_ast2500_yos= emitev2.c index eaa75bcccbb..48c813f3c8f 100644 --- a/hw/arm/aspeed_ast2500_yosemitev2.c +++ b/hw/arm/aspeed_ast2500_yosemitev2.c @@ -84,7 +84,6 @@ static const TypeInfo aspeed_ast2500_yosemitev2_types[] = =3D { .name =3D MACHINE_TYPE_NAME("yosemitev2-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_yosemitev2_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2600_anacapa.c b/hw/arm/aspeed_ast2600_anacap= a.c index 65d6b0faa2d..e82f5c98f26 100644 --- a/hw/arm/aspeed_ast2600_anacapa.c +++ b/hw/arm/aspeed_ast2600_anacapa.c @@ -368,7 +368,6 @@ static const TypeInfo aspeed_ast2600_anacapa_types[] = =3D { .name =3D MACHINE_TYPE_NAME("anacapa-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_anacapa_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2600_bletchley.c b/hw/arm/aspeed_ast2600_blet= chley.c index b7e84db1438..9dda83ad4c0 100644 --- a/hw/arm/aspeed_ast2600_bletchley.c +++ b/hw/arm/aspeed_ast2600_bletchley.c @@ -90,7 +90,6 @@ static const TypeInfo aspeed_ast2600_bletchley_types[] = =3D { .name =3D MACHINE_TYPE_NAME("bletchley-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_bletchley_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2600_catalina.c b/hw/arm/aspeed_ast2600_catal= ina.c index f714c9d1b32..f91e0635908 100644 --- a/hw/arm/aspeed_ast2600_catalina.c +++ b/hw/arm/aspeed_ast2600_catalina.c @@ -675,7 +675,6 @@ static const TypeInfo aspeed_ast2600_catalina_types[] = =3D { .name =3D MACHINE_TYPE_NAME("catalina-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_catalina_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2600_evb.c b/hw/arm/aspeed_ast2600_evb.c index c43d2687c1c..404083b61dc 100644 --- a/hw/arm/aspeed_ast2600_evb.c +++ b/hw/arm/aspeed_ast2600_evb.c @@ -58,7 +58,6 @@ static const TypeInfo aspeed_ast2600_evb_types[] =3D { .name =3D MACHINE_TYPE_NAME("ast2600-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2600_evb_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2600_fby35.c b/hw/arm/aspeed_ast2600_fby35.c index f6244270704..6bcda0ac630 100644 --- a/hw/arm/aspeed_ast2600_fby35.c +++ b/hw/arm/aspeed_ast2600_fby35.c @@ -171,7 +171,6 @@ static const TypeInfo aspeed_ast2600_fby35_types[] =3D { .name =3D MACHINE_TYPE_NAME("fby35-bmc"), .parent =3D MACHINE_TYPE_NAME("ast2600-evb"), .class_init =3D aspeed_machine_fby35_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2600_fuji.c b/hw/arm/aspeed_ast2600_fuji.c index 37db252e276..cf49149fe9a 100644 --- a/hw/arm/aspeed_ast2600_fuji.c +++ b/hw/arm/aspeed_ast2600_fuji.c @@ -133,7 +133,6 @@ static const TypeInfo aspeed_ast2600_fuji_types[] =3D { .name =3D MACHINE_TYPE_NAME("fuji-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_fuji_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2600_gb200nvl.c b/hw/arm/aspeed_ast2600_gb200= nvl.c index ad9a10110b8..705561afe39 100644 --- a/hw/arm/aspeed_ast2600_gb200nvl.c +++ b/hw/arm/aspeed_ast2600_gb200nvl.c @@ -104,7 +104,6 @@ static const TypeInfo aspeed_ast2600_gb200nvl_types[] = =3D { .name =3D MACHINE_TYPE_NAME("gb200nvl-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_gb200nvl_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2600_rainier.c b/hw/arm/aspeed_ast2600_rainie= r.c index 8f0a412ddcf..6e5debc8bc1 100644 --- a/hw/arm/aspeed_ast2600_rainier.c +++ b/hw/arm/aspeed_ast2600_rainier.c @@ -191,7 +191,6 @@ static const TypeInfo aspeed_ast2600_rainier_types[] = =3D { .name =3D MACHINE_TYPE_NAME("rainier-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_rainier_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c index 54230aa92e6..ccfa4ade265 100644 --- a/hw/arm/aspeed_ast27x0-fc.c +++ b/hw/arm/aspeed_ast27x0-fc.c @@ -236,7 +236,6 @@ static const TypeInfo ast2700fc_types[] =3D { .class_init =3D ast2700fc_class_init, .instance_size =3D sizeof(Ast2700FCState), .is_available =3D target_aarch64, - .interfaces =3D aarch64_machine_interfaces, }, }; =20 diff --git a/hw/arm/aspeed_ast27x0_evb.c b/hw/arm/aspeed_ast27x0_evb.c index 2b767808e12..0deb3127c21 100644 --- a/hw/arm/aspeed_ast27x0_evb.c +++ b/hw/arm/aspeed_ast27x0_evb.c @@ -77,14 +77,12 @@ static const TypeInfo aspeed_ast27x0_evb_types[] =3D { .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a1_evb_class_init, .is_available =3D target_aarch64, - .interfaces =3D aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("ast2700a2-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a2_evb_class_init, .is_available =3D target_aarch64, - .interfaces =3D aarch64_machine_interfaces, } }; =20 diff --git a/hw/arm/ax3000-boards.c b/hw/arm/ax3000-boards.c index 4b8deec15cf..c7248f9f52b 100644 --- a/hw/arm/ax3000-boards.c +++ b/hw/arm/ax3000-boards.c @@ -48,7 +48,6 @@ static const TypeInfo ax3000_machine_types[] =3D { .instance_size =3D sizeof(Ax3000MachineState), .class_size =3D sizeof(Ax3000MachineClass), .class_init =3D ax3000_machine_class_init, - .interfaces =3D aarch64_machine_interfaces, .abstract =3D true, } }; diff --git a/hw/arm/b-l475e-iot01a.c b/hw/arm/b-l475e-iot01a.c index ee789c8df94..04dce2d19ce 100644 --- a/hw/arm/b-l475e-iot01a.c +++ b/hw/arm/b-l475e-iot01a.c @@ -132,7 +132,6 @@ static const TypeInfo bl475e_machine_type[] =3D { .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(Bl475eMachineState), .class_init =3D bl475e_machine_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c index 0079aa1dd2b..15c878d1636 100644 --- a/hw/arm/bananapi_m2u.c +++ b/hw/arm/bananapi_m2u.c @@ -154,4 +154,4 @@ static void bpim2u_machine_init(MachineClass *mc) } =20 DEFINE_MACHINE_EXTENDED("bpim2u", MACHINE, Bpim2uMachineState, - bpim2u_machine_init, false, arm_machine_interfaces) + bpim2u_machine_init, false, NULL) diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 01d74ad38cd..4b930e6ba12 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -85,7 +85,6 @@ static const TypeInfo collie_machine_typeinfo =3D { .parent =3D TYPE_MACHINE, .class_init =3D collie_machine_class_init, .instance_size =3D sizeof(CollieMachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void collie_machine_register_types(void) diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index d59c1ebba7f..511b71fbd7e 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -135,4 +135,4 @@ static void cubieboard_machine_init(MachineClass *mc) =20 DEFINE_MACHINE_EXTENDED("cubieboard", MACHINE, CubieboardMachineState, cubieboard_machine_init, false, - arm_machine_interfaces) + NULL) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index b7decdb2c7f..62f7cbe875e 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -169,7 +169,6 @@ static const TypeInfo nuri_type =3D { .name =3D MACHINE_TYPE_NAME("nuri"), .parent =3D TYPE_MACHINE, .class_init =3D nuri_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static void smdkc210_class_init(ObjectClass *oc, const void *data) @@ -190,7 +189,6 @@ static const TypeInfo smdkc210_type =3D { .name =3D MACHINE_TYPE_NAME("smdkc210"), .parent =3D TYPE_MACHINE, .class_init =3D smdkc210_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static void exynos4_machines_init(void) diff --git a/hw/arm/imx8mm-evk.c b/hw/arm/imx8mm-evk.c index 019c609c542..ffe8e494a57 100644 --- a/hw/arm/imx8mm-evk.c +++ b/hw/arm/imx8mm-evk.c @@ -136,4 +136,4 @@ static void imx8mm_evk_machine_init(MachineClass *mc) =20 DEFINE_MACHINE_EXTENDED("imx8mm-evk", MACHINE, Imx8mmEvkMachineState, imx8mm_evk_machine_init, false, - aarch64_machine_interfaces) + NULL) diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index 16e9722d146..389e7c86d21 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -162,7 +162,6 @@ static const TypeInfo imx8mp_evk_machine_types[] =3D { .class_init =3D imx8mp_evk_machine_class_init, .instance_init =3D imx8mp_evk_machine_init, .instance_size =3D sizeof(FslImx8mpEvkState), - .interfaces =3D aarch64_machine_interfaces, }, }; =20 diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index f8bcf42c615..25ecd931e76 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -706,7 +706,7 @@ static void integratorcp_machine_init(MachineClass *mc) =20 DEFINE_MACHINE_EXTENDED("integratorcp", MACHINE, IntegratorcpMachineState, integratorcp_machine_init, false, - arm_machine_interfaces) + NULL) =20 static const Property core_properties[] =3D { DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0), diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 22fe1fa932f..cb4536faadd 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -88,4 +88,4 @@ static void mcimx7d_sabre_machine_init(MachineClass *mc) =20 DEFINE_MACHINE_EXTENDED("mcimx7d-sabre", MACHINE, Mcimx7dSabreMachineState, mcimx7d_sabre_machine_init, false, - arm_machine_interfaces) + NULL) diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index 9d5c4898469..85285861c5f 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -75,7 +75,6 @@ static const TypeInfo microbit_info =3D { .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(MicrobitMachineState), .class_init =3D microbit_machine_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static void microbit_machine_init(void) diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 41dfb185353..3a384d3cdb9 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -1631,35 +1631,30 @@ static const TypeInfo mps2tz_an505_info =3D { .name =3D TYPE_MPS2TZ_AN505_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps2tz_an505_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps2tz_an521_info =3D { .name =3D TYPE_MPS2TZ_AN521_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps2tz_an521_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps3tz_an524_info =3D { .name =3D TYPE_MPS3TZ_AN524_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps3tz_an524_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps3tz_an547_info =3D { .name =3D TYPE_MPS3TZ_AN547_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps3tz_an547_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps3tz_an555_info =3D { .name =3D TYPE_MPS3TZ_AN555_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps3tz_an555_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static void mps2tz_machine_init(void) diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index ac9366d8447..b13b7bc55ec 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -568,28 +568,24 @@ static const TypeInfo mps2_an385_info =3D { .name =3D TYPE_MPS2_AN385_MACHINE, .parent =3D TYPE_MPS2_MACHINE, .class_init =3D mps2_an385_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps2_an386_info =3D { .name =3D TYPE_MPS2_AN386_MACHINE, .parent =3D TYPE_MPS2_MACHINE, .class_init =3D mps2_an386_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps2_an500_info =3D { .name =3D TYPE_MPS2_AN500_MACHINE, .parent =3D TYPE_MPS2_MACHINE, .class_init =3D mps2_an500_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo mps2_an511_info =3D { .name =3D TYPE_MPS2_AN511_MACHINE, .parent =3D TYPE_MPS2_MACHINE, .class_init =3D mps2_an511_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static void mps2_machine_init(void) diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index caad820d3bc..d6f4c1640ab 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -635,7 +635,6 @@ static const TypeInfo mps3r_machine_types[] =3D { .name =3D TYPE_MPS3R_AN536_MACHINE, .parent =3D TYPE_MPS3R_MACHINE, .class_init =3D mps3r_an536_class_init, - .interfaces =3D arm_machine_interfaces, }, }; =20 diff --git a/hw/arm/musca.c b/hw/arm/musca.c index 75d82eebcac..1b161487e7e 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -658,14 +658,12 @@ static const TypeInfo musca_a_info =3D { .name =3D TYPE_MUSCA_A_MACHINE, .parent =3D TYPE_MUSCA_MACHINE, .class_init =3D musca_a_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo musca_b1_info =3D { .name =3D TYPE_MUSCA_B1_MACHINE, .parent =3D TYPE_MUSCA_MACHINE, .class_init =3D musca_b1_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static void musca_machine_init(void) diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index 4f14d257465..025de42dac6 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -550,27 +550,22 @@ static const TypeInfo npcm7xx_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("npcm750-evb"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D npcm750_evb_machine_class_init, - .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("quanta-gsj"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D gsj_machine_class_init, - .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("quanta-gbs-bmc"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D gbs_bmc_machine_class_init, - .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("kudo-bmc"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D kudo_bmc_machine_class_init, - .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("mori-bmc"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D mori_bmc_machine_class_init, - .interfaces =3D arm_machine_interfaces, }, }; =20 diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c index f462369bea3..2a04cf4f2c9 100644 --- a/hw/arm/npcm8xx_boards.c +++ b/hw/arm/npcm8xx_boards.c @@ -249,7 +249,6 @@ static const TypeInfo npcm8xx_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("npcm845-evb"), .parent =3D TYPE_NPCM8XX_MACHINE, .class_init =3D npcm845_evb_machine_class_init, - .interfaces =3D aarch64_machine_interfaces, }, }; =20 diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 3b628d13cbc..c3fe4187b8b 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -226,7 +226,6 @@ static const TypeInfo sx1_machine_v2_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D sx1_machine_v2_class_init, .instance_size =3D sizeof(Sx1MachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void sx1_machine_v1_class_init(ObjectClass *oc, const void *data) @@ -247,7 +246,6 @@ static const TypeInfo sx1_machine_v1_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D sx1_machine_v1_class_init, .instance_size =3D sizeof(Sx1MachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void sx1_machine_init(void) diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index 0e149ed6c98..3f06716c364 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -135,4 +135,4 @@ static void orangepi_machine_init(MachineClass *mc) =20 DEFINE_MACHINE_EXTENDED("orangepi-pc", MACHINE, OrangePiMachineState, orangepi_machine_init, false, - arm_machine_interfaces) + NULL) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index bbaa20bd630..7ff3e8400e6 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -392,29 +392,24 @@ static const TypeInfo raspi_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("raspi0"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi0_machine_class_init, - .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi1ap"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi1ap_machine_class_init, - .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi2b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi2b_machine_class_init, - .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi3ap"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3ap_machine_class_init, .is_available =3D target_aarch64, - .interfaces =3D aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi3b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3b_machine_class_init, .is_available =3D target_aarch64, - .interfaces =3D aarch64_machine_interfaces, }, { .name =3D TYPE_RASPI_MACHINE, .parent =3D TYPE_RASPI_BASE_MACHINE, diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 2ad561fdcfc..08fcdf58c9f 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -127,7 +127,6 @@ static const TypeInfo raspi4b_machine_type =3D { .instance_size =3D sizeof(Raspi4bMachineState), .class_init =3D raspi4b_machine_class_init, .is_available =3D target_aarch64, - .interfaces =3D aarch64_machine_interfaces, }; =20 static void raspi4b_machine_register_type(void) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 0c2daf5c01f..aee7d05c3e6 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -437,7 +437,6 @@ static const TypeInfo realview_eb_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D realview_eb_class_init, .instance_size =3D sizeof(RealViewMachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void realview_eb_mpcore_class_init(ObjectClass *oc, const void *dat= a) @@ -460,7 +459,6 @@ static const TypeInfo realview_eb_mpcore_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D realview_eb_mpcore_class_init, .instance_size =3D sizeof(RealViewMachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void realview_pb_a8_class_init(ObjectClass *oc, const void *data) @@ -481,7 +479,6 @@ static const TypeInfo realview_pb_a8_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D realview_pb_a8_class_init, .instance_size =3D sizeof(RealViewMachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void realview_pbx_a9_class_init(ObjectClass *oc, const void *data) @@ -503,7 +500,6 @@ static const TypeInfo realview_pbx_a9_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D realview_pbx_a9_class_init, .instance_size =3D sizeof(RealViewMachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void realview_machine_init(void) diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index 140b2ecb9e2..ec307388f45 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -152,7 +152,6 @@ static const TypeInfo sabrelite_machine_init_typeinfo = =3D { .instance_init =3D sabrelite_machine_instance_init, .instance_size =3D sizeof(SabreliteMachineState), .abstract =3D false, - .interfaces =3D arm_machine_interfaces, }; =20 static void sabrelite_machine_init_register_types(void) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 56d08f605c8..6ba353341a1 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -946,7 +946,6 @@ static const TypeInfo sbsa_ref_info =3D { .instance_finalize =3D sbsa_ref_instance_finalize, .class_init =3D sbsa_ref_class_init, .instance_size =3D sizeof(SBSAMachineState), - .interfaces =3D aarch64_machine_interfaces, }; =20 static void sbsa_ref_machine_init(void) diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 56ecc828f4f..f634918868b 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -1428,7 +1428,6 @@ static const TypeInfo lm3s811evb_type =3D { .name =3D MACHINE_TYPE_NAME("lm3s811evb"), .parent =3D TYPE_MACHINE, .class_init =3D lm3s811evb_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 /* @@ -1450,7 +1449,6 @@ static const TypeInfo lm3s6965evb_type =3D { .name =3D MACHINE_TYPE_NAME("lm3s6965evb"), .parent =3D TYPE_MACHINE, .class_init =3D lm3s6965evb_class_init, - .interfaces =3D arm_machine_interfaces, }; =20 static void stellaris_machine_init(void) diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 520af79c800..1db9bc1eb24 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -438,7 +438,6 @@ static const TypeInfo versatilepb_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D versatilepb_class_init, .instance_size =3D sizeof(VersatileMachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void versatileab_class_init(ObjectClass *oc, const void *data) @@ -461,7 +460,6 @@ static const TypeInfo versatileab_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D versatileab_class_init, .instance_size =3D sizeof(VersatileMachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void versatile_machine_init(void) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index f26d8c6f8d1..1e29fe0f09c 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -850,7 +850,6 @@ static const TypeInfo vexpress_a9_info =3D { .parent =3D TYPE_VEXPRESS_MACHINE, .class_init =3D vexpress_a9_class_init, .instance_init =3D vexpress_a9_instance_init, - .interfaces =3D arm_machine_interfaces, }; =20 static const TypeInfo vexpress_a15_info =3D { @@ -858,7 +857,6 @@ static const TypeInfo vexpress_a15_info =3D { .parent =3D TYPE_VEXPRESS_MACHINE, .class_init =3D vexpress_a15_class_init, .instance_init =3D vexpress_a15_instance_init, - .interfaces =3D arm_machine_interfaces, }; =20 static void vexpress_machine_init(void) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d738b95c726..eae4f0fe413 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -133,7 +133,6 @@ static void arm_virt_compat_default_set(MachineClass *m= c) .name =3D MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ .parent =3D TYPE_VIRT_MACHINE, \ .class_init =3D MACHINE_VER_SYM(class_init, virt, __VA_ARGS__), \ - .interfaces =3D arm_aarch64_machine_interfaces, \ }; \ static void MACHINE_VER_SYM(register, virt, __VA_ARGS__)(void) \ { \ diff --git a/hw/arm/xen-pvh.c b/hw/arm/xen-pvh.c index 10cac28a910..b47dd9efd81 100644 --- a/hw/arm/xen-pvh.c +++ b/hw/arm/xen-pvh.c @@ -96,7 +96,6 @@ static const TypeInfo xen_arm_machine_type =3D { .class_init =3D xen_arm_machine_class_init, .instance_size =3D sizeof(XenPVHMachineState), .instance_init =3D xen_arm_instance_init, - .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void xen_arm_machine_register_types(void) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index f3148975406..8ebd8e5ccd5 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -479,7 +479,6 @@ static const TypeInfo zynq_machine_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D zynq_machine_class_init, .instance_size =3D sizeof(ZynqMachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void zynq_machine_register_types(void) diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 2b04513ba2e..e06a0c55549 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -402,14 +402,12 @@ static const TypeInfo versal_virt_machine_init_typein= fo =3D { .name =3D TYPE_XLNX_VERSAL_VIRT_MACHINE, .parent =3D TYPE_XLNX_VERSAL_VIRT_BASE_MACHINE, .class_init =3D versal_virt_machine_class_init, - .interfaces =3D aarch64_machine_interfaces, }; =20 static const TypeInfo versal2_virt_machine_init_typeinfo =3D { .name =3D TYPE_XLNX_VERSAL2_VIRT_MACHINE, .parent =3D TYPE_XLNX_VERSAL_VIRT_BASE_MACHINE, .class_init =3D versal2_virt_machine_class_init, - .interfaces =3D aarch64_machine_interfaces, }; =20 static void versal_virt_machine_init_register_types(void) diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index 4e489702743..da8b3ede873 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -303,7 +303,6 @@ static const TypeInfo xlnx_zcu102_machine_init_typeinfo= =3D { .class_init =3D xlnx_zcu102_machine_class_init, .instance_init =3D xlnx_zcu102_machine_instance_init, .instance_size =3D sizeof(XlnxZCU102), - .interfaces =3D aarch64_machine_interfaces, }; =20 static void xlnx_zcu102_machine_init_register_types(void) diff --git a/target/arm/machine.c b/target/arm/machine.c index 42a1427fa16..61106f9def6 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -1346,15 +1346,3 @@ const VMStateDescription vmstate_arm_cpu =3D { NULL } }; - -const InterfaceInfo arm_machine_interfaces[] =3D { - { } -}; - -const InterfaceInfo arm_aarch64_machine_interfaces[] =3D { - { } -}; - -const InterfaceInfo aarch64_machine_interfaces[] =3D { - { } -}; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432314; cv=none; d=zohomail.com; s=zohoarc; b=EPeQc+P0+lzr77Aemy7C1/WMUuFwgU9RIrd97u/1eRFnRf2DdbzSu91GUV1EdBlUfBX5I3C2hOgEXViynAznj0iNSU/1hHg/s1Vxi7gU5xZrGFFAxoVGw+CX2xXFGTlW3mRioSaYLgB1Ewmh1Ii9z1XJfqyHqdHNw0easysgUkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432314; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=UmB+1TDKoh/4mI7SHzWs3U7JB4f7U8ULgqOxLqQwacg=; b=ZJB0sJQaQw7o/ngKv9BsFcj0w0mF1mgpUvZM6qaa7E2dhDJ0Lny3wEilhNLG2dSJZtLwzox/2+gjYRF8zGsUPi8T9LwdE9EaCM7JdKU3UItBi+LWhy7ehROWml9Y7uLERb3qPrNXrb8XGtb801CCr5j9khHg4pmuT+HEAPeAKhE= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178843231418289.42689299097117; Thu, 3 Sep 2026 03:45:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24wH-00020j-4I; Thu, 03 Sep 2026 06:45:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wE-0001xJ-T7 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:59 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wC-0007B1-UU for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:44:58 -0400 Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHMsu3852411 for ; Thu, 3 Sep 2026 10:44:55 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf51m0nkj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:44:55 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-93909014c85so404667085a.0 for ; Thu, 03 Sep 2026 03:44:55 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5f9114sm59039355e9.5.2026.09.03.03.44.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:44:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= UmB+1TDKoh/4mI7SHzWs3U7JB4f7U8ULgqOxLqQwacg=; b=H1m0LBaUjMID5VHM yzoJkw1fcE8pLEMdasqI3Um+lqtxZMGo8V9WbqcJJ1dBLczU7sJodfamiFyKqHhn +V6P0Rv9DujmMbIPlpjjhBjAot4GQfVmswMNBqpcxxJlbwxicQo3wogpZ2pVTokk NFkq1JWzJFo+Xi1EOqcoWuPO4eypj3Uwc4h87jurlD0xou3xxwSgVXf0EiLtufWq DzraQJuJmnkNTBHAhFJmxga5kg9xAt2SKKNxHq/y/Bc0t2EssS/NYOMHRgBkJr3b wn70vQ6z8Fiu/6WpgYgf+uZGk9McntQhNYcAlAc/hdhyfbUt50hHsnHDR0SZm1lo AnhKNQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432294; x=1789037094; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=UmB+1TDKoh/4mI7SHzWs3U7JB4f7U8ULgqOxLqQwacg=; b=VdO9HHLp2AsvLNsgpAm/TCP8MwiskUDPHhzreIiYgt3AGFh6gf/ePIXDjpP4okrfGI lhxteHg/wp5K/68bX/IQdsY/tr8GNLehM5OnRzBYNY2fuWKPfhh97Q/AxiTd2b/yNNWY 54hvoUYILWjv3Mhuu88M2vdN3M/rLFucQvFsZWQ08rsjSj0R/PLzssUjdjU+X+jkHZi6 yCtWBBdYCSFyXQbisyBYSh3SGwbVBlo4sL029sP1ZTxE30NtrApySQwhQPAOXtx4oCV4 z70pAwUT35HhAdFnVnGRT42A51eNhXU9LzkLjLtWWxxjLqlt9ZuRB5/laC+nei3vCKgM 939Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432294; x=1789037094; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=UmB+1TDKoh/4mI7SHzWs3U7JB4f7U8ULgqOxLqQwacg=; b=e/rSb+nI6rVKfgl/cmPNsOrcm8ue+pgnzaG6hfKQ7FO4nIC6uHlbIPuhQnQfKGg0Jm Yt/hK8+wvXeLMxSYpeqzyPmQetNn9bJLbsd2/Ha+KzergAfFRI0E+ir172Tg//yBcCqm pdGYR3b6GYK5JJfIg5o8MDiy8+t+sYgrE1faMiQaQx9xJPZEW7wwocKT6ApIMgPfyj+q 0nvMjwnRHRwODAbvESTO0Z8zrQW6LYpeWUQJIbJoByKzsDwSUJwWLfOXrdG9DC1pat4Y U2yz4R+OM04G0rOPU7YTrU0C4gljahTLsq8H5T6rZL6hBiO7ew52Uur5/+ItdNnuD6rC R7nQ== X-Gm-Message-State: AFuF++l/t5LTUsw5jv0/MzKy1dnF3BiiKGYhQ1J4seHe977lfz1XiIlw k3zteIYbtRMJnZwTXTM4jxtfEj1jIH0EVVn0wmsKqPcA4exigTwWO1sGH4cp97JySNOL3dgwDor nOYpmQGRbWFupNmkffJtb5CmXKovjmlfQuM5cFXUmBUHJ+b+rPeQbjoUonTz02VEoDg== X-Gm-Gg: AYBFou1ig9d3d0p6ZI7qwUhv0OQ0NwHIDucAlN3vwrJBZzxLltILiHQxDzKkAu84PP8 YIfA1JOysrivebTtzYfnN+9S4MBhtZqxRCtOuhfInUNsP93DBRCZHkUgftn/RyjJTMRiui1oDJt 6dsunhAnEwzLlf9aJeD7nmBmNe2+FlFQ4EhAFXVBROSjrdQ4HBm0k3R5HUuMTBZN+6LYSzKPjLb Q4Fg4Ggr7t6t6GvCtSavNflM/hO3dXlFbgXgyZAqb5TDcUvlIa2P+IW2ONCzFLZ6iqROhpr8AjB u9zM3xS9yzsLnQ/CxhEXO6gGheXEGXyNEEu1J4syZoRBERF3z2/CVY0H3RlbTeuUAqmvKUrvCCI yZL7uyWVwtxN2mvXNDlrrN9mRWSvpmUP+XazxYG0X X-Received: by 2002:a05:620a:2686:b0:939:75e9:7a60 with SMTP id af79cd13be357-93975e982aamr172105785a.12.1788432294393; Thu, 03 Sep 2026 03:44:54 -0700 (PDT) X-Received: by 2002:a05:620a:2686:b0:939:75e9:7a60 with SMTP id af79cd13be357-93975e982aamr172101385a.12.1788432293798; Thu, 03 Sep 2026 03:44:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 42/51] hw/arm: remove DEFINE_MACHINE_{AARCH64,ARM} Date: Thu, 3 Sep 2026 12:39:26 +0200 Message-ID: <20260903103936.62355-43-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: imq0lg18AanQCJcesxiJvy69wXCfKFB6 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX9LYMlBvdNoDw l/pXrKYTsihXkCYV0uKQ5WfWlTG//0z6ZBlkoM9DNiXTeMueCVA7JEOrN05Gq+ca7vbeqLBc28r +hn264V/D8jGj5GZG/VJT561JyleGsnOypvNLTtG/QWaKVTEdG/MJwLzGCL6N9A0v3sm2sSwdtk yc0qy9+wIf6C0h5BQXZY8ETML9IQNxgc7KCYZW09xWF793YJ44zZoCHEoAFkCqKtMcpN6o2cRh4 XVgrFEw6dc+pAbXEHMjfuE2Qc3oVJ6u6DhlTbMqVIgGuZw3NcN9X47xF4W3gAQ2IM3cbL+NaBp2 +oL3GVYwRByOIOXLQeEEd17JVEAXObaNTgVv8XiPULOBHHhHG+EWdOYeYWeXMqbJqE/8ZKI1WTq 32SB8BBINSmtcj1EC7kPXrh01ZgvYm0fwaQRHTE1IZR0pPrI2OjrfzdOXclj+dyi8lEiYWX5y2w Lu0KaDGcFSegLHeDyDA== X-Authority-Analysis: v=2.4 cv=X8Ji7mTe c=1 sm=1 tr=0 ts=6a994fa7 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=4WwWt7SMaMprD5RLbn8A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX9Zj4tIeGA9M7 P8wXsMv7NN5Zg9xf0Cp1P/EIzGkHgzsaUcRRnc0DyL3EYTt8Hn6C4X62ZoNDC6ZaRNOTsh79jMt MvwPSeVJqRH6DnkwqWY38mzVfBuEEG4= X-Proofpoint-ORIG-GUID: imq0lg18AanQCJcesxiJvy69wXCfKFB6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432316009158500 From: Pierrick Bouvier Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260901202043.26532-10-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/machines-qom.h | 14 -------------- hw/arm/digic_boards.c | 2 +- hw/arm/imx25_pdk.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/max78000fthr.c | 2 +- hw/arm/mcimx6ul-evk.c | 2 +- hw/arm/msf2-som.c | 2 +- hw/arm/netduino2.c | 2 +- hw/arm/netduinoplus2.c | 2 +- hw/arm/olimex-stm32-h405.c | 2 +- hw/arm/stm32vldiscovery.c | 2 +- 11 files changed, 10 insertions(+), 24 deletions(-) diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h index 449592beda0..e3eebbdefbc 100644 --- a/include/hw/arm/machines-qom.h +++ b/include/hw/arm/machines-qom.h @@ -11,18 +11,4 @@ =20 #include "hw/core/boards.h" =20 -/* - * A machine defined with the DEFINE_MACHINE_ARM() macro will be - * available in both qemu-system-arm and qemu-system-aarch64 binaries. - * - * One defined with DEFINE_MACHINE_AARCH64() will only be available in - * the qemu-system-aarch64 binary. - */ -#define DEFINE_MACHINE_ARM(namestr, machine_initfn) \ - DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - NULL) -#define DEFINE_MACHINE_AARCH64(namestr, machine_initfn) \ - DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - NULL) - #endif diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index ed12f542001..c7ecf22a958 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -146,4 +146,4 @@ static void canon_a1100_machine_init(MachineClass *mc) mc->default_ram_id =3D "ram"; } =20 -DEFINE_MACHINE_ARM("canon-a1100", canon_a1100_machine_init) +DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init) diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index f7a51481af0..3246512c214 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -150,4 +150,4 @@ static void imx25_pdk_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE_ARM("imx25-pdk", imx25_pdk_machine_init) +DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init) diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 1aa5b49de92..909dd929e63 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -138,4 +138,4 @@ static void kzm_machine_init(MachineClass *mc) mc->default_ram_id =3D "kzm.ram"; } =20 -DEFINE_MACHINE_ARM("kzm", kzm_machine_init) +DEFINE_MACHINE("kzm", kzm_machine_init) diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c index 530ca9dd964..290a14c8ad9 100644 --- a/hw/arm/max78000fthr.c +++ b/hw/arm/max78000fthr.c @@ -48,4 +48,4 @@ static void max78000_machine_init(MachineClass *mc) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE_ARM("max78000fthr", max78000_machine_init) +DEFINE_MACHINE("max78000fthr", max78000_machine_init) diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 6e9d92b1f1d..a3dafb20131 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -78,4 +78,4 @@ static void mcimx6ul_evk_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE_ARM("mcimx6ul-evk", mcimx6ul_evk_machine_init) +DEFINE_MACHINE("mcimx6ul-evk", mcimx6ul_evk_machine_init) diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 1ada1a13613..8d00fef43b0 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -109,4 +109,4 @@ static void emcraft_sf2_machine_init(MachineClass *mc) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE_ARM("emcraft-sf2", emcraft_sf2_machine_init) +DEFINE_MACHINE("emcraft-sf2", emcraft_sf2_machine_init) diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index c32deaf43ba..6a639264d61 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -66,4 +66,4 @@ static void netduino2_machine_init(MachineClass *mc) mc->ignore_memory_transaction_failures =3D true; } =20 -DEFINE_MACHINE_ARM("netduino2", netduino2_machine_init) +DEFINE_MACHINE("netduino2", netduino2_machine_init) diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index a90dcbe8c26..d04ab8aeea4 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -66,4 +66,4 @@ static void netduinoplus2_machine_init(MachineClass *mc) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE_ARM("netduinoplus2", netduinoplus2_machine_init) +DEFINE_MACHINE("netduinoplus2", netduinoplus2_machine_init) diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c index e801e4308ed..154501fc3c7 100644 --- a/hw/arm/olimex-stm32-h405.c +++ b/hw/arm/olimex-stm32-h405.c @@ -72,4 +72,4 @@ static void olimex_stm32_h405_machine_init(MachineClass *= mc) mc->default_ram_size =3D 0; } =20 -DEFINE_MACHINE_ARM("olimex-stm32-h405", olimex_stm32_h405_machine_init) +DEFINE_MACHINE("olimex-stm32-h405", olimex_stm32_h405_machine_init) diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index 8f93c0036a3..0b39543c1ff 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -69,4 +69,4 @@ static void stm32vldiscovery_machine_init(MachineClass *m= c) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE_ARM("stm32vldiscovery", stm32vldiscovery_machine_init) +DEFINE_MACHINE("stm32vldiscovery", stm32vldiscovery_machine_init) --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432318; cv=none; d=zohomail.com; s=zohoarc; b=eE6+WDR8iNiyz97EAXULZQ0HCGUO/yNBkFoKRELRBwTpvFxjgns3nbbt1T9GUP2GughYeXAIZqLQzxHfrlhu1jHPFIXG1nsG+bSf5S2mdN1wdLoy7vnmg7uhBTwULWxx1mb37LxxlYze2Uh587yCJNMHTfRQTbu4kkGb5x+e9z8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432318; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=XFSVP/GURN1oZMC9TghOwuDDFUlGLlMAaP04wT+0YWA=; b=QqC09z31mJU98r/+Wt/OPF74RkAzK6v4aM5L5HMyCvxHc6WsF19zm/lrd7N5vyVbKFKa3oTcBLh3e2AQemD2T6LRVjtp+xHKTfeFTQZNaUPfOfZ3sNWKZMwWlwEp8O2z+1aXfUOtkQlk4NBXw+QxQawMruDv1u+oYbvq0pryB7I= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432318296938.871147418637; Thu, 3 Sep 2026 03:45:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24wP-0002Wl-VY; Thu, 03 Sep 2026 06:45:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wO-0002T5-NO for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:08 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wK-0007I5-La for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:08 -0400 Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHAtb935180 for ; Thu, 3 Sep 2026 10:45:03 GMT Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gerdnbvnd-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:45:03 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-93918756165so542608485a.0 for ; Thu, 03 Sep 2026 03:45:02 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee60bae6sm74008705e9.9.2026.09.03.03.44.59 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:44:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= XFSVP/GURN1oZMC9TghOwuDDFUlGLlMAaP04wT+0YWA=; b=iUVhxoVZPWdKJdj4 fQQKOvq7d702T7sV5bnZ1Bx98NHkirRlEn5nFqdF8m6pSV5IiW80huOls9dEkcow nw2UPPoOgUdMUXLJIHcoVlp55S3TC53xQ44Zsba21grB2nKy+9mk9VOdzx9H+En/ wEz/rBwJGtKmgAabEaHPdDYa3ZixDnwM3Z83KdGb1ADdJSjPWax20O7TW+I+xTBe t6CQbILuM899xgompRPuD9HLTO1pni6WB9BeWq+H5T1dy/sCaGV/wu60uyFo7FK6 fWLTr+qBnZMYW4NUuyh4A0FtedQZ2C1rRW28w4P9UXjfzgfT3pprvve3rCZPmZAs CUGIHA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432302; x=1789037102; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=XFSVP/GURN1oZMC9TghOwuDDFUlGLlMAaP04wT+0YWA=; b=QneqPZMwrn9oCAH6jQjWC+khUB2hcRn4fBfO2MAdgDcjE6ZGSsnAouN8/bAsEMGspu DsHWC5Wt6C2t5BA+21m+mtaH7Keh2QeH7jSOQkPRkjW2IFSi6iPa9bHeeuSkfsbdO/K8 muwdyvHraFvqQtwlQFsy8m7zpX8BrglzAuvTVC07slJR52SSWcY4GizKsrPGVqLFUp7z 9zfacoOJYyjTO5Cs80FTolb5dGDD2Xr3spJoHSege9Yr66nlDK/GIKcfrExgZ46tOmzH 15kRNfoZlq1eAkp7uN4k7F3rDXT0CoE96P8I6SYMGZvbLmBDQYHSU6jvlnhwsunHMpXM AaFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432302; x=1789037102; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=XFSVP/GURN1oZMC9TghOwuDDFUlGLlMAaP04wT+0YWA=; b=BwjyYvN1WIkzUXDf8IeUPtjxSLrCECnz9iw+o0T3KzLIxGAyGNV1fLYztfpWpPV74F 8Azcs3SwftJralOszEK3NRV5j1yRK8dDNMZigu2x4SggwXH23Iu2jdokNg+syCz2VC+H DepTEv5ZfdaIq9tbrdlCpURCyU9yMnOAMPLiFawRmzswYYpkBEbsibdvmeM/4OKR+b8W vg2bgPBPy+rm03Bedi4+98W9ve36J2RM1P/uOR0NQVnFuz/7zwy2o5aSLCTyBpHAPkgp M4HCp18dAFOC0JGnceQHYT1GH5HPpThbRu1tLYuZMs16gBCrJzBffh5z63zAa0zMFcFo yMtw== X-Gm-Message-State: AFuF++klNp++IlBpyw04ELFOSm2RiL+hNmWjErJCimuuxH68By2sVMqB gG12w/VgtH1zBFh/IyIVM4rdcaGJlg7kJnvrC7LvQbLRMkuKl40XEmJTv8ttjRes4ewgRtcIFbU Qu7sKOT7oPVLFgj81PU3yHMSkAE4/wP/XHBZ6t7OFf7NFKG916HFD2+gbfvkB8vHdYQ== X-Gm-Gg: AYBFou0EtslQqYrrbRFofHzuXlJ1EV3T7V4p0QcM2neAUxQQxhMOg/4m9mmiK1cmc9f VudTcy9kypMydL8AW6sPGS3VI37rqugERcQ2w+xdMTNNhFCL4eTmw7XvqtK93OZHYH/06tMai3C NZdUTmpzIAYzihs51dR0w93wIpieXpaQqktE1XsE61SaPv6JXVm7FyewUQUwoUNgaIXoiuhTNop xettDW30m3ioaGNKEJT0K2Zl7buyUEF3noLfQ9BtstuH1bzExS1LjMIvea11Sdxj6JPiWDtnwZN 6TB5iEDCBf0vkGafv5AB667JfQKweSOIImuoqRjf3f0JRF/BEKGGUP1P+WNxEyd+9kONULiSLLt Amlv4PPV3UBlEooKw2T6yADMcWOqKEo2g3lD3GwPD X-Received: by 2002:a05:620a:1083:b0:936:cd76:4d4b with SMTP id af79cd13be357-9396e2162eemr483369285a.42.1788432301565; Thu, 03 Sep 2026 03:45:01 -0700 (PDT) X-Received: by 2002:a05:620a:1083:b0:936:cd76:4d4b with SMTP id af79cd13be357-9396e2162eemr483363485a.42.1788432300700; Thu, 03 Sep 2026 03:45:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 43/51] hw/arm: remove machines-qom.h Date: Thu, 3 Sep 2026 12:39:27 +0200 Message-ID: <20260903103936.62355-44-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=YcmNIQRf c=1 sm=1 tr=0 ts=6a994faf cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=oVOCmnCwC0CRNczbz68A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX43DMF+yDpkfL gBa3F7Ger0Lp4+cr8vhnTlvA+DSlLr8MDbnWjhlXTVnPTbenVBLZuPQ7u6RbMzG7O5mO0KGM5tz Eg/i4lA0jbXD9hZstF2gU4hglv5DWNk= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX5rXu0P3bmsek 7nXq9F8ETgul0x7Zw/FmkuH3Tv6TG3g+X/3CSowPIHi4PM9u/pX9/fGE7c4oQ51WefuM5Z08Pn/ VFSxAQ67/vXCEqM7uG+apg2adqKqdGTCmTxLXwnxt0YTyScRkdSuvmV0JhpBUplMPDo2kvV5/Wr 28fOml3TVnSVcmV+91l+oFVSi2bMV/NkqtpwleaqXrbtppdAsmUUkg8MCJ5v4V0dNV78v29ZpDT bNTETS1+Cat57yHnLTwQKY3HZPvQKMM8geWcxwZZtBpbyBCzoYTkLNRBQLHO8iAE9h3R5yiIgos PPXamVYbES6j9I4yTLL5qNDxLBZcU1qzEf8HurhMMXEAcLtwIwEJj3KWu3zFWtjfvn0ARZDRvj0 C/oORATZgsuUoTUGY2N9QrdqB1wA3Y5kDTLDZwF93tCv8MANOuec9q9liQ9WhbVBdaXYTElpw5i dtMMeOxY+22RBPCT2+w== X-Proofpoint-GUID: 5aszFZUbc3UCh5TbNxvs9xixXpsdjyrd X-Proofpoint-ORIG-GUID: 5aszFZUbc3UCh5TbNxvs9xixXpsdjyrd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 phishscore=0 impostorscore=0 spamscore=0 suspectscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432319993158500 From: Pierrick Bouvier Header is now empty so we can remove it. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260901202043.26532-11-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/machines-qom.h | 14 -------------- configs/targets/aarch64-softmmu.c | 1 - configs/targets/arm-softmmu.c | 1 - hw/arm/aspeed.c | 1 - hw/arm/aspeed_ast1040_evb.c | 1 - hw/arm/aspeed_ast10x0_evb.c | 1 - hw/arm/aspeed_ast2400_palmetto.c | 1 - hw/arm/aspeed_ast2400_quanta-q71l.c | 1 - hw/arm/aspeed_ast2400_supermicrox11.c | 1 - hw/arm/aspeed_ast2500_evb.c | 1 - hw/arm/aspeed_ast2500_g220a.c | 1 - hw/arm/aspeed_ast2500_romulus.c | 1 - hw/arm/aspeed_ast2500_supermicro-x11spi.c | 1 - hw/arm/aspeed_ast2500_tiogapass.c | 1 - hw/arm/aspeed_ast2500_witherspoon.c | 1 - hw/arm/aspeed_ast2500_yosemitev2.c | 1 - hw/arm/aspeed_ast2600_anacapa.c | 1 - hw/arm/aspeed_ast2600_bletchley.c | 1 - hw/arm/aspeed_ast2600_catalina.c | 1 - hw/arm/aspeed_ast2600_evb.c | 1 - hw/arm/aspeed_ast2600_fby35.c | 1 - hw/arm/aspeed_ast2600_fuji.c | 1 - hw/arm/aspeed_ast2600_gb200nvl.c | 1 - hw/arm/aspeed_ast2600_rainier.c | 1 - hw/arm/aspeed_ast27x0-fc.c | 1 - hw/arm/aspeed_ast27x0_evb.c | 1 - hw/arm/ax3000-boards.c | 1 - hw/arm/b-l475e-iot01a.c | 1 - hw/arm/bananapi_m2u.c | 1 - hw/arm/collie.c | 1 - hw/arm/cubieboard.c | 1 - hw/arm/digic_boards.c | 1 - hw/arm/exynos4_boards.c | 1 - hw/arm/imx25_pdk.c | 1 - hw/arm/imx8mm-evk.c | 1 - hw/arm/imx8mp-evk.c | 1 - hw/arm/integratorcp.c | 1 - hw/arm/kzm.c | 1 - hw/arm/max78000fthr.c | 1 - hw/arm/mcimx6ul-evk.c | 1 - hw/arm/mcimx7d-sabre.c | 1 - hw/arm/microbit.c | 1 - hw/arm/mps2-tz.c | 1 - hw/arm/mps2.c | 1 - hw/arm/mps3r.c | 1 - hw/arm/msf2-som.c | 1 - hw/arm/musca.c | 1 - hw/arm/netduino2.c | 1 - hw/arm/netduinoplus2.c | 1 - hw/arm/npcm7xx_boards.c | 1 - hw/arm/npcm8xx_boards.c | 1 - hw/arm/olimex-stm32-h405.c | 1 - hw/arm/omap_sx1.c | 1 - hw/arm/orangepi.c | 1 - hw/arm/raspi.c | 1 - hw/arm/raspi4b.c | 1 - hw/arm/realview.c | 1 - hw/arm/sabrelite.c | 1 - hw/arm/sbsa-ref.c | 1 - hw/arm/stellaris.c | 1 - hw/arm/stm32vldiscovery.c | 1 - hw/arm/versatilepb.c | 1 - hw/arm/vexpress.c | 1 - hw/arm/virt.c | 1 - hw/arm/xen-pvh.c | 1 - hw/arm/xilinx_zynq.c | 1 - hw/arm/xlnx-versal-virt.c | 1 - hw/arm/xlnx-zcu102.c | 1 - hw/core/null-machine.c | 1 - hw/nitro/machine.c | 1 - hw/remote/machine.c | 1 - target-info-qom.c | 1 - target/arm/machine.c | 1 - 73 files changed, 86 deletions(-) delete mode 100644 include/hw/arm/machines-qom.h diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h deleted file mode 100644 index e3eebbdefbc..00000000000 --- a/include/hw/arm/machines-qom.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * QOM type definitions for ARM / Aarch64 machines - * - * Copyright (c) Linaro - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#ifndef HW_ARM_MACHINES_QOM_H -#define HW_ARM_MACHINES_QOM_H - -#include "hw/core/boards.h" - -#endif diff --git a/configs/targets/aarch64-softmmu.c b/configs/targets/aarch64-so= ftmmu.c index 2200a4f19e9..fdebdcc3582 100644 --- a/configs/targets/aarch64-softmmu.c +++ b/configs/targets/aarch64-softmmu.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qemu/target-info-impl.h" #include "qemu/target-info-init.h" -#include "hw/arm/machines-qom.h" #include "target/arm/cpu-qom.h" #include "target/arm/cpu-param.h" =20 diff --git a/configs/targets/arm-softmmu.c b/configs/targets/arm-softmmu.c index 9d558a0c1a1..2b98f65a0f8 100644 --- a/configs/targets/arm-softmmu.c +++ b/configs/targets/arm-softmmu.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qemu/target-info-impl.h" #include "qemu/target-info-init.h" -#include "hw/arm/machines-qom.h" #include "target/arm/cpu-qom.h" #include "target/arm/cpu-param.h" =20 diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 8fa16b3831c..a7cfbd6c5e0 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -14,7 +14,6 @@ #include "hw/arm/boot.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" -#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/gpio/pca9552.h" #include "hw/gpio/pca9554.h" diff --git a/hw/arm/aspeed_ast1040_evb.c b/hw/arm/aspeed_ast1040_evb.c index dd68f9e25c7..486f0f6a1ba 100644 --- a/hw/arm/aspeed_ast1040_evb.c +++ b/hw/arm/aspeed_ast1040_evb.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/core/qdev-clock.h" diff --git a/hw/arm/aspeed_ast10x0_evb.c b/hw/arm/aspeed_ast10x0_evb.c index f377e955adc..c937bb74665 100644 --- a/hw/arm/aspeed_ast10x0_evb.c +++ b/hw/arm/aspeed_ast10x0_evb.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/core/qdev-clock.h" diff --git a/hw/arm/aspeed_ast2400_palmetto.c b/hw/arm/aspeed_ast2400_palme= tto.c index f4918683c3d..e2350e5b6ca 100644 --- a/hw/arm/aspeed_ast2400_palmetto.c +++ b/hw/arm/aspeed_ast2400_palmetto.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/aspeed_ast2400_quanta-q71l.c b/hw/arm/aspeed_ast2400_qu= anta-q71l.c index e1ddf682315..e8cbbb8a052 100644 --- a/hw/arm/aspeed_ast2400_quanta-q71l.c +++ b/hw/arm/aspeed_ast2400_quanta-q71l.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" =20 diff --git a/hw/arm/aspeed_ast2400_supermicrox11.c b/hw/arm/aspeed_ast2400_= supermicrox11.c index 86d49fd1dee..c75898cc6d1 100644 --- a/hw/arm/aspeed_ast2400_supermicrox11.c +++ b/hw/arm/aspeed_ast2400_supermicrox11.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/aspeed_ast2500_evb.c b/hw/arm/aspeed_ast2500_evb.c index 5f616252e0b..6ca2a36322c 100644 --- a/hw/arm/aspeed_ast2500_evb.c +++ b/hw/arm/aspeed_ast2500_evb.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/aspeed_ast2500_g220a.c b/hw/arm/aspeed_ast2500_g220a.c index 3c654c62dd6..00bb1c61053 100644 --- a/hw/arm/aspeed_ast2500_g220a.c +++ b/hw/arm/aspeed_ast2500_g220a.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/aspeed_ast2500_romulus.c b/hw/arm/aspeed_ast2500_romulu= s.c index b2ed623f680..340a74408b6 100644 --- a/hw/arm/aspeed_ast2500_romulus.c +++ b/hw/arm/aspeed_ast2500_romulus.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" =20 diff --git a/hw/arm/aspeed_ast2500_supermicro-x11spi.c b/hw/arm/aspeed_ast2= 500_supermicro-x11spi.c index 77fa028b096..5a7e49d6ccd 100644 --- a/hw/arm/aspeed_ast2500_supermicro-x11spi.c +++ b/hw/arm/aspeed_ast2500_supermicro-x11spi.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/aspeed_ast2500_tiogapass.c b/hw/arm/aspeed_ast2500_tiog= apass.c index 1771f376480..6cb567526c4 100644 --- a/hw/arm/aspeed_ast2500_tiogapass.c +++ b/hw/arm/aspeed_ast2500_tiogapass.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/nvram/eeprom_at24c.h" diff --git a/hw/arm/aspeed_ast2500_witherspoon.c b/hw/arm/aspeed_ast2500_wi= therspoon.c index 4cc349c3236..26ddb673470 100644 --- a/hw/arm/aspeed_ast2500_witherspoon.c +++ b/hw/arm/aspeed_ast2500_witherspoon.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/misc/led.h" diff --git a/hw/arm/aspeed_ast2500_yosemitev2.c b/hw/arm/aspeed_ast2500_yos= emitev2.c index 48c813f3c8f..3ba1ed5f6fa 100644 --- a/hw/arm/aspeed_ast2500_yosemitev2.c +++ b/hw/arm/aspeed_ast2500_yosemitev2.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/nvram/eeprom_at24c.h" diff --git a/hw/arm/aspeed_ast2600_anacapa.c b/hw/arm/aspeed_ast2600_anacap= a.c index e82f5c98f26..697be58b0e4 100644 --- a/hw/arm/aspeed_ast2600_anacapa.c +++ b/hw/arm/aspeed_ast2600_anacapa.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sensor/adc128d818.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/i2c_mux_pca954x.h" diff --git a/hw/arm/aspeed_ast2600_bletchley.c b/hw/arm/aspeed_ast2600_blet= chley.c index 9dda83ad4c0..2822f6bdf5a 100644 --- a/hw/arm/aspeed_ast2600_bletchley.c +++ b/hw/arm/aspeed_ast2600_bletchley.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/gpio/pca9552.h" diff --git a/hw/arm/aspeed_ast2600_catalina.c b/hw/arm/aspeed_ast2600_catal= ina.c index f91e0635908..23636ab6985 100644 --- a/hw/arm/aspeed_ast2600_catalina.c +++ b/hw/arm/aspeed_ast2600_catalina.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/i2c_mux_pca954x.h" diff --git a/hw/arm/aspeed_ast2600_evb.c b/hw/arm/aspeed_ast2600_evb.c index 404083b61dc..8a17c4453e9 100644 --- a/hw/arm/aspeed_ast2600_evb.c +++ b/hw/arm/aspeed_ast2600_evb.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/aspeed_ast2600_fby35.c b/hw/arm/aspeed_ast2600_fby35.c index 6bcda0ac630..65d98fafec6 100644 --- a/hw/arm/aspeed_ast2600_fby35.c +++ b/hw/arm/aspeed_ast2600_fby35.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/nvram/eeprom_at24c.h" diff --git a/hw/arm/aspeed_ast2600_fuji.c b/hw/arm/aspeed_ast2600_fuji.c index cf49149fe9a..8a87c2dbee3 100644 --- a/hw/arm/aspeed_ast2600_fuji.c +++ b/hw/arm/aspeed_ast2600_fuji.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/i2c_mux_pca954x.h" diff --git a/hw/arm/aspeed_ast2600_gb200nvl.c b/hw/arm/aspeed_ast2600_gb200= nvl.c index 705561afe39..311feb82023 100644 --- a/hw/arm/aspeed_ast2600_gb200nvl.c +++ b/hw/arm/aspeed_ast2600_gb200nvl.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/nvram/eeprom_at24c.h" diff --git a/hw/arm/aspeed_ast2600_rainier.c b/hw/arm/aspeed_ast2600_rainie= r.c index 6e5debc8bc1..43a8f01a9e7 100644 --- a/hw/arm/aspeed_ast2600_rainier.c +++ b/hw/arm/aspeed_ast2600_rainier.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/nvram/eeprom_at24c.h" diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c index ccfa4ade265..73362b60d2a 100644 --- a/hw/arm/aspeed_ast27x0-fc.c +++ b/hw/arm/aspeed_ast27x0-fc.c @@ -22,7 +22,6 @@ #include "hw/arm/boot.h" #include "hw/block/flash.h" #include "hw/arm/aspeed_coprocessor.h" -#include "hw/arm/machines-qom.h" =20 #define TYPE_AST2700FC MACHINE_TYPE_NAME("ast2700fc") OBJECT_DECLARE_SIMPLE_TYPE(Ast2700FCState, AST2700FC); diff --git a/hw/arm/aspeed_ast27x0_evb.c b/hw/arm/aspeed_ast27x0_evb.c index 0deb3127c21..460c9ff0d2e 100644 --- a/hw/arm/aspeed_ast27x0_evb.c +++ b/hw/arm/aspeed_ast27x0_evb.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/sensor/tmp105.h" diff --git a/hw/arm/ax3000-boards.c b/hw/arm/ax3000-boards.c index c7248f9f52b..dc98ee7b71a 100644 --- a/hw/arm/ax3000-boards.c +++ b/hw/arm/ax3000-boards.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "hw/arm/ax3000-boards.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "qemu/error-report.h" #include "qom/object.h" =20 diff --git a/hw/arm/b-l475e-iot01a.c b/hw/arm/b-l475e-iot01a.c index 04dce2d19ce..de19212ab85 100644 --- a/hw/arm/b-l475e-iot01a.c +++ b/hw/arm/b-l475e-iot01a.c @@ -29,7 +29,6 @@ #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/core/split-irq.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/stm32l4x5_soc.h" #include "hw/gpio/stm32l4x5_gpio.h" #include "hw/display/dm163.h" diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c index 15c878d1636..8f59111fd4e 100644 --- a/hw/arm/bananapi_m2u.c +++ b/hw/arm/bananapi_m2u.c @@ -27,7 +27,6 @@ #include "hw/core/qdev-properties.h" #include "hw/arm/allwinner-r40.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" =20 #define TYPE_BPIM2U_MACHINE MACHINE_TYPE_NAME("bpim2u") OBJECT_DECLARE_SIMPLE_TYPE(Bpim2uMachineState, BPIM2U_MACHINE) diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 4b930e6ba12..ca6b3addb7b 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -15,7 +15,6 @@ #include "hw/core/boards.h" #include "strongarm.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "system/address-spaces.h" #include "qom/object.h" diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index 511b71fbd7e..ae27056938f 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -22,7 +22,6 @@ #include "hw/core/qdev-properties.h" #include "hw/arm/allwinner-a10.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/i2c/i2c.h" =20 #define TYPE_CUBIEBOARD_MACHINE MACHINE_TYPE_NAME("cubieboard") diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index c7ecf22a958..90c19106ad0 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -29,7 +29,6 @@ #include "hw/core/boards.h" #include "qemu/error-report.h" #include "hw/arm/digic.h" -#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/core/loader.h" #include "system/qtest.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 62f7cbe875e..78632877df8 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -28,7 +28,6 @@ #include "hw/core/sysbus.h" #include "net/net.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "system/address-spaces.h" #include "hw/arm/exynos4210.h" #include "hw/net/lan9118.h" diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index 3246512c214..243c30a67e7 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -28,7 +28,6 @@ #include "hw/core/qdev-properties.h" #include "hw/arm/fsl-imx25.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "qemu/error-report.h" #include "system/qtest.h" diff --git a/hw/arm/imx8mm-evk.c b/hw/arm/imx8mm-evk.c index ffe8e494a57..8a5737502fd 100644 --- a/hw/arm/imx8mm-evk.c +++ b/hw/arm/imx8mm-evk.c @@ -11,7 +11,6 @@ #include "system/address-spaces.h" #include "hw/arm/boot.h" #include "hw/arm/fsl-imx8mm.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "system/kvm.h" diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index 389e7c86d21..3f376f86d91 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -10,7 +10,6 @@ #include "system/address-spaces.h" #include "hw/arm/boot.h" #include "hw/arm/fsl-imx8mp.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "system/kvm.h" diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 25ecd931e76..382ea7850d8 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -13,7 +13,6 @@ #include "migration/vmstate.h" #include "hw/core/boards.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/misc/arm_integrator_debug.h" #include "hw/net/smc91c111.h" #include "net/net.h" diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 909dd929e63..387bf54ced1 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -17,7 +17,6 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx31.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "qemu/error-report.h" #include "system/address-spaces.h" diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c index 290a14c8ad9..ed50bb91979 100644 --- a/hw/arm/max78000fthr.c +++ b/hw/arm/max78000fthr.c @@ -12,7 +12,6 @@ #include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "qemu/error-report.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/max78000_soc.h" #include "hw/arm/boot.h" =20 diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index a3dafb20131..40071d2c7b9 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -14,7 +14,6 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6ul.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "qemu/error-report.h" diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index cb4536faadd..db8a62e5f6c 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -16,7 +16,6 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx7.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "qemu/error-report.h" diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index 85285861c5f..c1a3f6903fe 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -12,7 +12,6 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "system/system.h" #include "system/address-spaces.h" =20 diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 3a384d3cdb9..4e6744eddf4 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -60,7 +60,6 @@ #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/arm/armv7m.h" -#include "hw/arm/machines-qom.h" #include "hw/core/or-irq.h" #include "hw/core/boards.h" #include "system/address-spaces.h" diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index b13b7bc55ec..35d867328a9 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -31,7 +31,6 @@ #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/arm/armv7m.h" -#include "hw/arm/machines-qom.h" #include "hw/core/or-irq.h" #include "hw/core/boards.h" #include "system/address-spaces.h" diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index d6f4c1640ab..eedb877e4bc 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -37,7 +37,6 @@ #include "hw/core/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/bsa.h" -#include "hw/arm/machines-qom.h" #include "hw/char/cmsdk-apb-uart.h" #include "hw/i2c/arm_sbcon_i2c.h" #include "hw/intc/arm_gicv3.h" diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 8d00fef43b0..1372d7f628a 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -32,7 +32,6 @@ #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/qdev-clock.h" #include "system/address-spaces.h" #include "hw/arm/msf2-soc.h" diff --git a/hw/arm/musca.c b/hw/arm/musca.c index 1b161487e7e..571bee1b72b 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -26,7 +26,6 @@ #include "system/system.h" #include "hw/arm/boot.h" #include "hw/arm/armsse.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "hw/char/pl011.h" #include "hw/core/split-irq.h" diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index 6a639264d61..0db8798b4bd 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -30,7 +30,6 @@ #include "qemu/error-report.h" #include "hw/arm/stm32f205_soc.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" =20 /* Main SYSCLK frequency in Hz (120MHz) */ #define SYSCLK_FRQ 120000000ULL diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index d04ab8aeea4..5ac0eb81637 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -30,7 +30,6 @@ #include "qemu/error-report.h" #include "hw/arm/stm32f405_soc.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" =20 /* Main SYSCLK frequency in Hz (168MHz) */ #define SYSCLK_FRQ 168000000ULL diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index 025de42dac6..9c526a26839 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -17,7 +17,6 @@ #include "qemu/osdep.h" =20 #include "hw/arm/npcm7xx.h" -#include "hw/arm/machines-qom.h" #include "hw/core/cpu.h" #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c index 2a04cf4f2c9..4b3af165034 100644 --- a/hw/arm/npcm8xx_boards.c +++ b/hw/arm/npcm8xx_boards.c @@ -19,7 +19,6 @@ #include "chardev/char.h" #include "hw/core/boards.h" #include "hw/arm/npcm8xx.h" -#include "hw/arm/machines-qom.h" #include "hw/core/cpu.h" #include "hw/core/loader.h" #include "hw/core/qdev.h" diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c index 154501fc3c7..de9ac4978ce 100644 --- a/hw/arm/olimex-stm32-h405.c +++ b/hw/arm/olimex-stm32-h405.c @@ -31,7 +31,6 @@ #include "qemu/error-report.h" #include "hw/arm/stm32f405_soc.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" =20 /* olimex-stm32-h405 implementation is derived from netduinoplus2 */ =20 diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index c3fe4187b8b..a7e469ea6a3 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -32,7 +32,6 @@ #include "hw/arm/omap.h" #include "hw/core/boards.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "system/qtest.h" #include "system/address-spaces.h" diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index 3f06716c364..7a19732f5df 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -26,7 +26,6 @@ #include "hw/core/qdev-properties.h" #include "hw/arm/allwinner-h3.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" =20 #define TYPE_ORANGEPI_MACHINE MACHINE_TYPE_NAME("orangepi-pc") OBJECT_DECLARE_SIMPLE_TYPE(OrangePiMachineState, ORANGEPI_MACHINE) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 7ff3e8400e6..fadbacb2534 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -24,7 +24,6 @@ #include "qemu/error-report.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/arm/machines-qom.h" #include "qom/object.h" =20 #define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common") diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 08fcdf58c9f..7d3eed96304 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -11,7 +11,6 @@ #include "qemu/cutils.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/raspi_platform.h" #include "hw/display/bcm2835_fb.h" #include "hw/core/registerfields.h" diff --git a/hw/arm/realview.c b/hw/arm/realview.c index aee7d05c3e6..ceba0331b08 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -12,7 +12,6 @@ #include "target/arm/cpu.h" #include "hw/core/sysbus.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/split-irq.h" #include "hw/misc/arm_sysctl.h" #include "hw/net/lan9118.h" diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index ec307388f45..05dfabd9376 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -14,7 +14,6 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "qemu/error-report.h" diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 6ba353341a1..158b461eb48 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -35,7 +35,6 @@ #include "hw/arm/bsa.h" #include "hw/arm/fdt.h" #include "hw/arm/smmuv3.h" -#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/core/boards.h" #include "hw/ide/ide-bus.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index f634918868b..f41315e1928 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -15,7 +15,6 @@ #include "hw/sd/sd.h" #include "hw/ssi/ssi.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "qemu/timer.h" #include "hw/i2c/i2c.h" #include "net/net.h" diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index 0b39543c1ff..d899a134b38 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -31,7 +31,6 @@ #include "qemu/error-report.h" #include "hw/arm/stm32f100_soc.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" =20 /* stm32vldiscovery implementation is derived from netduinoplus2 */ =20 diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 1db9bc1eb24..f94bf96599e 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -12,7 +12,6 @@ #include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/net/smc91c111.h" #include "net/net.h" #include "system/system.h" diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 1e29fe0f09c..914cda66d20 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -26,7 +26,6 @@ #include "qemu/datadir.h" #include "hw/core/sysbus.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/misc/arm_sysctl.h" #include "hw/net/lan9118.h" #include "hw/i2c/i2c.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index eae4f0fe413..0871a35e11f 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -37,7 +37,6 @@ #include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/virt.h" -#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/display/ramfb.h" #include "net/net.h" diff --git a/hw/arm/xen-pvh.c b/hw/arm/xen-pvh.c index b47dd9efd81..f05956c1662 100644 --- a/hw/arm/xen-pvh.c +++ b/hw/arm/xen-pvh.c @@ -10,7 +10,6 @@ #include "hw/core/boards.h" #include "system/system.h" #include "hw/xen/xen-pvh-common.h" -#include "hw/arm/machines-qom.h" =20 #define TYPE_XEN_ARM MACHINE_TYPE_NAME("xenpvh") =20 diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 8ebd8e5ccd5..c1897ab1cf3 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -20,7 +20,6 @@ #include "qapi/error.h" #include "hw/core/sysbus.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "net/net.h" #include "system/system.h" #include "hw/core/boards.h" diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index e06a0c55549..4018f2bf7d1 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -21,7 +21,6 @@ #include "hw/arm/fdt.h" #include "hw/arm/xlnx-versal.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "qom/object.h" #include "target/arm/cpu.h" =20 diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index da8b3ede873..bb596218540 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -19,7 +19,6 @@ #include "qapi/error.h" #include "hw/arm/xlnx-zynqmp.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "qemu/error-report.h" #include "qemu/log.h" diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index c1ecf3214fd..2aa748233b3 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -16,7 +16,6 @@ #include "hw/core/boards.h" #include "system/address-spaces.h" #include "hw/core/cpu.h" -#include "hw/arm/machines-qom.h" #include "hw/riscv/machines-qom.h" =20 static void machine_none_init(MachineState *mch) diff --git a/hw/nitro/machine.c b/hw/nitro/machine.c index bb8878299bc..88d01960a01 100644 --- a/hw/nitro/machine.c +++ b/hw/nitro/machine.c @@ -31,7 +31,6 @@ #include "system/system.h" #include "system/nitro-accel.h" #include "qemu/accel.h" -#include "hw/arm/machines-qom.h" #include "hw/core/eif.h" #include /* for crc32 */ =20 diff --git a/hw/remote/machine.c b/hw/remote/machine.c index 6580e0d9683..ced782f6a9c 100644 --- a/hw/remote/machine.c +++ b/hw/remote/machine.c @@ -24,7 +24,6 @@ #include "hw/core/qdev.h" #include "hw/remote/vfio-user-obj.h" #include "hw/pci/msi.h" -#include "hw/arm/machines-qom.h" =20 static void remote_machine_init(MachineState *machine) { diff --git a/target-info-qom.c b/target-info-qom.c index eb9491338ca..7959853e0da 100644 --- a/target-info-qom.c +++ b/target-info-qom.c @@ -12,7 +12,6 @@ #include "qemu/target-info-impl.h" #include "qemu/target-info-init.h" #include "qemu/target-info-qom.h" -#include "hw/arm/machines-qom.h" #include "hw/riscv/machines-qom.h" =20 static const TypeInfo target_info_types[] =3D { diff --git a/target/arm/machine.c b/target/arm/machine.c index 61106f9def6..7005f4e5d77 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -11,7 +11,6 @@ #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "target/arm/gtimer.h" -#include "hw/arm/machines-qom.h" =20 static bool vfp_needed(void *opaque) { --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432319; cv=none; d=zohomail.com; s=zohoarc; b=Ch5OoS8Q006T6Cwrqa7LCBLKsbwX/NBJBZzDR308cGTePa7C61xw5MuUroaTt7jiYASG7NebKOarnvGABJaf1bubsWloqg61BtJJw1fJuQ3e4ZKY89PGd4kiEqSUdrzbp6bAqecCegGjiT07Z1+bkYc9pQFWJzOIseQOJWmt0tk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432319; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=65LJzxr2vu9J3ZcTiKvu6EAA29gHMoI3gixs+8qBmRU=; b=X7TpeN7OB4a8gshqhismAAq8EU1yo2Zbc5mJq2NI8ic7BMcU8tloSj6m5U3xx99UN72eItexOGng3qiN4yVMikFq7nthqHP7ZYgNlb0jN8GNSVSI84NqWDIHRYTqdzm2aXJCbv3b2MKpID/l2RSNB1xkCt7EDfkDyW/vE93XuLU= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432319509186.21309160662008; Thu, 3 Sep 2026 03:45:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24wU-0002jI-Kg; Thu, 03 Sep 2026 06:45:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wS-0002bU-Jk for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:12 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wQ-0007O8-UQ for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:12 -0400 Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHBjr1328202 for ; Thu, 3 Sep 2026 10:45:09 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4genrnmme3-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:45:09 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-9393ac4961fso163645785a.2 for ; Thu, 03 Sep 2026 03:45:09 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-484492ce236sm14941005f8f.35.2026.09.03.03.45.06 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:45:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 65LJzxr2vu9J3ZcTiKvu6EAA29gHMoI3gixs+8qBmRU=; b=cdDSCPih5+or3zGN Btpuw9dJCzK7ZV/uG+bjagksyc+qXM4/bxD93nrZJuoVeC9EJ84sGM+7LXytGtAT kzjw+NIqtUw4pMVZ7NOIH7jWDlpTALQci0cXIoo2gnp4Dumv7y3x9XAhiSWQzsIn 9/4v0TxluAshEGDkttimIoFOA9d91gTCJnYsSd1Havvy/jg61sFiOWgHg6zeuKg6 08P+3cTyYwGg/LnOQXelVeYbZn2Fqf7BDUgZ/Mo+zgcWZNR517y/XZ6YzJTaadHI YHcO2eo/9fHuBiqsJUb+tBQ7c5xupGBQGCHFDNVp7XQ36NA22WeMwuOIXsbmm8ki DXG8XQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432308; x=1789037108; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=65LJzxr2vu9J3ZcTiKvu6EAA29gHMoI3gixs+8qBmRU=; b=LEzlMEsEiJApzZEJzDyJXmhyC9Tw6iLzUkDDWIgXTE9iHALPovIMjdC1QoG1gtg9FL qOkslx2t+W7AsGa2rJxQY6slE+ao05naVuSjKS0JAbitWLDU+vWH10gztG6Sv/CIAPz9 e5Swv0dK7W754JBBqGgBF1sp0LBwDrY0xONO7DoJpT//OJglZgSKj2RhblqtrD0jkh2x mR5wH+mIMbxRWevHTYVEU6KbAa5qbfivxtqESLs53Mp+KZ41/bR1gIxBEqWkr5W1qM3X DjnIMH8PxbRNuVDfewVHpLx0PNtmD+XwUr4GE1ld7C984VPbIvEHEHzH/5zzQyrsg+my Hc3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432308; x=1789037108; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=65LJzxr2vu9J3ZcTiKvu6EAA29gHMoI3gixs+8qBmRU=; b=OA3iGgMGQnsZ7L0ObUvE0ztI4f5YLUAmgM6lhJLgvmTbG0pd39FFJ3xDGqog3qwlbd F4ALO4FuQJYVhhig12arc72fcVbGzu9UbSR8LoZuF+nUkCwdReoquJAKdsz/OZFd1BrA y2+OmXVyZcEhImAooQVnkpqQkVxkB1mulESQp8qu4gpLby5CJfd5X291q8YB8fT6D8eH uj5BAbz/N1FHF1sDHFwX4Ia8e6yBZklNCA/H9Ypp4Y45q8aFZ49g/VHr4cUxSnwp/2g9 cPYDRMoo9FYHKP2RhSkmYSh62m+wlXSMMKkTMMT4CykZgZ5NYClRRUmoxtMZHo78wPeZ 62Kw== X-Gm-Message-State: AFuF++ljw7G8+GVd33jPFROeZf9IvCabLsAsQStyMuePW2I7FSX3AKd7 dd09Ejolcdr/Z/nxeyFh3/iPFEwhrOTRMqpzRKIIrQ3zYrmNdQNAOnb9wZTGrUsClwPDqlteo4R a1OLtDeUH3SJl27uLVC+Jr33ZzY8G94xbdKU+Sehv3sQneC5HAFmDWt6e74ibzmfadg== X-Gm-Gg: AYBFou1iMkWHgNOUMbQSDq4/klPemtpG1pp+4uBsK7g6He7/hTbWWLSRF0aal1TX/A5 UGkph1K/xITW9fFgv5UEy3REVrfENKr4BEQJHsf5NPoUv24ao5FgKN6578PAqbgDZCWnOW+GM8v Hir1MnYdeFHt8ihZeaLbAz0DbI2IiS+iSeemQGsF2+trezNKVZdUPICOoMUlT0hUJefeC2peqkG cOnULwE0FkNuHHUaRCNngoZS4anZAlNiCTO7tYFA5LhPy+OfArZy590/hjWG44T/f9hJ6v5akQX lPCgL5ViygVPXURLWqVyNrf6g0lcVMtrpQiUhGgZ1N/giQEqJ52QSSuLB3m2ebk71Cjaw3QSM23 OYXRhgaTCxIzaF62YiIMvMMcy1dhthWfPGCV4LPzK X-Received: by 2002:a05:620a:2545:b0:937:6900:a7ae with SMTP id af79cd13be357-93960dfe4b3mr1160660685a.15.1788432308496; Thu, 03 Sep 2026 03:45:08 -0700 (PDT) X-Received: by 2002:a05:620a:2545:b0:937:6900:a7ae with SMTP id af79cd13be357-93960dfe4b3mr1160654885a.15.1788432307941; Thu, 03 Sep 2026 03:45:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 44/51] hw/riscv: remove TYPE_TARGET_{RISCV32,RISCV64}_MACHINE Date: Thu, 3 Sep 2026 12:39:28 +0200 Message-ID: <20260903103936.62355-45-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: sB5PEzpBRgSxMBzfu6GBE8Mnc1GkmH-M X-Proofpoint-ORIG-GUID: sB5PEzpBRgSxMBzfu6GBE8Mnc1GkmH-M X-Authority-Analysis: v=2.4 cv=YKuvDxGx c=1 sm=1 tr=0 ts=6a994fb5 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=h_r1GPaHZSNDaGzxDFMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXwxCEU43kD5y/ tHmZT+U8Tml1Z9/ywZdREJYPhnlzz79k6HSRkl5naW9vHdbDOuy3NAAHgmpX0A5Fu+xzFmN1FYy 3tL/SCJHQ2qaKCzQRyvO2oP4iTufPLYwYo5HOGOrGZPwYWUOe9AyQu8pIJ/PvFUwo9P381/2Ix6 109DNrjXNrKKlaJbbF4CTwCBqPZW0K8wzIW3GEz997FvJzFaes138lIeZxl+okaaHEt4LNTow3B xStb/Rk2AsXmHilrc9jzVMtKGBgZ0hGjYP7H20TKl3NDCSyWj1dWoqTZ1x9KNfuP4Q6WBlxgn5P 2Y+eIyxCP7QE5Av18CRtsUP9R4sTH37H5j0eF0aNYTpFn9YrG3/GpeFCbURBULHk3rHP1DeJugx AJbbBGbPpR+BYb8kGfSCdYjKD7Y7GPm75St/TFMTvDMSuqzE7bn306d0IqCDf8oBzFKqrL6x5HZ k5r9pETg0M0gzlWEyCA== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX7ziInekbFcho DG87MxE+oAus5XSp07AV2URrBbXcYUYe9WqkmyxWbw44J/LJGh3jVbraly3MyRM/RWneUT5xU2P k53KKTDetA37CJQ1H4duD7GpsozvIe8= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 adultscore=0 impostorscore=0 malwarescore=0 phishscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432319836158504 From: Pierrick Bouvier Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260901202043.26532-12-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/riscv/machines-qom.h | 6 ------ hw/core/null-machine.c | 5 +---- hw/riscv/virt.c | 2 -- target-info-qom.c | 13 ------------- target/riscv/machine.c | 4 ---- 5 files changed, 1 insertion(+), 29 deletions(-) diff --git a/include/hw/riscv/machines-qom.h b/include/hw/riscv/machines-qo= m.h index ee346227bb2..6c0bbdfc159 100644 --- a/include/hw/riscv/machines-qom.h +++ b/include/hw/riscv/machines-qom.h @@ -11,12 +11,6 @@ =20 #include "hw/core/boards.h" =20 -#define TYPE_TARGET_RISCV32_MACHINE \ - "target-info-riscv32-machine" - -#define TYPE_TARGET_RISCV64_MACHINE \ - "target-info-riscv64-machine" - /* * Interfaces specifying whether a given QOM object is available in * qemu-system-riscv32, qemu-system-riscv64, or both. diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 2aa748233b3..2f008c4a702 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -56,7 +56,4 @@ static void machine_none_machine_init(MachineClass *mc) mc->no_cdrom =3D 1; } =20 -DEFINE_MACHINE_WITH_INTERFACES("none", machine_none_machine_init, - { TYPE_TARGET_RISCV32_MACHINE }, - { TYPE_TARGET_RISCV64_MACHINE }, - { }) +DEFINE_MACHINE("none", machine_none_machine_init) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d58656f70d1..d2ae321a376 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1811,8 +1811,6 @@ static const TypeInfo virt_machine_typeinfo =3D { .instance_size =3D sizeof(RISCVVirtState), .interfaces =3D (const InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, - { TYPE_TARGET_RISCV32_MACHINE }, - { TYPE_TARGET_RISCV64_MACHINE }, { } }, }; diff --git a/target-info-qom.c b/target-info-qom.c index 7959853e0da..f98d3d7698e 100644 --- a/target-info-qom.c +++ b/target-info-qom.c @@ -14,19 +14,6 @@ #include "qemu/target-info-qom.h" #include "hw/riscv/machines-qom.h" =20 -static const TypeInfo target_info_types[] =3D { - { - .name =3D TYPE_TARGET_RISCV32_MACHINE, - .parent =3D TYPE_INTERFACE, - }, - { - .name =3D TYPE_TARGET_RISCV64_MACHINE, - .parent =3D TYPE_INTERFACE, - }, -}; - -DEFINE_TYPES(target_info_types) - static void target_info_qom_class_init(ObjectClass *oc, const void * data) { TargetInfoQomClass *klass =3D TARGET_INFO_CLASS(oc); diff --git a/target/riscv/machine.c b/target/riscv/machine.c index 31c49ca3e6a..59676c94470 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -582,17 +582,13 @@ const VMStateDescription vmstate_riscv_cpu =3D { }; =20 const InterfaceInfo riscv32_machine_interfaces[] =3D { - { TYPE_TARGET_RISCV32_MACHINE }, { } }; =20 const InterfaceInfo riscv64_machine_interfaces[] =3D { - { TYPE_TARGET_RISCV64_MACHINE }, { } }; =20 const InterfaceInfo riscv32_64_machine_interfaces[] =3D { - { TYPE_TARGET_RISCV32_MACHINE }, - { TYPE_TARGET_RISCV64_MACHINE }, { } }; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432328; cv=none; d=zohomail.com; s=zohoarc; b=cwBSgNUI4DIXC+7wj5tJPa6NIqpJU5KSmmPnZciNdwVr6n7yzP81I7fvxon63JbY3cx0OCVMY+92TX09bYRfnzVsfB2x93g/4OtFzWkHLNrihdet98IYkad+i6zERIp0c70EiLHw57c2ASv8dcXnM6axtljjzyuh3FXec+s8xmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432328; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=l/Gg73EeuXDsxmGWWLO6e5XjomQj9g6yk/aNMfC08hQ=; b=Kd1hYVQln8TCJX2AvLfWkNzzhGNnhd337vQZa19kgrqMslXWgZvbKEFaauInOZxTW9QP54LKFTy/zyEqfHIkhNeytkAE8J8ZX+AScTsWF1c2UHxilMiZIt0WPU5/qYhpF+c95YUqdvNV4QYkIA3A1CbZkYtcXM/8wXz6Gq5hBjo= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432328908105.5654512574348; Thu, 3 Sep 2026 03:45:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24wd-00039G-Bf; Thu, 03 Sep 2026 06:45:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wb-00031R-W5 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:22 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wZ-0007P7-OJ for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:21 -0400 Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AH4q4935013 for ; Thu, 3 Sep 2026 10:45:18 GMT Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gerdnbvpa-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:45:18 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-9393ac4961fso163667885a.2 for ; Thu, 03 Sep 2026 03:45:17 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ce7ac52c3sm85767345e9.4.2026.09.03.03.45.13 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:45:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= l/Gg73EeuXDsxmGWWLO6e5XjomQj9g6yk/aNMfC08hQ=; b=S6KSxLQgceso33Ar +/nz2SqX2LF4ssN+oSiHZxsvIccSax9ZFZtroc8B04qNj6fP6ceyuv1FZ9ZCcaHl u5Wap2b0m+2Keb5C2yWnSqNChwb/SkrWtMjuZ9wL2lpE0DOP6UWICWu6LLX8H/aW YmCXJp+REVwhSKgQDrDuQ/eXkZ+J3AZgNHhaaMlW/9y/hFsSzU9X0H79kwgUoHvN +eMhYG1rJAxrwX8R7daz9MZ4rA6Me69+mXIY374FHl/otECLXjCJWv/7JjO5uF+N SUQ7ZJlQb+/Itwxmo22UbjBAqz3HLXLLItd670mZmWQ8ZzVjZ7WYbomx+KiUdIpU bw2PhA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432317; x=1789037117; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=l/Gg73EeuXDsxmGWWLO6e5XjomQj9g6yk/aNMfC08hQ=; b=XbD/Kqcie3UQKSTLlKZqC0dO4PWWwkU47Wy3PCRZUdMGj/S08z3GynaGdPXVXAPeFo +vIf3zjKYsyqsm4DWPeoSnnbgzg2hbe/WJRdL0ydQwYvdTgtQKkJUc6ky/+vQp/DtTV1 jzQTnhfNh0YXt4hAFaJ5wekq7Ldnn/c/48hd4/SMS+i5AnCiWfsbRymdBt+iwv//yf4r kMBaZalsabX/kcURQdI8zHiT1ovyFz6zCyOkxrzR/RY0mMB2bw0wDewF6DO1obPD90hi DL4bP7UfJ/2EFSstbSyuzRWsaU+lva7LNkIx7D0zyE3Py5BuZz4ySRYdSKgBKG9OP83N FcLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432317; x=1789037117; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=l/Gg73EeuXDsxmGWWLO6e5XjomQj9g6yk/aNMfC08hQ=; b=mdUgfWf4S+B8sSfnNlThHE3VDHnk7nlH07kM9rnqHMm7vLHA9y0SvUUii6Mx4NE2Nz ad4Hix3V15DqRBHsAR6I01NWQz5B7mRNiQVKih/WBnshVg1aQhb5GQfGS/rk9C54YAqC IejTnY6Kj5KlOxf0YM7DBnkvceCWen/gGxmCJe/dODDv8iIBCBT7skD1qmLriz+slb3m Kk1lgvakEuR+uvWoRLeZQlv2EKYmypWJN8hyfCXxSK+U5dlMFqSP5LbI7BxwoKXoI9SA OtEyBUYs5ZuPtdCTqOMFYElMlDjjlZ6EwDiKP1VEZsb51z9OQyUG2afKh4vwgTY6S49V u8ng== X-Gm-Message-State: AFuF++m0aALPqkwSTmpJ+mPCbQGFFKBpWkmGG3gx71hAsh8ucU7KlKGC 42F9cdG1OCntwTF3HRqMF97hOb3RvSziVEmbcVJck6nn0tPpljbHFwMsiZ7v4nZgVOOJf034hUM WtnVt+rx3yq+6iTCxI0I2ZBNFITw8Ye9hAqlyBJVoZvuE8ICoD+57niQ+62sSA3FNgw== X-Gm-Gg: AYBFou0IWus0LGujxsq5tZdDlOWDocSVvT2qxvRqviqS1u5PQ927JyFsd9Kfaw049nS 1vg3Hw7DvRBljZfVzuo71o4aHF+L49DjaLApPU+nLU+l64PQB1rEaHwyBLZVOPmDoTnTOdHqd59 FPiqzAaplF8p6Uxm8TTiYitOcmS3l4Y9vzliA5oiqIIznn85syexKGiJe4ous1e3/JG2as0doA+ dHkTidWxZbvHPzDkg1ALAx1aaDnJ8abCR4t4tzqF4AZhj8JSrnlnBy6CEqCO5vNCx7c3FP4LIJd zVYNduUJ8nZO41PoQ5FJxNwb7CyvHbC0qjrCe00U4ijbkrlS39k0i2JJlgk4sPa0fqCpg+TRbEO isqNuOcSuYwZLSrx5tHTiLoE5d4QO32EyDfjbXe0H X-Received: by 2002:a05:620a:1a15:b0:937:1538:6b93 with SMTP id af79cd13be357-93960ff982bmr1304278085a.40.1788432316862; Thu, 03 Sep 2026 03:45:16 -0700 (PDT) X-Received: by 2002:a05:620a:1a15:b0:937:1538:6b93 with SMTP id af79cd13be357-93960ff982bmr1304272985a.40.1788432316272; Thu, 03 Sep 2026 03:45:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 45/51] hw/riscv: remove {riscv32, riscv32_64, riscv64}_machine_interfaces Date: Thu, 3 Sep 2026 12:39:29 +0200 Message-ID: <20260903103936.62355-46-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=YcmNIQRf c=1 sm=1 tr=0 ts=6a994fbe cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=HyVZBBfh0p0RB8WjpRcA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX/09t/N3FRh+Y XJwOoIcK3xOcXmgFi6eAn0rVZ67wts8jbW9ovd8C8YwzvLh59K2PtMe489mnbJLXEbdnPwFlHcX h3o6n/pylpO3RJA4lnbkJ2t6OdmOp7Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX/9kuf4Toq03M KXRk3a8Ih1Hdx6bpIGQG/XhiCkwVFsH2XJ01mv1hUiBmz0SqgHr0MkqSvAEvb9faoz7UMTz3cNE E3BjPaTI74EwVya3hv08pH+jK3LucMwWovW2SNa1InAklVPkFT0MLU71g9dEcOBa6y4knNUIUE8 GHiAMbEcH85GciwvJrKGLGfNtJoELUZ5TNb+GP4uRLf2D9NX1ni/TX3HVLFC1aCUhMAOVEgPYgj 3XCollDk7cg1Wn26D0kol/xnVoPHQH9uJwRTwVM7M3MOxrTDFeYgzN/+XOi19Fr7Zqm5GFW80pf BjnRe90yDvsNnJ1IVYqWAGJhdLJHz1/jUwtacratkgQUnwfsNdePW3M93TKmSoXi0CbXvsOOJgb 73YuE2NWQ9Gqo2pvCV1KW4ZC6IEeMYVok7VWGRqIK716aXU0YsG9SglZh79Hl1J2tOYziYTE0nB R/9po+AnhtGGkPt9sQQ== X-Proofpoint-GUID: 0po9v5eIGDLn0QEMrxkW4gm9_taOwxjD X-Proofpoint-ORIG-GUID: 0po9v5eIGDLn0QEMrxkW4gm9_taOwxjD X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 phishscore=0 impostorscore=0 spamscore=0 suspectscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432329168158500 From: Pierrick Bouvier Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260901202043.26532-13-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/riscv/machines-qom.h | 15 +++------------ hw/riscv/k230.c | 1 - hw/riscv/microchip_pfsoc.c | 1 - hw/riscv/opentitan.c | 1 - hw/riscv/shakti_c.c | 1 - hw/riscv/sifive_e.c | 1 - hw/riscv/sifive_u.c | 1 - hw/riscv/spike.c | 1 - hw/riscv/tt_atlantis.c | 1 - hw/riscv/xiangshan_kmh.c | 1 - target/riscv/machine.c | 12 ------------ 11 files changed, 3 insertions(+), 33 deletions(-) diff --git a/include/hw/riscv/machines-qom.h b/include/hw/riscv/machines-qo= m.h index 6c0bbdfc159..e5f45b32e69 100644 --- a/include/hw/riscv/machines-qom.h +++ b/include/hw/riscv/machines-qom.h @@ -11,15 +11,6 @@ =20 #include "hw/core/boards.h" =20 -/* - * Interfaces specifying whether a given QOM object is available in - * qemu-system-riscv32, qemu-system-riscv64, or both. - */ - -extern const InterfaceInfo riscv32_machine_interfaces[]; -extern const InterfaceInfo riscv64_machine_interfaces[]; -extern const InterfaceInfo riscv32_64_machine_interfaces[]; - /* * Helper macros for defining machines available in qemu-system-riscv32, * qemu-system-riscv64, or both. @@ -27,14 +18,14 @@ extern const InterfaceInfo riscv32_64_machine_interface= s[]; =20 #define DEFINE_MACHINE_RISCV32(namestr, machine_initfn) \ DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - riscv32_machine_interfaces) + NULL) =20 #define DEFINE_MACHINE_RISCV64(namestr, machine_initfn) \ DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - riscv64_machine_interfaces) + NULL) =20 #define DEFINE_MACHINE_RISCV32_64(namestr, machine_initfn) \ DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - riscv32_64_machine_interfaces) + NULL) =20 #endif diff --git a/hw/riscv/k230.c b/hw/riscv/k230.c index 558f30b97e9..72d50d369a9 100644 --- a/hw/riscv/k230.c +++ b/hw/riscv/k230.c @@ -556,7 +556,6 @@ static const TypeInfo k230_machine_typeinfo =3D { .class_init =3D k230_machine_class_init, .instance_init =3D k230_machine_instance_init, .instance_size =3D sizeof(K230MachineState), - .interfaces =3D riscv64_machine_interfaces, }; =20 static void k230_machine_init_register_types(void) diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index 4017129c830..42d4fc39734 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -756,7 +756,6 @@ static const TypeInfo microchip_icicle_kit_machine_type= info =3D { .class_init =3D microchip_icicle_kit_machine_class_init, .instance_init =3D microchip_icicle_kit_machine_instance_init, .instance_size =3D sizeof(MicrochipIcicleKitState), - .interfaces =3D riscv64_machine_interfaces, }; =20 static void microchip_icicle_kit_machine_init_register_types(void) diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c index 5b2f33d5aca..c58d8993303 100644 --- a/hw/riscv/opentitan.c +++ b/hw/riscv/opentitan.c @@ -338,7 +338,6 @@ static const TypeInfo open_titan_types[] =3D { .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(OpenTitanState), .class_init =3D opentitan_machine_class_init, - .interfaces =3D riscv32_machine_interfaces, } }; =20 diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c index 835b1f879b7..9fd7856dc24 100644 --- a/hw/riscv/shakti_c.c +++ b/hw/riscv/shakti_c.c @@ -98,7 +98,6 @@ static const TypeInfo shakti_c_machine_type_info =3D { .class_init =3D shakti_c_machine_class_init, .instance_init =3D shakti_c_machine_instance_init, .instance_size =3D sizeof(ShaktiCMachineState), - .interfaces =3D riscv64_machine_interfaces, }; =20 static void shakti_c_machine_type_info_register(void) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 71925583bd9..ede7cb52f00 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -168,7 +168,6 @@ static const TypeInfo sifive_e_machine_typeinfo =3D { .class_init =3D sifive_e_machine_class_init, .instance_init =3D sifive_e_machine_instance_init, .instance_size =3D sizeof(SiFiveEState), - .interfaces =3D riscv32_64_machine_interfaces, }; =20 static void sifive_e_machine_init_register_types(void) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 57a57c96e16..08687cfc363 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -680,7 +680,6 @@ static const TypeInfo sifive_u_machine_typeinfo =3D { .class_init =3D sifive_u_machine_class_init, .instance_init =3D sifive_u_machine_instance_init, .instance_size =3D sizeof(SiFiveUState), - .interfaces =3D riscv32_64_machine_interfaces, }; =20 static void sifive_u_machine_init_register_types(void) diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 630b65f5697..3786de4b0b7 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -292,7 +292,6 @@ static const TypeInfo spike_machine_typeinfo =3D { .class_init =3D spike_machine_class_init, .instance_init =3D spike_machine_instance_init, .instance_size =3D sizeof(SpikeState), - .interfaces =3D riscv32_64_machine_interfaces, }; =20 static void spike_machine_init_register_types(void) diff --git a/hw/riscv/tt_atlantis.c b/hw/riscv/tt_atlantis.c index d808bcc11c3..5e155726abf 100644 --- a/hw/riscv/tt_atlantis.c +++ b/hw/riscv/tt_atlantis.c @@ -609,7 +609,6 @@ static const TypeInfo tt_atlantis_types[] =3D { .parent =3D TYPE_MACHINE, .class_init =3D tt_atlantis_machine_class_init, .instance_size =3D sizeof(TTAtlantisState), - .interfaces =3D riscv64_machine_interfaces, }, }; =20 diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c index 384624d69ad..e02624b62b4 100644 --- a/hw/riscv/xiangshan_kmh.c +++ b/hw/riscv/xiangshan_kmh.c @@ -216,7 +216,6 @@ static const TypeInfo xiangshan_kmh_machine_info =3D { .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(XiangshanKmhState), .class_init =3D xiangshan_kmh_machine_class_init, - .interfaces =3D riscv64_machine_interfaces, }; =20 static void xiangshan_kmh_machine_register_types(void) diff --git a/target/riscv/machine.c b/target/riscv/machine.c index 59676c94470..22a918cec95 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -580,15 +580,3 @@ const VMStateDescription vmstate_riscv_cpu =3D { NULL } }; - -const InterfaceInfo riscv32_machine_interfaces[] =3D { - { } -}; - -const InterfaceInfo riscv64_machine_interfaces[] =3D { - { } -}; - -const InterfaceInfo riscv32_64_machine_interfaces[] =3D { - { } -}; --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432340; cv=none; d=zohomail.com; s=zohoarc; b=DNvUWiwE0y4+4DeiHwutVZuL8Rr+P5Rp6Tw76udr6tYce1PMLdoy0YlkxAZ5bYQezuLNe5VDEsIvX8hYeEAKMqoj3uriE5D7whJjRf+1YH14U8OIFlJCqJm2d3lb7l6IBHnBhVAFxHlc4eYjpzbcWzQkO5lx0pLBYNexuBeJSJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432340; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Dj3OXid++Iqy/cyluFGTJnkN7KIeTKozIJoG2tmGEKk=; b=ghr7mKy1bSUap+pJDdaVP8KPR9gQPBwDP0fj5FScFpRLZJFi5RhQUfX7CgsJ+vvNKmk6xk+/jnFzdhg3W8WPeAtjnQofGNhdV2PXP5D8V0DGgBMUb68JSgOda5CZgfTH/ANuxGquBrpx/0bop3cOgb2skm0wLu/UKvq4lGgeb5w= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432340126474.20499458800975; Thu, 3 Sep 2026 03:45:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24wj-0003he-OP; Thu, 03 Sep 2026 06:45:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wh-0003Wz-Sf for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:27 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wg-0007Pl-3m for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:27 -0400 Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHDQa212469 for ; Thu, 3 Sep 2026 10:45:24 GMT Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf1pyhg64-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:45:24 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-92e52306621so322965185a.1 for ; Thu, 03 Sep 2026 03:45:24 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448eeabbfsm12286085f8f.31.2026.09.03.03.45.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:45:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Dj3OXid++Iqy/cyluFGTJnkN7KIeTKozIJoG2tmGEKk=; b=ZP0ZMZ+aVhKP0aG5 Fk/iSNO1ut+UW/w294cOQLvJLdOEiCtxs1Fm9/8CH0VsjCuRVuvuEDJg65rWzHvZ fAHay99uU5Il0JYoZKKqdztnxwSXztJrZDFJ2QttvSQgnnByfNc99Cp65GsezS2x 0pyXlZZl81yaDUvEmVOMLdifPs3VA5F7v/x0y3OZD3D1FyXcJ1xQ1P+2VCI6aomd 0m2EHIlVv8G4XGjxoJDK4PJbB/yoYQUQq+MPgnvb+yk1ts3Q73KFp6DWFGAOVFSb 9ecoVtYIE6J4/c/oZ6laTmFDGkGezXV0gAA1mwFOFSNoeIX8spUxMhEiLt2Wf7zP iApGyQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432323; x=1789037123; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Dj3OXid++Iqy/cyluFGTJnkN7KIeTKozIJoG2tmGEKk=; b=aBp0sxwNB+TNCh8VAaRNlcNDIpdSVZiV+I87kVdvfAk6FqAwk538LCfAxDWhcxVQdu 1wWWfGoaKAOuWrGPeDvWBcqXvxC4og4yIM0pQSZ9oj/VWH0MNKmCy57FCJK0+r/Eh8wZ vFuTnK9gi7RkPlZ0PHLTH51xQ41/vXUq0dDYlzdsLrgsCTedOsM95QLHCGPn/a1/e04B zzHWELOERYDENEzPg9D/qBMRXa3qtf+PME9ahQvlDTwK/IQsA/z8Gf1juEHSeq9EtNCh dK9DXmGbDT1z9bJA/LvdQC/YgbsMorFA+9RL+GZXf33VA69vPevw28XqzJPCAvx5GMtg Og2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432323; x=1789037123; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Dj3OXid++Iqy/cyluFGTJnkN7KIeTKozIJoG2tmGEKk=; b=TwIVv+FB6VacKxYZgVQfPDQYNYnp9GwalvHFYyRpatEHhuqvBCcMSdJvX0TcBySie5 T5ZHtM6b/eX8sG9Monb6SPy7bteJvEqyDDN52KiE/D7Slw6+kF8ed/pnhwDE9WxDeSZH AsuCj2jTF3waDYUTuPvuwi0QIzD+HkwHOEzHj+CO/0KtNmrH9Zd3DeGs2vyU7GFVWPMk 3xlG5Q831inc+yUMx81UH47UYfB8zIKR5ZYW4W4owg92z2HiueSY8p1Cae230qwqPQwu yN2Z/bCEoo/YaH0DLsUI90A1OQ6bl60E57GP40h6ilEEPKkiikFIHDM3FwmSv8vYCPzX Hdjg== X-Gm-Message-State: AFuF++npI97j0QL/DayAfAWJPHxIhiHHPxm75ufY5WkFD3sp8WH6tyCn 7Cq6ld7kTSJ4lZSWPZ2QIaU+MZm07WYDwSzZRYkmvvAPh4r80MBs8KVrN5i+j1hD2cqn/SEV+MO D4+vrnekj2MwDnwoBzQ0khbFPWx3J7lWU6ff13AOHJWNESKO5cNXMWvwDjPexgsF5MA== X-Gm-Gg: AYBFou3LrR766P2bhfBKNcCqX7RPY2whVtBlNbD7jf4gf7QvSvEuRO3KhHCvxw/tmi1 eMKp27TiWRUkP2cPwnzT4ogm70VlRR+UXLoVnELZ+YvB6u1e6lj3v6SXxmgWA5zqQXRdEjFFLnU bjhIHcHoir5QYRJkkp8E+e29uabJsUWZ0CavOGkz4Wvp1t68IzkCAqu6cZivoXRzro5lvfmTtcr Xj9xyZWhPiFYMITddxlxQqpVetnVaGKVXXy5sRlabSwDN8H4uCV/PWVtpZTFWlDORaN5kPbv5pZ Enx2AiDeYmEWdauADlYgXYvOX4DtSP9I9H0nNYjlHdvN8JM17FRbtcJ8XYDvrLyi3ZgmHj38ucN ihSZafK6y+jo2ZPkk1nspC6TB/h/llSdLppnFbyCo X-Received: by 2002:a05:620a:8084:b0:939:191c:cac7 with SMTP id af79cd13be357-93972cbb0c3mr304146185a.13.1788432323536; Thu, 03 Sep 2026 03:45:23 -0700 (PDT) X-Received: by 2002:a05:620a:8084:b0:939:191c:cac7 with SMTP id af79cd13be357-93972cbb0c3mr304143485a.13.1788432323108; Thu, 03 Sep 2026 03:45:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 46/51] hw/riscv: remove DEFINE_MACHINE_{RISCV32,RISCV64} Date: Thu, 3 Sep 2026 12:39:30 +0200 Message-ID: <20260903103936.62355-47-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX7LoRAeRMFOjl nQAPA0+oPyM1r1KFNiOs6ryMW4bN8gu1bQuEdTJhcLQIP48hW9U2B6hjVP7qYqOCDpi369fnMpv h3FvcGwQSm2CZrNUEdlh2UV9tLLaaszpwnLGlFf7XaOxGJ03EVh+A+ju4q0Vq4UwM4M/QkjRrJW GEODt+IrWGre/+V+sPWGJA8Gf3AaF9Dc5gWhmJd6yR+3PRn95IUONhqdQh1/lfLfiVTHcFkBmSX JIuCJwV3y+tHZNAGfJ2dx2GgCPcmnHiURmSahye5akyVPbuWBuiwQAsNoa1ptMAGUyGZOfv5wSb h2oIG2DfiK6tCTQeGcY4kjg4mNpy3CjlIha0nWKo5dxDtOE0eNQ1LEL6osZbHEksOBh/k+F2Elt Df27CDYCCkFdGSQgc0lMay1k1R5isNAQ4hX5yhOPClCzKYfKL8hJnbStHmKi+UOsld/WKehlm5z RkJOiPKdWvpJeIFf8Tw== X-Proofpoint-ORIG-GUID: ztBI3xiaZPn6WioGu0GSGjy3eKyRQbni X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXxEMbjfLwDw1/ vDMAgjXO4We8m1o1AK7nHLNYcPmyAgyfdBc1T80rsdG0PtWcxSfnRi1YXZb8vcK5DBLiJH510h3 qur+TP0bJ3DLZxCw7dRwS6w6TgbpDaM= X-Proofpoint-GUID: ztBI3xiaZPn6WioGu0GSGjy3eKyRQbni X-Authority-Analysis: v=2.4 cv=DMO/JSNb c=1 sm=1 tr=0 ts=6a994fc4 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=r4SdTxa7mPobecY91-8A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 bulkscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 suspectscore=0 adultscore=0 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432341163158500 From: Pierrick Bouvier Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260901202043.26532-14-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/riscv/machines-qom.h | 17 ----------------- hw/riscv/boston-aia.c | 2 +- hw/riscv/microblaze-v-generic.c | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/include/hw/riscv/machines-qom.h b/include/hw/riscv/machines-qo= m.h index e5f45b32e69..79d212eeb7d 100644 --- a/include/hw/riscv/machines-qom.h +++ b/include/hw/riscv/machines-qom.h @@ -11,21 +11,4 @@ =20 #include "hw/core/boards.h" =20 -/* - * Helper macros for defining machines available in qemu-system-riscv32, - * qemu-system-riscv64, or both. - */ - -#define DEFINE_MACHINE_RISCV32(namestr, machine_initfn) \ - DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - NULL) - -#define DEFINE_MACHINE_RISCV64(namestr, machine_initfn) \ - DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - NULL) - -#define DEFINE_MACHINE_RISCV32_64(namestr, machine_initfn) \ - DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - NULL) - #endif diff --git a/hw/riscv/boston-aia.c b/hw/riscv/boston-aia.c index 965d0f5699e..30eff10bc5f 100644 --- a/hw/riscv/boston-aia.c +++ b/hw/riscv/boston-aia.c @@ -474,4 +474,4 @@ static void boston_mach_class_init(MachineClass *mc) mc->default_cpu_type =3D TYPE_RISCV_CPU_MIPS_P8700; } =20 -DEFINE_MACHINE_RISCV64("boston-aia", boston_mach_class_init) +DEFINE_MACHINE("boston-aia", boston_mach_class_init) diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generi= c.c index d33ac39a68c..503e8e08992 100644 --- a/hw/riscv/microblaze-v-generic.c +++ b/hw/riscv/microblaze-v-generic.c @@ -187,4 +187,4 @@ static void mb_v_generic_machine_init(MachineClass *mc) mc->default_cpus =3D 1; } =20 -DEFINE_MACHINE_RISCV32_64("amd-microblaze-v-generic", mb_v_generic_machine= _init) +DEFINE_MACHINE("amd-microblaze-v-generic", mb_v_generic_machine_init) --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432349; cv=none; d=zohomail.com; s=zohoarc; b=Md837n/RAXP87LNVkHkGLfBwDlRdqyZyAJ2kN0ECZWKJLShybO3gL4xQ8NxKFxjAjm0jPTbAo1wI2YEAB2oF6kU9LRrhdw7xytxE4BA0RsQnwGAps05sA8+PaWGtMH7mcCk7/GOnRFqQjLUGw0vJbBD35Dw2UEQJMv2RWVzrNdM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432349; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=u2uPEjrhazV94I7bm/tFzqgbgp+DLQTVhbdTjxOavog=; b=D3VcIkFA8NE6fpaGfhac9DAaChRp8H5tRJDyU60pdCKAp1z4iMCHBnIr1zbZohyBbmYeTRsjipVdIzsxvqoS/riTf7xqL6v5fUkWdZqQ2h7aYAVnL6Lhhtnp2Hd5JDhRyZ50iGT4C2y8R1T/g+vNbTj9BV25d5Bn2XdVVhclIbY= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432349720980.7718796183239; Thu, 3 Sep 2026 03:45:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24ws-000437-Bp; Thu, 03 Sep 2026 06:45:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wq-0003w3-IJ for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:36 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wo-0007Qt-AS for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:36 -0400 Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AH5lk935074 for ; Thu, 3 Sep 2026 10:45:33 GMT Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gerdnbvpx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:45:32 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-93917f4ccb4so306989585a.0 for ; Thu, 03 Sep 2026 03:45:32 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ce5936a5esm51782465e9.3.2026.09.03.03.45.29 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:45:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= u2uPEjrhazV94I7bm/tFzqgbgp+DLQTVhbdTjxOavog=; b=SiFH0UzXMpPx0NDf c3rCPTkajj8MnPJ6/G0MCE8CmxUhBkOSWjK1K+DDGXvBGJrP2KdFDOoUHDhWKFL+ 5zrE/GePPMzqVDL+3iMEMRq1Wfc/vBVs4nzn8Q9ZkWCntlqd62JLoYeGN3A4uP8F qF3hg0UkKxh34zodHMweJaWBRmG1Yrsdwe19uA+Fa+I/OzEgjbLw/wtT0BcSn8Ex JApH/XG/9qTrQQ2gFspqlIzIENopZwmtq+1wGrrVqnZKaygQLl2qEg0yQdPRechK tRbU5voAoI0FmbxNoSXQMxfdFo1k36MG67noWnYs9O9umxK8RjnD3fJB2UBobJt5 Ce6uwQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432332; x=1789037132; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=u2uPEjrhazV94I7bm/tFzqgbgp+DLQTVhbdTjxOavog=; b=RCXJe3nnsekHknqFKuBZIXs5wBQSt//juNW+TWxcPnoHRJJ2gNoyj4jCgWBvkERrqe wdElgX60Nes/76lrVuMABk+zU+Rf110XbN75ap3zBI88fq5Waw25qb8yO++YEne/3qEo TqBcZFwu70tzKKKktxdJC/EL+S+rfcaCjUmvpceCSc48gCp567+LpdMDjPkZqPwDRuxW riDN09ud3LBcScRg50jpcmOAAnxfebJ0ajs6mA/uSH3Hn2mVzXySEIX8hEH/yATc12Ae FclhClXg978GsrH3E/fj4/iN7iHrNtquXcaILn+6tdS4OXdcWAgwYDf2rq0tPTyjghkr GWpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432332; x=1789037132; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=u2uPEjrhazV94I7bm/tFzqgbgp+DLQTVhbdTjxOavog=; b=GkagLrSEHN17Qtu38a5Ix5nn+KeuYKY34p8NyQAOlaV5j36UGlD+DiNG51Zx7fp7dT Q+g/70B3zMjGUtcPCropB0SjAlMg27ybQqfOhn5APzwfVfr5mrIeSYq52RObzI7xmvVi BcsFhQz13WS2DgxMGyGzXXFVNNgVNvtKiJeqYRcqc1zNI3GpXmdb5FTEb9HZuGqB5Acp zGZKG1Lc+3Bw5hzFyE86ui63/bZ5Gkb/gOTJiL0yGsvJwv8DpsiZrHOL8COrQS4pgUEB 2mB4F2rnLnndDnwaDnxY5hfMvRB0IcbcM2hHj4j4Fo4FRLZg5/apCM37rsw0Kuq2v4EK ogow== X-Gm-Message-State: AFuF++mX2b9Mt5JNFUBVtrpZaZHtdu/JK3f2exjkGZ5SeLD6Lmr+IKPn zymtf9qoEBo52YxloP3zKyO0nDTlyMCdCqthtD4O2Ccxv2Pk6yAnO8Um+Or0qZI2VmW4NweXc3u iXnv/UgNC9YZn/Rkx8pl7qOBzlTWt8csFHaiyzb7ggAx+4X/QEh0CsRrQ8U2AL7N33g== X-Gm-Gg: AYBFou2+TCh4lWOx4STr+eNajw2LXlL5T2eNajMTBMRZrb3aal3mg5PJq5CvjU1kdAU eZ/YV2zqyGAmc9lPHikMuDTvKG3yDeCxnPcA+I8hRE1vbk3N8oVD9gZZu5xswUn6r/Q6WErjaBc IlxIHyu8NQSziAiHYN4p2R0IS2QOVekZUFbnQiipVf5jrffsCJ6IADaFSfXTSVen0ICCf0T1CZ2 Omtrr1/AAGkziHItnK8pM0atxjZ2xIvPA0PyRom5V64Zzolc6Ruvn9xFNnaslif/UXK3LpjY9SM X1UZoUTIvvZqlHsdLUf2MhBwb4G2mc3xpgTSPNi6U8VSLGlP7WIUibcX5B9Hdr2eghmSNGcsZXX XDh9aF1NMeFNinx/LJA+6uDXQPrZ8aNXieUCiYUoV X-Received: by 2002:a05:620a:70dc:b0:939:4890:98e1 with SMTP id af79cd13be357-93961022e70mr1091869385a.42.1788432331736; Thu, 03 Sep 2026 03:45:31 -0700 (PDT) X-Received: by 2002:a05:620a:70dc:b0:939:4890:98e1 with SMTP id af79cd13be357-93961022e70mr1091866085a.42.1788432331223; Thu, 03 Sep 2026 03:45:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 47/51] hw/riscv: remove machines-qom.h Date: Thu, 3 Sep 2026 12:39:31 +0200 Message-ID: <20260903103936.62355-48-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=YcmNIQRf c=1 sm=1 tr=0 ts=6a994fcc cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=KzGqfiNxp7Nhv_o5qEAA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX1S0MCat88PCe wDT3qrOzOMA5kcTdytd53uDpEAuRaZe970Mr4TZtFnfA7XBGktsVLyFRs3zHYltWGWXEWRdTrcq Y7g3KdPcefC+uoAXyaU5tXq8IpcmQyw= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXxdcwK4BblxT4 0WDzzhWhg+mz2Rc1iaxz672ZcIAWiGGZxrEC2Z4QlESIWousOb+zSLT1ssPh4JPAv+xH+TX257/ qGPnIAs8ciYCxz4RviwP3zwKXu76a8mBPrYe6n7qTiIZRJMtYAHjSnk0ote4/KhrUWwJjTPbjqU mrpiGR6t+AoteXN5tVLSgpGBeU/jmqnYEr3mKJj1lQ7QZdCdKVYCZIhm9Z0u33Usm857G3t9Qtx dgmDgMFo+i+Bz/VxMY3VJYiRt+wv2I0xHrG/V6SnDPihUBqz/c3yONmDD2OIBKGTSIS2TBOnyfR nkTU89ngzC0lskt1mLWO5Pu1Wuo7RF1TWlCYN1AcP6GQdDaYhh5V2rXVV+lVv9y0QlwtAx4diu1 FNxSuuEXtkEYV1If+0Y+TsCSZXs+nDXRi06WRFwGK6VeAU85PDHGfMmP3xQsO3N9p8/3FA9MwL6 eHnB9lXZezfgeXdxvhg== X-Proofpoint-GUID: USxi_l_dyfArS444lLUgmWJja_sS9WMO X-Proofpoint-ORIG-GUID: USxi_l_dyfArS444lLUgmWJja_sS9WMO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 phishscore=0 impostorscore=0 spamscore=0 suspectscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432351293158500 From: Pierrick Bouvier Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260901202043.26532-15-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/riscv/machines-qom.h | 14 -------------- configs/targets/riscv32-softmmu.c | 1 - configs/targets/riscv64-softmmu.c | 1 - hw/core/null-machine.c | 1 - hw/riscv/boston-aia.c | 1 - hw/riscv/k230.c | 1 - hw/riscv/microblaze-v-generic.c | 1 - hw/riscv/microchip_pfsoc.c | 1 - hw/riscv/opentitan.c | 1 - hw/riscv/shakti_c.c | 1 - hw/riscv/sifive_e.c | 1 - hw/riscv/sifive_u.c | 1 - hw/riscv/spike.c | 1 - hw/riscv/tt_atlantis.c | 1 - hw/riscv/virt.c | 1 - hw/riscv/xiangshan_kmh.c | 1 - target-info-qom.c | 1 - target/riscv/machine.c | 1 - 18 files changed, 31 deletions(-) delete mode 100644 include/hw/riscv/machines-qom.h diff --git a/include/hw/riscv/machines-qom.h b/include/hw/riscv/machines-qo= m.h deleted file mode 100644 index 79d212eeb7d..00000000000 --- a/include/hw/riscv/machines-qom.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * QOM type definitions for riscv32 / riscv64 machines - * - * Copyright (c) rev.ng Labs Srl. - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#ifndef HW_RISCV_MACHINES_QOM_H -#define HW_RISCV_MACHINES_QOM_H - -#include "hw/core/boards.h" - -#endif diff --git a/configs/targets/riscv32-softmmu.c b/configs/targets/riscv32-so= ftmmu.c index c1d94679c7e..0829ab84de5 100644 --- a/configs/targets/riscv32-softmmu.c +++ b/configs/targets/riscv32-softmmu.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qemu/target-info-impl.h" #include "qemu/target-info-init.h" -#include "hw/riscv/machines-qom.h" #include "target/riscv/cpu-qom.h" #include "target/riscv/cpu-param.h" =20 diff --git a/configs/targets/riscv64-softmmu.c b/configs/targets/riscv64-so= ftmmu.c index f648a5c8944..553bd1f75fe 100644 --- a/configs/targets/riscv64-softmmu.c +++ b/configs/targets/riscv64-softmmu.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qemu/target-info-impl.h" #include "qemu/target-info-init.h" -#include "hw/riscv/machines-qom.h" #include "target/riscv/cpu-qom.h" #include "target/riscv/cpu-param.h" =20 diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 2f008c4a702..60254913019 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -16,7 +16,6 @@ #include "hw/core/boards.h" #include "system/address-spaces.h" #include "hw/core/cpu.h" -#include "hw/riscv/machines-qom.h" =20 static void machine_none_init(MachineState *mch) { diff --git a/hw/riscv/boston-aia.c b/hw/riscv/boston-aia.c index 30eff10bc5f..b90da096ea8 100644 --- a/hw/riscv/boston-aia.c +++ b/hw/riscv/boston-aia.c @@ -18,7 +18,6 @@ #include "hw/ide/ahci-pci.h" #include "hw/core/loader.h" #include "hw/riscv/cps.h" -#include "hw/riscv/machines-qom.h" #include "hw/pci-host/xilinx-pcie.h" #include "hw/core/qdev-properties.h" #include "qapi/error.h" diff --git a/hw/riscv/k230.c b/hw/riscv/k230.c index 72d50d369a9..34905bb1702 100644 --- a/hw/riscv/k230.c +++ b/hw/riscv/k230.c @@ -26,7 +26,6 @@ #include "hw/core/sysbus.h" #include "hw/riscv/k230.h" #include "hw/riscv/boot.h" -#include "hw/riscv/machines-qom.h" #include "hw/intc/riscv_aclint.h" #include "hw/intc/sifive_plic.h" #include "hw/char/serial-mm.h" diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generi= c.c index 503e8e08992..b0494b1ac50 100644 --- a/hw/riscv/microblaze-v-generic.c +++ b/hw/riscv/microblaze-v-generic.c @@ -25,7 +25,6 @@ #include "system/address-spaces.h" #include "hw/char/xilinx_uartlite.h" #include "hw/misc/unimp.h" -#include "hw/riscv/machines-qom.h" =20 #define LMB_BRAM_SIZE (128 * KiB) #define MEMORY_BASEADDR 0x80000000 diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index 42d4fc39734..60bb96da016 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -49,7 +49,6 @@ #include "hw/misc/unimp.h" #include "hw/riscv/boot.h" #include "hw/riscv/riscv_hart.h" -#include "hw/riscv/machines-qom.h" #include "hw/riscv/microchip_pfsoc.h" #include "hw/intc/riscv_aclint.h" #include "hw/intc/sifive_plic.h" diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c index c58d8993303..8cd660dd415 100644 --- a/hw/riscv/opentitan.c +++ b/hw/riscv/opentitan.c @@ -26,7 +26,6 @@ #include "hw/core/boards.h" #include "hw/misc/unimp.h" #include "hw/riscv/boot.h" -#include "hw/riscv/machines-qom.h" #include "qemu/units.h" #include "system/system.h" #include "system/address-spaces.h" diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c index 9fd7856dc24..a205a213324 100644 --- a/hw/riscv/shakti_c.c +++ b/hw/riscv/shakti_c.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "hw/core/boards.h" #include "hw/riscv/shakti_c.h" -#include "hw/riscv/machines-qom.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/intc/sifive_plic.h" diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index ede7cb52f00..1acfea49668 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -40,7 +40,6 @@ #include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_e.h" #include "hw/riscv/boot.h" -#include "hw/riscv/machines-qom.h" #include "hw/char/sifive_uart.h" #include "hw/intc/riscv_aclint.h" #include "hw/intc/sifive_plic.h" diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 08687cfc363..997ee91aa0e 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -51,7 +51,6 @@ #include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_u.h" #include "hw/riscv/boot.h" -#include "hw/riscv/machines-qom.h" #include "hw/riscv/fdt-common.h" #include "hw/char/sifive_uart.h" #include "hw/intc/riscv_aclint.h" diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 3786de4b0b7..e36fe996b09 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -34,7 +34,6 @@ #include "hw/riscv/boot.h" #include "hw/riscv/fdt-common.h" #include "hw/riscv/numa.h" -#include "hw/riscv/machines-qom.h" #include "hw/char/riscv_htif.h" #include "hw/intc/riscv_aclint.h" #include "chardev/char.h" diff --git a/hw/riscv/tt_atlantis.c b/hw/riscv/tt_atlantis.c index 5e155726abf..7d02868b222 100644 --- a/hw/riscv/tt_atlantis.c +++ b/hw/riscv/tt_atlantis.c @@ -20,7 +20,6 @@ =20 #include "hw/riscv/boot.h" #include "hw/riscv/fdt-common.h" -#include "hw/riscv/machines-qom.h" #include "hw/riscv/riscv_hart.h" =20 #include "hw/char/serial-mm.h" diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d2ae321a376..dd396410178 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -36,7 +36,6 @@ #include "hw/riscv/virt.h" #include "hw/riscv/boot.h" #include "hw/riscv/fdt-common.h" -#include "hw/riscv/machines-qom.h" #include "hw/riscv/numa.h" #include "kvm/kvm_riscv.h" #include "hw/firmware/smbios.h" diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c index e02624b62b4..247a0b5d1f2 100644 --- a/hw/riscv/xiangshan_kmh.c +++ b/hw/riscv/xiangshan_kmh.c @@ -41,7 +41,6 @@ #include "hw/riscv/boot.h" #include "hw/riscv/xiangshan_kmh.h" #include "hw/riscv/riscv_hart.h" -#include "hw/riscv/machines-qom.h" #include "system/system.h" =20 static const MemMapEntry xiangshan_kmh_memmap[] =3D { diff --git a/target-info-qom.c b/target-info-qom.c index f98d3d7698e..6965e4d1169 100644 --- a/target-info-qom.c +++ b/target-info-qom.c @@ -12,7 +12,6 @@ #include "qemu/target-info-impl.h" #include "qemu/target-info-init.h" #include "qemu/target-info-qom.h" -#include "hw/riscv/machines-qom.h" =20 static void target_info_qom_class_init(ObjectClass *oc, const void * data) { diff --git a/target/riscv/machine.c b/target/riscv/machine.c index 22a918cec95..c3f5a255099 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -24,7 +24,6 @@ #include "migration/cpu.h" #include "exec/icount.h" #include "target/riscv/tcg/debug.h" -#include "hw/riscv/machines-qom.h" #ifdef CONFIG_KVM #include "kvm/kvm_riscv.h" #endif --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432353; cv=none; d=zohomail.com; s=zohoarc; b=fU3iTc12CRedNTM3mHYxCuZw8gk+JW/g5O/KNSU6T3DF1PniwJRi9RP5iA+cJlcBQrt06fQDI2aLS+/LamqFyV1v+2yRZtX3zH4zB+7bNEIdEmjRi3hgK46RIKPjTDAQLaOB7J6D0TqBGOFgeRKaPwgnxfgvD4jJR/Hasu/Fdp8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432353; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=KFtuNuJQzlFXmwO25agl4qJWfBENhsuy5w7rq2nSqZU=; b=GUNA2ZXiG+0fUtZWwTLW7K37WUsklyB2aqfEF4n8/WmdX8aWiLwwi08l7osO1d9t3Uw572OettbDUvrb1qDeTvUv4serP5XqDB1Gcl4zac9wrC2e/epe0Ajn+I+J9kisLPvTb5+bU3EzzJTPjEKaI7yzS7l8K6MLwH9GLM4zx4M= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432353192186.81240789925596; Thu, 3 Sep 2026 03:45:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24wx-0004Dh-Ns; Thu, 03 Sep 2026 06:45:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24ww-0004D1-FL for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:42 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24wu-0007Rd-UX for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:42 -0400 Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHBjt1328202 for ; Thu, 3 Sep 2026 10:45:39 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4genrnmmft-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:45:39 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-930b571432fso150039385a.0 for ; Thu, 03 Sep 2026 03:45:39 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5f914bsm74282785e9.3.2026.09.03.03.45.37 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:45:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= KFtuNuJQzlFXmwO25agl4qJWfBENhsuy5w7rq2nSqZU=; b=FlEbgOSVdeF5NDdT drFvyKfzC3hAF4PcTtqeJvqUnZTxNl+swmYF29Is1fND0NyFRMU1dfwk4riCqqjb vhu4qn7/SiOWNghOgj+4FPEBSf7VoezTjZDkgpU3KkDmIgtYAKl6jFprp7T99Ak7 9RUJ7KN1kPkQXNZY6CzXbXE5bzzG6sAkr5Gn4Q4282FQ3HQUiFZzWDJ6Gb0O6VI1 AXkdJrZaihzfDsbZhQw8LXs2LWo7uVH9FoGIjNFyn8GNKBUdfHzyMSe1m2BB2YK8 DdvYK4JqEuyTUCtz+c1IPGOnBf8J9Agt+j39GjQWBZUzYVNdqZZgNROGd2fCEGQE ZLKabQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432338; x=1789037138; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=KFtuNuJQzlFXmwO25agl4qJWfBENhsuy5w7rq2nSqZU=; b=Ryh4pvv9YDY+JaHdGWQa+Cgm0xqg+RBiHJo66jEOKwzkS8u68ttRBuJjQmy4ylzqL5 COIPkfxlemCVx6DaltncQuABYVLPDVCK371G4dow6Sc7Z/ekxbBhcEDjb2eXJsFgPWAG HFOsxk9KKfUNz2k4rc0jT4ufrO7Xw/NhL3V4IiCGNE9mpaBTBMhkvYRYl80p1xxymLcl 0L1dN5aN+dU983zpJdfxGtXNdj0SMErFlqDKzu9xQvTNbmTV48YgsySX+wKYjb3dCFTv e0woU3xXRng/M2U7moy3ndEVO/2ZmsRWIGuLCr18a/x9o6qTloJiqrvyqWa+VZjj3Pg7 YgKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432338; x=1789037138; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=KFtuNuJQzlFXmwO25agl4qJWfBENhsuy5w7rq2nSqZU=; b=KZ/zuNG+IefMm8igkNfDevImxiWlStGrDcSJE7kgOlCth+fbXx6bF/IA21sa42tRPV hE/1iO0+o3+AL6jSiRK/JWdYozw92acQ1neB+JUkmsg1L4ryKOKbcLgcTgrWP+JMAmFH S2SOBynRUtvOg73JC3FiwDgwCSmzsbLuVqeJrBs24IB+R4qnzG6SA9Xgx4X6U/aiMLo0 oC2VU6sGAdH02bD+mnUZYU1SCzrYYxGqz0bbDGW5jnn012rtuiSdcqCSFIUcxmBotKhY mdYDH6YhU8Vnh6ukMP7oVVctH1oNpwahVOXyGlWkubb30+9TqWP7AsOrR3zjUaGLbYnF UK7Q== X-Gm-Message-State: AFuF++nYYaXFrm0TmVDBGpDpdX744XetDi7FeV80ZN7TFTIrklrC0SE2 Gyfss1eMSGYlky98ZyTYek5WlHlcFVTXAyEyVYrBpCnXF4eK2mpeKf0ccuNSgK+beIski0e1wNM PlkHu8dkIS18YSfqGbuKD6HkBOovI+yaKz5JMnNVTTIcah+Yi4TDAyT6A9iqU3njEZQ== X-Gm-Gg: AYBFou0Z08E5mih1eeWRC1Dhs+bslneUkaU1jsYU9nG+9zEOKEoYo40Jo+JBXI/bg5S IlLkNV6XJUW0uM7/hj3V5Z0dCAzHV8c369CkXOn6ngZkFTnCnkg1ZXDWgGIrfNRdn1X5uD7sv6i F7HGEQxNpiEogP7/kYeJm7bP560wndsVEp6xlh6e+qBjEiKd71k38NLektOgQadTZfN6K+E8sRs PxLX0MeHrCuZ4RKUrzeRCYN8wCKi1q/rpXJI9kgOQJnPSzsyvqjOl3vlZDtgmvFk3Lpo28PzW/X 9CdAQXXbpmwaIAs2yx0wUWml1k6KrgaNmNTaJgxUX4Pk6noAgcUZMX4iKKmsrqTMm9MItu+JzFe w1Nn91Zz1sxGwqQwNZF81ScmRCY6PtYSMuX9VWigY X-Received: by 2002:a05:620a:4621:b0:939:72cb:baf2 with SMTP id af79cd13be357-93972cbbc95mr193248185a.41.1788432338375; Thu, 03 Sep 2026 03:45:38 -0700 (PDT) X-Received: by 2002:a05:620a:4621:b0:939:72cb:baf2 with SMTP id af79cd13be357-93972cbbc95mr193245585a.41.1788432337936; Thu, 03 Sep 2026 03:45:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 48/51] rustfmt: disable wrap_comments Date: Thu, 3 Sep 2026 12:39:32 +0200 Message-ID: <20260903103936.62355-49-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: gT1dBPxqlvd49au_YMryMzbhu8CCJ6PV X-Proofpoint-ORIG-GUID: gT1dBPxqlvd49au_YMryMzbhu8CCJ6PV X-Authority-Analysis: v=2.4 cv=YKuvDxGx c=1 sm=1 tr=0 ts=6a994fd3 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=20KFwNOVAAAA:8 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=uawEZQS_clvRjjTe5l0A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX8aNr+vY86i79 xOhdRAkOZBOCMQH1v6+wB03TV9a86lPu14BoPZ7KxdPDMSHaAGnkqugeH022xmgRg++VyvMhaGe t2bv4rMfaZkMxzre+caKgVN2PBMwDrfN05D1ggmzsonaB+9TmaUh1XtvFy6LEZjpu0O9xdDpYmF +qHAfTWZQWtyOgNQad/LSTymOGNYSGYs5tqkZEsk0/YJcrPuoRPetjECtx6upBeQhaFIMdraoLy y+/HzMBcQVGpjd/lLXvzDhH9pnsdBfeVMwm5xeE9w23bJl070XkgftDr6KSCsGuX1aF6wHpGueQ bI7mkvZaorZyN2szwmJclXfmOG/aa4tl312rlSrNNT8u4I7Dd9gfBJbb2e+oU0xo8qJwg0tn++3 xiPG3HU7pZDSX8N6ZJKFuN7qNutLyRyZQurhqzwqFkwJI+h90GEETxbqZdIl7Bnz5b/t9JCGr+D pTREDpJLSxMd5Wk5oZQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX0s71a3oWjCmw QLCKBeAhGmPAd/h67CFElnb+DSzjZw6NWpFmej5AvzigzVyklx6pHHBG9qqk5bqlCDuM/G83YfR /aWyXVOvAOwaeNGiyB4WNgQtwoRR5A0= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 adultscore=0 impostorscore=0 malwarescore=0 phishscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432355470158500 From: Paolo Bonzini This was in practice not enabled until now, and now that it is the results are not great. Disable it so that the CI job check-rust-tools-nightly does not fail gratuitously. Reported-by: Peter Maydell Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260902083624.419157-1-pbonzini@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- rust/rustfmt.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/rustfmt.toml b/rust/rustfmt.toml index ebecb99fe09..a7d610bce21 100644 --- a/rust/rustfmt.toml +++ b/rust/rustfmt.toml @@ -4,4 +4,4 @@ format_code_in_doc_comments =3D true format_strings =3D true imports_granularity =3D "Crate" group_imports =3D "StdExternalCrate" -wrap_comments =3D true +wrap_comments =3D false --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432360; cv=none; d=zohomail.com; s=zohoarc; b=IELq3WtgWEJdWHedUNlxNCLoczVqC8iw8gZgHnhCwy7bpQ+IYVkPzrssZgaxv92nJo9gI5rAhceMLm3qHgSNWTafDCBAhHZw1Em8X74NLV3jmCNXIkt/m/F91OFo6T2z+WXJQzRVPGdw8TjOZsdyblmJJ68PXmkNPNx3naNfyoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432360; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=BTy2XS91RzmD8oGboMvqcXBcmA2Uon8RInC8cmD3rjo=; b=UHl3fTHcXC6BF6JA8YlDim9bAVkmhDJDR5UM89yf4lNBuSrfu6Cbdzx43AlkO1sTuS0l9iWzBgYWJcJBAAf8Fgxqx9lwcX55jcm+xKFC3LcnckoGx1pSYnbH2dtpIuiUmYkJQBxLEHeLddXI1w8ZNoL3QaQHnQiJ33F65gCk1/g= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432360390898.2298734198433; Thu, 3 Sep 2026 03:46:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24x7-0004dA-Dy; Thu, 03 Sep 2026 06:45:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24x4-0004XE-RI for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:50 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24x3-0007WK-39 for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:50 -0400 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHE3g440333 for ; Thu, 3 Sep 2026 10:45:48 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf6p706ex-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:45:47 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-939062ecda9so326263185a.1 for ; Thu, 03 Sep 2026 03:45:47 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e80388sm14545394f8f.14.2026.09.03.03.45.43 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= BTy2XS91RzmD8oGboMvqcXBcmA2Uon8RInC8cmD3rjo=; b=PFqULDYi8ydWtBhN Edy+hm31djS6NL3gxlD/K6MV5mI7BznNzyeGCae/GJN5B09N/QOn8UvpOosE+Ze4 ULPcteMt71InB1xJja7B/stjRs7FPn97b7EFS3O469wJcL46c9g+WDVMGDJuBe2X uqXTpvzatGhOvr84uZxqtNDQ5sak+iePVCT2KPji7jE4Jp/8/KefXYTvgHGjXN6W byXKxJTfW7cqyEEfT4x26SimO0pBCwcQ7T7Cyhb0S8l3LsW9VLR6Xaewp4bvXliv 4h0WDBIIApdg029T72vU5B/Z/7F/OPtZsS1axkuSbSzCOAZMQj4lDGb7kWXPqoUt zrBEjw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432347; x=1789037147; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=BTy2XS91RzmD8oGboMvqcXBcmA2Uon8RInC8cmD3rjo=; b=jBRqmXcW//5pIVbWvuFzi5FYGd3gJoMVRs+qEQ8qcPCiTol2QqBA6pxk4i4tN28QvJ RJy7LKHq2tINeYCuq3Ee5JXNcu0nEbMv+TtYp2kHRRu55/6BDrfB9qihQ+s3AMjbN1ru xE1O0mrCxw/vWAvY81byVm5l3aXcpipeVYSupLbj9WXP1ik2Cl4W3p2rDdyPe8br5Z1h 58B3LxIsmFHA3xTTwDzoqXVUD8bGo1HZAGG0taqUpRWCHC3LJAcWmajllvJDoiM5cRtA dqFDxvr0J1YVtLMBTBexjIKa9+VZXYsvaKKRxIge7U0Fia4J3t+g5xx1GPl2Q0OdBnsK Qe0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432347; x=1789037147; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=BTy2XS91RzmD8oGboMvqcXBcmA2Uon8RInC8cmD3rjo=; b=lUkI/6kV0d9pEATi21cTlO0mkM4J+wjvoyPSdk/8aISP5PS0gNru2lZ26VJI69g9Mg 3QAq9VCOIJ7zSPdQsJIFGE/xwp6v96RAVOpWuaABV/nuuqStENA/nnLEITmG8AWPm5ap thtYZqChW2UZhfnAN9JRGWHoNHkdckDDNUlsxuavY+ogXn9pDUfeZ5+ehHgwmgyTbpeC KxdShFjxNWAwpMYvompND7uxc970Lvp15Ooh+dhw3vG2d0zLUVReeZy9Y7FbATley9pM iCxAP+YkCChY+MyyXqq5XJJHTTPHmkRIsa5lR/CA5pXQWezVXf78+pHEh5MCj9GQDiCK eSqw== X-Gm-Message-State: AFuF++kjcBSzPnGTvpb5TauGTpItP93La66B5WEZcz3pAGrtdQKdj2SQ hkVgXCBr7Rl3zWmjkggKculBf12x/JdShryB0q+vcWf+maIAMYGUlsiWMvX125K0TWRf0HNxRvJ jjCNzwAwtb83BVhMmSnx4Yx3X1uYhP3eoouCE4Ag+gjSFAw9e5MO2yttUFiAEmx3fbg== X-Gm-Gg: AYBFou2JQ7c7MEofI0lghUCImcnDvpwqqJy4F+sgLlmJr93BBz20ou+yA5/KQon9GYs Iw3sOb6qitprt5MUD7krxNpYlSg1eQa0fw0S+WpmTnhZ5IH094uFlEMnMV/wh7HRf6Uo6AYgDUn XBTjO6JPfV8PkFDsos8IbiNZMj5pEFNFNHiDMUTQt1DV9WsxBSPaoontY/Nrva71qxckPFAZrCf JjD5YwYIN6luRB4N5tz8bg9QW8CsAIvw7LDHvRZhcsrBQlHtn1CruJJ9fTKONAeaKXVCt2ZulFF c08VQ4FonKXvbdFjaw1NFEchbfCplwFuCVNgDSoBHnT7Qc5cWjzFx6Ccs0ZaH0jwAZ/nNwzs0+u 9lhjKMZJIdkENchl3nMACiti4cBm+OGzPOKy94Y93 X-Received: by 2002:a05:620a:5bd3:b0:939:6de7:a623 with SMTP id af79cd13be357-9396de7ccf2mr484247985a.47.1788432347212; Thu, 03 Sep 2026 03:45:47 -0700 (PDT) X-Received: by 2002:a05:620a:5bd3:b0:939:6de7:a623 with SMTP id af79cd13be357-9396de7ccf2mr484244985a.47.1788432346797; Thu, 03 Sep 2026 03:45:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 49/51] system: improve -mon deprecation warning Date: Thu, 3 Sep 2026 12:39:33 +0200 Message-ID: <20260903103936.62355-50-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: quX5xPwZ5EXHgtabsw2yLnc6VaRUcXQC X-Proofpoint-ORIG-GUID: quX5xPwZ5EXHgtabsw2yLnc6VaRUcXQC X-Authority-Analysis: v=2.4 cv=OZyoyBTY c=1 sm=1 tr=0 ts=6a994fdb cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=ID6ng7r3AAAA:8 a=20KFwNOVAAAA:8 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=9lCKVJmnSQc2mt-fxsIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=AkheI1RvQwOzcTXhi5f4:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX/givwNgvYHch 9oiRmg7+EmpPynZnf9bz3Ve6RKIitZDx0XKs0ruw8+IG2pYflkljadJ07O91ItRNgR3Fhkz/TW1 q8idLLUs+SG+DnYWneIhsP2KUhN/yw4= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXzzaqHABy37KY wVPrINh90MMRAYfCrQnPYWrtA1nvrqrrgUGQN0rPOp59sez5HpeAmIcwraGByiNqW9tgJjObnGY 2mBQQa2CtoE2lUSl618NUXrWzSFLF3e5YA0UZVoqOBTw2tA+KGTMrUDBQSyFnkGh93iE3y+Oohe xIlGOQc8BTd/Ok+lWb/KLJLWuWfUo2W7ZLVBAG+26748+v+H2ch8rDozZXfmEvenM8SWq76yzWW mb84T5Ry9n6Q0vq5INOouK0+oFQBBo6JYAAwex303wZamc5PB6Dob6wefzPqHdQIhZf+6jVBirT tistXNXsHjCWsqgsFDXa5/3vgnri1S13YBZGPi/n5xS2kM/TBpCauaFnOF+mMBgacIG8i7alGrD IPeBbUHqOaxzKJFkEWu72CdvZZ/ckLjwuMcs9vVPE6W/GcW3+pIsa8HDvPQk9O4Kpqizn2kSFUM bGu2319pWDQlOYE91SA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 bulkscore=0 suspectscore=0 impostorscore=0 clxscore=1015 malwarescore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432361283158500 From: Daniel P. Berrang=C3=A9 Expand the text a bit to make the new syntax more explicit and point users to the man page for further info. Reported-by: Peter Maydell Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Maydell Message-ID: <20260902104753.1756783-1-berrange@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- system/vl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/system/vl.c b/system/vl.c index 1b22a358d23..9bd7664b85c 100644 --- a/system/vl.c +++ b/system/vl.c @@ -3238,8 +3238,13 @@ void qemu_init(int argc, char **argv) default_monitor =3D 0; break; case QEMU_OPTION_mon: - warn_report_once("'-mon' is deprecated, use '-object' with= " - "'monitor-hmp' or 'monitor-qmp' types ins= tead"); + warn_report_once( + "'-mon' is deprecated. Switch to either " + "'-object monitor-hmp,id=3DID,chardev=3DCHR-ID' or " + "'-object monitor-qmp,id=3DID,chardev=3DCHR-ID' instea= d. " + "See '-object' docs in the QEMU manual for further " + "configuration guidance: " + "https://www.qemu.org/docs/master/system/invocation.ht= ml"); if (!qemu_opts_parse_noisily(qemu_find_opts("mon"), optarg, true)) { exit(1); --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432362; cv=none; d=zohomail.com; s=zohoarc; b=LoQZX+LrnDhRHzj7lihXgXS5kechqAPdDz1bIn14AqvR9IiuMjGYrC2Acna3CF902W8bP3JrhxMBEB0x28dfDY0TFBYi4ZDfpmuaKQpZDYG4Ew1Ytu6Qx23QSuie0ZEkQyxlcvVaQMZjDtzwqfFc4bU/Jzzc9XJ5VJpe5jy79rU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432362; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=EUW4H00dK0LyYVxqdRdDg345+N9pW5llaDu9ahskXFM=; b=HslnLu2Pfe2x5zyPIFlJEjFK0AkraRpMz2rlPJRtDO9UlYd7vMn3QQWNHZR0Vtgsc0giCQluG5RpEJ+Mk0SbgCm+dPZzFwWxhW5XJEg+bDvLU++93Bn7Di4e6vCnmqK3luJkZy8hJGWEFmf5CZGBydqnCckMeFWmiQhiPPKdcXs= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432362296830.867064652137; Thu, 3 Sep 2026 03:46:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24xC-0004fi-8A; Thu, 03 Sep 2026 06:45:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24xB-0004fB-9w for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:57 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24x9-0007bu-Md for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:45:57 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHBWK162783 for ; Thu, 3 Sep 2026 10:45:54 GMT Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf6tx052a-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:45:54 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-93771aa0379so599054385a.1 for ; Thu, 03 Sep 2026 03:45:54 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448ed2edfsm12633265f8f.23.2026.09.03.03.45.52 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= EUW4H00dK0LyYVxqdRdDg345+N9pW5llaDu9ahskXFM=; b=R7CnIrTorFDJv6Nm 5ZEuvg4JvUZciAQtkvE0wyLadjexrAHGUyMFu2bvYc1Kk1Ems+N7HoiIVtuZCAob PZsM9661s2U1RurpixbxcrIYcQDr4MzCP0Rdufjg2vZvSnVO90qHR71H2CbkGM0p adERgF0eIUX+UN8dHl42qbLYYLWiOBwFbJviCzEPrxqK8l1b9ZZWE4cKcRKXGz+z zbdeyX4stzxxkACFRnnzpjbuyN8cdQQwDsjYLXQvPdHi3WWeIbLwLTnxKiEhdsxs wqlFnrNwaGVdUxuWfK8WNs9ap1+A+rM1HSJRdOMHxz4TlXsCFFIGChWozbYhfjn5 ci43NA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432354; x=1789037154; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EUW4H00dK0LyYVxqdRdDg345+N9pW5llaDu9ahskXFM=; b=HCDqgyvq40ltkS/a8WuQRZCiG84hmTxyEymYW1IrYVPuWSNDDlVWfkMNJz+yOdlzbF 2G7h1o17GUeWN5/N5hhhS5XtZ7/FD33RVMdG/geZUlDu5pwZlJGhUiVSboTo6LtSAVy1 yiQW6fStff/kBTryG5I8UXBw2qWSNwTe9Ubv1u4FsYD/s8sna7wabBfH0UA5Dec/nFtx Uph0xSw9aGDN5MZXViK8WcN5aPcB4dbV61GdVBFCXGT+ztuDSmp7E+5sRYK3dIVi6Jxd kZQjoBL5cpHoKbe0ymAqLWzcBHjFdZHmZVmFzGTJhmVoyEkKBpygAkcx4+r7obXISok6 4I7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432354; x=1789037154; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=EUW4H00dK0LyYVxqdRdDg345+N9pW5llaDu9ahskXFM=; b=jk7DB9xWi5ZClLEUlUkxy3zGcE9MLFpPxDor4PJtrZbXk/vA7bdXwHg0TCrv0ugJg4 yG2KtmxaMiuSxL9lYEil2i3d8BMiv9ja8SEWtgQs4Hm8n9bAJ52kfMyEZkEvVLCP5Gi7 G9OhDcnO4GibAvT3xFFVYV9BskmnW7o2M03F0+XqTkyXAUH85LVvRpJt/okmKSULDza9 N2VJ+NRRqWCNjM5QLkteXFzVstk2gKudlGGoCC6Fav3E6Kdm0DmU/iGAEQ5ws9N+kzH6 cffuNTj14/aBjWae1QNr6HNVbhvY4hTDSdsHSodWQ75PS4EPR1iqX+eFNGIHY7dlbiQx sgLw== X-Gm-Message-State: AFuF++nbui/JbxSr0E+U9Lbdp79bwg33wGKJdp3eEx2Utqt3yfJAnFGi lPN7QvBjZ3JkuEWkvvZ5C8Lo1f6EStLr/82wWVbE+808s5EeSuBPcIoD0EmoRXRaxPafRiP56wh ljvGoPO0W9tsctJq7K9JDYThit6jsXWzR2M4zx1+GgPFMavBQDdnF2Ld7P5S7ILLoKw== X-Gm-Gg: AYBFou3VJEFL7tXyDoRCo+GgvvhLOUVvpTjbOLmL+OZEKjzA3gFKL0leXQwMScRbhxY 6b4YQ8hRlPPo4kGDuc3N8slLdRXahS+AYgYoN9FZOkM5yb2mcaPS8umWcQ1kT9kbBsg8rxAfETb 6xtgC82mjouuXK0PEabM0nPLxp+CisP2aDlKq6iUKPUB9aOCfgUrUSQhLKPhuznbzNIAkW+a03u YVWIWxRnDYDApDR/Sjs95SH8v6vvI5Zb8r/aUNjJMMcqUiiz7Wpd3TySyNzH/RsuP0MTc4cNsy5 t8BYm40IU9vA2yo/QNvOK+CJc0H2GY7dd40fAWN7HtIlsT+MU4P5NyMlqu8tGWx5wIDWOaUYnxY ZoFYhR6uxGjRXXtV1F1YJmS93F9Cd3/KlKJYoVwXa X-Received: by 2002:a05:620a:90d2:20b0:936:df48:d507 with SMTP id af79cd13be357-93960e05a05mr1039310685a.18.1788432353970; Thu, 03 Sep 2026 03:45:53 -0700 (PDT) X-Received: by 2002:a05:620a:90d2:20b0:936:df48:d507 with SMTP id af79cd13be357-93960e05a05mr1039306785a.18.1788432353502; Thu, 03 Sep 2026 03:45:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 50/51] MAINTAINERS: Stop reviewing meson-related patches Date: Thu, 3 Sep 2026 12:39:34 +0200 Message-ID: <20260903103936.62355-51-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: gwdVYf5S8SkansMsSd0XJlFr82QHilg_ X-Authority-Analysis: v=2.4 cv=TqjWQjXh c=1 sm=1 tr=0 ts=6a994fe2 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=S56xvJB5AAAA:8 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=DDkSHnejo0K-hebZM0MA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=MH9Ivq0PDQRhlrFuIVvX:22 X-Proofpoint-ORIG-GUID: gwdVYf5S8SkansMsSd0XJlFr82QHilg_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX/zOQkUhQmBf2 Cg17pJtQNuqKINztA3XFNp93KLhOdvGC121Ltxszz2Gsbmmlv7n+1FypjY97Mq7UwlclfO0q+ln b7Nw4eZbQsra/63h9SWymqvZ0eBdf27EAxyKHoBucI3co7AA3w82bYzqJH0NvQatPkrSiUKeIwa 1AB95wGiJcZGB/mzg+rG4nc2x/TOWF9QewOmoaj4CUfM1Y+iRFv3dzrjXnF9SXiG0s9NcGkXgcz mbbzDlxupeiOPgpyjR9b/lDu8Y3QqliqHNzFtcSovjxadu298KGWjbWE65VzsI8TMMG8/OIfpn6 Ce/fVBtWQ6dTfRkX3ptjZjQ19zeoMOSIvAxH2aUBXuDRws7+GY6P3cC7V+dz68aA1U9JdzNG2vz 7VyPdQ+eRufl5dSymDvdQsbhtqSR8/rfSpSdj0JsRarS/W6OOXuao9O/jUvVxQF4r3cfihkK8Co mAAck02iLkE6LbJ20Pw== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfXx86gJt6rosmq ueujAsHzekQy7UnBPbDsCahuDBPJ1GfsLjoc64ZvKgp10LV11589OqlMKTUN3uTg6Nd0wi9ypUQ Z4ct4bT0si9S2Yld8zaPX2j1S/e+rVI= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 suspectscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 malwarescore=0 spamscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432363302158500 From: Philippe Mathieu-Daud=C3=A9 With retrospective to commit 48fad83ff49 ("MAINTAINERS: add entries for the key build bits") I think I only wanted to be listed in the "Top Level Makefile and configure", not the meson one (I'm not following meson changes closely enough). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260902155105.32165-1-philmd@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index e3f91ff1cab..2cff90141f7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4676,7 +4676,6 @@ Meson M: Paolo Bonzini R: Marc-Andr=C3=A9 Lureau R: Daniel P. Berrange -R: Philippe Mathieu-Daud=C3=A9 R: Pierrick Bouvier S: Maintained F: meson.build --=20 2.53.0 From nobody Sat Sep 26 20:50:54 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788432386; cv=none; d=zohomail.com; s=zohoarc; b=Sb+JcxaYANeyXtCpOokwfZdWtkdLsCHxiSC5ovbyYR5akbtS1wAXbGY/tmNwVHBdz7kTFf+GYksQXQtwZ/rhGXc6jztWgFfkj4Vl7KtIi6LguXTusiweX//Wfg6Ik0ql5BfYnCkvoYyg43k1Dhcm+BSvnTDQ77kvyKAXiH18tbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788432386; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=h9RIWx6x6zRqaO0k/EMmEuPQdfhJn8c7lVHPbY/dtr0=; b=QoWvey8ALnsyUVN7JwgeMAchNKU8hAXfDC5N1foe9t28fHhh95mirC8LTZ8t9bjZNTnxu435ZPvMQg9ygX24IYu8apn9KMNxQQEvzzFLDvQMbA3Uj8YwkTWWYfymbN7MQGVsLPTLa/YY7dnRBQfVF6hGltLOF005j1WvqGJ+WdM= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788432386135148.73984324897765; Thu, 3 Sep 2026 03:46:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x24xX-0005EF-OW; Thu, 03 Sep 2026 06:46:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24xM-00057m-0C for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:46:11 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x24xI-0007f3-Us for qemu-devel@nongnu.org; Thu, 03 Sep 2026 06:46:07 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683AHIoQ162960 for ; Thu, 3 Sep 2026 10:46:04 GMT Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf6tx0532-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 10:46:03 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-9396e0515dcso59117085a.1 for ; Thu, 03 Sep 2026 03:46:03 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ce5533ffbsm88537205e9.3.2026.09.03.03.45.59 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 03:46:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= h9RIWx6x6zRqaO0k/EMmEuPQdfhJn8c7lVHPbY/dtr0=; b=Ymu34p7NDVN4rETw q1e8WTEjA+NBxt2CmZ3vOvIY4EpXraN/EcCcbgHw7DiooOHXQ2uSr3o0WhKKHXCq rjOe87GLH64bpUNukq3Up5X3wvYS9dvIp19gcOxoQzB22SkOHq+08jlumcDNKukn 1DFLI2W5FJnC6+yrpjdzNItrsH8UUOeEOItw4CZUgZOOAHo/i7JKJDd6QE7yVrFT JM25XXWGuxrDrhrZuotLJ26SEUqREkSfAF4Q5HFxp0cXKHyT2iGvySXTRUq2EZl5 23LL80BtIooELRn7RBXgMYbeml8O9TbzM+toBd3ccv9Kc1WRPxvQzY8F72B/EEab K/yTJA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788432363; x=1789037163; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=h9RIWx6x6zRqaO0k/EMmEuPQdfhJn8c7lVHPbY/dtr0=; b=jKlXJk2gy5P7fzpa++Aq/XuZAyRtveeFD2emwMPplrkfL+WZJP2XQiTimmpIT8BE8R OZmAzwyzJ/IjPAc6uFjo0BE40JeYPorX4iLwT5sdMAoRVD/L7df4Oh2LenTYPyi12G+B vKLbUyjYcva0O/Ei4Zjy/zWR4uLN/83Vztztmadsf1cPCFjTlCirlxEdxCg4iKU0y5OZ 3WaTDPkomJAIGLfN9EWRfVdbpNFuURF3h3Xj3tLeSMowOGcC4VaLO9D0U1pPvW3a1Vn2 qgSGFIy0Xrp8co/Ry3agTscpkEiIMFrWn8GV9ZSdsHP7i+N/Ogo+vwHq2PiCKffJChXp 1vmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788432363; x=1789037163; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=h9RIWx6x6zRqaO0k/EMmEuPQdfhJn8c7lVHPbY/dtr0=; b=HdHYhrcPNC320GHubk+ylp6gyYgmTT9gIyxTFqVHxLXr5Dfu3JSp0PhI1BaIX/VzA9 imNE/Y51EqEl7iYn1aCO31GlXOhnmyl5zokPu+8/gMvyRTIHmyUg0BO23W31El76DCd/ u3GAoOzR1Ulu7P8qamGEqvDnhzfZXPTBHm8HDY9/xjxABrmZ9A2ch2FYQqfc9gEZVfcD PWmoKkrySONO/ITm+w7vMJQF6Po3ymShhJ1lNo+drpTZ21/GIfcLEL1r3TdAwb9xY6eD laACjj0mekZcFzRI7cIoMD/sEmC4lrWPWbHqId7a9Pb1P6JD0NPSvamIsym2qqB+MPtO D43g== X-Gm-Message-State: AFuF++kJU5xQxsOhnzF+sQ6zPqjTjQpllThi+vrnkfSs7vwjLkzvvYf2 phuz30fArXGvApHir2Zaz1kZ974lpegAJcz7Co6NVHGHMsG/5H2BS1/Qjtt4DB89bgwT2ACP1cP yKQU3z7EPGvpAtUmeNZucoLktWZ3gmEE2cFQ0rKYVvBWrgjWiWP787aS3woDPuL+XcA== X-Gm-Gg: AYBFou08TkkAm1g3VVaFjEVqbUKNg7OnMXfsJZHWfW+POc1X3kSbzzDJ/rTc5yReaP3 CrUqY3sGYnS6PLs1oCalq07Iy0zML6spmC9+rVUYauhu8JneXZEXEOewbJw0bhHFxx9uCMGq+IT KOI8PyxZOO5D6CQy4lDTtor+7lU4sf3xdAPly6SBF8hqozqI91qbX5oytkMivMNGK1Nu7shLWrY 9lHOHfdmF/7v8qHhGuVfe+NQIDYoarSzarBI/0A+eKDNJSVLE065FujBfOJiPwHxwmGFNTekmRP sE0TDtUBOV0Gs4gI6XMO476wzkzZeGwXq7ZIKuKY9pQJ/eNfJ4YNy+2pGwNFAfgGMh1Eh03T208 wnQGoIFnS9CCF6+LHogALwp+xWmIbW6xBJvFpRh4v X-Received: by 2002:a05:620a:a20e:b0:939:3b56:c416 with SMTP id af79cd13be357-93960ca35cfmr1270682185a.8.1788432363217; Thu, 03 Sep 2026 03:46:03 -0700 (PDT) X-Received: by 2002:a05:620a:a20e:b0:939:3b56:c416 with SMTP id af79cd13be357-93960ca35cfmr1270678385a.8.1788432362638; Thu, 03 Sep 2026 03:46:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 51/51] MAINTAINERS: Update PhilMD's email address Date: Thu, 3 Sep 2026 12:39:35 +0200 Message-ID: <20260903103936.62355-52-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260903103936.62355-1-philmd@oss.qualcomm.com> References: <20260903103936.62355-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 3XTfT3AHjt--JywAugLFfvtf6qfD09id X-Authority-Analysis: v=2.4 cv=TqjWQjXh c=1 sm=1 tr=0 ts=6a994feb cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=ID6ng7r3AAAA:8 a=p0WdMEafAAAA:8 a=NEAV23lmAAAA:8 a=S56xvJB5AAAA:8 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=20KFwNOVAAAA:8 a=69wJf7TsAAAA:8 a=jqTOf7lJAAAA:8 a=hXZgYZo4AAAA:8 a=pGLkceISAAAA:8 a=VwQbUJbxAAAA:8 a=QyXUC8HyAAAA:8 a=9u_AbM2CAAAA:8 a=up-X0YpDAAAA:8 a=K92WTf5yAAAA:8 a=bgKrIEmzAAAA:8 a=gPJu0pBYAAAA:8 a=r_1tXGB3AAAA:8 a=v5NkL0kxAAAA:8 a=FyogFE7hAAAA:8 a=Ixn1CAxRAAAA:8 a=ciZXtekWAAAA:8 a=lB0dNpNiAAAA:8 a=-c9VzbpeAAAA:8 a=0FD05c-RAAAA:8 a=RBb6cmxZ0Hc3-IgbcVcA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=AkheI1RvQwOzcTXhi5f4:22 a=MH9Ivq0PDQRhlrFuIVvX:22 a=cvBusfyB2V15izCimMoJ:22 a=Fg1AiH1G6rFz08G2ETeA:22 a=rFolWk1O-vXzQ6QHWabK:22 a=37BJPeUnzxYkbV1yBC-1:22 a=BKQHd7vISpuzHE4vo7dZ:22 a=86FmjZgct7XXK6GGpxvI:22 a=X9ok8FpLfHEzVMsE4qxm:22 a=Ifulqbl_J-1aL42CD9IR:22 a=AlIIF0cMT2hfDT4axODj:22 a=t8nPyN_e6usw4ciXM-Pk:22 a=KW0dtVGFZSnqoMbxR4e2:22 a=p2WyBLmlf5vdw_nX_QRo:22 X-Proofpoint-ORIG-GUID: 3XTfT3AHjt--JywAugLFfvtf6qfD09id X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX5kHOCnaf1v4g EeKTCnioXMGF3s6SIY4fVKT/2Io/fklgD6z025YhHqOqEq+FWx3R2tkmpntw2r8R2TqrAz2b6xn wWRS3k49fwEDFe+8U8sOt5GeGZMBFoOvBGnU/ZzovEYWeujMCDlvNIvR4SSLF+iVW83h0MPq2Ue mKwl6+wQ2YJX9WXuKbvrU0cV9HBqmquO33Xd3VFUAP9fcoOaJ9BxtiwGko1eEb+/FBtvk/QG58j X2Rmp4X38fRhJzpwDjn+mHrfydmKEUlKNMi7IKjWvxiPBGDWvZ7QV++jHrZmptLjUNr0jnb699k 7UwuqMHXxrrVtafN7ZxNUKrXY4OYcQ7zdA7l6Iuyb2/nyYWfl9roCMtDnKVgN4ac5y0MOyiFK8D gcCRSiff6O0E9LXgC33x3UAK4m8JnwSvDvj8oEhEQ6JKh5y64o4agT71EQJqLa+DQrepyhcWwLf t7qvkbZNvrLE37tEsbA== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDA5MiBTYWx0ZWRfX/SbNPN2zhk6w bf5ERU6Nmwjs3F4HRg9+xu5fGyKgQuF6hcx0quLh9UX+ar0TfEZ7nYvoxufg5ik0gfuNAAr+GVU QJay6QFDccbdvY/MMeMDU/0Fl8h9vxg= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_03,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 suspectscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 malwarescore=0 spamscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030092 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788432387547158500 From: Philippe Mathieu-Daud=C3=A9 My personal email free service doesn't scale with qemu-devel@ mailing list traffic, returning distinct STMP errors. Dispatch to work email instead. Update mailmap accordingly. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260902155211.32399-1-philmd@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 56 ++++++++++++++++++++++++++--------------------------- .mailmap | 9 +++++---- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 2cff90141f7..f524d905236 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -68,7 +68,7 @@ Project policy and developer guides R: Alex Benn=C3=A9e R: Daniel P. Berrang=C3=A9 R: Markus Armbruster -R: Philippe Mathieu-Daud=C3=A9 +R: Philippe Mathieu-Daud=C3=A9 W: https://www.qemu.org/docs/master/devel/index.html S: Odd Fixes F: docs/devel/build-environment.rst @@ -132,7 +132,7 @@ T: git https://gitlab.com/cohuck/qemu.git s390-next L: qemu-s390x@nongnu.org =20 MIPS general architecture support -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 R: Jiaxun Yang S: Odd Fixes K: ^Subject:.*(?i)mips @@ -315,7 +315,7 @@ F: tests/docker/dockerfiles/debian-microblaze-cross.d/b= uild-toolchain.sh F: tests/functional/microblaze/ =20 MIPS TCG CPUs -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 R: Aurelien Jarno R: Jiaxun Yang R: Aleksandar Rikalo @@ -545,7 +545,7 @@ Guest CPU Cores (other accelerators) Overall CPUs other accelerators M: Richard Henderson R: Paolo Bonzini -R: Philippe Mathieu-Daud=C3=A9 +R: Philippe Mathieu-Daud=C3=A9 S: Maintained F: include/exec/cpu*.h F: include/exec/target_long.h @@ -707,7 +707,7 @@ F: qemu.nsi F: scripts/nsis.py =20 Darwin (macOS, iOS) -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 S: Odd Fixes F: .gitlab-ci.d/macos* F: */*.m @@ -1013,7 +1013,7 @@ F: tests/functional/arm/test_quanta_gsj.py =20 Raspberry Pi M: Peter Maydell -R: Philippe Mathieu-Daud=C3=A9 +R: Philippe Mathieu-Daud=C3=A9 L: qemu-arm@nongnu.org S: Odd Fixes F: hw/arm/raspi*.c @@ -1324,7 +1324,7 @@ F: include/hw/misc/avr_power.h F: hw/misc/avr_power.c =20 Arduino -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 S: Maintained F: hw/avr/arduino.c F: tests/functional/avr/test_uno.py @@ -1473,7 +1473,7 @@ F: hw/microblaze/petalogix_ml605_mmu.c MIPS Machines ------------- Overall MIPS Machines -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 S: Odd Fixes F: configs/devices/mips*/* F: hw/mips/ @@ -1490,7 +1490,7 @@ F: hw/dma/rc4030.c F: hw/nvram/ds1225y.c =20 Malta -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 R: Aurelien Jarno S: Odd Fixes F: hw/isa/piix.c @@ -1504,7 +1504,7 @@ F: tests/functional/mips*/test_tuxrun.py =20 Fuloong 2E M: Huacai Chen -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 R: Jiaxun Yang S: Odd Fixes F: hw/mips/fuloong2e.c @@ -1528,7 +1528,7 @@ F: include/hw/intc/loongson_liointc.h F: tests/functional/mips64el/test_loongson3v.py =20 Boston -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 R: Aleksandar Rikalo S: Odd Fixes F: hw/core/loader-fit.c @@ -2113,7 +2113,7 @@ F: include/hw/i386/nitro_enclave.h F: docs/system/i386/nitro-enclave.rst =20 Machine core -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 R: Zhao Liu S: Maintained F: hw/core/cpu-internal.h @@ -2137,7 +2137,7 @@ F: tests/unit/test-smp-parse.c =20 TargetInfo API M: Pierrick Bouvier -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 S: Supported F: include/qemu/target-info*.h F: target-info*.c @@ -2373,7 +2373,7 @@ F: docs/system/virtio-net-failover.rst T: git https://github.com/jasowang/qemu.git net =20 Parallel NOR Flash devices -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 S: Maintained F: hw/block/pflash_cfi*.c F: include/hw/block/flash.h @@ -2408,7 +2408,7 @@ S: Maintained F: hw/ssi/xilinx_* =20 SD (Secure Card) -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 M: Bin Meng L: qemu-block@nongnu.org S: Odd Fixes @@ -2890,14 +2890,14 @@ F: tests/qtest/launchupdate-test.c F: tests/data/igvm/* =20 LED -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 S: Maintained F: include/hw/misc/led.h F: hw/misc/led.c =20 Unimplemented device M: Peter Maydell -R: Philippe Mathieu-Daud=C3=A9 +R: Philippe Mathieu-Daud=C3=A9 R: Ani Sinha S: Maintained F: include/hw/misc/unimp.h @@ -2905,7 +2905,7 @@ F: hw/misc/unimp.c =20 Empty slot M: Artyom Tarasenko -R: Philippe Mathieu-Daud=C3=A9 +R: Philippe Mathieu-Daud=C3=A9 R: Ani Sinha S: Maintained F: include/hw/misc/empty_slot.h @@ -2984,14 +2984,14 @@ F: hw/display/apple-gfx* =20 PIIX4 South Bridge (i82371AB) M: Herv=C3=A9 Poussineau -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 S: Maintained F: hw/isa/piix.c F: include/hw/southbridge/piix.h =20 VIA South Bridges (VT82C686B, VT8231) M: BALATON Zoltan -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 R: Jiaxun Yang S: Maintained F: hw/isa/vt82c686.c @@ -3056,13 +3056,13 @@ F: hw/intc/openpic.c F: include/hw/ppc/openpic.h =20 MIPS CPS -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 S: Odd Fixes F: hw/misc/mips_* F: include/hw/misc/mips_* =20 MIPS GIC -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 S: Odd Fixes F: hw/intc/mips_gic.c F: hw/timer/mips_gictimer.c @@ -3188,7 +3188,7 @@ F: audio/alsaaudio.c =20 Core Audio framework backend M: Gerd Hoffmann -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 R: Christian Schoenebeck R: Akihiko Odaki S: Odd Fixes @@ -3426,7 +3426,7 @@ F: scripts/coccinelle/errp-guard.cocci =20 GDB stub M: Alex Benn=C3=A9e -R: Philippe Mathieu-Daud=C3=A9 +R: Philippe Mathieu-Daud=C3=A9 S: Maintained F: docs/system/gdb.rst F: gdbstub/* @@ -3440,7 +3440,7 @@ T: git https://gitlab.com/stsquad/qemu gdbstub/next Memory API M: Paolo Bonzini M: Peter Xu -R: Philippe Mathieu-Daud=C3=A9 +R: Philippe Mathieu-Daud=C3=A9 S: Supported F: include/system/ioport.h F: include/exec/memop.h @@ -3503,7 +3503,7 @@ F: tests/functional/generic/test_vnc.py =20 Cocoa graphics M: Peter Maydell -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 R: Akihiko Odaki S: Odd Fixes F: ui/cocoa.m @@ -4067,7 +4067,7 @@ S: Maintained F: contrib/elf2dmp/ =20 Overall sensors -M: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 S: Odd Fixes F: hw/sensor F: include/hw/sensor @@ -4620,7 +4620,7 @@ F: tests/vm/freebsd =20 Functional testing framework M: Thomas Huth -R: Philippe Mathieu-Daud=C3=A9 +R: Philippe Mathieu-Daud=C3=A9 R: Daniel P. Berrange S: Odd Fixes F: docs/devel/testing/functional.rst diff --git a/.mailmap b/.mailmap index 08f0fa9e118..bd8bf07feb7 100644 --- a/.mailmap +++ b/.mailmap @@ -113,10 +113,11 @@ Paul Burton Paul Burton Paul Burton Paul Burton -Philippe Mathieu-Daud=C3=A9 -Philippe Mathieu-Daud=C3=A9 -Philippe Mathieu-Daud=C3=A9 -Philippe Mathieu-Daud=C3=A9 +Philippe Mathieu-Daud=C3=A9 +Philippe Mathieu-Daud=C3=A9 +Philippe Mathieu-Daud=C3=A9 +Philippe Mathieu-Daud=C3=A9 +Philippe Mathieu-Daud=C3=A9 Pierrick Bouvier Roman Bolshakov Sriram Yagnaraman --=20 2.53.0