hw/ide: remove old i386 dependency

and remove a duplicated include

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: John Snow <jsnow@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 373311f91a5e7e88cb147e09aaa48ce35a73ca98..451b18b419477c76c282b3072bb1ab67d519371b 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -24,7 +24,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/msi.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 
 #include "qemu/error-report.h"

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 86b2a8f504d863224aa3832f8a7b6673bb5da6de..65aff518ec590fcef102a8f672402d6011b18652 100644 (file)
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -24,7 +24,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 471d0c928b55ce8bc59acc66ff2d61ac6a1f892b..1ea5812b7ec7f88566e59b4c6902a3b69de18f79 100644 (file)
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -24,17 +24,16 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
+#include "sysemu/blockdev.h"
 #include "sysemu/dma.h"
 #include "hw/block/block.h"
 #include "sysemu/block-backend.h"
 #include "qemu/cutils.h"
-#include "qemu/error-report.h"
 
 #include "hw/ide/internal.h"
 #include "trace.h"

diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 8dd0ced6b32bda669a903b554fe80b29b30c6044..c01b24ecbea710b791989fb457dbf44402efc919 100644 (file)
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -63,7 +63,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/msi.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 40213d662ce63f3a86923f4b9faa43d53d6fa4e5..9fb24fc92b54be8270057da165886db889ceedff 100644 (file)
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -24,7 +24,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"

diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 17917c0b30a43c7735df3a34d9790c396863d5e3..fde4d4645e905c0130de78c5951b254d7f0d0c06 100644 (file)
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -24,7 +24,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pcmcia.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 25f1d36f3a7931565f82ec1ffa010d8135c26f49..1ab0a892d0f32b3d7ec91504f537d390e6dd6695 100644 (file)
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -24,7 +24,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index dfb21f65fad9c3ba342ca54b2f5d7630fa6cd37e..a3afe1fd29c06a5d31805a6c4da375203c7013c9 100644 (file)
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -25,11 +25,11 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/sysemu.h"
+#include "sysemu/blockdev.h"
 #include "sysemu/dma.h"
 
 #include "hw/ide/pci.h"

diff --git a/hw/ide/via.c b/hw/ide/via.c
index 35c305932534142263f0f26bac190cd54d886bd8..117ac4d95e9bfde5f517bc4d6b737bcf1fc10f3f 100644 (file)
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -25,7 +25,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"