Patchwork [v1,1/1] glib: Fix some misuses of gsize/size_t types

login
register
mail settings
Submitter Peter Crosthwaite
Date May 22, 2013, 3:01 a.m.
Message ID <926326e96fd8685d74e9d5bf430fe4ad97a55289.1369191585.git.peter.crosthwaite@xilinx.com>
Download mbox | patch
Permalink /patch/245485/
State New
Headers show

Comments

Peter Crosthwaite - May 22, 2013, 3:01 a.m.
From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

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>
---

 hw/nvram/fw_cfg.c | 4 ++--
 qemu-char.c       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Paolo Bonzini - May 22, 2013, 6:03 a.m.
----- Messaggio originale -----
> Da: "peter crosthwaite" <peter.crosthwaite@xilinx.com>
> A: qemu-devel@nongnu.org
> Cc: pbonzini@redhat.com, aliguori@us.ibm.com, "edgar iglesias" <edgar.iglesias@gmail.com>
> 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 <peter.crosthwaite@xilinx.com>
> 
> 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>
> ---
> 
>  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 <pbonzini@redhat.com>

Paolo
Edgar Iglesias - May 22, 2013, 6:25 a.m.
On Wed, May 22, 2013 at 02:03:05AM -0400, Paolo Bonzini wrote:
> 
> 
> ----- Messaggio originale -----
> > Da: "peter crosthwaite" <peter.crosthwaite@xilinx.com>
> > A: qemu-devel@nongnu.org
> > Cc: pbonzini@redhat.com, aliguori@us.ibm.com, "edgar iglesias" <edgar.iglesias@gmail.com>
> > 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 <peter.crosthwaite@xilinx.com>
> > 
> > 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>
> > ---
> > 
> >  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 <pbonzini@redhat.com>

Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Anthony Liguori - May 22, 2013, 10:57 p.m.
Applied.  Thanks.

Regards,

Anthony Liguori

Patch

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) {