[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 29/46] qapi/meson: Remove QMP from user-mode emulation
From: |
Paolo Bonzini |
Subject: |
[PULL 29/46] qapi/meson: Remove QMP from user-mode emulation |
Date: |
Mon, 8 Feb 2021 19:23:14 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210122204441.2145197-11-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qapi/meson.build | 10 +++++++---
tests/meson.build | 7 ++++++-
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/qapi/meson.build b/qapi/meson.build
index 2839871b47..b301a46f04 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -4,14 +4,18 @@ util_ss.add(files(
'qapi-dealloc-visitor.c',
'qapi-util.c',
'qapi-visit-core.c',
- 'qmp-dispatch.c',
- 'qmp-event.c',
- 'qmp-registry.c',
'qobject-input-visitor.c',
'qobject-output-visitor.c',
'string-input-visitor.c',
'string-output-visitor.c',
))
+if have_system or have_tools
+ util_ss.add(files(
+ 'qmp-dispatch.c',
+ 'qmp-event.c',
+ 'qmp-registry.c',
+ ))
+endif
qapi_all_modules = [
'acpi',
diff --git a/tests/meson.build b/tests/meson.build
index 6f1ff926d2..7d7da6a636 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -86,7 +86,6 @@ tests = {
'test-qobject-input-visitor': [testqapi],
'test-string-input-visitor': [testqapi],
'test-string-output-visitor': [testqapi],
- 'test-qmp-event': [testqapi],
'test-opts-visitor': [testqapi],
'test-visitor-serialization': [testqapi],
'test-bitmap': [],
@@ -117,6 +116,12 @@ tests = {
'test-qapi-util': [],
}
+if have_system or have_tools
+ tests += {
+ 'test-qmp-event': [testqapi],
+ }
+endif
+
test_deps = {
'test-qht-par': qht_bench,
}
--
2.29.2
- [PULL 12/46] x86/cpu: Populate SVM CPUID feature bits, (continued)
- [PULL 12/46] x86/cpu: Populate SVM CPUID feature bits, Paolo Bonzini, 2021/02/08
- [PULL 15/46] virtio-scsi: don't uninitialize queues that we didn't initialize, Paolo Bonzini, 2021/02/08
- [PULL 17/46] target/i386: Fix decoding of certain BMI instructions, Paolo Bonzini, 2021/02/08
- [PULL 20/46] meson: Explicit TCG backend used, Paolo Bonzini, 2021/02/08
- [PULL 18/46] target/i86: implement PKS, Paolo Bonzini, 2021/02/08
- [PULL 19/46] configure: Improve TCI feature description, Paolo Bonzini, 2021/02/08
- [PULL 21/46] meson: Warn when TCI is selected but TCG backend is available, Paolo Bonzini, 2021/02/08
- [PULL 22/46] tests/meson: Only build softfloat objects if TCG is selected, Paolo Bonzini, 2021/02/08
- [PULL 23/46] pc-bios/meson: Only install EDK2 blob firmwares with system emulation, Paolo Bonzini, 2021/02/08
- [PULL 24/46] meson: Restrict block subsystem processing, Paolo Bonzini, 2021/02/08
- [PULL 29/46] qapi/meson: Remove QMP from user-mode emulation,
Paolo Bonzini <=
- [PULL 27/46] meson: Restrict emulation code, Paolo Bonzini, 2021/02/08
- [PULL 28/46] qapi/meson: Restrict qdev code to system-mode emulation, Paolo Bonzini, 2021/02/08
- [PULL 35/46] replay: rng-builtin support, Paolo Bonzini, 2021/02/08
- [PULL 25/46] meson: Merge trace_events_subdirs array, Paolo Bonzini, 2021/02/08
- [PULL 37/46] hw/pci-host: add pci-intack write method, Paolo Bonzini, 2021/02/08
- [PULL 43/46] tz-ppc: add dummy read/write methods, Paolo Bonzini, 2021/02/08
- [PULL 42/46] spapr_pci: add spapr msi read method, Paolo Bonzini, 2021/02/08
- [PULL 31/46] qapi/meson: Restrict UI module to system emulation and tools, Paolo Bonzini, 2021/02/08
- [PULL 26/46] meson: Restrict some trace event directories to user/system emulation, Paolo Bonzini, 2021/02/08
- [PULL 30/46] qapi/meson: Restrict system-mode specific modules, Paolo Bonzini, 2021/02/08