From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org, qemu-block@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
hpoussin@reactos.org,
Aleksandar Markovic <amarkovic@wavecomp.com>,
Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>,
Artyom Tarasenko <atar4qemu@gmail.com>,
Richard Henderson <rth@twiddle.net>
Subject: Re: [PATCH 3/8] hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h
Date: Sat, 14 Mar 2020 23:03:05 +0100 [thread overview]
Message-ID: <b06a8839-730d-7ce7-b0b1-f8b83068dc9e@redhat.com> (raw)
In-Reply-To: <7679b82b4f26fdb16f00c3b130f8e6a807724f73.1584134074.git.balaton@eik.bme.hu>
On 3/13/20 10:14 PM, BALATON Zoltan wrote:
> 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: Philippe Mathieu-Daudé <philmd@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"
>
next prev parent reply other threads:[~2020-03-14 22:04 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 21:14 [PATCH 0/8] Misc hw/ide legacy clean up BALATON Zoltan
2020-03-13 21:14 ` [PATCH 5/8] hw/ide/pci.c: Coding style update to fix checkpatch errors BALATON Zoltan
2020-03-14 22:05 ` Philippe Mathieu-Daudé
2020-03-13 21:14 ` [PATCH 6/8] hw/ide: Do ide_drive_get() within pci_ide_create_devs() BALATON Zoltan
2020-03-13 22:16 ` BALATON Zoltan
2020-03-14 10:01 ` Paolo Bonzini
2020-03-16 6:23 ` Markus Armbruster
2020-03-16 8:30 ` Philippe Mathieu-Daudé
2020-03-16 14:03 ` Markus Armbruster
2020-03-13 21:14 ` [PATCH 4/8] hw/ide: Move MAX_IDE_BUS define to one header BALATON Zoltan
2020-03-16 6:53 ` Markus Armbruster
2020-03-16 8:23 ` Philippe Mathieu-Daudé
2020-03-13 21:14 ` [PATCH 1/8] hw/ide: Get rid of piix3_init functions BALATON Zoltan
2020-03-14 21:59 ` Philippe Mathieu-Daudé
2020-03-16 6:34 ` Markus Armbruster
2020-03-16 12:40 ` BALATON Zoltan
2020-03-13 21:14 ` [PATCH 3/8] hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h BALATON Zoltan
2020-03-14 22:03 ` Philippe Mathieu-Daudé [this message]
2020-03-13 21:14 ` [PATCH 8/8] hw/ide: Remove unneeded inclusion of hw/ide.h BALATON Zoltan
2020-03-13 21:14 ` [PATCH 7/8] hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h BALATON Zoltan
2020-03-13 21:14 ` [PATCH 2/8] hw/ide: Get rid of piix4_init function BALATON Zoltan
2020-03-14 22:02 ` Philippe Mathieu-Daudé
2020-03-14 23:52 ` BALATON Zoltan
2020-03-15 5:35 ` Michael S. Tsirkin
2020-03-15 12:08 ` BALATON Zoltan
2020-03-14 11:45 ` [PATCH 0/8] Misc hw/ide legacy clean up Mark Cave-Ayland
2020-03-14 11:54 ` Paolo Bonzini
2020-03-16 6:58 ` Markus Armbruster
2020-03-16 13:06 ` BALATON Zoltan
2020-03-16 13:41 ` BALATON Zoltan
2020-03-17 4:25 ` John Snow
2020-03-16 12:55 ` [PATCH v2] hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h BALATON Zoltan
2020-03-16 13:35 ` [PATCH v2] hw/ide: Do ide_drive_get() within pci_ide_create_devs() BALATON Zoltan
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=b06a8839-730d-7ce7-b0b1-f8b83068dc9e@redhat.com \
--to=philmd@redhat.com \
--cc=amarkovic@wavecomp.com \
--cc=atar4qemu@gmail.com \
--cc=balaton@eik.bme.hu \
--cc=ehabkost@redhat.com \
--cc=hpoussin@reactos.org \
--cc=jsnow@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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).