Revision d0249ce5 hw/s390x/ipl.c

b/hw/s390x/ipl.c
23 23
#define INITRD_PARM_START               0x010408UL
24 24
#define INITRD_PARM_SIZE                0x010410UL
25 25
#define PARMFILE_START                  0x001000UL
26
#define ZIPL_FILENAME                   "s390-zipl.rom"
27 26
#define ZIPL_IMAGE_START                0x009000UL
28 27
#define IPL_PSW_MASK                    (PSW_MASK_32 | PSW_MASK_64)
29 28

  
......
54 53
    char *kernel;
55 54
    char *initrd;
56 55
    char *cmdline;
56
    char *firmware;
57 57
} S390IPLState;
58 58

  
59 59

  
......
78 78

  
79 79
        /* Load zipl bootloader */
80 80
        if (bios_name == NULL) {
81
            bios_name = ZIPL_FILENAME;
81
            bios_name = ipl->firmware;
82 82
        }
83 83

  
84 84
        bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
......
144 144
    DEFINE_PROP_STRING("kernel", S390IPLState, kernel),
145 145
    DEFINE_PROP_STRING("initrd", S390IPLState, initrd),
146 146
    DEFINE_PROP_STRING("cmdline", S390IPLState, cmdline),
147
    DEFINE_PROP_STRING("firmware", S390IPLState, firmware),
147 148
    DEFINE_PROP_END_OF_LIST(),
148 149
};
149 150

  

Also available in: Unified diff