qemu-rust.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Daniel Henrique Barboza" <danielhb413@gmail.com>,
	"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
	"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
	"Halil Pasic" <pasic@linux.ibm.com>,
	"Christian Borntraeger" <borntraeger@linux.ibm.com>,
	qemu-ppc@nongnu.org,
	"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
	"Alexandre Iooss" <erdnaxe@crans.org>,
	qemu-riscv@nongnu.org, "Thomas Huth" <huth@tuxfamily.org>,
	"Bernhard Beschow" <shentey@gmail.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Eric Farman" <farman@linux.ibm.com>,
	"Bin Meng" <bmeng.cn@gmail.com>,
	qemu-s390x@nongnu.org,
	"Niek Linnenbank" <nieklinnenbank@gmail.com>,
	qemu-arm@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
	"John Snow" <jsnow@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Cleber Rosa" <crosa@redhat.com>,
	qemu-rust@nongnu.org, "Nicholas Piggin" <npiggin@gmail.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Palmer Dabbelt" <palmer@dabbelt.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Weiwei Li" <liwei1518@gmail.com>,
	"Mahmoud Mandour" <ma.mandourr@gmail.com>,
	"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
	"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
	"Aurelien Jarno" <aurelien@aurel32.net>,
	"Ani Sinha" <anisinha@redhat.com>,
	"Alistair Francis" <alistair.francis@wdc.com>
Subject: [PATCH 36/39] plugins: detect qemu plugin API symbols from header
Date: Thu, 21 Nov 2024 16:58:03 +0000	[thread overview]
Message-ID: <20241121165806.476008-37-alex.bennee@linaro.org> (raw)
In-Reply-To: <20241121165806.476008-1-alex.bennee@linaro.org>

From: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Instead of using a static file (error prone and hard to keep in sync),
we generate it using a script.

Note: if a symbol is not exported, we'll now notice it when linking for
Windows/MacOS platforms.

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20241112212622.3590693-3-pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 MAINTAINERS                    |  1 +
 plugins/meson.build            | 12 ++++++---
 scripts/qemu-plugin-symbols.py | 45 ++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100755 scripts/qemu-plugin-symbols.py

diff --git a/MAINTAINERS b/MAINTAINERS
index eb7149bf1a..2b1c4abed6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3752,6 +3752,7 @@ F: plugins/
 F: tests/tcg/plugins/
 F: tests/functional/test_aarch64_tcg_plugins.py
 F: contrib/plugins/
+F: scripts/qemu-plugin-symbols.py
 
 AArch64 TCG target
 M: Richard Henderson <richard.henderson@linaro.org>
diff --git a/plugins/meson.build b/plugins/meson.build
index 1cc039d29b..98542e926f 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -2,17 +2,23 @@ if not get_option('plugins')
   subdir_done()
 endif
 
+qemu_plugin_symbols = configure_file(
+  input: files('../include/qemu/qemu-plugin.h'),
+  output: 'qemu-plugin.symbols',
+  capture: true,
+  command: [files('../scripts/qemu-plugin-symbols.py'), '@INPUT@'])
+
 # Modules need more symbols than just those in plugins/qemu-plugins.symbols
 if not enable_modules
   if host_os == 'darwin'
     configure_file(
-      input: files('qemu-plugins.symbols'),
+      input: qemu_plugin_symbols,
       output: 'qemu-plugins-ld64.symbols',
       capture: true,
       command: ['sed', '-ne', 's/^[[:space:]]*\\(qemu_.*\\);/_\\1/p', '@INPUT@'])
     emulator_link_args += ['-Wl,-exported_symbols_list,plugins/qemu-plugins-ld64.symbols']
   else
-    emulator_link_args += ['-Xlinker', '--dynamic-list=' + (meson.project_source_root() / 'plugins/qemu-plugins.symbols')]
+    emulator_link_args += ['-Xlinker', '--dynamic-list=' + qemu_plugin_symbols.full_path()]
   endif
 endif
 
@@ -23,7 +29,7 @@ if host_os == 'windows'
   # First, create a .def file listing all the symbols a plugin should expect to have
   # available in qemu
   win32_plugin_def = configure_file(
-    input: files('qemu-plugins.symbols'),
+    input: qemu_plugin_symbols,
     output: 'qemu_plugin_api.def',
     capture: true,
     command: ['sed', '-e', '0,/^/s//EXPORTS/; s/[{};]//g', '@INPUT@'])
