提交 3d1bba20 编写于 作者: P Peter Crosthwaite 提交者: Anthony Liguori

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: NDavid Holsgrove <david.holsgrove@xilinx.com>
Signed-off-by: NPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NEdgar E. Iglesias <edgar.iglesias@gmail.com>
Message-id: 926326e96fd8685d74e9d5bf430fe4ad97a55289.1369191585.git.peter.crosthwaite@xilinx.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
上级 1239b472
...@@ -54,7 +54,7 @@ struct FWCfgState { ...@@ -54,7 +54,7 @@ struct FWCfgState {
#define JPG_FILE 0 #define JPG_FILE 0
#define BMP_FILE 1 #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) int *file_typep)
{ {
GError *err = NULL; GError *err = NULL;
...@@ -112,7 +112,7 @@ static void fw_cfg_bootsplash(FWCfgState *s) ...@@ -112,7 +112,7 @@ static void fw_cfg_bootsplash(FWCfgState *s)
const char *boot_splash_filename = NULL; const char *boot_splash_filename = NULL;
char *p; char *p;
char *filename, *file_data; char *filename, *file_data;
size_t file_size; gsize file_size;
int file_type; int file_type;
const char *temp; const char *temp;
......
...@@ -2920,7 +2920,7 @@ void qmp_ringbuf_write(const char *device, const char *data, ...@@ -2920,7 +2920,7 @@ void qmp_ringbuf_write(const char *device, const char *data,
CharDriverState *chr; CharDriverState *chr;
const uint8_t *write_data; const uint8_t *write_data;
int ret; int ret;
size_t write_count; gsize write_count;
chr = qemu_chr_find(device); chr = qemu_chr_find(device);
if (!chr) { if (!chr) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册