From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTT3f-0006t9-N1 for qemu-devel@nongnu.org; Wed, 10 Feb 2016 06:35:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTT3c-0004lt-HV for qemu-devel@nongnu.org; Wed, 10 Feb 2016 06:35:43 -0500 Received: from e06smtp08.uk.ibm.com ([195.75.94.104]:50529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTT3c-0004ld-4n for qemu-devel@nongnu.org; Wed, 10 Feb 2016 06:35:40 -0500 Received: from localhost by e06smtp08.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 10 Feb 2016 11:35:38 -0000 References: <1455102397-14425-1-git-send-email-mjt@msgid.tls.msk.ru> From: Christian Borntraeger Message-ID: <56BB2086.2040001@de.ibm.com> Date: Wed, 10 Feb 2016 12:35:34 +0100 MIME-Version: 1.0 In-Reply-To: <1455102397-14425-1-git-send-email-mjt@msgid.tls.msk.ru> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] s390x: remove s390-zipl.rom List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Tokarev , qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Pierre Morel , Richard Henderson 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 > Signed-off-by: Michael Tokarev a minor nit below, otherwise Acked-by: Christian Borntraeger > --- > 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