Skip to contentSkip to conversation

s390x: fix build for --without-default-devices

PATCH In review Cornelia Huck 3 participants 4 messages Nov 3, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390x: fix build for --without-default-devices

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")
---
 hw/s390x/meson.build             | 2 +-
 include/hw/s390x/s390-pci-vfio.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
hw/s390x/meson.build +1 -1
index f4663a835514..2a7818d94b94 100644
@@ -27,7 +27,7 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
 ))
 s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-ccw.c'))
 s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c'))
-s390x_ss.add(when: 'CONFIG_LINUX', if_true: files('s390-pci-vfio.c'))
+s390x_ss.add(when: 'CONFIG_VFIO', if_true: files('s390-pci-vfio.c'))
 
 virtio_ss = ss.source_set()
 virtio_ss.add(files('virtio-ccw.c'))
include/hw/s390x/s390-pci-vfio.h +2 -1
index c7984905b3b7..ff708aef500f 100644
@@ -13,8 +13,9 @@
 #define HW_S390_PCI_VFIO_H
 
 #include "hw/s390x/s390-pci-bus.h"
+#include CONFIG_DEVICES
 
-#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);
Signature · 1 line
2.26.2
#1 lore raw
Quoted 6 lines · Cornelia Huck

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")

Good catch. Did a test compile and this clearly works, but I'm wondering if it should be checking against CONFIG_VFIO_PCI?

Quoted 34 lines
---
  hw/s390x/meson.build             | 2 +-
  include/hw/s390x/s390-pci-vfio.h | 3 ++-
  2 files changed, 3 insertions(+), 2 deletions(-)
hw/s390x/meson.build +1 -1
index f4663a835514..2a7818d94b94 100644
@@ -27,7 +27,7 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
  ))
  s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-ccw.c'))
  s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c'))
-s390x_ss.add(when: 'CONFIG_LINUX', if_true: files('s390-pci-vfio.c'))
+s390x_ss.add(when: 'CONFIG_VFIO', if_true: files('s390-pci-vfio.c'))
 
  virtio_ss = ss.source_set()
  virtio_ss.add(files('virtio-ccw.c'))
include/hw/s390x/s390-pci-vfio.h +2 -1
index c7984905b3b7..ff708aef500f 100644
@@ -13,8 +13,9 @@
  #define HW_S390_PCI_VFIO_H
 
  #include "hw/s390x/s390-pci-bus.h"
+#include CONFIG_DEVICES
 
-#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);
Reviewed-by
#2 lore raw
Quoted 10 lines · Matthew Rosato
Quoted 6 lines · Cornelia Huck

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")

Good catch.  Did a test compile and this clearly works, but I'm wondering if it should be checking against CONFIG_VFIO_PCI?

I guess looking at it again, there's nothing in s390-vfio-pci today that strictly needs it, just the VIOPCIDevice struct defined in hw/vfio/pci.h and that should still be available even if CONFIG_VFIO_PCI=n (not like you'll be able to create these devices without CONFIG_VFIO or CONFIG_VFIO_PCI anyway).

Quoted 32 lines
Quoted 31 lines

---
  hw/s390x/meson.build             | 2 +-
  include/hw/s390x/s390-pci-vfio.h | 3 ++-

  2 files changed, 3 insertions(+), 2 deletions(-)
hw/s390x/meson.build +1 -1
index f4663a835514..2a7818d94b94 100644
@@ -27,7 +27,7 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
   ))
   s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-ccw.c'))
   s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c'))
-s390x_ss.add(when: 'CONFIG_LINUX', if_true: files('s390-pci-vfio.c'))
+s390x_ss.add(when: 'CONFIG_VFIO', if_true: files('s390-pci-vfio.c'))
   virtio_ss = ss.source_set()
   virtio_ss.add(files('virtio-ccw.c'))
include/hw/s390x/s390-pci-vfio.h +2 -1
index c7984905b3b7..ff708aef500f 100644
@@ -13,8 +13,9 @@
   #define HW_S390_PCI_VFIO_H
   #include "hw/s390x/s390-pci-bus.h"
+#include CONFIG_DEVICES
-#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);
 
Reviewed-by Tested-by on v1 1/1
#3 lore raw
In reply to Cornelia Huck
Quoted 29 lines · Cornelia Huck

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")
---
 hw/s390x/meson.build             | 2 +-
 include/hw/s390x/s390-pci-vfio.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
hw/s390x/meson.build +1 -1
index f4663a835514..2a7818d94b94 100644
@@ -27,7 +27,7 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
 ))
 s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-ccw.c'))
 s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c'))
-s390x_ss.add(when: 'CONFIG_LINUX', if_true: files('s390-pci-vfio.c'))
+s390x_ss.add(when: 'CONFIG_VFIO', if_true: files('s390-pci-vfio.c'))
 
 virtio_ss = ss.source_set()
 virtio_ss.add(files('virtio-ccw.c'))
include/hw/s390x/s390-pci-vfio.h +0 -0
index c7984905b3b7..ff708aef500f 100644

include/hw/s390x/s390-pci-vfio.h line 16

Quoted 4 lines
include/hw/s390x/s390-pci-vfio.h +1 -0
@@ -13,8 +13,9 @@
 #define HW_S390_PCI_VFIO_H
 
 #include "hw/s390x/s390-pci-bus.h"
+#include CONFIG_DEVICES

This odd include should come with a comment IMHO.

This fixes the issue, thanks.

Quoted 7 lines
include/hw/s390x/s390-pci-vfio.h +1 -1
-#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);