From patchwork Tue Jul 17 16:00:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 171504 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 67BCF2C00BD for ; Wed, 18 Jul 2012 03:17:01 +1000 (EST) Received: from localhost ([::1]:51689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrADl-0007qt-Km for incoming@patchwork.ozlabs.org; Tue, 17 Jul 2012 12:01:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrACy-00074U-16 for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrACn-0005mO-Pp for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrACn-0005mF-HQ for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:00:57 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6HG0tbd019920 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 Jul 2012 12:00:56 -0400 Received: from dhcp-5-188.str.redhat.com (vpn1-6-35.ams2.redhat.com [10.36.6.35]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q6HG0dqb007516; Tue, 17 Jul 2012 12:00:54 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Tue, 17 Jul 2012 18:00:05 +0200 Message-Id: <1342540838-9027-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1342540838-9027-1-git-send-email-kwolf@redhat.com> References: <1342540838-9027-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 08/41] hd-geometry: Add tracepoints 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: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/hd-geometry.c | 7 +++---- trace-events | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index c45eafd..f0dd021 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c @@ -32,6 +32,7 @@ #include "block.h" #include "hw/block-common.h" +#include "trace.h" struct partition { uint8_t boot_ind; /* 0x80 - active */ @@ -89,10 +90,7 @@ static int guess_disk_lchs(BlockDriverState *bs, *pheads = heads; *psectors = sectors; *pcylinders = cylinders; -#if 0 - printf("guessed geometry: LCHS=%d %d %d\n", - cylinders, heads, sectors); -#endif + trace_hd_geometry_lchs_guess(bs, cylinders, heads, sectors); return 0; } } @@ -159,4 +157,5 @@ void hd_geometry_guess(BlockDriverState *bs, } bdrv_set_geometry_hint(bs, *pcyls, *pheads, *psecs); } + trace_hd_geometry_guess(bs, *pcyls, *pheads, *psecs, translation); } diff --git a/trace-events b/trace-events index fc32bc6..5f27f1a 100644 --- a/trace-events +++ b/trace-events @@ -141,6 +141,10 @@ ecc_mem_readl_ecr1(uint32_t ret) "Read event count 2 %08x" ecc_diag_mem_writeb(uint64_t addr, uint32_t val) "Write diagnostic %"PRId64" = %02x" ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= %02x" +# hw/hd-geometry.c +hd_geometry_lchs_guess(void *bs, int cyls, int heads, int secs) "bs %p LCHS %d %d %d" +hd_geometry_guess(void *bs, int cyls, int heads, int secs, int trans) "bs %p CHS %d %d %d trans %d" + # hw/jazz-led.c jazz_led_read(uint64_t addr, uint8_t val) "read addr=0x%"PRIx64": 0x%x" jazz_led_write(uint64_t addr, uint8_t new) "write addr=0x%"PRIx64": 0x%x"