* [Qemu-devel] [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types
@ 2013-05-22 3:01 peter.crosthwaite
2013-05-22 6:03 ` Paolo Bonzini
2013-05-22 22:57 ` Anthony Liguori
0 siblings, 2 replies; 4+ messages in thread
From: peter.crosthwaite @ 2013-05-22 3:01 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, aliguori, edgar.iglesias
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types
2013-05-22 3:01 [Qemu-devel] [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types peter.crosthwaite
@ 2013-05-22 6:03 ` Paolo Bonzini
2013-05-22 6:25 ` Edgar E. Iglesias
2013-05-22 22:57 ` Anthony Liguori
1 sibling, 1 reply; 4+ messages in thread
From: Paolo Bonzini @ 2013-05-22 6:03 UTC (permalink / raw)
To: peter crosthwaite; +Cc: edgar iglesias, aliguori, qemu-devel, qemu-trival
----- 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types
2013-05-22 6:03 ` Paolo Bonzini
@ 2013-05-22 6:25 ` Edgar E. Iglesias
0 siblings, 0 replies; 4+ messages in thread
From: Edgar E. Iglesias @ 2013-05-22 6:25 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: peter crosthwaite, qemu-devel, qemu-trival, aliguori
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>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types
2013-05-22 3:01 [Qemu-devel] [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types peter.crosthwaite
2013-05-22 6:03 ` Paolo Bonzini
@ 2013-05-22 22:57 ` Anthony Liguori
1 sibling, 0 replies; 4+ messages in thread
From: Anthony Liguori @ 2013-05-22 22:57 UTC (permalink / raw)
To: peter.crosthwaite, qemu-devel; +Cc: aliguori, qemu-trival, edgar iglesias
Applied. Thanks.
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-05-22 23:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-22 3:01 [Qemu-devel] [PATCH v1 1/1] glib: Fix some misuses of gsize/size_t types peter.crosthwaite
2013-05-22 6:03 ` Paolo Bonzini
2013-05-22 6:25 ` Edgar E. Iglesias
2013-05-22 22:57 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).