diff --git a/scripts/qemu-plugin-symbols.py b/scripts/qemu-plugin-symbols.py
new file mode 100755
index 0000000000..e285ebb8f9
--- /dev/null
+++ b/scripts/qemu-plugin-symbols.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Extract QEMU Plugin API symbols from a header file
+#
+# Copyright 2024 Linaro Ltd
+#
+# Author: Pierrick Bouvier <pierrick.bouvier@linaro.org>
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or later.
+# See the COPYING file in the top-level directory.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+import argparse
+import re
+
+def extract_symbols(plugin_header):
+    with open(plugin_header) as file:
+        content = file.read()
+    # Remove QEMU_PLUGIN_API macro definition.
+    content = content.replace('#define QEMU_PLUGIN_API', '')
+    expected = content.count('QEMU_PLUGIN_API')
+    # Find last word between QEMU_PLUGIN_API and (, matching on several lines.
+    # We use *? non-greedy quantifier.
+    syms = re.findall(r'QEMU_PLUGIN_API.*?(\w+)\s*\(', content, re.DOTALL)
+    syms.sort()
+    # Ensure we found as many symbols as API markers.
+    assert len(syms) == expected
+    return syms
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description='Extract QEMU plugin symbols')
+    parser.add_argument('plugin_header', help='Path to QEMU plugin header.')
+    args = parser.parse_args()
+
+    syms = extract_symbols(args.plugin_header)
+
+    print('{')
+    for s in syms:
+        print("  {};".format(s))
+    print('};')
+
+if __name__ == '__main__':
+    main()
-- 
2.39.5



  parent reply	other threads:[~2024-11-21 16:59 UTC|newest]

