qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 19/20] hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h
Date: Tue, 17 Mar 2020 19:23:28 -0400	[thread overview]
Message-ID: <20200317232329.22362-20-jsnow@redhat.com> (raw)
In-Reply-To: <20200317232329.22362-1-jsnow@redhat.com>

From: BALATON Zoltan <balaton@eik.bme.hu>

We can move this define now that less files use it to internal.h to
further reduce dependency on hw/ide.h.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-id: e68675d2f6252f229cf788b7cd163bb76fa3e26b.1584457537.git.balaton@eik.bme.hu
Signed-off-by: John Snow <jsnow@redhat.com>
---
 include/hw/ide.h          | 2 --
 include/hw/ide/internal.h | 2 ++
 hw/mips/mips_r4k.c        | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/hw/ide.h b/include/hw/ide.h
index d52c211f32..c5ce5da4f4 100644
--- a/include/hw/ide.h
+++ b/include/hw/ide.h
@@ -4,8 +4,6 @@
 #include "hw/isa/isa.h"
 #include "exec/memory.h"
 
-#define MAX_IDE_DEVS	2
-
 /* ide-isa.c */
 ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq,
                         DriveInfo *hd0, DriveInfo *hd1);
diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h
index 1bc1fc73e5..55da35d768 100644
--- a/include/hw/ide/internal.h
+++ b/include/hw/ide/internal.h
@@ -27,6 +27,8 @@ typedef struct IDEDMAOps IDEDMAOps;
 #define TYPE_IDE_BUS "IDE"
 #define IDE_BUS(obj) OBJECT_CHECK(IDEBus, (obj), TYPE_IDE_BUS)
 
+#define MAX_IDE_DEVS 2
+
 /* Bits of HD_STATUS */
 #define ERR_STAT		0x01
 #define INDEX_STAT		0x02
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index ad8b75e286..3487013a4a 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -26,6 +26,7 @@
 #include "qemu/log.h"
 #include "hw/mips/bios.h"
 #include "hw/ide.h"
+#include "hw/ide/internal.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "hw/rtc/mc146818rtc.h"
-- 
2.21.1



  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 ` [PULL 16/20] hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h John Snow
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 ` John Snow [this message]
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-20-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).