From patchwork Mon Oct 1 22:09:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977511 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O5EnV0n1"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PH7G6xlqz9s3l for ; Tue, 2 Oct 2018 08:31:06 +1000 (AEST) Received: from localhost ([::1]:40974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76iW-0005rL-LG for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:31:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XV-00041R-N5 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76OD-0007HF-HU for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:08 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:43518) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76OD-0007Gg-93 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:05 -0400 Received: by mail-wr1-x435.google.com with SMTP id n1-v6so5502285wrt.10 for ; Mon, 01 Oct 2018 15:10:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pBSy+cmyl1xiqOIalJT3WVoAQSHu6GZjIz+/f2h6grQ=; b=O5EnV0n1a09sB1TJp2ywEcfUqR6BxCHPzmPPnhzo6blvH0vGSzqYfTXEIIvSNwzoBL 6npthCTgKZrjVGbbQB5ewhLanaG49JUn1lAkaDttQ5MomziaPD1z+tCNWTiLtj9gu/fy +pkhiuV46nQ/0m+AX6dMdKYE+AOhRLbgAQR7KUvot+EMvI9scvesV1x0b+iGUSyiKsxO dy/TqEgErTC099dQA1USjDxg3z955h4BzC4mCqCc1J6IiIbddHDLnQzGjb5iFbfh1YLR LtSyqctS3g+g8OZ38zFzeyZJmNTwvzVTYb6COZ3951D7tYHP8hFMQVovQNKk/D2yEIxH bxNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pBSy+cmyl1xiqOIalJT3WVoAQSHu6GZjIz+/f2h6grQ=; b=WqSUGrPMhhyiC/GsC+KJx1JegAf4pXOB3YGK6sWJN0914ptxHf/dBRICevX2pciSB1 3eMCi9YicjJeSs/LSOYl/mDkCdGyXhiJIA1sY5n/rdqg3lI4Tqb94oT/oT+3zN0zrBQI bKK/OQkCyLV1l9jUljjjYtb6XjN9heziM9suSkzWl2G5lh5iT+kTwQLH+r8QMEHc1bf6 4Ew3pBuJTv/ff2Kj66FLhx188UUSPgbdv+lbZxAwrTQbQRVVyb7LKLOdY8CduNirpNm/ zMbFii+Mab2JK60OrsujOlzQ0u+GUKCFH2MsepRGDtHQak2QBKIJcDYdm+AF3yYvz+zK 0PAg== X-Gm-Message-State: ABuFfoh07maTMFnjCQSJQ11U3zW0Z7q0E6UxmvRJFsDK5sBhaK7heXl3 5UORHcIgVa/w9coqJUjb/NI= X-Google-Smtp-Source: ACcGV622AcDY8OHgwr9KRLOnZnqLpIt5jyRXV7FANC11+Apkl7zONMo6C3p2ZzlG30XJOwU1wcpYyg== X-Received: by 2002:adf:fec9:: with SMTP id q9-v6mr7629094wrs.164.1538431804212; Mon, 01 Oct 2018 15:10:04 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:03 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:29 +0200 Message-Id: <20181001220942.2382-3-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 Subject: [Qemu-devel] [PATCH 02/15] hw/timer/sun4v-rtc: Convert from DPRINTF() macro to trace events X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Artyom Tarasenko , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?b?ZMOp?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Artyom Tarasenko Reviewed-by: Cédric Le Goater --- hw/timer/sun4v-rtc.c | 13 +++---------- hw/timer/trace-events | 4 ++++ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/hw/timer/sun4v-rtc.c b/hw/timer/sun4v-rtc.c index 310523225f..13be94f8da 100644 --- a/hw/timer/sun4v-rtc.c +++ b/hw/timer/sun4v-rtc.c @@ -14,15 +14,8 @@ #include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/timer/sun4v-rtc.h" +#include "trace.h" -//#define DEBUG_SUN4V_RTC - -#ifdef DEBUG_SUN4V_RTC -#define DPRINTF(fmt, ...) \ - do { printf("sun4v_rtc: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) do {} while (0) -#endif #define TYPE_SUN4V_RTC "sun4v_rtc" #define SUN4V_RTC(obj) OBJECT_CHECK(Sun4vRtc, (obj), TYPE_SUN4V_RTC) @@ -41,14 +34,14 @@ static uint64_t sun4v_rtc_read(void *opaque, hwaddr addr, /* accessing the high 32 bits */ val >>= 32; } - DPRINTF("read from " TARGET_FMT_plx " val %lx\n", addr, val); + trace_sun4v_rtc_read(addr, val); return val; } static void sun4v_rtc_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - DPRINTF("write 0x%x to " TARGET_FMT_plx "\n", (unsigned)val, addr); + trace_sun4v_rtc_read(addr, val); } static const MemoryRegionOps sun4v_rtc_ops = { diff --git a/hw/timer/trace-events b/hw/timer/trace-events index ca9ad6321a..75bd3b1042 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -66,5 +66,9 @@ cmsdk_apb_dualtimer_read(uint64_t offset, uint64_t data, unsigned size) "CMSDK A cmsdk_apb_dualtimer_write(uint64_t offset, uint64_t data, unsigned size) "CMSDK APB dualtimer write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" cmsdk_apb_dualtimer_reset(void) "CMSDK APB dualtimer: reset" +# hw/timer/sun4v-rtc.c +sun4v_rtc_read(uint64_t addr, uint64_t value) "read: addr 0x%" PRIx64 " value 0x%" PRIx64 +sun4v_rtc_write(uint64_t addr, uint64_t value) "write: addr 0x%" PRIx64 " value 0x%" PRIx64 + # hw/timer/xlnx-zynqmp-rtc.c xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, int sec) "Get time from host: %d-%d-%d %2d:%02d:%02d"