[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/17] hw/remote: move stub vfu_object_set_bus_irq out of stubs/
|
From: |
Paolo Bonzini |
|
Subject: |
[PATCH 06/17] hw/remote: move stub vfu_object_set_bus_irq out of stubs/ |
|
Date: |
Mon, 16 Oct 2023 08:31:16 +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 ef6e39a64d8..025e7d2851f 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
- [PATCH 01/17] meson: do not build shaders by default, (continued)
- [PATCH 01/17] meson: do not build shaders by default, Paolo Bonzini, 2023/10/16
- [PATCH 05/17] hw/xen: cleanup sourcesets, Paolo Bonzini, 2023/10/16
- [PATCH 04/17] configure: clean up handling of CFI option, Paolo Bonzini, 2023/10/16
- [PATCH 08/17] configure, tests/tcg: simplify GDB conditionals, Paolo Bonzini, 2023/10/16
- [PATCH 07/17] tests/tcg/arm: move non-SVE tests out of conditional, Paolo Bonzini, 2023/10/16
- [PATCH 10/17] configure: clean up PIE option handling, Paolo Bonzini, 2023/10/16
- [PATCH 06/17] hw/remote: move stub vfu_object_set_bus_irq out of stubs/,
Paolo Bonzini <=
- [PATCH 09/17] configure: clean up plugin option handling, Paolo Bonzini, 2023/10/16
- [PATCH 11/17] configure: remove some dead cruft, Paolo Bonzini, 2023/10/16
- [PATCH 12/17] configure: move target-specific defaults to an external machine file, Paolo Bonzini, 2023/10/16
- [PATCH 14/17] configure: unify handling of several Debian cross containers, Paolo Bonzini, 2023/10/16
- [PATCH 15/17] configure, meson: use command line options to configure qemu-ga, Paolo Bonzini, 2023/10/16
- [PATCH 16/17] meson-buildoptions: document the data at the top, Paolo Bonzini, 2023/10/16
- [PATCH 17/17] meson: add a note on why we use config_host for program paths, Paolo Bonzini, 2023/10/16
- [PATCH 13/17] configure: move environment-specific defaults to config-meson.cross, Paolo Bonzini, 2023/10/16