From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
To: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Cc: philmd@redhat.com
Subject: Re: [PATCH 14/15] sparc: remove bios_name
Date: Tue, 27 Oct 2020 16:21:21 +0000 [thread overview]
Message-ID: <8b0444f1-760d-5e6a-54fc-3cc2ccd345ed@ilande.co.uk> (raw)
In-Reply-To: <20201026143028.3034018-15-pbonzini@redhat.com>
On 26/10/2020 14:30, Paolo Bonzini wrote:
> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> hw/sparc/leon3.c | 4 +---
> hw/sparc/sun4m.c | 2 +-
> hw/sparc64/sun4u.c | 2 +-
> 3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
> index d40b7891f6..1c50b02f81 100644
> --- a/hw/sparc/leon3.c
> +++ b/hw/sparc/leon3.c
> @@ -185,6 +185,7 @@ static void leon3_set_pil_in(void *opaque, int n, int level)
> static void leon3_generic_hw_init(MachineState *machine)
> {
> ram_addr_t ram_size = machine->ram_size;
> + const char *bios_name = machine->firmware ?: LEON3_PROM_FILENAME;
> const char *kernel_filename = machine->kernel_filename;
> SPARCCPU *cpu;
> CPUSPARCState *env;
> @@ -259,9 +260,6 @@ static void leon3_generic_hw_init(MachineState *machine)
> memory_region_add_subregion(address_space_mem, LEON3_PROM_OFFSET, prom);
>
> /* Load boot prom */
> - if (bios_name == NULL) {
> - bios_name = LEON3_PROM_FILENAME;
> - }
> filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
>
> if (filename) {
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 38d1e0fd12..81d4ae9385 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -878,7 +878,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
> hwdef->max_mem - machine->ram_size);
> }
>
> - prom_init(hwdef->slavio_base, bios_name);
> + prom_init(hwdef->slavio_base, machine->firmware);
>
> slavio_intctl = slavio_intctl_init(hwdef->intctl_base,
> hwdef->intctl_base + 0x10000ULL,
> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
> index 05e659c8a4..50230d261a 100644
> --- a/hw/sparc64/sun4u.c
> +++ b/hw/sparc64/sun4u.c
> @@ -578,7 +578,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
> /* set up devices */
> ram_init(0, machine->ram_size);
>
> - prom_init(hwdef->prom_addr, bios_name);
> + prom_init(hwdef->prom_addr, machine->firmware);
>
> /* Init sabre (PCI host bridge) */
> sabre = SABRE(qdev_new(TYPE_SABRE));
Looks good to me:
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
ATB,
Mark.
next prev parent reply other threads:[~2020-10-27 16:23 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 14:30 [PATCH 00/15] remove bios_name variable Paolo Bonzini
2020-10-26 14:30 ` [PATCH 01/15] alpha: remove bios_name Paolo Bonzini
2020-10-26 17:09 ` Alex Bennée
2020-10-26 18:11 ` Philippe Mathieu-Daudé
2020-10-26 14:30 ` [PATCH 02/15] digic: stash firmware into DigicState Paolo Bonzini
2020-10-26 14:44 ` Peter Maydell
2020-10-26 15:05 ` Paolo Bonzini
2020-10-26 14:30 ` [PATCH 03/15] arm: remove bios_name Paolo Bonzini
2020-10-26 17:11 ` Alex Bennée
2020-10-26 14:30 ` [PATCH 04/15] hppa: " Paolo Bonzini
2020-10-26 17:12 ` Alex Bennée
2020-10-26 18:11 ` Philippe Mathieu-Daudé
2020-10-26 14:30 ` [PATCH 05/15] i386: " Paolo Bonzini
2020-10-26 17:15 ` Alex Bennée
2020-10-26 14:30 ` [PATCH 06/15] lm32: " Paolo Bonzini
2020-10-26 17:15 ` Alex Bennée
2020-10-26 18:12 ` Philippe Mathieu-Daudé
2020-10-26 14:30 ` [PATCH 07/15] m68k: " Paolo Bonzini
2020-10-26 17:17 ` Alex Bennée
2020-10-26 18:13 ` Philippe Mathieu-Daudé
2020-10-26 18:54 ` Thomas Huth
2020-10-26 19:11 ` Laurent Vivier
2020-10-27 13:26 ` Paolo Bonzini
2020-10-26 14:30 ` [PATCH 08/15] mips: " Paolo Bonzini
2020-10-26 17:20 ` Alex Bennée
2020-10-27 14:40 ` Philippe Mathieu-Daudé
2020-10-26 14:30 ` [PATCH 09/15] moxie: " Paolo Bonzini
2020-10-26 17:20 ` Alex Bennée
2020-10-26 14:30 ` [PATCH 10/15] ppc: " Paolo Bonzini
2020-10-26 17:21 ` Alex Bennée
2020-10-27 2:04 ` David Gibson
2020-10-26 14:30 ` [PATCH 11/15] rx: move BIOS load from MCU to board Paolo Bonzini
2020-10-26 17:24 ` Alex Bennée
2020-10-26 17:34 ` Paolo Bonzini
2020-10-26 19:00 ` Philippe Mathieu-Daudé
2020-10-26 14:30 ` [PATCH 12/15] s390: remove bios_name Paolo Bonzini
2020-10-26 17:29 ` Alex Bennée
2020-10-26 18:58 ` Thomas Huth
2020-10-27 8:37 ` Cornelia Huck
2020-10-27 8:38 ` Christian Borntraeger
2020-10-27 13:26 ` Paolo Bonzini
2020-10-26 14:30 ` [PATCH 13/15] sh4: " Paolo Bonzini
2020-10-26 17:29 ` Alex Bennée
2020-10-26 18:56 ` Philippe Mathieu-Daudé
2020-10-26 14:30 ` [PATCH 14/15] sparc: " Paolo Bonzini
2020-10-26 17:30 ` Alex Bennée
2020-10-26 18:57 ` Philippe Mathieu-Daudé
2020-10-27 16:21 ` Mark Cave-Ayland [this message]
2020-10-26 14:30 ` [PATCH 15/15] vl: " Paolo Bonzini
2020-10-26 17:30 ` Alex Bennée
2020-10-27 14:22 ` Thomas Huth
2020-10-26 14:51 ` [PATCH 00/15] remove bios_name variable no-reply
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=8b0444f1-760d-5e6a-54fc-3cc2ccd345ed@ilande.co.uk \
--to=mark.cave-ayland@ilande.co.uk \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@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).