diff options
| author | Alexander Graf <agraf@suse.de> | 2013-04-22 16:52:53 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-04-26 20:18:24 +0200 |
| commit | d0249ce5a8d11564958262fd567d1ea770358134 (patch) | |
| tree | 950f52decc07ac31ad78b70586d9e7cad60d98f0 /hw/s390x/ipl.c | |
| parent | 3325995640e0a598c4c350a1a02357b422e90973 (diff) | |
| download | qemu-d0249ce5a8d11564958262fd567d1ea770358134.zip qemu-d0249ce5a8d11564958262fd567d1ea770358134.tar.gz qemu-d0249ce5a8d11564958262fd567d1ea770358134.tar.bz2 | |
S390: IPL: Use different firmware for different machines
We have a virtio-s390 and a virtio-ccw machine in QEMU. Both use vastly
different ways to do I/O. Having the same firmware blob for both doesn't
really make any sense.
Instead, let's parametrize the firmware file name, so that we can have
different blobs for different machines.
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/s390x/ipl.c')
| -rw-r--r-- | hw/s390x/ipl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index d1f7acd..ace5ff5 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(), }; |