Blame 0208-xilinx_timer-Fix-a-compile-error-if-debug-enabled.patch

5544c1
From 593883a749b0659ab4a2f2d96e65c34a3bd0fcca Mon Sep 17 00:00:00 2001
5544c1
From: Chris Wulff <crwulff@gmail.com>
5544c1
Date: Sun, 9 Sep 2012 20:20:07 -0400
5544c1
Subject: [PATCH] xilinx_timer: Fix a compile error if debug enabled
5544c1
5544c1
There was a missing include of qemu-log and a variable name in a printf was out
5544c1
of date.
5544c1
5544c1
Signed-off-by: Chris Wulff <crwulff@gmail.com>
5544c1
Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
5544c1
(cherry picked from commit 8354cd722e0afae63bee3e4cb21c8f0ddb6874c2)
5544c1
5544c1
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
5544c1
---
5544c1
 hw/xilinx_timer.c | 3 ++-
5544c1
 1 file changed, 2 insertions(+), 1 deletion(-)
5544c1
5544c1
diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
5544c1
index c02e6ca..f410487 100644
5544c1
--- a/hw/xilinx_timer.c
5544c1
+++ b/hw/xilinx_timer.c
5544c1
@@ -24,6 +24,7 @@
5544c1
 
5544c1
 #include "sysbus.h"
5544c1
 #include "ptimer.h"
5544c1
+#include "qemu-log.h"
5544c1
 
5544c1
 #define D(x)
5544c1
 
5544c1
@@ -189,7 +190,7 @@ static void timer_hit(void *opaque)
5544c1
 {
5544c1
     struct xlx_timer *xt = opaque;
5544c1
     struct timerblock *t = xt->parent;
5544c1
-    D(fprintf(stderr, "%s %d\n", __func__, timer));
5544c1
+    D(fprintf(stderr, "%s %d\n", __func__, xt->nr));
5544c1
     xt->regs[R_TCSR] |= TCSR_TINT;
5544c1
 
5544c1
     if (xt->regs[R_TCSR] & TCSR_ARHT)
5544c1
-- 
5544c1
1.7.12.1
5544c1