[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 51/53] virtio-ccw: do not include headers for all virtio devices
From: |
Paolo Bonzini |
Subject: |
[PULL 51/53] virtio-ccw: do not include headers for all virtio devices |
Date: |
Tue, 19 Apr 2022 07:51:07 +0200 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/s390x/ipl.c | 3 +++
hw/s390x/s390-virtio-ccw.c | 1 +
hw/s390x/virtio-ccw.c | 2 ++
hw/s390x/virtio-ccw.h | 16 ----------------
4 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 2dcc24175d..4b5eb77afd 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/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 90480e7cf9..2d32647d08 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -25,6 +25,7 @@
#include "qemu/error-report.h"
#include "qemu/option.h"
#include "qemu/qemu-print.h"
+#include "qemu/units.h"
#include "hw/s390x/s390-pci-bus.h"
#include "sysemu/reset.h"
#include "hw/s390x/storage-keys.h"
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index c845a92c3a..15b458527e 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -12,6 +12,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "exec/address-spaces.h"
#include "sysemu/kvm.h"
#include "net/net.h"
#include "hw/virtio/virtio.h"
@@ -19,6 +20,7 @@
#include "hw/virtio/virtio-net.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
+#include "qemu/log.h"
#include "qemu/module.h"
#include "hw/virtio/virtio-access.h"
#include "hw/virtio/virtio-bus.h"
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"
--
2.35.1
- [PULL 43/53] thread-posix: optimize qemu_sem_timedwait with zero timeout, (continued)
- [PULL 43/53] thread-posix: optimize qemu_sem_timedwait with zero timeout, Paolo Bonzini, 2022/04/19
- [PULL 50/53] virtio-ccw: move device type declarations to .c files, Paolo Bonzini, 2022/04/19
- [PULL 53/53] target/i386: Remove unused XMMReg, YMMReg types and CPUState fields, Paolo Bonzini, 2022/04/19
- [PULL 25/53] include: move dump_in_progress() to runstate.h, Paolo Bonzini, 2022/04/19
- [PULL 26/53] include: move C/util-related declarations to cutils.h, Paolo Bonzini, 2022/04/19
- [PULL 32/53] include: move page_size_init() to include/hw/core/cpu.h, Paolo Bonzini, 2022/04/19
- [PULL 42/53] thread-posix: implement Semaphore with QemuCond and QemuMutex, Paolo Bonzini, 2022/04/19
- [PULL 39/53] whpx: Added support for breakpoints and stepping, Paolo Bonzini, 2022/04/19
- [PULL 47/53] hw: hyperv: Initial commit for Synthetic Debugging device, Paolo Bonzini, 2022/04/19
- [PULL 49/53] virtio-ccw: move vhost_ccw_scsi to a separate file, Paolo Bonzini, 2022/04/19
- [PULL 51/53] virtio-ccw: do not include headers for all virtio devices,
Paolo Bonzini <=
- Re: [PULL for-7.1 00/53] Misc pull request for QEMU 7.1, Peter Maydell, 2022/04/19
- Re: [PULL for-7.1 00/53] Misc pull request for QEMU 7.1, Richard Henderson, 2022/04/19