From patchwork Mon Sep 17 08:47:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 184320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E76802C007E for ; Mon, 17 Sep 2012 18:48:59 +1000 (EST) Received: from localhost ([::1]:52254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDX0j-0006rN-RP for incoming@patchwork.ozlabs.org; Mon, 17 Sep 2012 04:48:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDX0S-0006Yy-8Q for qemu-devel@nongnu.org; Mon, 17 Sep 2012 04:48:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDX0N-00048L-Td for qemu-devel@nongnu.org; Mon, 17 Sep 2012 04:48:40 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:58366) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDX0N-0003tn-Oq for qemu-devel@nongnu.org; Mon, 17 Sep 2012 04:48:35 -0400 Received: by mail-ie0-f173.google.com with SMTP id c10so8767331ieb.4 for ; Mon, 17 Sep 2012 01:48:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=xp+htV7w4squ8P9ys/4T25L1gWXspceDC90VvBWLpYw=; b=U9ILYJZc4A4PAon50UuHfrfwPSAwDbI7TO/n5fL3wH83Hvk1V8W+EY2tI1ESlW6ClG UjjyoHF5V1fi2ga6gL6WCAAwfdNLXrBnA5BSCJwbPczzefR5cvdKIZajNd43m7z6iElJ G8uIo+ZvuiaZ2DCKd5NMn9+QdeBucoktsM1lEP0QlOyb8lRVgnd/cV1ZhUWWuOtRdCn8 em9NESKgGmAFrznM5S61IHCOetV45oJ7nqjqVGyd0RwgqhNrPdqRisSM6IdFVM5HjkST cMswRyxhrdzsjtNCKr9X36SSDm4ImvmRMWXDRdyos2mKqb47YndUKIaP5M6yMWf1j5z7 SoLA== Received: by 10.50.170.3 with SMTP id ai3mr6083330igc.9.1347871715311; Mon, 17 Sep 2012 01:48:35 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id n5sm16489010igw.13.2012.09.17.01.48.32 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Sep 2012 01:48:34 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: qemu-devel@nongnu.org, edgar.iglesias@gmail.com Date: Mon, 17 Sep 2012 18:47:36 +1000 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQkmGyAkYZk0S9BZKjLFlhTgpYo4A49a59UaV2kH7IYp6s7/nvWCrcsYaa3rjAh74XHt6Lnb X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.223.173 Cc: peter.crosthwaite@petalogix.com, crwulff@gmail.com Subject: [Qemu-devel] [PATCH v1 6/6] xilinx_timer: Fix a compile error if debug enabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Chris Wulff There was a missing include of qemu-log and a variable name in a printf was out of date. Signed-off-by: Chris Wulff Signed-off-by: Peter A. G. Crosthwaite --- hw/xilinx_timer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c index 9eb5ef7..2e48ca2 100644 --- a/hw/xilinx_timer.c +++ b/hw/xilinx_timer.c @@ -24,6 +24,7 @@ #include "sysbus.h" #include "ptimer.h" +#include "qemu-log.h" #define D(x) @@ -189,7 +190,7 @@ static void timer_hit(void *opaque) { struct xlx_timer *xt = opaque; struct timerblock *t = xt->parent; - D(fprintf(stderr, "%s %d\n", __func__, timer)); + D(fprintf(stderr, "%s %d\n", __func__, xt->nr)); xt->regs[R_TCSR] |= TCSR_TINT; if (xt->regs[R_TCSR] & TCSR_ARHT)