From: Thomas Huth <thuth@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
qemu-s390x <qemu-s390x@nongnu.org>,
Cornelia Huck <cohuck@redhat.com>,
philmd@redhat.com
Subject: Re: [PATCH 12/15] s390: remove bios_name
Date: Mon, 26 Oct 2020 19:58:18 +0100 [thread overview]
Message-ID: <d6b02fc1-7582-2fae-31b5-b5a1f3aa9b13@redhat.com> (raw)
In-Reply-To: <20201026143028.3034018-13-pbonzini@redhat.com>
On 26/10/2020 15.30, Paolo Bonzini wrote:
> Cc: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> hw/s390x/ipl.c | 8 ++------
> hw/s390x/s390-virtio-ccw.c | 3 ++-
> 2 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index 3d2652d75a..61e8c967d3 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -128,11 +128,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
> if (!ipl->kernel || ipl->enforce_bios) {
> uint64_t fwbase = (MIN(ram_size, 0x80000000U) - 0x200000) & ~0xffffUL;
>
> - if (bios_name == NULL) {
> - bios_name = ipl->firmware;
> - }
> -
> - bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
> + bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, ipl->firmware);
> if (bios_filename == NULL) {
> error_setg(errp, "could not find stage1 bootloader");
> return;
> @@ -154,7 +150,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
> g_free(bios_filename);
>
> if (bios_size == -1) {
> - error_setg(errp, "could not load bootloader '%s'", bios_name);
> + error_setg(errp, "could not load bootloader '%s'", ipl->firmware);
> return;
> }
>
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index e52182f946..a521eba673 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -258,7 +258,8 @@ static void ccw_init(MachineState *machine)
> /* get a BUS */
> css_bus = virtual_css_bus_init();
> s390_init_ipl_dev(machine->kernel_filename, machine->kernel_cmdline,
> - machine->initrd_filename, "s390-ccw.img",
> + machine->initrd_filename,
> + machine->firmware ?: "s390-ccw.img",
> "s390-netboot.img", true);
>
> dev = qdev_new(TYPE_S390_PCI_HOST_BRIDGE);
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
next prev parent reply other threads:[~2020-10-26 19:04 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 [this message]
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
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=d6b02fc1-7582-2fae-31b5-b5a1f3aa9b13@redhat.com \
--to=thuth@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@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).