From nobody Thu Jan 8 13:32:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1767390546; cv=none; d=zohomail.com; s=zohoarc; b=YSTU1xES90VKAyO9inANorF6//GpserYP1LjYvJrqPDOvYD777K+Uc9Ykyn4mlobJs1zqE+2NQu3Sl/QIGeK5ZMr2WIyOjBXRIjQmrBScZcMOfC9Kk0NjFvNyKpMjh4SEVCvfV3y8nBv9nNYdygrD1UddzrRiEKbHrjow3/ZyPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767390546; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=R4hbow1zviH+bWh7+b+fqV3JFTVXLR9m8ieoHmc4Fac=; b=Nn0TPc8EnhxtVDqlD0H25V5g7z5HpKl+6u1PJOssCR1d2fWn7ANEj2tL+9LBjjEUghhC6HQCF12XLPiMuyvSzrpjQxaAlvuLffwTnH3MNOYE/el0Jr+h1Ez8mf06coamw8tYBkmJMbFRP9BwzjlRSPiYWDAUGbCRAgcVjEZVv4A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767390546654483.58606758690496; Fri, 2 Jan 2026 13:49:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vbn0T-0006kc-Uw; Fri, 02 Jan 2026 16:48:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vbmzi-0006fx-WF for qemu-devel@nongnu.org; Fri, 02 Jan 2026 16:47:44 -0500 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vbmzh-0000Jl-73 for qemu-devel@nongnu.org; Fri, 02 Jan 2026 16:47:38 -0500 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-7b8eff36e3bso19488045b3a.2 for ; Fri, 02 Jan 2026 13:47:36 -0800 (PST) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34f476f8f3fsm62925a91.5.2026.01.02.13.47.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jan 2026 13:47:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1767390456; x=1767995256; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R4hbow1zviH+bWh7+b+fqV3JFTVXLR9m8ieoHmc4Fac=; b=SWOPPREGfOYuf+GDEfsIqIZyeHHicIPqjFAkHTbmaGdF1u3scP6RU5yFqC8NoQaeXK Z33obRO+oidCPP3M7Uajhv0BLbHmw/+55TyC3ayk8O+0il1N2m1Y39K7odKLJ8Z9ZGrb 462RzuWNlAxVrk9RhIeg+FiS0b10qH2ntKIR1miTsB3lCIxVDUSGYb6Qw2gMwYY1Aqxp OKZaS12xl7qHBUDh9I4TDPagMEfHWi3ZNWZ44VkoUZsBK8zevzKp17tm4l+eTD8BeUpm oliCjHy8zMqIZnNSpufZAzo4Pho+1Nro80cCVktOhnPFpM6hwjoM/+JvHY3XcjqSnEI8 5IJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767390456; x=1767995256; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=R4hbow1zviH+bWh7+b+fqV3JFTVXLR9m8ieoHmc4Fac=; b=vFudyOaZrXgCePtfPzttvtiAh0HSrXhOy9YRh6ai0O3ciaQ18TfbZicFlwTEq+lKJT gh1XQtsfGF8ioAVPh9P82zktV6k0GZFv8g3nDRyS1BxvTqWyLafblayMJ9YH/MZJ56NB bCuZzB2Ll6Tvwcbba03MSYoPBJOuHdwKMnYfI/W+ulR5EUNcZxRnIJo4KLVKLIOA05xw 83rdAyOhMxaWfUcFFTtKkqhUxr263DvqxDrj4hNLl6Stq5v6xXvjYE97li9GiVMIoI/3 z2rU8SNdn1rxF6wUBMqTw5mair3uGpn+7sQwubP1jO5mOgHEgKbu1Wha2q1y/fQN4Vn2 KDzA== X-Gm-Message-State: AOJu0Yzyic3VmbVrgTDd3VLMsUg4uHguQTpwirOBpqzaYkTxAb0WDw68 o3y8/wgyxocbNxvAUFJUvbWkwM2rwaI2DbkfLpRUgg478tT8bEVmoxbpCdRSeZbHq8DqtLp5CVz hOENb X-Gm-Gg: AY/fxX6FezT+uJj4At4PjoZhF87IHlv2+PIwM2thvrakLm9pRSGQvEBr6V3FEsiZ/Dj TQRx47QESnmB6/+eeBkeZUBSz2+12eXd10unyLQ6dpaHoyh6m4lXMgXrV+TEaTt21i22RsBw99k NffI8OpKy34xwXYwUHYz/PK6XJHjKde+qzkagQIUva2Q/ZFF+Jn0hf64dsIo1RYweTvoUMzk1Fx yJ+zzlAWUd6ooB4abf6kYL/SVYiNvBwlFwsyaIoJ37DN4LJMXhv1ZEmGJGkvkZFpQjbCEEpxDMb I4t/RvZ6f6KZmjrrb9nZPCXWc6BjQwF4bh8cLoNQ/e8uatK3eCua+meChV9gsJ5hazHpnCvIkha V8PrOBHgr2cv2nuLPje0KLT0o35DP+myJWDGDR0zPS7w/s9agkNAJfmkvI+3o/gnUxEheVLOGWm Yo1Km2QdmjvD5TXzkSqMYUAoqZW4eM8RIJzk9x2owwb3gwJ7HTHQxgT1jga+EAXU4y X-Google-Smtp-Source: AGHT+IF6j2aZSgO3xM2T6ObR+O8IFpLYaekMMtl3lPyIKyrtc9cO3VfyhcMs0ji49NPvmqxNQkJPaA== X-Received: by 2002:a05:6a20:3d89:b0:34f:ec32:6a3c with SMTP id adf61e73a8af0-376a8cbe9d0mr43275220637.28.1767390455557; Fri, 02 Jan 2026 13:47:35 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Gustavo Bueno Romero , Richard Henderson , =?UTF-8?q?Phil=20Mathieu-Daud=C3=A9?= , Manos Pitsidianakis , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Pierrick Bouvier Subject: [PATCH v2 06/11] plugins: move qemu-plugin.h to include/plugins/ Date: Fri, 2 Jan 2026 13:47:19 -0800 Message-ID: <20260102214724.4128196-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260102214724.4128196-1-pierrick.bouvier@linaro.org> References: <20260102214724.4128196-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x42e.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1767390548507158500 Content-Type: text/plain; charset="utf-8" This change has two benefits: - ensure plugins can't include anything else from QEMU than plugins API - when compiling a C++ module, solves the header conflict with iostream header that includes transitively the wrong ctype.h, which already exists in include/qemu. By Hyrum's law, there was already one usage of other headers with mem plugin, which has been eliminated in previous commit. Signed-off-by: Pierrick Bouvier Reviewed-by: Manos Pitsidianakis Reviewed-by: Richard Henderson --- docs/devel/tcg-plugins.rst | 4 ++-- meson.build | 2 +- include/{qemu =3D> plugins}/qemu-plugin.h | 3 --- include/qemu/plugin.h | 2 +- plugins/core.c | 2 +- plugins/meson.build | 6 +++--- scripts/clean-includes | 2 +- 7 files changed, 9 insertions(+), 12 deletions(-) rename include/{qemu =3D> plugins}/qemu-plugin.h (99%) diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index 9463692c411..f48c32bd844 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -166,7 +166,7 @@ Plugin API =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The following API is generated from the inline documentation in -``include/qemu/qemu-plugin.h``. Please ensure any updates to the API +``include/plugins/qemu-plugin.h``. Please ensure any updates to the API include the full kernel-doc annotations. =20 -.. kernel-doc:: include/qemu/qemu-plugin.h +.. kernel-doc:: include/plugins/qemu-plugin.h diff --git a/meson.build b/meson.build index 3d6c6c702d0..a8fd8e88225 100644 --- a/meson.build +++ b/meson.build @@ -4495,7 +4495,7 @@ endforeach # Other build targets =20 if get_option('plugins') - install_headers('include/qemu/qemu-plugin.h') + install_headers('include/plugins/qemu-plugin.h') if host_os =3D=3D 'windows' # On windows, we want to deliver the qemu_plugin_api.lib file in the q= emu installer, # so that plugin authors can compile against it. diff --git a/include/qemu/qemu-plugin.h b/include/plugins/qemu-plugin.h similarity index 99% rename from include/qemu/qemu-plugin.h rename to include/plugins/qemu-plugin.h index e44f863d839..78872716246 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/plugins/qemu-plugin.h @@ -2,9 +2,6 @@ * Copyright (C) 2017, Emilio G. Cota * Copyright (C) 2019, Linaro * - * License: GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * * SPDX-License-Identifier: GPL-2.0-or-later */ =20 diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index cea0a68858b..cdd4f68c0c1 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -8,7 +8,7 @@ #define QEMU_PLUGIN_H =20 #include "qemu/config-file.h" -#include "qemu/qemu-plugin.h" +#include "plugins/qemu-plugin.h" #include "qemu/error-report.h" #include "qemu/queue.h" #include "qemu/option.h" diff --git a/plugins/core.c b/plugins/core.c index b4b783008f7..3f66533d749 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -15,7 +15,7 @@ #include "qemu/lockable.h" #include "qemu/option.h" #include "qemu/plugin.h" -#include "qemu/qemu-plugin.h" +#include "plugins/qemu-plugin.h" #include "qemu/queue.h" #include "qemu/rcu_queue.h" #include "qemu/rcu.h" diff --git a/plugins/meson.build b/plugins/meson.build index 4318e3a1671..34643e2cea3 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -3,7 +3,7 @@ if not get_option('plugins') endif =20 qemu_plugin_symbols =3D configure_file( - input: files('../include/qemu/qemu-plugin.h'), + input: files('../include/plugins/qemu-plugin.h'), output: 'qemu-plugin.symbols', capture: true, command: [files('../scripts/qemu-plugin-symbols.py'), '@INPUT@']) @@ -62,12 +62,12 @@ endif =20 if host_os =3D=3D 'windows' plugins_deps =3D declare_dependency(sources: [files('win32_linker.c')], - include_directories: '../include/qemu', + include_directories: '../include/plugi= ns', link_with: win32_qemu_plugin_api_lib, link_args: win32_qemu_plugin_api_link_= flags, dependencies: glib) else - plugins_deps =3D declare_dependency(include_directories: '../include/qem= u', + plugins_deps =3D declare_dependency(include_directories: '../include/plu= gins', dependencies: glib) endif =20 diff --git a/scripts/clean-includes b/scripts/clean-includes index 25dbf16c021..3fae8e00e67 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -128,7 +128,7 @@ for f in "$@"; do ;; *include/qemu/osdep.h | \ *include/qemu/compiler.h | \ - *include/qemu/qemu-plugin.h | \ + *include/plugins/qemu-plugin.h | \ *include/glib-compat.h | \ *include/system/os-posix.h | \ *include/system/os-win32.h | \ --=20 2.47.3