[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 25/42] hw/ide: remove old i386 dependency
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v3 25/42] hw/ide: remove old i386 dependency |
Date: |
Tue, 17 Oct 2017 13:44:09 -0300 |
and remove a duplicated include
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: John Snow <address@hidden>
---
hw/ide/ahci.c | 1 -
hw/ide/cmd646.c | 1 -
hw/ide/core.c | 3 +--
hw/ide/ich.c | 1 -
hw/ide/isa.c | 1 -
hw/ide/microdrive.c | 1 -
hw/ide/pci.c | 1 -
hw/ide/piix.c | 2 +-
hw/ide/via.c | 1 -
9 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 32d1296a64..2634f8db3d 100644
--- 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 86b2a8f504..65aff518ec 100644
--- 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 5f1cd3b91f..ceb1e32a32 100644
--- 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 8dd0ced6b3..c01b24ecbe 100644
--- 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 40213d662c..9fb24fc92b 100644
--- 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 17917c0b30..fde4d4645e 100644
--- 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 25f1d36f3a..1ab0a892d0 100644
--- 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 dfb21f65fa..a3afe1fd29 100644
--- 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 35c3059325..117ac4d95e 100644
--- 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"
--
2.15.0.rc0
- [Qemu-devel] [PATCH v3 14/42] ppc: remove duplicated includes, (continued)
- [Qemu-devel] [PATCH v3 14/42] ppc: remove duplicated includes, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 15/42] i386/hax: remove duplicated includes, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 16/42] i386/hax: remove duplicated include, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 17/42] nios2: remove duplicated includes (in code commented out), Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 18/42] misc: avoid "include/" in include path, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 21/42] hw/misc/pvpanic: remove unused #include, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 19/42] numa: remove unused #include, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 20/42] hw/input/vmmouse: remove unused #include, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 22/42] hw/ssi/aspeed_smc: remove unused #include, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 23/42] amd_iommu: avoid needless includes in header file, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 25/42] hw/ide: remove old i386 dependency,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v3 26/42] hw/ipmi: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 24/42] misc: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 28/42] hw/tpm: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 27/42] hw/i2c: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 29/42] hw/virtio-balloon: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 30/42] hw/unicore32: restrict hw addr defines to source file, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 31/42] hw/timer/i8254: rename pit_init() -> i8254_pit_init(), Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 32/42] hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init(), Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 33/42] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch, Philippe Mathieu-Daudé, 2017/10/17