diff mbox series

migration: Fix format in error message

Message ID 20240311123439.16844-1-anthony.perard@citrix.com (mailing list archive)
State New, archived
Headers show
Series migration: Fix format in error message | expand

Commit Message

Anthony PERARD March 11, 2024, 12:34 p.m. UTC 
From: Anthony PERARD <anthony.perard@citrix.com>

In file_write_ramblock_iov(), "offset" is "uintptr_t" and not
"ram_addr_t". While usually they are both equivalent, this is not the
case with CONFIG_XEN_BACKEND.

Use the right format. This will fix build on 32-bit.

Fixes: f427d90b9898 ("migration/multifd: Support outgoing mapped-ram stream format")
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 migration/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Xu March 11, 2024, 1:15 p.m. UTC | #1 
On Mon, Mar 11, 2024 at 12:34:39PM +0000, Anthony PERARD wrote:
> From: Anthony PERARD <anthony.perard@citrix.com>
> 
> In file_write_ramblock_iov(), "offset" is "uintptr_t" and not
> "ram_addr_t". While usually they are both equivalent, this is not the
> case with CONFIG_XEN_BACKEND.
> 
> Use the right format. This will fix build on 32-bit.
> 
> Fixes: f427d90b9898 ("migration/multifd: Support outgoing mapped-ram stream format")
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>

Rather than waiting for a trivial pull, I'll queue this for 9.0.  Thanks.
diff mbox series

Patch

diff --git a/migration/file.c b/migration/file.c
index 164b079966..5054a60851 100644
--- a/migration/file.c
+++ b/migration/file.c
@@ -191,7 +191,7 @@  int file_write_ramblock_iov(QIOChannel *ioc, const struct iovec *iov,
          */
         offset = (uintptr_t) iov[slice_idx].iov_base - (uintptr_t) block->host;
         if (offset >= block->used_length) {
-            error_setg(errp, "offset " RAM_ADDR_FMT
+            error_setg(errp, "offset %" PRIxPTR
                        "outside of ramblock %s range", offset, block->idstr);
             ret = -1;
             break;