aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2013-01-16 14:50:29 +0100
committerBlue Swirl <blauwirbel@gmail.com>2013-01-19 10:22:48 +0000
commit0e7a75929353b04bd2fce1be8640226883b42a10 (patch)
treeb50137042e6b5acccd807ab833abd12fbd6aba9a
parent089da572b956ef0f8f5b8d5917358e07892a77c2 (diff)
downloadqemu-arm-0e7a75929353b04bd2fce1be8640226883b42a10.tar.gz
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: Markus Armbruster <armbru@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--hw/fw_cfg.c2
-rw-r--r--include/sysemu/sysemu.h2
-rw-r--r--vl.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c
index 699383c87a..3b31d77f3f 100644
--- a/hw/fw_cfg.c
+++ b/hw/fw_cfg.c
@@ -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);
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index cd12f0931b..6599617def 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -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);
diff --git a/vl.c b/vl.c
index f4cf7e8a85..4ee1302595 100644
--- a/vl.c
+++ b/vl.c
@@ -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);