Commit 26b2a2a4 authored by Collin L. Walling's avatar Collin L. Walling Committed by Thomas Huth
Browse files

s390-ccw: parse and set boot menu options 



Set boot menu options for an s390 guest and store them in
the iplb. These options are set via the QEMU command line
option:

    -boot menu=on|off[,splash-time=X]

or via the libvirt domain xml:

    <os>
      <bootmenu enable='yes|no' timeout='X'/>
    </os>

Where X represents some positive integer representing
milliseconds.

Any value set for loadparm will override all boot menu options.
If loadparm=PROMPT, then the menu will be enabled without a
timeout.

Signed-off-by: default avatarCollin L. Walling <walling@linux.vnet.ibm.com>
Reviewed-by: default avatarJanosch Frank <frankja@linux.vnet.ibm.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 118ee80f

hw/s390x/ipl.c

+52 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
#include "hw/s390x/ebcdic.h"

#include "ipl.h"

#include "qemu/error-report.h"

#include "qemu/config-file.h"

#include "qemu/cutils.h"

#include "qemu/option.h"



#define KERN_IMAGE_START                0x010000UL

#define KERN_PARM_AREA                  0x010480UL
@@ -219,6 +222,54 @@ static Property s390_ipl_properties[] = { 
    DEFINE_PROP_END_OF_LIST(),

};



static void s390_ipl_set_boot_menu(S390IPLState *ipl)

{

    QemuOptsList *plist = qemu_find_opts("boot-opts");

    QemuOpts *opts = QTAILQ_FIRST(&plist->head);

    uint8_t *flags = &ipl->qipl.qipl_flags;

    uint32_t *timeout = &ipl->qipl.boot_menu_timeout;

    const char *tmp;

    unsigned long splash_time = 0;



    if (!get_boot_device(0)) {

        if (boot_menu) {

            error_report("boot menu requires a bootindex to be specified for "

                         "the IPL device.");

        }

        return;

    }



    switch (ipl->iplb.pbt) {

    case S390_IPL_TYPE_CCW:

        break;

    default:

        error_report("boot menu is not supported for this device type.");

        return;

    }



    if (!boot_menu) {

        return;

    }



    *flags |= QIPL_FLAG_BM_OPTS_CMD;



    tmp = qemu_opt_get(opts, "splash-time");



    if (tmp && qemu_strtoul(tmp, NULL, 10, &splash_time)) {

        error_report("splash-time is invalid, forcing it to 0.");

        *timeout = 0;

        return;

    }



    if (splash_time > 0xffffffff) {

        error_report("splash-time is too large, forcing it to max value.");

        *timeout = 0xffffffff;

        return;

    }



    *timeout = cpu_to_be32(splash_time);

}



static bool s390_gen_initial_iplb(S390IPLState *ipl)

{

    DeviceState *dev_st;
@@ -435,6 +486,7 @@ void s390_ipl_prepare_cpu(S390CPU *cpu) 
        }

        ipl->qipl.netboot_start_addr = cpu_to_be64(ipl->start_addr);

    }

    s390_ipl_set_boot_menu(ipl);

    s390_ipl_prepare_qipl(cpu);

}

hw/s390x/ipl.h

+7 −2
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ void s390_reipl_request(void); 


#define QIPL_ADDRESS  0xcc



/* Boot Menu flags */

#define QIPL_FLAG_BM_OPTS_CMD   0x80



/*

 * The QEMU IPL Parameters will be stored at absolute address

 * 204 (0xcc) which means it is 32-bit word aligned but not
@@ -104,9 +107,11 @@ void s390_reipl_request(void); 
 * in pc-bios/s390-ccw/iplb.h.

 */

struct QemuIplParameters {

    uint8_t  reserved1[4];

    uint8_t  qipl_flags;

    uint8_t  reserved1[3];

    uint64_t netboot_start_addr;

    uint8_t  reserved2[16];

    uint32_t boot_menu_timeout;

    uint8_t  reserved2[12];

} QEMU_PACKED;

typedef struct QemuIplParameters QemuIplParameters;

pc-bios/s390-ccw/iplb.h

+7 −2
Original line number Diff line number Diff line
@@ -74,14 +74,19 @@ extern IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE))); 


#define QIPL_ADDRESS  0xcc



/* Boot Menu flags */

#define QIPL_FLAG_BM_OPTS_CMD   0x80



/*

 * This definition must be kept in sync with the defininition

 * in hw/s390x/ipl.h

 */

struct QemuIplParameters {

    uint8_t  reserved1[4];

    uint8_t  qipl_flags;

    uint8_t  reserved1[3];

    uint64_t netboot_start_addr;

    uint8_t  reserved2[16];

    uint32_t boot_menu_timeout;

    uint8_t  reserved2[12];

} __attribute__ ((packed));

typedef struct QemuIplParameters QemuIplParameters;