qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: BALATON Zoltan <balaton@eik.bme.hu>
To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Subject: [PATCH v2 10/13] hw/ppc/mac.h: Move grackle-pcihost declaration out from shared header
Date: Sun, 25 Sep 2022 14:38:17 +0200 (CEST)	[thread overview]
Message-ID: <2ff9b0ca151cab09512b37d855d03eee4a62812a.1664108862.git.balaton@eik.bme.hu> (raw)
In-Reply-To: <cover.1664108862.git.balaton@eik.bme.hu>

It is only used by mac_oldworld anyway and it already instantiates
a few devices by name so this allows reducing the shared header further.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
 hw/pci-host/grackle.c | 1 +
 hw/ppc/mac.h          | 3 ---
 hw/ppc/mac_oldworld.c | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c
index b05facf463..5282123004 100644
--- a/hw/pci-host/grackle.c
+++ b/hw/pci-host/grackle.c
@@ -34,6 +34,7 @@
 #include "trace.h"
 #include "qom/object.h"
 
+#define TYPE_GRACKLE_PCI_HOST_BRIDGE "grackle-pcihost"
 OBJECT_DECLARE_SIMPLE_TYPE(GrackleState, GRACKLE_PCI_HOST_BRIDGE)
 
 struct GrackleState {
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
index 55cb02c990..fe77a6c6db 100644
--- a/hw/ppc/mac.h
+++ b/hw/ppc/mac.h
@@ -35,9 +35,6 @@
 #define KERNEL_LOAD_ADDR 0x01000000
 #define KERNEL_GAP       0x00100000
 
-/* Grackle PCI */
-#define TYPE_GRACKLE_PCI_HOST_BRIDGE "grackle-pcihost"
-
 /* Mac NVRAM */
 #define TYPE_MACIO_NVRAM "macio-nvram"
 OBJECT_DECLARE_SIMPLE_TYPE(MacIONVRAMState, MACIO_NVRAM)
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 1fa7b770b7..1355d032ff 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -214,7 +214,7 @@ static void ppc_heathrow_init(MachineState *machine)
     }
 
     /* Grackle PCI host bridge */
-    grackle_dev = qdev_new(TYPE_GRACKLE_PCI_HOST_BRIDGE);
+    grackle_dev = qdev_new("grackle-pcihost");
     qdev_prop_set_uint32(grackle_dev, "ofw-addr", 0x80000000);
     s = SYS_BUS_DEVICE(grackle_dev);
     sysbus_realize_and_unref(s, &error_fatal);
-- 
2.30.4



  parent reply	other threads:[~2022-09-25 12:55 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-25 12:38 [PATCH v2 00/13] Misc ppc/mac machines clean up BALATON Zoltan
2022-09-25 12:38 ` [PATCH v2 01/13] mac_newworld: Drop some variables BALATON Zoltan
2022-09-25 12:38 ` [PATCH v2 02/13] mac_oldworld: Drop some more variables BALATON Zoltan
2022-09-25 12:38 ` [PATCH v2 03/13] mac_{old|new}world: Set tbfreq at declaration BALATON Zoltan
2022-09-29  7:09   ` Mark Cave-Ayland
2022-09-25 12:38 ` [PATCH v2 04/13] mac_{old|new}world: Avoid else branch by setting default value BALATON Zoltan
2022-09-25 12:38 ` [PATCH v2 05/13] mac_oldworld: Do not open code sysbus_mmio_map() BALATON Zoltan
2022-09-29  7:28   ` Mark Cave-Ayland
2022-09-29 11:32     ` BALATON Zoltan
2022-10-03  7:54       ` Mark Cave-Ayland
2022-10-03 20:18         ` BALATON Zoltan
2022-09-25 12:38 ` [PATCH v2 06/13] mac_newworld: Simplify creation of Uninorth devices BALATON Zoltan
2022-09-29  7:39   ` Mark Cave-Ayland
2022-10-03 14:05     ` Philippe Mathieu-Daudé via
2022-10-04  6:39       ` Markus Armbruster
2022-10-04  8:00         ` Daniel P. Berrangé
2022-09-25 12:38 ` [PATCH v2 07/13] mac_{old|new}world: Reduce number of QOM casts BALATON Zoltan
2022-09-25 12:38 ` [PATCH v2 08/13] hw/ppc/mac.h: Move newworld specific parts out from shared header BALATON Zoltan
2022-09-25 12:38 ` [PATCH v2 09/13] hw/ppc/mac.h: Move macio " BALATON Zoltan
2022-09-29  7:43   ` Mark Cave-Ayland
2022-09-25 12:38 ` BALATON Zoltan [this message]
2022-09-29  7:44   ` [PATCH v2 10/13] hw/ppc/mac.h: Move grackle-pcihost declaration " Mark Cave-Ayland
2022-09-29 11:42     ` BALATON Zoltan
2022-10-03  7:57       ` Mark Cave-Ayland
2022-09-25 12:38 ` [PATCH v2 11/13] hw/ppc/mac.h: Move PROM and KERNEL defines to board code BALATON Zoltan
2022-09-25 12:38 ` [PATCH v2 12/13] hw/ppc/mac.h: Rename to include/hw/nvram/mac_nvram.h BALATON Zoltan
2022-09-25 12:38 ` [PATCH v2 13/13] mac_nvram: Use NVRAM_SIZE constant BALATON Zoltan
2022-09-29  7:45   ` Mark Cave-Ayland
2022-09-26 21:40 ` [PATCH v2 00/13] Misc ppc/mac machines clean up Daniel Henrique Barboza
2022-10-03  8:11   ` 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=2ff9b0ca151cab09512b37d855d03eee4a62812a.1664108862.git.balaton@eik.bme.hu \
    --to=balaton@eik.bme.hu \
    --cc=mark.cave-ayland@ilande.co.uk \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@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).