[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] s390x: remove s390-zipl.rom
From: |
Christian Borntraeger |
Subject: |
Re: [Qemu-devel] [PATCH] s390x: remove s390-zipl.rom |
Date: |
Wed, 10 Feb 2016 12:35:34 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 |
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 <address@hidden>
> Signed-off-by: Michael Tokarev <address@hidden>
a minor nit below, otherwise
Acked-by: Christian Borntraeger <address@hidden>
> ---
> 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