Re: [Qemu-devel] [PATCH 04/10] S390: check if BIOS is available and create links

[Alexander Graf]

On 26.04.2013, at 14:12, Dominik Dingel wrote:

> Signed-off-by: Dominik Dingel <address@hidden>
> 
> Check if the BIOS is available before loading it into the memory.
> Create the needed Links for build.
> 
> Add a if the BIOS is available, also add the needed links for the build
> process.
> 
> diff --git a/configure b/configure
> index 19777de..2bbbd54 100755
> --- a/configure
> +++ b/configure
> @@ -4541,6 +4541,7 @@ for bios_file in \
>     $source_path/pc-bios/*.aml \
>     $source_path/pc-bios/*.rom \
>     $source_path/pc-bios/*.dtb \
> +    $source_path/pc-bios/*.img \
>     $source_path/pc-bios/openbios-* \
>     $source_path/pc-bios/palcode-*
> do
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index 9758529..36daa67 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -95,6 +95,10 @@ static int s390_ipl_init(SysBusDevice *dev)
>         }
> 
>         bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
> +        if (bios_filename == NULL) {
> +            hw_error("could not find stage1 bootloader\n");
> +        }
> +        
>         bios_size = load_elf(bios_filename, NULL, NULL, &ipl->start_addr, 
> NULL,
>                              NULL, 1, ELF_MACHINE, 0);
>         if (bios_size == -1UL) {
> diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
> index ad55a14..1e6ab1e 100644
> --- a/pc-bios/s390-ccw/Makefile
> +++ b/pc-bios/s390-ccw/Makefile
> @@ -21,6 +21,7 @@ s390-ccw.elf: $(OBJECTS)
> 
> s390-ccw.img: s390-ccw.elf
>       $(call quiet-command,strip $< -o $@,"  Stripping $(TARGET_DIR)$@")
> +     ln -s -f  `pwd`/$@ ../$@ 

I don't think we do this for any other blobs, so why should we here?

Alex

> 
> clean:
>       rm -f *.o *.d *.img *.elf *~
> -- 
> 1.7.9.5
>