From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Michael Tokarev <mjt@tls.msk.ru>, qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Pierre Morel <pmorel@linux.vnet.ibm.com>,
Richard Henderson <rth@twiddle.net>
Subject: Re: [Qemu-devel] [PATCH] s390x: remove s390-zipl.rom
Date: Wed, 10 Feb 2016 12:35:34 +0100 [thread overview]
Message-ID: <56BB2086.2040001@de.ibm.com> (raw)
In-Reply-To: <1455102397-14425-1-git-send-email-mjt@msgid.tls.msk.ru>
On 02/10/2016 12:06 PM, Michael Tokarev wrote:
> This is an s390 boot rom which was used in s390-virtio machine.
> but since commit 3538fb6f89dd9bb2e7e59de2bfad52a45321c744
> "s390x: remove s390-virtio machine", this file isn't used.
> The only place it is referenced in the code is an unused
> which I'm modifying too, to refer to s390-ccw.rom instead.
>
> Cc: Pierre Morel <pmorel@linux.vnet.ibm.com>
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
a minor nit below, otherwise
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> Makefile | 1 -
> hw/s390x/ipl.c | 2 +-
> hw/s390x/s390-virtio.c | 1 -
> pc-bios/README | 4 ----
> pc-bios/s390-zipl.rom | Bin 3304 -> 0 bytes
> 5 files changed, 1 insertion(+), 7 deletions(-)
> delete mode 100644 pc-bios/s390-zipl.rom
>
> diff --git a/Makefile b/Makefile
> index 30b1b2d..f9fae3a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -400,7 +400,6 @@ efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \
> qemu-icon.bmp qemu_logo_no_text.svg \
> bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
> multiboot.bin linuxboot.bin kvmvapic.bin \
> -s390-zipl.rom \
> s390-ccw.img \
> spapr-rtas.bin slof.bin \
> palcode-clipper \
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index 6992add..4e6a0ac 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -106,7 +106,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
> /* Adjust ELF start address to final location */
> ipl->bios_start_addr += fwbase;
> } else {
> - /* Try to load non-ELF file (e.g. s390-zipl.rom) */
> + /* Try to load non-ELF file (e.g. s390-ccw.rom) */
s390-ccw.img
next prev parent reply other threads:[~2016-02-10 11:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-10 11:06 [Qemu-devel] [PATCH] s390x: remove s390-zipl.rom Michael Tokarev
2016-02-10 11:35 ` Christian Borntraeger [this message]
2016-02-10 11:48 ` Michael Tokarev
2016-02-16 6:07 ` Thomas Huth
2016-02-16 7:06 ` Thomas Huth
2016-02-16 8:43 ` Christian Borntraeger
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=56BB2086.2040001@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=mjt@tls.msk.ru \
--cc=pmorel@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=rth@twiddle.net \
/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).