From d86158eeb752242791e3f94172ed020204040250 Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Tue, 19 Jan 2021 12:50:46 -0500 Subject: [PATCH 7/7] s390x: fix build for --without-default-devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Cornelia Huck Message-id: <20210119125046.472811-8-cohuck@redhat.com> Patchwork-id: 100681 O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 7/7] s390x: fix build for --without-default-devices Bugzilla: 1905391 RH-Acked-by: David Hildenbrand RH-Acked-by: Auger Eric RH-Acked-by: Thomas Huth s390-pci-vfio.c calls into the vfio code, so we need it to be built conditionally on vfio (which implies CONFIG_LINUX). Fixes: cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count") Reported-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Matthew Rosato Message-Id: <20201103123237.718242-1-cohuck@redhat.com> Acked-by: Greg Kurz Tested-by: Greg Kurz Signed-off-by: Cornelia Huck (cherry picked from commit 77280d33bc9cfdbfb5b5d462259d644f5aefe9b3) Signed-off-by: Cornelia Huck Conflicts: hw/s390x/meson.build include/hw/s390x/s390-pci-vfio.h --> adaptions due to missing Meson rework Signed-off-by: Danilo C. L. de Paula --- hw/s390x/Makefile.objs | 2 +- include/hw/s390x/s390-pci-vfio.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index 43756c9437d..dbef4b8906c 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -7,7 +7,7 @@ obj-y += ipl.o obj-y += css.o obj-$(CONFIG_S390_CCW_VIRTIO) += s390-virtio-ccw.o obj-$(CONFIG_TERMINAL3270) += 3270-ccw.o -obj-$(CONFIG_LINUX) += s390-pci-vfio.o +obj-$(CONFIG_VFIO) += s390-pci-vfio.o ifeq ($(CONFIG_VIRTIO_CCW),y) obj-y += virtio-ccw.o obj-$(CONFIG_VIRTIO_SERIAL) += virtio-ccw-serial.o diff --git a/include/hw/s390x/s390-pci-vfio.h b/include/hw/s390x/s390-pci-vfio.h index 539bcf04eb5..685b136d46b 100644 --- a/include/hw/s390x/s390-pci-vfio.h +++ b/include/hw/s390x/s390-pci-vfio.h @@ -13,8 +13,9 @@ #define HW_S390_PCI_VFIO_H #include "hw/s390x/s390-pci-bus.h" +#include "config-devices.h" -#ifdef CONFIG_LINUX +#ifdef CONFIG_VFIO bool s390_pci_update_dma_avail(int fd, unsigned int *avail); S390PCIDMACount *s390_pci_start_dma_count(S390pciState *s, S390PCIBusDevice *pbdev); -- 2.27.0