From patchwork Tue Jul 10 09:12:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 170112 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 442592C00E7 for ; Tue, 10 Jul 2012 20:13:47 +1000 (EST) Received: from localhost ([::1]:59460 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoWWT-00040b-Fq for incoming@patchwork.ozlabs.org; Tue, 10 Jul 2012 05:14:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoWVh-0002Py-On for qemu-devel@nongnu.org; Tue, 10 Jul 2012 05:13:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SoWVa-0002NS-RV for qemu-devel@nongnu.org; Tue, 10 Jul 2012 05:13:33 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:57883) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoWVa-0002NG-M9 for qemu-devel@nongnu.org; Tue, 10 Jul 2012 05:13:26 -0400 Received: from blackfin.pond.sub.org (p57B0F62B.dip.t-dialin.net [87.176.246.43]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 48D599FE43; Tue, 10 Jul 2012 11:13:23 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 47C34600A2; Tue, 10 Jul 2012 11:12:56 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 10 Jul 2012 11:12:32 +0200 Message-Id: <1341911575-7306-7-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1341911575-7306-1-git-send-email-armbru@redhat.com> References: <1341911575-7306-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: kwolf@redhat.com, blauwirbel@gmail.com, stefanha@linux.vnet.ibm.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v3 06/29] 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 Signed-off-by: Markus Armbruster --- 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 1f9fc98..acef082 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"