{"id":2222183,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222183/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-ppc/patch/20260410195323.17937-21-philmd@linaro.org/","project":{"id":69,"url":"http://patchwork.ozlabs.org/api/1.1/projects/69/?format=json","name":"QEMU powerpc development","link_name":"qemu-ppc","list_id":"qemu-ppc.nongnu.org","list_email":"qemu-ppc@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260410195323.17937-21-philmd@linaro.org>","date":"2026-04-10T19:53:14","name":"[v2,20/27] hw/s390x: Reduce 'monitor/monitor.h' inclusions","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"765216820ee99f3a92e198a7c8ad203d2cfe1ab1","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-ppc/patch/20260410195323.17937-21-philmd@linaro.org/mbox/","series":[{"id":499497,"url":"http://patchwork.ozlabs.org/api/1.1/series/499497/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-ppc/list/?series=499497","date":"2026-04-10T19:52:55","name":"monitor: Remove need of per-target handlers","version":2,"mbox":"http://patchwork.ozlabs.org/series/499497/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222183/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222183/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=Weo9G5Ev;\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-ppc-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 4fsnf66NXfz1yCv\n\tfor ; Sat, 11 Apr 2026 05:57:50 +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 1wBHxL-00064d-3Q; Fri, 10 Apr 2026 15:55: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 1wBHxJ-0005ui-Me\n for qemu-ppc@nongnu.org; Fri, 10 Apr 2026 15:55:53 -0400","from mail-wm1-x335.google.com ([2a00:1450:4864:20::335])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1wBHxH-0003Lh-4j\n for qemu-ppc@nongnu.org; Fri, 10 Apr 2026 15:55:53 -0400","by mail-wm1-x335.google.com with SMTP id\n 5b1f17b1804b1-4889e045bc6so26074505e9.2\n for ; Fri, 10 Apr 2026 12:55:50 -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-488d525c931sm98623515e9.0.2026.04.10.12.55.48\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Fri, 10 Apr 2026 12:55:49 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1775850950; x=1776455750; 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=j1FsrkHiiVfTWUBHqJkrxULfXG6j6GR2S4+XnGN40SU=;\n b=Weo9G5EvHvy6O5IG4GSe0RjE58zSpZEThDd346JX8LS5B/a30XZAoOz3A1J5MErOsa\n liMqSzy15Bq22DXqj459EC3/Ch9kvrZD6He6oR/7xg927h//+ZG61lUWdwLj05904kf+\n GQcS93YHACunEVTl6MulLMiaLlsR9A+romv68N1xWT5YJYyG9Trnm9ad1SSQQV8sNUUC\n rQ6t0m5E1ZKsJH7SQnhLYmv9bxTjvoZDwFY1EYvfmfcFl9ig8mPieKRTPahlGwn6ttNa\n +bJq/PosKpcZfesPSHtzYWzPD2oZLaLLuBW32C/RJVOgFFmhYJejhUP7sbpg2+qSE1pi\n DXkA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775850950; x=1776455750;\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=j1FsrkHiiVfTWUBHqJkrxULfXG6j6GR2S4+XnGN40SU=;\n b=BRmw1mYblWDgz8J4FkDRdcZJATUM/8XcMgl2gnnNUR4HchEUd87UH7ThZeiAByVctE\n LIOHXruxyern9mCwpuqzn+Y/mi/Z2VFt8w0LThCSgmiOSwc9BZUj5pvOyG8ZwvrBVrpp\n rndco0Iywn/nty/amFy3eVMBDfZWp9OCUkAhgkYfG8lRjFJHcMwAfR7A7c3lYpKMKMTG\n IpqWmFE5GzIwrnCO52a13Qht5ekvFKkJuYDdQ6FCBKxUxBWMpshrMvRdv3Ylt68La3pm\n 4sruwa24u2+w/RzyTlpC95LwyVzrVxBcF6YL3KrjMcXpCAmBqt1n9jySteldaBo0Rdq+\n PyDQ==","X-Forwarded-Encrypted":"i=1;\n AJvYcCV/+uITPt7st3cwLD3I9JXtnQZOiYQk4gr63o0P865/bGZM1sjxlukQfCORmXz1utSybOETv7TN7A==@nongnu.org","X-Gm-Message-State":"AOJu0Yy0UuTz3c2FMvpYD5MRKPNBx6g4jTC5US/F91KD/k+cowN9RbpC\n Qhyt0NiUTVeUez8O7Rpgz+gEZYj+XkMqrJclFqiUYd5rZBHVqncelKO+hi6LjzfPNQs=","X-Gm-Gg":"AeBDiesv5ehsfCR4NEB73d78tAlnuDWREANrRE6BUwRi1eu6VvNHoFE0/07/n0thcUi\n T5PfWz+6N971s3bmszCAQJWFv7XArcas+A2/6kpCt+YIJ/cCbbjnhJCGubld4HlVybiqP++ym3M\n jsx7p1GnNzJhP8tNESdjQN0yeTtVL+0dv2h6Ngs3sck6mm1XGMJdXU6yk+xTQelnAvjssWrsC4Y\n 8Uh/QFdu6eqxC4so5cm9suUIEqJqXUbHz7L+ZuFbHvXdIUBGo1fM/98c39Qo3cLGGMtzofjp7wP\n V3TXK36jarhv5qzmZQH64kGt6H9D9kjyofV3fMbX8guyr0gh/T7gP4wKFTu65HlWy9VSqrM8P50\n onutw3Y+toRgNBO/lR8FO9dupoNCCI0f/eFwP84OfC+2u06qbXSrbmOWoFyMOWsCeNFCDIGj2BI\n WpMRSPQHkLXebOjSRFalqlH8BaoBAJ0t/GaX1N5g6uMWeu1GDQwA/pLux6M+QU3KW/Q+C8ZOMB","X-Received":"by 2002:a05:600c:871a:b0:488:c683:be89 with SMTP id\n 5b1f17b1804b1-488d67f0b8fmr60065145e9.9.1775850949623;\n Fri, 10 Apr 2026 12:55:49 -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?= , Halil Pasic ,\n Christian Borntraeger ,\n Jason Herne , Eric Farman ,\n Matthew Rosato ,\n Ilya Leoshkevich , David Hildenbrand ,\n Cornelia Huck ","Subject":"[PATCH v2 20/27] hw/s390x: Reduce 'monitor/monitor.h' inclusions","Date":"Fri, 10 Apr 2026 21:53:14 +0200","Message-ID":"<20260410195323.17937-21-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::335;\n envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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-ppc@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"We want to make the HMP commands available for all targets,\nmove the declarations to \"monitor/hmp.h\" where all other\nare, and only include the monitor headers in the source files.\n\nSigned-off-by: Philippe Mathieu-Daudé \n---\n include/hw/s390x/storage-attributes.h | 4 ----\n include/hw/s390x/storage-keys.h | 3 ---\n include/monitor/hmp.h | 5 +++++\n hw/s390x/s390-skeys.c | 2 ++\n hw/s390x/s390-stattrib.c | 2 ++\n 5 files changed, 9 insertions(+), 7 deletions(-)","diff":"diff --git a/include/hw/s390x/storage-attributes.h b/include/hw/s390x/storage-attributes.h\nindex 66716a97c05..0305873b019 100644\n--- a/include/hw/s390x/storage-attributes.h\n+++ b/include/hw/s390x/storage-attributes.h\n@@ -13,7 +13,6 @@\n #define S390_STORAGE_ATTRIBUTES_H\n \n #include \"hw/core/qdev.h\"\n-#include \"monitor/monitor.h\"\n #include \"qom/object.h\"\n \n #define TYPE_S390_STATTRIB \"s390-storage_attributes\"\n@@ -72,7 +71,4 @@ static inline Object *kvm_s390_stattrib_create(void)\n }\n #endif\n \n-void hmp_info_cmma(Monitor *mon, const QDict *qdict);\n-void hmp_migrationmode(Monitor *mon, const QDict *qdict);\n-\n #endif /* S390_STORAGE_ATTRIBUTES_H */\ndiff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-keys.h\nindex 2d02936c31c..666c05e2996 100644\n--- a/include/hw/s390x/storage-keys.h\n+++ b/include/hw/s390x/storage-keys.h\n@@ -13,7 +13,6 @@\n #define S390_STORAGE_KEYS_H\n \n #include \"hw/core/qdev.h\"\n-#include \"monitor/monitor.h\"\n #include \"qom/object.h\"\n \n #define TYPE_S390_SKEYS \"s390-skeys\"\n@@ -123,8 +122,6 @@ int s390_skeys_set(S390SKeysState *ks, uint64_t start_gfn,\n S390SKeysState *s390_get_skeys_device(void);\n \n void s390_qmp_dump_skeys(const char *filename, Error **errp);\n-void hmp_dump_skeys(Monitor *mon, const QDict *qdict);\n-void hmp_info_skeys(Monitor *mon, const QDict *qdict);\n \n #define TYPE_DUMP_SKEYS_INTERFACE \"dump-skeys-interface\"\n \ndiff --git a/include/monitor/hmp.h b/include/monitor/hmp.h\nindex b444095f684..a0a063db8e4 100644\n--- a/include/monitor/hmp.h\n+++ b/include/monitor/hmp.h\n@@ -182,4 +182,9 @@ void hmp_gva2gpa(Monitor *mon, const QDict *qdict);\n void hmp_gpa2hva(Monitor *mon, const QDict *qdict);\n void hmp_gpa2hpa(Monitor *mon, const QDict *qdict);\n \n+void hmp_dump_skeys(Monitor *mon, const QDict *qdict);\n+void hmp_info_skeys(Monitor *mon, const QDict *qdict);\n+void hmp_info_cmma(Monitor *mon, const QDict *qdict);\n+void hmp_migrationmode(Monitor *mon, const QDict *qdict);\n+\n #endif\ndiff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c\nindex d974d97b5e7..7dca67d6618 100644\n--- a/hw/s390x/s390-skeys.c\n+++ b/hw/s390x/s390-skeys.c\n@@ -24,6 +24,8 @@\n #include \"system/kvm.h\"\n #include \"migration/qemu-file-types.h\"\n #include \"migration/register.h\"\n+#include \"monitor/hmp.h\"\n+#include \"monitor/monitor.h\"\n #include \"trace.h\"\n \n #define S390_SKEYS_BUFFER_SIZE (128 * KiB) /* Room for 128k storage keys */\ndiff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c\nindex 2e83aa211cd..74b23b0a995 100644\n--- a/hw/s390x/s390-stattrib.c\n+++ b/hw/s390x/s390-stattrib.c\n@@ -15,6 +15,8 @@\n #include \"system/ram_addr.h\"\n #include \"migration/qemu-file.h\"\n #include \"migration/register.h\"\n+#include \"monitor/hmp.h\"\n+#include \"monitor/monitor.h\"\n #include \"hw/core/qdev-properties.h\"\n #include \"hw/s390x/storage-attributes.h\"\n #include \"qemu/error-report.h\"\n","prefixes":["v2","20/27"]}