Commit 5f31ade0 authored by Farhan Ali's avatar Farhan Ali Committed by Cornelia Huck
Browse files

s390x/ipl: Extend S390IPLState to support network boot 



Add new field to S390IPLState to store the name of the network boot
loader.

Signed-off-by: default avatarFarhan Ali <alifm@linux.vnet.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
parent 34f1b23f

hw/s390x/ipl.c

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ static Property s390_ipl_properties[] = { 
    DEFINE_PROP_STRING("initrd", S390IPLState, initrd),

    DEFINE_PROP_STRING("cmdline", S390IPLState, cmdline),

    DEFINE_PROP_STRING("firmware", S390IPLState, firmware),

    DEFINE_PROP_STRING("netboot_fw", S390IPLState, netboot_fw),

    DEFINE_PROP_BOOL("enforce_bios", S390IPLState, enforce_bios, false),

    DEFINE_PROP_BOOL("iplbext_migration", S390IPLState, iplbext_migration,

                     true),

hw/s390x/ipl.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ struct S390IPLState { 
    char *initrd;

    char *cmdline;

    char *firmware;

    char *netboot_fw;

    uint8_t cssid;

    uint8_t ssid;

    uint16_t devno;

hw/s390x/s390-virtio-ccw.c

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ static void ccw_init(MachineState *machine) 
    /* get a BUS */

    css_bus = virtual_css_bus_init();

    s390_init_ipl_dev(machine->kernel_filename, machine->kernel_cmdline,

                      machine->initrd_filename, "s390-ccw.img", true);

                      machine->initrd_filename, "s390-ccw.img",

                      "s390-netboot.img", true);

    s390_flic_init();



    dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);

hw/s390x/s390-virtio.c

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ void s390_init_ipl_dev(const char *kernel_filename, 
                       const char *kernel_cmdline,

                       const char *initrd_filename,

                       const char *firmware,

                       const char *netboot_fw,

                       bool enforce_bios)

{

    Object *new = object_new(TYPE_S390_IPL);
@@ -78,6 +79,7 @@ void s390_init_ipl_dev(const char *kernel_filename, 
    }

    qdev_prop_set_string(dev, "cmdline", kernel_cmdline);

    qdev_prop_set_string(dev, "firmware", firmware);

    qdev_prop_set_string(dev, "netboot_fw", netboot_fw);

    qdev_prop_set_bit(dev, "enforce_bios", enforce_bios);

    object_property_add_child(qdev_get_machine(), TYPE_S390_IPL,

                              new, NULL);

hw/s390x/s390-virtio.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ void s390_init_ipl_dev(const char *kernel_filename, 
                       const char *kernel_cmdline,

                       const char *initrd_filename,

                       const char *firmware,

                       const char *netboot_fw,

                       bool enforce_bios);

void s390_create_virtio_net(BusState *bus, const char *name);

void s390_nmi(NMIState *n, int cpu_index, Error **errp);