Re: [PATCH 4/4] virtio-ccw: do not include headers for all virtio devices

[Thomas Huth]

On 28/03/2022 16.30, Paolo Bonzini wrote:

Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
  hw/s390x/ipl.c        |  3 +++
  hw/s390x/virtio-ccw.h | 16 ----------------
  2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index e21776822a..ca56a1b29a 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -27,11 +27,14 @@
  #include "hw/s390x/css.h"
  #include "hw/s390x/ebcdic.h"
  #include "hw/s390x/pv.h"
+#include "hw/scsi/scsi.h"
+#include "hw/virtio/virtio-net.h"
  #include "ipl.h"
  #include "qemu/error-report.h"
  #include "qemu/config-file.h"
  #include "qemu/cutils.h"
  #include "qemu/option.h"
+#include "standard-headers/linux/virtio_ids.h"
  #include "exec/exec-all.h"

#define KERN_IMAGE_START 0x010000UL

diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h
index fc131194bf..fac186c8f6 100644
--- a/hw/s390x/virtio-ccw.h
+++ b/hw/s390x/virtio-ccw.h
@@ -13,24 +13,8 @@
  #ifndef HW_S390X_VIRTIO_CCW_H
  #define HW_S390X_VIRTIO_CCW_H

-#include "hw/virtio/virtio-blk.h"

-#include "hw/virtio/virtio-net.h"
-#include "hw/virtio/virtio-serial.h"
-#include "hw/virtio/virtio-scsi.h"
  #include "qom/object.h"
-#ifdef CONFIG_VHOST_SCSI
-#include "hw/virtio/vhost-scsi.h"
-#endif
-#include "hw/virtio/virtio-balloon.h"
-#include "hw/virtio/virtio-rng.h"
-#include "hw/virtio/virtio-crypto.h"
  #include "hw/virtio/virtio-bus.h"
-#ifdef CONFIG_VHOST_VSOCK
-#include "hw/virtio/vhost-vsock.h"
-#endif /* CONFIG_VHOST_VSOCK */
-#include "hw/virtio/virtio-gpu.h"
-#include "hw/virtio/virtio-input.h"
-
  #include "hw/s390x/s390_flic.h"
  #include "hw/s390x/css.h"
  #include "ccw-device.h"

Reviewed-by: Thomas Huth <th...@redhat.com>