Re: [Qemu-devel] [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types

2013-05-22 Thread Paolo Bonzini


- Messaggio originale -
 Da: peter crosthwaite peter.crosthwa...@xilinx.com
 A: qemu-devel@nongnu.org
 Cc: pbonz...@redhat.com, aligu...@us.ibm.com, edgar iglesias 
 edgar.igles...@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.crosthwa...@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.holsgr...@xilinx.com
 Signed-off-by: Peter Crosthwaite peter.crosthwa...@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 pbonz...@redhat.com

Paolo



Re: [Qemu-devel] [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types

2013-05-22 Thread Edgar E. Iglesias
On Wed, May 22, 2013 at 02:03:05AM -0400, Paolo Bonzini wrote:
 
 
 - Messaggio originale -
  Da: peter crosthwaite peter.crosthwa...@xilinx.com
  A: qemu-devel@nongnu.org
  Cc: pbonz...@redhat.com, aligu...@us.ibm.com, edgar iglesias 
  edgar.igles...@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.crosthwa...@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.holsgr...@xilinx.com
  Signed-off-by: Peter Crosthwaite peter.crosthwa...@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 pbonz...@redhat.com

Reviewed-by: Edgar E. Iglesias edgar.igles...@gmail.com



Re: [Qemu-devel] [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types

2013-05-22 Thread Anthony Liguori
Applied.  Thanks.

Regards,

Anthony Liguori




[Qemu-devel] [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types

2013-05-21 Thread peter . crosthwaite
From: Peter Crosthwaite peter.crosthwa...@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.holsgr...@xilinx.com
Signed-off-by: Peter Crosthwaite peter.crosthwa...@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