Thread overview: 78+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-21 16:57 [PATCH 00/39] maintainer updates for -rc2 pre-PR Alex Bennée
2024-11-21 16:57 ` [PATCH 01/39] tests/functional: fix mips64el test to honour workdir Alex Bennée
2024-11-21 16:57 ` [PATCH 02/39] tests/functional: automatically clean up scratch files after tests Alex Bennée
2024-11-21 16:57 ` [PATCH 03/39] tests/functional: remove "AVOCADO" from env variable name Alex Bennée
2024-11-21 16:57 ` [PATCH 04/39] tests/functional: remove todo wrt avocado.utils.wait_for Alex Bennée
2024-11-21 16:57 ` [PATCH 05/39] tests/functional: remove leftover :avocado: tags Alex Bennée
2024-11-21 16:57 ` [PATCH 06/39] tests/functional: remove obsolete reference to avocado bug Alex Bennée
2024-11-21 16:57 ` [PATCH 07/39] tests/functional: remove comments talking about avocado Alex Bennée
2024-11-21 19:03   ` Pierrick Bouvier
2024-11-21 16:57 ` [PATCH 08/39] tests/functional: honour self.workdir in ACPI bits tests Alex Bennée
2024-11-21 16:57 ` [PATCH 09/39] tests/functional: put QEMUMachine logs in testcase log directory Alex Bennée
2024-11-21 16:57 ` [PATCH 10/39] tests/functional: honour requested test VM name in QEMUMachine Alex Bennée
2024-11-21 16:57 ` [PATCH 11/39] tests/functional: enable debug logging for QEMUMachine Alex Bennée
2024-11-21 19:02   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 12/39] tests/functional: logs details of console interaction operations Alex Bennée
2024-11-21 19:03   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 13/39] tests/functional: don't try to wait for the empty string Alex Bennée
2024-11-21 19:04   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 14/39] tests/functional: require non-NULL success_message for console wait Alex Bennée
2024-11-21 19:24   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 15/39] tests/functional: rewrite console handling to be bytewise Alex Bennée
2024-11-21 16:57 ` [PATCH 16/39] tests/functional: remove time.sleep usage from tuxrun tests Alex Bennée
2024-11-21 19:39   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 17/39] tests/functional: add a QMP backdoor for debugging stalled tests Alex Bennée
2024-11-21 19:41   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 18/39] tests/functional: avoid accessing log_filename on earlier failures Alex Bennée
2024-11-22 10:19   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 19/39] tests/functional: Convert the Avocado aarch64 tuxrun tests Alex Bennée
2024-11-21 16:57 ` [PATCH 20/39] tests/functional: update the arm " Alex Bennée
2024-11-22 10:22   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 21/39] tests/functional: update the aarch64 " Alex Bennée
2024-11-21 19:08   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 22/39] tests/functional: update the i386 " Alex Bennée
2024-11-22 11:17   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 23/39] tests/functional: add a m68k " Alex Bennée
2024-11-21 19:07   ` Thomas Huth
2024-11-22 10:16   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 24/39] tests/functional: update the mips32 " Alex Bennée
2024-11-22 10:08   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 25/39] tests/functional: update the mips32el " Alex Bennée
2024-11-22 10:09   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 26/39] tests/functional: update the mips64 " Alex Bennée
2024-11-22 10:09   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 27/39] tests/functional: update the mips64el " Alex Bennée
2024-11-22 10:11   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 28/39] tests/functional: update the ppc32 " Alex Bennée
2024-11-22 10:42   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 29/39] tests/functional: update the ppc64 " Alex Bennée
2024-11-22  9:52   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 30/39] tests/functional: update the riscv32 " Alex Bennée
2024-11-22 10:58   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 31/39] tests/functional: update the riscv64 " Alex Bennée
2024-11-22 11:02   ` Thomas Huth
2024-11-21 16:57 ` [PATCH 32/39] tests/functional: update the s390x " Alex Bennée
2024-11-22 11:00   ` Thomas Huth
2024-11-21 16:58 ` [PATCH 33/39] tests/functional: update the sparc64 " Alex Bennée
2024-11-22 11:02   ` Thomas Huth
2024-11-21 16:58 ` [PATCH 34/39] tests/functional: update the x86_64 " Alex Bennée
2024-11-22 11:15   ` Thomas Huth
2024-11-21 16:58 ` [PATCH 35/39] plugins: add missing export for qemu_plugin_num_vcpus Alex Bennée
2024-11-21 16:58 ` Alex Bennée [this message]
2024-11-21 16:58 ` [PATCH 37/39] plugins: eradicate qemu-plugins.symbols static file Alex Bennée
2024-11-21 16:58 ` [PATCH 38/39] rust/pl011: Fix range checks for device ID accesses Alex Bennée
2024-11-21 16:58 ` [PATCH 39/39] docs: explicitly permit a "commonly known identity" with SoB Alex Bennée
2024-11-26  4:55   ` Ani Sinha
2024-11-26 21:27   ` Michael S. Tsirkin
2024-11-21 17:19 ` [PATCH 00/39] maintainer updates for -rc2 pre-PR Peter Maydell
2024-11-21 17:31   ` Alex Bennée
2024-11-22 10:45     ` Thomas Huth
2024-11-23 15:29       ` Alex Bennée
2024-11-21 19:03 ` Cédric Le Goater
2024-11-21 19:10   ` Thomas Huth
2024-11-21 21:46     ` Cédric Le Goater
2024-11-22 10:47       ` Thomas Huth
2024-11-22 11:59         ` Cédric Le Goater
2024-11-22 12:32           ` Thomas Huth
2024-11-22 13:03             ` Cédric Le Goater
2024-11-22 10:14 ` Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241121165806.476008-37-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=alistair.francis@wdc.com \
    --cc=anisinha@redhat.com \
    --cc=armbru@redhat.com \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=bmeng.cn@gmail.com \
    --cc=borntraeger@linux.ibm.com \
    --cc=crosa@redhat.com \
    --cc=danielhb413@gmail.com \
    --cc=dbarboza@ventanamicro.com \
    --cc=erdnaxe@crans.org \
    --cc=farman@linux.ibm.com \
    --cc=harshpb@linux.ibm.com \
    --cc=huth@tuxfamily.org \
    --cc=jiaxun.yang@flygoat.com \
    --cc=jsnow@redhat.com \
    --cc=liwei1518@gmail.com \
    --cc=ma.mandourr@gmail.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mark.cave-ayland@ilande.co.uk \
    --cc=mst@redhat.com \
    --cc=nieklinnenbank@gmail.com \
    --cc=npiggin@gmail.com \
    --cc=palmer@dabbelt.com \
    --cc=pasic@linux.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=pierrick.bouvier@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    --cc=qemu-rust@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=shentey@gmail.com \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    --cc=zhiwei_liu@linux.alibaba.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).