From 3d1bba20913356ff4f8ff2c38519f10c5f4b77e6 Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Wed, 22 May 2013 13:01:43 +1000 Subject: [PATCH] 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 Signed-off-by: Peter Crosthwaite Reviewed-by: Paolo Bonzini Reviewed-by: Edgar E. Iglesias Message-id: 926326e96fd8685d74e9d5bf430fe4ad97a55289.1369191585.git.peter.crosthwaite@xilinx.com Signed-off-by: Anthony Liguori --- hw/nvram/fw_cfg.c | 4 ++-- qemu-char.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 1a7e49c132..479113bd81 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; diff --git a/qemu-char.c b/qemu-char.c index cff2896065..5d20d3ce54 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2920,7 +2920,7 @@ void qmp_ringbuf_write(const char *device, const char *data, CharDriverState *chr; const uint8_t *write_data; int ret; - size_t write_count; + gsize write_count; chr = qemu_chr_find(device); if (!chr) {