From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uf2Uc-0002HN-Lq for qemu-devel@nongnu.org; Wed, 22 May 2013 02:25:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uf2UW-0000UC-4M for qemu-devel@nongnu.org; Wed, 22 May 2013 02:25:46 -0400 Received: from mail-ee0-f52.google.com ([74.125.83.52]:48366) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uf2UV-0000U1-Sx for qemu-devel@nongnu.org; Wed, 22 May 2013 02:25:39 -0400 Date: Wed, 22 May 2013 08:25:28 +0200 From: "Edgar E. Iglesias" Message-ID: <20130522062528.GI4051@smtp.vpn> References: <926326e96fd8685d74e9d5bf430fe4ad97a55289.1369191585.git.peter.crosthwaite@xilinx.com> <1514690342.5631967.1369202585862.JavaMail.root@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1514690342.5631967.1369202585862.JavaMail.root@redhat.com> Subject: Re: [Qemu-devel] [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: peter crosthwaite , qemu-devel@nongnu.org, qemu-trival@nongnu.org, aliguori@us.ibm.com On Wed, May 22, 2013 at 02:03:05AM -0400, Paolo Bonzini wrote: > > > ----- Messaggio originale ----- > > Da: "peter crosthwaite" > > A: qemu-devel@nongnu.org > > Cc: pbonzini@redhat.com, aliguori@us.ibm.com, "edgar iglesias" > > Inviato: Mercoledì, 22 maggio 2013 5:01:43 > > Oggetto: [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types > > > > From: Peter Crosthwaite > > > > 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 > > --- > > > > 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 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; > > > > diff --git a/qemu-char.c b/qemu-char.c > > index cff2896..5d20d3c 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) { > > -- > > 1.8.3.rc1.44.gb387c77.dirty > > > > > > Adding qemu-trivial... > > Reviewed-by: Paolo Bonzini Reviewed-by: Edgar E. Iglesias