{"id":2228687,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2228687/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260427080738.77138-28-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":"<20260427080738.77138-28-philmd@linaro.org>","date":"2026-04-27T08:07:33","name":"[v4,27/32] 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/20260427080738.77138-28-philmd@linaro.org/mbox/","series":[{"id":501599,"url":"http://patchwork.ozlabs.org/api/1.1/series/501599/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501599","date":"2026-04-27T08:07:06","name":"monitor: Remove need of per-target handlers","version":4,"mbox":"http://patchwork.ozlabs.org/series/501599/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2228687/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2228687/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=ufqed5MR;\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 4g3x8q4xB2z1xvV\n\tfor ; Mon, 27 Apr 2026 18:11:07 +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 1wHH3N-0000bT-IC; Mon, 27 Apr 2026 04:10: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 1wHH3J-0000RU-9K\n for qemu-devel@nongnu.org; Mon, 27 Apr 2026 04:10:49 -0400","from mail-wr1-x434.google.com ([2a00:1450:4864:20::434])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1wHH3H-0002ku-0m\n for qemu-devel@nongnu.org; Mon, 27 Apr 2026 04:10:48 -0400","by mail-wr1-x434.google.com with SMTP id\n ffacd0b85a97d-43d73422431so9153233f8f.2\n for ; Mon, 27 Apr 2026 01:10:46 -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-4412e36ff8bsm29899843f8f.26.2026.04.27.01.10.44\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Mon, 27 Apr 2026 01:10:44 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1777277445; x=1777882245; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:from:to:cc:subject:date:message-id\n :reply-to; bh=5IB1vvAJbcMlRA4A8vxRuUp8fkqXSVJfJBJpe4/kUNg=;\n b=ufqed5MRXbNEvkbLcavnZJHWqEeNoCUVkqtnVsV/7ku3Oa9JYDMzcDJnGw+QOiJdHa\n ItfG8xm8MJkEJmJ898lIn/W87A+3r2LNokHGhQsXyrgXXtCwg1Bg9eDr3UpvF7GsnE9a\n FVKeUjP1j9o3d/ZyEShoBZ3sjZXNseBotZpr6Bqa6YG3JjqFmYMP4yNNqtfDKWbzgZ6Q\n KFJMn8SYr0p6ExDO+WHxU/yFBfXN1u2AY9fBHQEixjFHgETlw1jjnioNdmYYXAf7WrBB\n RKbHoAfPmWni61bTqvaFp7uQHSVLQN8pOiBRlL8dEXakT2FPlfticS0fDQFci2VzrZN2\n ZdFQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777277445; x=1777882245;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=5IB1vvAJbcMlRA4A8vxRuUp8fkqXSVJfJBJpe4/kUNg=;\n b=X2GKYSXfo2Gx+DJji4GzCK3/Ih82n8zM2iZN5i9sWddBpOl695aWgNuOpv35nKPTtX\n sXfN9nZlRc/Ai5/EHTxMm/xkdifMjmvT4McMMT/KJyQ5TzSPAEerDOWZ46ea68d0IhjS\n KMvzcjD9gOWR94iOZ1XVANl2fwQkjs/6D/NW82mvw7kHQgfYcT1XdRAOzuikEu+G8xi/\n c3OKn3Yg7RXudggWuVyx2ZqcyhWvqcmuX1L8nc8w4jJ0rqKOaB/4RUhVyeGS18kulGwh\n rAu2QADvdO/Q6IJU9hSHnl/pi5KVUrWTvs+Aiw0vp5/CL+Z6il8+HlopZTELzzOFtfps\n VYMg==","X-Forwarded-Encrypted":"i=1;\n AFNElJ+7CC70GOn1HpRRBRE9wal3N0NCpTNe0SW7tILu+Ush1mO3gzlPLj2hgOlyoZoP1GQ3DSEAeE5Hg0Kq@nongnu.org","X-Gm-Message-State":"AOJu0YyxRJDxgOnqJsZvxId9qdPzYmK3G0kQcfAH2NxWAOb7wN9bcaf4\n 7d8WaU1WWV0a8xwBlY60nv4MjDla6uwS5E4CbLSbozD8Hx6Zav+/p+dv0/MdB7qaGtDMoI7D8JH\n 4S+PdG7I=","X-Gm-Gg":"AeBDievpyfJAOjRs1TwXquIqYOM4vPTsJ/otrITQNjk9Pw+amJrA0ecfR6akAhQwQyv\n Vx3hfd+7pTlch/DZGDw27faLhR5OtnI0qq6pnhYkzoAuaNYPD87ebBd94EFjZ8IhJWrmK81+AgU\n 32zLlF4VfjW9RGGkZoa9/2I1hcdEzX1uQfIIRY20RcfDWDLulGs/XNWY+859bYfy5V3VqaWY5s2\n yDdAe+xYKTQcpZ42ei0p5YxEFXG0RHuIA3DflHPYz5/u07Ig/OqFDnmHmSMC8jse0LiP5Px9z+k\n PE3ysY1TXeaXjnQN81icI57VZ4ApADjWTbAHl7W29H3AbNwcV6n1qwfm3fBJ4ZagcCORDrVBPOC\n tt6hZj5lvASUkMzEo5Vdb2Dtc4Nav23sRgNGZdNz8MjvvEfUtTs34vI5NP/LUZKxwZ13vIARIlw\n mNhIYw0MTKMlTQ3isIYApqMQ91xwdycmRM7HSmbTPiu3c5MBDwPpA1jWKWMJSr/OW/83Rvx2yi/\n Ldtf++wGiI=","X-Received":"by 2002:a05:6000:18a5:b0:43c:ff58:35c3 with SMTP id\n ffacd0b85a97d-43fe3dc818fmr65953027f8f.10.1777277445162;\n Mon, 27 Apr 2026 01:10:45 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","To":"Markus Armbruster ,\n\tqemu-devel@nongnu.org","Subject":"[PATCH v4 27/32] target/i386: Replace target_monitor_defs ->\n SysemuCPUOps::monitor_defs","Date":"Mon, 27 Apr 2026 10:07:33 +0200","Message-ID":"<20260427080738.77138-28-philmd@linaro.org>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260427080738.77138-1-philmd@linaro.org>","References":"<20260427080738.77138-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::434;\n envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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 9d126600c05..d8e102dd1b9 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@@ -10686,6 +10687,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@@ -10699,6 +10727,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":["v4","27/32"]}