From nobody Wed Aug 26 07:38:03 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=1786569463; cv=none; d=zohomail.com; s=zohoarc; b=kFZo6Nle227omdEwjwDcdnVI+wnFc9yFxwZ5XJzfrO8Yl0d+OGOlGbtXAmTEK6y3/4gxOfSFYCaGjEM0bv3SHx/ArKke68L2kMD/58ztYizRde9TKcTtM9byLHpgGQdLPm7JCRYyZ7G5B50VfY3IPUvfKsImxHft17sen8IPRf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569463; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wuO9FuvuiLBW9iBaej8zk2gCJXMV7JJPaKuAA2JzHl4=; b=dKE4h9PmVX2s1WtqAsn2mFGeaUOwHTHc2Z2Yi5COTEVUmyeN2NZwMHGdufOWqtv2OFHzGsIH+1T5c/xk1TbGTolcggiUORh++3M2JnYhXhKw48TrivAcREt+X5jkaUx7ROUFTosGPQBgkrBKZXUK96S/sM5tGKTgHO3hUkvNM50= 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 1786569463480631.6971095943163; Wed, 12 Aug 2026 14:17:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGKE-0006aP-UO; Wed, 12 Aug 2026 17:17: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 1wuGKB-0006a7-U8 for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:17:23 -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 1wuGKA-0007kN-A6 for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:17:23 -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 67CK2bn84038352 for ; Wed, 12 Aug 2026 21:17:20 GMT Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0mndbfk1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:17:20 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51bff5c7035so124671cf.2 for ; Wed, 12 Aug 2026 14:17:19 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4815a5af441sm705721f8f.22.2026.08.12.14.17.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:17:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= wuO9FuvuiLBW9iBaej8zk2gCJXMV7JJPaKuAA2JzHl4=; b=BagT2OOKWsVvb54n O6Jf89698PgWotI/UFSUXgtmak1ThDbbwpGFfhvkUkzmXVBfcpoUW3AJtQdKyQ7C ERLise4ux/OvD7FdtkcZ9hinq/dn7YoY3bx/R32e0Iil18vdnK9v//dpp6k084Ji 1EBaMQT7gox9Hmj84oqOy9rh7y1fZUY8iZ8+/5n3oQ34TLcVMUrAOQMpSteCoLwr pK4iPMRShhyGWFfrIQ/iBKE4jqhEIcbC1znTQocE8SauXr//cMBdGtZYSLVLmcvk UHd8rb032km5hEqTKsxNhQoq6JkuA86WcY/7tUkFV2EMWMFneXVBoq9o7nDKkYI9 OEY21A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569439; x=1787174239; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=wuO9FuvuiLBW9iBaej8zk2gCJXMV7JJPaKuAA2JzHl4=; b=ARB17XjNUv59H4ZEw7UCSoN/cssyFe4Ug1RuKhwZo45aEJzFYbpCDD/P5r4KEYKlJU CNWT7VXSY+kGyRBR3zZhdsVtaYvPACMBv1jJFmLgwzgO8GmZS9c23iYg1DxRmqOfw91R 4mPHbwOMcE/q3P0HnDnTd/AnYzt/0l0Y2zv88cS26bbhoDhv68RM56I5PEWGogaboY6t JUTxtArpTMGYjDWZNoVSKaFXD+UxwYAI6A3jK1BPiZP6N9ccK8HYf165NzvzcaZ/el4s sNnx3/8Dj0v3xtwQfSbER6jmQ5S9Ti9iTCGN88OLq14j+2f7XpAEfPM3f3x1QYDeKs5i +jYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569439; x=1787174239; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=wuO9FuvuiLBW9iBaej8zk2gCJXMV7JJPaKuAA2JzHl4=; b=VriUVDdL70p3/G7zCaq9TByFawgclwQIqg8L9Pu2gq7XiRjBxHJRblxTegQblQJYpG BmNHzsVQnl595wDJEGtPpAgwI/jJKJ96gJBZ0YsyM86O4BAZX72dg00CjRmhZ9oSwvU7 QZRsspkCx63TP4cc7oV9PLsdshqh+jOz57d0uOyY7qwMV/Ko6CMrE44ydTGhuaC6t2Rn CKm7A6iHCIxg9WbnmeW6XpgATgv7f3uiXyMfmCxxKn+EzvV4XLhu9f3jmA9r8fx728hO lQJotJp4o/tqdYMNnXUpvgSLUA6Ghh/HPgsfXJOIdcqTBNFCviOKhrM1QoQ+OvE6YC/f 4foA== X-Gm-Message-State: AOJu0YxMl5pFKSgaaGrJ6nEm1hQuyT2DgpI07LgUDKS2oMKQcrUzQRVr xzA7iStsakk7EeiewyuZ6HWAOXoCIuaqk2/X0y9t1vind2Sah9f02JISvLyPoqCoI0bLLQrJfQz y/hyuA/D6T4i9lKuClD98Ek9Edv2V/QnZv7+JwAuJazEUYRFZ0wqQoW/wgg6QlkQN/w== X-Gm-Gg: AR+sD13bB2SRBoAaD0puv2W1Jgxcqm/qRJHz/Xvc43yOcTKhmXu8R/R6zoIc9FUdIzo mXlUVew0gTzPdUxKCaBoQcqk3Ip0UYkDAteK/b+JdFsqgckasXo83yhN6fKm+geN0+rJiAEYtjz 8bB8nLvIPIONilr32KUTGw1qxAAWkvvQjJw11jcQqcjT8Trr+t4U/1zx4xNCofQAjtuXb8M6E3z Nk2ktha3mIaEmrVHbk23PIsmbcAL1ppkrckqK8Oi3ktgwJhxVECsP2K3hqTksnngd9wbW7Gn6H8 Tsh0LMkeVaiLWfvkDFRiTIPaO+uKBkj3S5vLTeZQ4eIq5D03pzyTt+mWnT5NlH/4A4VE2KiftIY ZCqaZczsK4Bl9v1t/DoUtmlqkavuNtewWJrwD19Px7g== X-Received: by 2002:a05:622a:4c0c:b0:51c:849b:86b with SMTP id d75a77b69052e-52d73e744cdmr11824341cf.43.1786569439064; Wed, 12 Aug 2026 14:17:19 -0700 (PDT) X-Received: by 2002:a05:622a:4c0c:b0:51c:849b:86b with SMTP id d75a77b69052e-52d73e744cdmr11823711cf.43.1786569438672; Wed, 12 Aug 2026 14:17:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Brian Cain , Pierrick Bouvier Subject: [PATCH v3 01/23] hexagon: Remove unnecessary 'monitor/monitor.h' header Date: Wed, 12 Aug 2026 23:16:45 +0200 Message-ID: <20260812211708.92824-2-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfXxqOGDqD1cBCV xUelYegyDRJEMZcYWhTER1z+nIWk8VZYz7ojYsQMbthFwNY6sHTtY9t+NGeRVDBq6+u2K7ew4kQ H5cw6JsiQ1yKH3g1FUFbRkw0IIUKt8s= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX73mSvkQE/XoB AfemXXQuoauBNexY0TmYn3QHQjsIPcnuD48NSbnV/7oos48L3PulBKL+ArgnS4DWSVcss8koARK WyIGqc69iMkkSLSuOtYtsi1JoyrLoqlwmdPTlhSODoqf31Tz+cBr8moU+JTnQYvRQ3goa5i/9wi 7xIuzeCFN+7a3MJPsQtNnGMsn4/0s4Wun23Pd9+D+BZJUrfP4NDuCd3dMqnwE7RJN3fqa+w4xos 8yPoFAxgEk/zpnk7d3f42NBe6kBIM/eGRYyeLQpWrPCPrEDnPHU5v55mt9nyOoaJLAi4gt6hRWH hbfD6uvM1isc6c+KZFUsilECLGji0j2e7pSbYtkPvfZyFdyzsWzzdLR61IilwJT7QT54eea8vKu 9iqy/qrpa9zYFA5yINlIK9ZFpAr8umhDDU/6TlUzWLtC6//LSozwoZ9IyumD3hML65xJhVGk8wt pE9cqAa98MpdjZk72qg== X-Proofpoint-GUID: qb4aEVQO0R_EGoHYiexv0wIQObIaBR9K X-Authority-Analysis: v=2.4 cv=C87ZDwP+ c=1 sm=1 tr=0 ts=6a7ce2e0 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA: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=-f94bmcIBZYFaPXTGXwA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-ORIG-GUID: qb4aEVQO0R_EGoHYiexv0wIQObIaBR9K 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 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-2608120171 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: 1786569466424158500 The Monitor type is used in these 2 files, as a pointer. Since the type is forward-declared in "qemu/typedefs.h", which all source files include via "qemu/osdep.h", we do not need to include it. Do however include "exec/hwaddr.h" and "exec/mmu-access-type.h" which declare the types used by hex_tlb_find_match prototype: extern bool hex_tlb_find_match(CPUHexagonState *env, uint32_t VA, MMUAccessType access_type, hwaddr *PA, int= *prot, ^^^^^^^^^^^^^ ^^^^^^ uint64_t *size, int32_t *excp, int mmu_idx= ); Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/hw/hexagon/hexagon_tlb.h | 2 +- target/hexagon/hex_mmu.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/hexagon/hexagon_tlb.h b/include/hw/hexagon/hexagon_= tlb.h index 90d9ed84043..760dc1ea811 100644 --- a/include/hw/hexagon/hexagon_tlb.h +++ b/include/hw/hexagon/hexagon_tlb.h @@ -12,7 +12,7 @@ #include "qom/object.h" #include "exec/hwaddr.h" #include "exec/mmu-access-type.h" -#include "monitor/monitor.h" + #define TYPE_HEXAGON_TLB "hexagon-tlb" OBJECT_DECLARE_SIMPLE_TYPE(HexagonTLBState, HEXAGON_TLB) =20 diff --git a/target/hexagon/hex_mmu.h b/target/hexagon/hex_mmu.h index 4f556c715a9..6aa450b9413 100644 --- a/target/hexagon/hex_mmu.h +++ b/target/hexagon/hex_mmu.h @@ -7,8 +7,9 @@ #ifndef HEXAGON_MMU_H #define HEXAGON_MMU_H =20 +#include "exec/hwaddr.h" +#include "exec/mmu-access-type.h" #include "cpu.h" -#include "monitor/monitor.h" =20 extern void hex_tlbw(CPUHexagonState *env, uint32_t index, uint64_t value); extern uint32_t hex_tlb_lookup(CPUHexagonState *env, uint32_t ssr, uint32_= t VA); --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569503; cv=none; d=zohomail.com; s=zohoarc; b=PokKbrha0cAa/v4f94pbn9LGavUDhLgT7wOw3hP/au99r5e6MANTc5096R80QISwLQHA1N6I7yn1XDLEqmUgfdGn89wKByFn+GeGzD4WwCZ6f2WtDYvkvKSsS3xMI4e2OkH1Rs9sGoFiRKY4iF6SWsBYwc8EPxNqdFDB8e7pWUI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569503; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CTL8wcdSUWwK33yVhke1H/B7124nQYamJHTbfP7lLYI=; b=m+8h6pnjYb4jKtZ6kYD50xuGiKwpydSMKiUsNHoDOIJP9y2teyG3Q50cL5eukn7ObXsEl/j1KHpCD+nYG38qxKEw0+LUy5LC5Ufyq5Xm+MQBsZjNM5zt7F9YSRqi4f3c6Mgzk5Y9hPEqlzwt0rxi9juGZWRCHkThoAUpUpTWtDc= 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 1786569503154479.02577590883413; Wed, 12 Aug 2026 14:18:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGKQ-0006b0-9l; Wed, 12 Aug 2026 17:17: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 1wuGKI-0006ag-Qb for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:17:31 -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 1wuGKH-0007km-5C for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:17:30 -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 67CK2cie599726 for ; Wed, 12 Aug 2026 21:17:28 GMT Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0y04gd1x-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:17:27 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51c0199faafso13607071cf.3 for ; Wed, 12 Aug 2026 14:17:27 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49982131261sm11879755e9.8.2026.08.12.14.17.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:17:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= CTL8wcdSUWwK33yVhke1H/B7124nQYamJHTbfP7lLYI=; b=nejspe8PclA+j/OU InA86rOrZyLYsrxCTSaX2n+UQHGhZNEqdkKnqerIq9w1ItpjiGSbwCg2ZRS2d53i 7MnmTIGDpAWe5Wj7lsk5E8l2qUOELLxseazYbhBUTEvKe+vqIeQhKr3xMF+IE8c4 m6HMShWE2erIemBc2+f70C45CaNbYbKkwzkbKBHpM4YW18M/bGfroSpyerG5dssz +hfcCD2/dCJ3FqvHKExPEN5O6csObbPtJdKWbUXANZWmsoM15Qr9wU7auO/p8yPr GDb/44DsNlDmd5D8wPsN+hTtajeFhnFSrsCWb4/a/hlwOlwXaGd+nIxim5ErzpYC 5NnF8w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569447; x=1787174247; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=CTL8wcdSUWwK33yVhke1H/B7124nQYamJHTbfP7lLYI=; b=KvfSDq7qshw45vdmIxiF4h1QkpA24Bq+NJ9Es2uZonajNmwcWF+yTjKQi07l1S+Bm4 RfEC79MdyJ3duaX8mVqxntcykgFxTdxUyb3+Y4s2w3m05qmfGxzVcH44cpOToGrBEBJL iovfdYPW4oLs/FtPIwwS6Hlr3vLmPjUQIuL3lM2B7w+fcysvz56fezXAf3jLWWdwQksN vr5CE1j0dPy7nJ1ZS//PY7yxuIL/R4lHn3dDmYC5hk1qzt3vRXmcECj2f1cKDryx2G8e w00fagn5CFDqOPGIHLa7uCQMKPu33MY9QFKHbljRprHD+KPuHf1q2DOQnrkykCyC9/Yx cOFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569447; x=1787174247; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=CTL8wcdSUWwK33yVhke1H/B7124nQYamJHTbfP7lLYI=; b=GslhavwkBFet08WTI+R5oHo9OvjSZJRMeOP9D5QWAqG8KNX5FKk+AxxGCcUOPxNKdN MppQvYJKoE8bC9r2a2GHGRetDNgRfe4OSOUxa5j96iQvg3IBd06+xBahv2J8+4WyOIgF cBByVjjHKsMaM2yHOX9Q6MjnO8AVKjV0ZhYGvdR0qw0m+sOv0NoH+3M7slwM1t7NLlFy 1Ko8At9mfj/Hto4AwUV6UGQfEjmh6MklLym8TPNmBD0TyhAfXXoqUV1GsQlVJncugj+r JWaTxNrOAZbZ5JunZjCZuWqc2gD4ogkn5233JKETZcFan9arqhV+rEXQUG2MdDhbLGiG sAnw== X-Gm-Message-State: AOJu0YwtVHbwzRrjxMsDl1xBsHU80o8004lcAYbxTH0qXjFE18ug9/CS d0ff7alsJUN1dZGtwCcYXXp9p/oM/Uh3xBGyq1jWvVGB4eWal35ZXKP1OfpUORiA9jsYEbI5tGm KO6+jQDBKjUwyDi8VXW8U8GJ+NWbYj6AewAb12+X6K/FyKGJqUbY6HidnsU5uSmslaA== X-Gm-Gg: AR+sD13f43Duq2rMIv5hQ4jNEMRwzZA6U6aXQqPUQ1msfyewEclFg067VAM6IZ0X/59 zK7jZI2Vb+LWoLoXUp4KickK8rH5bxs1MKFuTbKGJjqBCu8zEKH7MS1ks38axD5L20DtyvsDmkv QkAkt/1qf3+k8iPIx+kmCt5CX86H/hop7hN3/q9iuBfQJjp9USGmFQ2y1tJqMOU+G15S4VWMraM uW65tl/tkXbi0T0AjVfrQ6pm5NsQ2Aw3fkPRxpYd6gfEDsnH7M31wfv0FfvUG01kS1fTWCeWYT8 hEsccAEnowiBX5f9WeZO7rDF2Zih/SCIendcrRX9qmwUoLEVutU6hAPrn8YebYwztCSUm46ogBU fIk4NfDT1jm/YeZVvn7FbFhVTGcnM6eQ8P/piT6QHEg== X-Received: by 2002:a05:622a:4c15:b0:51c:73f:e3a7 with SMTP id d75a77b69052e-52d73d14fbbmr12250071cf.26.1786569447291; Wed, 12 Aug 2026 14:17:27 -0700 (PDT) X-Received: by 2002:a05:622a:4c15:b0:51c:73f:e3a7 with SMTP id d75a77b69052e-52d73d14fbbmr12249471cf.26.1786569446738; Wed, 12 Aug 2026 14:17:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Stefano Garzarella , Jason Wang Subject: [PATCH v3 02/23] net/vhost-vdpa: Include missing 'qemu/iov.h' header Date: Wed, 12 Aug 2026 23:16:46 +0200 Message-ID: <20260812211708.92824-3-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX8LyhEGlXnd3F fq/tQvPBvMkhuZdRkrz70W1iZjI0+o+Jxrybh9R5BVjkuOB0r2Xr9xVk1nal0DDyORpE559G8AV +9f2zXEfADl9YcVCDcy6HHgtpYmUAX1GC3zIaQoSY1TK4tg7pilXC9/R6/L4+ckOGfamf1huk8i q1Y0xkc2EKdhz0AeGHEnda7QFcdjZ6QZd0ToIC5qgLmoduhQTNbJM5X9jVf3XL2+M+xKX1aP7OO nghJLDlO8RQysQClVY5IxNDRSLVEPJeuXx37n4oslB/XcmU7Bdl8gzWD9bOklKkcEe6AJg2ah42 LTpnLK+Zii+o2I70ip8zGxf629zGOtNywEk8gWrniluq9NUsOpAFg6pHpX+++4XZ1i2cMPpXgHV E82J5n7kK+RNkqlzEOutJvLItH0I297tu/KIMp/pgEjLs7ls+zeAEuk7+F4bh8tIBnzVexICUsh 9C+94LfgL3wFX0zvAeA== X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX7bmKZje85dNN mKanYx994p2RSHn8grCmcp8DDGE1ePhRrE+9lunIj6Z/rnWtSBxIDCEhBK8e51Rw0HgLvLnuRb1 Q0l0g6qwHP0fEcj6CiXfIIlAd65XQvg= X-Proofpoint-ORIG-GUID: r990-IK_6LEQbotFCHZKdRPrO9nwzYzg X-Authority-Analysis: v=2.4 cv=X5Vi7mTe c=1 sm=1 tr=0 ts=6a7ce2e7 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=q2KDGgPci4KyuifsgR0A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-GUID: r990-IK_6LEQbotFCHZKdRPrO9nwzYzg 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 impostorscore=0 bulkscore=0 adultscore=0 priorityscore=1501 suspectscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569504513158500 vhost-vdpa.c uses methods declared in the "qemu/iov." header. Include it otherwise we get when refactoring unrelated headers: ../net/vhost-vdpa.c: In function =E2=80=98vhost_vdpa_net_load_cmd=E2=80= =99: ../net/vhost-vdpa.c:714:24: error: implicit declaration of function =E2= =80=98iov_size=E2=80=99 714 | size_t data_size =3D iov_size(data_sg, data_num), cmd_size; | ^~~~~~~~ ../net/vhost-vdpa.c:714:24: error: nested extern declaration of =E2=80=98= iov_size=E2=80=99 ../net/vhost-vdpa.c:742:5: error: implicit declaration of function =E2=80= =98iov_from_buf=E2=80=99 742 | iov_from_buf(out_cursor, 1, 0, &ctrl, sizeof(ctrl)); | ^~~~~~~~~~~~ ../net/vhost-vdpa.c:742:5: error: nested extern declaration of =E2=80=98i= ov_from_buf=E2=80=99 ../net/vhost-vdpa.c:744:5: error: implicit declaration of function =E2=80= =98iov_to_buf=E2=80=99 744 | iov_to_buf(data_sg, data_num, 0, | ^~~~~~~~~~ ../net/vhost-vdpa.c:744:5: error: nested extern declaration of =E2=80=98i= ov_to_buf=E2=80=99 ../net/vhost-vdpa.c:748:5: error: implicit declaration of function =E2=80= =98iov_copy=E2=80=99 748 | iov_copy(&out, 1, out_cursor, 1, 0, cmd_size); | ^~~~~~~~ Fixes: bd907ae4b00 ("vdpa: manual forward CVQ buffers") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Michael S. Tsirkin Reviewed-by: Marc-Andr=C3=A9 Lureau --- net/vhost-vdpa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index c526c2b2dc0..1052361a4ab 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -17,6 +17,7 @@ #include "hw/virtio/vhost-vdpa.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/iov.h" #include "qemu/log.h" #include "qemu/memalign.h" #include "qemu/option.h" --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569496; cv=none; d=zohomail.com; s=zohoarc; b=QgYjStaNjCYmCbLVLEy1OI3AJ6O1156De4qdSb/RSqEQvN4bPyDtRArQmqhGm76x1VbWT40/nIq6L6w5KHADALJuNIkDogkr2ZrQiTmdwPwZ3pS9FTJNi7KvrHU5JCmcLTyw96i3ItNrcGuSqoEqKNPX0JBC6Jqk5CjBxHIial0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569496; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BWohhf3UbnBtftxLdI+m/izlkbFDecQnJ0g0svmG1iM=; b=YLBu8Udx/yq4Esv6NY8L3fOVG5mPzRSqRhUECJuDcuc3OHoWvVDZefiBNFqi/7uNkY1hzDzZJ/SaGnbxrwbBMo5nLDvBPMNY5j9s5e/kup7/Y8zXWm/iPSkdZnWvFI5mQXVROFNDeRI5tWeD4/nlkmakGcys2vdCBhyY3+pH0q4= 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 1786569496823979.1295450299608; Wed, 12 Aug 2026 14:18:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGKU-0006oD-34; Wed, 12 Aug 2026 17:17: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 1wuGKR-0006hM-FO for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:17: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 1wuGKP-0007l6-BD for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:17:38 -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 67CK2QiC1165264 for ; Wed, 12 Aug 2026 21:17:35 GMT Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0sk427t7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:17:35 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-5283fa0656dso4292351cf.1 for ; Wed, 12 Aug 2026 14:17:35 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4815a5c2308sm540004f8f.33.2026.08.12.14.17.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:17:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= BWohhf3UbnBtftxLdI+m/izlkbFDecQnJ0g0svmG1iM=; b=bc0cGnvaoHZXmquu EsV1nmkNI7rq6wa3Llwui1WNINiqTxviWaMKJLgG1GmYxRgR6W7jq5gHZzG4XkzO gDNjavMSOP0Rid0RgOEK8yblP5J/ayGoYyCA/RHNeOOPlZu9J5BaBnSb7fS8MoXc OPm47K17M4UKWg7QfVMmckiuNrifgGsur58qplWDfkNoUUYqLnXFmwErXkUi1+E+ rc/bhpxpHMi22Tt1ZIDiCyvopouumW3EpMb3g1XK1E8s3ztLs/OClUp1kFNeyrDT 6nHVSFSMbI0G4zVB+1Ew85d+TO1LVrI4RlnQatANAL7vSIgr7AcwFd6gThu9hLqM FHCK1w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569455; x=1787174255; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=BWohhf3UbnBtftxLdI+m/izlkbFDecQnJ0g0svmG1iM=; b=KYJoWio9uOHvXDOz2hA+Hj4THg5tE5MHa67a6YLlh0awZT6/6jzHQWuz0QpH9CWKii WDEIUG6TO3PLO9vx55EAFXab055fCJozfUdhicKrrEVnfB44HHwd247ecpCU6gtrbEDf 5zMm1ZCSzEhJdtvs7I4D0u56pFkoK0Y5xqBIWzaZw0N5QdNFw5Gan8FCdM8q3gDf57// CxlA+4UW58VnpPfuTu14ra6MlvHDXonncQ2LQRtLM7OlRsaduyMCPOYJjBHT22TYN6gk WkvOZblEDZVEmnQUVIIdtJI4JL4vH6VCBUvIc/2K0jkWholIBTfOEY6HuBj/KsWGkL9W b85g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569455; x=1787174255; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=BWohhf3UbnBtftxLdI+m/izlkbFDecQnJ0g0svmG1iM=; b=mWrkZ1KEF21Tihdvh8xFIpln4m7ssxuF4blmmCCrLBmvJYX8/KyuShykLMTN35KKY/ DFYt8uc/J/SAuzN9APeI56F43HHIfQ6U7ERJ39iK4vZ0vxRYK7ReglKrh9LgV5rdB6Jn U6q/AM+MmsWtv6S8wuX2H71rCt82pih3CXS+N8+CISB2LATGK0svY1qcIEwH2fwRag/I aa4qKhW6YSt6DMTuH6DzpV89vieANC5ELXnVkzJaIQBJ1IqbNCF9dEPcOWyZK9QR6P9L /iHC5MDTQAK9DJZpwZYabgIEm0fI+skU+XrjSdMbZ3oWCwnvMSfCWYmxCSzUxs8n67+b SOxA== X-Gm-Message-State: AOJu0Yzi266FKjsFFElt06IDcROyysojPEYeEfl9yHFF21SWs5YM5HLE sxKrBzuBwXBg2CqUpX4RY5YWGVHUI5GNB07exWJ2uAq5C5JUGHpLpF3wEuwnotMqODo2UOmOI/D D51NHjK/PG4/9F8xhp6zRdO6PLmdyIwoYH2+WZ/SX2XjMQUQBWFgZskr1s0kfMWPV1Q== X-Gm-Gg: AR+sD11/PbdXGo1l/Vx1OpHwIdJorf4OPmKPihwIGBqPCVk0P7rph3s0pp5HbnSzqmk ixe+LGmoqshVW4eT6xf40Hk/IRYEDukhSQxn8Hlmy7nLpVn0nSFUjEWaeGZSWmsju45a2emsN/p +jyud5bIYJREEkx/58DZKc2CvNRvOgeM3inE6B2igNszVhvTpNOgqC/g0JyCVjGjzdVyJcDyhwN kN6MGtVcHQS+iWRqDp6/JQ+gF5MZulWSUf7YORdg5i6RBre8AGlch5B8+ghysftAG0rD2rnLhVm DkQ9fEAjh+oobUicJQ3d4DtVvMcHKnmvPQV0kWBqaYmjOm1le5ZjETwJxUUSgXWnQfxvMB73sTJ k4B7UPj8AB5B4SVl3wjoRwfgx+HZIjt1oTsyO0vQjTQ== X-Received: by 2002:a05:622a:5e88:b0:516:7a83:8c37 with SMTP id d75a77b69052e-52d74b47733mr6308511cf.11.1786569454813; Wed, 12 Aug 2026 14:17:34 -0700 (PDT) X-Received: by 2002:a05:622a:5e88:b0:516:7a83:8c37 with SMTP id d75a77b69052e-52d74b47733mr6308061cf.11.1786569454418; Wed, 12 Aug 2026 14:17:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 03/23] tests/unit: Include 'qemu/main-loop.h' header in test-util-sockets.c Date: Wed, 12 Aug 2026 23:16:47 +0200 Message-ID: <20260812211708.92824-4-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: xu1dVZAR8G_og9qBGP_p__uFrdELBTuZ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX6r3/TWbT0QLv PHaYfB3Cwf7DRbTXP9BYMZC8q6HINdm+XwIUZbiSVnkrbGMHNGKn8c+XoEiFgGrmdiGpgNf1m94 36lzcUzDeL2FNcxXAVJj1e3bjnjwiVh3ddwPCyM6fI5syOWKKT/lKbqtKgiOPPLvEklKtmrgV3d mvlHBta9Inj8/6eLhA5lBeqsV+yOjM8eapicQy1RbaE6aorlzSpEsSEGmj16M7Vh8q1AdDgPjS4 rLSgjdw8AGCMGH3KFExX8sQsunvszHLFNT7iWG+6Ri/SOpjkbBNiCnQo4WEZ6kEYNbznhV+r78H 5CcVJt3VbhDebqFNJPcwfXp7+RRsyJVaoComztLCeIhYgILKdRsyI6p2bpqoucnC0/BiP99QBmf 5pXPLLnd0Ps1zMKIEiWpl7dWUnzbX/9a8U8cSdThtELa4GBXWHuGaiEiU3aQujHoYp2Ib1nRIwB kw3+KkYOGxbBOl1gQAw== X-Authority-Analysis: v=2.4 cv=E8n9Y6dl c=1 sm=1 tr=0 ts=6a7ce2ef cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=hs6llZlkumWZFO0I0y4A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=zZCYzV9kfG8A:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX0JYY46UdulJW j0hl0SvZUeyUkEd6VDL1aaPedMjsaXBeym5IEixRg0KpKE9fLjbZMy7eu1ci71dQOu1BMAfBkMZ +kcl8UcqAeyhMAcMTaf+KJXTm2Isf+4= X-Proofpoint-ORIG-GUID: xu1dVZAR8G_og9qBGP_p__uFrdELBTuZ 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 bulkscore=0 clxscore=1015 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569498116158500 test-util-sockets.c calls qemu_init_main_loop(), itself declared in the "qemu/main-loop.h" header. Include the latter to avoid when refactoring unrelated headers: ../tests/unit/test-util-sockets.c:553:5: error: call to undeclared functi= on 'qemu_init_main_loop' 553 | qemu_init_main_loop(&error_abort); | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- tests/unit/test-util-sockets.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/test-util-sockets.c b/tests/unit/test-util-sockets.c index ee66d727c38..ab3f39c3efb 100644 --- a/tests/unit/test-util-sockets.c +++ b/tests/unit/test-util-sockets.c @@ -19,6 +19,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/main-loop.h" #include "qemu/sockets.h" #include "qapi/error.h" #include "socket-helpers.h" --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569497; cv=none; d=zohomail.com; s=zohoarc; b=SPGlmjEuKeDAUk2R2g3dfbt8AlejUcit70tzEtdYLmqTxc4RGfHKoquIX9nno4MxnjPXQDxqi49LJlo6PnnWypv1VysL5aSWiIkctSShK4Dm8UuVsKW/1hUs+NWpT645/w/ZU5lflvepoYZYAQLgwAFJEWxWn6iTTIMBSwUw7D0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569497; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=B+nReeGosnleLKDqAb59HHlaGs68hFMkcZj63B2f5Cg=; b=dlbZ1BQZcxftcA1fKXBnuwB6GMwpnUcBVUOVKmiAW8jtdu2+Axiwjic7W3ZjLERH+3Krlxve5OYpXh1Md/5dD+HpwWLZOoz3dum7viMi6bC/vHe/CSOgbGmM7PKfM32Dy0ZW6ox5ayK8aw+UV/8CaimFDPgVdqEhgB9jerSN78s= 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 1786569497371334.40492274598955; Wed, 12 Aug 2026 14:18:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGKw-00076N-Lq; Wed, 12 Aug 2026 17:18: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 1wuGKY-0006ww-4n for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:17:46 -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 1wuGKW-0007lV-Hh for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:17:45 -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 67CK2QuU246263 for ; Wed, 12 Aug 2026 21:17:43 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 4g0uts1emx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:17:42 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92e8004d60eso277416085a.1 for ; Wed, 12 Aug 2026 14:17:42 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4815a561296sm713044f8f.4.2026.08.12.14.17.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:17:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= B+nReeGosnleLKDqAb59HHlaGs68hFMkcZj63B2f5Cg=; b=jOtew4ygSShIACsX pStnrG2DeJRrd4JvCw2OhUv7fOJDj7ObOpn+jmfktGZirqsS36c6aWmTiIwmJN3D 8cfSbv3rSgBvKeqNOSXPRXQN1yulxZc5ymR5ZRU9fR0sEk+wkVVpebHz6tS1eHtS RHWHO2c9m3MllDP3bgxb4HQZ4pC6YNqMWq/6r/h2G7nd26ZTpAPLpZMBfb97L7xP 2Ag8GgjS9d+ZhCAj4+ggq+9fms6BTityqXxrJ6NCohJ05lmkoVNx9ihFZJ+zqk86 IWA3qKUb0HQ+Ci14DJah3wgtNl6yqaLwP17KojRwc3gH9eEOKBLozRkxs2OXIkTX E1d1Ew== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569462; x=1787174262; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=B+nReeGosnleLKDqAb59HHlaGs68hFMkcZj63B2f5Cg=; b=XFzuVFfypurnhxpftrT/zEzJtxEMKC5z5H4a8WrWSNAEwdV+7py9OLSN4ilf8E2qHy vbuv/jVpXdMB+qxITJmnYRhDgaM36kwXJ2dLOsLLQdVK2xQ05EttFAKz6JqUoZ8COmrS GKbiH6rC3uLwmXBSsbR4o8DXeXKNozD28UNh8whItoZ8M6jnwiae9AebqaVtf7+Gaa2S NEMAg/LFiikPR0g8mKCKetaX+QryQFcGUZJ3lvPFmls9zK+7Cl1cTcjgHwXGDYS8FwC/ iVwqoBGV/Pd+3KROD3lKSFIP0e0sUOQZq1wVrw3OryXakM698BzG4J/bppNHvqt5nuxJ kopQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569462; x=1787174262; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=B+nReeGosnleLKDqAb59HHlaGs68hFMkcZj63B2f5Cg=; b=ZCVeeIV1eY7VVPFRS/iQXr7K1rZnpw3uH8FhMFgy5+cYps33RTiQPoyvKWlwWo9zIo 7MI7ZmQ65sx/teCUGZ5xf58H6GXZHtzSjzAlRcV4kgOIJF7seUSHX1P8eN8S3UVL/H3r ePR9v49+Zcuw4mOBNqoG+pRk5djjI8Gbs/QSznVqiXvVLdgg5gKhZ6K/Z5q22EO4FqSi iVs0WvLReea6Su14npek4z4tl5xGZ8LCsg4nARgFn6rCfAbbyyLDK/5onCQc1Iv5Ghlb Mt35rTbPN/hTUEnqt2CJDLJ1ZHFvqhjciB+uNfbgNEUwSjlHia5xfFysBj5rEbH5pSHN 2f8g== X-Gm-Message-State: AOJu0YzdZuevw9hucfh5HIq/ABosCEtCngQaVv5S2Crw7lPwiljFiJ5z rEgE5e5MW5YkQvmPTuJNU+bjJEXpMqRxTUmcCp9qk4ObmyWUJ0s3/oImuYqoQu4p1/Fe0e6q8Pd IigUznZsVX3CR6yFym3PnzaODY6KgS5zPpeGJAHuqkOlsRlYMhjYNhKy+qNJVxYk+ng== X-Gm-Gg: AR+sD12bvDlJgywv/b9HBDNc4A5d3JA2W6cSguf7iBJ+mYec6MTUKi0aERTLqTP5t+5 NNtEVct1FQAdjP+XAu36KgXP91eKyNMnshpUjWRrG7acI+5hfq5OFr+h7+fpcEaC44WKeujXFYB l6PqL99SWpr/CD8VsejbO8ncJ3JurUn0qs/CzfsUB6qpDwEqW+Fd9sCvmg8wxhilBmX+YLoeF+M xAXU4w2pOkVEmBZHvsuSKB5ZQGDVGiowoczrYxVlv40+8h+QF+TIGwRkxnOdl8XV5OJ41yds0/C A1PaGjyNhjktnUGronwCrWQSNbdtXXQ/jV2GRyQQXunq5k/vqbynhfhoIlZDQm8C38IakKnyvGU GWdHdMNzmsiUx/hSNFXGtQkh8RSUTQ1VkJYg3qPVKvg== X-Received: by 2002:a05:622a:58cb:b0:51c:1568:3a53 with SMTP id d75a77b69052e-52d73c49054mr13596521cf.16.1786569462129; Wed, 12 Aug 2026 14:17:42 -0700 (PDT) X-Received: by 2002:a05:622a:58cb:b0:51c:1568:3a53 with SMTP id d75a77b69052e-52d73c49054mr13595821cf.16.1786569461566; Wed, 12 Aug 2026 14:17:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth Subject: [PATCH v3 04/23] qapi/qmp-dispatch: Include 'qemu/aio-wait.h' and 'monitor/monitor.h' Date: Wed, 12 Aug 2026 23:16:48 +0200 Message-ID: <20260812211708.92824-5-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: WBGJ_kiiIjPGRIjQdmKkXvwqD2mWTex6 X-Authority-Analysis: v=2.4 cv=aPDAb79m c=1 sm=1 tr=0 ts=6a7ce2f7 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=tlxghdvPRZsVr19qFskA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: WBGJ_kiiIjPGRIjQdmKkXvwqD2mWTex6 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX1NmU4YD0E7oF 0bS9p5ze0QRQxvzBySi+MzM+WpLUe4wXldG2QFFr08qE9LOIVlWKG+rvJAO7Kfcf6UsE+obwR53 O/bskr080KGh0qWkSimWqk0+nI7DJHU= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX3w/tpbqFjUG0 2S42lIwjZqQOUPDXoMWvZooUO6xOGhFMBpsHL9otGZSSFrUVdqgoupDWsEUVCX/3EwC/7x1yJ9j NlFVG2pw31sc7zG8T78+6a83XGGngyQ9Ihg7aDo4WVnNCZ9WU2tv18OA+VB2Mz1jFkDmxVMiZTn dbyKOy9xNu5X73R3GZ9td9zqefiGskpPudls81C450j1RDoNe+xmA+WVwyz8BqDtbGYCtiyPplo 3ncrAzbSqlMUcMsCKvuFt0ERbQv9BJe8pIpo3tH1JY0/bqa6O2eVihJp8WvayMbl9J0cQ/rH3+s cvUbnRejZKD9N/vR4TRVIgXcjNZAfTEDhjymCRN0lkQ/VNAfBebzq9Vp/zzThlBHdxZFkpdgmYL 7Tr7MbWG0KDiqtBWV8UzkHaZ/pUClIMCH8RSgLZUTBSxTVQ0XjeuNYBYgPA76Ng4/g+dBhNYNhU 3wYTm3nIIkRgGTeLXzA== 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 bulkscore=0 suspectscore=0 malwarescore=0 adultscore=0 phishscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569498123158500 qmp-dispatch.c calls aio_wait_kick() and monitor_cur(). Include the header declaring them in order to avoid the following build failure when refactoring unrelated headers: ../qapi/qmp-dispatch.c:126:12: error: call to undeclared function 'monito= r_cur' 126 | assert(monitor_cur() =3D=3D NULL); | ^ ../qapi/qmp-dispatch.c:141:5: error: call to undeclared function 'aio_wai= t_kick' 141 | aio_wait_kick(); | ^ Fixes: 41725fa7eda ("qmp: Call monitor_set_cur() only in qmp_dispatch()") Fixes: fc1a2ec7da5 ("monitor: Fix deadlock in monitor_cleanup") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- qapi/qmp-dispatch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index e3897d51977..965cad64998 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" =20 #include "qemu/aio.h" +#include "qemu/aio-wait.h" #include "qapi/compat-policy.h" #include "qapi/error.h" #include "qapi/qmp-registry.h" @@ -24,6 +25,7 @@ #include "qobject/qbool.h" #include "qemu/coroutine.h" #include "qemu/main-loop.h" +#include "monitor/monitor.h" =20 Visitor *qobject_input_visitor_new_qmp(QObject *obj) { --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569513; cv=none; d=zohomail.com; s=zohoarc; b=Ruo4ch+jJH1p2rba26/2fV2dwbkSEQKmx/sBZURScBZrgJwk1RoDgulGAvjGZGWFm486XsK3vOBGcwLzn3FBoZO5fmiKkwJ4FhhApLb90Ot6dEdScZVukNJ9eWT03jSwP611pItJJH7h1b/gFsjOeIshS/gB2MdVYA7KqRrshng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569513; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XRXzSgA7Adl7gZWlg6d1p79tZSCWK9Hf77fhujcSFnk=; b=XID+L3+9xMaIQjFkDBAh6zmCt0ZvwY8E3d3xmof8jdiIYOcgfIVEtoyd0tCZ1TAjQX1Y+BUV9ZytQ9a9xXdscCoukvm1fo9vYQMCPu4BO/R4/XIOPG1cD4tBrBr5R8P2M3BCJ4sKwNdlf3tthI1xPh4uVawH8VvciKD3V7iPE9w= 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 1786569513531735.904280924308; Wed, 12 Aug 2026 14:18:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGKz-0007Ft-3t; Wed, 12 Aug 2026 17:18: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 1wuGKs-00072c-Jc for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18: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 1wuGKp-0007ly-MW for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:06 -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 67CK2bqp4038351 for ; Wed, 12 Aug 2026 21:17:51 GMT Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0mndbfmh-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:17:51 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-51c26012cd0so125881cf.0 for ; Wed, 12 Aug 2026 14:17:50 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4815a5af45fsm527217f8f.18.2026.08.12.14.17.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:17:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= XRXzSgA7Adl7gZWlg6d1p79tZSCWK9Hf77fhujcSFnk=; b=nXyGLg5W+SjxO0O1 aFK0q8W9oOp2Az05AzLS2EpETo/5QPAmxJVWGQs4NIpFfIpsWVcJViyeNY1zHOEf nQKNqkrAzg42AbXv/rAwCj32OWjO2Tmem+xwmiIAaVgRWKrubLw841jQWh7DIrgd t7hldz+gu7IW6n/92ptLRaUOR+BfKpCKFFkq6gJgUuphyJjck+i/300pt059ZlEZ UOtEmmFC0zT8mWoVwBzy7V514cdE/HUan19graGoklfgPQiQBJLSAGuWaMS9Its7 ZbaPtA6txUM06qsFWLFVSc+/lZjYLb2lw4fsj3JD6MXLbNkpI9rGra5uPlE6Jl6d 2sfdpQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569470; x=1787174270; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=XRXzSgA7Adl7gZWlg6d1p79tZSCWK9Hf77fhujcSFnk=; b=GldgDeMpcuwz+j9TQ3YfTMpIREHQFdRdTgJfdQ0kl4lijKXOyqkMCB7cAuBehB6gL/ M2/0T7e9NmPYs0DLoFiqtS8+iorvY8XwQ7+Mst+K2scRHhUXUWU9hGHZOso6PPJBMyho AVzdyzSnjFy8mhjgQi1fCYCf9DNWzGSiqf4xIAuQpU8Zq7S5PrH13iI84HVEJKaSPfLe kZ+/y8G2y7jASQm4ZZY3tfYIJ5NEmzx4PX8XSOy4UH855R0lDVqRtjS5xPBrBKl9Q18K lrRHUFuNQnMG0ht+D44wgpkKetI1IQMCLjzZdNXg3Uf2rB+AsFtD7PGX+Qlzv+1l8hrF 4Crg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569470; x=1787174270; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=XRXzSgA7Adl7gZWlg6d1p79tZSCWK9Hf77fhujcSFnk=; b=PTKhOqQrXh8Kj23+92QypK2+ChbpcrP2O/W0B0GsomEiCURnWwSsbgoKe3LfvIbWre rxQuiDY9tDvWNM3kuIhiEIuscXfO4ZaUwRlVSIj337ND096g4ao1c1U/eGIaFqLBcLji Bh3fqZVmicTCGT/HjctCwWM5shdsfDJZjSgJFQUjjaQk6EHZHGeB3SoHsVNF7N7Ik0f2 SAtvDdl3sXBPK0JtPBogWJeZFFrnbrIQTrJ7V/U9X/EnMISjpUKhCzjaJ9KVOt+Ad2Xr 54FC6Fru16vyW4DLoOjHAqnc8aw03bXC2Q5zHRaId7Lo0RdmZWKPURTuWbNFxek13LSH N98g== X-Gm-Message-State: AOJu0YwCxKRy6p6EY9SGuA2oPIFqE8uToBmkREeM6b5iLOQCR/F5txoU KwwucnFw4BCVhXfaxvjyYzZ+iFST/2brzdbgmA4PVRNELcfE49/0uZ8Zz9M8nFZ9Pl2n45YV2rp Gu9WfgegmIkScbMShOCgHIBDFSI1ylhZJsmD9icayH723kMrmNvM7QCHt47fGJwHamA== X-Gm-Gg: AR+sD118MHJ3bnEAyA/dNNOAYYoCS2Aont5K4PcBBDJ+1nuBSul7lIzCvDVcjm66Rop 8DSMOMkzzk7yuyGXgnVU43ykhvQhVHi+J6VD8yZPoimt1kvoBzYoRe/sZltdf1eT6rRmJ9E+S63 /dwhasQrdetm+eSwHxCeNumAC4cIkMyPpGBC0qbHeoTr2rD8vmvfBDh03l2TVvVtUw4QozYNZ1F jYFZ4GkGIPxAZp64nvNNwjxPRsiylUhmCAHAoRe+L7HxyJSK8zfnd6J6X43p0jMoxYX4cKYtLS4 gRDNu49bUM4czEw+8pnvUukW3cCsvr/BPtiI3yf9G5+KyeaGTqknSkckxtbbYYmOL+c4lnmyuub eM80qPWNvgh48yzzabX557HEPGMJ7zunbV9xELHTKhA== X-Received: by 2002:a05:622a:1e1a:b0:52d:3ff0:62ae with SMTP id d75a77b69052e-52d73e07de7mr12729441cf.35.1786569470030; Wed, 12 Aug 2026 14:17:50 -0700 (PDT) X-Received: by 2002:a05:622a:1e1a:b0:52d:3ff0:62ae with SMTP id d75a77b69052e-52d73e07de7mr12727771cf.35.1786569468743; Wed, 12 Aug 2026 14:17:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth Subject: [PATCH v3 05/23] qapi/qmp-registry: Remove unnecessary 'monitor/monitor.h' header Date: Wed, 12 Aug 2026 23:16:49 +0200 Message-ID: <20260812211708.92824-6-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfXxO95z2x6b+x8 A8u00l/vBV2HapztvSSuKLXzzCbJZqlt+FvYMVoA++W9bjwHcfKv6UTOR3d0U5gRW7p8lYVUnPJ JO4b9Wpa+uMdi9stganKGvYOloYPZE8= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX8+i0DD/JiH9E TpcWxVanqQRd5HrPARzbFjszMOqMP/M+D/XrZ3j1yOcfiMeY6JSjni++Pk2zF9Db0ZOYXhCTe+Q /UENw1bi08HQVcieSsHi9zGRs9wgdmuOjU+l+ZhRp6IJzO9brJeqxO7I5TJZYAZAppu9zDn+jAA 3S/FfyGu8U4adfMcTTrWcTgdppYDPJPkqsBmhmAZp4SZX+CNDNjqBdiZ+t3iH5u8VM86id/WnlM 3Ha1gqxSWKCeU+93AYm3KSpiroIEJAB+VbNfMFfrzMDdYU+ne31raiwMbWWi90U9IOTstkFF4VL Fjfm1Bap5+g4YjVFnfO0lWnCJVneWQMxcuyhkypG0FogoJLFOdEp9j3sxCd2ywhuQFur6XU1w5p LxGD2W3blV6BaxRwzXW0uO61Oe3j1RGkiv0L69eQ9Ljd+K7PRsBjqE2TWv8gvdRJe0TfZql9Qxq HX8uIctVHvmr1W0hnpA== X-Proofpoint-GUID: N7UnxgwUogmxI1HisfEX0CqTMGMqyyCl X-Authority-Analysis: v=2.4 cv=C87ZDwP+ c=1 sm=1 tr=0 ts=6a7ce2ff cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA: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=hs6llZlkumWZFO0I0y4A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-ORIG-GUID: N7UnxgwUogmxI1HisfEX0CqTMGMqyyCl 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 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-2608120171 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: 1786569514187158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/qapi/qmp-registry.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/qapi/qmp-registry.h b/include/qapi/qmp-registry.h index e0ee1ad3ac6..6146306a3a1 100644 --- a/include/qapi/qmp-registry.h +++ b/include/qapi/qmp-registry.h @@ -14,7 +14,6 @@ #ifndef QAPI_QMP_DISPATCH_H #define QAPI_QMP_DISPATCH_H =20 -#include "monitor/monitor.h" #include "qemu/queue.h" =20 typedef void (QmpCommandFunc)(QDict *, QObject **, Error **); --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569518; cv=none; d=zohomail.com; s=zohoarc; b=EJC3cIhMA256pGkkQ+gr1yTf9dTvKheLYbizpQPCd/RQl4ujgBxZMf2qfQjO9g+Gd2uiz0gaul0YJSILu5nFTvqgEB9sVmVuCmIRU7ql81BpQH4mhjI4mDxtp9GhwA7afxZTlfx8jPhPXr0goX2MywNGdWWmT5ncbv5iobcNPsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569518; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FfDt809OwGUecLKGIu73SG0kKCLQ3D0RaHEA1CNLFys=; b=V9mGwHwPjVzs8dG/HC/dJfeIrKbJd3+7KzfcBj2miB3N4t3F+nGn+Lt2YZ3Ed5vNj4P3QRA2m4B3EM3ZTon2HQSktBhj7B8Yz59xD1ZwCbHxa5UNbRqRQ4GqGl1W8p+zi+NRvSy41vWNKsAPvQSp23V+iDRIDpEDvYeCedTnPRw= 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 1786569518429346.4558902388259; Wed, 12 Aug 2026 14:18:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGL0-0007Mn-2B; Wed, 12 Aug 2026 17:18: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 1wuGKu-00076A-9v for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:09 -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 1wuGKr-0007mK-1W for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:07 -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 67CK2clK301219 for ; Wed, 12 Aug 2026 21:17:59 GMT Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0pmytx8m-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:17:58 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-51c1c7f135bso23929521cf.0 for ; Wed, 12 Aug 2026 14:17:58 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981d85953sm8762185e9.0.2026.08.12.14.17.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:17:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= FfDt809OwGUecLKGIu73SG0kKCLQ3D0RaHEA1CNLFys=; b=EWWBRVqLH3oV6nTf 5163OhuLZfcrQF5pyoWIab4ulfbHi/N8Xazq7WLRiz4Kac9FigGn3f2fAU2YbNGI zNNi4sM4AoXnzMZBnMOjSav+tY1KuHBz4Iv7rx6wZPzmd9rOhwz1Mfn8oVBrNT+J zlTJPtWMuLqSnI5fRS3tPepZIaw1HaRAoTzTOFelBYUu0vWfSlPMySxEMUr1iaHE YBXhpqXPc60DmR9O7GdgJ7ntIUyK/SO5pfY446dgpXeI82CGqy0+0+cT02AqMif2 CE6Vyf7b8NXFPZ+yOkseV8GUI/M8CD7uJKiFZ26Zu8vsRMiKhUg8Md7XK184+5Bu 8NeZmg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569478; x=1787174278; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=FfDt809OwGUecLKGIu73SG0kKCLQ3D0RaHEA1CNLFys=; b=LAUzJJvAwQUcymMohPye9G7yWck5lnqo0+L3fxzwSHz5IRNXcaPvKYE5Q8fR2BTXG3 PGL6DmxT0lZak1I9Tb/rJdXuSH8ZDjadT3rf2tzo4SHmDRroWZjCD9lIRd+q4xgiVuDf +/hnUdMu0i2S5fFwNfSO8DxKTjh/4oju1Hpbp2eqD84R049jwMcSnAGxWFc6q6wN6tdR 9yF+GeMabSXnufgaYS5cWhVHCInTKXrB6oe5WkM3UdgkKF3hWXHHYxbRf3nBhOzMNn0a QQsG/vCl2dSOhyc5AT2nybI5TFYJYlw131hsu6Qo8mAZntD9DJVZa9NQwGSdb8lUt22C NUhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569478; x=1787174278; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=FfDt809OwGUecLKGIu73SG0kKCLQ3D0RaHEA1CNLFys=; b=G1NxvNtTwXssBQxlQB35FQwGzZFWkdmvDpBHelJHdpNV95FJAQ9EdarHz7xOeeDHvB as+2cBkkBkI3MlBgK9dpmeWvx0iQguiuinpaoGEyJML/ibmKIRDAkmAsJDLyZg+laj2v SM16ChejNcRu+S85uiAPqm8kbsGwrW0t7BAKE5snk9+Z1HqkspWGH/TfZ6AqXePRu9KK woB5zlaML6pGsQ8AR8BsiP8xRB+Oec0UeyO0F5Btf8WFuYuZjA6kB4g+JDI4ETCXbU5v FQnjFPA5AzWUrfLFMnu9xB+oWX2yPzMkdzd4rUjMpLiKZIRDOlPQWWSmXRRw/pCo1sEl FQ0Q== X-Gm-Message-State: AOJu0Yx9Cdsr011pbWwjvke0JhcHNENCGBWNDt0EfQuSXDaDJ5/rppS5 KAfP98FqSgQTjYKmg37S1S5V/p1XTmALL1NsFBGuVNz2I7HjED6DHMVJeMyACAO2Ffhqgh+uFRJ u7ikYjC7H+maL9FNkQ+L0aMvDVZ2Dgq3aLrLhEFcjweb46ZSY7PjBEIPYTptETUM8vg== X-Gm-Gg: AR+sD11lMgs0ddaCDKeUJRbpcQLokvODJLk9fw/cla52IRZw4iTJJxmdLsvx8Q75t9r MwPWgbN8+sFZjoYoyK0M47FPG8XVMEcYz4TU3kzECdxP3wnrKL/Sq1Cqx5pukJHSVicp1CYF9Cr 1UfRCUxAKHNMuaVOqcCo2jaOE65kIEeiKFgAXzvISZb22IZJOqKfyUW3eFxwvDa4E3SSFK0azcu DSnKD9Lkdx8wcHy/J1J/vM7+HrXwkJJZ3DbEKaNDOi7kqFft8sc3LdqG+h46EYqxIDsk2e8mYGh FrjUnwBDsWRd+cLr+x0EnhyqQSyG+XtTa61itSGyBz0mf3Hj6ncAIZx4DyluasKF3pNh1gXDFYL pXFV0L04HlRgeaO6AxmWzEeW4mDssb8CdyIXM+MckTg== X-Received: by 2002:ac8:5805:0:b0:51c:ace:de6a with SMTP id d75a77b69052e-52d73c724c3mr12153391cf.18.1786569477981; Wed, 12 Aug 2026 14:17:57 -0700 (PDT) X-Received: by 2002:ac8:5805:0:b0:51c:ace:de6a with SMTP id d75a77b69052e-52d73c724c3mr12152731cf.18.1786569477445; Wed, 12 Aug 2026 14:17:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , Fabiano Rosas Subject: [PATCH v3 06/23] migration/hmp-cmds: Include 'block/block-global-state.h' header Date: Wed, 12 Aug 2026 23:16:50 +0200 Message-ID: <20260812211708.92824-7-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfXyeqgYe8OytDT sa3RHNzXE+JnM/rCeupnTkwLkinA2zYXQdieIgdLz8sANNUZW/S7XFVOSgVeqef9Ozl04UxbdTc 1JDnAL8ZvTM37oYpGOSY7tkPJGhbWKA= X-Proofpoint-ORIG-GUID: iC1ac-2Ol-FQm_bXVuoER2oaL3d0dXct X-Authority-Analysis: v=2.4 cv=C/fZDwP+ c=1 sm=1 tr=0 ts=6a7ce306 cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA: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=tlxghdvPRZsVr19qFskA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-GUID: iC1ac-2Ol-FQm_bXVuoER2oaL3d0dXct X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX9Y5YmKDeaZGX 5szQYEQ60gQxHbu53iEBLNU4S76cEwP0uRb5qV8s6HXVuR/Zxlkf8+kV+rEdslQpwyGBG8/QKI1 4ZNfsURjwUnirV8/YGydrxcwhCa8y9rqkkxwd5BLb3GA3ZNvihF1Wnt/Wca3yOakZ41N8fJbRjt MM8b5OKZHi9Au51DNTu3Q6N6vyVEB5YneHQqSNL80vKgjXSIP82WCPQXfuNN7P3uZBKoaudw3/Q PyRDtjMFG+nxnRy4dsTNI2rX3x1JB0yby4pSZvPFFcRGL4uw3PzYYtz002KtxSqO2tjSEa3nr8e XhF8v0GubdO13VK9pTY25yXpD0hxdYmwD8YkELE83OgOX6hVjVX0+dp9Bh19g9wqM01Dh3TtsqW loZGd01iPLtiZPnHBZjUQB51kLQUAZ0F22gfp5uWYoKsysgJk6BgT82qkI2ku2hf0Tli9wxGbyd 9w71tlCjygaLjKuzmPw== 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 phishscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 lowpriorityscore=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-2608120171 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: 1786569520310158500 migration-hmp-cmds.c uses types / methods declared in "block/block-global-state.h". Include the latter otherwise we get when refactoring unrelated headers: ../migration/migration-hmp-cmds.c:911:5: error: use of undeclared identif= ier 'BdrvNextIterator' 911 | BdrvNextIterator it; | ^ ../migration/migration-hmp-cmds.c:918:15: error: call to undeclared funct= ion 'bdrv_first' 918 | for (bs =3D bdrv_first(&it); bs; bs =3D bdrv_next(&it)) { | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Dr. David Alan Gilbert --- migration/migration-hmp-cmds.c | 1 + 1 file changed, 1 insertion(+) diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c index b04fc4489f4..351512942af 100644 --- a/migration/migration-hmp-cmds.c +++ b/migration/migration-hmp-cmds.c @@ -15,6 +15,7 @@ =20 #include "qemu/osdep.h" #include "block/qapi.h" +#include "block/block-global-state.h" #include "migration/snapshot.h" #include "monitor/hmp.h" #include "monitor/hmp-completion.h" --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569525; cv=none; d=zohomail.com; s=zohoarc; b=JU1VLWpYGFNn7JAO8ziz+ZnKbMSQy1M1RX/IwJCD19lGHQidQeH5kUEf/qmuT+eiGW50oh7pIpmVUlPn0HfF+L1JI3gOpnRA8okH9fzeUSGS9fMe/C3lxnffHoRkHBrQ1J4tCuPV2ASSh5VCqLXZNFPVwdHHM6U0m3CPBUCRgiA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569525; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Wj/hXbyDREedb9rtIp3sbKuyoyc96OWYmMM1MuRH8o0=; b=bE6yL4wUnkeEqhKZNfn3RaKLGFLgOsplmj7/nmU97KoJUkroACOta1AS+nQg/i3UxorIKqBX2dg4w2bRkobbCr2DYdocbItBSQfD3crVsftlHMonun97H0TFmb9hHWMg6QQE4+icZC9Bk12lU2/gHKJwv1VOqJtnICYYxEYdIJw= 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 1786569524907566.9318153037998; Wed, 12 Aug 2026 14:18:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGL0-0007Rp-M6; Wed, 12 Aug 2026 17:18: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 1wuGKw-000796-FT for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:10 -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 1wuGKu-0007me-KE for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18: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 67CK2EZh641781 for ; Wed, 12 Aug 2026 21:18:07 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0wt8rrjs-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:18:07 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c1c7f135bso23930971cf.0 for ; Wed, 12 Aug 2026 14:18:07 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981e4435bsm5414455e9.3.2026.08.12.14.18.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Wj/hXbyDREedb9rtIp3sbKuyoyc96OWYmMM1MuRH8o0=; b=Oe77hhXeYnUoHw9A Z10Pb6reiwg5hq3iH2vvX0tuiST2RJc/GNk+3RIhsb/1QCFNw5PhY2pBixs+smy1 l5XiMrttEbv4UyxY1BYfo0JtudyEV6aiaMsBfXFojPYjOgePB+6ykbWL3zehK6C+ 8C3P13B28VXduBtgE3L4Ggb07SWbc/WaVlFLYSwFfq0ZRyvz40n5PVQP5w+0KwJ/ FoC5ep2dPQDkcyR6U7OUQtDo7NrmWdrVHr6fv4NH2K484c/7gLUFtAQw9vX3ZllV DzGLS8UKDixA+dsCdr6fvP2se3ISaxtWi6z9L5V7EKcWY4tK5DyxSdl2keHKebRd Mbd/4A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569486; x=1787174286; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=Wj/hXbyDREedb9rtIp3sbKuyoyc96OWYmMM1MuRH8o0=; b=QR/Yjjr4ATeRLcs+Tldl6o4TouIJu/Q6sYbsFqtqvEP+kBDTlIQzE+dGHaK8VDig4K ZN29qq5fxQboZTYeA7gUbAUX5/DCT6XJ03oPAA1UCjbIgnB90muIE7gRLxq5QKGMdzwU 4J+S7i0OaSSBS5DPTIvI51UC0/TxIcSQ5uHv4TqK69xu1IVlH4Fp28xmqQnkU4XZWfIh 6L3yXWyfJ5blle8RUC/SuGMq8b8bqPY/vQBI5RfkJVz+NrERMo7pOSpDCZGH2ESJVDqN vqD6l80aIesmpVEsGwmqt5VR4fKGi5Cjtby3CCmOB4C5kWFjhrYf/d2P39+/AV7fSfSl x/8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569486; x=1787174286; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Wj/hXbyDREedb9rtIp3sbKuyoyc96OWYmMM1MuRH8o0=; b=j4otxHgQjtgwELszINCN8F1zhJ24UCqTk4tJdAKZD6MCvV0sQ6WREIYs7SGgpd5QFb bfkZZa242RBT4j1iL8dBneY9UbcuS+eXMhSV90qhQWUw75bdWBvIV637+B4qjTKIQlD9 cVfj2/DDcfvSBbXbp57xGu/55K7sDpCJgaH+XBLe9QhNxRFxzCEMDZOmfyFdo/6NOtWP U/t8/mBoVFI9oDoMvp8K/QMqPdt29haDcXtBCCbgzudnlPNzH91OESHfF1IgIkREFD9Z Y1cmoDDkrOJoFZahyFouyudUEz54bgFsYI/EbhTOvr3/wxRnNMmCPRKBUc2zGAeVEYbL GY3Q== X-Gm-Message-State: AOJu0YyxQFOYeKG9FsGtu2MKCM4u5WmlUbY0dgOk1Wocj6SMQHFC9nzz Bl/Zpf14y/SSSW2GF955wGg2GLlS+SOo0L1YKiItWenICf7XzjkrIjNSOdPUTRrNAF8QJXuVFwj oOxEzYxCApYEGFfMZq991AJMGqQEyB5caJIwAbXE0aY/V07nKFB+BgOGVjN/3q588wQ== X-Gm-Gg: AR+sD12Fb+0CBplZXVLwPGEP73lSl3h9Cu9VAR88wJnVSLH57cDDHvDdsbmFReLlWtm 7Ajr7qT85s214u0ls4W2OmHEc3r9zYWXS/1fmWSlMlKdCIRLlE4xYz31SNs2kTqfg+2OHfBeMVk 8bId+q7jygmQxH7QCzgW/GNhTAFoCL70rj0xWajdsC8hUH2RTDbrls8pABq+rQKdiDd9ERhnq3u MxQviMD5IA9uZjNAI2pLTA6eHAOnyGvxMYbISf1wT+GKyROwLHOZ10FX3svY3Z+xomQzjdYfQ8G 61KeM9LeuIgfaaRBJ0GYuZ4ePoUOuobeQdsjtE7DNbKIIqIjAsmIcrKFQb8uYxMJdnQFh5uNkKP QV6UwniglSkLR67WyZ9y8/eHeojPfu8ul0HUk40ElNg== X-Received: by 2002:a05:622a:428d:b0:517:5bc1:e1f5 with SMTP id d75a77b69052e-52d73a95758mr15908031cf.0.1786569486220; Wed, 12 Aug 2026 14:18:06 -0700 (PDT) X-Received: by 2002:a05:622a:428d:b0:517:5bc1:e1f5 with SMTP id d75a77b69052e-52d73a95758mr15906111cf.0.1786569484901; Wed, 12 Aug 2026 14:18:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 07/23] monitor: Include missing 'qemu/aio-wait.h' header Date: Wed, 12 Aug 2026 23:16:51 +0200 Message-ID: <20260812211708.92824-8-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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=YLqvDxGx c=1 sm=1 tr=0 ts=6a7ce30f cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA: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=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX9XroaT8BsBaP CQiuKHcXTDNhsGoJasJrfYwHWP8AikyKnq5kpnNc20Gn3gTR4RUZygHFadhj3H1iljx75RK1HJw O2EmiaKNfHLiIupQCza1Kl8f5NX0jUQtSCko6FwDJ5V3471jOiPHL6i/cgM2aGGoNXOGQEWs0sD TzYQQ2si2uCyiRFzM3MZPYZqVI+bkZRWFrboGT8aZvBlb0NTSedKoXVI6Io06wukd1/xVjGGx1v R2AR7g9BG4wogArFH3UcMccJYwOGP9n9goVqWc5ebh7Ce/0SQSGBltGFcDrJ3MjG8wwYlThMjEh hlVf2QrhQ7x/nU/40GgY/NEL1yNQjePIYMcbOmtd6hLEoMKnHwq7fbpksK5xaRFSAd+lcsN2Vec NZT2s89SBG4lFpaHY+CQXwJDdjqb97Gwk4jaKrAazlrvloWl1CI+NwE2PqqPq8CTOn+jfDRtSQu 4l6FqGpyOQhSfvmlIvg== X-Proofpoint-ORIG-GUID: thqL_DeuhL2WMCqJ3oo1fDE6ZyVM4LgT X-Proofpoint-GUID: thqL_DeuhL2WMCqJ3oo1fDE6ZyVM4LgT X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfXw1lEBezpQ/wb VHUAtrZd3AJbw+2Pjozs1LaLwOnHaowzlt1XNh8QzCAK2X4cK0lhUfmuU9mlEBP/uSTCWN4yv3L sq4C+hnWtRAywuLlpO910pA6gPeNtm0= 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 impostorscore=0 spamscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569526196158500 Both monitor.c and qmp.c use types / methods declared in "qemu/aio-wait.h". Include the latter to avoid the following errors when refactoring unrelated headers: ../monitor/monitor.c:648:5: error: call to undeclared function 'AIO_WAIT_= WHILE_UNLOCKED' 648 | AIO_WAIT_WHILE_UNLOCKED(NULL, | ^ ../monitor/qmp.c:792:9: error: call to undeclared function 'aio_wait_bh_o= neshot' 792 | aio_wait_bh_oneshot(iothread_get_aio_context(mon_iothread= ), | ^ Fixes: 9ce44e2ce26 ("qmp: Move dispatcher to a coroutine") Fixes: a5df506e129 ("monitor: implement support for deleting QMP objects") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- monitor/monitor.c | 1 + monitor/qmp.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/monitor/monitor.c b/monitor/monitor.c index ed195fd97bb..c75ae815343 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -30,6 +30,7 @@ #include "qapi/qapi-visit-control.h" #include "qobject/qdict.h" #include "qom/object_interfaces.h" +#include "qemu/aio-wait.h" #include "qemu/error-report.h" #include "qemu/option.h" #include "system/qtest.h" diff --git a/monitor/qmp.c b/monitor/qmp.c index 338d37cb7e5..6ae1098d39f 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" - +#include "qemu/aio-wait.h" #include "chardev/char-io.h" #include "monitor-internal.h" #include "qapi/error.h" --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569518; cv=none; d=zohomail.com; s=zohoarc; b=UK0yvQxQRewN33QgA1p6q1EErOb5+9wg1hPufZzqCJvxjxJxSxJuUHgYBH9/kwC+0A8LM/YcY55HLwdpWJ3O+4P1YD7+ZyfB07HuOAdYgyUrhGpPlqFRe4v3rUd7AtQEE7sLNCBl5aIVW7IfGoM+RORYAFn1k0zgaNiPmdKYTj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569518; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4jylwJEiWHamFPUImIEYllM79mPGNpY0k9FcLmQlC3c=; b=hAOM4lySec4RrBK3efC2fGgNIMxs/d5OxusMVHVPdroPPRKe7+Tg0g3IxbyTMb7XaPQongzeVMuJYPokjYLT9JuEezkr9hF8MQ4jHf3ASlFk6Cp0EUu0AlEFZBd2KuSSlMAhEeSP5mxSxDBReqHBuPXe4+BPds9qS66X2qTMxRM= 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 1786569518189965.6630952725783; Wed, 12 Aug 2026 14:18:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGL7-0007g4-3X; Wed, 12 Aug 2026 17:18: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 1wuGL3-0007au-Ij for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:17 -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 1wuGL1-0007n6-DR for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:17 -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 67CK2ODV1165237 for ; Wed, 12 Aug 2026 21:18:14 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0sk427uy-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:18:13 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c1d30035dso12853941cf.2 for ; Wed, 12 Aug 2026 14:18:13 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4815a569325sm595083f8f.14.2026.08.12.14.18.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 4jylwJEiWHamFPUImIEYllM79mPGNpY0k9FcLmQlC3c=; b=SanvVAi8p/MGR/ey uLAjV90H6uWfrlVr+aPKzH4G3Nc9EHi6m9ztD0mqMuYgSnvfbhGmmqEFrbV9gfBh JfLj0RoXblxN8/4/+dnAbqroe/FVfCZeykgVoClYRDzDPkigC61DYfg1woDGjlbv oIs5RA/cS1sKmzylTB3L9jkaVp4WHRzwtI6+dDsvV+SzN9MKbdvlyC+LO2svM8s6 vyNoHUfQjH8oTelbjVOEVcMGgOFysunnqwuxtECmG4fRxjzGqKOqFy6bx3eOayWB jjE02ZAou9nsd0bUXEiCkt80SWJ3boTG03IolKakPSDBKu2v31Yre+/eqTlv3N/G dDjORA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569493; x=1787174293; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=4jylwJEiWHamFPUImIEYllM79mPGNpY0k9FcLmQlC3c=; b=Osx1c3lJXgTOP4eyOEDc/AWjUGUNMaSmpSPpTwzZFACtIoO12GKYKT6aFuf0GOzjxm 7cPQlTq7Iz7hSz1rhoDPaeZVpGh9YdpwwKm8HyasjzotW63ABKZfDaVfiFsHahUUiPcM takBN1xdNE+ONlCQEx2FiO8QR5CHeErE2dxlni9jg2bpbpSToBJqiyzXlYTLOZlr8b5E nN/qXbLt+lg0V6KvFQLsyL/CP7a0KxR9oukop1YAHwaumwoCq6IdVKhGMROZXfNHmu5j D+1z8vGUxkiNEFq20yxQQn9W8+07kjM/4sIBebTChnGJtNK2n/qLreAFv1zDmCnuI+EI zLNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569493; x=1787174293; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=4jylwJEiWHamFPUImIEYllM79mPGNpY0k9FcLmQlC3c=; b=XRDefUNlXfz0Srh6Yz7OuBGqLKtlsWRKih8a4sDFhtQK20l5PaCI0Eglt/oRzfIbwM W/f2rgJ6jvry5pBETWgWy3dkDG9fIJRXHPM0yFvBPUg2cPug5EpUaMPNoQgoFKZBi0Pp gMzsbysLloFdM/I5FCi9jL0hhg7ZAM5zYDqAeNugB86IitP/iGqq0V1IO3q5YH9hyL8p 79AXsv+4H4WXTEbjp7rZKp54Eb83KDYl/MkmIypUUpjxREaqJZNaFQjTfgYh/apRup92 d4r7ITDmOLMcRbv781EOir7/6ue3v8KAIhUbjuw3mtmAyrpo3jc0dSob9NzhbEwfPBw9 qmiQ== X-Gm-Message-State: AOJu0Yzm2dVfcoDap197rx18tb3b7S19IqCjNB6SiSgi+hjlKzT5p3Ce eL9QdcIb8ZhWeF30+FlDO1AxpDZViNgcD2r64mkTmaJzW8o7GuwcrPWnLOH9L/FUBThnwTtijIv X06kDz153sEPb3sAnIFh3Bk2/YZFuqYTo/U6wzWxQ7YtU685SNRavKByG2HLT9UIgWA== X-Gm-Gg: AR+sD11iLmAGNBC8EiSM+DShxm3ZAGi+47vwDZpgwNw3idrgbUZHGQx3vGp7XcZg7sq 55wvIKP5SpQ1mefNlbi43bo2b0CnuJiJ3Eh6oVa6AVNp0aq0uwo5BgMJznqkp6RReTnI8LFag4T +gsfsu7/CoWkaPhvnoWfXhMyUklleAcBODsKGvETOtleu0OYPgenwMc+T5m5Wo4i3hA48Keo1TL hc8IjR/awsvbgXAcELCt1d3mW9fmTYDDsXw3Z7uxRpJ+m5W2rIF/+wzq50KRsEDlcQZxrE/ZpP+ njw7EewT7bmx1egVUNzWdHj1TTmbaeQ9086bseQMPwvnOlUcPV3mli1MeZfJr+FnKWXm3mBIAC0 oPmmdSvqm511hB0Pw6HAMuKcsR6eR6a4zgHrmmwExWg== X-Received: by 2002:a05:622a:58c5:b0:519:efea:cf41 with SMTP id d75a77b69052e-52d73d93652mr11324701cf.28.1786569492782; Wed, 12 Aug 2026 14:18:12 -0700 (PDT) X-Received: by 2002:a05:622a:58c5:b0:519:efea:cf41 with SMTP id d75a77b69052e-52d73d93652mr11324231cf.28.1786569492345; Wed, 12 Aug 2026 14:18:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 08/23] monitor: Include missing 'qemu/lockable.h' header Date: Wed, 12 Aug 2026 23:16:52 +0200 Message-ID: <20260812211708.92824-9-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: NJgqIa8eMeN3GDMumEr8c3ZAjQeJTEnv X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfXxgNN8hJAcaNu dixh2pipuAGcoRJ+BntAssF53H9cZ2eIvwBfWx0do+xlo4uN0JbSJt6JLr0lTXV4RwQcVjnQRPK SIsyuTu7wGyXyr4JazlF8cR5KCsxxyJRKJwKYGKw21Gs5TfKcoRMPZe8CwzXSzm16cSWQxOGKYL VKSosyLAJ7m/bV8yYeJcakdc1cf5OnXd4avBWfA2bQvNLsGguK7fbQu/1HEwzgHy1mBQPCIX66O FvR0gMciOBXntiEqOu7MeGVj/NDZnGvIqkU9nVUa4bNDQZCtc9p9MNKQt0L16wRved30g33sz4u P54g2HtCnmE+jvgAUsnveO/Ufsgpq60DlGg5cR52JRbhWLKW71Q9fofTIANEQBuDOUoQWTbsO2S pNLl0UTy+HeMjQA33pVYoLr750ewvMt5sP9TGJPuk68ogc5xKT4eXbFrfACPKuISk1qC9qQ7RaN TMTfVFtcFkHrGcD7BOA== X-Authority-Analysis: v=2.4 cv=E8n9Y6dl c=1 sm=1 tr=0 ts=6a7ce315 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=_5bDPQybseJbp6lUwYQA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX+cEuvQ481cJ/ d4fPEY6SpKfTvLdCAEDr9r/lylzlugG6t6rX9K+iAA92ozHEJZSqPI135VT8c+kfTZjAThrwiZl H/w+di/GHu0OkaiK43hH4/Xs5/vx28E= X-Proofpoint-ORIG-GUID: NJgqIa8eMeN3GDMumEr8c3ZAjQeJTEnv 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 bulkscore=0 clxscore=1015 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569520317158500 Files in monitor/ use the QEMU_LOCK_GUARD() macros, which are declared in "qemu/lockable.h". Include the latter to avoid when refactoring unrelated headers: ../monitor/fds.c:146:5: error: call to undeclared function 'QEMU_LOCK_GUA= RD' 146 | QEMU_LOCK_GUARD(&mon->mon_lock); | ^ ../monitor/monitor.c:176:5: error: call to undeclared function 'QEMU_LOCK= _GUARD' 176 | QEMU_LOCK_GUARD(&mon->mon_lock); | ^ ../monitor/qmp.c:164:5: error: call to undeclared function 'WITH_QEMU_LOC= K_GUARD' 164 | WITH_QEMU_LOCK_GUARD(&mon->mon_lock) { | ^ Fixes: 0210c3b39be ("monitor: Use LOCK_GUARD macros") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- monitor/fds.c | 1 + monitor/monitor.c | 1 + monitor/qmp.c | 1 + 3 files changed, 3 insertions(+) diff --git a/monitor/fds.c b/monitor/fds.c index cc35d2ec334..abe5f13487d 100644 --- a/monitor/fds.c +++ b/monitor/fds.c @@ -29,6 +29,7 @@ #include "qapi/qmp/qerror.h" #include "qemu/ctype.h" #include "qemu/cutils.h" +#include "qemu/lockable.h" #include "system/runstate.h" =20 /* file descriptors passed via SCM_RIGHTS */ diff --git a/monitor/monitor.c b/monitor/monitor.c index c75ae815343..6af09f2f6ea 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -32,6 +32,7 @@ #include "qom/object_interfaces.h" #include "qemu/aio-wait.h" #include "qemu/error-report.h" +#include "qemu/lockable.h" #include "qemu/option.h" #include "system/qtest.h" #include "trace.h" diff --git a/monitor/qmp.c b/monitor/qmp.c index 6ae1098d39f..aec03157750 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -24,6 +24,7 @@ =20 #include "qemu/osdep.h" #include "qemu/aio-wait.h" +#include "qemu/lockable.h" #include "chardev/char-io.h" #include "monitor-internal.h" #include "qapi/error.h" --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569539; cv=none; d=zohomail.com; s=zohoarc; b=lEnKsSGcfSmcY6zZRylfZ4EW42KrQkXp4RmjdgtH1RUhTF+YrIXnPhfVxo3xLmfiPrGOWaL1HYSg6yVSE/pQYVUg8DeUysVHqlA+f92U3bagoSVTZn6CcUSW3SVxb1c9bNgup9HHpg7iQ2aUGgh2ss17+5BgAJUShW4nSraI5BA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569539; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QS1Cy5Kr9ojZJTzD0MEMOVSD2Z0r9Tx5Q6QJdnTa014=; b=JWvcT5ebJaCjlx5emEJHSnKIqIF9rB8xu+2RGbsXi0cYSktbkVzGGiv/ai26isMwkch7wssAfuYv9mpRxF3+8wYKps7IlRylUBHQNiPqU6mNCzAE2w035/16p5swU2DiRW7A2gIgDXGbyxAK88pItjs6HOFmNJmDYf0FU91EquM= 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 1786569539439739.1057040415186; Wed, 12 Aug 2026 14:18:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGLJ-00007R-OG; Wed, 12 Aug 2026 17:18:33 -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 1wuGLH-0008J3-Gz for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:31 -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 1wuGLB-0007nS-Mh for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:31 -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 67CK2bWG4038374 for ; Wed, 12 Aug 2026 21:18:21 GMT Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0mndbfns-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:18:21 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-51c12e43b98so17360901cf.1 for ; Wed, 12 Aug 2026 14:18:21 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981e4435bsm5420205e9.3.2026.08.12.14.18.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:18:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= QS1Cy5Kr9ojZJTzD0MEMOVSD2Z0r9Tx5Q6QJdnTa014=; b=Qovj8nLPF0eN8J1v 8j4LTkw+DcDyThvOGCa21H4nkBk+aykZyPoIA3a6D7NF8NS+cCizt+v0moYOJceV ByRg+O48ZZ5LagfXH3RKEaSBbFBIscEEC4GoakvZ28/PCZV4typiBnAKdz5LuRIM KZqxCCbE38bu3tapMsn/7/NEM8ytI1rtKO9aQPHnBDqmn1J0xNZaGj9sWcSIpXVg MxRp/LLOr+BqjF2Ursk4zeiLPQV7pMgRnn/kXTJJ7FmAkR5Vy8hJQwB+da59qp5Q xvYK0I/USz1jz+Fi97WWGOlCExR2scnTcOHVJ/Fn+WoKX9nCVgGnLZlrO3GcihTO dzy9tQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569501; x=1787174301; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=QS1Cy5Kr9ojZJTzD0MEMOVSD2Z0r9Tx5Q6QJdnTa014=; b=GsRRWycqWQubMn7sxvC7zRTAvFiImcX7cUIxEoq4qiP9BBy15WJYyW+s1u1cVkpN8Q +mGBwh+S0oWhgb+7XYYrK/VEZOjKQ7gRnCLHLgOTrCP8/SQqpsrTsB2kHcsd7LUjYaZi 6Mm3gcCNLkfZOfGGAY9VGqc1NSzo49wHYDsAlpLvZLVRS8FPmh4v7VIO4XiDocdGxBBK bzptpkjBWQAUTYIs2QQauKU+A1bc9LkAmm1bxLQAdXgOSno4ul/ur+tl5VgjN0aCI0Ar FCi8BPS8/ufYiLpL+5fzBCE4JKb3pqdj+CSsit/WMthQ9xmSwoE2B4KqR6QeMGgCgEXF gFAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569501; x=1787174301; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=QS1Cy5Kr9ojZJTzD0MEMOVSD2Z0r9Tx5Q6QJdnTa014=; b=SdQ83tbvuLHDJYtRSuHekAYkkbH5OEH5UXVYIk+cjkjDqMZEKabkxdiHGcwd/+4sLJ XrJ7+x16zFuy4YW694k65Rgf5PExvq4GnNI6R/NcXa5O4ggZvlJ+ucIwVWApanHGgSqQ bz1AsAbZRxh1X+cR2/13950VhEePqAw1sYEc5N8+QG4ND5yosYxJ1AeZe1fvpuO4ckNl U/BM8aNwelDRPt6MSO6GjLbykhfBU7GMLaMeWxvtkC4QRIQfclCT+8hfKXd2F+sy8aBS OpuhAfPe996tAjy8y2tGf4lCqsJ/0lOTUmxEn6iIu2nwfp1535VMCdOpssFtPNAgmtJr 1l3w== X-Gm-Message-State: AOJu0Yx83++7dILNLpab7kzxseyGzu/nndd6H8dCuhq07SKNy0UZu1z3 tcsuhrEOBRLGsArLGp18M0oK4HqF83UvjbNgh0zxxEe393S30hVxtSo7CQ4jOmudpAiSryx7MrV A2qapICKxIxYkMXE0alFnyvw7vQQhNboNJ0CHVrfdzQscBaREow6ROi8NWJBsYnpDZg== X-Gm-Gg: AR+sD13ztpsWH3GzLtNORbnsUAs5oQVimc1bAWkZxyitB5S9VFSuBNR8tSqLKzfXiXL jZ8c+mbWRWLjGCRF0brQ7Hl434gYuR7LoyNI2wUFKNkWepFa5KSY2NPCqwT+UO1HNyElkr87Avy +E0It/CTF78aRb/ZpxOemsmlcZayKhoMZnkZtgLAJp3g6ozsbDQ5TfNBkM4LuMfMtrdhX4UTrIL 1liCeIcPkXByuyLXsObk5d0jHPB9hFcsTT1ehuzQBianXTOOLrLXMUHHzfEwE6yYTCzCoDSK+ln R17WUilEN32T4lsOwXcTAqEn/NIRn20ye9+ZxmkwEDd5E+0VzwuyN7mKsJsUipTy/ZP+YNWIF70 J9EFcEzIxYdyRiFdCvls9bspEQkb5hSMQDdvmVGcq/g== X-Received: by 2002:a05:622a:3c8:b0:51c:20:aea7 with SMTP id d75a77b69052e-52d73c37b4dmr11151101cf.9.1786569500760; Wed, 12 Aug 2026 14:18:20 -0700 (PDT) X-Received: by 2002:a05:622a:3c8:b0:51c:20:aea7 with SMTP id d75a77b69052e-52d73c37b4dmr11150431cf.9.1786569500202; Wed, 12 Aug 2026 14:18:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 09/23] monitor: Include missing 'qemu/coroutine-core.h' header Date: Wed, 12 Aug 2026 23:16:53 +0200 Message-ID: <20260812211708.92824-10-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX0b7xGU4s2jIt marTH5PmMezau3bfuBXBP0B8mp1zpfxDsYAPYEmEY6rp6AI3ucthNGvSis1rr+O7NSDZggaWlOs xadQSeu7FEW8R+Euy90gTzoWSyBmxdA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX7MWHOQLa9lGV KUYGMmLn5VzlnmYXaNiYblW4cv7yP4V/7OjA3TlZH3f5H24uOoohfyd1EbhGod9nLE9Wpjcdjfv dblU5W1AHvWddWtUJj6LRGZs+WRGuAby+zfFJ+tSAkY/Q2Ba24kGQ1ZnVSNig4Ruv821ODCjw6h ugz/uJbYx8erWXmRx/Yd72BprYvzzSLZei9DQfgwCZyrSrWZCZST6FHinTDtAXI7XirrWTrLRqw z61uBI5vQ4g5vd1wamGz9Jgq5PwqGyRreF7cejyM7DtGMvXBTFyrDYDGNc9CMQYIi2JXL+wt+8Z VATqq4rZw4TbJGJEQhF3OF3EcnPF/n1bwZ1n9qRmRJlsL0hAoM5S/Yv1zOuGCGms5nQo2IIgn0A Qp3ibXG32X6MAT+sQV6DIahuDOxhGX4WbFeMHNjx0jWMjkVA+MUDH9IjDclKDChh87/Yhbw/Ab9 SPg91+BKtfd0sjX3aDg== X-Proofpoint-GUID: LrJKsydu3GQDaioie8ufAIo_JW-M4I7Q X-Authority-Analysis: v=2.4 cv=C87ZDwP+ c=1 sm=1 tr=0 ts=6a7ce31d cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA: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=tlxghdvPRZsVr19qFskA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-ORIG-GUID: LrJKsydu3GQDaioie8ufAIo_JW-M4I7Q 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 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-2608120171 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: 1786569540484158500 "monitor/monitor.h" declares monitor_set_cur() which use the 'Coroutine' type, itself declared in "qemu/coroutine-core.h". Include the latter to avoid when refactoring unrelated headers: In file included from ../../target/sh4/monitor.c:26: qemu/include/monitor/monitor.h:32:26: error: unknown type name 'Coroutine' 32 | Monitor *monitor_set_cur(Coroutine *co, Monitor *mon); | ^ Fixes: e69ee454b5f ("monitor: Make current monitor a per-coroutine property= ") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/monitor/monitor.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 890497b0d22..efdd2165aa9 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -4,6 +4,7 @@ #include "block/block.h" #include "qapi/qapi-types-misc.h" #include "qapi/qapi-emit-events.h" +#include "qemu/coroutine-core.h" #include "qemu/readline.h" #include "exec/hwaddr.h" #include "qom/object.h" --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569533; cv=none; d=zohomail.com; s=zohoarc; b=M3iWvJSriG90wGaAglnbFDw42dt78hoUQMlI2F5sRKqUW9N6T5/FhxYtP3NOXNlPCFNl49ceAJ26zveObqvMVytw6nqXgtPbsT4jvW3xT4HjGhvckhr5jrF0CXMGcgvdOTSujbrKByQVz5GsY5wD/cx/Pm/qcBF5vql1N1TvCOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569533; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PJgb4ZmR+WskCzVafLInG1mhyEcJ7bjBiV9xVtr4/Bg=; b=Dk1h5JvvsF3RwJ6TtPaf38MtXKmCRTvuZzZwJJlUE0RA8/8biQx6khkPbJFXxxxiKdCrVfiCmBysdAHWdhHq01coQjkKIz22Mvy1tZhBreYg0wI3Ld9XbdqYNas0znHEwuR7aTCCfZVLfSfWzmlZwGXeZXIkCfYh4G1I0BYr5A4= 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 1786569533017634.7670487706652; Wed, 12 Aug 2026 14:18:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGLJ-0008Vc-8b; Wed, 12 Aug 2026 17:18:33 -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 1wuGLI-0008Mj-3Q for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18: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 1wuGLG-0007nr-EE for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:31 -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 67CK2QPJ301087 for ; Wed, 12 Aug 2026 21:18:29 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0pmytx9r-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:18:29 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c12e43b98so17361811cf.1 for ; Wed, 12 Aug 2026 14:18:28 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981d9613fsm36963725e9.0.2026.08.12.14.18.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:18:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= PJgb4ZmR+WskCzVafLInG1mhyEcJ7bjBiV9xVtr4/Bg=; b=Ug0yIDa8A2L769Nu PV3vI3hxjFAt/9ygRYAo/kU6YQfkWy4oeWIGi9LUfxIAyMdnv0H97xXoCZV9qGTb EoH44ccNAriEeqQJab5w2ustibJnohYYmGODUMJMMwkxyHDpzh6Zwq2CyNtp4LVp xQYmkhQdQs7rZ8Y1Xxvhv1zG5cMJxSg1CcXExTIPd8n4WifWPVjDrJtWRcZaeyFW 7XYZ2OAbGL0kGoXnGE4+Nmo8A1XjtgpsGIFOPa8gBQlPcLOMYMulCHN9JywhQCoe XmmLXUIFmdBs2yMgzIeyd5lS4edKR03SEpH8uNok1uboMQN3axNFY1NutAjCGvJT 550qGg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569508; x=1787174308; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=PJgb4ZmR+WskCzVafLInG1mhyEcJ7bjBiV9xVtr4/Bg=; b=OXShCBsEJVk1ybSKwmyUWBmQCuOExDwr8Iomgpw8fpY845iyFNTu13LdAPOBjhrsUx +XNmPLsJNFWKp0ob62Aplx7DJEpHyjxhuQWmMi0ObyUP3qAXr9QDVZi63vcTKnbplk8q FouxA+CYyZ8vCCJHv8YSo4OrEIzh2UZXfZXbgPz59Pn1FIZoVtSUg8YZmFGPQqY10l3e Tva7eG7PE4VsVcKsUHNdA1T2vYbuAcaD3WDIBd08yFbhqzqmtSM6YRxVP9bVVdM3x2+5 rtcnotu6Z0K44IxbsexpgwrffrzBroDnbrNlFmw0y/WxII7SSHCBEVMwcwaroFTgDzop MVgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569508; x=1787174308; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=PJgb4ZmR+WskCzVafLInG1mhyEcJ7bjBiV9xVtr4/Bg=; b=qwbVkm8eX802IGWo0v6RNJreFFBtUTRr9rtJO3aFvMdT73X4zI6zThl/HrtaG2waBK Ci1LfbIBmUixx3giPTD+CAIHyZkPZIGgMaeJFie3uyawr1KR62hcnePhNMGbtDwjlkDv BBBOQ3FYAwS8/uVkzCrGztkNorVd2FPv9+I9BEhqjR+FER9aosMQXp553RHzAch54nR9 ueQHkz1b37X1ytMQu6mYkU/8aXjG0/bPuXQBA7F34w9gIsg3Mcl+hn6V0JcLrCiw9sQa pEm5Ng9l40CB3UoR1NMjkrR/3YEAFyWwYJ8p4vnpjTUGOkY7S7NvdId1OUoF0I1O+4to uZcg== X-Gm-Message-State: AOJu0Ywv8Hfw9NyhuagcMpKNoyaQ7ylXLKbIoFyP3f0cqnBGDrqzwPZs kzAVwJEHkKTc+b74wsfVNkbFLpdWO2WGRX3AHUBBF3oLAYSkgsc4vyExNb25KBD0ke90fVrQVXg GnWrfuIqQZFleUjhMTZx27p6/3Dz2rzjEdb2IAeulGdYBtJZnK3PmrCjwju/MQJF0NQ== X-Gm-Gg: AR+sD12T6+PQJiFtkP0ytKK0TP2ri5r9/Vm4CIc5zon0ZRmrj0272Bwa9NX9oEHk9YT Yv3K0KRLwWyRO5ogCPUFYekTZIuCZo0BEJEaEiSlEBKn0TNIzsEjCnAZDloRT9SBASDTWTMLmgF HZGPeNH0BK4tWdmMacH3GAx8Y9reHWqlXludZkGQVgf95DOOoKdPf1/ghRdmSPeFMWZprPA6aCt pcQlvZ0MjCBw6YL0o38/2xcf3WiZQkgP3W89cL5/6/F0IugOswKQQ3OOo+mUfpvy97637qNWGFB PXyHO7218j5h/XJdXYJGYQ7gnVZV+YR4s6wBupw0ajuGsKx0lsdgtOLdBipPZHxylUNbmO8rU1g 1NRmQvDgESP/PBmwT4Cy3pnTY8BhAu+YUU3YT3Bxk7g== X-Received: by 2002:a05:622a:60b:b0:517:78c7:d93a with SMTP id d75a77b69052e-52d73c86a1emr10400711cf.16.1786569508044; Wed, 12 Aug 2026 14:18:28 -0700 (PDT) X-Received: by 2002:a05:622a:60b:b0:517:78c7:d93a with SMTP id d75a77b69052e-52d73c86a1emr10399901cf.16.1786569507305; Wed, 12 Aug 2026 14:18:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 10/23] monitor: Reduce inclusion of 'qapi/qapi-emit-events.h' header Date: Wed, 12 Aug 2026 23:16:54 +0200 Message-ID: <20260812211708.92824-11-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX5FvDkgdCGiaj yRjyuEoUH0HsEe5Ohn8hZT2gn1xpq/kaKk+hdQ+72ncu5LmHX38bmYP7Fo9sGHea02zVqTgVf8I v9XaJggAJs1Bef0eCvZHcA/mVd6o2/A= X-Proofpoint-ORIG-GUID: qiFIQuZW_WuLexxkueBzj7wXdSvFxQyE X-Authority-Analysis: v=2.4 cv=C/fZDwP+ c=1 sm=1 tr=0 ts=6a7ce325 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA: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=tlxghdvPRZsVr19qFskA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-GUID: qiFIQuZW_WuLexxkueBzj7wXdSvFxQyE X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX9QL3bRNM5Wnr RbigPK+KkJUlseDA4jcZDZg5JlBRzaY1jFnUSTY4TAREa5PcbqI1tj7nCQCptKEwyvvbqePmaBl kXeNQRDQaqS9eAkVC7SMRV1qQnU9zhu1mQI+luVA8nhUadJ73jr44fWEW4e4jUr4YOYvP2xoq74 YMh6eQL666A5tUrgdwnjthVe0TX3n+JkGj0PS7w86iahv16Hx1dhfz3koiZ1v9ZZxJWeERDKBry 3vJ0Vq7zFzC9YaDbT6PKGR++sr1pkPecHUcON1dawtQb6h/2A46zmjaaF1eEkm2fFedNY9RkHMY XYjskK7K4Wdkj3xEIGoUFk2XgEtY+R5W8f46qnT4UOdfF39S6T7FhiEtecZPWtXBszVQi/ZpCE1 jhKcKVbOXEugoL2yqPFpsSapqOz+YBWess4mWNzTdLwfOL0pMOjRIHkOYPsy+BA6DERHeDqhyQj peXCo2ehDJFMy296uTg== 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 phishscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 lowpriorityscore=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-2608120171 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: 1786569534225158500 "monitor/monitor.h" don't use anything declared in the generated "qapi/qapi-emit-events.h" header. However the "monitor/monitor-internal.h" do: 107 struct MonitorClass { ... 116 /* 117 * If non-NULL, the monitor is able to send event 118 * notifications back to the client 119 */ 120 void (*emit_event)(Monitor *mon, QAPIEvent event, QDict *qdict); ^^^^^^^^^ Move the header inclusion to "monitor/monitor-internal.h" to avoid including / re-exposing unnecessary declarations in the global "monitor/monitor.h" header. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/monitor/monitor.h | 1 - monitor/monitor-internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index efdd2165aa9..fa9f4a8a75a 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -3,7 +3,6 @@ =20 #include "block/block.h" #include "qapi/qapi-types-misc.h" -#include "qapi/qapi-emit-events.h" #include "qemu/coroutine-core.h" #include "qemu/readline.h" #include "exec/hwaddr.h" diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 23829f32f9a..bc0932c425a 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -27,6 +27,7 @@ =20 #include "chardev/char-fe.h" #include "monitor/monitor.h" +#include "qapi/qapi-emit-events.h" #include "qapi/qapi-types-control.h" #include "qapi/qapi-types-qom.h" #include "qapi/qmp-registry.h" --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569562; cv=none; d=zohomail.com; s=zohoarc; b=FhlLhZw/jLVpfgpidW67+rfvCf3Z/FwqY/kk7BoWWW+i4s7occpEUZuKrptxYr5yMHS09Q9klqjcD2gBz5dZjIar4VWSUhYQ3lCz+IxaHANS7m6NDkSRBtGyjngYvB0+1TvCzGTdJTxdyHOGx11dNTEXSzAxWzV92YUsECMRq3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569562; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6pUTbE2syqmA7oZ20AgG6JLbEPFbMRRLvqwwnIBp3hc=; b=l+6c7jPElo2XcUY7tTJjSFaMTxEgfflRMdwcGru12vKkznDp7dSRMPE4X/UsOKLmHZi8/xN2r/ss9lzOD2em89OG0ciHfoGk0/xmOSNMA3czso0PWG3YsxbOXlYFepUkAvhCU77aH8hH3aC6r9T3dV/xpEsogIsxny9mVPWPBNY= 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 1786569562617878.254950689272; Wed, 12 Aug 2026 14:19:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGLs-0001kM-68; Wed, 12 Aug 2026 17:19: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 1wuGLX-0001CF-GN for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:49 -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 1wuGLQ-0007oo-F0 for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:46 -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 67CK2X5U246457 for ; Wed, 12 Aug 2026 21:18:37 GMT Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0uts1eqa-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:18:36 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-5174a236220so14456851cf.3 for ; Wed, 12 Aug 2026 14:18:36 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981ded713sm8617665e9.1.2026.08.12.14.18.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:18:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 6pUTbE2syqmA7oZ20AgG6JLbEPFbMRRLvqwwnIBp3hc=; b=RzSp0n8fcQCn0IWU MYIAZ0dqEQk9OJ5x+743cKNIYC/QhTpIfbeqibqGvE7EbiA5mSyERpafG6+FdL2m NDr6vxNAqyzLicclvcIdGtTNTP3/jaFkeKeiass+TEB0Yza7P5GejZmSRGqUIYwi DWUB4dWqBm9WH+2ALpTtZQ2GpNaxabP/J4N9VRJSYilPZ30Cf7nYyxBQP2Il22ke G4RzKZvJ+r8fMfLT8m9k2chNKPkeTAtQ5o76ep28ChVGIjdR299K+jTRjzCiylVT RNwLzy3xXSqv5HAVan4YsyNnAteDDUBhaGF514N+OuVWi0OUxwMcMQWR0b4VwflX lznVsA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569516; x=1787174316; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=6pUTbE2syqmA7oZ20AgG6JLbEPFbMRRLvqwwnIBp3hc=; b=S7QR309V8A3/SbU91kcIsNOslDoZIZAwFYe4rwcQjYWQib0V6rDfMYSe0DzOm863Wj FHukVwfk7bgNrAI7IJufdz+mxpOJwfuls4W9/f6BN7Tat6/LIlw5/LKLmcc8RzdPsRkG LISBl7PFDzBNHp6XOia1+NZ6WWvIzKbLdhWK47+dmv6wzQeGiMZPaox0ttKVrUUR5vtw 4FjYVqJJUZjxV4PmKxOrDzD7FEBbBvXwxEJRQoVT7EfIaoRmyuhpKbV/BhHvxQMju/mX tCTKM5MAlOSivJkL6Q09JC7SvikBUtrndwOkfwx4axuUKoANlIJSL46AL4YHvtFiCO+/ P7Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569516; x=1787174316; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=6pUTbE2syqmA7oZ20AgG6JLbEPFbMRRLvqwwnIBp3hc=; b=VaRLz8ICpZBOvhanyc6EMUA/+Ww/Be24zrfUCUfRljYP1xa/7d7Q8S2nWF+dsnse6Y bVbJKr6qOP/D5X4F2aneRZ9U4OL8EZAcQYW6DyP57jeFqJprANA6PCW7GjAYWl8fLRjP 9a83uE8joCQeMsldaYcxp4wUzlHaI/it+C2PTNPyQKR0re1Dn8sR16XpK0KrtTTvPzko 6LIBHRavoUvKZa7cipVWcaxECvZvCe9R7z+rgx03aW/PRs4bmx7FudDzohLE0OSloR6P ZyQBH4Urm0gJy865Cv0dHIEeReWvXTanr+sKbEDXq34djxKTn5k83xZExY4XJkmT9nQB Xliw== X-Gm-Message-State: AOJu0YwKwrBXV24bOi9BV4zsBp0wQJEVfmere+Wik9cdUX1K7AckjuM5 rzXKqVvzpBPXnW8rGwnJ4F7GJcYLchaC4fWmatyNMPvBRDu0FUY0gaq1HliZ+4q6rtB5S/SVqmw AwoaYnyK5StQZ8kt9JGkAxuk3U50FaDd9bQItspgNNspG4BikWGH1flzvj2TE811wKQ== X-Gm-Gg: AR+sD13whzSXtzorab/SMOMB7E+pMSYR5RKnQ1rLF/W2PkEgVVe6V11vkvV44R/RXxm 1eK5gmSdj0BPwhtOfl5P3gzRfxmlsqBujMVU3MGxS7bq6OADe586wjBvJwR5l8EEgYq/LmPTD1Q eRIz+t49dIVC/a0C3YtiU+p1RpTLKHc/K5hHkE3OZuFFi0TPLQLV5LmRDgsOXWLtr6/OvvMrZc9 rAEX7l2V3btb6WTXEKzwpFEGsf3brjLY1Ika6wkKwP7LPe5vmZLMBfsJpMfeHNt/o2J+Tcf1DyE k1zyxvKTxVUU/Tu7V1GQhEPJ2pIMRpZkyEN4zZxKS8k8JUuxWZz2+N1s9CGyLD2Ezn8P3umyEdt 3pa8ka5m78m5l8cbcV7FaTR1IXZ7f6vMd5wwNBNcyog== X-Received: by 2002:ac8:5907:0:b0:517:8011:3a4b with SMTP id d75a77b69052e-52d73d8a4e7mr9618361cf.21.1786569515619; Wed, 12 Aug 2026 14:18:35 -0700 (PDT) X-Received: by 2002:ac8:5907:0:b0:517:8011:3a4b with SMTP id d75a77b69052e-52d73d8a4e7mr9618021cf.21.1786569515157; Wed, 12 Aug 2026 14:18:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 11/23] monitor: Remove unnecessary 'block/block.h' header Date: Wed, 12 Aug 2026 23:16:55 +0200 Message-ID: <20260812211708.92824-12-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: Dlq_adkXCC8N9-rDauQiEb-33TQEAp9k X-Authority-Analysis: v=2.4 cv=aPDAb79m c=1 sm=1 tr=0 ts=6a7ce32c cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=neFa9O3qn1L-Jj73aAYA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-ORIG-GUID: Dlq_adkXCC8N9-rDauQiEb-33TQEAp9k X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX01DXoLM1UU7I iqkvnMwjsOOlDLDVaON7InZ+5fCkdLvgaTjBKcgN8YFfiR9Jxd9Kmw4jUTfsVG2N23h/ViMsYQ0 8TSquv1ZnjWHqqkuu+GTbUIzXRmzvEc= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX/fh2EFjX7o6F wxq1ciuTkpKTRusKAnoyv0O2H/wuhAyxaHXHJt6mKDKUCPyKNHeJDVpRiLWfXFMBbU2c6Ym+FfP SH67mCMGh5T95rsJA8TU/cYQfnR+BI/7V5A6XOjlTm1MDOdCi7SbCcAsuvqNrNAOwl6haLutY0t /lA9rAzXhUMQwb1As+jT2bQhVYJYh7AuQIVYRbvIHAv+nLb+Sa29i+WDn+H7LRoyV+umlDiiSAO LfcKMkyDSKDNrRqE7kT8ofc67Wn8510XJCfexhNODcnnvFlwDeXiRLHOFFpZkB0uDn7uI0HoBsv or1Fredx88miht0DEa0AGVauND1y4OdHnMK7F4FRdSzc17syHAkGkMnQ60bvlpV0J4IY7AHvmbq XSJoQPUkPNCKB27G88rwfKuQBThh7/ckTy5IKGZVb2xd7Zfs8CK2u50pFlvL2PA8513vBTD5r0I 6DBJVLXOu+RCJjSgbLA== 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 bulkscore=0 suspectscore=0 malwarescore=0 adultscore=0 phishscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569564362158500 Nothing here requires declarations from "block/block.h" anymore. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/monitor/monitor.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index fa9f4a8a75a..fd98ee2c71d 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -1,7 +1,6 @@ #ifndef MONITOR_H #define MONITOR_H =20 -#include "block/block.h" #include "qapi/qapi-types-misc.h" #include "qemu/coroutine-core.h" #include "qemu/readline.h" --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569547; cv=none; d=zohomail.com; s=zohoarc; b=V6kOQ5rewJkJ/1vbmKYXZvOUjW5tOifHeXmW5YsrXg3o4F4TyopJOp+hsU+JR77Wj8cfpL+cDx7aGDJp5TbNjliWChU4yuG1nxp+DAzRV+JisSMphNHr0BvJmpwqJtygp7bmDD1dzja0AAn2ygS5fdi1ObeVjwcVpxo6UfGFDbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569547; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ONOj2kSqH/Uu4Rdc+2HQhntXUKyktLF2J9FIRZo+Slk=; b=DRX93Gt6VmysJ+t7KjNT9kN+QcC5Bm53NKLBs8FKczvIATp77tv+konjRlAhv2WiQACu643TgWlbz6hCcNYOMu4Mvz3OSRQPuTfzbz0mzVoX6Dgf+LixiP2dGxjF6SOxjA3WPTlHSHzBlkHtTVtqnL2uqNwnoG/01sMzdx8hzJE= 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 1786569547450657.1291503192773; Wed, 12 Aug 2026 14:19:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGLk-0001fS-Pq; Wed, 12 Aug 2026 17:19: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 1wuGLX-0001CG-Gk for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:49 -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 1wuGLV-0007pF-KR for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:47 -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 67CK2Mew642256 for ; Wed, 12 Aug 2026 21:18:44 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0wt8rrmh-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:18:43 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c1d7886cdso244841cf.1 for ; Wed, 12 Aug 2026 14:18:43 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981b1bd61sm14922645e9.8.2026.08.12.14.18.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= ONOj2kSqH/Uu4Rdc+2HQhntXUKyktLF2J9FIRZo+Slk=; b=K7BPbP2RDOvUu2mP XGcMhkftJ1d9TDBlaLtaHQkfP4cV11T0PAnbMHyL3MT8KDD+AS7h+F8hXwxjqjiQ WLNFzL1k7jGr1vfvY073pRwrPSFM8GyajdESIK3YBBR8jaqvfV8FAKItkumC1I0H 1GrcZux981DHaQhJ/jK8XoAsjAylQ+hz90QIopzxhygS1DQhawwkIs9E3pCKbB6m /ThzX6xc0fbOgCZb92eGMaVCrLBqDc/6T1d2RL25d5hOHSR97IsFrOmuI51LkhUh ge4T+GIDL4ParvcmUDeVUALNpnZHMLtmCcCv9lQKWeBy7oP2ZbJfXiK7ECxTXprb BCPeJA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569523; x=1787174323; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=ONOj2kSqH/Uu4Rdc+2HQhntXUKyktLF2J9FIRZo+Slk=; b=OR0Fryv2SCLtmfiiFsCRcYUkGdX69Bx/9f67+JOBqZf2IBGD3jsxkFHOJIVDoYY/w1 xU2slZEyPM12O4g+t+YS04FbjYWv1hyKgnhhQiFdRUaDZgN1jitEQPiqKMpd3svuQaBQ j/XVKc+x99XBvXMJqxoCqbw7bF38xZ2URI6gPOzFYKCuaumhydgcyndxUx54bntgBtdr I+oWOZUYDLGZ/+/7UJixTjJzOh08dQe8gziRs98IWEuPG9hkgVf3ua2vOLyNx7hiwYZ4 CjY/XPpv1q9d9doysbJCxF4yZKskj5xC3ooGCgA2gY1cOTyV2nivdeQoj0c+cRHqiMi2 FOHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569523; x=1787174323; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ONOj2kSqH/Uu4Rdc+2HQhntXUKyktLF2J9FIRZo+Slk=; b=rwMbk6hbzle4zG0iPA9f55dGbY4T/haw26fORjgItMbUjsi3W8Og5hlp+q2kY1zX5f RNIPVCSHL0siIg/CTpNN/6i3kXbEWDDcCkvqsnQbazg+ZNUXqZ/tdqH7HHsmQGpkHp7M NYHKeuSdd4A/745L+HAKXaMcKy5eU0bazJmXWfuJmRfISFOMjVOmyaF57ylrV+9V5lpa nGymui/2SEUc6+bXNaVKtFcg849m4VRDc6JPEv5TWSUSU5ZVNHt7p/otuF4Bbkpw6m5r GA5+p/bJDwsPLwp7tX7fd8JfetVSmnN6zmTBzUsBbLrQ2zBDH3dF+7fnhgW2vaWMQSLJ MZvg== X-Gm-Message-State: AOJu0Yyl/j2XmeZt6YQxIK3H1VnjprkEx21DYviY62tpaNgqwNHSAgYh Uv8FUzI13JM7a35PzUxrpL9C8ym9vZ8XL1zRFv1M4yHkR04w/zDF6dzAl+df/CGxAw7ReW0f7hf qwfuplDew4edojTKvKilmMrsVUnJOVc0KoPQ0dpWNhykONwkuHGeD+VLHmn3iRDoaWw== X-Gm-Gg: AR+sD12c5id3tdMO1uUsChbHz2fKrhjdReV099E82Q9bR3cmUmbjbKJVO31Zyb2Jn8/ VZzbLXjJpzHaAhcpud5pW0B60ONrYrWT7wYYnoq9TBW2eZsB6Go9fFpkH988kDkZUZ8LiSH652/ nt5OvxQIOn3bLGZna1aSISW2MKlQc1XMnSK+6xEq/KBKCK+X5XXGEzA3MPPv7pDgRw1WtDFwzrr WLFJNXXsxYLIdkIRxshulJyWOqVtEgVJYSr8n7l23RBn09k8MBoKUy/p80xnMtEkCRkFfwPz7hC uJqTREyZ1LR0ObeuN0j5caOf5xmCC/gnFctRyJe4Mvz/wfGoGtL1sf82eV0w1fS6fGMHH52Eoud 0j47GGNAvrfY68idq0f9ZRC9oE2bWBs4bYTVpwhn82w== X-Received: by 2002:a05:622a:1901:b0:52d:3352:f7ac with SMTP id d75a77b69052e-52d73db1794mr8814671cf.28.1786569522784; Wed, 12 Aug 2026 14:18:42 -0700 (PDT) X-Received: by 2002:a05:622a:1901:b0:52d:3352:f7ac with SMTP id d75a77b69052e-52d73db1794mr8814451cf.28.1786569522454; Wed, 12 Aug 2026 14:18:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , David Gibson , Paolo Bonzini , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 12/23] system: Remove unnecessary 'monitor/monitor.h' header Date: Wed, 12 Aug 2026 23:16:56 +0200 Message-ID: <20260812211708.92824-13-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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=YLqvDxGx c=1 sm=1 tr=0 ts=6a7ce333 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA: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=4VRd78mhg-xsesdjslEA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX+9jdIunQKJm0 ecW2zB8MO9fmP5RE5U8yVC9PoVWVHEsUe4h1MYl3kM+5A/aIwkLp/ClcIKrslAF+VrreTrFB9Rd ZqDLXcLtlqVHYmwAMoVbmvMVkHwgycgxWHxKrrnRPJRbUervA8UBmj0wVbO96r0IbUT7ZUNchFB /d/9RyAHo4iFp2j7j6dsqK60/D9fALoHisE6BU3S6Lj6uttkTLtug6ZDzaH29WDKzBOQTdekC4v kE6lki8zH0L/JUy1WmIisol9RjeOKrh9z4idftNMf3t6GEPvIfUenP2kBryaRqcE62LAZNYE6wF tM8V/SDEjzKJo2Uma8XPxdUU+tmOv4OdVLIVjwiwuY0JsJ80lCtXmUAiDayImj3vHrFzIyFGMdx nESwhtwatBeguKYY2vNqMkxr7q1rwTEAW+NqpoAW/AVtZG1oDWi7YVcBw+j0MzjYA12OqVe3BPP E+uTcSttoXnsDRn0lvQ== X-Proofpoint-ORIG-GUID: GqKLzAWSVMkypGSumFFPXZngBa0aMfGu X-Proofpoint-GUID: GqKLzAWSVMkypGSumFFPXZngBa0aMfGu X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX3bekKK1OhQyd vOG98O0/LtGDUWKsuCTGmsT1zxjCCZD0B8lBUMtMSEpQ0tOoaxifBtLKHKddM2x0kzeAc6RH6P7 gRD62pjqbMitAAUlG3ecSqOq5LJG9Ig= 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 impostorscore=0 spamscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569548749158500 No code in device_tree.c or physmem.c require declarations from "monitor/monitor.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- system/device_tree.c | 1 - system/physmem.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/system/device_tree.c b/system/device_tree.c index 1ea19629841..48365435ea0 100644 --- a/system/device_tree.c +++ b/system/device_tree.c @@ -29,7 +29,6 @@ #include "qemu/config-file.h" #include "qapi/qapi-commands-machine.h" #include "qobject/qdict.h" -#include "monitor/hmp.h" =20 #include =20 diff --git a/system/physmem.c b/system/physmem.c index c21ea929153..21614e1c4d0 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -84,8 +84,6 @@ #include "qemu/mmap-alloc.h" #endif =20 -#include "monitor/monitor.h" - #ifdef CONFIG_LIBDAXCTL #include #endif --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569598; cv=none; d=zohomail.com; s=zohoarc; b=Wr2MN0H8EbYpR9Hf1P0fCh+1JjQzcUc4T19CwUHm480nq+gUJTk7PXuM5CTMNnEcZvt5yCk34pmsnW70SxFl+ISDpiACFbQnWAVUnuO/1fhjEYJmpvsELP3sC94VThrg8Lp/nVTEOIRxIxi6Pbw2Dv6yfVmkU74+2RDFep3u5l4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569598; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uq1aVaFQbnVSJ9aDVRI9epnWVGLRe5HWP3zqUmbSIy4=; b=icmO56Wn4L1dgTw8O/MfAy9E1Jqmt5PRhW2Sxmu+SCAnUsiP2QFHSsGZHAryYwhQKVdA6d/wFUecdGTwplw11TMAHl1gborjYxFgHC6KVNOd3h9BZsVuUUi/3pCd5RJKk4BDj4OQ57yPgOzbGtkOfRMytJY7ISIU+Y+uPhZ9bQI= 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 1786569598251317.5101647685043; Wed, 12 Aug 2026 14:19:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGM9-00024o-9z; Wed, 12 Aug 2026 17:19: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 1wuGLf-0001Ka-89 for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:56 -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 1wuGLc-0007qB-Ps for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:18:54 -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 67CK2N3p245892 for ; Wed, 12 Aug 2026 21:18:51 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0uts1er2-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:18:51 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c0199faafso13620171cf.3 for ; Wed, 12 Aug 2026 14:18:51 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-499820c2897sm15013935e9.0.2026.08.12.14.18.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:18:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= uq1aVaFQbnVSJ9aDVRI9epnWVGLRe5HWP3zqUmbSIy4=; b=EklcCRhOtJXvb9Ee 23/ySgjB6ZUiRkWr8TQWLhzTj9Ilk15QqAnD6YqAx5RWAVh2HVefVFjB+8hrnzd6 iNkLJbHE6ul409apeMcMK77G+cigQOBPzGWWO+vleWxLPPp3hZOiOiG9KwlyF81O UIgjMl/mAUVnFtqQyVS9IjkWoaVnKXk8Jykz7kOeIQJh3Yhn92SRRJZBT2JlXzg3 qSiiUT0FLsKckCpdraRCOc2Uv7vAG0T49SMb9x0ZWKEdkAN2DnuniB9lnSrnGO46 HZ8x1WtLgeV9zkk3l69Q5eVPKucaQ60xGHLusbzcE6QULR0TroDvQmutQ+mMQnZE 8PxSPA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569530; x=1787174330; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=uq1aVaFQbnVSJ9aDVRI9epnWVGLRe5HWP3zqUmbSIy4=; b=FYjvDHTW0P2f5iERCVUlOr2kHhGqojMyaR5oOFIeiPRayKjmtVIeWWVNUdCPtZWZTk xoHys5BTDlLY1WHFM24Iyu+Eh3rW5QChk4ZWDaw39mW2ffosNjbgAknW8VsjI7rQvT69 +r2wm0VDDmlCY60oK7AixJhWEsxmTfXiFR5vw1M6siWhgr5KMtKHobeefI5E/qJY3E9X g3lePCdp0dY0EqORDUDyVI+TbM3vwmKelBPIWvpPcNAO6uQaS4VV5quxOIYioDraN0MK VK75nJMrhmH6/Dp0V5rpstXKcqBilYwmxepY+QNFHZ+y0Y8SR9zbRQqzEFrKZ2sQiCoM mYfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569530; x=1787174330; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=uq1aVaFQbnVSJ9aDVRI9epnWVGLRe5HWP3zqUmbSIy4=; b=PotnQy+pEdXltAqV7n70f6UYfVoiGwbQk4sp8q0TlZA42s/IMUux+o9kn0wqZYRDsT Di2uPv/0EY9xxjx95Kge5im4DcBkAooRQqljL2NrzLTQ43rAETzDqNPb3Gv6hnsTIRCX blT1NXbT4wt2C7X91Jw/CzZ2watMocTeN+VcBXYajW4wPZLWQ0bWJAqzv1z70KSljL+n YbSOP8LPvi/pLEFljVRnBXcjvP5VCP1b/khjmLsim7Kd1Zp7b70txEH8LnXjopCGO/OG SNPU0fby/ZT4hisWahruOzrH4qalEVN/KgRKSWsIC+tWogMWGirQQ7vwwFCt9awHFDAK klMQ== X-Gm-Message-State: AOJu0YxlJMWyXe44QWBYEbH44vIf78xDaQnC73X6CR3deJvCsEYKEmq4 WrGfrbX7NIWeZ3661HhHc9fC0IvCmWu4vaCYtelVRYfG4W+swqyp+9w2WsCu6YOJqNe3uflx2tt Aj7h4AvyyYDBN5xTFcCSmEoyjEO5Cwa+dm+UPeJJB0KlLFpukizqONTFD+jzNuhT4tg== X-Gm-Gg: AR+sD13G0WtwLiC4f6CILSI5J7kyNZJc/M8A1NBPcOUZqYt+3wts16KSBbI+jmcT42E PP0b82q0xPtAIIFhvVt2lHQ/qa6j2t+ye/+gzjvmJAgqgeuKJ9EECcBEEs/Azt4gaGoTYd/Diws 1YlaDN/hJzM06W6H6qnbEECNTG2PJOvWK0Rny7UAQo25JNkYWorS9Q95DbsBSuYY/zZxDydEc4r xYqzPRzeIcQdADi8bYR9LRIzmh+iVjVNJPrtdsqi3DalaphOFd4ednU/BJjuqzUZheEotDVSAFe 5Mqzo4PbhBZhtHcf3Pa1y3kGbpykfMvWBNxjz7n7HWOljjlTzfvoNHY7IbWytCvkyhg3eNGgmiT ymu4gIPiE5ZsRQmjhhTpAIImtNJ16yXaAVWb1cHzmeg== X-Received: by 2002:a05:622a:4d0b:b0:51c:257c:8164 with SMTP id d75a77b69052e-52d73d151a2mr11480091cf.25.1786569530093; Wed, 12 Aug 2026 14:18:50 -0700 (PDT) X-Received: by 2002:a05:622a:4d0b:b0:51c:257c:8164 with SMTP id d75a77b69052e-52d73d151a2mr11479561cf.25.1786569529654; Wed, 12 Aug 2026 14:18:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hyman Huang Subject: [PATCH v3 13/23] system/dirtylimit: Extract HMP code to dirtylimit-hmp-cmds.c Date: Wed, 12 Aug 2026 23:16:57 +0200 Message-ID: <20260812211708.92824-14-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: GFQwnQKM0jaJ5XMOkAMyQndNFMHK7Ni6 X-Authority-Analysis: v=2.4 cv=aPDAb79m c=1 sm=1 tr=0 ts=6a7ce33b cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=zCLxbh44AAAA:8 a=WRxKY6twSJXuwc0U0koA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=tlNt8cdNSqtyJh_VpUlY:22 X-Proofpoint-ORIG-GUID: GFQwnQKM0jaJ5XMOkAMyQndNFMHK7Ni6 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX0wnjoQ3Z47D6 SlSCq1dTME5jiQwMSxjCG7IP8VbApvOeWAgQnWdpyXaZmC8CbHHpkqxP+1apOwpkL8BoNDa4biy urznCyl+k8SQT4aoLFRACDuVxeYc3Ss= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX6JPHsQNjzE+K KG1HznFjJqFn5bODKn+02GoqbCu6g8c116DvJv7NlrMw5gl/GxbfHqOVc7+L7J2vlcx7HofEeun 5XMxtSYz4EfzfPfWKDi5JoONNGkKZvqWMNu6rOOvT02O3qUHcCZM6Ntfq5ubSF7wOnrlFBw/QrC S8H3tHqG7UkxloNTPGBL/ESfbd0xCE8LBBq6uBYD5OF2HXUcil5J4Vb5v/bt0B80RET02f8/jQM s2e9xGTwSJFQGYtuskV5D/Koa+TmYgMilfnNXV4plEsNiywqriX6AlWyqE534kXnWh+yF+nHToA oNpS4QUOBq+6cNQNeIgq4o0/Z7uK3YKgmZhZkK7ptTkgHSHe77NHBH37qChvaiLeqXn6Z04MlMY edsKakRG/g9HIxpFO7+rLf+D+Vk0iAwNgdUk8EkpTOUh8ArjOIZ6sYSQyV4MPe/T6X3VcWCwl0+ 5BtO0QxaWfdZ/9Okavw== 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 bulkscore=0 suspectscore=0 malwarescore=0 adultscore=0 phishscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569598633158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Hyman Huang --- MAINTAINERS | 1 + system/dirtylimit-hmp-cmds.c | 74 ++++++++++++++++++++++++++++++++++++ system/dirtylimit.c | 60 ----------------------------- system/meson.build | 1 + 4 files changed, 76 insertions(+), 60 deletions(-) create mode 100644 system/dirtylimit-hmp-cmds.c diff --git a/MAINTAINERS b/MAINTAINERS index 4628793dde6..a33fbeebf61 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3858,6 +3858,7 @@ Migration dirty limit and dirty page rate M: Hyman Huang S: Maintained F: system/dirtylimit.c +F: system/dirtylimit-hmp-cmds.c F: include/system/dirtylimit.h F: migration/dirtyrate.c F: migration/dirtyrate.h diff --git a/system/dirtylimit-hmp-cmds.c b/system/dirtylimit-hmp-cmds.c new file mode 100644 index 00000000000..4928d57cc8e --- /dev/null +++ b/system/dirtylimit-hmp-cmds.c @@ -0,0 +1,74 @@ +/* + * HMP commands related to migration dirty page rate limit + * + * Copyright (c) 2022 CHINA TELECOM CO.,LTD. + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-migration.h" +#include "qobject/qdict.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" +#include "system/dirtylimit.h" + +void hmp_cancel_vcpu_dirty_limit(Monitor *mon, const QDict *qdict) +{ + int64_t cpu_index =3D qdict_get_try_int(qdict, "cpu_index", -1); + Error *err =3D NULL; + + qmp_cancel_vcpu_dirty_limit(!!(cpu_index !=3D -1), cpu_index, &err); + if (err) { + hmp_handle_error(mon, err); + return; + } + + monitor_printf(mon, "[Please use 'info vcpu_dirty_limit' to query " + "dirty limit for virtual CPU]\n"); +} + +void hmp_set_vcpu_dirty_limit(Monitor *mon, const QDict *qdict) +{ + int64_t dirty_rate =3D qdict_get_int(qdict, "dirty_rate"); + int64_t cpu_index =3D qdict_get_try_int(qdict, "cpu_index", -1); + Error *err =3D NULL; + + if (dirty_rate < 0) { + error_setg(&err, "invalid dirty page limit %" PRId64, dirty_rate); + goto out; + } + + qmp_set_vcpu_dirty_limit(!!(cpu_index !=3D -1), cpu_index, dirty_rate,= &err); + +out: + hmp_handle_error(mon, err); +} + +void hmp_info_vcpu_dirty_limit(Monitor *mon, const QDict *qdict) +{ + DirtyLimitInfoList *info; + g_autoptr(DirtyLimitInfoList) head =3D NULL; + Error *err =3D NULL; + + if (!dirtylimit_in_service()) { + monitor_printf(mon, "Dirty page limit not enabled!\n"); + return; + } + + head =3D qmp_query_vcpu_dirty_limit(&err); + if (err) { + hmp_handle_error(mon, err); + return; + } + + for (info =3D head; info !=3D NULL; info =3D info->next) { + monitor_printf(mon, "vcpu[%"PRIi64"], limit rate %"PRIi64 " (MB/s)= ," + " current rate %"PRIi64 " (MB/s)\n", + info->value->cpu_index, + info->value->limit_rate, + info->value->current_rate); + } +} diff --git a/system/dirtylimit.c b/system/dirtylimit.c index 50fa67f3d6a..70bb7bac2d0 100644 --- a/system/dirtylimit.c +++ b/system/dirtylimit.c @@ -17,8 +17,6 @@ #include "qapi/error.h" #include "system/dirtyrate.h" #include "system/dirtylimit.h" -#include "monitor/hmp.h" -#include "monitor/monitor.h" #include "system/memory.h" #include "exec/target_page.h" #include "hw/core/boards.h" @@ -491,21 +489,6 @@ void qmp_cancel_vcpu_dirty_limit(bool has_cpu_index, dirtylimit_state_unlock(); } =20 -void hmp_cancel_vcpu_dirty_limit(Monitor *mon, const QDict *qdict) -{ - int64_t cpu_index =3D qdict_get_try_int(qdict, "cpu_index", -1); - Error *err =3D NULL; - - qmp_cancel_vcpu_dirty_limit(!!(cpu_index !=3D -1), cpu_index, &err); - if (err) { - hmp_handle_error(mon, err); - return; - } - - monitor_printf(mon, "[Please use 'info vcpu_dirty_limit' to query " - "dirty limit for virtual CPU]\n"); -} - void qmp_set_vcpu_dirty_limit(bool has_cpu_index, int64_t cpu_index, uint64_t dirty_rate, @@ -548,23 +531,6 @@ void qmp_set_vcpu_dirty_limit(bool has_cpu_index, dirtylimit_state_unlock(); } =20 -void hmp_set_vcpu_dirty_limit(Monitor *mon, const QDict *qdict) -{ - int64_t dirty_rate =3D qdict_get_int(qdict, "dirty_rate"); - int64_t cpu_index =3D qdict_get_try_int(qdict, "cpu_index", -1); - Error *err =3D NULL; - - if (dirty_rate < 0) { - error_setg(&err, "invalid dirty page limit %" PRId64, dirty_rate); - goto out; - } - - qmp_set_vcpu_dirty_limit(!!(cpu_index !=3D -1), cpu_index, dirty_rate,= &err); - -out: - hmp_handle_error(mon, err); -} - /* Return the max throttle time of each virtual CPU */ uint64_t dirtylimit_throttle_time_per_round(void) { @@ -646,29 +612,3 @@ struct DirtyLimitInfoList *qmp_query_vcpu_dirty_limit(= Error **errp) { return dirtylimit_query_all(); } - -void hmp_info_vcpu_dirty_limit(Monitor *mon, const QDict *qdict) -{ - DirtyLimitInfoList *info; - g_autoptr(DirtyLimitInfoList) head =3D NULL; - Error *err =3D NULL; - - if (!dirtylimit_in_service()) { - monitor_printf(mon, "Dirty page limit not enabled!\n"); - return; - } - - head =3D qmp_query_vcpu_dirty_limit(&err); - if (err) { - hmp_handle_error(mon, err); - return; - } - - for (info =3D head; info !=3D NULL; info =3D info->next) { - monitor_printf(mon, "vcpu[%"PRIi64"], limit rate %"PRIi64 " (MB/s)= ," - " current rate %"PRIi64 " (MB/s)\n", - info->value->cpu_index, - info->value->limit_rate, - info->value->current_rate); - } -} diff --git a/system/meson.build b/system/meson.build index cd3193d170b..377adce8035 100644 --- a/system/meson.build +++ b/system/meson.build @@ -9,6 +9,7 @@ system_ss.add(files( 'cpus.c', 'cpu-timers.c', 'dirtylimit.c', + 'dirtylimit-hmp-cmds.c', 'dma-helpers.c', 'exit-with-parent.c', 'globals.c', --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569581; cv=none; d=zohomail.com; s=zohoarc; b=iPU1rA3ICM0AD6CAOTE+Hk+cE6c2Zqgz3g78ucS/QOoO9HPeQUAKmtBB/4V8pBR7PdFE23eoY8h59br7kTkmG2aKp+aAJjCptkqTQLhdO1+tK1VOglVJwUEMyznyw24DnqFADwqOv9f2xiHhHQjXlyOoFG+7KffOL89YQmgKmYU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569581; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=97+XKwMvL5vZM1NtKPV3aSs2kqnjlhlKaZ+8LDjMShs=; b=KHQJPRcC5e+UeaEeMzxDE1SXvQDYbpKmY6c60RHkfJgC3FM+YV9fTNUjZoSDMoqUoCKgl/9r0v8wzW7LYt9xrO8KVxD31ib59U9740e/F6suDHC1mRpeoRyfmOxqECOP7KomaHJPwjDg0wW+NTPTBZhFVc6WpQPLPDoycX9E+sk= 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 1786569581152619.2631847367543; Wed, 12 Aug 2026 14:19:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGM6-00024R-Q9; Wed, 12 Aug 2026 17:19: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 1wuGLm-0001ik-48 for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19: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 1wuGLk-0007rK-HK for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19:01 -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 67CK2Pe11165240 for ; Wed, 12 Aug 2026 21:18:59 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0sk427xc-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:18:59 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c21c01cf3so24744991cf.2 for ; Wed, 12 Aug 2026 14:18:58 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981e4435bsm5434785e9.3.2026.08.12.14.18.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:18:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 97+XKwMvL5vZM1NtKPV3aSs2kqnjlhlKaZ+8LDjMShs=; b=ZIQWi5BXPBtYMc9F iO35ZLSzsgn8nIxjixyHporSessv9hizZxbZ8uZbwLAQKWo2OHAdHRvDouzzBGa4 8EfY+Iy/cjb1JZydfaMWWgATa/6e1+9ncgF/WTH5FWntRgsbBnnih5tflEaUGglh z9iHb1yvdjI9wdggV5/kwq2EkjJ269yMShfSCTfm90SaN1WCkrH2rdUnhmn4jkkh riDFFJf2m08H6KzJMrKwiNcvTAc/sc/9BO6RJSpyFe2Upl8h7FRnA1WBFzMSYRTk QltU59pVEQ/BZSOhmSFkYs+3v3omGnuh6pjdA4yW9b5Z1E5kOSvIgT4+hsEass5w RmALIQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569538; x=1787174338; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=97+XKwMvL5vZM1NtKPV3aSs2kqnjlhlKaZ+8LDjMShs=; b=O0PmlyjR5F6Lz+w/NQY01FKEQTqYQxCJa7xEeEbYS7Z/ERPQdtTzUA5tQXadN9NvvA f3fJOPw34KI0TCw5zw7GQx+g+9SKjizju1ptamVcNE8pGk919LEGxlBUVHUiF9OvFiEa dL/2TqqQy6JYoSvQDHzN9+7jTQdpEaamZbUooR09YdTzxAmb+uHNpaUZfXVDkkrj1cBf FLmCNnuxzWS3FVli7Q5iOcQEkN638rg1lOkAKFg9stS9mh3Y6P9MIseg+aLBCf7TgsaW 364eLaCzeg31g7GR7SO4G2sDfZCyvW6QhcWjGgwfgSOpuo9ScKiVj+T8EyyRDKO82ec7 QDDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569538; x=1787174338; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=97+XKwMvL5vZM1NtKPV3aSs2kqnjlhlKaZ+8LDjMShs=; b=SNWbX90NEolayDxlIUAC0kmmjT+bL1ry0xt3aEehys1z2dOvUAU+bBmj3Ts0yNo0pd HiOu/UXfOWSspx09XXuBeg97LyH4kCE1Kjfdtq7IEy9HcjaEGseVq2pM0mE3JlkFilTM tVrAI10Eu4zWoZhCQ9LlahAtYUKGxaLn2goNI7T8QemJpLKn6g/WYjASrHCrE+d36EPP nzD6K3G7W3e1wKsATrUNv4Nf2WNWr74jwwPHEfKMCHaNf+wrwByjVFJ3RQCr0FYiQnDV k8AkAtEPLJsHweXisFYkl41HCAerkqQrdHAReFCnl/gIww6YNrqO42vWcmtNfGUpehWp f4Uw== X-Gm-Message-State: AOJu0Yy1h+iA7efNTGpNqkx8YLQJF8cnsPGsVivHHIZj+NzKQXSKL3qM Gvm8IaJInqQ6yr+Gg5G/QCgT4zqpsANlG9PjwKFLBjUBg/xoxCY8NGNYiRQ+JDCo/MQIK7iuMUe IpeBu+3lan7wnW73zsucQakFNzhkdyobWfsMdVZlmIyEiMuRBdVFGTGS7ZhboOSosVQ== X-Gm-Gg: AR+sD13zzsrtWunIrLIc0pnTgfRNrUIpnVmv7qJeMW1DaNJ6mqQ/yo77izVT7QRCeTb 3JoRBcxS6a9ci9wSTpiYzuKbfZqT9S6mQVBhFOsIQ2MVdnOCWNnh8M9wDOuASVVRQST8ja6jLzJ sGd91vC6EjqY4JVxDtfnHhd2x0JnnRxeEsqxnba3eSKw/7MiGuiKYO4jKTtNmVsOIqzxGvV7MoS xwrc97KcP9IOzufLzxnpT5XaRpLY10M7D7CZAtnyn8cEtTtIsc0JCjTiFu+Sq1RkXhPeWdgolBm tUSkz6UF8p8Yc7taJyG9FhvlggjCAg/2eyptKl69aMB3/TYDyJ/wXaUm4Ap1NgW6jvseI39ShNV TFkWTMOoSo6xaLMBj9H3dMqVNXjRY/0BWAzT9AO7GfA== X-Received: by 2002:ac8:598f:0:b0:516:d83c:edb6 with SMTP id d75a77b69052e-52d73c4996cmr12093911cf.12.1786569538060; Wed, 12 Aug 2026 14:18:58 -0700 (PDT) X-Received: by 2002:ac8:598f:0:b0:516:d83c:edb6 with SMTP id d75a77b69052e-52d73c4996cmr12093181cf.12.1786569537477; Wed, 12 Aug 2026 14:18:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , Paolo Bonzini Subject: [PATCH v3 14/23] system: Move qmp_inject_nmi() to hw/core/machine-qmp-cmds.c Date: Wed, 12 Aug 2026 23:16:58 +0200 Message-ID: <20260812211708.92824-15-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: hKBp3KuA530vUgr8Lh-Ee_kGyfkgZRUO X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfXwzy0NXJDptTz CQL4+wMojbnQEsAhO2PtgsihNZyQC0iU/jBq4Ic6i/8Ol1IFipGOrgvwqxF2d7OnBEGc2cv4HH4 cGSgp9EDkYZIZPuemGlkUIc4tCvywC26058bZiwxIm1HKu0YbFKHX6/07uTN7JzgC961r8ZvjGv b+wlYs0qzmG7Nn3tJ5Yno8Za1rKnorkhvu9ox7Zl5PBAaK826nq81P1Yjo0Hpzv7ORWHZo4foRs EDSrfQxu5Dxo+lPoipi5rXHIcm1U6Ufrz3tDxbxg9aIdoPFmTkYZIacIQsc/igFi2Y9A7+oUnku hxnHYZndT0nWTe/nWvp1AUWOAJqOSseY/mlIgLaq38ZaQH+T7xu5ak3PZCC3tIjOKrhNVbm6n9Z 0Kz+t/T3z/h8+4DmDd889Vv1sa/ZcEQD+OYU95nWLJOO53Oz4kEaVfraIX6IITWDkZctQP1VyCf /6uLKIc+GNQmAQ6apNQ== X-Authority-Analysis: v=2.4 cv=E8n9Y6dl c=1 sm=1 tr=0 ts=6a7ce343 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=tlxghdvPRZsVr19qFskA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX8qKXT/ThtDAC 5fgO+sLUhdo0VAFNWpqHwutls7JEXJKAXjHPajd/JSdn7k10iO3POFm0pIo3oz35S9DMmYXCc0a YbVP06G37fbE9JGMOCCKyLP4MiQuQcg= X-Proofpoint-ORIG-GUID: hKBp3KuA530vUgr8Lh-Ee_kGyfkgZRUO 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 bulkscore=0 clxscore=1015 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569582449158500 We figured NMI relates to machines (for their machine-specific handling), so move the 'inject-nmi' QMP handler with the rest of machine ones, in hw/core/machine-qmp-cmds.c. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/core/machine-qmp-cmds.c | 6 ++++++ system/cpus.c | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index e62cb4ec888..1aa5f262298 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/acpi/vmgenid.h" #include "hw/core/boards.h" +#include "hw/core/nmi.h" #include "hw/intc/intc.h" #include "hw/mem/memory-device.h" #include "qapi/error.h" @@ -448,3 +449,8 @@ void qmp_dump_skeys(const char *filename, Error **errp) } DUMP_SKEYS_INTERFACE_CLASS(oc)->qmp_dump_skeys(filename, errp); } + +void qmp_inject_nmi(Error **errp) +{ + nmi_inject(errp); +} diff --git a/system/cpus.c b/system/cpus.c index 9758cda4636..aa2510bf8fc 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -26,7 +26,6 @@ #include "qemu/coroutine-tls.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" -#include "qapi/qapi-commands-misc.h" #include "qapi/qapi-events-run-state.h" #include "qapi/qmp/qerror.h" #include "exec/gdbstub.h" @@ -38,7 +37,6 @@ #include "qemu/plugin.h" #include "system/cpus.h" #include "qemu/guest-random.h" -#include "hw/core/nmi.h" #include "system/physmem.h" #include "system/replay.h" #include "system/runstate.h" @@ -922,9 +920,3 @@ void qmp_pmemsave(uint64_t addr, uint64_t size, const c= har *filename, exit: fclose(f); } - -void qmp_inject_nmi(Error **errp) -{ - nmi_inject(errp); -} - --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569594; cv=none; d=zohomail.com; s=zohoarc; b=D304nQXda/jbuK26+1XmtETAmvH6AS1CD8e8B8gx0Pbkqt+FkURAMytxpRqjf9hQcP3L3koh2Ks2ffGBzVw5ry1YsW8O74ei/SSv7WUJrHagm5BfsiQHPcLsN2JwHdKs66Lc0kbCZyCTVQ8WpCVByrFX6b2mDYOy9bhJT0peUW8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569594; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4yh5CKrAm943x0CiLRXtdl2IgSauY6gT5P+gn0EJiUE=; b=hJGwgjvQ3MWU1mvuUckxSntea4PDybQbpVTIOQT5s3qm4rjcv6ma6LaU8zL5LvP7UguKh015LllZc96atFJVUfkNwrt2OrZy+unGRR4PSe0nXHYvLzawOdZ3F/zxbPqg+MTYSyAxoRtjllmsdMBNV8uanZ5mCxKn6ocrTgnezh0= 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 1786569594272969.5064451519335; Wed, 12 Aug 2026 14:19:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGMM-0002U4-DR; Wed, 12 Aug 2026 17:19: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 1wuGLv-000202-SK for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19: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 1wuGLs-0007rv-2A for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19:11 -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 67CK2Mjs1743372 for ; Wed, 12 Aug 2026 21:19:06 GMT Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0nutb7f8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:19:06 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-51c1b4d961dso3115651cf.1 for ; Wed, 12 Aug 2026 14:19:06 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4815a5b6c21sm566199f8f.27.2026.08.12.14.19.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:19:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 4yh5CKrAm943x0CiLRXtdl2IgSauY6gT5P+gn0EJiUE=; b=aiTYijhAoJg/4u0v 5OcEtYBN1Cc9WtpAJ0ewjXk4HQD5Ig2AfwsVa5/wPgpI0tcAGVBYP67bgXq1ekMt sBDF7RagL3s1YMYvu9/cA2UF5q/pRj5E7QeGJcJ120aNeQwlOP3kGGxJA5zsz14t R0sUJTG/omi/Qvb2qKmMwFSCa2yzZyLaiLeo3bXllmtJvqwMkoVVQbDdwKoOHovv 7SYM4vA77UVWscG9gyWx3wcwzlgerg/c41aW/nbSXWTOEKlQTyMWD43+KT6SGp9G 2DsWah9OCA1WSUNx0NJRfA55l3U2+m5EXnPJMWyPHV8kFFkiJgC0oN7MKlecmSC/ V1CY9g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569545; x=1787174345; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=4yh5CKrAm943x0CiLRXtdl2IgSauY6gT5P+gn0EJiUE=; b=Uc51hejxbtkDW9HEljNkVrg/HWbtv9XLilXxo1E/RGkOPpqhNqa8c6CP32omL98EMg Kf6y4wRX0UobNIhdU8INAtmYjoNjOeetqNvBA/5kxEYEqLyg68pP6Rd4FYtghnAwFlhz vQOJsmautQmC6cXo6cW8bdviEiAsTnKXh/c+zDW/ddzE400wA1iJn6wlVYnsbY6Clz+m cOs2sIEka+YRrf3RvGld0CpA0XRxbuxH53ZgX/HnKSNwy0NOZ/lyqOQpcpkS57He9FJJ KAqnY8EMNRJJENO6zJsHS00/81Ncx7z2S2fsNvQNxHkbE/pPLs+X+V30W1IXNmt9ZQER CsOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569545; x=1787174345; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=4yh5CKrAm943x0CiLRXtdl2IgSauY6gT5P+gn0EJiUE=; b=Jl7v43T+2q3TKr5QEbIE3IKM+koDlgggWHB0o6qzarkYaWz6Ot72esDononJsMkynf VZ9DqqDqvJbTJ4+LV3WDCI9OAtxipWjiJjo4kkro34dt7WYSUftDobfKMb6sLw5ldar5 6xaXiOTEqLJhqe4gRTxMeemvjQJRP05vxtZxU2/VuOXwxEC5INRQlAO0vb0N6FU+PGLH bM9jz3kFGda62Y01VfNwktNoWaEgGsoZiNRfK/eAGi/iUbHYECE1HzA1Nku7CP4NzqE5 qXL5UFIvjJ4oGyfqx9hgG5t7Kqe6vphLZ5GOhVWyg3fvy/7Hc+xj8xY4zxtbAh7KmK/7 PHuw== X-Gm-Message-State: AOJu0YxjjutYqjr/wqaKkyEaaIVtrhI61oXjPkz4klAPBY13a/oDpA0u S9lnhB/0vsh+Dkqsa1L1ximqmh/nWKYno3LH7mUkj8gMDXgzO4InZt2qHzGgNxWrrukrkI9LzZD CdWJF/1SIn8WiYPAER75EK3xMwG0yCDjRGD0CmuvWoQASqFK44FsYvBu7TClXL2/TxQ== X-Gm-Gg: AR+sD11mmCP6ExV3YZj35n5b1Ihyoy19nV9taRuF4VK3ZRCr34lddUGtiL/6KTbpmCf 1COF3qPAkHfC3+V6h1oo+nf64SEbL0tAly6R3lnsSaz9cpzgK03auHCAHgFlYLPRAX3LLt3RSd/ AiRYyOW3eFqgpsc/n/wBu3Axsjlndv9iivR+d8tw4hDyIY8acvVWrAQsT2U6G5ybhBY2vQOrAP3 Ta3v/zHNtn6cC43+OMxDxKcVj7FRRl3aJWmNWpouWOBy4nMRUdplGGCXVj84BQfXX7Co+en1gPY ZN3I/g+9bOMCx8qggy9W2XOfLhG6U0WiN4SMkY95BJyL4qKEzo97pjzUAxeA+q02FctRTWAeJtu +ZDIpOtycDyp1rxtjLWVTgRcTbWCPZMSz1cEd0nNmMQ== X-Received: by 2002:ac8:5d53:0:b0:517:c582:9161 with SMTP id d75a77b69052e-52d74a6f672mr4134911cf.7.1786569545233; Wed, 12 Aug 2026 14:19:05 -0700 (PDT) X-Received: by 2002:ac8:5d53:0:b0:517:c582:9161 with SMTP id d75a77b69052e-52d74a6f672mr4134221cf.7.1786569544586; Wed, 12 Aug 2026 14:19:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu Subject: [PATCH v3 15/23] system: Extract QMP memsave/pmemsave commands to physmem-qmp-cmds.c Date: Wed, 12 Aug 2026 23:16:59 +0200 Message-ID: <20260812211708.92824-16-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfXx/lgenDvNEZC ijBZhd7t8ws5lwNMiwAjZ2dPRS/X1dhfVjeAJndz3Q4H/8Ki6eF2UDSkwhaAqeMS4g0TkamoN7A grRVc7BI3qHH/RzlIT3sE+P/m4aPMbs= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfXyx/8XNLEvw6L o5oc0AOA9sM3x95WOUHwmit/bOjfAwQHOs5dpY/sNSRTlExgTsSRLDBUZUjESUn1ncXKXq2D+T/ wIkswqvu+LC/jlLyECWtzXdxMP8w4oQWqrE6+oZebsQ675zrEFvN/VI1a8GLqnFEnimlbEF0AN0 NsLC1/fGwQfdk4+WYVxbgbxcTqWQCpdS/TADsybcrzE/Ujeyq8XNDW1IPfKRnJrlelzrWGVAILZ uE++WK6W4cnGpdwgFb/h3G/mhI2fhW+0rwyF93kMRxbVnb3fCnqbNqvSph4gDAkjAB8vclIBNuB aashVKrcfeVYXtgmgVezV0EbHkAieQmgSLQJeuuF1YvxIzfkL+Ak+A0FIIyqfVKHfVNE5E82Rcp 9eYqFn0stkDOr5YWfoRR7Wzh65yLCuzpZ1OYOomTKlVMvzUocEsmQ93F1lqszm1vqJMxfuYQh/z D7yzoaLLOZeA2hAkwZA== X-Proofpoint-ORIG-GUID: VaMlR_E9MKNanxc-QVKhIwHq2dVFrRNV X-Authority-Analysis: v=2.4 cv=POA/P/qC c=1 sm=1 tr=0 ts=6a7ce34a cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=7DZkrcYYXL7zIbTVLmcA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-GUID: VaMlR_E9MKNanxc-QVKhIwHq2dVFrRNV 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 impostorscore=0 bulkscore=0 suspectscore=0 priorityscore=1501 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569594869158500 Keep cpus.c related to vCPU scheduling, move the QMP handlers related to dumping physical memory to file to their own unit. Fix a pair of checkpatch.pl errors doing so: ERROR: braces {} are necessary for all arms of this statement #185: FILE: system/physmem-qmp-cmds.c:51: + if (l > size) [...] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- MAINTAINERS | 1 + system/cpus.c | 92 -------------------------------- system/physmem-qmp-cmds.c | 107 ++++++++++++++++++++++++++++++++++++++ system/meson.build | 1 + 4 files changed, 109 insertions(+), 92 deletions(-) create mode 100644 system/physmem-qmp-cmds.c diff --git a/MAINTAINERS b/MAINTAINERS index a33fbeebf61..f4689530b5e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3419,6 +3419,7 @@ F: system/ioport.c F: system/memory.c F: system/memory_mapping.c F: system/physmem.c +F: system/physmem-qmp-cmds.c F: system/memory_ldst* F: system/memory-internal.h F: system/ram-block-attributes.c diff --git a/system/cpus.c b/system/cpus.c index aa2510bf8fc..43ff10cf008 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -25,9 +25,7 @@ #include "qemu/osdep.h" #include "qemu/coroutine-tls.h" #include "qapi/error.h" -#include "qapi/qapi-commands-machine.h" #include "qapi/qapi-events-run-state.h" -#include "qapi/qmp/qerror.h" #include "exec/gdbstub.h" #include "accel/accel-cpu-ops.h" #include "system/hw_accel.h" @@ -40,7 +38,6 @@ #include "system/physmem.h" #include "system/replay.h" #include "system/runstate.h" -#include "migration/misc.h" #include "system/cpu-timers.h" #include "system/whpx.h" #include "hw/core/boards.h" @@ -831,92 +828,3 @@ int vm_stop_force_state(RunState state) return ret; } } - -void qmp_memsave(uint64_t addr, uint64_t size, const char *filename, - bool has_cpu, int64_t cpu_index, Error **errp) -{ - FILE *f; - uint64_t l; - CPUState *cpu; - uint8_t buf[1024]; - uint64_t orig_addr =3D addr, orig_size =3D size; - - if (migration_guest_ram_loading()) { - error_setg(errp, "Guest memory access not allowed during migration= "); - return; - } - - if (!has_cpu) { - cpu_index =3D 0; - } - - cpu =3D qemu_get_cpu(cpu_index); - if (cpu =3D=3D NULL) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", - "a CPU number"); - return; - } - - f =3D fopen(filename, "wb"); - if (!f) { - error_setg_file_open(errp, errno, filename); - return; - } - - while (size !=3D 0) { - l =3D sizeof(buf); - if (l > size) - l =3D size; - if (cpu_memory_rw_debug(cpu, addr, buf, l, 0) !=3D 0) { - error_setg(errp, "Invalid addr 0x%016" PRIx64 "/size %" PRIu64 - " specified", orig_addr, orig_size); - goto exit; - } - if (fwrite(buf, 1, l, f) !=3D l) { - error_setg(errp, "writing memory to '%s' failed", - filename); - goto exit; - } - addr +=3D l; - size -=3D l; - } - -exit: - fclose(f); -} - -void qmp_pmemsave(uint64_t addr, uint64_t size, const char *filename, - Error **errp) -{ - FILE *f; - uint64_t l; - uint8_t buf[1024]; - - if (migration_guest_ram_loading()) { - error_setg(errp, "Guest memory access not allowed during migration= "); - return; - } - - f =3D fopen(filename, "wb"); - if (!f) { - error_setg_file_open(errp, errno, filename); - return; - } - - while (size !=3D 0) { - l =3D sizeof(buf); - if (l > size) - l =3D size; - physical_memory_read(addr, buf, l); - if (fwrite(buf, 1, l, f) !=3D l) { - error_setg(errp, "writing memory to '%s' failed", - filename); - goto exit; - } - addr +=3D l; - size -=3D l; - } - -exit: - fclose(f); -} diff --git a/system/physmem-qmp-cmds.c b/system/physmem-qmp-cmds.c new file mode 100644 index 00000000000..d85430357d5 --- /dev/null +++ b/system/physmem-qmp-cmds.c @@ -0,0 +1,107 @@ +/* + * QMP commands to dump physical memory + * + * Copyright (c) 2003-2008 Fabrice Bellard + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-machine.h" +#include "qapi/qmp/qerror.h" +#include "hw/core/cpu.h" +#include "system/physmem.h" +#include "migration/misc.h" + +void qmp_memsave(uint64_t addr, uint64_t size, const char *filename, + bool has_cpu, int64_t cpu_index, Error **errp) +{ + FILE *f; + uint64_t l; + CPUState *cpu; + uint8_t buf[1024]; + uint64_t orig_addr =3D addr, orig_size =3D size; + + if (migration_guest_ram_loading()) { + error_setg(errp, "Guest memory access not allowed during migration= "); + return; + } + + if (!has_cpu) { + cpu_index =3D 0; + } + + cpu =3D qemu_get_cpu(cpu_index); + if (cpu =3D=3D NULL) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", + "a CPU number"); + return; + } + + f =3D fopen(filename, "wb"); + if (!f) { + error_setg_file_open(errp, errno, filename); + return; + } + + while (size !=3D 0) { + l =3D sizeof(buf); + if (l > size) { + l =3D size; + } + if (cpu_memory_rw_debug(cpu, addr, buf, l, 0) !=3D 0) { + error_setg(errp, "Invalid addr 0x%016" PRIx64 "/size %" PRIu64 + " specified", orig_addr, orig_size); + goto exit; + } + if (fwrite(buf, 1, l, f) !=3D l) { + error_setg(errp, "writing memory to '%s' failed", + filename); + goto exit; + } + addr +=3D l; + size -=3D l; + } + +exit: + fclose(f); +} + +void qmp_pmemsave(uint64_t addr, uint64_t size, const char *filename, + Error **errp) +{ + FILE *f; + uint64_t l; + uint8_t buf[1024]; + + if (migration_guest_ram_loading()) { + error_setg(errp, "Guest memory access not allowed during migration= "); + return; + } + + f =3D fopen(filename, "wb"); + if (!f) { + error_setg_file_open(errp, errno, filename); + return; + } + + while (size !=3D 0) { + l =3D sizeof(buf); + if (l > size) { + l =3D size; + } + physical_memory_read(addr, buf, l); + if (fwrite(buf, 1, l, f) !=3D l) { + error_setg(errp, "writing memory to '%s' failed", + filename); + goto exit; + } + addr +=3D l; + size -=3D l; + } + +exit: + fclose(f); +} diff --git a/system/meson.build b/system/meson.build index 377adce8035..64e06e7abcc 100644 --- a/system/meson.build +++ b/system/meson.build @@ -19,6 +19,7 @@ system_ss.add(files( 'memory_mapping.c', 'memory.c', 'physmem.c', + 'physmem-qmp-cmds.c', 'qdev-monitor.c', 'qtest.c', 'rtc.c', --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569586; cv=none; d=zohomail.com; s=zohoarc; b=eybVTMLQ5GnINIkh6CgtOASLlxNY+VPk7E6ms/ksiGEoBVr5sESMCF3fFUVUu9l+LJVbhmjupoYaIByG3AtS/mkUCM/EapvhXp9hBFsPOoqqD2G/wQ6sLlyyMiPIu8lfXG9gfzVcBWnqtS4mbGEofh/TTcooW63nQwgpxOrqgtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569586; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cGRVAiRqF+IabBCiB6j4AzbKv01hLh5mnem5PrgK5/4=; b=LtQA8FQRGMKNMF5IipBFqrga0AmauvOfGfzIzlu4kPmG9Q/z6f2syHxpmfD2SZpAGz1w/icdFV6wQlS2oo1CapDyRKdCbRfRUstog2wWTQNvpi5jKhorZM8j0a+Lrvyv9KIYV5EKh8OgvyJ5H4IL796B/38x8RdzeoE7sL68uuw= 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 1786569586142485.2437361917034; Wed, 12 Aug 2026 14:19:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGMM-0002Ue-Mi; Wed, 12 Aug 2026 17:19:39 -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 1wuGM1-000253-9Z for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19:21 -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 1wuGLz-0007sv-7b for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19:17 -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 67CK2P1b1743540 for ; Wed, 12 Aug 2026 21:19:14 GMT Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0nutb7fq-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:19:13 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-90410c668adso14894156d6.1 for ; Wed, 12 Aug 2026 14:19:13 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981b03e70sm16511765e9.3.2026.08.12.14.19.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:19:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= cGRVAiRqF+IabBCiB6j4AzbKv01hLh5mnem5PrgK5/4=; b=Mamb9ayo9PK4/+gd QAjyvEJLkZPQ6aGTZNrMN3lBTJWRs/YNJhCmL4+TNov4vsVoUGDpOuBlOqNUmgJo gNfZbWgldhfiN2xHnWmGpwFLoRW36VUa772kqiOMCWcMR4PYxiKBMB9uleKF6eNz tqcnMoe3QM62r3QkgjVecuuqNx5QWhmRVoMxd8vC/V9Q5LhTiXn7BDnjvYfMIYrr yBbHWdl8nY12+0NC0McEDK5ha/AYKY9ELcdAvoNJ8RZ0bOeEkqsLEdM+HBdzX51l fhxihE0Lbu9m+FlAe7hTQF5ZqINKvLsz6/+0VvW5rCdQYL1tCoAQQ22cYs57+MOL zw4yEw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569553; x=1787174353; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=cGRVAiRqF+IabBCiB6j4AzbKv01hLh5mnem5PrgK5/4=; b=Kz8qxMQ+Ffekiu0LpTiGZkWjWuc8cYCHvqo+ijxcBV9rQlg63GpaFNzOsDk+obN23i 2x23uY7n6ypPdT1owyZuL6qvEQTrfdWGvHx6PRg4mmZwpyB+dAfLHP/OycLHcTLxWIa5 n/AGHXl9cQwFWw7zYmG62cnHuoIwrLVvtFU4WslGRBmmDvBXm+a6wkPgipKwQrstDUtI o5S8gjDJ4IcEyKA1CaJceKNiNAu0CV5RPVXgDbXawhehLPc3xhXYE9Kmum4UYwAmfaIp /Ia0kCEjXvIiXmAWfUWllKSfpdeGV+OifVvUhBH8D//y11kx+agPJh6fJ0xmPw1u4a2/ C5Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569553; x=1787174353; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=cGRVAiRqF+IabBCiB6j4AzbKv01hLh5mnem5PrgK5/4=; b=YcymmHcw2C5zcSbxdj7WKzyp/n1tHDxvgQQHqAAStDkhyOl8cwI7TP4HaM8dciJ8CC ZgEXl5WI+H/3YbaKlibblA1UvqxEq9ewfG0onc+5mPeZD3CQPuX6LPN8J/FY3G+q6hh/ cAtJCD/NI71QOih0zrfNKkMjQ+ZIB5xyq6jixHzyaWQAr4kRMQobIJb5W9HJbVNtu8xH hxh5G8o50r8ftqrXBmPz121e7X7e5dz0qeVUwJJfQMR59yKDrZmtbSuUFvkctsruj8mP +7kzgTxja50AByGL2UgPIb8X3B7j8hOuPsFvEjvuTg5NJSf1/Qr9GlDrX1g8JuCWDrKY 9Wig== X-Gm-Message-State: AOJu0YzqqZqnm/9aLC5peUR1s0jBOPjGTjI6QEdYCeOTWmwScKsVHRxd n+31nJ9+IyvNNyNsImdR/HGjud4yxMHVbgSAf/1VrRRqKPasv5JnGwb9HdSJZfxeSZ3b5Rx4Kof Bzh52tRqZGIoBEsbWHGPm34N9ngRs7YwoRq/kHPeEOX2fY0Uv2c+ZKbsbidFGi7ZC0g== X-Gm-Gg: AR+sD13vEsmC6UYoCh1XwbG3STGQdAwMuKqPUy7h6i+0bW+O8Tcoidn6oHiAiQKUBUy IIh+N6CF7CH9rKtkIngk0yluQ8IbH/B1o8NVyaT6kUbAbIX9KhzIg1O/jaH5s+zaM0QmG5LclIt v+nt1Lpvc5B3qJacMgplyGVo9fg1smFJgm9PDxmkNf5ZO/Hwu/x0KAWCCVthI5gZtbVFfnHSpbG vY2W2vk2gzA1lUBdYtvsVV8DWknMoqWfuPVOnBz0ZEfwoqqhkL6rOPUFs6GDbF5SKqgbwrwWUt3 sU+9hbADwsusuL2CGT62J9HOBti/LY8JnEjSOTFSZw6KwxX3diE4njw5xqcqWOLIFF5SY+Ysv1F mj35yGaIi2yCr8pK59PkNLDMiUqIDP1uyidPh3vltrg== X-Received: by 2002:a05:622a:1a9b:b0:52d:41d0:89e0 with SMTP id d75a77b69052e-52d73e3c8a6mr9553571cf.40.1786569552501; Wed, 12 Aug 2026 14:19:12 -0700 (PDT) X-Received: by 2002:a05:622a:1a9b:b0:52d:41d0:89e0 with SMTP id d75a77b69052e-52d73e3c8a6mr9552941cf.40.1786569551757; Wed, 12 Aug 2026 14:19:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 16/23] system: Move runstate-related code from cpus.c to runstate.c Date: Wed, 12 Aug 2026 23:17:00 +0200 Message-ID: <20260812211708.92824-17-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX+GA1RL431cUu BzhC7Rfcq/nU7yQDD20ShdNArffF8q1sgJAiafT6EMCs6S1k0biQBTblcIaJCcznBVhSUb4EYHi yIpDjPDmnGcYVDVeTdbmiE6haNMpFC8= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX5V24ZypqSUuT wTVlwvsyK5KRH0iL3qCbE7fjPQ3bxAhzUCYUp/ry0r6VDUx3bWJUMRXjZYMFsbJYf7N3dL20I9Z dWXEGxfX5zQ8sSWHFz3NDuPcDsErknhIa67WpehuwqjQKc89ZLQN09O6/APC4DOA5Lzp08P83oA u6t6yaQ+zKnqQpfKvkIILkxosK71yfsQrebFoDdlfr233hZRTHvzFELh8JPhJQq1V/VxnU69rOQ of97K1QM6iMGDpfhO5Xe3KWVhS79wt2XQXbo9qqEq9NZVhW52npA3XDdGH2tij/UcU3l5rE5pYt f6gT2BQmIoVlOdG3CoBRjjLz+rG3chbG5GUn7M5XLA3JNIK73F4eJHY68KSMLO7tjhsfOCEr+7e 7qPCwb7XFNJWxyXGHzANVSljtIzUi7HGXOlCaDjk+SRna/iA4lMkyqfJj0DW+74cDTRnhkI54CN TX2vd05GhfFG2JDNQ+A== X-Proofpoint-ORIG-GUID: E97Pe9neoKgDgIbR16Y4JAb5Cfi_Oz8j X-Authority-Analysis: v=2.4 cv=POA/P/qC c=1 sm=1 tr=0 ts=6a7ce351 cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=QK4PlI00PMcCPjLnJOMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=pJ04lnu7RYOZP9TFuWaZ:22 X-Proofpoint-GUID: E97Pe9neoKgDgIbR16Y4JAb5Cfi_Oz8j 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 impostorscore=0 bulkscore=0 suspectscore=0 priorityscore=1501 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569586680158500 Keep cpus.c focused on vCPUs handling, move code related to VM state to runstate.c where similar code lives. Fix few checkpatch.pl warnings: WARNING: Block comments use a leading /* on a separate line WARNING: Block comments use * on subsequent lines #327: FILE: system/runstate.c:541: +/* does a state transition even if the VM is already stopped, + current state is forgotten forever */ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- system/cpus.c | 147 ------------------------------------------- system/runstate.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 147 deletions(-) diff --git a/system/cpus.c b/system/cpus.c index 43ff10cf008..f37e215c586 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qemu/coroutine-tls.h" #include "qapi/error.h" -#include "qapi/qapi-events-run-state.h" #include "exec/gdbstub.h" #include "accel/accel-cpu-ops.h" #include "system/hw_accel.h" @@ -272,58 +271,6 @@ void cpu_interrupt(CPUState *cpu, int mask) cpus_accel->handle_interrupt(cpu, mask); } =20 -/* - * True if the vm was previously suspended, and has not been woken or rese= t. - */ -static int vm_was_suspended; - -void vm_set_suspended(bool suspended) -{ - vm_was_suspended =3D suspended; -} - -bool vm_get_suspended(void) -{ - return vm_was_suspended; -} - -static int do_vm_stop(RunState state, bool send_stop) -{ - int ret =3D 0; - RunState oldstate =3D runstate_get(); - - if (runstate_is_live(oldstate)) { - vm_was_suspended =3D (oldstate =3D=3D RUN_STATE_SUSPENDED); - runstate_set(state); - cpu_disable_ticks(); - if (oldstate =3D=3D RUN_STATE_RUNNING) { - pause_all_vcpus(); - } - ret =3D vm_state_notify(0, state); - if (send_stop) { - qapi_event_send_stop(); - } - } - - bdrv_drain_all(); - /* - * Even if vm_state_notify() return failure, - * it would be better to flush as before. - */ - ret |=3D bdrv_flush_all(); - trace_vm_stop_flush_all(ret); - - return ret; -} - -/* Special vm_stop() variant for terminating the process. Historically cl= ients - * did not expect a QMP STOP event and so we need to retain compatibility. - */ -int vm_shutdown(void) -{ - return do_vm_stop(RUN_STATE_SHUTDOWN, false); -} - bool cpu_can_run(CPUState *cpu) { if (cpu->stop) { @@ -734,97 +681,3 @@ void cpu_stop_current(void) cpu_exit(current_cpu); } } - -int vm_stop(RunState state) -{ - if (qemu_in_vcpu_thread()) { - qemu_system_vmstop_request_prepare(); - qemu_system_vmstop_request(state); - /* - * FIXME: should not return to device code in case - * vm_stop() has been requested. - */ - cpu_stop_current(); - return 0; - } - - return do_vm_stop(state, true); -} - -/** - * Prepare for (re)starting the VM. - * Returns 0 if the vCPUs should be restarted, -1 on an error condition, - * and 1 otherwise. - */ -int vm_prepare_start(bool step_pending) -{ - int ret =3D vm_was_suspended ? 1 : 0; - RunState state =3D vm_was_suspended ? RUN_STATE_SUSPENDED : RUN_STATE_= RUNNING; - RunState requested; - - qemu_vmstop_requested(&requested); - if (runstate_is_running() && requested =3D=3D RUN_STATE__MAX) { - return -1; - } - - /* Ensure that a STOP/RESUME pair of events is emitted if a - * vmstop request was pending. The BLOCK_IO_ERROR event, for - * example, according to documentation is always followed by - * the STOP event. - */ - if (runstate_is_running()) { - qapi_event_send_stop(); - qapi_event_send_resume(); - return -1; - } - - /* - * WHPX accelerator needs to know whether we are going to step - * any CPUs, before starting the first one. - */ - accel_pre_resume(MACHINE(qdev_get_machine()), step_pending); - - /* We are sending this now, but the CPUs will be resumed shortly later= */ - qapi_event_send_resume(); - - cpu_enable_ticks(); - runstate_set(state); - vm_state_notify(1, state); - vm_was_suspended =3D false; - return ret; -} - -void vm_start(void) -{ - if (!vm_prepare_start(false)) { - resume_all_vcpus(); - } -} - -void vm_resume(RunState state) -{ - if (runstate_is_live(state)) { - vm_start(); - } else { - runstate_set(state); - } -} - -/* does a state transition even if the VM is already stopped, - current state is forgotten forever */ -int vm_stop_force_state(RunState state) -{ - if (runstate_is_live(runstate_get())) { - return vm_stop(state); - } else { - int ret; - runstate_set(state); - - bdrv_drain_all(); - /* Make sure to return an error if the flush in a previous vm_stop= () - * failed. */ - ret =3D bdrv_flush_all(); - trace_vm_stop_flush_all(ret); - return ret; - } -} diff --git a/system/runstate.c b/system/runstate.c index 08acf801b0e..d3e64d2b625 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -52,6 +52,7 @@ #include "qemu/thread.h" #include "qom/object.h" #include "qom/object_interfaces.h" +#include "system/cpu-timers.h" #include "system/cpus.h" #include "system/qtest.h" #include "system/replay.h" @@ -408,6 +409,159 @@ int vm_state_notify(bool running, RunState state) return ret; } =20 +/* + * True if the vm was previously suspended, and has not been woken or rese= t. + */ +static int vm_was_suspended; + +void vm_set_suspended(bool suspended) +{ + vm_was_suspended =3D suspended; +} + +bool vm_get_suspended(void) +{ + return vm_was_suspended; +} + +static int do_vm_stop(RunState state, bool send_stop) +{ + int ret =3D 0; + RunState oldstate =3D runstate_get(); + + if (runstate_is_live(oldstate)) { + vm_was_suspended =3D (oldstate =3D=3D RUN_STATE_SUSPENDED); + runstate_set(state); + cpu_disable_ticks(); + if (oldstate =3D=3D RUN_STATE_RUNNING) { + pause_all_vcpus(); + } + ret =3D vm_state_notify(0, state); + if (send_stop) { + qapi_event_send_stop(); + } + } + + bdrv_drain_all(); + /* + * Even if vm_state_notify() return failure, + * it would be better to flush as before. + */ + ret |=3D bdrv_flush_all(); + trace_vm_stop_flush_all(ret); + + return ret; +} + +/* + * Special vm_stop() variant for terminating the process. Historically cl= ients + * did not expect a QMP STOP event and so we need to retain compatibility. + */ +int vm_shutdown(void) +{ + return do_vm_stop(RUN_STATE_SHUTDOWN, false); +} + + +int vm_stop(RunState state) +{ + if (qemu_in_vcpu_thread()) { + qemu_system_vmstop_request_prepare(); + qemu_system_vmstop_request(state); + /* + * FIXME: should not return to device code in case + * vm_stop() has been requested. + */ + cpu_stop_current(); + return 0; + } + + return do_vm_stop(state, true); +} + +/** + * Prepare for (re)starting the VM. + * Returns 0 if the vCPUs should be restarted, -1 on an error condition, + * and 1 otherwise. + */ +int vm_prepare_start(bool step_pending) +{ + int ret =3D vm_was_suspended ? 1 : 0; + RunState state =3D vm_was_suspended ? RUN_STATE_SUSPENDED : RUN_STATE_= RUNNING; + RunState requested; + + qemu_vmstop_requested(&requested); + if (runstate_is_running() && requested =3D=3D RUN_STATE__MAX) { + return -1; + } + + /* + * Ensure that a STOP/RESUME pair of events is emitted if a + * vmstop request was pending. The BLOCK_IO_ERROR event, for + * example, according to documentation is always followed by + * the STOP event. + */ + if (runstate_is_running()) { + qapi_event_send_stop(); + qapi_event_send_resume(); + return -1; + } + + /* + * WHPX accelerator needs to know whether we are going to step + * any CPUs, before starting the first one. + */ + accel_pre_resume(MACHINE(qdev_get_machine()), step_pending); + + /* We are sending this now, but the CPUs will be resumed shortly later= */ + qapi_event_send_resume(); + + cpu_enable_ticks(); + runstate_set(state); + vm_state_notify(1, state); + vm_was_suspended =3D false; + return ret; +} + +void vm_start(void) +{ + if (!vm_prepare_start(false)) { + resume_all_vcpus(); + } +} + +void vm_resume(RunState state) +{ + if (runstate_is_live(state)) { + vm_start(); + } else { + runstate_set(state); + } +} + +/* + * does a state transition even if the VM is already stopped, + * current state is forgotten forever + */ +int vm_stop_force_state(RunState state) +{ + if (runstate_is_live(runstate_get())) { + return vm_stop(state); + } else { + int ret; + runstate_set(state); + + bdrv_drain_all(); + /* + * Make sure to return an error if the flush in a previous vm_stop= () + * failed. + */ + ret =3D bdrv_flush_all(); + trace_vm_stop_flush_all(ret); + return ret; + } +} + static ShutdownCause reset_requested; static ShutdownCause shutdown_requested; static int shutdown_exit_code =3D EXIT_SUCCESS; --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569594; cv=none; d=zohomail.com; s=zohoarc; b=U6BydRfcOw+t5Qy/5vlVu7CY7iWyU9bvYcsE94D2TgPXwGsL53exmleXC79tbN/2g/q8GM/Ic/IhuCr9xQHGlUD8bSRLtbX1nEaCLO57RHyht+WMC5/SVBTT1/LPBnhnU3wCWw22ogCPqErUUlbVEIK1LS8Bn/oWQ7f0Os17fTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569594; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+BCKk2lGMbJUaVoi4AJMm9GxmkkQjGgn2BvCt1jmRkA=; b=i8OWsQSFgY74AHiU3T2iGW1pHYw3VAcmOPlil0Xv2jZ54L05ElTAiods22RGx+tM4p3iH+urjUZyE2lKreXjcWQ282ddH5/adisXiUrAla8KYmWg3IJIUWOhHMlTI57ruQi2urO60iqbd/wjULAGtqGqZtvRWndt5N+xFRN7MmY= 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 1786569594825693.7223455045964; Wed, 12 Aug 2026 14:19:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGMO-0002WM-4I; Wed, 12 Aug 2026 17:19: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 1wuGMA-0002Ew-1d for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19: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 1wuGM6-0007tY-UH for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19: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 67CK2QUM1165252 for ; Wed, 12 Aug 2026 21:19:21 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0sk427ya-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:19:21 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-52d33c89a29so13636361cf.1 for ; Wed, 12 Aug 2026 14:19:21 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4815a5c2837sm637097f8f.37.2026.08.12.14.19.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= +BCKk2lGMbJUaVoi4AJMm9GxmkkQjGgn2BvCt1jmRkA=; b=bgYvGoJq49ckn2fN I6ykKST8ueu1IeT/mjMCdU81L9tCzhEu5zzVe6aHp+62w/2jaIshnLJ065cZwOSQ p+Xn0Wv/IJdWtTOM7mdmoEeNXUv2oRELUAWzBPWrntzOLI2rxA+naPR07bacajhh +QV8r00h63c+GFx2vSvbI520nQBOtFAgZYfoEfRHg3B0wow9Gk0d+IHAAnYtqrzu aTeo6QjPqqiR7f3HaRXQFkyR8R9ExOE/Mm9NJhtwdLYLY+O3jWgATYW4dIwC3Gjy FJkqhhoTfAePaPe88HLN/odaL8eeH5+6A6RU+RScTRtmvRekGinfq5Tfq0ai9mRW U94ASw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569560; x=1787174360; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=+BCKk2lGMbJUaVoi4AJMm9GxmkkQjGgn2BvCt1jmRkA=; b=NAyMaKxeQRDkp3zpToayl1gYs8tSHpgWOjA5zxce6aOrPHkrjKdlOb16kD3E1Snlk8 jA4p6R8+XhsWXM8itMu3tNQpTXCnb1VvvJmElP8+SezxNWWGjCDdiBP/ejXLzv0j5mdf ooCrWEEdr8ONRmXwegNIQWLrN2P1ZEHKn7pbIUt/aH92u6LHkjV2LADYBmHDblPEeD59 F3jThRU56WDQmULz3luAgfayLv9id+Gr8KLUKBSPqGCFTTKwlFKJ7ajl8K+IdyGrf0QV dNqS0I2S/x6T0N8DNOxjrCqnFKjaUH9AO+yZC5fTFZFwDWiLr5pVvWNZM+SppnR7fcdk Y9pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569560; x=1787174360; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=+BCKk2lGMbJUaVoi4AJMm9GxmkkQjGgn2BvCt1jmRkA=; b=N4GW3S2ZXCBNuUgM2zT90gyUOfk5C+42QsEfzA3tyWufEaJ4nfS5DS3G9JRvn7cwVy K31RhQTvYMVJdA634p5gKRpSJ6uAPC2b+Y/YmAAm95IsewX4vR3kSykhxGIC7puAlB0b SJlakQ7Nz29+WgTu5iCR/WQ8DgnhDNITD3iKu3WuE4TawqzdvHRgqgFrldiFJv0c+lU0 TVz8ff6jB/mTWnOuZCLwrI7eIFl7+p8B6f/DVbU9cN1z/xSCEdn8RwVIYWPTTQ6zyiED FyQNGrHud+WvOzm5rWNq/ctEATukflhXbQ8onO8kJGZiq+zLpTEJvgMYqOXjDDY3RZZO 2pGQ== X-Gm-Message-State: AOJu0Yx+e7R3OqFk9pRetV0kSguiGHG76O5EwtsVluV9mhwphAcwAH8r WbCor4EztzZRqm0HSfCh4pPbfMxBQT5dGrYd469mgIKCActzGQoG+x7f0WzspMG+DppUnBbVAvD awMUwO++PO7XgPkgKUGTcNNicHkaUnVMWBo5iTX5FeulRX6rbtmXzqaoCG+TI/LbARg== X-Gm-Gg: AR+sD10pJlg9WzefB5ah04UVj+96Hwl+YsqOIrQTwMDwj/EIyOTujt+lZukah1fgzIF k057g8L8xy7BRf1AM0pXBMM5CeC22gnETKxkUm1t0U0YILyB+jsg8xRqpDYYG/PlcokMaLrS/3Q zqH84+RDJ/Zy3wZyIzkvpNtDzNDYOhkrO4BcGLKV8ml3htfLJ11U1Ew6B6wMWROh1wgCvm4pKKa r1HC8/3FNjZMzhmkoLZRO/NJZz0NclmHZ/Fxqc41Jfrygthw+AKP8CsOdueWVpokixerk4yCu+6 qiGy4wiB6hayo8Xnza1oG3Ij93uT6J63uX4lZJtjs2UCE7hXkJZwt9MGdqmpy8GNP7EV+OufUB4 3Af1RZsouOsI4B9PsqUZIKiG0ZzcPdxtxXH6pMOxWdw== X-Received: by 2002:a05:622a:2294:b0:517:8a18:7624 with SMTP id d75a77b69052e-52d73be13a6mr13991741cf.3.1786569559799; Wed, 12 Aug 2026 14:19:19 -0700 (PDT) X-Received: by 2002:a05:622a:2294:b0:517:8a18:7624 with SMTP id d75a77b69052e-52d73be13a6mr13990951cf.3.1786569559090; Wed, 12 Aug 2026 14:19:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 17/23] monitor: Rename MonitorQMP @mon -> @qmon Date: Wed, 12 Aug 2026 23:17:01 +0200 Message-ID: <20260812211708.92824-18-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: i50CADaw_gfsZBweIMP1vao5vTuSph7V X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX19Z6NYQ6TESi Osqb6mJcagZs3R2xX/swaTbgxiGf6vck30YxyqbhcxzAV3bKWBIjUWU2DJb+w84IyiSLQMz/Czj thlKa/sKU4t5TpeZtWTk6oRj2h9VlwgpyH1xg49BI8VTFVmichjHaIkm+hn6S9uWTBpZhC2c2Zr Jr9+mHp8EUZSXXN731/pFKlefyVviX7Sj5NpTZJbwFdj8XqsVN5EeaZxlUthMKmPP189Y3ilJw/ DsnA/jLHsfByTtTGJEWfLa+gOgvAmKKhbOE5FFw3BtzRnbUALvU80XeuJGhSmCW9xV+b57rsZn7 Cqf5MmPzm49ys3iyXubp6+KivuBPN7HTcRU7UUz02ncL4ifEH2Hg9fiwMtWJOEr4TZA8ek0/Kbe vXG0A952zgJLVn9O5quYUCT/wEt0duBvyMTkrBR5IVr0LK746UFcGxT2LdSBWkwSCeki+hGtCmH ysghNbq/I+hpoLiduPw== X-Authority-Analysis: v=2.4 cv=E8n9Y6dl c=1 sm=1 tr=0 ts=6a7ce359 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=eGoNBsedGaBmCx4Gi5QA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX6rwcpxVlqHYS DcIYzRSCFdrWjnP1/Y9W9qTVfyIWeE3PxN0CSPqAYAZiGLe/e5CqznHZCHJYIUavzOISE7Wfa8l /pbVI4bBlkQheEtLHaEgNt1bAaGRODI= X-Proofpoint-ORIG-GUID: i50CADaw_gfsZBweIMP1vao5vTuSph7V 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 bulkscore=0 clxscore=1015 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569596788158500 Mechanical change to sanitize using the following patterns: MonitorQMP *qmon (this patch) MonitorHMP *hmon (following one) Monitor *mon Rename @mon (and @qmp_mon) as @qmon when the type is MonitorQMP. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- monitor/monitor-internal.h | 4 +- monitor/qmp-cmds-control.c | 18 +-- monitor/qmp.c | 256 ++++++++++++++++++------------------- 3 files changed, 139 insertions(+), 139 deletions(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index bc0932c425a..cfbb3e5ecea 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -216,8 +216,8 @@ void monitor_list_append(Monitor *mon); void monitor_fdsets_cleanup(void); int monitor_set_cpu(Monitor *mon, int cpu_index); =20 -void qmp_send_response(MonitorQMP *mon, const QDict *rsp); -void monitor_data_destroy_qmp(MonitorQMP *mon); +void qmp_send_response(MonitorQMP *qmon, const QDict *rsp); +void monitor_data_destroy_qmp(MonitorQMP *qmon); void coroutine_fn monitor_qmp_dispatcher_co(void *data); void qmp_dispatcher_co_wake(void); =20 diff --git a/monitor/qmp-cmds-control.c b/monitor/qmp-cmds-control.c index 8fe0876a3da..45f4fe4f6fb 100644 --- a/monitor/qmp-cmds-control.c +++ b/monitor/qmp-cmds-control.c @@ -39,7 +39,7 @@ * On success, set mon->qmp.capab[], and return true. * On error, set @errp, and return false. */ -static bool qmp_caps_accept(MonitorQMP *mon, QMPCapabilityList *list, +static bool qmp_caps_accept(MonitorQMP *qmon, QMPCapabilityList *list, Error **errp) { GString *unavailable =3D NULL; @@ -48,7 +48,7 @@ static bool qmp_caps_accept(MonitorQMP *mon, QMPCapabilit= yList *list, memset(capab, 0, sizeof(capab)); =20 for (; list; list =3D list->next) { - if (!mon->capab_offered[list->value]) { + if (!qmon->capab_offered[list->value]) { if (!unavailable) { unavailable =3D g_string_new(QMPCapability_str(list->value= )); } else { @@ -65,27 +65,27 @@ static bool qmp_caps_accept(MonitorQMP *mon, QMPCapabil= ityList *list, return false; } =20 - memcpy(mon->capab, capab, sizeof(capab)); + memcpy(qmon->capab, capab, sizeof(capab)); return true; } =20 void qmp_qmp_capabilities(bool has_enable, QMPCapabilityList *enable, Error **errp) { - MonitorQMP *mon =3D MONITOR_QMP(monitor_cur()); + MonitorQMP *qmon =3D MONITOR_QMP(monitor_cur()); =20 - if (mon->commands =3D=3D &qmp_commands) { + if (qmon->commands =3D=3D &qmp_commands) { error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND, "Capabilities negotiation is already complete, command " "ignored"); return; } =20 - if (!qmp_caps_accept(mon, enable, errp)) { + if (!qmp_caps_accept(qmon, enable, errp)) { return; } =20 - mon->commands =3D &qmp_commands; + qmon->commands =3D &qmp_commands; } =20 VersionInfo *qmp_query_version(Error **errp) @@ -118,9 +118,9 @@ static void query_commands_cb(const QmpCommand *cmd, vo= id *opaque) CommandInfoList *qmp_query_commands(Error **errp) { CommandInfoList *list =3D NULL; - MonitorQMP *mon =3D MONITOR_QMP(monitor_cur()); + MonitorQMP *qmon =3D MONITOR_QMP(monitor_cur()); =20 - qmp_for_each_command(mon->commands, query_commands_cb, &list); + qmp_for_each_command(qmon->commands, query_commands_cb, &list); =20 return list; } diff --git a/monitor/qmp.c b/monitor/qmp.c index aec03157750..d6ce734916e 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -79,44 +79,44 @@ static MonitorQMP *qmp_dispatcher_current_mon; =20 OBJECT_DEFINE_TYPE(MonitorQMP, monitor_qmp, MONITOR_QMP, MONITOR); =20 -static void monitor_qmp_cleanup_req_queue_locked(MonitorQMP *mon); +static void monitor_qmp_cleanup_req_queue_locked(MonitorQMP *qmon); =20 static void monitor_qmp_finalize(Object *obj) { - MonitorQMP *mon =3D MONITOR_QMP(obj); + MonitorQMP *qmon =3D MONITOR_QMP(obj); =20 - json_message_parser_destroy(&mon->parser); - qemu_mutex_destroy(&mon->qmp_queue_lock); - monitor_qmp_cleanup_req_queue_locked(mon); - g_queue_free(mon->qmp_requests); + json_message_parser_destroy(&qmon->parser); + qemu_mutex_destroy(&qmon->qmp_queue_lock); + monitor_qmp_cleanup_req_queue_locked(qmon); + g_queue_free(qmon->qmp_requests); } =20 static bool monitor_qmp_get_pretty(Object *obj, Error **errp) { - MonitorQMP *mon =3D MONITOR_QMP(obj); + MonitorQMP *qmon =3D MONITOR_QMP(obj); =20 - return mon->pretty; + return qmon->pretty; } =20 static void monitor_qmp_set_pretty(Object *obj, bool val, Error **errp) { - MonitorQMP *mon =3D MONITOR_QMP(obj); + MonitorQMP *qmon =3D MONITOR_QMP(obj); =20 - mon->pretty =3D val; + qmon->pretty =3D val; } =20 static int monitor_qmp_get_close_action(Object *obj, Error **errp) { - MonitorQMP *mon =3D MONITOR_QMP(obj); + MonitorQMP *qmon =3D MONITOR_QMP(obj); =20 - return mon->close_action; + return qmon->close_action; } =20 static void monitor_qmp_set_close_action(Object *obj, int val, Error **err= p) { - MonitorQMP *mon =3D MONITOR_QMP(obj); + MonitorQMP *qmon =3D MONITOR_QMP(obj); =20 - mon->close_action =3D val; + qmon->close_action =3D val; } =20 static void monitor_qmp_emit_event(Monitor *mon, QAPIEvent event, QDict *q= dict); @@ -150,25 +150,25 @@ static void monitor_qmp_class_init(ObjectClass *cls, = const void *data) static void handle_qmp_command(void *opaque, QObject *req, Error *err); static void monitor_qmp_init(Object *obj) { - MonitorQMP *mon =3D MONITOR_QMP(obj); + MonitorQMP *qmon =3D MONITOR_QMP(obj); =20 - qemu_mutex_init(&mon->qmp_queue_lock); - mon->qmp_requests =3D g_queue_new(); + qemu_mutex_init(&qmon->qmp_queue_lock); + qmon->qmp_requests =3D g_queue_new(); =20 - json_message_parser_init(&mon->parser, handle_qmp_command, mon, NULL); + json_message_parser_init(&qmon->parser, handle_qmp_command, qmon, NULL= ); } =20 static void monitor_qmp_emit_event(Monitor *mon, QAPIEvent event, QDict *q= dict) { - MonitorQMP *qmp =3D MONITOR_QMP(mon); + MonitorQMP *qmon =3D MONITOR_QMP(mon); =20 WITH_QEMU_LOCK_GUARD(&mon->mon_lock) { - if (qmp->commands =3D=3D &qmp_cap_negotiation_commands) { + if (qmon->commands =3D=3D &qmp_cap_negotiation_commands) { return; } } =20 - qmp_send_response(qmp, qdict); + qmp_send_response(qmon, qdict); } =20 static bool monitor_qmp_requires_iothread(const Monitor *mon) @@ -177,17 +177,17 @@ static bool monitor_qmp_requires_iothread(const Monit= or *mon) QEMU_CHAR_FEATURE_GCONTEXT); } =20 -static bool qmp_oob_enabled(MonitorQMP *mon) +static bool qmp_oob_enabled(MonitorQMP *qmon) { - return mon->capab[QMP_CAPABILITY_OOB]; + return qmon->capab[QMP_CAPABILITY_OOB]; } =20 -static void monitor_qmp_caps_reset(MonitorQMP *mon) +static void monitor_qmp_caps_reset(MonitorQMP *qmon) { - memset(mon->capab_offered, 0, sizeof(mon->capab_offered)); - memset(mon->capab, 0, sizeof(mon->capab)); - mon->capab_offered[QMP_CAPABILITY_OOB] =3D - monitor_requires_iothread(MONITOR(mon)); + memset(qmon->capab_offered, 0, sizeof(qmon->capab_offered)); + memset(qmon->capab, 0, sizeof(qmon->capab)); + qmon->capab_offered[QMP_CAPABILITY_OOB] =3D + monitor_requires_iothread(MONITOR(qmon)); } =20 static void qmp_request_free(QMPRequest *req) @@ -198,22 +198,22 @@ static void qmp_request_free(QMPRequest *req) } =20 /* Caller must hold mon->qmp.qmp_queue_lock */ -static void monitor_qmp_cleanup_req_queue_locked(MonitorQMP *mon) +static void monitor_qmp_cleanup_req_queue_locked(MonitorQMP *qmon) { - while (!g_queue_is_empty(mon->qmp_requests)) { - qmp_request_free(g_queue_pop_head(mon->qmp_requests)); + while (!g_queue_is_empty(qmon->qmp_requests)) { + qmp_request_free(g_queue_pop_head(qmon->qmp_requests)); } } =20 -static void monitor_qmp_drain_queue(MonitorQMP *mon) +static void monitor_qmp_drain_queue(MonitorQMP *qmon) { - QEMU_LOCK_GUARD(&mon->qmp_queue_lock); - monitor_qmp_cleanup_req_queue_locked(mon); + QEMU_LOCK_GUARD(&qmon->qmp_queue_lock); + monitor_qmp_cleanup_req_queue_locked(qmon); } =20 -static void monitor_qmp_cleanup_queue_and_resume(MonitorQMP *mon) +static void monitor_qmp_cleanup_queue_and_resume(MonitorQMP *qmon) { - QEMU_LOCK_GUARD(&mon->qmp_queue_lock); + QEMU_LOCK_GUARD(&qmon->qmp_queue_lock); =20 /* * Same condition as in monitor_qmp_dispatcher_co(), but before @@ -221,11 +221,11 @@ static void monitor_qmp_cleanup_queue_and_resume(Moni= torQMP *mon) * Also, the queue should not be empty either, otherwise the * monitor hasn't been suspended yet (or was already resumed). */ - bool need_resume =3D (!qmp_oob_enabled(mon) || - mon->qmp_requests->length =3D=3D QMP_REQ_QUEUE_LEN_MAX) - && !g_queue_is_empty(mon->qmp_requests); + bool need_resume =3D (!qmp_oob_enabled(qmon) || + qmon->qmp_requests->length =3D=3D QMP_REQ_QUEUE_LEN_MAX) + && !g_queue_is_empty(qmon->qmp_requests); =20 - monitor_qmp_cleanup_req_queue_locked(mon); + monitor_qmp_cleanup_req_queue_locked(qmon); =20 if (need_resume) { /* @@ -237,22 +237,22 @@ static void monitor_qmp_cleanup_queue_and_resume(Moni= torQMP *mon) * when we get here while the monitor is suspended. An * unfortunately timed CHR_EVENT_CLOSED can do the trick. */ - monitor_resume(&mon->parent_obj); + monitor_resume(&qmon->parent_obj); } =20 } =20 -void qmp_send_response(MonitorQMP *mon, const QDict *rsp) +void qmp_send_response(MonitorQMP *qmon, const QDict *rsp) { const QObject *data =3D QOBJECT(rsp); GString *json; =20 - json =3D qobject_to_json_pretty(data, mon->pretty); + json =3D qobject_to_json_pretty(data, qmon->pretty); assert(json !=3D NULL); - trace_monitor_qmp_respond(mon, json->str); + trace_monitor_qmp_respond(qmon, json->str); =20 g_string_append_c(json, '\n'); - monitor_puts(&mon->parent_obj, json->str); + monitor_puts(&qmon->parent_obj, json->str); =20 g_string_free(json, true); } @@ -262,10 +262,10 @@ void qmp_send_response(MonitorQMP *mon, const QDict *= rsp) * Null @rsp can only happen for commands with QCO_NO_SUCCESS_RESP. * Nothing is emitted then. */ -static void monitor_qmp_respond(MonitorQMP *mon, QDict *rsp) +static void monitor_qmp_respond(MonitorQMP *qmon, QDict *rsp) { if (rsp) { - qmp_send_response(mon, rsp); + qmp_send_response(qmon, rsp); } } =20 @@ -273,15 +273,15 @@ static void monitor_qmp_respond(MonitorQMP *mon, QDic= t *rsp) * Runs outside of coroutine context for OOB commands, but in * coroutine context for everything else. */ -static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req) +static void monitor_qmp_dispatch(MonitorQMP *qmon, QObject *req) { QDict *rsp; QDict *error; =20 - rsp =3D qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon), - &mon->parent_obj); + rsp =3D qmp_dispatch(qmon->commands, req, qmp_oob_enabled(qmon), + &qmon->parent_obj); =20 - if (mon->commands =3D=3D &qmp_cap_negotiation_commands) { + if (qmon->commands =3D=3D &qmp_cap_negotiation_commands) { error =3D qdict_get_qdict(rsp, "error"); if (error && !g_strcmp0(qdict_get_try_str(error, "class"), @@ -293,7 +293,7 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObje= ct *req) } } =20 - monitor_qmp_respond(mon, rsp); + monitor_qmp_respond(qmon, rsp); qobject_unref(rsp); } =20 @@ -313,22 +313,22 @@ static QMPRequest *monitor_qmp_requests_pop_any_with_= lock(void) { QMPRequest *req_obj =3D NULL; Monitor *mon; - MonitorQMP *qmp_mon; + MonitorQMP *qmon; =20 QTAILQ_FOREACH(mon, &mon_list, entry) { - qmp_mon =3D MONITOR_QMP( + qmon =3D MONITOR_QMP( object_dynamic_cast(OBJECT(mon), TYPE_MONITOR_QMP)); - if (!qmp_mon) { + if (!qmon) { continue; } =20 - qemu_mutex_lock(&qmp_mon->qmp_queue_lock); - req_obj =3D g_queue_pop_head(qmp_mon->qmp_requests); + qemu_mutex_lock(&qmon->qmp_queue_lock); + req_obj =3D g_queue_pop_head(qmon->qmp_requests); if (req_obj) { /* With the lock of corresponding queue held */ break; } - qemu_mutex_unlock(&qmp_mon->qmp_queue_lock); + qemu_mutex_unlock(&qmon->qmp_queue_lock); } =20 if (req_obj) { @@ -391,7 +391,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) QMPRequest *req_obj; QDict *rsp; bool oob_enabled; - MonitorQMP *mon; + MonitorQMP *qmon; =20 while ((req_obj =3D monitor_qmp_dispatcher_pop_any()) !=3D NULL) { trace_monitor_qmp_in_band_dequeue(req_obj, @@ -401,8 +401,8 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) * @req_obj has a request, we hold req_obj->mon->qmp_queue_lock */ =20 - mon =3D req_obj->mon; - qmp_dispatcher_current_mon =3D mon; + qmon =3D req_obj->mon; + qmp_dispatcher_current_mon =3D qmon; =20 /* * We need to resume the monitor if handle_qmp_command() @@ -415,17 +415,17 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *dat= a) * We need to save qmp_oob_enabled() for later, because * qmp_qmp_capabilities() can change it. */ - oob_enabled =3D qmp_oob_enabled(mon); + oob_enabled =3D qmp_oob_enabled(qmon); if (oob_enabled - && mon->qmp_requests->length =3D=3D QMP_REQ_QUEUE_LEN_MAX - 1)= { - monitor_resume(&mon->parent_obj); + && qmon->qmp_requests->length =3D=3D QMP_REQ_QUEUE_LEN_MAX - 1= ) { + monitor_resume(&qmon->parent_obj); } =20 /* * Drop the queue mutex now, before yielding, otherwise we might * deadlock if the main thread tries to lock it. */ - qemu_mutex_unlock(&mon->qmp_queue_lock); + qemu_mutex_unlock(&qmon->qmp_queue_lock); =20 if (qatomic_xchg(&qmp_dispatcher_co_busy, true) =3D=3D true) { /* @@ -448,18 +448,18 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *dat= a) trace_monitor_qmp_cmd_in_band(id_json->str); g_string_free(id_json, true); } - monitor_qmp_dispatch(mon, req_obj->req); + monitor_qmp_dispatch(qmon, req_obj->req); } else { assert(req_obj->err); trace_monitor_qmp_err_in_band(error_get_pretty(req_obj->err)); rsp =3D qmp_error_response(req_obj->err); req_obj->err =3D NULL; - monitor_qmp_respond(mon, rsp); + monitor_qmp_respond(qmon, rsp); qobject_unref(rsp); } =20 if (!oob_enabled) { - monitor_resume(&mon->parent_obj); + monitor_resume(&qmon->parent_obj); } =20 qmp_request_free(req_obj); @@ -481,7 +481,7 @@ void qmp_dispatcher_co_wake(void) =20 static void handle_qmp_command(void *opaque, QObject *req, Error *err) { - MonitorQMP *mon =3D opaque; + MonitorQMP *qmon =3D opaque; QDict *qdict =3D qobject_to(QDict, req); QMPRequest *req_obj; =20 @@ -489,7 +489,7 @@ static void handle_qmp_command(void *opaque, QObject *r= eq, Error *err) =20 if (req && trace_event_get_state_backends(TRACE_HANDLE_QMP_COMMAND)) { GString *req_json =3D qobject_to_json(req); - trace_handle_qmp_command(mon, req_json->str); + trace_handle_qmp_command(qmon, req_json->str); g_string_free(req_json, true); } =20 @@ -503,18 +503,18 @@ static void handle_qmp_command(void *opaque, QObject = *req, Error *err) trace_monitor_qmp_cmd_out_of_band(id_json->str); g_string_free(id_json, true); } - monitor_qmp_dispatch(mon, req); + monitor_qmp_dispatch(qmon, req); qobject_unref(req); return; } =20 req_obj =3D g_new0(QMPRequest, 1); - req_obj->mon =3D mon; + req_obj->mon =3D qmon; req_obj->req =3D req; req_obj->err =3D err; =20 /* Protect qmp_requests and fetching its length. */ - WITH_QEMU_LOCK_GUARD(&mon->qmp_queue_lock) { + WITH_QEMU_LOCK_GUARD(&qmon->qmp_queue_lock) { =20 /* * Suspend the monitor when we can't queue more requests after @@ -523,9 +523,9 @@ static void handle_qmp_command(void *opaque, QObject *r= eq, Error *err) * Note that when OOB is disabled, we queue at most one command, * for backward compatibility. */ - if (!qmp_oob_enabled(mon) || - mon->qmp_requests->length =3D=3D QMP_REQ_QUEUE_LEN_MAX - 1) { - monitor_suspend(&mon->parent_obj); + if (!qmp_oob_enabled(qmon) || + qmon->qmp_requests->length =3D=3D QMP_REQ_QUEUE_LEN_MAX - 1) { + monitor_suspend(&qmon->parent_obj); } =20 /* @@ -533,10 +533,10 @@ static void handle_qmp_command(void *opaque, QObject = *req, Error *err) * handled in time order. Ownership for req_obj, req, * etc. will be delivered to the handler side. */ - trace_monitor_qmp_in_band_enqueue(req_obj, mon, - mon->qmp_requests->length); - assert(mon->qmp_requests->length < QMP_REQ_QUEUE_LEN_MAX); - g_queue_push_tail(mon->qmp_requests, req_obj); + trace_monitor_qmp_in_band_enqueue(req_obj, qmon, + qmon->qmp_requests->length); + assert(qmon->qmp_requests->length < QMP_REQ_QUEUE_LEN_MAX); + g_queue_push_tail(qmon->qmp_requests, req_obj); } =20 /* Kick the dispatcher routine */ @@ -545,12 +545,12 @@ static void handle_qmp_command(void *opaque, QObject = *req, Error *err) =20 static void monitor_qmp_read(void *opaque, const uint8_t *buf, int size) { - MonitorQMP *mon =3D opaque; + MonitorQMP *qmon =3D opaque; =20 - json_message_parser_feed(&mon->parser, (const char *) buf, size); + json_message_parser_feed(&qmon->parser, (const char *) buf, size); } =20 -static QDict *qmp_greeting(MonitorQMP *mon) +static QDict *qmp_greeting(MonitorQMP *qmon) { QList *cap_list =3D qlist_new(); QObject *ver =3D NULL; @@ -562,7 +562,7 @@ static QDict *qmp_greeting(MonitorQMP *mon) qobject_unref(args); =20 for (cap =3D 0; cap < QMP_CAPABILITY__MAX; cap++) { - if (mon->capab_offered[cap]) { + if (qmon->capab_offered[cap]) { qlist_append_str(cap_list, QMPCapability_str(cap)); } } @@ -574,10 +574,10 @@ static QDict *qmp_greeting(MonitorQMP *mon) =20 static void monitor_qmp_self_delete_bh(void *opaque) { - MonitorQMP *mon =3D opaque; + MonitorQMP *qmon =3D opaque; const char *mon_id =3D object_get_canonical_path_component( - OBJECT(mon)); - g_autofree char *chardev_id =3D g_strdup(mon->parent_obj.chardev_id); + OBJECT(qmon)); + g_autofree char *chardev_id =3D g_strdup(qmon->parent_obj.chardev_id); Error *local_error =3D NULL; =20 if (!mon_id) { @@ -587,13 +587,13 @@ static void monitor_qmp_self_delete_bh(void *opaque) * mon from monitor_qmp_event but it is already * unparented. */ - object_unref(mon); + object_unref(qmon); return; } =20 user_creatable_del(mon_id, &local_error); /* Pairs with ref from monitor_qmp_event */ - object_unref(mon); + object_unref(qmon); if (local_error !=3D NULL) { error_report_err(local_error); } else { @@ -604,25 +604,25 @@ static void monitor_qmp_self_delete_bh(void *opaque) static void monitor_qmp_event(void *opaque, QEMUChrEvent event) { QDict *data; - MonitorQMP *mon =3D opaque; + MonitorQMP *qmon =3D opaque; =20 /* * Protect against race if a client drops & quickly * reconnects - we'll have the delete BH scheduled * so must not honour a new open request */ - if (mon->delete_pending) { + if (qmon->delete_pending) { return; } =20 switch (event) { case CHR_EVENT_OPENED: - WITH_QEMU_LOCK_GUARD(&mon->parent_obj.mon_lock) { - mon->commands =3D &qmp_cap_negotiation_commands; - monitor_qmp_caps_reset(mon); + WITH_QEMU_LOCK_GUARD(&qmon->parent_obj.mon_lock) { + qmon->commands =3D &qmp_cap_negotiation_commands; + monitor_qmp_caps_reset(qmon); } - data =3D qmp_greeting(mon); - qmp_send_response(mon, data); + data =3D qmp_greeting(qmon); + qmp_send_response(qmon, data); qobject_unref(data); break; case CHR_EVENT_CLOSED: @@ -632,16 +632,16 @@ static void monitor_qmp_event(void *opaque, QEMUChrEv= ent event) * stdio, it's possible that stdout is still open when stdin * is closed. */ - monitor_qmp_cleanup_queue_and_resume(mon); - json_message_parser_destroy(&mon->parser); - json_message_parser_init(&mon->parser, handle_qmp_command, - mon, NULL); + monitor_qmp_cleanup_queue_and_resume(qmon); + json_message_parser_destroy(&qmon->parser); + json_message_parser_init(&qmon->parser, handle_qmp_command, + qmon, NULL); monitor_fdsets_cleanup(); - switch (mon->close_action) { + switch (qmon->close_action) { case MONITOR_QMP_CLOSE_ACTION_NONE: break; case MONITOR_QMP_CLOSE_ACTION_DELETE: - mon->delete_pending =3D true; + qmon->delete_pending =3D true; /* * Do NOT run in the AIO context associated with the * monitor. We need to run in the default AIO context @@ -652,9 +652,9 @@ static void monitor_qmp_event(void *opaque, QEMUChrEven= t event) * with the BH by processing an explicit 'object-del'. * Will be released by monitor_qmp_self_delete_bh */ - object_ref(mon); + object_ref(qmon); aio_bh_schedule_oneshot(qemu_get_aio_context(), - monitor_qmp_self_delete_bh, mon); + monitor_qmp_self_delete_bh, qmon); break; default: g_assert_not_reached(); @@ -668,24 +668,24 @@ static void monitor_qmp_event(void *opaque, QEMUChrEv= ent event) } } =20 -static bool monitor_qmp_dispatcher_is_servicing(MonitorQMP *mon) +static bool monitor_qmp_dispatcher_is_servicing(MonitorQMP *qmon) { - return qmp_dispatcher_current_mon =3D=3D mon; + return qmp_dispatcher_current_mon =3D=3D qmon; } =20 static void monitor_qmp_setup_handlers_bh(void *opaque) { - MonitorQMP *mon =3D opaque; + MonitorQMP *qmon =3D opaque; GMainContext *context; =20 - assert(monitor_requires_iothread(MONITOR(mon))); + assert(monitor_requires_iothread(MONITOR(qmon))); context =3D iothread_get_g_main_context(mon_iothread); assert(context); - qemu_chr_fe_set_handlers(&mon->parent_obj.chr, monitor_can_read, + qemu_chr_fe_set_handlers(&qmon->parent_obj.chr, monitor_can_read, monitor_qmp_read, monitor_qmp_event, - NULL, &mon->parent_obj, context, true); - monitor_list_append(&mon->parent_obj); - qatomic_set(&mon->setup_pending, false); + NULL, &qmon->parent_obj, context, true); + monitor_list_append(&qmon->parent_obj); + qatomic_set(&qmon->setup_pending, false); } =20 void monitor_new_qmp(const char *id, const char *chardev_id, @@ -703,11 +703,11 @@ void monitor_new_qmp(const char *id, const char *char= dev_id, =20 static void monitor_qmp_complete(UserCreatable *uc, Error **errp) { - MonitorQMP *mon =3D MONITOR_QMP(uc); + MonitorQMP *qmon =3D MONITOR_QMP(uc); UserCreatableClass *ucc_parent =3D USER_CREATABLE_CLASS( object_class_get_parent( - OBJECT_CLASS(MONITOR_QMP_GET_CLASS(mon)))); + OBJECT_CLASS(MONITOR_QMP_GET_CLASS(qmon)))); ERRP_GUARD(); =20 ucc_parent->complete(uc, errp); @@ -715,33 +715,33 @@ static void monitor_qmp_complete(UserCreatable *uc, E= rror **errp) return; } =20 - qemu_chr_fe_set_echo(&mon->parent_obj.chr, true); + qemu_chr_fe_set_echo(&qmon->parent_obj.chr, true); =20 - if (monitor_requires_iothread(MONITOR(mon))) { + if (monitor_requires_iothread(MONITOR(qmon))) { /* * Make sure the old iowatch is gone. It's possible when * e.g. the chardev is in client mode, with wait=3Don. */ - remove_fd_in_watch(mon->parent_obj.chr.chr); + remove_fd_in_watch(qmon->parent_obj.chr.chr); /* * Clean up listener IO sources early to prevent racy fd * handling between the main thread and the I/O thread. */ - remove_listener_fd_in_watch(mon->parent_obj.chr.chr); + remove_listener_fd_in_watch(qmon->parent_obj.chr.chr); /* * We can't call qemu_chr_fe_set_handlers() directly here * since chardev might be running in the monitor I/O * thread. Schedule a bottom half. */ - mon->setup_pending =3D true; + qmon->setup_pending =3D true; aio_bh_schedule_oneshot(iothread_get_aio_context(mon_iothread), - monitor_qmp_setup_handlers_bh, mon); + monitor_qmp_setup_handlers_bh, qmon); /* The bottom half will add @mon to @mon_list */ } else { - qemu_chr_fe_set_handlers(&mon->parent_obj.chr, monitor_can_read, + qemu_chr_fe_set_handlers(&qmon->parent_obj.chr, monitor_can_read, monitor_qmp_read, monitor_qmp_event, - NULL, &mon->parent_obj, NULL, true); - monitor_list_append(&mon->parent_obj); + NULL, &qmon->parent_obj, NULL, true); + monitor_list_append(&qmon->parent_obj); } } =20 @@ -753,14 +753,14 @@ static void monitor_qmp_iothread_quiesce(void *opaque) static bool monitor_qmp_prepare_delete(UserCreatable *uc, Error **errp) { Monitor *mon =3D MONITOR(uc); - MonitorQMP *qmp =3D MONITOR_QMP(uc); + MonitorQMP *qmon =3D MONITOR_QMP(uc); =20 - if (monitor_qmp_dispatcher_is_servicing(qmp)) { + if (monitor_qmp_dispatcher_is_servicing(qmon)) { error_setg(errp, "Cannot delete the current QMP monitor"); return false; } =20 - if (qatomic_read(&qmp->setup_pending)) { + if (qatomic_read(&qmon->setup_pending)) { error_setg(errp, "monitor is still initializing"); return false; } @@ -779,7 +779,7 @@ static bool monitor_qmp_prepare_delete(UserCreatable *u= c, Error **errp) NULL, NULL, true); =20 /* Drain requests from any in-flight monitor_qmp_read(). */ - monitor_qmp_drain_queue(qmp); + monitor_qmp_drain_queue(qmon); =20 WITH_QEMU_LOCK_GUARD(&mon->mon_lock) { /* Disable flushes before cancel -- gcontext is already wrong. */ @@ -794,7 +794,7 @@ static bool monitor_qmp_prepare_delete(UserCreatable *u= c, Error **errp) } =20 /* Catch requests from a racing monitor_qmp_read(). */ - monitor_qmp_drain_queue(qmp); + monitor_qmp_drain_queue(qmon); monitor_fdsets_cleanup(); =20 return true; --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569594; cv=none; d=zohomail.com; s=zohoarc; b=Co/45GAMsCBgLio/JdWWNkDqpM3TNmxyVEl8qLt3cAg88OoypOqOxoLUfxBIXOsTn42n0aLDHqRUhz9QN3DXf10alqwyC0eqt+7Vui6sqX9Z4b9z7KQwHM46ASFSPKDw1i8IO2aOXsFwlwLAY3u01X1J9XXd9YtNZo58VKPt3qA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569594; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NG4KSBbNxvNRIZkFMRYfrR3abIcp/TjNZT5R6QRTgUA=; b=XnDB8jq+ej7gkxGY2ewHeF0SYJMpmLZUqe0ZRpJYkZwIwacDpkMKCckZIJajX5KpoKNCdfzXluf4GWB7I8SoBCp+zpuwxdihOJzcM8jvk57F2jewugijmkSZx7A/rW49iZ9D+Uxy2uGtz0UPoUT5NyLFp6QCwtdq7QLFLGGVMR8= 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 17865695947341019.0724398530202; Wed, 12 Aug 2026 14:19:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGMX-0002qX-NZ; Wed, 12 Aug 2026 17:19:49 -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 1wuGMH-0002Pf-99 for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19:34 -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 1wuGME-0007uc-En for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19:32 -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 67CK2T0t520534 for ; Wed, 12 Aug 2026 21:19:28 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0xx1rdsk-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:19:28 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c01ff996dso21308741cf.2 for ; Wed, 12 Aug 2026 14:19:27 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4815a569c2bsm633199f8f.12.2026.08.12.14.19.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= NG4KSBbNxvNRIZkFMRYfrR3abIcp/TjNZT5R6QRTgUA=; b=p3JX0SrUZXudAWPh L9l55FcBUP423nvEjmMAFptepteZaPlxOxhLwZGMSeAHOTvXf1ihuJhxkqkXZLVn omatTJz7sTlcqLIgrpJCD7dOBDEZtRrtLYy50ggH46MTAgKoXV4RW4r6n23/kPZ8 0lbkCvbTyf8wFasOJcuwgIr1p5flMuXj0p0XSQPbBc6/k3PjVCmvi6vttnq/EAIe JRmoLDpspWUzClMgmfbxai3PXi4N9dCfur07O8JVdwBFLDgd2iDuVY2CMVEX4svo UPlj79rKNXthdstRfzlQpRmux1zhNLgCkVXXpqAaHUYgt9PL+r4z0zkkQCotinC+ mQmCoA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569567; x=1787174367; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=NG4KSBbNxvNRIZkFMRYfrR3abIcp/TjNZT5R6QRTgUA=; b=gOdymzEhYeTseaKd8mHwJsGB1+A5apLO3Nb2WtlqTwPNq1uWZMPsnb6K3znQicLnDN vOveW3ZJvke3r+IAh38AIxR7K2W/oB+E5vFmUSOmohHVxqSIH95mC4FjVvUMTqLuGBzI B9WgipXDvD1lDBfuoEUpkcXn9I22u2pIvgwjO1Tw6Umoys5FWzxug1BpyPqY6YXG8CxS I6K6wdj8X1GjYJec+xvlSewPm8tu3ESXfkSjEx98mrRWZcK+fk7pnfVQMdMG7H1raxgm hMCqNGAjOcE2NCbx2Xxi5ponVRgCerNiNtgI3TMSZOjFf4A+yT+1HeM4rfKFYKugAF8g dnqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569567; x=1787174367; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=NG4KSBbNxvNRIZkFMRYfrR3abIcp/TjNZT5R6QRTgUA=; b=U2ovn2r3otUhr6xfnyYRN6BEZ0TK7b5x2pUgVgkuh5SyZbxpaorn4WpVPW38Wkzdko 6l5iSdr+kaN6m5sWHNb47aMrNoGa8SAmc0d8I3d9kjywR8pyk+W0efHYNdUJ97F6uAAO rhXKkhWzj64X6j7Sg6gr6HDD+Ln239OYFuflnFKednyJspahzn7ifMVLYdY8YPRawff7 DiNCFXUL/htq9OrQCjfsOY0t37HasAYP7Ja7uAR4BNLDzz+N1ktzIF8NHCQMWq+HCpzr ZQoyg7f3Y7qEgiVbyGbLhCbgEisCM+M0LDnPyouPLgUUCkVdg2QsDY9sGg5jWmZhpdjq FeTQ== X-Gm-Message-State: AOJu0Ywt09PI5Z/juwCVdrCUxHPikpSWROVKDrco6wqbcmdM91Ngxmli e3nd51fuPpPkB03BHXT58Oh8WrQIBPFeoGcUP7qOU1Jl0I/5L/HPgItrSeap2FUtTKdNELD3JrN Zr2CrbI/JdZ0TK1AETqiuyURF3vJtEnxV6BQGGNI01LvEFpQsGIjWK2Qn+KGz0kXYyQ== X-Gm-Gg: AR+sD12X5GudhzGujEA1+uFy8H4yW0dpt+xyZPbz8RHtqA+DeFr6ec2iyVNa6JODmgA C+HBhkmdPJZan+9aCAHopq3HSZtz5hJZdImcW+QlUtQIWlrC3tdz6PU+lyzkkOL8qNb6sv46zod GuO8ZdwNRmjVH13wF1OOw6xHYCGCcbRIxTrg3GhKnY9DPpEF1/grXAqoMPrcYwIcHjvFWRtUwLO k3mvMQqh8678O6ubCpH40eK4vrUQDpIUyHAIM7yBDtSDEL+FEQL2HVknezueC++JPT/Ieog7QuJ yCT+xutQRgEQRlZb7r3JqbiLFN0D3mBfwCxr0SRvK5t0eYloNV98mLtNIirZmDXwGX9sCtNpxbt dbB9JEw9oM+Sx1MuGfrBMOIKxt2Dwpe7mkdNgjkjvAQ== X-Received: by 2002:ac8:5d03:0:b0:52d:4f43:d5b0 with SMTP id d75a77b69052e-52d73d614b1mr10349761cf.22.1786569567035; Wed, 12 Aug 2026 14:19:27 -0700 (PDT) X-Received: by 2002:ac8:5d03:0:b0:52d:4f43:d5b0 with SMTP id d75a77b69052e-52d73d614b1mr10349001cf.22.1786569566294; Wed, 12 Aug 2026 14:19:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , Fabiano Rosas Subject: [PATCH v3 18/23] monitor: Rename MonitorHMP @mon -> @hmon Date: Wed, 12 Aug 2026 23:17:02 +0200 Message-ID: <20260812211708.92824-19-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: jIZDt6rr6i14HyzmQqtc36ULdhfcj5j9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfXwIzp1yeBXq3H jpkmJISWzKjm7Ou316jT7sSaPymrQK/cpZgFZTXqJMMbGOONlmatI00TVUGsAKLUhZxVm8fZ64S zKf3a3J7SOkVVelFdmd0oXSixu9oRdP8671WlktA94+k4uDN8Smb95xjUCvt5xIb/tK9jgPvfyl 7NPu2gT2PWc9WaL3x0xvCtF96ogzP1wAKrfODF1v3IkPChJ4aHXIvCgM41NNBH0tCntU9YfJ75J Od5ucPY5Ml/z/zhSLgE7ZZej7s4z59jRJ6hin8fn4cId4J3ktK3uYblLIvFhQ32DPsC5cdB74y/ onfxi4LtBSAReJnxudFFZ00DxTadK7r/EPCS4rJdlpxZI9IThrXJwtIVPmZ3seBB3fzZ4MziRJI EuG+hF6kaN05BumQHAdHfq6UnW2U6P2rQRxyB7JwXHcGOqK09MYP5ktzllSnh9CyPK4S88u/Fy/ ZlSlRBhza6DZ4mDw79g== X-Authority-Analysis: v=2.4 cv=J6KaKgnS c=1 sm=1 tr=0 ts=6a7ce360 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=5WHFjD7YvRk6Re6qPwMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=O8hF6Hzn-FEA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX8jWshnfT4/9i SoSPnUkvTwyfhtWBhRzhW2YBckzaQfBRXpP2D2MWPrXN/RE3Fwwk8TPouI3hIYXxZur1NyD+PYf ITRio4LFBxcnCEHlA90mqrO2lLUvu5U= X-Proofpoint-ORIG-GUID: jIZDt6rr6i14HyzmQqtc36ULdhfcj5j9 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 clxscore=1015 malwarescore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 phishscore=0 spamscore=0 adultscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569596921158500 Mechanical change to sanitize using the following patterns: MonitorQMP *qmon (previous patch) MonitorHMP *hmon (this patch) Monitor *mon Rename @mon (and @hmp_mon) as @hmon when the type is MonitorHMP. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/monitor/monitor.h | 4 +- monitor/monitor-internal.h | 2 +- migration/migration-hmp-cmds.c | 4 +- monitor/hmp-cmds.c | 10 +-- monitor/hmp.c | 155 +++++++++++++++++---------------- monitor/qmp-cmds.c | 12 +-- ui/ui-hmp-cmds.c | 4 +- 7 files changed, 96 insertions(+), 95 deletions(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index fd98ee2c71d..e86b945350a 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -55,8 +55,8 @@ void monitor_flush_locked(Monitor *mon); =20 void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, uint64_t size, Error **err= p); =20 -void monitor_read_command(MonitorHMP *mon, int show_prompt); -int monitor_read_password(MonitorHMP *mon, ReadLineFunc *readline_func, +void monitor_read_command(MonitorHMP *hmon, int show_prompt); +int monitor_read_password(MonitorHMP *hmon, ReadLineFunc *readline_func, void *opaque); =20 AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_i= d, diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index cfbb3e5ecea..65015409288 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -221,7 +221,7 @@ void monitor_data_destroy_qmp(MonitorQMP *qmon); void coroutine_fn monitor_qmp_dispatcher_co(void *data); void qmp_dispatcher_co_wake(void); =20 -void handle_hmp_command(MonitorHMP *mon, const char *cmdline); +void handle_hmp_command(MonitorHMP *hmon, const char *cmdline); int hmp_compare_cmd(const char *name, const char *list); =20 /* diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c index 351512942af..d4ca67575ab 100644 --- a/migration/migration-hmp-cmds.c +++ b/migration/migration-hmp-cmds.c @@ -855,9 +855,9 @@ void hmp_migrate(Monitor *mon, const QDict *qdict) =20 if (!detach) { HMPMigrationStatus *status; - MonitorHMP *hmp =3D MONITOR_HMP(mon); + MonitorHMP *hmon =3D MONITOR_HMP(mon); =20 - if (!hmp->use_readline) { + if (!hmon->use_readline) { monitor_printf(mon, "terminal does not allow synchronous " "migration, continuing detached\n"); return; diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index e9fb8d827a0..71d7df6d013 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -129,8 +129,8 @@ void hmp_info_version(Monitor *mon, const QDict *qdict) =20 void hmp_quit(Monitor *mon, const QDict *qdict) { - MonitorHMP *hmp =3D MONITOR_HMP(mon); - if (hmp->use_readline) { + MonitorHMP *hmon =3D MONITOR_HMP(mon); + if (hmon->use_readline) { monitor_suspend(mon); } qmp_quit(NULL); @@ -290,16 +290,16 @@ void hmp_info_sync_profile(Monitor *mon, const QDict = *qdict) =20 void hmp_info_history(Monitor *mon, const QDict *qdict) { - MonitorHMP *hmp_mon =3D container_of(mon, MonitorHMP, parent_obj); + MonitorHMP *hmon =3D container_of(mon, MonitorHMP, parent_obj); int i; const char *str; =20 - if (!hmp_mon->rs) { + if (!hmon->rs) { return; } i =3D 0; for(;;) { - str =3D readline_get_history(hmp_mon->rs, i); + str =3D readline_get_history(hmon->rs, i); if (!str) { break; } diff --git a/monitor/hmp.c b/monitor/hmp.c index 71a18882491..24076dc7c03 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -49,24 +49,24 @@ OBJECT_DEFINE_TYPE(MonitorHMP, monitor_hmp, MONITOR_HMP= , MONITOR); =20 static void monitor_hmp_finalize(Object *obj) { - MonitorHMP *mon =3D MONITOR_HMP(obj); - if (mon->rs) { - readline_free(mon->rs); + MonitorHMP *hmon =3D MONITOR_HMP(obj); + if (hmon->rs) { + readline_free(hmon->rs); } } =20 static bool monitor_hmp_get_readline(Object *obj, Error **errp) { - MonitorHMP *mon =3D MONITOR_HMP(obj); + MonitorHMP *hmon =3D MONITOR_HMP(obj); =20 - return mon->use_readline; + return hmon->use_readline; } =20 static void monitor_hmp_set_readline(Object *obj, bool val, Error **errp) { - MonitorHMP *mon =3D MONITOR_HMP(obj); + MonitorHMP *hmon =3D MONITOR_HMP(obj); =20 - mon->use_readline =3D val; + hmon->use_readline =3D val; } =20 int monitor_hmp_vprintf(Monitor *mon, const char *fmt, va_list ap) @@ -93,14 +93,14 @@ static void monitor_hmp_class_init(ObjectClass *cls, co= nst void *data) =20 static void monitor_hmp_init(Object *obj) { - MonitorHMP *hmp =3D MONITOR_HMP(obj); + MonitorHMP *hmon =3D MONITOR_HMP(obj); =20 /* * Default to common case for external HMP use, * as opposed to non-interactive internal use * from gdbstub */ - hmp->use_readline =3D true; + hmon->use_readline =3D true; } =20 int monitor_hmp_vprintf(Monitor *mon, const char *fmt, va_list ap) @@ -113,12 +113,12 @@ static void monitor_hmp_accept_input(Monitor *mon) { qemu_mutex_lock(&mon->mon_lock); if (mon->reset_seen) { - MonitorHMP *hmp =3D MONITOR_HMP(mon); - assert(hmp->rs); - readline_restart(hmp->rs); + MonitorHMP *hmon =3D MONITOR_HMP(mon); + assert(hmon->rs); + readline_restart(hmon->rs); qemu_chr_fe_accept_input(&mon->chr); qemu_mutex_unlock(&mon->mon_lock); - readline_show_prompt(hmp->rs); + readline_show_prompt(hmon->rs); } else { qemu_chr_fe_accept_input(&mon->chr); qemu_mutex_unlock(&mon->mon_lock); @@ -128,34 +128,34 @@ static void monitor_hmp_accept_input(Monitor *mon) static void monitor_command_cb(void *opaque, const char *cmdline, void *readline_opaque) { - MonitorHMP *mon =3D opaque; + MonitorHMP *hmon =3D opaque; =20 - monitor_suspend(&mon->parent_obj); - handle_hmp_command(mon, cmdline); - monitor_resume(&mon->parent_obj); + monitor_suspend(&hmon->parent_obj); + handle_hmp_command(hmon, cmdline); + monitor_resume(&hmon->parent_obj); } =20 -void monitor_read_command(MonitorHMP *mon, int show_prompt) +void monitor_read_command(MonitorHMP *hmon, int show_prompt) { - if (!mon->rs) { + if (!hmon->rs) { return; } =20 - readline_start(mon->rs, "(qemu) ", 0, monitor_command_cb, NULL); + readline_start(hmon->rs, "(qemu) ", 0, monitor_command_cb, NULL); if (show_prompt) { - readline_show_prompt(mon->rs); + readline_show_prompt(hmon->rs); } } =20 -int monitor_read_password(MonitorHMP *mon, ReadLineFunc *readline_func, +int monitor_read_password(MonitorHMP *hmon, ReadLineFunc *readline_func, void *opaque) { - if (mon->rs) { - readline_start(mon->rs, "Password: ", 1, readline_func, opaque); + if (hmon->rs) { + readline_start(hmon->rs, "Password: ", 1, readline_func, opaque); /* prompt is printed on return from the command handler */ return 0; } else { - monitor_printf(&mon->parent_obj, + monitor_printf(&hmon->parent_obj, "terminal does not support password prompting\n"); return -ENOTTY; } @@ -772,12 +772,12 @@ static const HMPCommand *search_dispatch_table(const = HMPCommand *disp_table, * Do not assume the return value points into @table! It doesn't when * the command is found in a sub-command table. */ -static const HMPCommand *monitor_parse_command(MonitorHMP *hmp_mon, +static const HMPCommand *monitor_parse_command(MonitorHMP *hmon, const char *cmdp_start, const char **cmdp, HMPCommand *table) { - Monitor *mon =3D &hmp_mon->parent_obj; + Monitor *mon =3D &hmon->parent_obj; const char *p; const HMPCommand *cmd; char cmdname[256]; @@ -809,7 +809,7 @@ static const HMPCommand *monitor_parse_command(MonitorH= MP *hmp_mon, *cmdp =3D p; /* search sub command */ if (cmd->sub_table !=3D NULL && *p !=3D '\0') { - return monitor_parse_command(hmp_mon, cmdp_start, cmdp, cmd->sub_t= able); + return monitor_parse_command(hmon, cmdp_start, cmdp, cmd->sub_tabl= e); } =20 return cmd; @@ -1254,15 +1254,15 @@ static void handle_hmp_command_co(void *opaque) data->done =3D true; } =20 -void handle_hmp_command(MonitorHMP *mon, const char *cmdline) +void handle_hmp_command(MonitorHMP *hmon, const char *cmdline) { QDict *qdict; const HMPCommand *cmd; const char *cmd_start =3D cmdline; =20 - trace_handle_hmp_command(mon, cmdline); + trace_handle_hmp_command(hmon, cmdline); =20 - cmd =3D monitor_parse_command(mon, cmdline, &cmdline, + cmd =3D monitor_parse_command(hmon, cmdline, &cmdline, hmp_cmds_for_target(false)); if (!cmd) { return; @@ -1270,17 +1270,17 @@ void handle_hmp_command(MonitorHMP *mon, const char= *cmdline) =20 if (!cmd->cmd && !cmd->cmd_info_hrt) { /* FIXME: is it useful to try autoload modules here ??? */ - monitor_printf(&mon->parent_obj, "Command \"%.*s\" is not availabl= e.\n", + monitor_printf(&hmon->parent_obj, "Command \"%.*s\" is not availab= le.\n", (int)(cmdline - cmd_start), cmd_start); return; } =20 - qdict =3D monitor_parse_arguments(&mon->parent_obj, &cmdline, cmd); + qdict =3D monitor_parse_arguments(&hmon->parent_obj, &cmdline, cmd); if (!qdict) { while (cmdline > cmd_start && qemu_isspace(cmdline[-1])) { cmdline--; } - monitor_printf(&mon->parent_obj, + monitor_printf(&hmon->parent_obj, "Try \"help %.*s\" for more information\n", (int)(cmdline - cmd_start), cmd_start); return; @@ -1289,18 +1289,18 @@ void handle_hmp_command(MonitorHMP *mon, const char= *cmdline) if (!cmd->coroutine) { /* old_mon is non-NULL when called from qmp_human_monitor_command(= ) */ Monitor *old_mon =3D monitor_set_cur(qemu_coroutine_self(), - &mon->parent_obj); - handle_hmp_command_exec(&mon->parent_obj, cmd, qdict); + &hmon->parent_obj); + handle_hmp_command_exec(&hmon->parent_obj, cmd, qdict); monitor_set_cur(qemu_coroutine_self(), old_mon); } else { HandleHmpCommandCo data =3D { - .mon =3D &mon->parent_obj, + .mon =3D &hmon->parent_obj, .cmd =3D cmd, .qdict =3D qdict, .done =3D false, }; Coroutine *co =3D qemu_coroutine_create(handle_hmp_command_co, &da= ta); - monitor_set_cur(co, &mon->parent_obj); + monitor_set_cur(co, &hmon->parent_obj); aio_co_enter(qemu_get_aio_context(), co); AIO_WAIT_WHILE_UNLOCKED(NULL, !data.done); } @@ -1308,7 +1308,8 @@ void handle_hmp_command(MonitorHMP *mon, const char *= cmdline) qobject_unref(qdict); } =20 -static void cmd_completion(MonitorHMP *mon, const char *name, const char *= list) +static void cmd_completion(MonitorHMP *hmon, + const char *name, const char *list) { const char *p, *pstart; char cmd[128]; @@ -1324,7 +1325,7 @@ static void cmd_completion(MonitorHMP *mon, const cha= r *name, const char *list) } memcpy(cmd, pstart, len); cmd[len] =3D '\0'; - readline_add_completion_of(mon->rs, name, cmd); + readline_add_completion_of(hmon->rs, name, cmd); if (*p =3D=3D '\0') { break; } @@ -1332,7 +1333,7 @@ static void cmd_completion(MonitorHMP *mon, const cha= r *name, const char *list) } } =20 -static void file_completion(MonitorHMP *mon, const char *input) +static void file_completion(MonitorHMP *hmon, const char *input) { DIR *ffs; struct dirent *d; @@ -1384,7 +1385,7 @@ static void file_completion(MonitorHMP *mon, const ch= ar *input) if (stat(file, &sb) =3D=3D 0 && S_ISDIR(sb.st_mode)) { pstrcat(file, sizeof(file), "/"); } - readline_add_completion(mon->rs, file); + readline_add_completion(hmon->rs, file); } } closedir(ffs); @@ -1396,7 +1397,7 @@ static const char *next_arg_type(const char *typestr) return (p !=3D NULL ? ++p : typestr); } =20 -static void monitor_find_completion_by_table(MonitorHMP *mon, +static void monitor_find_completion_by_table(MonitorHMP *hmon, const HMPCommand *cmd_table, char **args, int nb_args) @@ -1414,10 +1415,10 @@ static void monitor_find_completion_by_table(Monito= rHMP *mon, } else { cmdname =3D args[0]; } - readline_set_completion_index(mon->rs, strlen(cmdname)); + readline_set_completion_index(hmon->rs, strlen(cmdname)); for (cmd =3D cmd_table; cmd->name !=3D NULL; cmd++) { if (cmd_available(cmd)) { - cmd_completion(mon, cmdname, cmd->name); + cmd_completion(hmon, cmdname, cmd->name); } } } else { @@ -1434,12 +1435,12 @@ static void monitor_find_completion_by_table(Monito= rHMP *mon, =20 if (cmd->sub_table) { /* do the job again */ - monitor_find_completion_by_table(mon, cmd->sub_table, + monitor_find_completion_by_table(hmon, cmd->sub_table, &args[1], nb_args - 1); return; } if (cmd->command_completion) { - cmd->command_completion(mon->rs, nb_args, args[nb_args - 1]); + cmd->command_completion(hmon->rs, nb_args, args[nb_args - 1]); return; } =20 @@ -1461,20 +1462,20 @@ static void monitor_find_completion_by_table(Monito= rHMP *mon, switch (*ptype) { case 'F': /* file completion */ - readline_set_completion_index(mon->rs, strlen(str)); - file_completion(mon, str); + readline_set_completion_index(hmon->rs, strlen(str)); + file_completion(hmon, str); break; case 'B': /* block device name completion */ - readline_set_completion_index(mon->rs, strlen(str)); + readline_set_completion_index(hmon->rs, strlen(str)); while ((blk =3D blk_next(blk)) !=3D NULL) { - readline_add_completion_of(mon->rs, str, blk_name(blk)); + readline_add_completion_of(hmon->rs, str, blk_name(blk)); } break; case 's': case 'S': if (!strcmp(cmd->name, "help|?")) { - monitor_find_completion_by_table(mon, cmd_table, + monitor_find_completion_by_table(hmon, cmd_table, &args[1], nb_args - 1); } break; @@ -1487,7 +1488,7 @@ static void monitor_find_completion_by_table(MonitorH= MP *mon, static void monitor_find_completion(void *opaque, const char *cmdline) { - MonitorHMP *mon =3D opaque; + MonitorHMP *hmon =3D opaque; char *args[MAX_ARGS]; int nb_args, len; =20 @@ -1509,7 +1510,7 @@ static void monitor_find_completion(void *opaque, } =20 /* 2. auto complete according to args */ - monitor_find_completion_by_table(mon, hmp_cmds_for_target(false), + monitor_find_completion_by_table(hmon, hmp_cmds_for_target(false), args, nb_args); =20 cleanup: @@ -1518,18 +1519,18 @@ cleanup: =20 static void monitor_read(void *opaque, const uint8_t *buf, int size) { - MonitorHMP *mon =3D container_of(opaque, MonitorHMP, parent_obj); + MonitorHMP *hmon =3D container_of(opaque, MonitorHMP, parent_obj); int i; =20 - if (mon->rs) { + if (hmon->rs) { for (i =3D 0; i < size; i++) { - readline_handle_byte(mon->rs, buf[i]); + readline_handle_byte(hmon->rs, buf[i]); } } else { if (size =3D=3D 0 || buf[size - 1] !=3D 0) { - monitor_printf(&mon->parent_obj, "corrupted command\n"); + monitor_printf(&hmon->parent_obj, "corrupted command\n"); } else { - handle_hmp_command(mon, (char *)buf); + handle_hmp_command(hmon, (char *)buf); } } } @@ -1537,14 +1538,14 @@ static void monitor_read(void *opaque, const uint8_= t *buf, int size) static void monitor_event(void *opaque, QEMUChrEvent event) { Monitor *mon =3D opaque; - MonitorHMP *hmp =3D MONITOR_HMP(mon); + MonitorHMP *hmon =3D MONITOR_HMP(mon); =20 switch (event) { case CHR_EVENT_MUX_IN: qemu_mutex_lock(&mon->mon_lock); if (mon->mux_out) { mon->mux_out =3D 0; - if (hmp->use_readline) { + if (hmon->use_readline) { monitor_resume(mon); } } @@ -1559,7 +1560,7 @@ static void monitor_event(void *opaque, QEMUChrEvent = event) } else { monitor_flush_locked(mon); } - if (hmp->use_readline) { + if (hmon->use_readline) { monitor_suspend(mon); } mon->mux_out =3D 1; @@ -1572,7 +1573,7 @@ static void monitor_event(void *opaque, QEMUChrEvent = event) "information\n", QEMU_VERSION); qemu_mutex_lock(&mon->mon_lock); mon->reset_seen =3D 1; - if (!mon->mux_out && hmp->use_readline) { + if (!mon->mux_out && hmon->use_readline) { /* Suspend-resume forces the prompt to be printed. */ monitor_suspend(mon); monitor_resume(mon); @@ -1598,17 +1599,17 @@ static void monitor_event(void *opaque, QEMUChrEven= t event) static void G_GNUC_PRINTF(2, 3) monitor_readline_printf(void *opaque, const char *fmt, ..= .) { - MonitorHMP *mon =3D opaque; + MonitorHMP *hmon =3D opaque; va_list ap; va_start(ap, fmt); - monitor_vprintf(&mon->parent_obj, fmt, ap); + monitor_vprintf(&hmon->parent_obj, fmt, ap); va_end(ap); } =20 static void monitor_readline_flush(void *opaque) { - MonitorHMP *mon =3D opaque; - monitor_flush(&mon->parent_obj); + MonitorHMP *hmon =3D opaque; + monitor_flush(&hmon->parent_obj); } =20 void monitor_new_hmp(const char *id, const char *chardev_id, @@ -1626,11 +1627,11 @@ void monitor_new_hmp(const char *id, const char *ch= ardev_id, =20 static void monitor_hmp_complete(UserCreatable *uc, Error **errp) { - MonitorHMP *mon =3D MONITOR_HMP(uc); + MonitorHMP *hmon =3D MONITOR_HMP(uc); UserCreatableClass *ucc_parent =3D USER_CREATABLE_CLASS( object_class_get_parent( - OBJECT_CLASS(MONITOR_HMP_GET_CLASS(mon)))); + OBJECT_CLASS(MONITOR_HMP_GET_CLASS(hmon)))); ERRP_GUARD(); =20 ucc_parent->complete(uc, errp); @@ -1638,21 +1639,21 @@ static void monitor_hmp_complete(UserCreatable *uc,= Error **errp) return; } =20 - if (mon->parent_obj.chardev_id) { - if (mon->use_readline) { - mon->rs =3D readline_init(monitor_readline_printf, + if (hmon->parent_obj.chardev_id) { + if (hmon->use_readline) { + hmon->rs =3D readline_init(monitor_readline_printf, monitor_readline_flush, - mon, + hmon, monitor_find_completion); - monitor_read_command(mon, 0); + monitor_read_command(hmon, 0); } =20 - qemu_chr_fe_set_handlers(&mon->parent_obj.chr, + qemu_chr_fe_set_handlers(&hmon->parent_obj.chr, monitor_can_read, monitor_read, monitor_event, NULL, - &mon->parent_obj, NULL, true); - monitor_list_append(&mon->parent_obj); + &hmon->parent_obj, NULL, true); + monitor_list_append(&hmon->parent_obj); } } =20 diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 6cb0b587fbd..4ca87857c3f 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -166,10 +166,10 @@ char *qmp_human_monitor_command(const char *command_l= ine, bool has_cpu_index, int64_t cpu_index, Error **errp) { char *output =3D NULL; - MonitorHMP *hmp =3D MONITOR_HMP(object_new(TYPE_MONITOR_HMP)); + MonitorHMP *hmon =3D MONITOR_HMP(object_new(TYPE_MONITOR_HMP)); =20 if (has_cpu_index) { - int ret =3D monitor_set_cpu(&hmp->parent_obj, cpu_index); + int ret =3D monitor_set_cpu(&hmon->parent_obj, cpu_index); if (ret < 0) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", "a CPU number"); @@ -177,14 +177,14 @@ char *qmp_human_monitor_command(const char *command_l= ine, bool has_cpu_index, } } =20 - handle_hmp_command(hmp, command_line); + handle_hmp_command(hmon, command_line); =20 - WITH_QEMU_LOCK_GUARD(&hmp->parent_obj.mon_lock) { - output =3D g_strdup(hmp->parent_obj.outbuf->str); + WITH_QEMU_LOCK_GUARD(&hmon->parent_obj.mon_lock) { + output =3D g_strdup(hmon->parent_obj.outbuf->str); } =20 out: - object_unref(hmp); + object_unref(hmon); return output; } =20 diff --git a/ui/ui-hmp-cmds.c b/ui/ui-hmp-cmds.c index 06f4030ce4f..fb13eca0b0c 100644 --- a/ui/ui-hmp-cmds.c +++ b/ui/ui-hmp-cmds.c @@ -343,8 +343,8 @@ void hmp_change_vnc(Monitor *mon, const char *device, c= onst char *target, return; } if (!arg) { - MonitorHMP *hmp_mon =3D container_of(mon, MonitorHMP, parent_obj); - monitor_read_password(hmp_mon, hmp_change_read_arg, NULL); + MonitorHMP *hmon =3D container_of(mon, MonitorHMP, parent_obj); + monitor_read_password(hmon, hmp_change_read_arg, NULL); } else { qmp_change_vnc_password(arg, errp); } --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569595; cv=none; d=zohomail.com; s=zohoarc; b=eZPsgX1px6WtSSHKVbeZMCMXArW6t/nJD79f2VpIml3rb+TTAfPUkhMO6GVYKzeBSz5sHR0zl7YOCVjdq19f65ofWsM4KzzjBQ9gAO+B9TN1SQo3v02DcFORykAEJKjDBEG6e7CMKsUAcDw4K6nVIgLFVbAqJ1ThkG4BWmUaC4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569595; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vv3rNqnVj/Wl2XQrkMcX+ZywENfxlAP74DyxM9wJH40=; b=NFDIvdqRMNvJJ/UTuSE0gdH4HNNpHWTX2fl/k8shJJhYiEjSbJCTcTXzMtwRK5+WkkzJ1qKjirl3COqFwIXYmzh3PY0JVtf2U/98anbTHRDWYY/Iy+LFqA4RjRo6QvJekqiaq4sDSbKivYnMaRYys3k6oFTjtu9C4vBfzTgHD1A= 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 1786569595132284.56263947001014; Wed, 12 Aug 2026 14:19:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGMZ-000336-2u; Wed, 12 Aug 2026 17:19: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 1wuGMK-0002U9-Uz for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19: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 1wuGMJ-0007vM-JA for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19:36 -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 67CK2R5S297068 for ; Wed, 12 Aug 2026 21:19:34 GMT Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0p3d36sx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:19:34 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-52827090cc5so4525191cf.0 for ; Wed, 12 Aug 2026 14:19:34 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4998212a3a1sm6744155e9.6.2026.08.12.14.19.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:19:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= vv3rNqnVj/Wl2XQrkMcX+ZywENfxlAP74DyxM9wJH40=; b=DW7Bl98Y5qpHy5zp 601/CeFDeY7Jbr7/j5/x6czil3j3fBdnuYkyP+rFCf+SayN+RvuEjkUUlKC3O8fZ 62+h+pgW70T891IpQQ5mnqdYqSwf0k6P4o+Azj3byZylFIGHReIg9QVcqGN3gNYv 1owlLUOVn3zXRmRU6iYOmoWkkYRr2+AkphdxAZjFnkfV0am74EYLIrfJONYVOcXM Ewfm3PqUFNzMuKNVe7Q1EayHk0l3fsxFknREtsUpf4Bapmj5mycjw5LmRGxfuuWs r3NMRXhvYKAGIr9onL9QFzj/IhNqJvHtJJM1v7WSEIj7pHmI1fypDG01SykZE6yW arsU0w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569574; x=1787174374; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=vv3rNqnVj/Wl2XQrkMcX+ZywENfxlAP74DyxM9wJH40=; b=Kx+Vn4OXun6JYWW3/bGMrKI8yTaEG+lc9jIZ+km1w6Y4y1zBQNgdA9ik1AsATBp23n alGkSGO7FGv7Cg1DztRRo9wnDwPukp2diBMijNrGb1527FIUK3mgNFYMpjwUXf9gHlrv xDwMWlyz4+MFHXI4cxltC1M5NNgf10NJskVxg2lhSSxaZreI0G1GK7zbRAa81yJk2lWB hBPpTFUhiBbuJKfgXSu+I9MOQnP2zY3sNL6xWc3AV4YZ8TofjDOtvwwR5/dy8kj4NMi9 MbGHA8BDFi15o5y2JKuDjRAhv7kaHiffhyCkY4RqNHyMCrkDrKgVslJx8RlMeUHqYcmJ ivlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569574; x=1787174374; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=vv3rNqnVj/Wl2XQrkMcX+ZywENfxlAP74DyxM9wJH40=; b=dQOf+pKl0kEwM6WdJB3sBJWd7TSgDzOq61bGow/fkCOZTwH4YyvNSdwFamCcrwkD5Z vHGrDki98qECR+End3P7oG00B1ajDU6Mst7UBMBzgtvbvMqLwzOOt1g3a+cGEi6kScXA Ezsni+8yk8dP/JYJxWC+mPCKuuQLDq+4M8QE+oC5nkZkpqLLdLj+mCBu3+/mHONDfBSF CakR1+fM7zB0samq+Qa4iazMKS48f4fJQUdaYLxZxXgG9WG3PFqj0hvjafcxaOSQT5eC zdwn6i2scW44GNle4KcY1Z4v6DJPf78sfKbbAyvUpEuusjieToxJFWrMnm0nFVTdyZI7 iYRw== X-Gm-Message-State: AOJu0Yy4GOkrJ0v3/osDn8nm60XGlCmeD9w7bLRE6Au/b9zKIUwwPExb CCWb2ZG2/xWc1h90Si049Mmz3QkNjDf3136lPR5qTZZswZF8cc4QxeHfwPQd9X6iLshUfTXU9qW pXW6CHrXM4pluPAs7lC8/c2QcSEnxSps/ddJFxesSpnwg4Xz17vivokPw9rkS+L0iXA== X-Gm-Gg: AR+sD11mAbLs4ePqHmadWIZ80Mi2FESnJ45pH6Uf8CEZ5U4oBP81oWP/q0NVH/3C/0i dZCWVzAUK7MlE5CmS3v/rgVHm6Zdnb1sAzzP/4oW3iJ35b3QhpcBcKd979yr8s6E0QcWoX0dSft yrstz7JvnmKyAL8cnv5Yt/Td11ROKeJsUYQjCnL6vBwYSvpk16CfnDyvENFWU4vUh6aAcY08HaG uruYUqpft2zIQSdGk+SLPGtCcwTOEv+rU5dNFafIs/Mihyn0HoaIvKN1XVqI7ZXX5w2bOdG2wGx KLLUL+8c5V55fpfc+tcD5Oiy2IDs1tDtOi9sSfr7K0hXEkalQZm9B87038qyOt3K1WvoVJg4pLD +IBbsonO/Qd4rWwUqI9S5XQFZkDDq4RXqwF5iM3IDrA== X-Received: by 2002:a05:622a:8b:b0:517:6fc2:4760 with SMTP id d75a77b69052e-52d74a70ba9mr5757841cf.9.1786569573865; Wed, 12 Aug 2026 14:19:33 -0700 (PDT) X-Received: by 2002:a05:622a:8b:b0:517:6fc2:4760 with SMTP id d75a77b69052e-52d74a70ba9mr5757361cf.9.1786569573315; Wed, 12 Aug 2026 14:19:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 19/23] monitor: Better express monitor_read()'s opaque arg is of Monitor type Date: Wed, 12 Aug 2026 23:17:03 +0200 Message-ID: <20260812211708.92824-20-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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: 3bJOIgBn_BuRWyAnUmH2x9KVAPwt0bib X-Proofpoint-GUID: 3bJOIgBn_BuRWyAnUmH2x9KVAPwt0bib X-Authority-Analysis: v=2.4 cv=UfNhjqSN c=1 sm=1 tr=0 ts=6a7ce366 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=RPUA3qnEMxG_1LUdHp8A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfXzM614GKgiv8l 4bJRKB9pwDm7KsimX8abgqL1KXrtt9zdQRi/H6DF/MMaWOXpHsU4XY9xldCnb42tOkmWZuYGRr5 vdsk4rQARB78e/u6zabJBlgZ925LYscCxCVAdm+qwxSJcpIM5MTGkZC6zT6nknWA7H1uG8cwbq7 WP9yCFmqfL2j7CHnjPHmctoYjC20pYQxNc6MzsUDET6YIQyTWBQnILDX0e72yQb3i1Uss3lYU+b z+WEDcfphOmtvjBD+tIo35ibDxL+S8LLXhJg7fFyuk2FdV9z8k1yyKbVlmuK45YGMpflo2O3iKb uN5E/FPWK7lXtbNOIgcZUt6PGXHsPBM969QTblIPleEXxLmCi0mBGvUsNZx+PulOx3KBW0qaceW ARG3NlLoY5ZDsZCVAk/M90doUEuEoB4J/mHVUTgjvFaQzz8ouMvucsDvf2MV/iv/RdAGRnUtiIH +FMGufGKwOWdFbc2lmg== X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX3BT8usJcY7or j2BC0ZK6WlOyquN+i1XD0ZSuOk4wS8W2H7oWF6ZrZV0fVofgykT8MmYwbnlZldJCijgR6qD9Pb4 nobmgJmHG/s97mcjUoYn6MOh6WatmV4= 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 suspectscore=0 impostorscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569596810158500 monitor_read() is a IOReadHandler handler, called by qemu_chr_fe_set_handlers() with a Monitor* opaque argument. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- monitor/hmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/monitor/hmp.c b/monitor/hmp.c index 24076dc7c03..bfe3cea902c 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1519,7 +1519,8 @@ cleanup: =20 static void monitor_read(void *opaque, const uint8_t *buf, int size) { - MonitorHMP *hmon =3D container_of(opaque, MonitorHMP, parent_obj); + Monitor *mon =3D opaque; + MonitorHMP *hmon =3D container_of(mon, MonitorHMP, parent_obj); int i; =20 if (hmon->rs) { --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569635; cv=none; d=zohomail.com; s=zohoarc; b=lnDN29KgPiSWzdtv1VvWrylAkQwTGAsRQkeuwHCkgpvEAnbNsQF+v9JdTLb49umBEvaCda8s6rnxXbl3LqYH690pcGvcuQ7n5JMNzvTUz1Ju5PyY3iHvN2ZEAr2D/oIto7FK179s3ksMDPEKlcVHVNZAQoLAEANcp/rhFqYc96M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569635; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7bGZ0SK8RPLUbVTujswQ6hzIxVh9SxT3gEkMZuKr30Y=; b=Xmo7z/De0iGDHAbg57hNNBrsDMHtALv5z+86s4VlNT/72hPKvq7Yne3iXCNjHk/MAsOleDqPEJDgqM8FoRzgKkxdw4gjf2VP+gvDRM4LPmwqW7LgXs1V6owQYW+sxJ+Ak2/mBCDLiPYyRwa1/2XObaeUg7M+ecVtMhZL4dfz5kE= 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 1786569635767292.0117435241664; Wed, 12 Aug 2026 14:20:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGMb-0003Kt-Ce; Wed, 12 Aug 2026 17:19: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 1wuGMT-0002mG-RY for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19: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 1wuGMR-0007wA-Qh for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19:45 -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 67CK2clS301219 for ; Wed, 12 Aug 2026 21:19:42 GMT Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0pmytxd1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:19:42 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8efe7db1c42so16574946d6.3 for ; Wed, 12 Aug 2026 14:19:42 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981d85953sm8819555e9.0.2026.08.12.14.19.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:19:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 7bGZ0SK8RPLUbVTujswQ6hzIxVh9SxT3gEkMZuKr30Y=; b=WZJuWX4tDI4h5a2h bd23kw/2+px722MA5wblQ6+FEV+0+eIk0Kdubp3vglwMrSFkA2kvA5vlC+ks6Qfq 3teCFggQ62NaCyz+MJJgXkQ6ymhrSOoTVpPmosSDfi6oxLrsZYrPegreaYH5RDbU 6LMHDJbb2WLa1KLafsFAJTlgj2CbypWI0jDJvRIbXoFv9ENwuwGU7pKu9P1mYKW7 LHFhlE1Axi1vc8frQBpHqkEDB8kcgPdsZWFqmSko477Y3cfvqo1ABQ31WBHkCp+k 8UBC0gMf611izJhvmHPZSGhXyuQmbqGed1QbAaASeYg1L3u4kK9bdobOINtlZ+Ci /0JKaQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569581; x=1787174381; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=7bGZ0SK8RPLUbVTujswQ6hzIxVh9SxT3gEkMZuKr30Y=; b=EdPeLvvyGDEpVxAms/Q8EhIC3GaCU259d7BL3svYoQhm+wppWLuiwI5EJETsRlhK8t rZE+q/khyJHcJE97TG9ytR3KMIgLd6EMYNhLxdZITEO/VPIKJC+rmZkgHV51umTYoXV9 u60v3pub51LI2zV/wClpEVULvH8wbJd818o2+qCOORjQwrjqsP10POmNfan/lMrSBV/9 4q3Ex92a5IbaXEFiuML6t7Pzkd3t6TcvSPXMUV/dtvT0mjXLVf22ZFLKIa4ePdcGzCL0 dZ8z4NcHqD3cFnsPSrilXNzNpG7Uwvlx0CYnAL+CBOCp6S9nXfk3ea/nUElMTiPrWSEr KPhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569581; x=1787174381; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=7bGZ0SK8RPLUbVTujswQ6hzIxVh9SxT3gEkMZuKr30Y=; b=GgmcFw+YywvOn//sDJ0PBoOS3UR/vKQpk8TcW1DOGQ2UpNMIj/XTa2Rr21UoQDF2u6 9c01hZaol6Y0CK1j52As0QkhSKvbrDUSgC3DImUCReFMQZrY0dlLLzgEZwhWsmpyN2qO l2F7i7zXVAVc9iQjYa18Me6d1AMrfrhBoaq27jCZw1dLVFleTWzz7ewxVHYycgDoxd6C ii5hiZRpnrDpFE+qpTNVvUiFtChSy2nlZoZsJXJyBJ6kJThaiFmDD5uQfgJYvPRMTFqL 9o7m2POdmQQWnLDAEqhaT+RgSg5ZCOnkSGdvwsk0UQnO8b+q/5serhTLFeEaTbLoYqjg fYxQ== X-Gm-Message-State: AOJu0YwX1Y5SYKamtFVW90aJwEvQ2yBNAqopylOjZDLTbrUUhL/nM7AG So7ijLXpE0t1kIL0WPIGMS2dWb4TDdtsG2RV4SvaxJYHLzAPLb5R0aMua1px+KymZmse5z5k9Wr J4woATTU3jhNrWISpuZskitejxmuFC9xQmnc6sSz+pcr80rOgTphC//+vqg7CDspXXg== X-Gm-Gg: AR+sD116pvyXhsvvaqTYgsQtuUgZc4uyoqv58aKsm4fKVBdseLVXYTfLur/ZYa5FhYP 8TElPoDMHioYZQugg5sRhlWWdF6MKcxKndeoUu6mLCeJzldZIm5YC2gAS71pRIFpyJsRG1dmPvH FtQ/PwzRUxdc5i+ZYn7PUfXSGDQDOz6ADglKMJuf2vI0fCkW3gFjgn4y7sKxUyk60sH5RCX74If +IwnNYYWpRMjXc2B0sxi5IlL1nbhGfu7XpWnLFNDMH3f48qdI/g92OZx87y7JzLnTxFAxgshD8e x3pvO4VC6NZs9BsSv3QiMSuRiFYrltKMyYMfl3SgWYK7r4+2n4WGfi2YJLQ4FQnk+TQrlbkKJ70 pbL/KmthFiyv5wyA7OSln57HsWbCfVLfLDH++28BJ8w== X-Received: by 2002:a05:622a:58a:b0:528:3163:716b with SMTP id d75a77b69052e-52d73c37747mr12622491cf.3.1786569581236; Wed, 12 Aug 2026 14:19:41 -0700 (PDT) X-Received: by 2002:a05:622a:58a:b0:528:3163:716b with SMTP id d75a77b69052e-52d73c37747mr12621891cf.3.1786569580506; Wed, 12 Aug 2026 14:19:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 20/23] monitor: Use QOM MONITOR() macro to access MonitorQMP->parent_obj Date: Wed, 12 Aug 2026 23:17:04 +0200 Message-ID: <20260812211708.92824-21-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX862XXD4RZ3Wb rBjxnWcj1oZBlzVw+r0VOaWeMZxwDkO7FeUQVpyhF7tLTqwuevpaJkRwo5uax4ZvmYs0aQd/0ST Q3LULOwM7izENiA+LITcJkggKiWAFGU= X-Proofpoint-ORIG-GUID: C6aB6veOR0gbYT3l71P21Z9tg8rf2kjv X-Authority-Analysis: v=2.4 cv=C/fZDwP+ c=1 sm=1 tr=0 ts=6a7ce36e cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=ePcbETNVwOqpRS83YfwA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-GUID: C6aB6veOR0gbYT3l71P21Z9tg8rf2kjv X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX+41PANN9jjIo Zpyef90wZYCsqd96vVZegpJmeT7q4giKoPP6V+Zt3jYG/9SFs0VSRx22UQy6OOHi2Qou5eknhCd jX7bjfDhvKHEivlQvHO51LDF3wj1n2TJY9X0DUiPJXYViq+WsL7pYNBm75FeNIlnlTnZfojh3rm a12ErtBRoXzoPyyeXJ9i5l+uyuakSsrihmmvwF/exMqo3OvIM+eIPRdrJiL0J4vAuFsIWemFzuk /4vPkbQD4bd0nf5ZawLclF2BfSjW7VG9sfKzrmrTty5Gl0gPZW1yRoChz+dQKPCPFBRHu7y12/8 LiMP4VE7cpAVyjKx6vabiFFw0PfPKMwXgaTIIwl/PHHrDd4eSxtMcv69AszTaqh9p3KAUjEj0BI OIub8dXBzQnuO7D3k1iRYg3d4AezMRbhHWPsmmsgGcU99q7d2z/+Xw36fxQFLegla1AdXrKy1ZL PkqGaKJVQ543KllZn6w== 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 phishscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 lowpriorityscore=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-2608120171 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: 1786569636782158500 MonitorQMP QOM parent is Monitor, so we can use the following QOM-cast macro: MONITOR(qmon) =3D=3D &qmon->parent_obj When introducing a Monitor variable, name it @mon. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- monitor/qmp.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/monitor/qmp.c b/monitor/qmp.c index d6ce734916e..0fed9f47213 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -213,6 +213,8 @@ static void monitor_qmp_drain_queue(MonitorQMP *qmon) =20 static void monitor_qmp_cleanup_queue_and_resume(MonitorQMP *qmon) { + Monitor *mon =3D MONITOR(qmon); + QEMU_LOCK_GUARD(&qmon->qmp_queue_lock); =20 /* @@ -237,7 +239,7 @@ static void monitor_qmp_cleanup_queue_and_resume(Monito= rQMP *qmon) * when we get here while the monitor is suspended. An * unfortunately timed CHR_EVENT_CLOSED can do the trick. */ - monitor_resume(&qmon->parent_obj); + monitor_resume(mon); } =20 } @@ -245,6 +247,7 @@ static void monitor_qmp_cleanup_queue_and_resume(Monito= rQMP *qmon) void qmp_send_response(MonitorQMP *qmon, const QDict *rsp) { const QObject *data =3D QOBJECT(rsp); + Monitor *mon =3D MONITOR(qmon); GString *json; =20 json =3D qobject_to_json_pretty(data, qmon->pretty); @@ -252,7 +255,7 @@ void qmp_send_response(MonitorQMP *qmon, const QDict *r= sp) trace_monitor_qmp_respond(qmon, json->str); =20 g_string_append_c(json, '\n'); - monitor_puts(&qmon->parent_obj, json->str); + monitor_puts(mon, json->str); =20 g_string_free(json, true); } @@ -277,9 +280,10 @@ static void monitor_qmp_dispatch(MonitorQMP *qmon, QOb= ject *req) { QDict *rsp; QDict *error; + Monitor *mon =3D MONITOR(qmon); =20 rsp =3D qmp_dispatch(qmon->commands, req, qmp_oob_enabled(qmon), - &qmon->parent_obj); + mon); =20 if (qmon->commands =3D=3D &qmp_cap_negotiation_commands) { error =3D qdict_get_qdict(rsp, "error"); @@ -392,6 +396,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) QDict *rsp; bool oob_enabled; MonitorQMP *qmon; + Monitor *mon; =20 while ((req_obj =3D monitor_qmp_dispatcher_pop_any()) !=3D NULL) { trace_monitor_qmp_in_band_dequeue(req_obj, @@ -402,6 +407,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) */ =20 qmon =3D req_obj->mon; + mon =3D MONITOR(qmon); qmp_dispatcher_current_mon =3D qmon; =20 /* @@ -418,7 +424,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) oob_enabled =3D qmp_oob_enabled(qmon); if (oob_enabled && qmon->qmp_requests->length =3D=3D QMP_REQ_QUEUE_LEN_MAX - 1= ) { - monitor_resume(&qmon->parent_obj); + monitor_resume(mon); } =20 /* @@ -459,7 +465,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) } =20 if (!oob_enabled) { - monitor_resume(&qmon->parent_obj); + monitor_resume(mon); } =20 qmp_request_free(req_obj); @@ -482,6 +488,7 @@ void qmp_dispatcher_co_wake(void) static void handle_qmp_command(void *opaque, QObject *req, Error *err) { MonitorQMP *qmon =3D opaque; + Monitor *mon =3D MONITOR(qmon); QDict *qdict =3D qobject_to(QDict, req); QMPRequest *req_obj; =20 @@ -525,7 +532,7 @@ static void handle_qmp_command(void *opaque, QObject *r= eq, Error *err) */ if (!qmp_oob_enabled(qmon) || qmon->qmp_requests->length =3D=3D QMP_REQ_QUEUE_LEN_MAX - 1) { - monitor_suspend(&qmon->parent_obj); + monitor_suspend(mon); } =20 /* @@ -575,9 +582,10 @@ static QDict *qmp_greeting(MonitorQMP *qmon) static void monitor_qmp_self_delete_bh(void *opaque) { MonitorQMP *qmon =3D opaque; + Monitor *mon =3D MONITOR(qmon); const char *mon_id =3D object_get_canonical_path_component( OBJECT(qmon)); - g_autofree char *chardev_id =3D g_strdup(qmon->parent_obj.chardev_id); + g_autofree char *chardev_id =3D g_strdup(mon->chardev_id); Error *local_error =3D NULL; =20 if (!mon_id) { @@ -605,6 +613,7 @@ static void monitor_qmp_event(void *opaque, QEMUChrEven= t event) { QDict *data; MonitorQMP *qmon =3D opaque; + Monitor *mon =3D MONITOR(qmon); =20 /* * Protect against race if a client drops & quickly @@ -617,7 +626,7 @@ static void monitor_qmp_event(void *opaque, QEMUChrEven= t event) =20 switch (event) { case CHR_EVENT_OPENED: - WITH_QEMU_LOCK_GUARD(&qmon->parent_obj.mon_lock) { + WITH_QEMU_LOCK_GUARD(&mon->mon_lock) { qmon->commands =3D &qmp_cap_negotiation_commands; monitor_qmp_caps_reset(qmon); } @@ -676,15 +685,16 @@ static bool monitor_qmp_dispatcher_is_servicing(Monit= orQMP *qmon) static void monitor_qmp_setup_handlers_bh(void *opaque) { MonitorQMP *qmon =3D opaque; + Monitor *mon =3D MONITOR(qmon); GMainContext *context; =20 assert(monitor_requires_iothread(MONITOR(qmon))); context =3D iothread_get_g_main_context(mon_iothread); assert(context); - qemu_chr_fe_set_handlers(&qmon->parent_obj.chr, monitor_can_read, + qemu_chr_fe_set_handlers(&mon->chr, monitor_can_read, monitor_qmp_read, monitor_qmp_event, - NULL, &qmon->parent_obj, context, true); - monitor_list_append(&qmon->parent_obj); + NULL, mon, context, true); + monitor_list_append(mon); qatomic_set(&qmon->setup_pending, false); } =20 @@ -704,6 +714,7 @@ void monitor_new_qmp(const char *id, const char *charde= v_id, static void monitor_qmp_complete(UserCreatable *uc, Error **errp) { MonitorQMP *qmon =3D MONITOR_QMP(uc); + Monitor *mon =3D MONITOR(qmon); UserCreatableClass *ucc_parent =3D USER_CREATABLE_CLASS( object_class_get_parent( @@ -715,19 +726,19 @@ static void monitor_qmp_complete(UserCreatable *uc, E= rror **errp) return; } =20 - qemu_chr_fe_set_echo(&qmon->parent_obj.chr, true); + qemu_chr_fe_set_echo(&mon->chr, true); =20 if (monitor_requires_iothread(MONITOR(qmon))) { /* * Make sure the old iowatch is gone. It's possible when * e.g. the chardev is in client mode, with wait=3Don. */ - remove_fd_in_watch(qmon->parent_obj.chr.chr); + remove_fd_in_watch(mon->chr.chr); /* * Clean up listener IO sources early to prevent racy fd * handling between the main thread and the I/O thread. */ - remove_listener_fd_in_watch(qmon->parent_obj.chr.chr); + remove_listener_fd_in_watch(mon->chr.chr); /* * We can't call qemu_chr_fe_set_handlers() directly here * since chardev might be running in the monitor I/O @@ -738,10 +749,10 @@ static void monitor_qmp_complete(UserCreatable *uc, E= rror **errp) monitor_qmp_setup_handlers_bh, qmon); /* The bottom half will add @mon to @mon_list */ } else { - qemu_chr_fe_set_handlers(&qmon->parent_obj.chr, monitor_can_read, + qemu_chr_fe_set_handlers(&mon->chr, monitor_can_read, monitor_qmp_read, monitor_qmp_event, - NULL, &qmon->parent_obj, NULL, true); - monitor_list_append(&qmon->parent_obj); + NULL, mon, NULL, true); + monitor_list_append(mon); } } =20 --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569636; cv=none; d=zohomail.com; s=zohoarc; b=fv38+AqPEfmTxS49I4KGXCnmJduz6czk1o/1fBh901Bw3Ze1kyO1XJcfapt/mnJ23gv40zIQbniVODaZ0YmpF/XgpPEWKd3E1yDDmVP1fygQ35/zXHqkx+DDK+kpuflDweVx6UYHSqkxG0ORIP59WX1077ONB2KMcj/ALQvCSlA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569636; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bLtqyIX4rXVf0sJjNCYge/H7pnr+ce0FOPvj5DKPgLo=; b=CKr/PwwYUkPEGn1jaQ/S4KKQy4L6jH8BSpjgPGGknrCMUWKL3id2i9B6modbyXIIS8rFM7LSz/MXGvZS0jwcMLRh+QOk3/oaIDYhkbk4H5eU5LbvGs/+Qfae49KDGdYSfgbMFMCDqncF/YZ9Sq857hAg+HcXUH4e6Y94lSVxltA= 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 1786569636183662.6660690329448; Wed, 12 Aug 2026 14:20:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGMe-0003qZ-5I; Wed, 12 Aug 2026 17:19: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 1wuGMc-0003Ww-Gs for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19:54 -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 1wuGMa-0007wt-2G for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19:53 -0400 Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67CK2VFj947953 for ; Wed, 12 Aug 2026 21:19:50 GMT Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0nuck70v-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:19:49 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-907c59bd73bso23615186d6.3 for ; Wed, 12 Aug 2026 14:19:49 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4815a5613e2sm880305f8f.6.2026.08.12.14.19.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= bLtqyIX4rXVf0sJjNCYge/H7pnr+ce0FOPvj5DKPgLo=; b=jAJMTwVi2WukUttd o2pdyE018d9dY1pxmzgE6wk2nwEttZvCJ6EKEMWbMe1OcyrT0wVs9+pwCe8HcBzL Ck8CB7gNNKcYAMWPFiXRtQtkRyrsS5JW8KoWfEMxKSmbH/lFrmQ4VbHUvHKO2qR/ Khiu4z19AWLgJ9vyuYxaZa9zlMYTqlR8AjQp+mn7xDQcyFpLaDEcVaz68mqkCmLk qK1RT1iRBHeNgQToArpNmt8Jrv5gvHPjWHMe2FWYSJZPEv3NHfTrgb8Do3lMkfr6 dgY7jLnClBNvhbNA160sDgCtr+eDIoK1UmqtNX8psmTnaee5XWfP3mHzTPQr232O Q8spvg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569589; x=1787174389; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=bLtqyIX4rXVf0sJjNCYge/H7pnr+ce0FOPvj5DKPgLo=; b=gx3PqgQYE/ZIPJiaEpFZyyoh+yPcoBsPerWjUz70Z4Ol+Y7N/ar+q3EgCkb2UsKXtW X+GOcjHjtVpvvxtVlAuG2pRdU/bbgNeHSu2sH/RfP12igzqztcatX7lbTE6SFpTYEbG4 0bh2flQJI0+HeR4QlsphkXq1bZfVLQIEgeDHM9ThaVwaH0a1HEgWmkMp3yOJ0PSqJ4nW 4/lQhwaurjRzwNN4YYmElcyJfw0YbYbQLzfW1+H4BGyiSFu/MV5Q11SMlMEiKFPtmHXA cSWXucIf/UNPYAcwhHD3vnqvM2F1Bp9vht4j4+v13a60BPEcjpIDHVx8WEWeoN3shOIJ jpQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569589; x=1787174389; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=bLtqyIX4rXVf0sJjNCYge/H7pnr+ce0FOPvj5DKPgLo=; b=pAMSRAir6zfEMj1H4jqdhzy1pHUPsYizsHXlQAZmGBdToXqYCPsf4FxnnrfJ7NH4XF PJWHBrpIF6jws3yvJwRAh2J19Y39/cMngzPjcnnpGwOh5168SCvXfsbUwtRCaHADOzZr Zgp7in0u5NxanYmb7cd1jVqL1Tbfus0rApjCvtIbJAZ0G9XFF8Ee4mT5GR4FZNVaESMu WUMsfTEefdm1qAtiiO1OZ2shn/6iv0r4nLP4kj5jhBdHkrodvK55BatgDehOqku2rSHh rphNOB39buIAzy4IWfRIZw2iGJeSyEUKTWfqPbVQl9L0irDrP0/2oolrcX25mCWN/W/6 cM1g== X-Gm-Message-State: AOJu0Yzy4+2h4QM983Yvr9XeotSwE8CF5dhULNULLhnoZ7kV9CiVJNhG MSdVbTAxnkjXCzo5r5d0RfLkAfJEUp68LsowVXtS/SdkJnWHT0oyF8nZ/ziiWEgYiyl4RBbi5Tz a6UNvBXdkTwZwXGH6AORF5Zba4dM7nD7s5zRHQSPAu85eoemRPvcV+EONIkGRFhadvQ== X-Gm-Gg: AR+sD10vpskitNvomNqmU9FxqBqniUg3WMFtui1LgqaqPpWYmd5wUZepR0kfnFh9xt2 f9zvl/YltQ/o+AZ5MVTBkkS9saAvdf9p48V0nVW8m90BkR3Ffl993nb3t+Mdq3KYFOp9Z4Os7Vt nMM3fx27SLJyYNSI6wgWduD1DrHAIi47/RgypWhWZanBWwrmo4wRhhNctoTICR6axB4v8iLgt1f gcBqhX5iC8U44M94cP5sPo/1EHfnbqT2t/CsEPfohT3t2FO/NHHp052fgFoXg9gqs7gY/dkLbrT QXQ587qmEt38mOSQG0D6nABxyeOH54jp+nGbzAYKhpvI9z7SzsI0G28WtL4VNpsMx5/J5hen3z5 G29VfnwWP0Gm/Vwx+pK9Cw5zcQySNcjTtIzMDuyo2VQ== X-Received: by 2002:ac8:6903:0:b0:52b:4e1f:941d with SMTP id d75a77b69052e-52d73c1bbf9mr12938701cf.6.1786569588200; Wed, 12 Aug 2026 14:19:48 -0700 (PDT) X-Received: by 2002:ac8:6903:0:b0:52b:4e1f:941d with SMTP id d75a77b69052e-52d73c1bbf9mr12938171cf.6.1786569587709; Wed, 12 Aug 2026 14:19:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 21/23] monitor: Use QOM MONITOR() macro to access MonitorHMP->parent_obj Date: Wed, 12 Aug 2026 23:17:05 +0200 Message-ID: <20260812211708.92824-22-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: S_FrOkVClz7RJsd--a3ClkuYjUbr4VVo X-Proofpoint-ORIG-GUID: S_FrOkVClz7RJsd--a3ClkuYjUbr4VVo X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX7/R9XTSUz59P 37URMzEDdU1JwWP5ZU1MS2tNqrjUXdnE+8ZFFlfSY8MvCwR+rKBuiExpk0GGdMQzCCSxkAKwfCz Rv3s2r6YBcdmPvEg1q55hl956Dx8dBbB5w0Czdm8C+ZYdGXwFliX230zgg5o87/MekwSRGAFgq1 WZKx0+I3DLMxrNFM86LlqnOaSPX83CdtVXZiPQGfopK70OGD9h9sXQlRAOvl4emOaOZEkkl02ZX y3JseiR27Z0cY0584JC2DfAFPNdCfMeVkObagprGfHL8BKh0FZRYH5u+TcZKNXnGGDy+L84LuXG 587VRLaDfU+YH/yTjT+XM72wO6UCMGJs33YN19apUu4doQIsPy3sYOciU3kHW56gqTCZ5/4fHtN 3j2TXj58vhjVI1aFHnG5uM0VlcAvxlmuJv4Kw1ghOw5GA6C0i49ULr/xf5bU/5sWElS9CptcCYt 0q99hRs6eAnzOSAVKVQ== X-Authority-Analysis: v=2.4 cv=VcjH+lp9 c=1 sm=1 tr=0 ts=6a7ce375 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=ePcbETNVwOqpRS83YfwA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=O8hF6Hzn-FEA:10 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX0oGPMPkTWWN2 UhYR7sSFLfZN1KMcKz55aeYCiwfwpjkMXPckRyX1cBfQgVUdfNaGweYTiqzoIh0IckhJIRPVVMc zm/bTFTO/ai6VnbZB9MKxBUPj4V+VDc= 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 priorityscore=1501 phishscore=0 suspectscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 malwarescore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569636870158500 MonitorHMP QOM parent is Monitor, so we can use the following QOM-cast macro: MONITOR(hmon) =3D=3D &hmon->parent_obj When introducing a Monitor variable, name it @mon. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- monitor/hmp.c | 44 ++++++++++++++++++++++++++------------------ monitor/qmp-cmds.c | 7 ++++--- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/monitor/hmp.c b/monitor/hmp.c index bfe3cea902c..428ef014284 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -129,10 +129,11 @@ static void monitor_command_cb(void *opaque, const ch= ar *cmdline, void *readline_opaque) { MonitorHMP *hmon =3D opaque; + Monitor *mon =3D MONITOR(hmon); =20 - monitor_suspend(&hmon->parent_obj); + monitor_suspend(mon); handle_hmp_command(hmon, cmdline); - monitor_resume(&hmon->parent_obj); + monitor_resume(mon); } =20 void monitor_read_command(MonitorHMP *hmon, int show_prompt) @@ -155,7 +156,8 @@ int monitor_read_password(MonitorHMP *hmon, ReadLineFun= c *readline_func, /* prompt is printed on return from the command handler */ return 0; } else { - monitor_printf(&hmon->parent_obj, + Monitor *mon =3D MONITOR(hmon); + monitor_printf(mon, "terminal does not support password prompting\n"); return -ENOTTY; } @@ -777,7 +779,7 @@ static const HMPCommand *monitor_parse_command(MonitorH= MP *hmon, const char **cmdp, HMPCommand *table) { - Monitor *mon =3D &hmon->parent_obj; + Monitor *mon =3D MONITOR(hmon); const char *p; const HMPCommand *cmd; char cmdname[256]; @@ -1257,6 +1259,7 @@ static void handle_hmp_command_co(void *opaque) void handle_hmp_command(MonitorHMP *hmon, const char *cmdline) { QDict *qdict; + Monitor *mon =3D MONITOR(hmon); const HMPCommand *cmd; const char *cmd_start =3D cmdline; =20 @@ -1270,17 +1273,17 @@ void handle_hmp_command(MonitorHMP *hmon, const cha= r *cmdline) =20 if (!cmd->cmd && !cmd->cmd_info_hrt) { /* FIXME: is it useful to try autoload modules here ??? */ - monitor_printf(&hmon->parent_obj, "Command \"%.*s\" is not availab= le.\n", + monitor_printf(mon, "Command \"%.*s\" is not available.\n", (int)(cmdline - cmd_start), cmd_start); return; } =20 - qdict =3D monitor_parse_arguments(&hmon->parent_obj, &cmdline, cmd); + qdict =3D monitor_parse_arguments(mon, &cmdline, cmd); if (!qdict) { while (cmdline > cmd_start && qemu_isspace(cmdline[-1])) { cmdline--; } - monitor_printf(&hmon->parent_obj, + monitor_printf(mon, "Try \"help %.*s\" for more information\n", (int)(cmdline - cmd_start), cmd_start); return; @@ -1289,18 +1292,18 @@ void handle_hmp_command(MonitorHMP *hmon, const cha= r *cmdline) if (!cmd->coroutine) { /* old_mon is non-NULL when called from qmp_human_monitor_command(= ) */ Monitor *old_mon =3D monitor_set_cur(qemu_coroutine_self(), - &hmon->parent_obj); - handle_hmp_command_exec(&hmon->parent_obj, cmd, qdict); + mon); + handle_hmp_command_exec(mon, cmd, qdict); monitor_set_cur(qemu_coroutine_self(), old_mon); } else { HandleHmpCommandCo data =3D { - .mon =3D &hmon->parent_obj, + .mon =3D mon, .cmd =3D cmd, .qdict =3D qdict, .done =3D false, }; Coroutine *co =3D qemu_coroutine_create(handle_hmp_command_co, &da= ta); - monitor_set_cur(co, &hmon->parent_obj); + monitor_set_cur(co, mon); aio_co_enter(qemu_get_aio_context(), co); AIO_WAIT_WHILE_UNLOCKED(NULL, !data.done); } @@ -1529,7 +1532,7 @@ static void monitor_read(void *opaque, const uint8_t = *buf, int size) } } else { if (size =3D=3D 0 || buf[size - 1] !=3D 0) { - monitor_printf(&hmon->parent_obj, "corrupted command\n"); + monitor_printf(mon, "corrupted command\n"); } else { handle_hmp_command(hmon, (char *)buf); } @@ -1601,16 +1604,20 @@ static void G_GNUC_PRINTF(2, 3) monitor_readline_pr= intf(void *opaque, const char *fmt, ..= .) { MonitorHMP *hmon =3D opaque; + Monitor *mon =3D MONITOR(hmon); + va_list ap; va_start(ap, fmt); - monitor_vprintf(&hmon->parent_obj, fmt, ap); + monitor_vprintf(mon, fmt, ap); va_end(ap); } =20 static void monitor_readline_flush(void *opaque) { MonitorHMP *hmon =3D opaque; - monitor_flush(&hmon->parent_obj); + Monitor *mon =3D MONITOR(hmon); + + monitor_flush(mon); } =20 void monitor_new_hmp(const char *id, const char *chardev_id, @@ -1629,6 +1636,7 @@ void monitor_new_hmp(const char *id, const char *char= dev_id, static void monitor_hmp_complete(UserCreatable *uc, Error **errp) { MonitorHMP *hmon =3D MONITOR_HMP(uc); + Monitor *mon =3D MONITOR(hmon); UserCreatableClass *ucc_parent =3D USER_CREATABLE_CLASS( object_class_get_parent( @@ -1640,7 +1648,7 @@ static void monitor_hmp_complete(UserCreatable *uc, E= rror **errp) return; } =20 - if (hmon->parent_obj.chardev_id) { + if (mon->chardev_id) { if (hmon->use_readline) { hmon->rs =3D readline_init(monitor_readline_printf, monitor_readline_flush, @@ -1649,12 +1657,12 @@ static void monitor_hmp_complete(UserCreatable *uc,= Error **errp) monitor_read_command(hmon, 0); } =20 - qemu_chr_fe_set_handlers(&hmon->parent_obj.chr, + qemu_chr_fe_set_handlers(&mon->chr, monitor_can_read, monitor_read, monitor_event, NULL, - &hmon->parent_obj, NULL, true); - monitor_list_append(&hmon->parent_obj); + mon, NULL, true); + monitor_list_append(mon); } } =20 diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 4ca87857c3f..48a2231b439 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -167,9 +167,10 @@ char *qmp_human_monitor_command(const char *command_li= ne, bool has_cpu_index, { char *output =3D NULL; MonitorHMP *hmon =3D MONITOR_HMP(object_new(TYPE_MONITOR_HMP)); + Monitor *mon =3D MONITOR(hmon); =20 if (has_cpu_index) { - int ret =3D monitor_set_cpu(&hmon->parent_obj, cpu_index); + int ret =3D monitor_set_cpu(mon, cpu_index); if (ret < 0) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", "a CPU number"); @@ -179,8 +180,8 @@ char *qmp_human_monitor_command(const char *command_lin= e, bool has_cpu_index, =20 handle_hmp_command(hmon, command_line); =20 - WITH_QEMU_LOCK_GUARD(&hmon->parent_obj.mon_lock) { - output =3D g_strdup(hmon->parent_obj.outbuf->str); + WITH_QEMU_LOCK_GUARD(&mon->mon_lock) { + output =3D g_strdup(mon->outbuf->str); } =20 out: --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569640; cv=none; d=zohomail.com; s=zohoarc; b=QBjK6Uz+UDp5/j9SUd1y/iefduSAc2Uj8clJNd5Q8mgXRFK3Jf3A/z03A6akVychLyP3VYUbJ3SvLO9bY3zf6/lBgnRRshnVjsMRj05aOGoI0c8RRjBuRufQMCoTL37qxxIY3xtDvj6JSDOmqw1/UqEy/Fqz5X9dCEmekBJPWcM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569640; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=y52kfZzk7yEGBWT0Tv1PNp0kbACCLm5xxPwX+55JRIE=; b=IzlNyCdhy2Gt8OOFNWgS8+QkNv6Oc9aPnz3lB3FX0vdpmdnZnDZ7W0TwO5rjNaDrmnzHf5lttHhNgycRptqr/7O048GV1kkZLq3DMjqhwWiHZANUfjtqicVyrX6xGoqQoRwiJlQZViffk2otzjQ8oUiuGC5QGMFbOhNBynGV5/s= 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 1786569640018785.9688955604067; Wed, 12 Aug 2026 14:20:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGMi-0004ar-PS; Wed, 12 Aug 2026 17:20:00 -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 1wuGMh-0004Ue-DA for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19: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 1wuGMf-0007xV-NZ for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:19:59 -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 67CK2b6N4038350 for ; Wed, 12 Aug 2026 21:19:56 GMT Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0mndbft9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:19:56 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-51c19493ac2so14038641cf.1 for ; Wed, 12 Aug 2026 14:19:56 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4815a5af13csm535615f8f.21.2026.08.12.14.19.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= y52kfZzk7yEGBWT0Tv1PNp0kbACCLm5xxPwX+55JRIE=; b=SGXVkeGDNXe8jfZ8 SzkGZbHa+hk64RY9jVMCSitr4hxhjMwgdGehD3YDunzcPcBtI/8h5EbgkzetmO+U B7nmdzrXc5hNAJ29sjkU6Vi9r8IJrcPQMtcVvFTvCvvK/8DfaBHxMWohQcQFkgkP VYwRDAwYzUl1mha9IWvSJQgGhR2vDj7qQj2Vd6qDHwm2Mt8B2rjLQimgsWyudloE FHXwmcq6xn9hgE4DuKevHUyFpEuTn3/lTlLFqQWl1oL9tdI3fUmkLFRlzMdlVj2P ziCkTDNeIAscmCRn6rXJnoCbzHluLVb6Xi8dugHtAJ7IoeDrwZI/Q1rMbfBPaotB 5Zxpsw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569595; x=1787174395; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=y52kfZzk7yEGBWT0Tv1PNp0kbACCLm5xxPwX+55JRIE=; b=Id3Ciq2PH9u8BXYflHkC0sqPBYB8utpkmKneqNoGMb0KaOI+Tpv2GVdD3CGPC7WSzw aEiEg4TI9J5msQn3mTy+7dfzi5B2eGpbLvOCDINpKVlNNtlfRrX2EvLh+MUxWA3Qf3xC flIji3nZdCVEJYxkOEuN4YZhI+c/k2y75uvjRmjTL5eQ0BhfTVIPEi6o0b/H8i3YHbaE 6/7eIPHYxMQwwkU6Diw+sxsrEC6OAGueSmmeLQEyQ0pVPyxxDug5YU2gYa+eaJD+32+f V+/SJSIU4zKyO9sFEycYHS8v8ANyDhv1D7H5Y3d76knSI7dHrEL9Y0LeuQ2Ym/32EV46 S6sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569595; x=1787174395; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=y52kfZzk7yEGBWT0Tv1PNp0kbACCLm5xxPwX+55JRIE=; b=p2O6fxq7wvYAKhiFDuvg1yS1mnFmalClnSLmbsYHuXxjQVpEvfblt4G1UrJPYZEyco NiCK7X0jYJphik9Ld9BukUo5mcohAmDgr5/WqKInytslvMrAi2VgNieldl8V4z0YM/lz /rcws8W2bbQgjxbTgWSwD5kKbM0q/A46zOfFERKndIk7Hkr4eMB9SQO+jQ09CgIA++d7 CIiCjUL3l3Pb+5RogtvUAd1K/BdjaqhKQo/a9fB2DENjkPDlcn81Etmv0KD/geynphSr LXuO2xcDYXzOpP/d1U6qeQOkTuAB9nDIXLUCm5wVMdeFQYXOMPQ7IK6K0Y4PhC/pflck Qt9Q== X-Gm-Message-State: AOJu0YzyyPKmHP8wXKSsFmRNkzrXey2iCG+k9M3LlOMVbFKmIKyzyuK5 5dZ0Wz5xpCNSBroBztJfu0vJ32ifcPNCwUTp5qZWQUBHDjNypdXTjHiQM3l7NLs5h+CqIeHKwfh mXh721K2M5ZG10kGERVFKs4Wvl99GyGmWArc6xckdOpyc6lxT/QtcS306Q+g9VTeOaQ== X-Gm-Gg: AR+sD10p1KYi/Nxp5eWI6Uj7wsa9uz+0OPEGyxsDfvhQbHiLkij3SSk8IWOZA1wrLMg YUQMP8xOPHhL2duYJYziYXBaVyNAmdMRyFRq14ij7yDcnVKEp9fw5vShRPeVH7blD18EsOoW3HY qj5o133Vz+czHpG0fTAXYmWOK7NRaBwRYUtbqr7YPwX3tyTenBJxA6qglnL0XzXV8UJlwHJyF4D KZ2FfzqPXgAzfvBR8B5c1UjHCZSqiPPzczFQso2s48fA4QRMdXrwBZAzgBfH9PqfAjECBfEfm3Z dMjjgzL3fiBn6kE1TjfRNOWBxTJC37p2QplMWwmLOo50BVDvGR2N+ShwECARRzS3nSaY0WDbFeg J1PbSchnTfcG+GhNpqfy35t1rYe11VAmLMnW9YACI8w== X-Received: by 2002:ac8:5715:0:b0:51c:2554:a8f5 with SMTP id d75a77b69052e-52d73d73411mr11200361cf.36.1786569595428; Wed, 12 Aug 2026 14:19:55 -0700 (PDT) X-Received: by 2002:ac8:5715:0:b0:51c:2554:a8f5 with SMTP id d75a77b69052e-52d73d73411mr11199841cf.36.1786569594864; Wed, 12 Aug 2026 14:19:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 22/23] monitor: Replace container_of(MonitorHMP, parent_obj) -> MONITOR_HMP() Date: Wed, 12 Aug 2026 23:17:06 +0200 Message-ID: <20260812211708.92824-23-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX9cXhwjbHMmzN LMyCDe0duA1qHRitWk9mKfFF0B8ccaLvBVI+S4wElitwNSzNJ5jZSVwSAljTHiLEi6DNUs5oT6I 2z2h4p6/YUp0xpAoJxkDNOk3xi4EilE= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX48omq8GSwk9h YXi9xWpwkm67JTrRwubuNxmgHbz8ydadPswWwu+kL66CEnfqW1A3uCQgdhanHfVewveVopsF4dh ohhJfHFQ/GFn0mywkCFm9NTdk2HWNG4IBp6CceOB8tI2OK+Y1Wv+QtbehUfhBFCY/6F7cPvQO7W e9sKZAp2u/vcu9yWu5H2oFmEJvyioNy9uQf1jHSe0zZ9cIThFkIxMWHLTfMjxmHDy3CygyyRsnC zVct2IFOPL8dKRgCflst/gDMFqEXg6eoC4i7BRbeaDuSyZpHkgX5dhNNyUVhCxf7HjdeLKHTUbe jHJr07tXHDWxY6GocnMAkpc2WG/Lh/Npkrmr7Pb2cVxI9exeFsG5ytVM29L6cv22Ldm121IwqEh iI/EnOOVb70yU2dzfBDv9eQ6tmJARPM6CN6Ku3bYlT83jteHuz4kbtoQwKbizc/HUaK7vlcE+Th hdSZETIgx4Htb+aXhqQ== X-Proofpoint-GUID: X6kfg6B8UmaqmmDP2c1bgHY-3jKlXORp X-Authority-Analysis: v=2.4 cv=C87ZDwP+ c=1 sm=1 tr=0 ts=6a7ce37c cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=16vVVadSk7Frugt840YA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-ORIG-GUID: X6kfg6B8UmaqmmDP2c1bgHY-3jKlXORp 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 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-2608120171 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: 1786569640767158501 By replacing the container_of(MonitorHMP) use in ui/ui-hmp-cmds.c we can remove its incorrect inclusion of "monitor/monitor-internal.h" header, using the public "monitor/monitor.h" instead. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- monitor/hmp-cmds.c | 2 +- monitor/hmp.c | 2 +- ui/ui-hmp-cmds.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 71d7df6d013..19d71708394 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -290,7 +290,7 @@ void hmp_info_sync_profile(Monitor *mon, const QDict *q= dict) =20 void hmp_info_history(Monitor *mon, const QDict *qdict) { - MonitorHMP *hmon =3D container_of(mon, MonitorHMP, parent_obj); + MonitorHMP *hmon =3D MONITOR_HMP(mon); int i; const char *str; =20 diff --git a/monitor/hmp.c b/monitor/hmp.c index 428ef014284..4eadf7c2e7d 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1523,7 +1523,7 @@ cleanup: static void monitor_read(void *opaque, const uint8_t *buf, int size) { Monitor *mon =3D opaque; - MonitorHMP *hmon =3D container_of(mon, MonitorHMP, parent_obj); + MonitorHMP *hmon =3D MONITOR_HMP(mon); int i; =20 if (hmon->rs) { diff --git a/ui/ui-hmp-cmds.c b/ui/ui-hmp-cmds.c index fb13eca0b0c..eca3a82003f 100644 --- a/ui/ui-hmp-cmds.c +++ b/ui/ui-hmp-cmds.c @@ -19,7 +19,7 @@ #endif #include "monitor/hmp.h" #include "monitor/hmp-completion.h" -#include "monitor/monitor-internal.h" +#include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-ui.h" #include "qobject/qdict.h" @@ -343,7 +343,7 @@ void hmp_change_vnc(Monitor *mon, const char *device, c= onst char *target, return; } if (!arg) { - MonitorHMP *hmon =3D container_of(mon, MonitorHMP, parent_obj); + MonitorHMP *hmon =3D MONITOR_HMP(mon); monitor_read_password(hmon, hmp_change_read_arg, NULL); } else { qmp_change_vnc_password(arg, errp); --=20 2.53.0 From nobody Wed Aug 26 07:38:03 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=1786569627; cv=none; d=zohomail.com; s=zohoarc; b=OEg0hnJCJFJ/Eb8WSx3aUuMdb/L5aSCKbcdjbXhv10TCijPLvDE6J6HfspSuES0dhLGo4Cb+xvPVvqbBNGeLS/tsznIPwpEq4fdnyiZPvmh+Zu6CkuXWF10vczOjEBMwN4dv3gTUELBXU3becB+YJiDH9vQzHcf80yCyio7uumw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786569627; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=09Cz3K5Hfu2RAtmfX/9+Mk8nsbjxtr/nJzshMm746yo=; b=kxBVfSKloiWcPiFncliAhxz3v7av14T8tw3lHCiDnLVGX8CGfdUmixWwZRIjOS2Iym2ZYhHlr98Duic3bed/FlMlHE8wGFvHF+BZd9bVdSPmH1/R9AT+ilboAKugwTlc/Kb+0SKD7E2EvEljX4jJiaESuofbBF39s1H4BVL7MUc= 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 1786569627693584.7999456735944; Wed, 12 Aug 2026 14:20:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wuGMp-0005Bt-A5; Wed, 12 Aug 2026 17:20: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 1wuGMn-0004zV-MH for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:20: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 1wuGMm-0007z8-4f for qemu-devel@nongnu.org; Wed, 12 Aug 2026 17:20:05 -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 67CK3CdM601441 for ; Wed, 12 Aug 2026 21:20:03 GMT Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0y04gd9r-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 21:20:02 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-51c1eb52e1fso480671cf.0 for ; Wed, 12 Aug 2026 14:20:02 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981e2e266sm8712135e9.2.2026.08.12.14.20.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Aug 2026 14:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 09Cz3K5Hfu2RAtmfX/9+Mk8nsbjxtr/nJzshMm746yo=; b=f8j7/m+tr5HRpOCS 9tayy8CmuL5C5fVmEKf4H0zw15KJXIRBHyqm/X7BHXAH+doNepd4B4pfVVCnRg97 oXxPh+izYPhrzDDvjkKPMgFo0kk4yClaS70P0c0D1qcHC+NQUbqmkSpW3xCD1tqa maBLJAyP/avwC2rDhcnSGHJDEZQNC7JsDkwr8EliQV9lP202aywy0leJTAvdxKWU XFwn7zWiu3sMKFxlSSnbFADOc1A3XzkfwaXKbYCb2xKx4IKdAPAcH0ZPuYd8cdKG MAKPGVd+mzAfuHz4JP0vSRTENe7MDrBHiu6whn7yvBKY0D6sg8KMgPxVjs/5H66p h+Q/+Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786569602; x=1787174402; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=09Cz3K5Hfu2RAtmfX/9+Mk8nsbjxtr/nJzshMm746yo=; b=Tcz7WCKWSCL49hz+1vhJUVpyL34OaaRJWGcVnPsh2bS+HRsR3+I3WOldqRvsguGYMM VnrNbm/oHcJb5LeW9TXU8veayDJx/RfgOc2vZ+tv57kJWlcdB87JuM0bx2mSZW6B8Lrx bpmFY79cloxHC1aZ+aRvnG47Kr+HILw6CYD8zlgWxCx2Q2mOn9odBkOdY5rj2/NW054L c4IpaqLviw4BYAmeZQL+TE9+CqnpkULUf6yyVpOMF1w2gP/+gnPJ+QfYE7hU3pl1PPsF 2mB0PPxwd+4XGieKBD87oLXiZUNYJMx9B8nyFCcZC86knWA1xIFOS+igb4T/WGgUjuvR LAWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786569602; x=1787174402; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=09Cz3K5Hfu2RAtmfX/9+Mk8nsbjxtr/nJzshMm746yo=; b=F545fO1r3e9/eNMF4efFBIwbrAo6of+a4b/Tu0poZ86SxRTnFEH0SocdAYTrMaiv46 FzaNJE5ySscCEqH1mc+bFBNmhvxkOL/vD7wsMNQJ7Fabz5eEnUOtArRQucyvjbtvhAW/ vK8kLPXKHbtAmREZM5xSCBlINBnhlvZj+ZGGEk/WF6jhMF1sxtF144uz0nbib29syip+ lwqMYJxp8TECRo5A8hegH3bckpUgnKVRRWtFk9wh3lkVl3xNZ65fm8B4k7tggU/nwfaJ k/r4UPU1qmQrELKwNveyt/R7ZDt2KZ9OAsEUkaYtIzKvntVmOJ+bE3hLR/RHKBcOfirK b+vg== X-Gm-Message-State: AOJu0YydE1/XdE7/3K7hcnuLePY+4+RRTdzW1TpPCmK2y/6wo/xYYPLc /c/Z+LErOtF54rpHy0b0iC2pa+TEJLOv8NRTS4fVJS8ozIoEPNOB+H//AggAG7ERgXBzjoAZaP7 hbRvfL7zANLMazDT3+k4zqltvbf8tLs1MFJwpPQAY77aAQuCCP2KjQWxuWvK0hw26cg== X-Gm-Gg: AR+sD13Y79BWTWvsj14EB8K/A0ERQX/Tf36kZpK7I+YATRtWU65caXhG9lqSNL0iHkj jPQbXvCMEyq1kt4AWZbgjcUUqVK9xs3MW+Z3KWtHUGjUF8MqKXGQW7tOqqtOPFBOCAjLDa8jiUv 1AjhCg8AUTWAKhpJEAe05BKGQ/Qwq3Mi7rS7MLogPfHE07BBGw5JXaPEtozeIiKPAMc6VbqR3v6 HVIos0NM4GbY6k5+ycuP0mS5quvnkJ2L5zl6Re+dvToL4B2L3d10ra0zXNu5E86BbmsL6XI22vk uXBshCS8kCbkW8jUbsl+WSVZFCfZiosY9usX/Nb16ajyay2m2k3BEC8GY/YsJ4UPemQ0E5U0VO3 CFPQLlWtjog1/P5wCXZM53zAqQw0OdsFg0BvFtzBZAw== X-Received: by 2002:a05:622a:1194:b0:52d:6cf5:1c01 with SMTP id d75a77b69052e-52d73e2d702mr9676911cf.36.1786569602251; Wed, 12 Aug 2026 14:20:02 -0700 (PDT) X-Received: by 2002:a05:622a:1194:b0:52d:6cf5:1c01 with SMTP id d75a77b69052e-52d73e2d702mr9676621cf.36.1786569601859; Wed, 12 Aug 2026 14:20:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 23/23] monitor/hmp: Remove unnecessary 'monitor/monitor.h' header Date: Wed, 12 Aug 2026 23:17:07 +0200 Message-ID: <20260812211708.92824-24-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812211708.92824-1-philmd@oss.qualcomm.com> References: <20260812211708.92824-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: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX4l5+Cr4cSasr ZktoFgU8k75FZnlClMbTO3QkO40hAMVUNkuUx7MTjadsghgncFUtYERf1zcwHy/iry60U4gMXKm DhWe+EpBsgQWdO3ZxPdO0ILTXj60DLdXi+aPkPisDWtEXmPP0LVS9i7lckKXhVQIQnPY7WrvQ7q UTKh/i97LxdPbPcsZ6Rg6XH9gFprxYtwHnijg4bEM7OxEq9FOuAZ82OLtQbddypgimDEZtH8aZ7 vO8TvfJeBJLTGwg0Jx15Oak9IKFHfbzu4+uNKswu2Ud40QoeiVMhkvh259p6ipzitudiyqXpcGh XMl1RLCFcRvL2HJ5TaTpriGrszch1/VDZjsNtlQ34WI84NydBrAuCRCTZc5Oirm3MxjTgE6qrNv m+yCtejaj4k9jlWKmfDuLj31rQW1BTleGR7Ccp6E4F6Vw6SSjPMt/uifzfcpwOqZDE8uh5CKRRK KLIb+9HiBJBBai1tYdQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3MSBTYWx0ZWRfX8tgXyzHmwEY8 jJPXQGZrGNIi2heVYR1uN/NneFS0EwtnElMm1gH7ZZ5SmfIYeYBFoFnbTnEDbfVjU+y+pNJM8pI g0op/faURwOUDSqdYcsw7yWD1r/wx2g= X-Proofpoint-ORIG-GUID: SLNOrz5-PJfXtvYXAO_4GF_a0ANQOjMW X-Authority-Analysis: v=2.4 cv=X5Vi7mTe c=1 sm=1 tr=0 ts=6a7ce382 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=-VyI5JErSVUQEuwvVSgA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-GUID: SLNOrz5-PJfXtvYXAO_4GF_a0ANQOjMW 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-08-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 impostorscore=0 bulkscore=0 adultscore=0 priorityscore=1501 suspectscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120171 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: 1786569628641158500 Nothing here requires declarations from "monitor/monitor.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/monitor/hmp.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 9258a049bff..9be7fe28988 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -16,7 +16,6 @@ =20 #include "qemu/readline.h" #include "qapi/qapi-types-common.h" -#include "monitor/monitor.h" =20 #define HMP_STUB(cmd) \ void hmp_##cmd(Monitor *mon, const QDict *qdict) \ --=20 2.53.0