All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Peter Maydell <peter.maydell@linaro.org>,
	Thomas Huth <thuth@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	qemu-devel@nongnu.org, qemu-block@nongnu.org,
	qemu-trivial@nongnu.org
Subject: [Qemu-devel] [PATCH 13/34] hw/ide: remove old i386 dependency
Date: Fri, 22 Sep 2017 12:39:53 -0300	[thread overview]
Message-ID: <20170922154014.29350-14-f4bug@amsat.org> (raw)
In-Reply-To: <20170922154014.29350-1-f4bug@amsat.org>

and remove a duplicated include

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 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 d63eb4a72e..6438efa8f4 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 9472a60cab..48513c7e9d 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 f2dcc0ed77..34237c92fc 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.14.1

  parent reply	other threads:[~2017-09-22 15:41 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-22 15:39 [Qemu-devel] [PATCH 00/34] remove i386/pc dependency from non-PC world (part 1) Philippe Mathieu-Daudé
2017-09-22 15:39 ` [Qemu-devel] [PATCH 01/34] hw: use "qemu/osdep.h" as first #include in source files Philippe Mathieu-Daudé
2017-09-22 16:06   ` Peter Maydell
2017-09-23  5:08   ` David Gibson
2017-09-25  8:10   ` Cornelia Huck
2017-09-22 15:39 ` [Qemu-devel] [PATCH 02/34] hw: remove "qemu/osdep.h" from header files Philippe Mathieu-Daudé
2017-09-22 16:07   ` Peter Maydell
2017-09-22 16:54     ` Corey Minyard
2017-09-22 17:58     ` Philippe Mathieu-Daudé
2017-09-22 15:39 ` [Qemu-devel] [PATCH 03/34] block: remove "qemu/osdep.h" from header file Philippe Mathieu-Daudé
2017-09-22 16:32   ` Peter Maydell
2017-09-22 15:39 ` [Qemu-devel] [PATCH 04/34] misc: remove headers implicitly included Philippe Mathieu-Daudé
2017-09-22 16:31   ` Peter Maydell
2017-09-25  9:01   ` Stefan Hajnoczi
2017-09-22 15:39 ` [Qemu-devel] [PATCH 05/34] misc: remove duplicated includes Philippe Mathieu-Daudé
2017-09-22 16:39   ` Peter Maydell
2017-09-25  8:12   ` Cornelia Huck
2017-10-10 15:37   ` Anthony PERARD
2017-09-22 15:39 ` [Qemu-devel] [PATCH 06/34] ppc: " Philippe Mathieu-Daudé
2017-09-22 16:39   ` Peter Maydell
2017-09-23  5:31   ` David Gibson
2017-09-22 15:39 ` [Qemu-devel] [PATCH 07/34] i386/hax: " Philippe Mathieu-Daudé
2017-09-22 16:42   ` Peter Maydell
2017-09-22 15:39 ` [Qemu-devel] [PATCH 08/34] nios2: " Philippe Mathieu-Daudé
2017-09-22 16:44   ` Peter Maydell
2017-09-22 15:39 ` [Qemu-devel] [PATCH 09/34] misc: avoid "include/" in include path Philippe Mathieu-Daudé
2017-09-22 16:46   ` Peter Maydell
2017-09-22 15:39 ` [Qemu-devel] [PATCH 10/34] amd_iommu: avoid needless includes in header file Philippe Mathieu-Daudé
2017-09-25  5:13   ` Thomas Huth
2017-09-22 15:39 ` [Qemu-devel] [PATCH 11/34] i386/pc: use TYPE_PORT92 Philippe Mathieu-Daudé
2017-09-25  5:16   ` Thomas Huth
2017-09-22 15:39 ` [Qemu-devel] [PATCH 12/34] misc: remove old i386 dependency Philippe Mathieu-Daudé
2017-09-25  5:15   ` Thomas Huth
2017-10-10 15:37   ` Anthony PERARD
2017-09-22 15:39 ` Philippe Mathieu-Daudé [this message]
2017-09-22 18:03   ` [Qemu-devel] [PATCH 13/34] hw/ide: " John Snow
2017-09-22 15:39 ` [Qemu-devel] [PATCH 14/34] hw/ipmi: " Philippe Mathieu-Daudé
2017-09-22 16:58   ` Corey Minyard
2017-09-22 15:39 ` [Qemu-devel] [PATCH 15/34] hw/i2c: " Philippe Mathieu-Daudé
2017-09-25  5:17   ` Thomas Huth
2017-09-22 15:39 ` [Qemu-devel] [PATCH 16/34] hw/tpm: " Philippe Mathieu-Daudé
2017-09-22 16:05   ` Stefan Berger
2017-09-22 15:39 ` [Qemu-devel] [PATCH 17/34] hw/virtio-balloon: " Philippe Mathieu-Daudé
2017-09-25  5:23   ` Thomas Huth
2017-09-22 15:39 ` [Qemu-devel] [PATCH 18/34] hw/unicore32: restrict hw addr defines to source file Philippe Mathieu-Daudé
2017-09-25  5:19   ` Thomas Huth
2017-09-22 15:39 ` [Qemu-devel] [PATCH 19/34] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch Philippe Mathieu-Daudé
2017-09-22 15:40 ` [Qemu-devel] [PATCH 20/34] hw/timer/i8254: rename pit_init() -> i8254_pit_init() Philippe Mathieu-Daudé
2017-09-22 20:09   ` Hervé Poussineau
2017-09-22 15:40 ` [Qemu-devel] [PATCH 22/34] hw/input/i8042: extract API from hw/i386/pc.h Philippe Mathieu-Daudé
2017-09-22 20:10   ` Hervé Poussineau
2017-09-23  5:09   ` David Gibson
2017-09-22 16:01 ` [Qemu-devel] [PATCH 23/34] hw/dma/i8257: rename DMA_init() to i8257_dma_init() Philippe Mathieu-Daudé
2017-09-22 17:43   ` Hervé Poussineau
2017-09-22 18:08     ` [Qemu-devel] [Qemu-trivial] " Philippe Mathieu-Daudé
2017-10-06 12:09       ` Eduardo Otubo"
2017-09-22 16:01 ` [Qemu-devel] [PATCH 24/34] hw/timer/mc146818: rename rtc_init() -> mc146818_init() Philippe Mathieu-Daudé
2017-09-22 20:11   ` Hervé Poussineau
2017-09-23  5:10   ` David Gibson
2017-09-22 16:01 ` [Qemu-devel] [PATCH 25/34] hw/timer/m48t59: use TYPE_M48T59_ISA, add entries to MAINTAINERS Philippe Mathieu-Daudé
2017-09-22 20:12   ` Hervé Poussineau
2017-09-23  5:11   ` David Gibson
2017-09-22 16:01 ` [Qemu-devel] [PATCH 26/34] hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c Philippe Mathieu-Daudé
2017-09-22 20:13   ` Hervé Poussineau
2017-09-23  5:11   ` David Gibson
2017-09-22 16:01 ` [Qemu-devel] [PATCH 27/34] hw/pci: declare pci_nic_init_nofail() in "hw/net/pci.h" Philippe Mathieu-Daudé
2017-09-23  5:12   ` David Gibson
2017-09-25 14:30   ` Marcel Apfelbaum
2017-10-02 18:38     ` Philippe Mathieu-Daudé
2017-10-17  0:24       ` Philippe Mathieu-Daudé
2017-09-22 16:01 ` [Qemu-devel] [PATCH 28/34] hw/net/e1000: use TYPE_PCI_E1000 Philippe Mathieu-Daudé
2017-09-23  5:13   ` David Gibson
2017-09-22 16:01 ` [Qemu-devel] [PATCH 29/34] hw/net/e1000e: use TYPE_PCI_E1000E Philippe Mathieu-Daudé
2017-09-25  5:34   ` Thomas Huth
2017-09-22 16:01 ` [Qemu-devel] [PATCH 30/34] hw/net/pcnet: use TYPE_PCI_PCNET Philippe Mathieu-Daudé
2017-09-22 20:13   ` Hervé Poussineau
2017-09-23  5:14   ` David Gibson
2017-09-22 16:01 ` [Qemu-devel] [PATCH 31/34] hw/net/rtl8139: use TYPE_PCI_RTL8139 Philippe Mathieu-Daudé
2017-09-25  5:36   ` Thomas Huth
2017-09-22 16:01 ` [Qemu-devel] [PATCH 32/34] hw/net/ne2000: use TYPE_PCI_NE2000 Philippe Mathieu-Daudé
2017-09-22 20:14   ` Hervé Poussineau
2017-09-23  5:14   ` David Gibson
2017-09-22 16:01 ` [Qemu-devel] [PATCH 33/34] hw/alpha: remove old i386 dependency Philippe Mathieu-Daudé
2017-09-25  5:38   ` Thomas Huth
2017-10-02 18:52     ` Philippe Mathieu-Daudé
2017-10-02 19:03   ` Richard Henderson
2017-10-06 12:27     ` Philippe Mathieu-Daudé
2017-09-22 16:01 ` [Qemu-devel] [PATCH 34/34] misc: drop " Philippe Mathieu-Daudé
2017-09-25  5:40   ` Thomas Huth
     [not found] ` <20170922154014.29350-22-f4bug@amsat.org>
2017-09-22 20:10   ` [Qemu-devel] [PATCH 21/34] hw/display/vga: remove the old i386/pc dependency Hervé Poussineau
2017-10-16 19:44 ` [Qemu-devel] [PATCH 00/34] remove i386/pc dependency from non-PC world (part 1) Michael Tokarev
2017-10-16 22:49   ` Philippe Mathieu-Daudé

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=20170922154014.29350-14-f4bug@amsat.org \
    --to=f4bug@amsat.org \
    --cc=jsnow@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=thuth@redhat.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.