{"id":2222903,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222903/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260414003001.97571-24-philmd@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260414003001.97571-24-philmd@linaro.org>","date":"2026-04-14T00:29:55","name":"[v3,23/27] target/i386: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"aba25882dacda1a9373f566d73e651c5cae81640","submitter":{"id":85046,"url":"http://patchwork.ozlabs.org/api/1.1/people/85046/?format=json","name":"Philippe Mathieu-Daudé","email":"philmd@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260414003001.97571-24-philmd@linaro.org/mbox/","series":[{"id":499762,"url":"http://patchwork.ozlabs.org/api/1.1/series/499762/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499762","date":"2026-04-14T00:29:32","name":"monitor: Remove need of per-target handlers","version":3,"mbox":"http://patchwork.ozlabs.org/series/499762/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222903/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222903/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=GnKbDW+V;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fvlcL6Xksz1yCv\n\tfor ; Tue, 14 Apr 2026 10:33:06 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wCRi3-0000LL-TH; Mon, 13 Apr 2026 20:32:55 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wCRi2-0000KW-Rk\n for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:54 -0400","from mail-wm1-x332.google.com ([2a00:1450:4864:20::332])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1wCRi1-0003Rf-9G\n for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:54 -0400","by mail-wm1-x332.google.com with SMTP id\n 5b1f17b1804b1-488a14c31eeso41172535e9.0\n for ; Mon, 13 Apr 2026 17:32:52 -0700 (PDT)","from localhost.localdomain (88-187-86-199.subs.proxad.net.\n [88.187.86.199]) by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-488d681ecd5sm109676535e9.19.2026.04.13.17.32.50\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Mon, 13 Apr 2026 17:32:50 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1776126771; x=1776731571; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=rxLEbMZsZkzsDTrSuMDqm5sZgfXseQNGksHS6C02fq4=;\n b=GnKbDW+VrUbCy8fUAEH+TPOo69e78WgfE9LBx5IjGxovN7j1SfJYXELIfjREVM6ghX\n mwWizmmzVVPtdT8CExjZ6fVD1NLuXR5eWqv2MQdJ7zMqezMMn7yl6ToI8VptT2yQxLl2\n gitBWzvS5UZA/o9c9Yn2IYqt5TNzI/mr0jelV1G7+ZO7DGkpJ42eNW5H9F9r3UqhyxrM\n qm6Y7GNXznoFL6T9FcO/FdiJpH5XkUcywyK14OB6j4n2ZtVrV1JPGoHoA9p//wf1my9O\n Hud+/kTmnpSrYxurw/dsKr//fdWQGQneORISnaD18+NkAj1/HZE+oc6T+t1d0KDk/wrQ\n R71Q==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776126771; x=1776731571;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=rxLEbMZsZkzsDTrSuMDqm5sZgfXseQNGksHS6C02fq4=;\n b=MKAjhNVgA/dwrwMzuerkBRHbCcVdYXRL75Fm7ywyuSjttR234sbiOQ+LICBwqqlAiJ\n GE1VtsRyJrjNqh8MVCVqqVG7/2zW2JN6p8BqXN4N5n789/bD1bNhsCf/Gg5iLELoPei3\n keFlad5RaEmSvP8NhMxXp08/9916WIBpwgAmxkQi+QOmAkXnNv0KYvkPD6XWRd1NRDKb\n Aq3q5lPt1CEHVolG+b1l8CgOfJHeLmdAqWW8BtU1I2f9iFRwSI3ogfTljZZZQanV/MIN\n GyvGnUmSevyXq0ka8hjDluwzlrGre+Zj2b+zdlyuOVR+JhjrFEQw2ruk04GcoKENYu1Z\n vc3g==","X-Gm-Message-State":"AOJu0Yy1ZvAKD29W/XWGfTl0jdXkL/NL7WqfciKfT1VLBSxnoMBTeuPp\n 98k3FXZ5tSwgNktSRqGx7wOwVidkBl8vSvKgL7PK2HExvif+LCeCUNAzjT1kwZ9VTQBm8+hhqDy\n GO843I+g=","X-Gm-Gg":"AeBDievtS51p4Kher7hxrxqZsQUUAk8BdNTV/r+fKvaR6XwPQ7a++uWSLx1EsDFpbnl\n s7mcczqKqW6nnNmizJ5PXK4mqtLHgWbqz9FBREfLj8kcq4B/iawpcn69bJDH+BDilHEXhBQDhPu\n wMbGBVaNAsmNwwl67FnZpfZ5Lbk0NudPmDDTgQgAbyKSVsVun5opjsTrQYUxiMMVqctyTG4nKNz\n Ni4XRtjLi4Tqu+l6r++YjlanosQpPseO6eSfHmmrG/9FOFKE4D0jyIril/rS8ZUHioG79t+voja\n teLGJw7GC+UsHIQwCUXGK+8JVHhAuZxPbYERC2wZAuvEZruIUx8UAFnpCJ9HCdSRWeAR6+RpJ5C\n 74naF0v23vwt3eHv42fb3mWMrK5B7ITkjTZMM9xKlDwlh/lBaVBiA98nQBWl/DfJHewlCEEckv3\n FdqSjS/8uiYxMETntM3wIxCOzjit9FIhdewbDtGzHk5XybCVyEckdN2ESGM6zUj2bQe8uAHL2v","X-Received":"by 2002:a05:600c:8883:b0:488:b87b:3052 with SMTP id\n 5b1f17b1804b1-488d689b400mr157810815e9.29.1776126771428;\n Mon, 13 Apr 2026 17:32:51 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","To":"qemu-devel@nongnu.org","Cc":"Pierrick Bouvier ,\n Markus Armbruster ,\n Richard Henderson ,\n \"Dr. David Alan Gilbert\" ,\n Paolo Bonzini ,\n =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n Zhao Liu ","Subject":"[PATCH v3 23/27] target/i386: Replace target_monitor_defs ->\n SysemuCPUOps::monitor_defs","Date":"Tue, 14 Apr 2026 02:29:55 +0200","Message-ID":"<20260414003001.97571-24-philmd@linaro.org>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260414003001.97571-1-philmd@linaro.org>","References":"<20260414003001.97571-1-philmd@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::332;\n envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Restrict x86_monitor_defs[] to cpu.c, register it as\nSysemuCPUOps::monitor_defs hook, allowing to remove\nthe target_monitor_defs() method.\n\nSigned-off-by: Philippe Mathieu-Daudé \nReviewed-by: Richard Henderson \n---\n target/i386/cpu.c | 29 +++++++++++++++++++++++++++++\n target/i386/monitor.c | 30 ------------------------------\n 2 files changed, 29 insertions(+), 30 deletions(-)","diff":"diff --git a/target/i386/cpu.c b/target/i386/cpu.c\nindex c6fd1dc00eb..4cb8c627295 100644\n--- a/target/i386/cpu.c\n+++ b/target/i386/cpu.c\n@@ -39,6 +39,7 @@\n #include \"exec/watchpoint.h\"\n #ifndef CONFIG_USER_ONLY\n #include \"confidential-guest.h\"\n+#include \"monitor/hmp.h\"\n #include \"system/reset.h\"\n #include \"qapi/qapi-commands-machine.h\"\n #include \"system/address-spaces.h\"\n@@ -10685,6 +10686,33 @@ static const Property x86_cpu_properties[] = {\n };\n \n #ifndef CONFIG_USER_ONLY\n+\n+static int64_t monitor_get_pc(Monitor *mon, const struct MonitorDef *md,\n+ int offset)\n+{\n+ CPUArchState *env = mon_get_cpu_env(mon);\n+ int64_t ret = env->eip + env->segs[R_CS].base;\n+\n+ if (!(env->hflags & HF_CS64_MASK)) {\n+ ret = (int32_t)ret;\n+ }\n+ return ret;\n+}\n+\n+static const MonitorDef x86_monitor_defs[] = {\n+#define SEG(name, seg) \\\n+ { name \".limit\", offsetof(CPUX86State, segs[seg].limit) },\n+ SEG(\"cs\", R_CS)\n+ SEG(\"ds\", R_DS)\n+ SEG(\"es\", R_ES)\n+ SEG(\"ss\", R_SS)\n+ SEG(\"fs\", R_FS)\n+ SEG(\"gs\", R_GS)\n+ { \"pc\", 0, monitor_get_pc, },\n+ { NULL },\n+#undef SEG\n+};\n+\n #include \"hw/core/sysemu-cpu-ops.h\"\n \n static const struct SysemuCPUOps i386_sysemu_ops = {\n@@ -10698,6 +10726,7 @@ static const struct SysemuCPUOps i386_sysemu_ops = {\n .write_elf64_note = x86_cpu_write_elf64_note,\n .write_elf32_qemunote = x86_cpu_write_elf32_qemunote,\n .write_elf64_qemunote = x86_cpu_write_elf64_qemunote,\n+ .monitor_defs = x86_monitor_defs,\n .legacy_vmsd = &vmstate_x86_cpu,\n };\n #endif\ndiff --git a/target/i386/monitor.c b/target/i386/monitor.c\nindex 1befb8ea824..a536712c755 100644\n--- a/target/i386/monitor.c\n+++ b/target/i386/monitor.c\n@@ -591,33 +591,3 @@ void hmp_mce(Monitor *mon, const QDict *qdict)\n flags);\n }\n }\n-\n-static int64_t monitor_get_pc(Monitor *mon, const struct MonitorDef *md,\n- int offset)\n-{\n- CPUArchState *env = mon_get_cpu_env(mon);\n- int64_t ret = env->eip + env->segs[R_CS].base;\n-\n- if (!(env->hflags & HF_CS64_MASK)) {\n- ret = (int32_t)ret;\n- }\n- return ret;\n-}\n-\n-const MonitorDef monitor_defs[] = {\n-#define SEG(name, seg) \\\n- { name \".limit\", offsetof(CPUX86State, segs[seg].limit) },\n- SEG(\"cs\", R_CS)\n- SEG(\"ds\", R_DS)\n- SEG(\"es\", R_ES)\n- SEG(\"ss\", R_SS)\n- SEG(\"fs\", R_FS)\n- SEG(\"gs\", R_GS)\n- { \"pc\", 0, monitor_get_pc, },\n- { NULL },\n-};\n-\n-const MonitorDef *target_monitor_defs(void)\n-{\n- return monitor_defs;\n-}\n","prefixes":["v3","23/27"]}