diff mbox

arch_init: Fix format string by using RAM_ADDR_FMT

Message ID 1372359606-2759-1-git-send-email-sw@weilnetz.de
State Accepted
Headers show

Commit Message

Stefan Weil June 27, 2013, 7 p.m. UTC 
length is a ram_addr_t, so RAM_ADDR_FMT must be used instead of %ld.
This fixes a recently introduced regression for w64 builds.

Using RAM_ADDR_FMT also changes decimal output to sedecimal.
This is good here because length and block->length should both
use the same base in the error message.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 arch_init.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Anthony Liguori July 1, 2013, 1:14 p.m. UTC | #1 
Applied.  Thanks.

Regards,

Anthony Liguori
diff mbox

Patch

diff --git a/arch_init.c b/arch_init.c
index ea9ddad..4255db9 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -815,8 +815,9 @@  static int ram_load(QEMUFile *f, void *opaque, int version_id)
                     QTAILQ_FOREACH(block, &ram_list.blocks, next) {
                         if (!strncmp(id, block->idstr, sizeof(id))) {
                             if (block->length != length) {
-                                fprintf(stderr, "Length mismatch: %s: %ld "
-                                        "in != " RAM_ADDR_FMT "\n", id, length,
+                                fprintf(stderr,
+                                        "Length mismatch: %s: " RAM_ADDR_FMT
+                                        " in != " RAM_ADDR_FMT "\n", id, length,
                                         block->length);
                                 ret =  -EINVAL;
                                 goto done;