Merge commit '0bfcd599e3f5c5679cc7d0165a0a1822e2f60de2' into upstream-merge

* commit '0bfcd599e3f5c5679cc7d0165a0a1822e2f60de2':
  Fix %lld or %llx printf format use

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/hw/vga.c b/hw/vga.c
index de6bbe39d..0a535ae6f 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -232,7 +232,7 @@ static void vga_precise_update_retrace_info(VGACommonState *s)
         "clocking_mode = %d\n"
         "clock_sel = %d %d\n"
         "dots = %d\n"
-        "ticks/char = %lld\n"
+        "ticks/char = %" PRId64 "\n"
         "\n",
         (double) get_ticks_per_sec() / (r->ticks_per_char * r->total_chars),
         htotal_chars,