Commit 3d1bba20 authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Anthony Liguori
Browse files

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: default avatarDavid Holsgrove <david.holsgrove@xilinx.com>
Signed-off-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@gmail.com>
Message-id: 926326e96fd8685d74e9d5bf430fe4ad97a55289.1369191585.git.peter.crosthwaite@xilinx.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 1239b472

hw/nvram/fw_cfg.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

qemu-char.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {