{"id":2222150,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222150/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410195323.17937-8-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":"<20260410195323.17937-8-philmd@linaro.org>","date":"2026-04-10T19:53:01","name":"[v2,07/27] target/i386: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"36f5953438c35385911a1537493e0d65f6bf5e74","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/20260410195323.17937-8-philmd@linaro.org/mbox/","series":[{"id":499498,"url":"http://patchwork.ozlabs.org/api/1.1/series/499498/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499498","date":"2026-04-10T19:52:54","name":"monitor: Remove need of per-target handlers","version":2,"mbox":"http://patchwork.ozlabs.org/series/499498/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222150/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222150/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=HsD9cOWa;\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=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.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 4fsnbP1fmvz1yGb\n\tfor ; Sat, 11 Apr 2026 05:55:29 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wBHvv-0000iz-JN; Fri, 10 Apr 2026 15:54:27 -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 1wBHvp-0000eH-OB\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 15:54:22 -0400","from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1wBHvm-0001Qt-LU\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 15:54:20 -0400","by mail-wr1-x42f.google.com with SMTP id\n ffacd0b85a97d-43cf8fe9c2aso1606360f8f.2\n for ; Fri, 10 Apr 2026 12:54:18 -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 ffacd0b85a97d-43d63e469ddsm9737710f8f.17.2026.04.10.12.54.15\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Fri, 10 Apr 2026 12:54:16 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1775850857; x=1776455657; 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=5s/GIt0tTjsOfb6v9VaN6RJdqFFBKJGIkUaXvnC2hp0=;\n b=HsD9cOWagg8s0L96aQLSMgGu/flt1alHypu44f9dxNgzxWQCPFZBnoDPda05gqhMh1\n Yv3/pKuyBYrFRDFWI0FdkTUMrBcm+95ul8Gcke6OzEGk1DEZFOqFzKgmj6mBHeKuW8N8\n RqH2sOQbcKn86y8CexHoItP/AaDyeTCLEe6IBwx41deAHmXhV06JXfvO8FkiQ2mo5Rn2\n RjyEq4uP1NUeIJ6prToppFwTOlOZf2wnQQk1+4jExobPte8xclh2KDMKT1Z/uduvVK9K\n tJm3+uw+2XBzLZrW5mjYLtp8ZM/PSjSztiJSz58TuHQPpEMNVNEBfGvfHA40yUAu4XfS\n HJSw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775850857; x=1776455657;\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=5s/GIt0tTjsOfb6v9VaN6RJdqFFBKJGIkUaXvnC2hp0=;\n b=cfTgpV5HFt6tPA+beKN95T4GdMqDH7lyz6WIr0sjXuPd0E9SOzuIIt8416G3RCZNrS\n pbFGbZDi7OWoyyjbJw3cRfEPuq+V8NVaXeobZHBu+nI64vBas8lG0osWx52GkV+j+dVs\n fhPYUCSbLe8iM0HWiO7KusksR54C/Mbn8dFSLsJqZQlLBEGQc0jRpFPLd36i32Y3WLLE\n sn0kaNiDuF06la5gPz5c7776bTnqH1G5o4WdOTMXldZZvlHPfYjhk5xJPwiPsuWnTlNe\n 9W8jmrk5wzR6hAa4MiLUYmR7hXb+F1VwDlE8HA7UjH7K2uA0IkKBPJhuyuqR7ZTkD2U+\n wsUw==","X-Gm-Message-State":"AOJu0YyF109HeSywZQfLmk9TaJnjiTjiFiMLWFm+/L4Hg1PCQqguEHfr\n pdDOeSeqgU9DZLsfkNmoufQ7LZ4Qm7se/vOEh6YZ+1e2mECImjwD7LGVkSG/6rVLgnOk1c4enZ7\n qa6xQy/k=","X-Gm-Gg":"AeBDiesVN5bLLXw9NlwKwNFD7jtoI+s56imQcKVPpu476554sEH8R03XwmaCf2tuOHt\n 4BO1i3XUpCnRgYDsPsgst9Zpfd9+28X9Q9tGpx5Vcuzx/8E0xsRQL1dnpxX45x2DN+SVse3UTvC\n ju+Wx3tX95UxWQgOYdT6jNk2sB0NZ3QG24E3pg+ZkkPj4XmROyUIfvy5lrI0Rw8voUTJ0Wnpmkq\n MMpL+kfJ5BshtcWkf5ywWwetPVmtaXWKfgbkn3xax9/PIpjj6+u9ys+sJF6iM/ZVcY8qt188crJ\n 2V2ewwb8HmfvXCGG4TaSJFfDAMwGiyqoRAZGCsGieneVCrH4XOz/xxrh256GKlqojTzhvM/lHpc\n nx2AkX0+dlSDAMHhK0l52ulsA1BNDIEfKXyWfN+0Qk/rR6BzhNhZrs9eMkGyFrb2ILf4d9hXHDW\n +FIkn4yiGkghOISC4c4SeZJsoQ3sKnET6ujn/5Jm/Guw3/5ni2JEtrASUGF6B76Zb84wycmUqY","X-Received":"by 2002:a5d:5f92:0:b0:43b:60f7:2283 with SMTP id\n ffacd0b85a97d-43d64289753mr6876436f8f.22.1775850856829;\n Fri, 10 Apr 2026 12:54:16 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","To":"qemu-devel@nongnu.org","Cc":"Richard Henderson ,\n \"Dr. David Alan Gilbert\" ,\n Pierrick Bouvier , qemu-riscv@nongnu.org,\n Markus Armbruster , qemu-s390x@nongnu.org,\n kvm@vger.kernel.org, qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud?=\n\t=?utf-8?q?=C3=A9?= , Paolo Bonzini ,\n Zhao Liu ","Subject":"[PATCH v2 07/27] target/i386: Replace target_monitor_defs ->\n 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":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::42f;\n 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,\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=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":",\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é \n---\n target/i386/cpu.c | 24 ++++++++++++++++++++++++\n target/i386/monitor.c | 25 -------------------------\n 2 files changed, 24 insertions(+), 25 deletions(-)","diff":"diff --git a/target/i386/cpu.c b/target/i386/cpu.c\nindex c6fd1dc00eb..968414e7215 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,28 @@ 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+ return env->eip + env->segs[R_CS].base;\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 +10721,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 ddc666d3451..a536712c755 100644\n--- a/target/i386/monitor.c\n+++ b/target/i386/monitor.c\n@@ -591,28 +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- return env->eip + env->segs[R_CS].base;\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":["v2","07/27"]}