Commit 0e7a7592 authored by Markus Armbruster's avatar Markus Armbruster Committed by Blue Swirl
Browse files

vl: Use size_t for sizes in get_boot_devices_list() 



Code mixes uint32_t, int and size_t.  Very unlikely to go wrong in
practice, but clean it up anyway.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 089da572

hw/fw_cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ void fw_cfg_add_file(FWCfgState *s, const char *filename, 


static void fw_cfg_machine_ready(struct Notifier *n, void *data)

{

    uint32_t len;

    size_t len;

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

    char *bootindex = get_boot_devices_list(&len);

include/sysemu/sysemu.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ void register_devices(void); 


void add_boot_device_path(int32_t bootindex, DeviceState *dev,

                          const char *suffix);

char *get_boot_devices_list(uint32_t *size);

char *get_boot_devices_list(size_t *size);



bool usb_enabled(bool default_usb);

vl.c

+3 −3
Original line number Diff line number Diff line
@@ -1198,15 +1198,15 @@ void add_boot_device_path(int32_t bootindex, DeviceState *dev, 
 * memory pointed by "size" is assigned total length of the array in bytes

 *

 */

char *get_boot_devices_list(uint32_t *size)

char *get_boot_devices_list(size_t *size)

{

    FWBootEntry *i;

    uint32_t total = 0;

    size_t total = 0;

    char *list = NULL;



    QTAILQ_FOREACH(i, &fw_boot_order, link) {

        char *devpath = NULL, *bootpath;

        int len;

        size_t len;



        if (i->dev) {

            devpath = qdev_get_fw_dev_path(i->dev);