SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s390: remove bios_name

Browse Source 
Cc: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201026143028.3034018-13-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-10-26 10:30:25 -04:00
parent ac6dd9b9f3
commit f03443954b
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/s390x/ipl.c
View File

@ -128,11 +128,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
if (!ipl->kernel || ipl->enforce_bios) { if (!ipl->kernel || ipl->enforce_bios) {
uint64_t fwbase = (MIN(ram_size, 0x80000000U) - 0x200000) & ~0xffffUL; uint64_t fwbase = (MIN(ram_size, 0x80000000U) - 0x200000) & ~0xffffUL;
if (bios_name == NULL) { bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, ipl->firmware);
bios_name = ipl->firmware;
}
bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (bios_filename == NULL) { if (bios_filename == NULL) {
error_setg(errp, "could not find stage1 bootloader"); error_setg(errp, "could not find stage1 bootloader");
return; return;
@ -154,7 +150,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
g_free(bios_filename); g_free(bios_filename);
if (bios_size == -1) { 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; return;
} }

3
hw/s390x/s390-virtio-ccw.c
View File

@ -259,7 +259,8 @@ static void ccw_init(MachineState *machine)
/* get a BUS */ /* get a BUS */
css_bus = virtual_css_bus_init(); css_bus = virtual_css_bus_init();
s390_init_ipl_dev(machine->kernel_filename, machine->kernel_cmdline, 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); "s390-netboot.img", true);
dev = qdev_new(TYPE_S390_PCI_HOST_BRIDGE); dev = qdev_new(TYPE_S390_PCI_HOST_BRIDGE);