From patchwork Wed Dec 13 23:20:09 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: 10111137 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 C500D60352 for ; Wed, 13 Dec 2017 23:32:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B72F527F82 for ; Wed, 13 Dec 2017 23:32:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA697285B0; Wed, 13 Dec 2017 23:32:46 +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 2AD4F27F82 for ; Wed, 13 Dec 2017 23:32:46 +0000 (UTC) Received: from localhost ([::1]:38286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGW5-0005tV-BK for patchwork-qemu-devel@patchwork.kernel.org; Wed, 13 Dec 2017 18:32:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGMA-0005ga-VG for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:22:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePGMA-0007xB-3R for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:22:30 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:34849) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePGM9-0007wq-Vx for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:22:30 -0500 Received: by mail-qk0-x241.google.com with SMTP id c13so4150591qke.2 for ; Wed, 13 Dec 2017 15:22:29 -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=A8QkXOfxR5bue/gWaC4JAJCk8ySWAFUHjqLaW+JRgok=; b=NVkqoRr/rynUEky8ZDiy2VI2NB0tDI7GRGlSSDpXFbV0UzSGWVXVRrM06w3ajEoynv mGCkoaFqo7QAK+R5OX4lLSCjRHbRktSW4NZoue8VwyXgnhWRcgCoGmGO3A+GiQLNLMif ErJV11oHdjXzRNEhoG9dd7U3EOTNxUwegUPVgH8DXCJOcpW4B8aDfi+rQw3wzVWIt0mB PTTjjlJ1cIPhTtl6mwNMPughzW+83K9wDLbOEygFfHZbgIF08ljnVfr1gpcVgoDLhBqa osNeulg5yLuoIbCO3Jk+n69KcFjpemPqHpxFCD+XSsvcX7E1M4Heo0CrxpAtNtc+VbCi Sh8A== 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=A8QkXOfxR5bue/gWaC4JAJCk8ySWAFUHjqLaW+JRgok=; b=q5nKRmTASUaP2K44nHqV7HupJeMx8sSl5kg91PITrWdpVwkHXh1+2ge/LQ9adtNdI+ o8Ug89l7Vgigb5YGw1EVeR7B1vIOazKxA+1nKB1QjR9UoidmF/LMSs0zBZ+o17IsH30U 6lii7Cpp5ggiFtsm5I/pB/PFpo9HYt6woi0YyZ74LQYxDKo5b6/czHaeNMpGA+oLFlok Q+El2TCV5DgIX4StgfKBnRahyxFCpQ7fcZBNRS8Iep+Kzy+Ze62iKaRy6uqNoKitkURm 0mWrgHrnIPwZDw617ciPSWBC/ZLLDI+1nGWcu5R+4tWVj5gNF2dvaUAw2vu1KYnmyuHp rWIw== X-Gm-Message-State: AKGB3mIg0Jk9k+RwFyCSonPSudGh6NAQfRGo7d8gzzVhw4E/+zghWcdI yUNNABKvRmZN3iASx8pxOs4= X-Google-Smtp-Source: ACJfBotHfSyXzN+WzBJw64jwccA66TfuJlyJyXPLhz6EFcS9uysDGNmnSiJ6KlrUiuUsY1NLi9nPIQ== X-Received: by 10.55.76.193 with SMTP id z184mr13567709qka.346.1513207349614; Wed, 13 Dec 2017 15:22:29 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id l1sm1666918qkk.74.2017.12.13.15.22.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 15:22:28 -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 Date: Wed, 13 Dec 2017 20:20:09 -0300 Message-Id: <20171213232025.24503-11-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:c09::241 Subject: [Qemu-devel] [PATCH 10/26] sdcard: use more detailled state/mode 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: 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 sd_set_mode() can now use sd_state_name(), and sd_set_state() use sd_mode_name(). Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 6 ++++-- hw/sd/trace-events | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index bd4a896cba..c1ed7b59f1 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -161,7 +161,8 @@ static const char *sd_state_name(enum SDCardStates state) static void sd_set_mode(SDState *sd, enum SDCardModes mode) { if (sd->mode != mode) { - trace_sdcard_set_mode(sd_mode_name(sd->mode), sd_mode_name(mode)); + trace_sdcard_set_mode(sd_mode_name(sd->mode), sd_mode_name(mode), + sd_state_name(sd->state)); sd->mode = mode; } } @@ -193,7 +194,8 @@ static void sd_update_mode(SDState *sd) static void sd_set_state(SDState *sd, enum SDCardStates state) { if (sd->state != state) { - trace_sdcard_set_state(sd_state_name(sd->state), sd_state_name(state)); + trace_sdcard_set_state(sd_state_name(sd->state), sd_state_name(state), + sd_mode_name(sd->mode)); sd->state = state; } } diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 2677c2195d..db5a5e62f2 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -22,8 +22,8 @@ sdhci_write_dataport(uint16_t data_count) "write buffer filled with %u bytes of sdhci_led(bool state) "LED: %u" # hw/sd/sd.c -sdcard_set_mode(const char *current_mode, const char *new_mode) "%s -> %s" -sdcard_set_state(const char *current_state, const char *new_state) "%s -> %s" +sdcard_set_mode(const char *current_mode, const char *new_mode, const char *state) "%s -> %s (state: %s)" +sdcard_set_state(const char *current_state, const char *new_state, const char *mode) "%s -> %s (mode: %s)" # hw/sd/milkymist-memcard.c milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"