From: "Philippe Mathieu-Daudé via" <qemu-devel@nongnu.org>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH 4/4] qapi/meson: Restrict machine-specific objects to sysemu
Date: Fri, 4 Feb 2022 16:29:24 +0100 [thread overview]
Message-ID: <20220204152924.6253-5-f4bug@amsat.org> (raw)
In-Reply-To: <20220204152924.6253-1-f4bug@amsat.org>
machine/ and net/ are only useful to machines;
block/ and migration/ to machine or tools.
Note we need to keep building machine.json generated sources
on all targets because some want to access X86CPUFeatureWordInfo
from any architecture ¯\_(ツ)_/¯ Otherwise we get on all but
x86 targets:
/usr/bin/ld: libqemu-i386-linux-user.fa.p/target_i386_cpu.c.o: in function `x86_cpu_get_feature_words':
../target/i386/cpu.c:4587: undefined reference to `visit_type_X86CPUFeatureWordInfoList'
collect2: error: ld returned 1 exit status
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
qapi/meson.build | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/qapi/meson.build b/qapi/meson.build
index 656ef0e039..38b01f3083 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -23,10 +23,6 @@ endif
qapi_all_modules = [
'authz',
- 'block',
- 'block-core',
- 'block-export',
- 'char',
'common',
'compat',
'control',
@@ -35,26 +31,23 @@ qapi_all_modules = [
'error',
'introspect',
'job',
- 'machine',
- 'machine-target',
+ 'machine', # x86 is considered multiarch by some
'migration',
'misc',
'misc-target',
- 'net',
'pragma',
- 'qom',
'replay',
'run-state',
'sockets',
'trace',
- 'transaction',
- 'yank',
]
if have_system
qapi_all_modules += [
'acpi',
'audio',
'qdev',
+ 'machine-target',
+ 'net',
'pci',
'rdma',
'rocker',
@@ -63,7 +56,14 @@ if have_system
endif
if have_system or have_tools
qapi_all_modules += [
+ 'block',
+ 'block-core',
+ 'block-export',
+ 'char',
+ 'qom',
'ui',
+ 'transaction',
+ 'yank',
]
endif
--
2.34.1
next prev parent reply other threads:[~2022-02-04 15:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-04 15:29 [PATCH 0/4] buildsys: Avoid building unused objects Philippe Mathieu-Daudé via
2022-02-04 15:29 ` [PATCH 1/4] configure: Restrict TCG to emulation Philippe Mathieu-Daudé via
2022-02-04 15:35 ` Thomas Huth
2022-02-04 16:55 ` Paolo Bonzini
2022-02-04 15:29 ` [PATCH 2/4] tests/fp: Do not build softfloat3 tests if TCG is disabled Philippe Mathieu-Daudé via
2022-02-04 15:38 ` Thomas Huth
2022-02-04 15:29 ` [PATCH 3/4] qom: Remove user-creatable objects from user emulation Philippe Mathieu-Daudé via
2022-02-04 15:56 ` Thomas Huth
2022-02-04 16:14 ` Philippe Mathieu-Daudé via
2022-02-04 16:56 ` Paolo Bonzini
2022-02-04 15:29 ` Philippe Mathieu-Daudé via [this message]
2022-02-04 16:25 ` [PATCH 4/4] qapi/meson: Restrict machine-specific objects to sysemu Thomas Huth
2022-02-04 17:00 ` Paolo Bonzini
2022-02-04 23:40 ` Philippe Mathieu-Daudé via
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=20220204152924.6253-5-f4bug@amsat.org \
--to=qemu-devel@nongnu.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=f4bug@amsat.org \
--cc=pbonzini@redhat.com \
--cc=richard.henderson@linaro.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).