From nobody Sun Mar 22 15:39:56 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774023103; cv=none; d=zohomail.com; s=zohoarc; b=noKPXDtZp2gnZUwO6UQaWUrlMoK66z1FVIgRD5Z0qCiLD9UwGqy5OQ70YQFpjEjT7kCjVZfpc5qyeBEsbyu2E9DfKHLJS5QyJvSzPH4X68UOCaHI/7Riak8c3Z47QxTwlm+qRy86wtgUjabU+UGo2/xf+hOm/4jbTx9cd50c8/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774023103; 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=MxangKbcKg6DThVnOgtvYQODpyhNQKOeoUuVdNKo2bk=; b=bA7ShXI1z0/ATDYFbea/mDmxWX0gETc6N+p0/CNUvOrVfqnuho1NCdS7C3gwA0hfR03d5xHhuG6AyEvCHBm1SxJCYtjcPxy1qH5wpqbBMiySL20CwbVSE7l4eZlslRbosC0CnbM0er3ciRXJsvqx73XGfKukAAmH/gIO1Epnxmw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774023103721102.53307066055925; Fri, 20 Mar 2026 09:11:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3cPV-0000Ol-31; Fri, 20 Mar 2026 12:09:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w3cP4-0000BY-Q5 for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:08:51 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3cP2-0008WI-1P for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:08:50 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-486fd5360d4so17701165e9.1 for ; Fri, 20 Mar 2026 09:08:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486fe8359acsm70490645e9.12.2026.03.20.09.08.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774022924; x=1774627724; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MxangKbcKg6DThVnOgtvYQODpyhNQKOeoUuVdNKo2bk=; b=zk4IhcwnzNRB3cxoebI2usy+TH7RK8vxCo+JxV4RUDUaJeBjixPAcG9P5sAFQcnFG5 9ARaZ6oOAr8uGa9cYyKw41MNKjlbe3FLYIKMSxIoNWVCO+5JLia71VbY0gofk+blpMnF xwQstsn9qO5RaU77FK7G7V/9KwXT7WaDPnmchuIQCu1zmR3ZF3PF1cEUEouAP7yJD254 zFlPgyLar6S2wSSIit4f6TjnPYAzWjAZaS6OC91dw/FZscZDzXoddYW9qeFkpyTrRVli MxBHvbOirgIGoFoXN85xBhI2STMqpWKnqOiEMnWmQAlJjaix81BxG7ZgBn9tG7j3aO5C Td2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774022924; x=1774627724; h=content-transfer-encoding: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; bh=MxangKbcKg6DThVnOgtvYQODpyhNQKOeoUuVdNKo2bk=; b=bvgveF+JNoySH8CbBXEwZcfws/NvuEmU/jctorplwqpSgj3BlNnRw9iAFXi4YsF/O/ XFHilaOOJpH067RnWI9J6yARFeEoTT1mas6twRpD3buCJlJAGwc3VcT7qOQfko/UKK4/ VmWSs8AUa4Gx8y1kAYmLV9xN1Ze6zzeAuIBfznmJexgpWzVC8kw+G7OErozpuLFWRaSi vZ3+FbQR3pP1Y7tdOrWsn0kCR1EqpvWMLG1Ywco2+v0tyL7D3Ej60lw1ixZvs9skUmk5 hYd5+mCNuLD4E8+264Ecjc0uuYeD68KN81yoHBjX3zTMFLCojo0kOTOqgwbjkuyl26VD VbAw== X-Gm-Message-State: AOJu0YwJ/UIn+EjAWt5yyXGonGahpifG+yEKABUDvS9qcgfpY+Pikw8F FzDBiQMF20uOx4P5UvZybi3LXHoZU/ztGkM6qZ2j1qA6ocrTff+rYH31EYvJA7JQtfipKCuIuk9 Pnk/R11Y= X-Gm-Gg: ATEYQzyion2WQkd5pIE5mmYjmQ8XwaW4PWeQC6w62+XMHeJoDFz5nIVK2QdupuzCjZS ENTfsWc3hbJexkEjQbvJcWlU8c5Q9RbmIsBFQXuLsOg2ac/51nG9pSGL2Xwym3F1KBri1aQoYjm dCBvi4PjkKZYbqasddvlNSKwUZt+0ZLYZ1nhsfuYa81Yly07zM8y7+hM3rJ/0wziCjnWoVJ4tXH rJ4azo/KXMYmAU+r/FdgergdaR+3R5tkIUCbHy1fN5M3kc0r2zXeebmkpLYY8E7duOpk1nCGcCF C8RUIYI8Hu6Ybl6b6T/xXqXSqgq3Ny7NibZuPDmw2aFWyLxqETkUaAWSwdIBNKPqhjTUzLFIbuQ 6olCskY/EX9QPRrSgukb2jwlHgVaJDw1n8gEvIDqYT3StkUVh2DgIivdUba2/Pb+5T//bcrOxwF hgIuyy7VH8iDTGYWxB1P4QR5c1TRXIeNL6NpT0MRY9WV9i2s6TNg3Q9X8CM4AEKtBL+AH4RO8K X-Received: by 2002:a05:600c:46cc:b0:485:3b9e:caa7 with SMTP id 5b1f17b1804b1-486fee230d1mr51481725e9.23.1774022923353; Fri, 20 Mar 2026 09:08:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Dr . David Alan Gilbert" , Daniel Henrique Barboza , Alistair Francis , Mark Cave-Ayland , Artyom Tarasenko , Zhao Liu , Paolo Bonzini , qemu-riscv@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 04/10] target/i386: Replace legacy target_monitor_defs -> legacy_monitor_defs Date: Fri, 20 Mar 2026 17:08:04 +0100 Message-ID: <20260320160811.28611-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320160811.28611-1-philmd@linaro.org> References: <20260320160811.28611-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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 @linaro.org) X-ZM-MESSAGEID: 1774023104510158500 Expose x86_monitor_defs within target/i386/ and register it as CPUClass::legacy_monitor_defs hook. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/cpu.h | 2 ++ target/i386/cpu.c | 1 + target/i386/monitor.c | 7 ++----- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index b0c730b3390..7420ee3b8ea 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -34,6 +34,8 @@ #include "qemu/timer.h" #include "standard-headers/asm-x86/kvm_para.h" =20 +extern const MonitorDef *x86_monitor_defs; + #define XEN_NR_VIRQS 24 =20 #ifdef TARGET_X86_64 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b5e483e8cd2..c5d9c51c1ad 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -10745,6 +10745,7 @@ static void x86_cpu_common_class_init(ObjectClass *= oc, const void *data) cc->gdb_core_xml_file =3D "i386-32bit.xml"; #endif cc->disas_set_info =3D x86_disas_set_info; + cc->legacy_monitor_defs =3D x86_monitor_defs; =20 dc->user_creatable =3D true; =20 diff --git a/target/i386/monitor.c b/target/i386/monitor.c index ddc666d3451..9a0cc73bbf4 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -599,7 +599,7 @@ static int64_t monitor_get_pc(Monitor *mon, const struc= t MonitorDef *md, return env->eip + env->segs[R_CS].base; } =20 -const MonitorDef monitor_defs[] =3D { +static const MonitorDef monitor_defs[] =3D { #define SEG(name, seg) \ { name ".limit", offsetof(CPUX86State, segs[seg].limit) }, SEG("cs", R_CS) @@ -612,7 +612,4 @@ const MonitorDef monitor_defs[] =3D { { NULL }, }; =20 -const MonitorDef *target_monitor_defs(void) -{ - return monitor_defs; -} +const MonitorDef *x86_monitor_defs =3D monitor_defs; --=20 2.53.0