aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2023-08-31 10:58:23 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2023-10-18 10:01:01 +0200
commit1725253647a7b579f205adb6e9a91e9406fc0ef9 (patch)
treeb0a6e6472ae48d45a2254d6bcf23786c74173f85
parentadfa939e735688dba1098d91e8c71aef6d5ccd6b (diff)
downloadqemu-1725253647a7b579f205adb6e9a91e9406fc0ef9.zip
qemu-1725253647a7b579f205adb6e9a91e9406fc0ef9.tar.gz
qemu-1725253647a7b579f205adb6e9a91e9406fc0ef9.tar.bz2
hw/remote: move stub vfu_object_set_bus_irq out of stubs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/remote/meson.build4
-rw-r--r--hw/remote/vfio-user-obj-stub.c (renamed from stubs/vfio-user-obj.c)0
-rw-r--r--stubs/meson.build1
3 files changed, 3 insertions, 2 deletions
diff --git a/hw/remote/meson.build b/hw/remote/meson.build
index a1e8708..a3aa29a 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
index 79100d7..79100d7 100644
--- a/stubs/vfio-user-obj.c
+++ b/hw/remote/vfio-user-obj-stub.c
diff --git a/stubs/meson.build b/stubs/meson.build
index cde4497..0bf25e6 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'))