{"id":2222884,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222884/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260414003001.97571-9-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-9-philmd@linaro.org>","date":"2026-04-14T00:29:40","name":"[v3,08/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-devel/patch/20260414003001.97571-9-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/2222884/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222884/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=Q6MhdpYx;\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 4fvlZf5c6zz1yCv\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 14 Apr 2026 10:31:38 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wCRgS-0001pp-9T; Mon, 13 Apr 2026 20:31:16 -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 <philmd@linaro.org>) id 1wCRgK-0001fQ-R4\n for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:10 -0400","from mail-wm1-x330.google.com ([2a00:1450:4864:20::330])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1wCRgI-0003B5-8q\n for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:07 -0400","by mail-wm1-x330.google.com with SMTP id\n 5b1f17b1804b1-488e1a8ac40so34952325e9.2\n for <qemu-devel@nongnu.org>; Mon, 13 Apr 2026 17:31:05 -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-488d68479b2sm105283705e9.25.2026.04.13.17.31.02\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Mon, 13 Apr 2026 17:31:02 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1776126663; x=1776731463; 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=iqT5An8t/Rup8MOLjBq+qy6AZymRqDsPAbrkKupI24o=;\n b=Q6MhdpYxb4x1S+qHUdXHuDdMr6C06GtAMCXyHk3WE0ik4NlGKlt579ARBDvNbcD0BO\n 8kAmsNP6/mrupJlM/g4/U4j87iZsypmSz5xwX1lJfMZ74gOeXlZ+UbJYdt0Q+phsjur9\n BftCAekaimrNpL+b+TJY4yTD+ks7nARSLwOGfzm09MSsX3Y7YfrKfnneZGZrpBgfxTg+\n XTixRiN5SLa4oA5WCdBAVfXX7CqPHPU2RhC0XHHMp5G8vozBymqsVgjSZLNObvQ80wFf\n djZqB7xS1dotd7l+C/NVyoVX8Sv10AcUP7i5NmQrfR8FJthHdRZi9sfqvotumZ3sDshi\n WBxA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776126663; x=1776731463;\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=iqT5An8t/Rup8MOLjBq+qy6AZymRqDsPAbrkKupI24o=;\n b=Ze1oj6TYGeI4geh0a8NTg8iGu2LDsLSS5Cq1PtvyvUWskFuLU3TqcNGfohe7X9JwKv\n KALsGuqr1epp4yTqIhegrY+SykW6kT8ugFaU4Q4cFvYI/EfsxF3+guZG2BSF/H66FbRM\n +EmGWfgZAzyVDKfEgZi3TBNAIGGowPIu+6mwqjHBm1YNztCMLbyC3qC6bRXBxErOKw8k\n ixpCa9+H+0pmWytJ3dt1itAePLLYGMb+FeCy849nhpjZCpD9dQrJAyVo1fQoAWN67V8o\n GAyIknc9Wc9Vy2Y/ql832cncE4LoVGVgvvbTHpzwXH4X9XqeYVBZf8AFqnHpkecSC3dt\n +cTA==","X-Gm-Message-State":"AOJu0Yycr0MCgw3nQs7OLlcr+bKcOXQ/+xank0sfTz5NHEvEr3e1FT+b\n HVTGYRB4lGORZMkQ9GrbOVtwbBsSGLWUfYp2BzcmHDbcCKsgPtWjk9Nc/UIT5plThKHDixalu+p\n gOXbvdR0=","X-Gm-Gg":"AeBDiesEq4V2McfrTc9x/GRROkx3abNC5K8RbQdSIPCt7d2KYSKmKzAZmOh/ZjyGpqP\n d0T8cu05lFB5J83eXPDxtKwSsCLVUQlA7ANExh5l+Z4xys49Xztn6iJM70MicM4X9TJl3/Zg2B0\n KdHCiZPKaCh1PVmGbmIaQboTxIHzTKzXFomGa8Es89ZcRzA44Ah9PX/8XJkgQmBqxiAE+1Ipjm4\n D9ETi7P5jyZO51VyOl1Yjc3Dul4YzF8DuUOi60fOHkJOLrfUGP9faxUsyneP7H9RdRIN5eEBDz4\n wEYpj0jPgPWQefZqqz8P4ma6wtDBFqi+XtAxJr0dgBzWAlIBDk0OTCO6QsIjgSTL4hC8uuPoNWb\n xxV/1fyXFTcdHiwBVd+zS6XzPHxm011yWRCBS8KPDgOVHPNi36EiS+Uzt0TnByGl+TU4VbNskV+\n 9gEwTODpJrciuptZYEhhwDAkAYnJ7qZmx+gVjqmO1A9hDkwyISObgdhwOGr1gQlCLVgXKrEUo8","X-Received":"by 2002:a05:600c:43d5:b0:488:d8b6:abda with SMTP id\n 5b1f17b1804b1-488d8b6acdfmr118139995e9.19.1776126663425;\n Mon, 13 Apr 2026 17:31:03 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>","To":"qemu-devel@nongnu.org","Cc":"Pierrick Bouvier <pierrick.bouvier@linaro.org>,\n Markus Armbruster <armbru@redhat.com>,\n Richard Henderson <richard.henderson@linaro.org>,\n \"Dr. David Alan Gilbert\" <dave@treblig.org>,\n Paolo Bonzini <pbonzini@redhat.com>,\n =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>,\n Cornelia Huck <cohuck@redhat.com>, Halil Pasic <pasic@linux.ibm.com>,\n Christian Borntraeger <borntraeger@linux.ibm.com>,\n Jason Herne <jjherne@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>,\n Matthew Rosato <mjrosato@linux.ibm.com>,\n Ilya Leoshkevich <iii@linux.ibm.com>, David Hildenbrand <david@kernel.org>,\n qemu-s390x@nongnu.org","Subject":"[PATCH v3 08/27] hw/s390x: Reduce 'monitor/monitor.h' inclusions","Date":"Tue, 14 Apr 2026 02:29:40 +0200","Message-ID":"<20260414003001.97571-9-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::330;\n envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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 <qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-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é <philmd@linaro.org>\nReviewed-by: Richard Henderson <richard.henderson@linaro.org>\nAcked-by: Cornelia Huck <cohuck@redhat.com>\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 9c2330205fc..d694bfdf768 100644\n--- a/include/monitor/hmp.h\n+++ b/include/monitor/hmp.h\n@@ -173,4 +173,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":["v3","08/27"]}