From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com,
peter.maydell@linaro.org, richard.henderson@linaro.org,
BALATON Zoltan <balaton@eik.bme.hu>
Subject: [PULL 3/7] ppc/pegasos2: Fix naming of device tree nodes
Date: Fri, 4 Aug 2023 12:29:51 -0300 [thread overview]
Message-ID: <20230804152955.22316-4-danielhb413@gmail.com> (raw)
In-Reply-To: <20230804152955.22316-1-danielhb413@gmail.com>
From: BALATON Zoltan <balaton@eik.bme.hu>
The board firmware names devices by their class so match that for
common devices. Also make sure the /rtas node has a name. This is
needed because VOF otherwise does not include it in results got by
nextprop which is how AmigaOS queries it and fails if no name property
is found.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-ID: <808ade37aa141563d1ee349254151672bf7a5d59.1689725688.git.balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/pegasos2.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
index 8ed13a42a2..6475acfbed 100644
--- a/hw/ppc/pegasos2.c
+++ b/hw/ppc/pegasos2.c
@@ -739,6 +739,13 @@ static void add_pci_device(PCIBus *bus, PCIDevice *d, void *opaque)
pci_get_word(&d->config[PCI_VENDOR_ID]),
pci_get_word(&d->config[PCI_DEVICE_ID]));
+ if (pci_get_word(&d->config[PCI_CLASS_DEVICE]) ==
+ PCI_CLASS_NETWORK_ETHERNET) {
+ name = "ethernet";
+ } else if (pci_get_word(&d->config[PCI_CLASS_DEVICE]) >> 8 ==
+ PCI_BASE_CLASS_DISPLAY) {
+ name = "display";
+ }
for (i = 0; device_map[i].id; i++) {
if (!strcmp(pn, device_map[i].id)) {
name = device_map[i].name;
@@ -929,6 +936,7 @@ static void *build_fdt(MachineState *machine, int *fdt_size)
qemu_fdt_setprop_cell(fdt, "/rtas", "rtas-display-device", 0);
qemu_fdt_setprop_cell(fdt, "/rtas", "rtas-size", 20);
qemu_fdt_setprop_cell(fdt, "/rtas", "rtas-version", 1);
+ qemu_fdt_setprop_string(fdt, "/rtas", "name", "rtas");
/* cpus */
qemu_fdt_add_subnode(fdt, "/cpus");
--
2.41.0
next prev parent reply other threads:[~2023-08-04 15:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-04 15:29 [PULL 0/7] ppc queue Daniel Henrique Barboza
2023-08-04 15:29 ` [PULL 1/7] ppc/pegasos2: Fix reset state of USB functions Daniel Henrique Barboza
2023-08-04 15:29 ` [PULL 2/7] ppc/pegasos2: Fix reg property of ROM BARs Daniel Henrique Barboza
2023-08-04 15:29 ` Daniel Henrique Barboza [this message]
2023-08-04 15:29 ` [PULL 4/7] ppc/pegasos2: Fix reg property of 64 bit BARs in device tree Daniel Henrique Barboza
2023-08-04 15:29 ` [PULL 5/7] target/ppc: Implement ASDR register for ISA v3.0 for HPT Daniel Henrique Barboza
2023-08-04 15:29 ` [PULL 6/7] target/ppc: Fix pending HDEC when entering PM state Daniel Henrique Barboza
2023-08-04 15:29 ` [PULL 7/7] target/ppc: Fix VRMA page size for ISA v3.0 Daniel Henrique Barboza
2023-08-04 19:37 ` [PULL 0/7] ppc queue Richard Henderson
2023-08-05 6:56 ` Michael Tokarev
2023-08-06 20:09 ` Cédric Le Goater
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=20230804152955.22316-4-danielhb413@gmail.com \
--to=danielhb413@gmail.com \
--cc=balaton@eik.bme.hu \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=richard.henderson@linaro.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).