diff options
| -rw-r--r-- | hw/s390x/ipl.c | 5 | ||||
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 2 | ||||
| -rw-r--r-- | hw/s390x/s390-virtio.c | 7 | ||||
| -rw-r--r-- | hw/s390x/s390-virtio.h | 3 |
4 files changed, 11 insertions, 6 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index d1f7acd5fb..ace5ff50d1 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -23,7 +23,6 @@ #define INITRD_PARM_START 0x010408UL #define INITRD_PARM_SIZE 0x010410UL #define PARMFILE_START 0x001000UL -#define ZIPL_FILENAME "s390-zipl.rom" #define ZIPL_IMAGE_START 0x009000UL #define IPL_PSW_MASK (PSW_MASK_32 | PSW_MASK_64) @@ -54,6 +53,7 @@ typedef struct S390IPLState { char *kernel; char *initrd; char *cmdline; + char *firmware; } S390IPLState; @@ -78,7 +78,7 @@ static int s390_ipl_init(SysBusDevice *dev) /* Load zipl bootloader */ if (bios_name == NULL) { - bios_name = ZIPL_FILENAME; + bios_name = ipl->firmware; } bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); @@ -144,6 +144,7 @@ static Property s390_ipl_properties[] = { DEFINE_PROP_STRING("kernel", S390IPLState, kernel), DEFINE_PROP_STRING("initrd", S390IPLState, initrd), DEFINE_PROP_STRING("cmdline", S390IPLState, cmdline), + DEFINE_PROP_STRING("firmware", S390IPLState, firmware), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index a49e4401cd..8ea193e244 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -83,7 +83,7 @@ static void ccw_init(QEMUMachineInitArgs *args) css_bus = virtual_css_bus_init(); s390_sclp_init(); s390_init_ipl_dev(args->kernel_filename, args->kernel_cmdline, - args->initrd_filename); + args->initrd_filename, "s390-zipl.rom"); /* register hypercalls */ virtio_ccw_register_hcalls(); diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 46aec999a6..30d1118cdc 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -49,6 +49,7 @@ #endif #define MAX_BLK_DEVS 10 +#define ZIPL_FILENAME "s390-zipl.rom" static VirtIOS390Bus *s390_bus; static S390CPU **ipi_states; @@ -158,7 +159,8 @@ unsigned s390_del_running_cpu(S390CPU *cpu) void s390_init_ipl_dev(const char *kernel_filename, const char *kernel_cmdline, - const char *initrd_filename) + const char *initrd_filename, + const char *firmware) { DeviceState *dev; @@ -170,6 +172,7 @@ void s390_init_ipl_dev(const char *kernel_filename, qdev_prop_set_string(dev, "initrd", initrd_filename); } qdev_prop_set_string(dev, "cmdline", kernel_cmdline); + qdev_prop_set_string(dev, "firmware", firmware); qdev_init_nofail(dev); } @@ -247,7 +250,7 @@ static void s390_init(QEMUMachineInitArgs *args) s390_bus = s390_virtio_bus_init(&my_ram_size); s390_sclp_init(); s390_init_ipl_dev(args->kernel_filename, args->kernel_cmdline, - args->initrd_filename); + args->initrd_filename, ZIPL_FILENAME); /* register hypercalls */ s390_virtio_register_hcalls(); diff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio.h index a6c4c19895..5c405e7755 100644 --- a/hw/s390x/s390-virtio.h +++ b/hw/s390x/s390-virtio.h @@ -23,6 +23,7 @@ void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn); void s390_init_cpus(const char *cpu_model, uint8_t *storage_keys); void s390_init_ipl_dev(const char *kernel_filename, const char *kernel_cmdline, - const char *initrd_filename); + const char *initrd_filename, + const char *firmware); void s390_create_virtio_net(BusState *bus, const char *name); #endif |