[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/32] hw/remote: move stub vfu_object_set_bus_irq out of stubs/
From: |
Paolo Bonzini |
Subject: |
[PULL 20/32] hw/remote: move stub vfu_object_set_bus_irq out of stubs/ |
Date: |
Wed, 18 Oct 2023 10:27:40 +0200 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/remote/meson.build | 4 +++-
stubs/vfio-user-obj.c => hw/remote/vfio-user-obj-stub.c | 0
stubs/meson.build | 1 -
3 files changed, 3 insertions(+), 2 deletions(-)
rename stubs/vfio-user-obj.c => hw/remote/vfio-user-obj-stub.c (100%)
diff --git a/hw/remote/meson.build b/hw/remote/meson.build
index a1e8708c732..a3aa29aaf17 100644
--- a/hw/remote/meson.build
+++ b/hw/remote/meson.build
@@ -7,9 +7,11 @@ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true:
files('remote-obj.c'))
remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy.c'))
remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('iohub.c'))
remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('iommu.c'))
-remote_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_true:
files('vfio-user-obj.c'))
remote_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_true: libvfio_user_dep)
+remote_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_true:
files('vfio-user-obj.c'),
+ if_false: files('vfio-user-obj-stub.c'))
+remote_ss.add(when: 'CONFIG_ALL', if_true: files('vfio-user-obj-stub.c'))
specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c'))
specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true:
files('proxy-memory-listener.c'))
diff --git a/stubs/vfio-user-obj.c b/hw/remote/vfio-user-obj-stub.c
similarity index 100%
rename from stubs/vfio-user-obj.c
rename to hw/remote/vfio-user-obj-stub.c
diff --git a/stubs/meson.build b/stubs/meson.build
index cde44972bf8..0bf25e6ca53 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -65,4 +65,3 @@ else
stub_ss.add(files('qdev.c'))
endif
stub_ss.add(files('semihost-all.c'))
-stub_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_false:
files('vfio-user-obj.c'))
--
2.41.0
- [PULL 04/32] target/i386/cpu: Fix CPUID_HT exposure, (continued)
- [PULL 04/32] target/i386/cpu: Fix CPUID_HT exposure, Paolo Bonzini, 2023/10/18
- [PULL 10/32] docs/sphinx: avoid invalid escape in Python string, Paolo Bonzini, 2023/10/18
- [PULL 11/32] target/hexagon: avoid invalid escape in Python string, Paolo Bonzini, 2023/10/18
- [PULL 12/32] tests/avocado: avoid invalid escape in Python string, Paolo Bonzini, 2023/10/18
- [PULL 13/32] tests/vm: avoid invalid escape in Python string, Paolo Bonzini, 2023/10/18
- [PULL 17/32] meson, cutils: allow non-relocatable installs, Paolo Bonzini, 2023/10/18
- [PULL 14/32] tracetool: avoid invalid escape in Python string, Paolo Bonzini, 2023/10/18
- [PULL 16/32] meson: do not use set10, Paolo Bonzini, 2023/10/18
- [PULL 15/32] meson: do not build shaders by default, Paolo Bonzini, 2023/10/18
- [PULL 19/32] hw/xen: cleanup sourcesets, Paolo Bonzini, 2023/10/18
- [PULL 20/32] hw/remote: move stub vfu_object_set_bus_irq out of stubs/,
Paolo Bonzini <=
- [PULL 22/32] configure, tests/tcg: simplify GDB conditionals, Paolo Bonzini, 2023/10/18
- [PULL 21/32] tests/tcg/arm: move non-SVE tests out of conditional, Paolo Bonzini, 2023/10/18
- [PULL 18/32] configure: clean up handling of CFI option, Paolo Bonzini, 2023/10/18
- [PULL 24/32] configure: clean up PIE option handling, Paolo Bonzini, 2023/10/18
- [PULL 27/32] configure: move environment-specific defaults to config-meson.cross, Paolo Bonzini, 2023/10/18
- [PULL 25/32] configure: remove some dead cruft, Paolo Bonzini, 2023/10/18
- [PULL 29/32] configure, meson: use command line options to configure qemu-ga, Paolo Bonzini, 2023/10/18
- [PULL 23/32] configure: clean up plugin option handling, Paolo Bonzini, 2023/10/18
- [PULL 31/32] meson: add a note on why we use config_host for program paths, Paolo Bonzini, 2023/10/18
- [PULL 28/32] configure: unify handling of several Debian cross containers, Paolo Bonzini, 2023/10/18