Revert meson build file back to Make.objs

References: bsc#1179719

Related commits: cd7498d07fbb 77280d33bc9c

Signed-off-by: Liang Yan <lyan@suse.com>

diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
index a46a1c7894e0f612a2d74cec74f6d0c3ff8840a0..37c071d78533bb326d7e25e757e0bcaedc6cbb4d 100644 (file)
--- a/hw/s390x/Makefile.objs
+++ b/hw/s390x/Makefile.objs
@@ -35,3 +35,4 @@ obj-$(CONFIG_KVM) += pv.o
 obj-y += s390-ccw.o
 obj-y += ap-device.o
 obj-y += ap-bridge.o
+obj-$(CONFIG_VFIO) += s390-pci-vfio.o

diff --git a/include/hw/s390x/s390-pci-vfio.h b/include/hw/s390x/s390-pci-vfio.h
index a99499851f048ab04c2c1b45a4a26450ab198f3d..55db22a9541812a1e7ba66d5dea3f542b9bf8f88 100644 (file)
--- a/include/hw/s390x/s390-pci-vfio.h
+++ b/include/hw/s390x/s390-pci-vfio.h
@@ -13,6 +13,7 @@
 #define HW_S390_PCI_VFIO_H
 
 #include "hw/s390x/s390-pci-bus.h"
+#include  "config-devices.h"
 
 #ifdef CONFIG_VFIO
 bool s390_pci_update_dma_avail(int fd, unsigned int *avail);