* [PATCH for-5.2] s390x: fix build for --without-default-devices
@ 2020-11-03 12:32 Cornelia Huck
2020-11-03 13:21 ` Matthew Rosato
2020-11-03 13:42 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 4+ messages in thread
From: Cornelia Huck @ 2020-11-03 12:32 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, Matthew Rosato, Cornelia Huck, Alex Williamson,
qemu-s390x, Philippe Mathieu-Daudé
s390-pci-vfio.c calls into the vfio code, so we need it to be
built conditionally on vfio (which implies CONFIG_LINUX).
Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Fixes: cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
hw/s390x/meson.build | 2 +-
include/hw/s390x/s390-pci-vfio.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
index f4663a835514..2a7818d94b94 100644
--- a/hw/s390x/meson.build
+++ b/hw/s390x/meson.build
@@ -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'))
diff --git a/include/hw/s390x/s390-pci-vfio.h b/include/hw/s390x/s390-pci-vfio.h
index c7984905b3b7..ff708aef500f 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);
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH for-5.2] s390x: fix build for --without-default-devices
2020-11-03 12:32 [PATCH for-5.2] s390x: fix build for --without-default-devices Cornelia Huck
@ 2020-11-03 13:21 ` Matthew Rosato
2020-11-03 14:06 ` Matthew Rosato
2020-11-03 13:42 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 4+ messages in thread
From: Matthew Rosato @ 2020-11-03 13:21 UTC (permalink / raw)
To: Cornelia Huck, qemu-devel
Cc: Thomas Huth, qemu-s390x, Philippe Mathieu-Daudé,
Alex Williamson
On 11/3/20 7:32 AM, Cornelia Huck wrote:
> s390-pci-vfio.c calls into the vfio code, so we need it to be
> built conditionally on vfio (which implies CONFIG_LINUX).
>
> Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Fixes: cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Good catch. Did a test compile and this clearly works, but I'm
wondering if it should be checking against CONFIG_VFIO_PCI?
> ---
> hw/s390x/meson.build | 2 +-
> include/hw/s390x/s390-pci-vfio.h | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
> index f4663a835514..2a7818d94b94 100644
> --- a/hw/s390x/meson.build
> +++ b/hw/s390x/meson.build
> @@ -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'))
> diff --git a/include/hw/s390x/s390-pci-vfio.h b/include/hw/s390x/s390-pci-vfio.h
> index c7984905b3b7..ff708aef500f 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);
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH for-5.2] s390x: fix build for --without-default-devices
2020-11-03 13:21 ` Matthew Rosato
@ 2020-11-03 14:06 ` Matthew Rosato
0 siblings, 0 replies; 4+ messages in thread
From: Matthew Rosato @ 2020-11-03 14:06 UTC (permalink / raw)
To: Cornelia Huck, qemu-devel
Cc: Thomas Huth, qemu-s390x, Philippe Mathieu-Daudé,
Alex Williamson
On 11/3/20 8:21 AM, Matthew Rosato wrote:
> On 11/3/20 7:32 AM, Cornelia Huck wrote:
>> s390-pci-vfio.c calls into the vfio code, so we need it to be
>> built conditionally on vfio (which implies CONFIG_LINUX).
>>
>> Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Fixes: cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma
>> available count")
>> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
>
> 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).
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
>> ---
>> hw/s390x/meson.build | 2 +-
>> include/hw/s390x/s390-pci-vfio.h | 3 ++-
>> 2 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
>> index f4663a835514..2a7818d94b94 100644
>> --- a/hw/s390x/meson.build
>> +++ b/hw/s390x/meson.build
>> @@ -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'))
>> diff --git a/include/hw/s390x/s390-pci-vfio.h
>> b/include/hw/s390x/s390-pci-vfio.h
>> index c7984905b3b7..ff708aef500f 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);
>>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH for-5.2] s390x: fix build for --without-default-devices
2020-11-03 12:32 [PATCH for-5.2] s390x: fix build for --without-default-devices Cornelia Huck
2020-11-03 13:21 ` Matthew Rosato
@ 2020-11-03 13:42 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-03 13:42 UTC (permalink / raw)
To: Cornelia Huck, qemu-devel
Cc: Thomas Huth, qemu-s390x, Alex Williamson, Matthew Rosato
On 11/3/20 1:32 PM, Cornelia Huck wrote:
> s390-pci-vfio.c calls into the vfio code, so we need it to be
> built conditionally on vfio (which implies CONFIG_LINUX).
>
> Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Fixes: cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> hw/s390x/meson.build | 2 +-
> include/hw/s390x/s390-pci-vfio.h | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
> index f4663a835514..2a7818d94b94 100644
> --- a/hw/s390x/meson.build
> +++ b/hw/s390x/meson.build
> @@ -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'))
> diff --git a/include/hw/s390x/s390-pci-vfio.h b/include/hw/s390x/s390-pci-vfio.h
> index c7984905b3b7..ff708aef500f 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
This odd include should come with a comment IMHO.
This fixes the issue, thanks.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> -#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);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-03 14:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-03 12:32 [PATCH for-5.2] s390x: fix build for --without-default-devices Cornelia Huck
2020-11-03 13:21 ` Matthew Rosato
2020-11-03 14:06 ` Matthew Rosato
2020-11-03 13:42 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).