From 1725253647a7b579f205adb6e9a91e9406fc0ef9 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 31 Aug 2023 10:58:23 +0200 Subject: hw/remote: move stub vfu_object_set_bus_irq out of stubs/ Signed-off-by: Paolo Bonzini --- hw/remote/meson.build | 4 +++- hw/remote/vfio-user-obj-stub.c | 6 ++++++ stubs/meson.build | 1 - stubs/vfio-user-obj.c | 6 ------ 4 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 hw/remote/vfio-user-obj-stub.c delete mode 100644 stubs/vfio-user-obj.c 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/hw/remote/vfio-user-obj-stub.c b/hw/remote/vfio-user-obj-stub.c new file mode 100644 index 0000000..79100d7 --- /dev/null +++ b/hw/remote/vfio-user-obj-stub.c @@ -0,0 +1,6 @@ +#include "qemu/osdep.h" +#include "hw/remote/vfio-user-obj.h" + +void vfu_object_set_bus_irq(PCIBus *pci_bus) +{ +} 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')) diff --git a/stubs/vfio-user-obj.c b/stubs/vfio-user-obj.c deleted file mode 100644 index 79100d7..0000000 --- a/stubs/vfio-user-obj.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "qemu/osdep.h" -#include "hw/remote/vfio-user-obj.h" - -void vfu_object_set_bus_irq(PCIBus *pci_bus) -{ -} -- cgit v1.1