hw: Do not include "sysemu/block-backend.h" if it is not necessary

After reviewing a patch from Philippe that removes block-backend.h
from hw/lm32/milkymist.c, I noticed that this header is included
unnecessarily in a lot of other files, too. Remove those unneeded
includes to speed up the compilation process a little bit.

Signed-off-by: Thomas Huth <[email protected]>
Message-Id: <1518684912[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index 287392bbdc975bc7eca34f09d82b3f6237564624..1742cf6f6c6e4cd8b0f27e678bf62e063a619834 100644 (file)
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -27,7 +27,6 @@
 #include "sysemu/kvm.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
-#include "sysemu/block-backend.h"
 #include "exec/address-spaces.h"
 #include "qemu/error-report.h"
 #include "hw/char/pl011.h"

diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c
index a8ec2cdf36230cba35454a4251009751077ac5d4..f68df56b97bc762950b3956f4a8f3bcb0165c4d7 100644 (file)
--- a/hw/arm/msf2-soc.c
+++ b/hw/arm/msf2-soc.c
@@ -29,7 +29,6 @@
 #include "exec/address-spaces.h"
 #include "hw/char/serial.h"
 #include "hw/boards.h"
-#include "sysemu/block-backend.h"
 #include "qemu/cutils.h"
 #include "hw/arm/msf2-soc.h"
 #include "hw/misc/unimp.h"

diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index 87cd1e583cd20b6d8a2beeef1cba6977496d4477..2139a62e25ba988955ea00fca3066a34a599dbe1 100644 (file)
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -20,7 +20,6 @@
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/i2c/i2c.h"
-#include "sysemu/block-backend.h"
 #include "exec/address-spaces.h"
 #include "qemu/error-report.h"
 #include "hw/char/pl011.h"

diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index a55b1a369c0d8b3c05f6cba88b4caae318066648..7a925fa5e6e98c9000572aab619df5bdc41023e0 100644 (file)
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -22,7 +22,6 @@
 #include "hw/boards.h"
 #include "hw/i2c/i2c.h"
 #include "hw/ssi/ssi.h"
-#include "sysemu/block-backend.h"
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index dc1f5356977179b6af40a8b77d39b415beeea03d..0c140f4dc7ce2482c388aa687f5abea3397bcfa9 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -50,8 +50,6 @@
 #include "sysemu/qtest.h"
 #include "kvm_i386.h"
 #include "hw/xen/xen.h"
-#include "sysemu/block-backend.h"
-#include "hw/block/block.h"
 #include "ui/qemu-spice.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 0f1966d5474fdf3e0791f154591d506eb803d95d..729a0508aa5c68e3b8c1a0fddb2b6314eb3bf75f 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -40,7 +40,6 @@
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"
 #include "sysemu/arch_init.h"
-#include "sysemu/block-backend.h"
 #include "hw/i2c/smbus.h"
 #include "hw/xen/xen.h"
 #include "exec/memory.h"

diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c
index c3f1604936c936e2ac3659f4a2559cd0aec1abc5..5397483fd87ff9f7d1748f948cc3711fef671f23 100644 (file)
--- a/hw/ide/ahci-allwinner.c
+++ b/hw/ide/ahci-allwinner.c
@@ -18,7 +18,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qemu/error-report.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
 #include "hw/ide/internal.h"
 #include "hw/ide/ahci_internal.h"

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 65aff518ec590fcef102a8f672402d6011b18652..6bb92d717fbdba560978e27ff31e13fdaae1a6e3 100644 (file)
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -26,7 +26,6 @@
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
 

diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index c01b24ecbea710b791989fb457dbf44402efc919..134478ebb21dc0c114059b20ab8c1ed3cf0ad383 100644 (file)
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -65,7 +65,6 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/ahci_internal.h"

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 9fb24fc92b54be8270057da165886db889ceedff..028bd61774c882c549f0eba80a11793d0140487c 100644 (file)
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/isa/isa.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
 
 #include "hw/ide/internal.h"

diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 58e4f52f7d2fceeeee674a02fa35e26c938c9ba5..34bb98dce83f5e6b2b07e03da0303550278cc0a9 100644 (file)
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pcmcia.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
 
 #include "hw/ide/internal.h"

diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index 6f12f456ed49aea97fc9eeab8eca634f3777ed43..42fcf139eeec6bf64629e636f40e1cac1d4b09a0 100644 (file)
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
 
 #include "hw/ide/internal.h"

diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index f68c6256669bc5d5ca0f8ec70a2a79c17563d7f7..be4f83973da10391cca4aa6ddd8db9b477d23f92 100644 (file)
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -27,7 +27,6 @@
 #include "net/net.h"
 #include "hw/boards.h"
 #include "hw/i2c/smbus.h"
-#include "sysemu/block-backend.h"
 #include "hw/block/flash.h"
 #include "hw/mips/mips.h"
 #include "hw/mips/cpudevs.h"

diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index b09871a814a6edde26c68c80821d2c8dbd2f0c95..08e6f620fc76bccb41658373c9d2be2e576ac3ec 100644 (file)
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -41,7 +41,6 @@
 #include "hw/timer/i8254.h"
 #include "hw/display/vga.h"
 #include "hw/audio/pcspk.h"
-#include "sysemu/block-backend.h"
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 #include "sysemu/qtest.h"

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index a749e2565dff3bf62038905df22278aa29c6328d..2f5b6f651ac451b5d4a59fcc71d1aa34a83c28fa 100644 (file)
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -69,7 +69,6 @@
 #include "sysemu/kvm.h"
 #include "kvm_ppc.h"
 #include "hw/usb.h"
-#include "sysemu/block-backend.h"
 #include "exec/address-spaces.h"
 #include "hw/sysbus.h"
 #include "qemu/cutils.h"

diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 935493c9669fc0209c271bf0b2b6a4470bd0320c..10e291ca22f57543e5996804804b53658fbf3f17 100644 (file)
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -44,7 +44,6 @@
 #include "qemu/error-report.h"
 #include "sysemu/kvm.h"
 #include "kvm_ppc.h"
-#include "sysemu/block-backend.h"
 #include "exec/address-spaces.h"
 #include "qemu/cutils.h"
 

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 096d4d4cfbdf493c9a9bc1954f918c35067eccb2..c9d8950de7d9d4b449caa3c63e650563adc62a5e 100644 (file)
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -43,7 +43,6 @@
 #include "hw/timer/mc146818rtc.h"
 #include "hw/isa/pc87312.h"
 #include "hw/net/ne2000-isa.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/arch_init.h"
 #include "sysemu/kvm.h"
 #include "sysemu/qtest.h"

diff --git a/hw/scsi/mptendian.c b/hw/scsi/mptendian.c
index 3415229b5e393a8631fa656f301a86b6f3a105cd..8ae39a76f422d11b53d07085ba4422e5b8c738fb 100644 (file)
--- a/hw/scsi/mptendian.c
+++ b/hw/scsi/mptendian.c
@@ -24,7 +24,6 @@
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "sysemu/dma.h"
-#include "sysemu/block-backend.h"
 #include "hw/pci/msi.h"
 #include "qemu/iov.h"
 #include "hw/scsi/scsi.h"

diff --git a/hw/sd/core.c b/hw/sd/core.c
index 3c6eae6c88974ef6f2fc374bf1ddcb8ab5b18ba7..820345f704bcc568be8a8c9d4a01e3d6c3f9514a 100644 (file)
--- a/hw/sd/core.c
+++ b/hw/sd/core.c
@@ -21,7 +21,6 @@
 
 #include "qemu/osdep.h"
 #include "hw/qdev-core.h"
-#include "sysemu/block-backend.h"
 #include "hw/sd/sd.h"
 #include "trace.h"
 

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 0f5804b3b46037cc16689abfabdbe974f6bedfe0..2b8af2c884cccd77f8d2267a4437856233187f6d 100644 (file)
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -44,7 +44,6 @@
 #include "hw/empty_slot.h"
 #include "hw/loader.h"
 #include "elf.h"
-#include "sysemu/block-backend.h"
 #include "trace.h"
 #include "qemu/cutils.h"
 

diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index ac75eb21284304406e648865423edbfe68ff452b..8e61dfc3e65d25264e99666daa1cda4cc41e8c20 100644 (file)
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -28,9 +28,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
-#include "sysemu/block-backend.h"
 #include "exec/address-spaces.h"
-#include "hw/block/flash.h"
 #include "elf.h"
 #include "hw/tricore/tricore.h"
 #include "qemu/error-report.h"