From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Michael Tokarev <mjt@tls.msk.ru>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-devel@nongnu.org, qemu-trivial@nongnu.org
Subject: [Qemu-trivial] [PATCH v3 25/42] hw/ide: remove old i386 dependency
Date: Tue, 17 Oct 2017 13:44:09 -0300 [thread overview]
Message-ID: <20171017164426.25277-26-f4bug@amsat.org> (raw)
In-Reply-To: <20171017164426.25277-1-f4bug@amsat.org>
and remove a duplicated include
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: John Snow <jsnow@redhat.com>
---
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
next prev parent reply other threads:[~2017-10-17 16:46 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-17 16:43 [Qemu-trivial] [PATCH v3 00/42] remove i386/pc dependency from non-PC world (part 1) Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 01/42] MAINTAINERS: add entries for i2c/ppc4xx Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 02/42] MAINTAINERS: add an entry for the i82374 (southbridge) Philippe Mathieu-Daudé
2017-10-18 12:04 ` Thomas Huth
2017-11-06 21:41 ` Hervé Poussineau
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 03/42] MAINTAINERS: add an entry for the i8257 (DMA controller) Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 04/42] MAINTAINERS: add an entry for the i82378 (superio) Philippe Mathieu-Daudé
2017-11-06 22:12 ` Hervé Poussineau
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 05/42] MAINTAINERS: add an entry for watchdog/wdt_ib700 Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 06/42] MAINTAINERS: add an entry for input/pckbd.c Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 07/42] MAINTAINERS: add entries for timer/m48t59 Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 08/42] MAINTAINERS: add missing entry for include/hw/net/ Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 09/42] hw: use "qemu/osdep.h" as first #include in source files Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 10/42] hw: remove "qemu/osdep.h" from header files Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 11/42] block: remove "qemu/osdep.h" from header file Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 12/42] misc: remove headers implicitly included Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 13/42] misc: remove duplicated includes Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 14/42] ppc: " Philippe Mathieu-Daudé
2017-10-17 16:43 ` [Qemu-trivial] [PATCH v3 15/42] i386/hax: " Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 16/42] i386/hax: remove duplicated include Philippe Mathieu-Daudé
2017-10-18 12:12 ` Thomas Huth
2017-10-18 12:18 ` Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 17/42] nios2: remove duplicated includes (in code commented out) Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 18/42] misc: avoid "include/" in include path Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 19/42] numa: remove unused #include Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 20/42] hw/input/vmmouse: " Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 21/42] hw/misc/pvpanic: " Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 22/42] hw/ssi/aspeed_smc: " Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 23/42] amd_iommu: avoid needless includes in header file Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 24/42] misc: remove old i386 dependency Philippe Mathieu-Daudé
2017-10-17 16:44 ` Philippe Mathieu-Daudé [this message]
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 26/42] hw/ipmi: " Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 27/42] hw/i2c: " Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 28/42] hw/tpm: " Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 29/42] hw/virtio-balloon: " Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 30/42] hw/unicore32: restrict hw addr defines to source file Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 31/42] hw/timer/i8254: rename pit_init() -> i8254_pit_init() Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 32/42] hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init() Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 33/42] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch Philippe Mathieu-Daudé
2017-10-18 7:44 ` Igor Mammedov
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 34/42] hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc Philippe Mathieu-Daudé
2017-10-18 7:45 ` Igor Mammedov
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 35/42] hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h" Philippe Mathieu-Daudé
2017-10-18 12:26 ` [Qemu-trivial] [Qemu-devel] " Thomas Huth
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 36/42] hw/display/vga: "vga_int.h" requires "ui/console.h" Philippe Mathieu-Daudé
2017-10-18 12:14 ` Thomas Huth
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 37/42] hw/display/vga: extract public API from i386/pc to "hw/display/vga.h" Philippe Mathieu-Daudé
2017-10-18 12:19 ` Thomas Huth
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 38/42] hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 39/42] hw/misc/pvpanic: extract public API from i386/pc to "hw/misc/pvpanic.h" Philippe Mathieu-Daudé
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 40/42] i386/pc: move vmport.c to hw/i386/ Philippe Mathieu-Daudé
2017-10-18 12:47 ` Thomas Huth
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 41/42] i386/pc: move vmmouse.c " Philippe Mathieu-Daudé
2017-10-18 12:49 ` Thomas Huth
2017-10-17 16:44 ` [Qemu-trivial] [PATCH v3 42/42] misc: drop old i386 dependency Philippe Mathieu-Daudé
2017-11-06 19:02 ` [Qemu-trivial] [PATCH v3 00/42] remove i386/pc dependency from non-PC world (part 1) Philippe Mathieu-Daudé
2017-11-08 16:56 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171017164426.25277-26-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=mjt@tls.msk.ru \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).