aboutsummaryrefslogtreecommitdiff
path: root/hw/nvram
diff options
context:
space:
mode:
authorPeter Crosthwaite <peter.crosthwaite@xilinx.com>2013-05-22 13:01:43 +1000
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-22 07:40:09 -0500
commit3d1bba20913356ff4f8ff2c38519f10c5f4b77e6 (patch)
tree20564a0e6285f45825429c8823196e9bdf2f42ba /hw/nvram
parent1239b472bb0dba8060f1af29d40dafbc1b2860d4 (diff)
downloadqemu-3d1bba20913356ff4f8ff2c38519f10c5f4b77e6.zip
qemu-3d1bba20913356ff4f8ff2c38519f10c5f4b77e6.tar.gz
qemu-3d1bba20913356ff4f8ff2c38519f10c5f4b77e6.tar.bz2
glib: Fix some misuses of gsize/size_t types
This unbreaks cross compile builds: configure --target-list="i386-softmmu" --cpu=i386 When building on a 64bit machine. Reported-by: David Holsgrove <david.holsgrove@xilinx.com> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> Message-id: 926326e96fd8685d74e9d5bf430fe4ad97a55289.1369191585.git.peter.crosthwaite@xilinx.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/nvram')
-rw-r--r--hw/nvram/fw_cfg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 1a7e49c..479113b 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -54,7 +54,7 @@ struct FWCfgState {
#define JPG_FILE 0
#define BMP_FILE 1
-static char *read_splashfile(char *filename, size_t *file_sizep,
+static char *read_splashfile(char *filename, gsize *file_sizep,
int *file_typep)
{
GError *err = NULL;
@@ -112,7 +112,7 @@ static void fw_cfg_bootsplash(FWCfgState *s)
const char *boot_splash_filename = NULL;
char *p;
char *filename, *file_data;
- size_t file_size;
+ gsize file_size;
int file_type;
const char *temp;