Commit 30e32af7 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Andreas Färber
Browse files

vl.c: Extend get_boot_devices_list() to ignore suffixes 



As suffixes do not make sense for sPAPR's device tree and
there is no way to filter them out on the BusState::get_fw_dev_path()
level, let's add an ability for the external caller to specify
whether to apply suffixes or not.

We could handle suffixes in SLOF (ignored for now) but this would require
serious rework in the node opening code in SLOF, which has no obvious
benefit for the currently emulated sPAPR machine.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent a46622fd

hw/nvram/fw_cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static void fw_cfg_machine_ready(struct Notifier *n, void *data) 
{

    size_t len;

    FWCfgState *s = container_of(n, FWCfgState, machine_ready);

    char *bootindex = get_boot_devices_list(&len);

    char *bootindex = get_boot_devices_list(&len, false);



    fw_cfg_add_file(s, "bootorder", (uint8_t*)bootindex, len);

}

include/sysemu/sysemu.h

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ void rtc_change_mon_event(struct tm *tm); 


void add_boot_device_path(int32_t bootindex, DeviceState *dev,

                          const char *suffix);

char *get_boot_devices_list(size_t *size);

char *get_boot_devices_list(size_t *size, bool ignore_suffixes);



DeviceState *get_boot_device(uint32_t position);

vl.c

+5 −3
Original line number Diff line number Diff line
@@ -1209,7 +1209,7 @@ DeviceState *get_boot_device(uint32_t position) 
 * memory pointed by "size" is assigned total length of the array in bytes

 *

 */

char *get_boot_devices_list(size_t *size)

char *get_boot_devices_list(size_t *size, bool ignore_suffixes)

{

    FWBootEntry *i;

    size_t total = 0;
@@ -1224,7 +1224,7 @@ char *get_boot_devices_list(size_t *size) 
            assert(devpath);

        }



        if (i->suffix && devpath) {

        if (i->suffix && !ignore_suffixes && devpath) {

            size_t bootpathlen = strlen(devpath) + strlen(i->suffix) + 1;



            bootpath = g_malloc(bootpathlen);
@@ -1232,9 +1232,11 @@ char *get_boot_devices_list(size_t *size) 
            g_free(devpath);

        } else if (devpath) {

            bootpath = devpath;

        } else {

        } else if (!ignore_suffixes) {

            assert(i->suffix);

            bootpath = g_strdup(i->suffix);

        } else {

            bootpath = g_strdup("");

        }



        if (total) {