diff mbox

arch_init/ram_load: fix compilation on 32bit hosts

Message ID 1372428900-37274-1-git-send-email-agraf@suse.de
State New
Headers show

Commit Message

Alexander Graf June 28, 2013, 2:15 p.m. UTC 
Commit 87d2f825 broke compilation of arch_init.c on 32bit hosts. Fix it.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 arch_init.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Andreas Färber June 28, 2013, 2:33 p.m. UTC | #1 
Am 28.06.2013 16:15, schrieb Alexander Graf:
> Commit 87d2f825 broke compilation of arch_init.c on 32bit hosts. Fix it.
> 
> Signed-off-by: Alexander Graf <agraf@suse.de>

Cf. http://patchwork.ozlabs.org/patch/255122/ :)

Andreas
Alexander Graf June 28, 2013, 2:35 p.m. UTC | #2 
On 28.06.2013, at 16:33, Andreas Färber wrote:

> Am 28.06.2013 16:15, schrieb Alexander Graf:
>> Commit 87d2f825 broke compilation of arch_init.c on 32bit hosts. Fix it.
>> 
>> Signed-off-by: Alexander Graf <agraf@suse.de>
> 
> Cf. http://patchwork.ozlabs.org/patch/255122/ :)

Ah, nice. I'll drop my patch then and just apply this one to ppc-next for the time being.


Alex
diff mbox

Patch

diff --git a/arch_init.c b/arch_init.c
index 560d018..f46bdb1 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -815,10 +815,10 @@  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,
-                                        block->length);
-                                ret =  -EINVAL;
+                                fprintf(stderr, "Length mismatch: %s: "
+                                        RAM_ADDR_FMT " " "in != " RAM_ADDR_FMT
+                                        "\n", id, length, block->length);
+                                ret = -EINVAL;
                                 goto done;
                             }
                             break;