From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
qemu-block@nongnu.org, "Helge Deller" <deller@gmx.de>,
"Markus Armbruster" <armbru@redhat.com>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>,
"Richard Henderson" <rth@twiddle.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"John Snow" <jsnow@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Kevin Wolf" <kwolf@redhat.com>, "Max Reitz" <mreitz@redhat.com>,
qemu-ppc@nongnu.org,
"Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PULL 16/20] hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h
Date: Tue, 17 Mar 2020 19:23:25 -0400 [thread overview]
Message-ID: <20200317232329.22362-17-jsnow@redhat.com> (raw)
In-Reply-To: <20200317232329.22362-1-jsnow@redhat.com>
From: BALATON Zoltan <balaton@eik.bme.hu>
After previous patches we don't need hw/pci/pci.h any more in
hw/ide.h. Some files depended on implicit inclusion by this header
which are also fixed up here.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-id: 444a5e34331bf1f7880541b8d46e0353f470f5a6.1584457537.git.balaton@eik.bme.hu
Signed-off-by: John Snow <jsnow@redhat.com>
---
hw/ide/ahci_internal.h | 1 +
include/hw/ide.h | 1 -
include/hw/ide/pci.h | 1 +
include/hw/misc/macio/macio.h | 1 +
4 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h
index 73424516da..bab0459774 100644
--- a/hw/ide/ahci_internal.h
+++ b/hw/ide/ahci_internal.h
@@ -27,6 +27,7 @@
#include "hw/ide/ahci.h"
#include "hw/ide/internal.h"
#include "hw/sysbus.h"
+#include "hw/pci/pci.h"
#define AHCI_MEM_BAR_SIZE 0x1000
#define AHCI_MAX_PORTS 32
diff --git a/include/hw/ide.h b/include/hw/ide.h
index 21bd8f23f1..d52c211f32 100644
--- a/include/hw/ide.h
+++ b/include/hw/ide.h
@@ -2,7 +2,6 @@
#define HW_IDE_H
#include "hw/isa/isa.h"
-#include "hw/pci/pci.h"
#include "exec/memory.h"
#define MAX_IDE_DEVS 2
diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h
index a9f2c33e68..98ffa7dfcd 100644
--- a/include/hw/ide/pci.h
+++ b/include/hw/ide/pci.h
@@ -2,6 +2,7 @@
#define HW_IDE_PCI_H
#include "hw/ide/internal.h"
+#include "hw/pci/pci.h"
#define BM_STATUS_DMAING 0x01
#define BM_STATUS_ERROR 0x02
diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h
index 070a694eb5..87335a991c 100644
--- a/include/hw/misc/macio/macio.h
+++ b/include/hw/misc/macio/macio.h
@@ -27,6 +27,7 @@
#define MACIO_H
#include "hw/char/escc.h"
+#include "hw/pci/pci.h"
#include "hw/ide/internal.h"
#include "hw/intc/heathrow_pic.h"
#include "hw/misc/macio/cuda.h"
--
2.21.1
next prev parent reply other threads:[~2020-03-17 23:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 23:23 [PULL 00/20] Ide patches John Snow
2020-03-17 23:23 ` [PULL 01/20] cmd646: register cmd646_reset() function in DeviceClass John Snow
2020-03-17 23:23 ` [PULL 02/20] cmd646: register vmstate_ide_pci VMStateDescription " John Snow
2020-03-17 23:23 ` [PULL 03/20] dp264: use pci_create_simple() to initialise the cmd646 device John Snow
2020-03-17 23:23 ` [PULL 04/20] cmd646: remove unused pci_cmd646_ide_init() function John Snow
2020-03-17 23:23 ` [PULL 05/20] via-ide: move registration of VMStateDescription to DeviceClass John Snow
2020-03-17 23:23 ` [PULL 06/20] ide/via: Get rid of via_ide_init() John Snow
2020-03-17 23:23 ` [PULL 07/20] pci: Honour wmask when resetting PCI_INTERRUPT_LINE John Snow
2020-03-17 23:23 ` [PULL 08/20] via-ide: ensure that PCI_INTERRUPT_LINE is hard-wired to its default value John Snow
2020-03-17 23:23 ` [PULL 09/20] via-ide: initialise IDE controller in legacy mode John Snow
2020-03-17 23:23 ` [PULL 10/20] via-ide: allow guests to write to PCI_CLASS_PROG John Snow
2020-03-17 23:23 ` [PULL 11/20] via-ide: always use legacy IRQ 14/15 routing John Snow
2020-03-17 23:23 ` [PULL 12/20] hd-geo-test: Clean up use of buf[] in create_qcow2_with_mbr() John Snow
2020-03-17 23:23 ` [PULL 13/20] hw/ide: Get rid of piix3_init functions John Snow
2020-03-17 23:23 ` [PULL 14/20] hw/isa/piix4.c: Introduce variable to store devfn John Snow
2020-03-17 23:23 ` [PULL 15/20] hw/ide: Get rid of piix4_init function John Snow
2020-03-17 23:23 ` John Snow [this message]
2020-03-17 23:23 ` [PULL 17/20] hw/ide/pci.c: Coding style update to fix checkpatch errors John Snow
2020-03-17 23:23 ` [PULL 18/20] hw/ide: Do ide_drive_get() within pci_ide_create_devs() John Snow
2020-03-17 23:23 ` [PULL 19/20] hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h John Snow
2020-03-17 23:23 ` [PULL 20/20] hw/ide: Remove unneeded inclusion of hw/ide.h John Snow
2020-03-19 12:33 ` [PULL 00/20] Ide patches Peter Maydell
2020-03-19 18:02 ` John Snow
2020-03-23 22:27 ` Mark Cave-Ayland
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=20200317232329.22362-17-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=aleksandar.rikalo@rt-rk.com \
--cc=amarkovic@wavecomp.com \
--cc=armbru@redhat.com \
--cc=atar4qemu@gmail.com \
--cc=aurelien@aurel32.net \
--cc=david@gibson.dropbear.id.au \
--cc=deller@gmx.de \
--cc=ehabkost@redhat.com \
--cc=hpoussin@reactos.org \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=rth@twiddle.net \
--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 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).