File 0209-revert-s390x-fix-build-for-without-.patch of Package qemu-testsuite

Overview Repositories Revisions Requests Users Attributes Meta

File 0209-revert-s390x-fix-build-for-without-.patch of Package qemu-testsuite

From: "Cho, Yu-Chen" <acho@suse.com>
Date: Thu, 22 Apr 2021 15:55:33 +0800
Subject: revert s390x: fix build for --without-default-devices

Include-If: %if 0%{?suse_version} == 1315
References: bsc#1179725

revert 0157-s390x-fix-build-for-without-default.patch

This broke QEMU builds where the --without-default-devices option is
specified during configuration.
Backport patch 0157-s390x-fix-build-for-without-default.patch
subsequently changes this dependency from CONFIG_LINUX to CONFIG_VFIO,
which made sense upstream however it looks to me like CONFIG_VFIO does not
exist at this level of QEMU, meaning it's always OFF and
this is why we never build in s390-pci-vfio.o

Fixes: 77280d33bc ("s390x: fix build for --without-default-devices
(v5.2.0-rc1)")

Signed-off-by: Cho, Yu-Chen <acho@suse.com>
---
 hw/s390x/Makefile.objs           | 2 +-
 include/hw/s390x/s390-pci-vfio.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
index b11a5bef45d32934e3039670e829..3d5bdb72d9cd16953b0fe301987e 100644
--- a/hw/s390x/Makefile.objs
+++ b/hw/s390x/Makefile.objs
@@ -8,7 +8,7 @@ obj-y += css.o
 obj-y += s390-virtio-ccw.o
 obj-y += 3270-ccw.o
 obj-y += virtio-ccw.o
-obj-$(CONFIG_VFIO) += s390-pci-vfio.o
+obj-$(CONFIG_LINUX) += s390-pci-vfio.o
 obj-$(CONFIG_VIRTIO_SERIAL) += virtio-ccw-serial.o
 obj-$(CONFIG_VIRTIO_BALLOON) += virtio-ccw-balloon.o
 obj-$(CONFIG_VIRTIO_SCSI) += virtio-ccw-scsi.o
diff --git a/include/hw/s390x/s390-pci-vfio.h b/include/hw/s390x/s390-pci-vfio.h
index 685b136d46bfd146a76ab9a5d643..539bcf04eb5bcc29f0f54ef0cda2 100644
--- a/include/hw/s390x/s390-pci-vfio.h
+++ b/include/hw/s390x/s390-pci-vfio.h
@@ -13,9 +13,8 @@
 #define HW_S390_PCI_VFIO_H
 
 #include "hw/s390x/s390-pci-bus.h"
-#include "config-devices.h"
 
-#ifdef CONFIG_VFIO
+#ifdef CONFIG_LINUX
 bool s390_pci_update_dma_avail(int fd, unsigned int *avail);
 S390PCIDMACount *s390_pci_start_dma_count(S390pciState *s,
                                           S390PCIBusDevice *pbdev);

Places

File 0209-revert-s390x-fix-build-for-without-.patch of Package qemu-testsuite

Places