dcavalca / rpms / qemu

Forked from rpms/qemu a year ago
Clone

Blame 0185-arch_init.c-add-missing-symbols-before-PRIu64-in-deb.patch

5544c1
From df075bd97f2d88969e3178ec9cb302f955d31737 Mon Sep 17 00:00:00 2001
5544c1
From: Igor Mitsyanko <i.mitsyanko@samsung.com>
5544c1
Date: Wed, 5 Sep 2012 13:04:56 +0400
5544c1
Subject: [PATCH] arch_init.c: add missing '%' symbols before PRIu64 in debug
5544c1
 printfs
5544c1
5544c1
'%' symbols were missing in front of PRIu64 macros in DPRINTF() messages in
5544c1
arch_init.c, this caused compilation warnings when compiled with DEBUG_ARCH_INIT defined.
5544c1
5544c1
Signed-off-by: Igor Mitsyanko <i.mitsyanko@samsung.com>
5544c1
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
5544c1
(cherry picked from commit ef37a699a06f96e098ee00683b7052b5fbb6ad7d)
5544c1
5544c1
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
5544c1
---
5544c1
 arch_init.c | 8 ++++----
5544c1
 1 file changed, 4 insertions(+), 4 deletions(-)
5544c1
5544c1
diff --git a/arch_init.c b/arch_init.c
5544c1
index 5a1173e..47977de 100644
5544c1
--- a/arch_init.c
5544c1
+++ b/arch_init.c
5544c1
@@ -562,7 +562,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
5544c1
         if ((i & 63) == 0) {
5544c1
             uint64_t t1 = (qemu_get_clock_ns(rt_clock) - bwidth) / 1000000;
5544c1
             if (t1 > MAX_WAIT) {
5544c1
-                DPRINTF("big wait: " PRIu64 " milliseconds, %d iterations\n",
5544c1
+                DPRINTF("big wait: %" PRIu64 " milliseconds, %d iterations\n",
5544c1
                         t1, i);
5544c1
                 break;
5544c1
             }
5544c1
@@ -587,7 +587,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
5544c1
 
5544c1
     expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
5544c1
 
5544c1
-    DPRINTF("ram_save_live: expected(" PRIu64 ") <= max(" PRIu64 ")?\n",
5544c1
+    DPRINTF("ram_save_live: expected(%" PRIu64 ") <= max(%" PRIu64 ")?\n",
5544c1
             expected_time, migrate_max_downtime());
5544c1
 
5544c1
     if (expected_time <= migrate_max_downtime()) {
5544c1
@@ -799,8 +799,8 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
5544c1
     } while (!(flags & RAM_SAVE_FLAG_EOS));
5544c1
 
5544c1
 done:
5544c1
-    DPRINTF("Completed load of VM with exit code %d seq iteration " PRIu64 "\n",
5544c1
-            ret, seq_iter);
5544c1
+    DPRINTF("Completed load of VM with exit code %d seq iteration "
5544c1
+            "%" PRIu64 "\n", ret, seq_iter);
5544c1
     return ret;
5544c1
 }
5544c1
 
5544c1
-- 
5544c1
1.7.12.1
5544c1