commit 0e7a75929353b04bd2fce1be8640226883b42a10
author Markus Armbruster <armbru@redhat.com> Wed Jan 16 14:50:29 2013 +0100
committer Blue Swirl <blauwirbel@gmail.com> Sat Jan 19 10:22:48 2013 +0000
tree b50137042e6b5acccd807ab833abd12fbd6aba9a
parent 089da572b956ef0f8f5b8d5917358e07892a77c2

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>

hw/fw_cfg.c

diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c
index 699383c..3b31d77 100644
--- a/hw/fw_cfg.c
+++ b/hw/fw_cfg.c
@@ -471,7 +471,7 @@
 
 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

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index cd12f09..6599617 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -179,7 +179,7 @@
 
 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

diff --git a/vl.c b/vl.c
index f4cf7e8..4ee1302 100644
--- a/vl.c
+++ b/vl.c
@@ -1198,15 +1198,15 @@
  * 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);