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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C0F20CCD19A for ; Fri, 17 Oct 2025 11:36:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9iiu-0000jW-V5; Fri, 17 Oct 2025 07:34:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9iit-0000j8-UV for qemu-devel@nongnu.org; Fri, 17 Oct 2025 07:34:15 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v9iii-00060D-4l for qemu-devel@nongnu.org; Fri, 17 Oct 2025 07:34:15 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-471193a9d9eso8511045e9.2 for ; Fri, 17 Oct 2025 04:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760700840; x=1761305640; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n8oXWw/dktgNDXuS33Gpiga0QxIzazhu/qxi0riXcZ8=; b=QpDhaaCLe7fsPWXWhhEuLi2C1TI/AbLTIjz7SiTnS4sfWHy+OV3PofjerWT7ZgLyl7 HHiz90BQyVzY4tDJ4NQB453G6TDLntgI3z7Wzs5k6AQT7DBGc6T9ECC8Go05ds9TVqWa vvy17XT6s5NYTjBt6UcKHDEOuYHlzNxnASM6U5T/U40MyD4tn71ts8CIfGvyhqNXfZ2a bXOigbaTuzVxUwyQ1gBETeqX9PEz4PrIWXQk7nlUGokJBhR3Beg0dT7j3XkM96teP41n n3/WsagEojUTGdUEtQkpWaA2u2y+O2EwIDmLrxnLVihtboCIFykZ4fZPtTMvYo1b4bNR Oxmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760700840; x=1761305640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n8oXWw/dktgNDXuS33Gpiga0QxIzazhu/qxi0riXcZ8=; b=OUWag0FdrPSq9MTeCO9otW+9Qzt4ojTpqoNBX5SATrukkuCoFnuF0OCw9zgicwBkL0 GoCuBBvKN5CO+D7TuYVZ2cpZdJXgnWdZXPs5Oi4ipv7HXTtC17exuCZSiPsTymhsI6Hw UDrNli43YZvzqlImw6u6yCbOXnhgcmfJzRqmEpKm1V6OjiYaMD7Pz4juBFV7crMImhAC O9jKX/F+O+dUYxsnUkG4Xxr3U/bHgWjV++AO3C7tnpchanp0ho0Hd04pQg1+vFm1+4ur t6MLp5vu1H5QOBBRIQRfdTAq9PvvvvdeYVGagwFCI5SdMvUjbPmGtK6d3LJ3l54VVvQE qnAw== X-Gm-Message-State: AOJu0Yzs4Nd6U6FnN7YcbyEs1QTY9Ra3oz9QX9A6D2doesqRcTdHkgEo mEJ+qjl0wGN7meyCqBCxIeLDvKrpwSoAXtw7Cv+C79V1oOvTf/mMuTNCJN+djQ== X-Gm-Gg: ASbGncup8Tb3A5lEOto82YLrTcxkLP7CY6tFtckxoy8lPY9a4+Bswem/Y2R6xCJkBHC ExRCZtGKLw0bG6ZRMfrfnHimgpuSWBJ+KjZpkwHaCXGA3+Zm6yXyw6MncXZpudkGtvnyXRrOo8+ +ZVD7yZnkBsJfQcT4J/P38DQ1at/8BIcjgpZ4Lt+Pp0/AZm3GcO3qVcQyPnYzUDfI9GQK6SRK+s iGsjDtL32HzFGDfYaprOKGDmY0NwwvL9Q8yx14s7bP4uCXBCiAurLNR5fiJiRXDejnMITCak2O/ aoY+GGtpAUmjL54voylRisesbvL4AGk8OmNSs9CujXrIiIxn7sjWNW8hasvNS0JFd/A448XuYKk iEqxVHgCTyRdHZcIKNh0V1pvbnqgkVC8NlzelEkbV3TBbS7o172iNr6nPRv5gwm36upb18Hl0M+ ViYh1osb0nk2B50iLZVJZlQ2BdQrq9Zi0QfTClroYo4yA= X-Google-Smtp-Source: AGHT+IHChLP+fEi3IjSJ8xuUf0OcbY0gfQ2DOrnMB0thW11DyqUS6nTY7XHhnqI2um9SOjKmvUz9UQ== X-Received: by 2002:a05:600c:4ec6:b0:46f:b327:ecfb with SMTP id 5b1f17b1804b1-4711787bfe8mr25755445e9.9.1760700840070; Fri, 17 Oct 2025 04:34:00 -0700 (PDT) Received: from archlinux (pd95edc07.dip0.t-ipconnect.de. [217.94.220.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4711444c8adsm80395435e9.13.2025.10.17.04.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Oct 2025 04:33:59 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Laurent Vivier , Eduardo Habkost , John Snow , Fabiano Rosas , Laurent Vivier , kvm@vger.kernel.org, Zhao Liu , qemu-trivial@nongnu.org, Marcel Apfelbaum , "Michael S. Tsirkin" , Sunil Muthuswamy , Marcelo Tosatti , Michael Tokarev , Richard Henderson , qemu-block@nongnu.org, Paolo Bonzini , Gerd Hoffmann , Bernhard Beschow Subject: [PATCH 3/8] hw/rtc/mc146818rtc: Convert CMOS_DPRINTF() into trace events Date: Fri, 17 Oct 2025 13:33:33 +0200 Message-ID: <20251017113338.7953-4-shentey@gmail.com> X-Mailer: git-send-email 2.51.1.dirty In-Reply-To: <20251017113338.7953-1-shentey@gmail.com> References: <20251017113338.7953-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=shentey@gmail.com; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Bernhard Beschow --- hw/rtc/mc146818rtc.c | 14 +++----------- hw/rtc/trace-events | 4 ++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index f9f5cf396f..61e9c0bf99 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -43,16 +43,10 @@ #include "qapi/error.h" #include "qapi/qapi-events-misc.h" #include "qapi/visitor.h" +#include "trace.h" -//#define DEBUG_CMOS //#define DEBUG_COALESCED -#ifdef DEBUG_CMOS -# define CMOS_DPRINTF(format, ...) printf(format, ## __VA_ARGS__) -#else -# define CMOS_DPRINTF(format, ...) do { } while (0) -#endif - #ifdef DEBUG_COALESCED # define DPRINTF_C(format, ...) printf(format, ## __VA_ARGS__) #else @@ -439,8 +433,7 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, if ((addr & 1) == 0) { s->cmos_index = data & 0x7f; } else { - CMOS_DPRINTF("cmos: write index=0x%02x val=0x%02" PRIx64 "\n", - s->cmos_index, data); + trace_mc146818_rtc_ioport_write(s->cmos_index, data); switch(s->cmos_index) { case RTC_SECONDS_ALARM: case RTC_MINUTES_ALARM: @@ -726,8 +719,7 @@ static uint64_t cmos_ioport_read(void *opaque, hwaddr addr, ret = s->cmos_data[s->cmos_index]; break; } - CMOS_DPRINTF("cmos: read index=0x%02x val=0x%02x\n", - s->cmos_index, ret); + trace_mc146818_rtc_ioport_read(s->cmos_index, ret); return ret; } } diff --git a/hw/rtc/trace-events b/hw/rtc/trace-events index b9f2852d35..d2f36217cb 100644 --- a/hw/rtc/trace-events +++ b/hw/rtc/trace-events @@ -32,6 +32,10 @@ m48txx_nvram_io_write(uint64_t addr, uint64_t value) "io write addr:0x%04" PRIx6 m48txx_nvram_mem_read(uint32_t addr, uint32_t value) "mem read addr:0x%04x value:0x%02x" m48txx_nvram_mem_write(uint32_t addr, uint32_t value) "mem write addr:0x%04x value:0x%02x" +# mc146818rtc.c +mc146818_rtc_ioport_read(uint8_t addr, uint8_t value) "[0x%02" PRIx8 "] -> 0x%02" PRIx8 +mc146818_rtc_ioport_write(uint8_t addr, uint8_t value) "[0x%02" PRIx8 "] <- 0x%02" PRIx8 + # goldfish_rtc.c goldfish_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64 goldfish_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64 -- 2.51.1.dirty