From nobody Sat Apr 11 18:34:37 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=1775850927; cv=none; d=zohomail.com; s=zohoarc; b=iNRZ0nXWU0cE0MYz4YQb2j4DCPnyR03ZWR7BNCyuqhAeuP7TZs3aaHohK+JwG1vUBDMzMUimQoiee8KW460AlkL1G3gvHtiKr6KqVwvmofEEz0Ygw4cPyLFibSRt5xk9CMkrtAyBGtk6OaWix2/ZeZ8GYXgjWWegrxmBW6S4E/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775850927; 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=5s/GIt0tTjsOfb6v9VaN6RJdqFFBKJGIkUaXvnC2hp0=; b=HMdJLoayECmLY1RP/szRXWZvW2Fhp/CnWuyQklnJ6TLasGM8N3syWylLTXYKM2uotXNr1xI+uAssqxvCL25Ox4t6YrU1fYIwLJuJEKZlar0bbg1Zf/U6STqF2fSz6B6kGvsFsOs+X1XBya5XyZhC2JjzVtOdIvy/Rq9ECZaEMsQ= 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 (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17758509277341008.7772159038162; Fri, 10 Apr 2026 12:55:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBHvv-0000iz-JN; Fri, 10 Apr 2026 15:54:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBHvp-0000eH-OB for qemu-devel@nongnu.org; Fri, 10 Apr 2026 15:54:22 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wBHvm-0001Qt-LU for qemu-devel@nongnu.org; Fri, 10 Apr 2026 15:54:20 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-43cf8fe9c2aso1606360f8f.2 for ; Fri, 10 Apr 2026 12:54:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d63e469ddsm9737710f8f.17.2026.04.10.12.54.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 10 Apr 2026 12:54:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775850857; x=1776455657; 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=5s/GIt0tTjsOfb6v9VaN6RJdqFFBKJGIkUaXvnC2hp0=; b=HsD9cOWagg8s0L96aQLSMgGu/flt1alHypu44f9dxNgzxWQCPFZBnoDPda05gqhMh1 Yv3/pKuyBYrFRDFWI0FdkTUMrBcm+95ul8Gcke6OzEGk1DEZFOqFzKgmj6mBHeKuW8N8 RqH2sOQbcKn86y8CexHoItP/AaDyeTCLEe6IBwx41deAHmXhV06JXfvO8FkiQ2mo5Rn2 RjyEq4uP1NUeIJ6prToppFwTOlOZf2wnQQk1+4jExobPte8xclh2KDMKT1Z/uduvVK9K tJm3+uw+2XBzLZrW5mjYLtp8ZM/PSjSztiJSz58TuHQPpEMNVNEBfGvfHA40yUAu4XfS HJSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775850857; x=1776455657; 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=5s/GIt0tTjsOfb6v9VaN6RJdqFFBKJGIkUaXvnC2hp0=; b=cfTgpV5HFt6tPA+beKN95T4GdMqDH7lyz6WIr0sjXuPd0E9SOzuIIt8416G3RCZNrS pbFGbZDi7OWoyyjbJw3cRfEPuq+V8NVaXeobZHBu+nI64vBas8lG0osWx52GkV+j+dVs fhPYUCSbLe8iM0HWiO7KusksR54C/Mbn8dFSLsJqZQlLBEGQc0jRpFPLd36i32Y3WLLE sn0kaNiDuF06la5gPz5c7776bTnqH1G5o4WdOTMXldZZvlHPfYjhk5xJPwiPsuWnTlNe 9W8jmrk5wzR6hAa4MiLUYmR7hXb+F1VwDlE8HA7UjH7K2uA0IkKBPJhuyuqR7ZTkD2U+ wsUw== X-Gm-Message-State: AOJu0YyF109HeSywZQfLmk9TaJnjiTjiFiMLWFm+/L4Hg1PCQqguEHfr pdDOeSeqgU9DZLsfkNmoufQ7LZ4Qm7se/vOEh6YZ+1e2mECImjwD7LGVkSG/6rVLgnOk1c4enZ7 qa6xQy/k= X-Gm-Gg: AeBDiesVN5bLLXw9NlwKwNFD7jtoI+s56imQcKVPpu476554sEH8R03XwmaCf2tuOHt 4BO1i3XUpCnRgYDsPsgst9Zpfd9+28X9Q9tGpx5Vcuzx/8E0xsRQL1dnpxX45x2DN+SVse3UTvC ju+Wx3tX95UxWQgOYdT6jNk2sB0NZ3QG24E3pg+ZkkPj4XmROyUIfvy5lrI0Rw8voUTJ0Wnpmkq MMpL+kfJ5BshtcWkf5ywWwetPVmtaXWKfgbkn3xax9/PIpjj6+u9ys+sJF6iM/ZVcY8qt188crJ 2V2ewwb8HmfvXCGG4TaSJFfDAMwGiyqoRAZGCsGieneVCrH4XOz/xxrh256GKlqojTzhvM/lHpc nx2AkX0+dlSDAMHhK0l52ulsA1BNDIEfKXyWfN+0Qk/rR6BzhNhZrs9eMkGyFrb2ILf4d9hXHDW +FIkn4yiGkghOISC4c4SeZJsoQ3sKnET6ujn/5Jm/Guw3/5ni2JEtrASUGF6B76Zb84wycmUqY X-Received: by 2002:a5d:5f92:0:b0:43b:60f7:2283 with SMTP id ffacd0b85a97d-43d64289753mr6876436f8f.22.1775850856829; Fri, 10 Apr 2026 12:54:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , "Dr. David Alan Gilbert" , Pierrick Bouvier , qemu-riscv@nongnu.org, Markus Armbruster , qemu-s390x@nongnu.org, kvm@vger.kernel.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Zhao Liu Subject: [PATCH v2 07/27] target/i386: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs Date: Fri, 10 Apr 2026 21:53:01 +0200 Message-ID: <20260410195323.17937-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260410195323.17937-1-philmd@linaro.org> References: <20260410195323.17937-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::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1775850930519154100 Restrict x86_monitor_defs[] to cpu.c, register it as SysemuCPUOps::monitor_defs hook, allowing to remove the target_monitor_defs() method. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/cpu.c | 24 ++++++++++++++++++++++++ target/i386/monitor.c | 25 ------------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c6fd1dc00eb..968414e7215 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -39,6 +39,7 @@ #include "exec/watchpoint.h" #ifndef CONFIG_USER_ONLY #include "confidential-guest.h" +#include "monitor/hmp.h" #include "system/reset.h" #include "qapi/qapi-commands-machine.h" #include "system/address-spaces.h" @@ -10685,6 +10686,28 @@ static const Property x86_cpu_properties[] =3D { }; =20 #ifndef CONFIG_USER_ONLY + +static int64_t monitor_get_pc(Monitor *mon, const struct MonitorDef *md, + int offset) +{ + CPUArchState *env =3D mon_get_cpu_env(mon); + return env->eip + env->segs[R_CS].base; +} + +static const MonitorDef x86_monitor_defs[] =3D { +#define SEG(name, seg) \ + { name ".limit", offsetof(CPUX86State, segs[seg].limit) }, + SEG("cs", R_CS) + SEG("ds", R_DS) + SEG("es", R_ES) + SEG("ss", R_SS) + SEG("fs", R_FS) + SEG("gs", R_GS) + { "pc", 0, monitor_get_pc, }, + { NULL }, +#undef SEG +}; + #include "hw/core/sysemu-cpu-ops.h" =20 static const struct SysemuCPUOps i386_sysemu_ops =3D { @@ -10698,6 +10721,7 @@ static const struct SysemuCPUOps i386_sysemu_ops = =3D { .write_elf64_note =3D x86_cpu_write_elf64_note, .write_elf32_qemunote =3D x86_cpu_write_elf32_qemunote, .write_elf64_qemunote =3D x86_cpu_write_elf64_qemunote, + .monitor_defs =3D x86_monitor_defs, .legacy_vmsd =3D &vmstate_x86_cpu, }; #endif diff --git a/target/i386/monitor.c b/target/i386/monitor.c index ddc666d3451..a536712c755 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -591,28 +591,3 @@ void hmp_mce(Monitor *mon, const QDict *qdict) flags); } } - -static int64_t monitor_get_pc(Monitor *mon, const struct MonitorDef *md, - int offset) -{ - CPUArchState *env =3D mon_get_cpu_env(mon); - return env->eip + env->segs[R_CS].base; -} - -const MonitorDef monitor_defs[] =3D { -#define SEG(name, seg) \ - { name ".limit", offsetof(CPUX86State, segs[seg].limit) }, - SEG("cs", R_CS) - SEG("ds", R_DS) - SEG("es", R_ES) - SEG("ss", R_SS) - SEG("fs", R_FS) - SEG("gs", R_GS) - { "pc", 0, monitor_get_pc, }, - { NULL }, -}; - -const MonitorDef *target_monitor_defs(void) -{ - return monitor_defs; -} --=20 2.53.0