[Qemu-devel] [PATCH 1/2] migration: print ram_addr_t as RAM_ADDR_FMT not %zx

[Juan Quintela]

Not all the wold is 64bits (yet).

Signed-off-by: Juan Quintela 
---
 migration/ram.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/migration/ram.c b/migration/ram.c
index 62cf42b..d8d5a50 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1184,7 +1184,8 @@ int ram_save_queue_pages(MigrationState *ms, const char 
*rbname,
 }
 trace_ram_save_queue_pages(ramblock->idstr, start, len);
 if (start+len > ramblock->used_length) {
-error_report("%s request overrun start=%zx len=%zx blocklen=%zx",
+error_report("%s request overrun start=" RAM_ADDR_FMT " len="
+ RAM_ADDR_FMT " blocklen=" RAM_ADDR_FMT,
  __func__, start, len, ramblock->used_length);
 goto err;
 }
@@ -1845,7 +1846,7 @@ int ram_discard_range(MigrationIncomingState *mis,
 ret = postcopy_ram_discard_range(mis, host_startaddr, length);
 } else {
 error_report("ram_discard_range: Overrun block '%s' (%" PRIu64
- "/%zu/%zu)",
+ "/%zx/" RAM_ADDR_FMT")",
  block_name, start, length, rb->used_length);
 }

-- 
2.5.0

Re: [Qemu-devel] [PATCH 1/2] migration: print ram_addr_t as RAM_ADDR_FMT not %zx

[Dr. David Alan Gilbert]

* Juan Quintela (quint...@redhat.com) wrote:
> Not all the wold is 64bits (yet).
> 
> Signed-off-by: Juan Quintela 

Yep that's my fault.

Reviewed-by: Dr. David Alan Gilbert 

> ---
>  migration/ram.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/migration/ram.c b/migration/ram.c
> index 62cf42b..d8d5a50 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -1184,7 +1184,8 @@ int ram_save_queue_pages(MigrationState *ms, const char 
> *rbname,
>  }
>  trace_ram_save_queue_pages(ramblock->idstr, start, len);
>  if (start+len > ramblock->used_length) {
> -error_report("%s request overrun start=%zx len=%zx blocklen=%zx",
> +error_report("%s request overrun start=" RAM_ADDR_FMT " len="
> + RAM_ADDR_FMT " blocklen=" RAM_ADDR_FMT,
>   __func__, start, len, ramblock->used_length);
>  goto err;
>  }
> @@ -1845,7 +1846,7 @@ int ram_discard_range(MigrationIncomingState *mis,
>  ret = postcopy_ram_discard_range(mis, host_startaddr, length);
>  } else {
>  error_report("ram_discard_range: Overrun block '%s' (%" PRIu64
> - "/%zu/%zu)",
> + "/%zx/" RAM_ADDR_FMT")",
>   block_name, start, length, rb->used_length);
>  }
> 
> -- 
> 2.5.0
> 
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK