From: Gerd Hoffmann <kraxel@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, "David Hildenbrand" <david@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Cornelia Huck" <cohuck@redhat.com>, "Peter Lieven" <pl@kamp.de>,
qemu-devel@nongnu.org, "Max Reitz" <mreitz@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
"Ronnie Sahlberg" <ronniesahlberg@gmail.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Samuel Thibault" <samuel.thibault@ens-lyon.org>
Subject: Re: [PATCH v3 02/24] modules: collect module meta-data
Date: Mon, 21 Jun 2021 14:52:34 +0200 [thread overview]
Message-ID: <20210621125234.v5a2g3o2fft5nkcg@sirius.home.kraxel.org> (raw)
In-Reply-To: <919b1ff3-914b-a9a2-781f-d8ae244d71cf@redhat.com>
On Fri, Jun 18, 2021 at 06:09:55PM +0200, Paolo Bonzini wrote:
> On 18/06/21 06:53, Gerd Hoffmann wrote:
> > +def find_command(src, target, compile_commands):
> > + for command in compile_commands:
> > + if command['file'] != src:
> > + continue
> > + if target != '' and command['command'].find(target) == -1:
> > + continue
>
>
> Did you look into using extract_objects for this instead of looking for the
> target (which works, but yuck :))?
ninja: error: 'libui-curses.a.p/meson-generated_.._config-host.h.o', needed by 'ui-curses.modinfo.test', missing and no known rule to make it
Hmm, not sure where this comes from. meson doesn't try to link
config-host.h.o into libui-curses.a, so why does extract_all_objects()
return it?
Test patch (incremental to this series) below.
take care,
Gerd
From 5453683429d7b08b959e2cd63ee00fdccfb0c7b7 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 21 Jun 2021 14:45:14 +0200
Subject: [PATCH] [wip] extract_all_objects experiments
---
meson.build | 7 +++++++
scripts/modinfo-test.sh | 8 ++++++++
2 files changed, 15 insertions(+)
create mode 100755 scripts/modinfo-test.sh
diff --git a/meson.build b/meson.build
index 03bacca7cddb..8e7ccccf176c 100644
--- a/meson.build
+++ b/meson.build
@@ -2042,6 +2042,7 @@ target_modules += { 'accel' : { 'qtest': qtest_module_ss,
modinfo_collect = find_program('scripts/modinfo-collect.py')
modinfo_generate = find_program('scripts/modinfo-generate.py')
+modinfo_test = find_program('scripts/modinfo-test.sh')
modinfo_files = []
block_mods = []
@@ -2063,6 +2064,12 @@ foreach d, list : modules
input: module_ss.sources(),
capture: true,
command: [modinfo_collect, '@INPUT@'])
+ custom_target(d + '-' + m + '.modinfo.test',
+ output: d + '-' + m + '.modinfo.test',
+ input: sl.extract_all_objects(recursive: true),
+ capture: true,
+ build_by_default: true, # to be removed when added to a target
+ command: [modinfo_test, '@INPUT@'])
endif
else
if d == 'block'
diff --git a/scripts/modinfo-test.sh b/scripts/modinfo-test.sh
new file mode 100755
index 000000000000..979c9cc9aeef
--- /dev/null
+++ b/scripts/modinfo-test.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+if test "$1" = "--target"; then
+ echo "# target $2"
+ shift;shift
+fi
+for item in "$@"; do
+ echo "# input $item"
+done
--
2.31.1
next prev parent reply other threads:[~2021-06-21 12:58 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 4:53 [PATCH v3 00/24] modules: add meta-data database Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 01/24] modules: add modinfo macros Gerd Hoffmann
2021-06-18 17:46 ` Paolo Bonzini
2021-06-18 4:53 ` [PATCH v3 02/24] modules: collect module meta-data Gerd Hoffmann
2021-06-18 16:09 ` Paolo Bonzini
2021-06-21 12:52 ` Gerd Hoffmann [this message]
2021-06-18 4:53 ` [PATCH v3 03/24] modules: generate modinfo.c Gerd Hoffmann
2021-06-22 18:19 ` Jose R. Ziviani
2021-06-22 20:43 ` Jose R. Ziviani
2021-06-18 4:53 ` [PATCH v3 04/24] modules: add qxl module annotations Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 05/24] modules: add virtio-gpu " Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 06/24] modules: add chardev " Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 07/24] modules: add audio " Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 08/24] modules: add usb-redir " Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 09/24] modules: add ccid " Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 10/24] modules: add ui " Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 11/24] modules: add s390x " Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 12/24] modules: add block " Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 13/24] modules: use modinfo for dependencies Gerd Hoffmann
2021-06-18 17:48 ` Paolo Bonzini
2021-06-18 4:53 ` [PATCH v3 14/24] modules: use modinfo for qom load Gerd Hoffmann
2021-06-18 17:49 ` Paolo Bonzini
2021-06-18 4:53 ` [PATCH v3 15/24] modules: use modinfo for qemu opts load Gerd Hoffmann
2021-06-18 17:50 ` Paolo Bonzini
2021-06-18 4:53 ` [PATCH v3 16/24] modules: add tracepoints Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 17/24] modules: check arch and block load on mismatch Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 18/24] modules: check arch on qom lookup Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 19/24] modules: target-specific module build infrastructure Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 20/24] accel: autoload modules Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 21/24] accel: add qtest module annotations Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 22/24] accel: build qtest modular Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 23/24] accel: add tcg module annotations Gerd Hoffmann
2021-06-18 4:53 ` [PATCH v3 24/24] accel: build tcg modular Gerd Hoffmann
-- strict thread matches above, loose matches on Subject: below --
2021-06-22 16:03 [PATCH v3 02/24] modules: collect module meta-data Paolo Bonzini
2021-06-23 7:36 ` Gerd Hoffmann
2021-06-24 5:33 ` Paolo Bonzini
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=20210621125234.v5a2g3o2fft5nkcg@sirius.home.kraxel.org \
--to=kraxel@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=crosa@redhat.com \
--cc=david@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=ronniesahlberg@gmail.com \
--cc=samuel.thibault@ens-lyon.org \
--cc=thuth@redhat.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).