diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-06 13:43:28 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-06 13:43:28 +0000 |
| commit | 3493c36f0371777c62d1d72b205b0eb6117e2156 (patch) | |
| tree | c278a5eba013659d0222a1276f500a33d33d6620 /include/hw | |
| parent | a47c284a7cf8f6e98df974b1009bf412653ce01e (diff) | |
| parent | 77280d33bc9cfdbfb5b5d462259d644f5aefe9b3 (diff) | |
| download | qemu-3493c36f0371777c62d1d72b205b0eb6117e2156.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20201106' into staging
some s390x fixes, including a bios update
# gpg: Signature made Fri 06 Nov 2020 13:08:42 GMT
# gpg: using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg: issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [unknown]
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg: aka "Cornelia Huck <cohuck@kernel.org>" [unknown]
# gpg: aka "Cornelia Huck <cohuck@redhat.com>" [unknown]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20201106:
s390x: fix build for --without-default-devices
target/s390x: fix execution with icount
pc-bios/s390: update s390-ccw bios binaries
s390-bios: Skip writing iplb location to low core for ccw ipl
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/s390x/s390-pci-vfio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/hw/s390x/s390-pci-vfio.h b/include/hw/s390x/s390-pci-vfio.h index c7984905b3..ff708aef50 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 -#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); |