From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBAF1C433E0 for ; Wed, 10 Mar 2021 17:27:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6016064F3E for ; Wed, 10 Mar 2021 17:27:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6016064F3E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK2c6-0002nT-Ge for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 12:27:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK2I1-00062I-6o for qemu-devel@nongnu.org; Wed, 10 Mar 2021 12:06:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22196) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lK2Hy-0000JE-8t for qemu-devel@nongnu.org; Wed, 10 Mar 2021 12:06:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615395982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Xx92GyJcKDec9ihkE2KCgTkx1XXRENYEtB83EjOcbgc=; b=E52ubEM/jRT+UL1SE61xxp1DVdPx+grjNrf2lzO7efXNbcG/Cslw5uCcHD5VMyzd4g7vDv 92DkLLBejqjUq4wHSEtrjb/0dBCXmkWSIbCxd2/2Ui/RaJPDIh06n/WbIkUNUawtL+SUP5 UKwczniVRuqCbZKpV99/IdJH822ogEw= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-509-bd_ogUTTNpKgzLxb-KB6kA-1; Wed, 10 Mar 2021 12:06:20 -0500 X-MC-Unique: bd_ogUTTNpKgzLxb-KB6kA-1 Received: by mail-ej1-f70.google.com with SMTP id gn30so7449994ejc.3 for ; Wed, 10 Mar 2021 09:06:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xx92GyJcKDec9ihkE2KCgTkx1XXRENYEtB83EjOcbgc=; b=XSQf7PE0kIblKMavlsAOBEoXTw57SLEafY6F6rxt5h8pw7ArE46aYVVCrvgef4nZCL jc7sZS3LIM1W6HmPz9+WfMdNGDpenvLk9NeODjT2eoA0yppKSV7a7plxuobAOC3PIPAu 0OOChA3TJczaE83KJymnCnyoZ67EzIU0u83ihfQd+/vrcuiF0vqjJh0NkWqGnHCYE3Oh Ie9mhyi6wU8p3vhfURJKu2nf88QZOfdbyqSs7GjnjvdU5YViGA7z0VPxFCkKVFIblJ8E lzcTERg6VNqTyj8rZ4D0Wr6ZyOvD5OvW3yLzT1F34qXufzQQzgwav6pkWnWs3xAox4r2 JkPw== X-Gm-Message-State: AOAM5306LgP0DFZv9WJExL+G8UwwghdD/YW1Kd6/CkBMLAa0LsqHo27m AfSrc0Zi8a7HJOQ2xL+OZsZrT+eElbEYNfa/RgDe7WB8ygNWbptRSVybsKHxiNnhQ1tM6nJSmx6 LRa9D1ngdiwq97DWFgGM0NHUNDZIQ81oDXraaUhP9D3ToGGhcYswJHhH8IZBFX8/n X-Received: by 2002:a50:ec07:: with SMTP id g7mr4438462edr.72.1615395979113; Wed, 10 Mar 2021 09:06:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzltBhQM/nIoGAXOTteIpW4DjJt2eiK6oPdsWyVC5ftA50YZpxSfRXnhjHY6DNQf7DAZbIQZw== X-Received: by 2002:a50:ec07:: with SMTP id g7mr4438439edr.72.1615395978996; Wed, 10 Mar 2021 09:06:18 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id q26sm36453eja.45.2021.03.10.09.06.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 09:06:18 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/12] hw/block/pflash_cfi01: Clarify trace events Date: Wed, 10 Mar 2021 18:05:25 +0100 Message-Id: <20210310170528.1184868-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210310170528.1184868-1-philmd@redhat.com> References: <20210310170528.1184868-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz , David Edmondson , Alistair Francis , Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Use the 'mode_read_array' event when we set the device in such mode, and use the 'reset' event in DeviceReset handler. Reviewed-by: Bin Meng Reviewed-by: David Edmondson Signed-off-by: Philippe Mathieu-Daudé --- hw/block/pflash_cfi01.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 03472ea5b64..2618e00926d 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -663,7 +663,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, "\n", __func__, offset, pfl->wcycle, pfl->cmd, value); mode_read_array: - trace_pflash_reset(); + trace_pflash_mode_read_array(); memory_region_rom_device_set_romd(&pfl->mem, true); pfl->wcycle = 0; pfl->cmd = 0x00; /* This model reset value for READ_ARRAY (not CFI) */ @@ -886,6 +886,7 @@ static void pflash_cfi01_system_reset(DeviceState *dev) { PFlashCFI01 *pfl = PFLASH_CFI01(dev); + trace_pflash_reset(); /* * The command 0x00 is not assigned by the CFI open standard, * but QEMU historically uses it for the READ_ARRAY command (0xff). -- 2.26.2