From patchwork Wed Dec 13 23:20:13 2017 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: 10111139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C54D360352 for ; Wed, 13 Dec 2017 23:34:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B731828477 for ; Wed, 13 Dec 2017 23:34:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABA16285C7; Wed, 13 Dec 2017 23:34:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0C89C28477 for ; Wed, 13 Dec 2017 23:34:30 +0000 (UTC) Received: from localhost ([::1]:38295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGXl-0007C2-L7 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 13 Dec 2017 18:34:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGMX-00061M-Ja for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:22:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePGMS-0008G8-Iw for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:22:53 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:33050) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePGMS-0008Fm-F0 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:22:48 -0500 Received: by mail-qt0-x243.google.com with SMTP id e2so5921792qti.0 for ; Wed, 13 Dec 2017 15:22:48 -0800 (PST) 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=nwxkoCkahqCUkzRdPXbkwE3pdZ2d+NZQNuRFkeqweNk=; b=cpbRwvZmakrXpc93f7OeXvkQtxKH8temADnWjanNZJpJoFBDZE1+g3q3C57ZLmmAbh 1xxO0czOejxVCcyOj98jmwmKw/GkQfHYxLQ1l4ovmdrkF4/3VBoWY+Ep2B8AyFWVdE62 p0q2lQliOc2Bi5c9z/hOrW2FCSFyDiAxCTTiAEQu+zl2t1rIk0+G+/og9cTlOZfaIxXi dNHbtuEFAXK7m3jgXEhfTs88QL7MhTdDnl7ER10VwXU1dpXmRzwMPOlSZI2fUEMQRdNl zTYXrvL2617uq70BQfNSThbUwbA+fitrf5sYeNvUVSGbcznpgaV2laZ/WYZMMJ/Gy8sR MCpQ== 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=nwxkoCkahqCUkzRdPXbkwE3pdZ2d+NZQNuRFkeqweNk=; b=OOnG44zx9w5l26Mt/2GwrckDWZBKIf8R0XE9xDi7k06HuQX1H7OiSaHrgDv5hJW+SS 2XjUODE+I049tZMQYaWuM973NYq3echpqWjBliaJbqLXDrwQla8i+gevF2wDn6D1pEPq 4quODdaK+0KvJKZQ49sfMUiSsUcY0WpQ2wP7Ypb1q9tqTWd29cA6kTp0sKiv4E5nSeH+ 7MMnHlOqTuP9DHl0msCehrhAWmIptmvAS60vIEKgwAxWqJYQRfXiyGAraDqoM0GPXP97 llX11ekrTWGega8qGNC40KPXPJSNZGWTxU8EnBG7BXmLoiuFNFFa7Tqhorm9J2YwPUFw jMrQ== X-Gm-Message-State: AKGB3mKWlVzytvdRkv4TXj1Z17/59I1rIIeZSJ1OQxocQnI/ayXOPnvI QaUDA1M09iNc+di2rUSi6JE= X-Google-Smtp-Source: ACJfBov/cGVNNG5KCJaCXMykRCvXFGZw86tGF+W0nvfqQUyG+MX1Xo48c5/4+dcdqc9RXaeOg82Png== X-Received: by 10.200.51.249 with SMTP id d54mr13669249qtb.168.1513207368060; Wed, 13 Dec 2017 15:22:48 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id l1sm1666918qkk.74.2017.12.13.15.22.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 15:22:47 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrew Baumann , Prasad J Pandit , Clement Deschamps , Isaac Lozano <109lozanoi@gmail.com>, Thomas Huth , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Eduardo Habkost Date: Wed, 13 Dec 2017 20:20:13 -0300 Message-Id: <20171213232025.24503-15-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213232025.24503-1-f4bug@amsat.org> References: <20171213232025.24503-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: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [RFC PATCH 14/26] sdcard: use qemu_hexbuf_strdup() to trace command response 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: Sai Pavan Boddu , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 26 +++++++------------------- hw/sd/trace-events | 1 + 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 84e02745f1..2a249b1612 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -35,6 +35,7 @@ #include "hw/sd/sd.h" #include "qapi/error.h" #include "qemu/bitmap.h" +#include "qemu/cutils.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/timer.h" @@ -42,15 +43,6 @@ #include "sd-internal.h" #include "trace.h" -//#define DEBUG_SD 1 - -#ifdef DEBUG_SD -#define DPRINTF(fmt, ...) \ -do { fprintf(stderr, "SD: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) do {} while(0) -#endif - #define ACMD41_ENQUIRY_MASK 0x00ffffff #define OCR_POWER_UP 0x80000000 #define OCR_POWER_DELAY_NS 500000 /* 0.5ms */ @@ -1595,17 +1587,13 @@ send_response: sd->card_status &= ~CARD_STATUS_B; } -#ifdef DEBUG_SD - if (rsplen) { - int i; - DPRINTF("Response:"); - for (i = 0; i < rsplen; i++) - fprintf(stderr, " %02x", response[i]); - fprintf(stderr, " state %d\n", sd->state); - } else { - DPRINTF("No response %d\n", sd->state); + if (trace_event_get_state_backends(TRACE_SDCARD_COMMAND_RESPONSE)) { + char *hexbuf; + + hexbuf = qemu_hexbuf_strdup(response, rsplen, NULL, "(no response)"); + trace_sdcard_command_response(hexbuf, sd_state_name(sd->state)); + g_free(hexbuf); } -#endif return rsplen; } diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 0e78f980de..01f94c4b54 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -26,6 +26,7 @@ sdcard_set_mode(const char *current_mode, const char *new_mode, const char *stat sdcard_set_state(const char *current_state, const char *new_state, const char *mode) "%s -> %s (mode: %s)" sdcard_normal_command(uint8_t cmd, uint32_t arg, const char *state) "CMD%d arg 0x%08x (state %s)" sdcard_app_command(uint8_t acmd, uint32_t arg) "ACMD%d arg 0x%08x" +sdcard_command_response(const char *hexdump, const char *state) "%s (state %s)" sdcard_reset(void) "" sdcard_inserted(bool readonly) "read_only: %d" sdcard_ejected(void) ""