From patchwork Thu Feb 27 17:01:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 868977 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1561:b0:38f:210b:807b with SMTP id 1csp366271wrz; Thu, 27 Feb 2025 09:03:41 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXEP4PXkScpDNkyFZ+6c4RiPFhh+ea6rIOvmer4wv4mXBQO3yqY12Dhc0yw1mnVc9vi1twiew==@linaro.org X-Google-Smtp-Source: AGHT+IG+iheWw/UYZm6w3Fes1reblMQo7yJVNZlSoV96SN1J6ZMWQeuewuiPAg7EGHBdbVh+cmc5 X-Received: by 2002:a05:600c:3b14:b0:439:9985:6984 with SMTP id 5b1f17b1804b1-43ab9047cd7mr77921065e9.30.1740675820853; Thu, 27 Feb 2025 09:03:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740675820; cv=none; d=google.com; s=arc-20240605; b=eeJwP0vftX5aVuo8KyNsyxpCeXyof+5h2pmKvnHCifnhf0dgVPy291MW7raa/kJevA qOrt137EZJvi8Tr+wYun7WUMIV8HTf3JJZ1OsS2H0gRAg1RbJ2NocbVMuj1L8pzLak4S iDZsAo8Yjv6Qx5VHJ7ktfuQqFh8D0ZvveiTc9OsP3neddjI8vQj5e6cnN5WuirkJrxdk 2go/ub2YhfJvVMrpL0bdDU23dJCrd2vgeySEkMaivRVUT0IHRf1yxZcHchhIQm95wvJx E0Z4D8/QhgmNMo6ZPYpAICEeNV7g8rq/IDP7CFA9fiRrVHkroLWtWUPNGWm0Kvq5Fn7k XZEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=BMZ/a2nzPtLYyS89YoqeNcWEmY/c5UQ/LIwoP4jOOso=; fh=owec/YE2SKj8UeJdAv1n+OW8i8KuWBBpozFN1KhQKOU=; b=lEFKIoMIDN984LJF81JQz8uXgf6RKR5ma3qWySlWJfnxvd/aGk3gSVp8Jy6EP+jCfq Q1b6Qpp1Y4MkAGjKEPI3BTdQlzffFQwm1fToGtBFGFF9TOrbSEhfFTG8x5JXr7GcmXt+ 45QW0sMc5MD7SdoYeHtTpizqPKLEdF9jI2PRD9CpYv5J74vJOMKniaOfep/UTrq8Dplm Lo1bnamoCmYJwgewK2c9Y260rco5sc7Kl0Vi/cFHnOdHn+noKDvDJrK6z/NPHE3+yp7A ePLggpsaMLxRRXKfD5y0ZZ7ilw+4DGtN4vwtOLCPF8ZaIfZtYuBMN9r584k6pmex807W g4qQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="EiZc/z0m"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-390e484018esi1365540f8f.720.2025.02.27.09.03.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Feb 2025 09:03:40 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="EiZc/z0m"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnhGv-0005ai-3H; Thu, 27 Feb 2025 12:02:09 -0500 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 1tnhGY-0005DB-4e for qemu-devel@nongnu.org; Thu, 27 Feb 2025 12:01:43 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnhGR-0002L4-5J for qemu-devel@nongnu.org; Thu, 27 Feb 2025 12:01:41 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4399d14334aso11614005e9.0 for ; Thu, 27 Feb 2025 09:01:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740675682; x=1741280482; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BMZ/a2nzPtLYyS89YoqeNcWEmY/c5UQ/LIwoP4jOOso=; b=EiZc/z0mqtIgvsJqQTvgu1Jvwut4ug6jSNciof7t/mqrVqg/M93UQEVULflWhHe2dV AbBrd8FKZzH4dh3u28CJP/YbfHHtvizihUwI/cKrLcAORBMcq+RFa1m/kg6YfMZdT42y Kf1uQsKWhUQSbDi+rn9R6MFtUfOW8jkd+OSZdj6RTNwRTbG41SQ2NwRVBuWzRC6kuUon 9osPeTtyNMku5/WyhsZHwOlP5I7F7xrZ0cK+hqbZgFXYUoDDQhsrTHSHzptWYrdnyBLC ZeDtndY1ooAObYBHj04NcgGZ2G55Xki0vyoJpbcJrRFK7lQ+dtx5Vc2s4j7xKbss0k+h wQ1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740675682; x=1741280482; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BMZ/a2nzPtLYyS89YoqeNcWEmY/c5UQ/LIwoP4jOOso=; b=TPjHXMB+sMkuW731rVI4TAit/BaWheqHvnm/YkawoHpOLK8N6QvFT9kdqB8kzp44x0 KgU4xaohi4cEpdKR4ErOo2TUdyjjfmItZjr74BEs+HmYSfVVugNbJUPUoSicZE23OMBf eSPFAchtqP6CLZuTCjlyaTdbuGH2WX8tSNWVsNxc7px/qKjELlXVbJOnz5SaQqaCsosJ OlBS/ydcW9tcAFCghegYIAKXR1FpQl9rdGVZv9JmbWBAkGWcbEYfd3MG9/aur4d+et2g 5uM9YXGYgWL5Gq8HLKAjKJtjPSl20yrsa1YoIwWPXdcba6zTNUN+vu0kbYFmleTgk80r ZMug== X-Forwarded-Encrypted: i=1; AJvYcCWJHJ0DX2Ky4442uBzuEVyTnU1nlYS2F1Pps4ZgHQL1/0CIXhM8qmBHjPIs4W/7crNl18TRM+C3crlu@nongnu.org X-Gm-Message-State: AOJu0YzG/KtaaLyQhoOH+jT73ga3+Xti1wCsvuM6dnjmhZZg0SxJwobG anfEqQKsqUll3NWB2asifxqm7YLTL73YTMzo8ysIwt7DFh5hRw0zwj8TGXPhugw= X-Gm-Gg: ASbGncsd2XxrmCLzckx0rA3+GqDDkCWnyy2422IhXxGO0I18mXFSYvVylBtAtd6E5QN 0pHgkqsVGRF/bNylAsATR0EgV/Ef0IdvGfNRjU2UCCNt9u96TR+5LvCKXsLgSQP2D4qKg+NdSAf qS4B01gNvQNK+KpiECk+KNcdW8dkUzf0BrfWe8TwUOBkPh2RSS2t8MdmBT+fszPl2yRH0s88YFo IGaR8HjH7RXFN35gNz+djmrIArAtHIFZOGoqlCOnmNHX2IrhSNCuDGJPn0GgdVc3hyb2Tbx7adD ItwU3ktAl/5MXGV14GZzKXVkZ4UM+rgm X-Received: by 2002:a05:600c:5487:b0:439:9494:318 with SMTP id 5b1f17b1804b1-43ab8fd04dcmr63498175e9.1.1740675681665; Thu, 27 Feb 2025 09:01:21 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba5871f4sm62747565e9.39.2025.02.27.09.01.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 09:01:20 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 1/5] hw/arm/omap1: Convert raw printfs to qemu_log_mask() Date: Thu, 27 Feb 2025 17:01:13 +0000 Message-ID: <20250227170117.1726895-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250227170117.1726895-1-peter.maydell@linaro.org> References: <20250227170117.1726895-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org omap1.c is very old code, and it contains numerous calls direct to printf() for various error and information cases. In this commit, convert the printf() calls that are for either guest error or unimplemented functionality to qemu_log_mask() calls. This leaves the printf() calls that are informative or which are ifdeffed-out debug statements untouched. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- hw/arm/omap1.c | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index ca2eb0d1576..3c0ce5e0979 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -2559,8 +2559,9 @@ static void omap_rtc_interrupts_update(struct omap_rtc_s *s) static void omap_rtc_alarm_update(struct omap_rtc_s *s) { s->alarm_ti = mktimegm(&s->alarm_tm); - if (s->alarm_ti == -1) - printf("%s: conversion failed\n", __func__); + if (s->alarm_ti == -1) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: conversion failed\n", __func__); + } } static uint64_t omap_rtc_read(void *opaque, hwaddr addr, unsigned size) @@ -3024,8 +3025,9 @@ static void omap_mcbsp_source_tick(void *opaque) if (!s->rx_rate) return; - if (s->rx_req) - printf("%s: Rx FIFO overrun\n", __func__); + if (s->rx_req) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: Rx FIFO overrun\n", __func__); + } s->rx_req = s->rx_rate << bps[(s->rcr[0] >> 5) & 7]; @@ -3070,8 +3072,9 @@ static void omap_mcbsp_sink_tick(void *opaque) if (!s->tx_rate) return; - if (s->tx_req) - printf("%s: Tx FIFO underrun\n", __func__); + if (s->tx_req) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: Tx FIFO underrun\n", __func__); + } s->tx_req = s->tx_rate << bps[(s->xcr[0] >> 5) & 7]; @@ -3173,7 +3176,7 @@ static uint64_t omap_mcbsp_read(void *opaque, hwaddr addr, /* Fall through. */ case 0x02: /* DRR1 */ if (s->rx_req < 2) { - printf("%s: Rx FIFO underrun\n", __func__); + qemu_log_mask(LOG_GUEST_ERROR, "%s: Rx FIFO underrun\n", __func__); omap_mcbsp_rx_done(s); } else { s->tx_req -= 2; @@ -3278,8 +3281,9 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, } if (s->tx_req < 2) omap_mcbsp_tx_done(s); - } else - printf("%s: Tx FIFO overrun\n", __func__); + } else { + qemu_log_mask(LOG_GUEST_ERROR, "%s: Tx FIFO overrun\n", __func__); + } return; case 0x08: /* SPCR2 */ @@ -3293,8 +3297,11 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, case 0x0a: /* SPCR1 */ s->spcr[0] &= 0x0006; s->spcr[0] |= 0xf8f9 & value; - if (value & (1 << 15)) /* DLB */ - printf("%s: Digital Loopback mode enable attempt\n", __func__); + if (value & (1 << 15)) { /* DLB */ + qemu_log_mask(LOG_UNIMP, + "%s: Digital Loopback mode enable attempt\n", + __func__); + } if (~value & 1) { /* RRST */ s->spcr[0] &= ~6; s->rx_req = 0; @@ -3325,13 +3332,19 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, return; case 0x18: /* MCR2 */ s->mcr[1] = value & 0x03e3; - if (value & 3) /* XMCM */ - printf("%s: Tx channel selection mode enable attempt\n", __func__); + if (value & 3) { /* XMCM */ + qemu_log_mask(LOG_UNIMP, + "%s: Tx channel selection mode enable attempt\n", + __func__); + } return; case 0x1a: /* MCR1 */ s->mcr[0] = value & 0x03e1; - if (value & 1) /* RMCM */ - printf("%s: Rx channel selection mode enable attempt\n", __func__); + if (value & 1) { /* RMCM */ + qemu_log_mask(LOG_UNIMP, + "%s: Rx channel selection mode enable attempt\n", + __func__); + } return; case 0x1c: /* RCERA */ s->rcer[0] = value & 0xffff; @@ -3412,8 +3425,9 @@ static void omap_mcbsp_writew(void *opaque, hwaddr addr, } if (s->tx_req < 4) omap_mcbsp_tx_done(s); - } else - printf("%s: Tx FIFO overrun\n", __func__); + } else { + qemu_log_mask(LOG_GUEST_ERROR, "%s: Tx FIFO overrun\n", __func__); + } return; } From patchwork Thu Feb 27 17:01:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 868980 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1561:b0:38f:210b:807b with SMTP id 1csp367418wrz; Thu, 27 Feb 2025 09:05:14 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXusfPuh3qAWYi6GGUBVsfQEFbERfQmHfFulkCXma45CentKPXJh9PIUYxaiZCXzqvhOZgl5g==@linaro.org X-Google-Smtp-Source: AGHT+IGhnWJg0A0UzCUASYhQLzhjWspi/5ug9KK0PqF/OVWTndqGE6VnC/x2jDpBX6SkPMzes/9T X-Received: by 2002:a5d:434a:0:b0:38f:32ac:7e55 with SMTP id ffacd0b85a97d-390d4fa2b58mr6253860f8f.48.1740675914626; Thu, 27 Feb 2025 09:05:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740675914; cv=none; d=google.com; s=arc-20240605; b=cbrAx+i4hKJevmao9zNnNlQcdnsh4fTTyaKezKEyAxcn8fdybqWJTH1A2/kKYlHtvN 25HMHQ9JgmiicDtgjqT5Z63xOy4HuQ6zyPr87ORQqQxzmBN+1mCwLrO6//4SzwESOzSR zhMPL+Ue2OAIQfGXvBoMzC7ymxEBnbMy3Qvtqqr7Pn8/nGc//AtEGBJzFW0spedTeRk6 Pf9lzfV4rwbSwWNJ5mh2yV1MFqwP4LCRvK4sB2kSViS+lCPWW7O/sh7Ai2U9cS+ZWJsF bmyloOVYEUZtbeSaCC9BMtYq3uuhyx322HU1lsLrliis/gB5dgatxjrZWoOUP61MrYq7 jDqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=UF02YER6LE6cA8Ff3jhsAUNNOFSeF4BeX3fGvUwDcr8=; fh=kMV9Gf03Gytdui1wNFIYiPtWHZ5s+jsuC1BVPpLEkys=; b=Fgp2Yv8DsJdiOAWzNYCLta+XhFN/PYICoKxqOSasO4VHBdx+L0U1zExMfaCotswdi8 51NXbuR+69rIOmwddSGR6OvZ3LHG3dcz8mtwgqq4K/+Eg2AKYry4EXYJitW8MdyqTJeP Zf1LRT+MtQ+tHZbk710I6kNasqilufiUFwoqhrhJbTIXbemhbnNg+IRQJdY084mxKnYE fSSSqkzSphj2bTzI45/3RYM1OcJqLW07D6jP4YoSsybLxMnym3GohN8Q94XG7kZ8ERbv Q0xhNk3uSWMcMYyvEVeht1w9yvoSia3V/5R/ePnrLaBPAL7k5oUBrzDd36zJDbDHlJ89 Ns4g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IMnlzyQm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-390e483c4edsi1281210f8f.653.2025.02.27.09.05.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Feb 2025 09:05:14 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IMnlzyQm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnhId-0007RF-0m; Thu, 27 Feb 2025 12:03:51 -0500 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 1tnhGV-0005Ce-AC for qemu-devel@nongnu.org; Thu, 27 Feb 2025 12:01:44 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnhGQ-0002LP-Vs for qemu-devel@nongnu.org; Thu, 27 Feb 2025 12:01:37 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-439a331d981so11384095e9.3 for ; Thu, 27 Feb 2025 09:01:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740675684; x=1741280484; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UF02YER6LE6cA8Ff3jhsAUNNOFSeF4BeX3fGvUwDcr8=; b=IMnlzyQmRu9NFTY2Qpxd0zuu5otFx63Qt4HenisymcW7FIyvbVQUOWr4wic1qWWFxe kY6CW9ux/1BQWMQoAhICh/6HgT7cBEtOelUI5WrER+JULyC0AnxhSrODcntPCRsLinJ+ Sz3P7EiPeIDnudxqQTx7OHH1sYJc3ENu7S2mmBhLMtpHL7reRQ7ZWODKFzcxl28/0vXN 8mxEv7CLeMwercJvcs2ulZ6MX/973iZ7/S9dVZmoULkKK+DV6XkY7KeScd0i6jhqCyzC o4UWMk0nvU+ZdQbHVctf36aDa+XWBJE9ZWIWKKXNV2iYfkuoAVVfKx9Vt0vDi5X8fM6g mNnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740675684; x=1741280484; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UF02YER6LE6cA8Ff3jhsAUNNOFSeF4BeX3fGvUwDcr8=; b=F94BnXMC6sRDA9PRhYPHee+zTAr7T4YPRCBC2ivwyorN/arMVWbEhsCfnjcBG0p3jP ySOGdVPfj+eLXP36GabLqpoOf6J9WUcchy4Q2thUjRnEQB5iC6Sqm8uy8akwJAlPdru0 3ov56S9PyqWCKQ3LazFd5bwGo08jAjaKiXwdlw5TAzQBcJC9P6K5PoTRBhwJ3VvFavF4 ZFvYasqN3CaJIwaO4OhOu2Y2OJn4fRNlKlo6W6+hGpJ0U/mhlvKcmdWL+dHqRTDHKFqO xJMa1OMWY1lXego+KUOmFre+99TLMWfmdD//YA+Gky0vjQJzwZdNanuI0bHkiQ36QbNh iZUw== X-Forwarded-Encrypted: i=1; AJvYcCXrSnFdmIPDbeZmoRzpYYs/krwiXTwGOs97IdRZZugdqNvvnyGl1Zq4Q46ODhbq8uuqf0PcUmAv+Cff@nongnu.org X-Gm-Message-State: AOJu0YzN+zxaGCI6TI1PXsH4S8GcOFKV7EaWyR1ENPeFJ5VA6Sq/tSH3 DQJ8uuDUHFpfGzhHfYbl4Yz8niYOEyga2FHfm2oCm0HIbpREFycn+t5VNK14ZiKAYEm4uyjfpPn o X-Gm-Gg: ASbGnctzSWf/UlgPA6P9JAjp/EmCSHRNP6H5EhGThiR7JvB9qwpQPIxLAvGQKqwEF48 iFUUdLcgBiLgSdM80wTkyUhIDsqWTVLFVKVuI6l7o6PDhcaZdWzyzbCwW73a3Kl9xw4RKC02C6L o2+Cs2F7nUgbcf16Rey+O0ao9Q5O4AgM4cx0kUYoApsJW72Bm3SoRQfUQsC/Pln6C1v8ZNrogY9 cILrZI9fPGMKWV7Z8fhCGNWtlXKzpNu65SvsQUuGv5LGX0Icm82279N0k6zjZYT9kdLlbNpGkT4 WtWhwoYz0VApUg+kiLGTCjxUu9DOlRHl X-Received: by 2002:a05:600c:5103:b0:439:5da7:8e0 with SMTP id 5b1f17b1804b1-43ab8fe2fe9mr83751495e9.16.1740675682878; Thu, 27 Feb 2025 09:01:22 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba5871f4sm62747565e9.39.2025.02.27.09.01.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 09:01:21 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 2/5] hw/arm/omap1: Drop ALMDEBUG ifdeffed out code Date: Thu, 27 Feb 2025 17:01:14 +0000 Message-ID: <20250227170117.1726895-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250227170117.1726895-1-peter.maydell@linaro.org> References: <20250227170117.1726895-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In omap1.c, there are some debug printfs in the omap_rtc_write() function that are guardad by ifdef ALMDEBUG. ALMDEBUG is never set, so this is all dead code. It's not worth the effort of converting all of these to tracepoints; a modern tracepoint approach would probably have a single tracepoint covering all the register writes anyway. Just delete the printf()s. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- hw/arm/omap1.c | 51 -------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 3c0ce5e0979..8f5bb81c96a 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -2660,25 +2660,16 @@ static void omap_rtc_write(void *opaque, hwaddr addr, switch (offset) { case 0x00: /* SECONDS_REG */ -#ifdef ALMDEBUG - printf("RTC SEC_REG <-- %02x\n", value); -#endif s->ti -= s->current_tm.tm_sec; s->ti += from_bcd(value); return; case 0x04: /* MINUTES_REG */ -#ifdef ALMDEBUG - printf("RTC MIN_REG <-- %02x\n", value); -#endif s->ti -= s->current_tm.tm_min * 60; s->ti += from_bcd(value) * 60; return; case 0x08: /* HOURS_REG */ -#ifdef ALMDEBUG - printf("RTC HRS_REG <-- %02x\n", value); -#endif s->ti -= s->current_tm.tm_hour * 3600; if (s->pm_am) { s->ti += (from_bcd(value & 0x3f) & 12) * 3600; @@ -2688,17 +2679,11 @@ static void omap_rtc_write(void *opaque, hwaddr addr, return; case 0x0c: /* DAYS_REG */ -#ifdef ALMDEBUG - printf("RTC DAY_REG <-- %02x\n", value); -#endif s->ti -= s->current_tm.tm_mday * 86400; s->ti += from_bcd(value) * 86400; return; case 0x10: /* MONTHS_REG */ -#ifdef ALMDEBUG - printf("RTC MTH_REG <-- %02x\n", value); -#endif memcpy(&new_tm, &s->current_tm, sizeof(new_tm)); new_tm.tm_mon = from_bcd(value); ti[0] = mktimegm(&s->current_tm); @@ -2715,9 +2700,6 @@ static void omap_rtc_write(void *opaque, hwaddr addr, return; case 0x14: /* YEARS_REG */ -#ifdef ALMDEBUG - printf("RTC YRS_REG <-- %02x\n", value); -#endif memcpy(&new_tm, &s->current_tm, sizeof(new_tm)); new_tm.tm_year += from_bcd(value) - (new_tm.tm_year % 100); ti[0] = mktimegm(&s->current_tm); @@ -2737,25 +2719,16 @@ static void omap_rtc_write(void *opaque, hwaddr addr, return; /* Ignored */ case 0x20: /* ALARM_SECONDS_REG */ -#ifdef ALMDEBUG - printf("ALM SEC_REG <-- %02x\n", value); -#endif s->alarm_tm.tm_sec = from_bcd(value); omap_rtc_alarm_update(s); return; case 0x24: /* ALARM_MINUTES_REG */ -#ifdef ALMDEBUG - printf("ALM MIN_REG <-- %02x\n", value); -#endif s->alarm_tm.tm_min = from_bcd(value); omap_rtc_alarm_update(s); return; case 0x28: /* ALARM_HOURS_REG */ -#ifdef ALMDEBUG - printf("ALM HRS_REG <-- %02x\n", value); -#endif if (s->pm_am) s->alarm_tm.tm_hour = ((from_bcd(value & 0x3f)) % 12) + @@ -2766,33 +2739,21 @@ static void omap_rtc_write(void *opaque, hwaddr addr, return; case 0x2c: /* ALARM_DAYS_REG */ -#ifdef ALMDEBUG - printf("ALM DAY_REG <-- %02x\n", value); -#endif s->alarm_tm.tm_mday = from_bcd(value); omap_rtc_alarm_update(s); return; case 0x30: /* ALARM_MONTHS_REG */ -#ifdef ALMDEBUG - printf("ALM MON_REG <-- %02x\n", value); -#endif s->alarm_tm.tm_mon = from_bcd(value); omap_rtc_alarm_update(s); return; case 0x34: /* ALARM_YEARS_REG */ -#ifdef ALMDEBUG - printf("ALM YRS_REG <-- %02x\n", value); -#endif s->alarm_tm.tm_year = from_bcd(value); omap_rtc_alarm_update(s); return; case 0x40: /* RTC_CTRL_REG */ -#ifdef ALMDEBUG - printf("RTC CONTROL <-- %02x\n", value); -#endif s->pm_am = (value >> 3) & 1; s->auto_comp = (value >> 2) & 1; s->round = (value >> 1) & 1; @@ -2802,32 +2763,20 @@ static void omap_rtc_write(void *opaque, hwaddr addr, return; case 0x44: /* RTC_STATUS_REG */ -#ifdef ALMDEBUG - printf("RTC STATUSL <-- %02x\n", value); -#endif s->status &= ~((value & 0xc0) ^ 0x80); omap_rtc_interrupts_update(s); return; case 0x48: /* RTC_INTERRUPTS_REG */ -#ifdef ALMDEBUG - printf("RTC INTRS <-- %02x\n", value); -#endif s->interrupts = value; return; case 0x4c: /* RTC_COMP_LSB_REG */ -#ifdef ALMDEBUG - printf("RTC COMPLSB <-- %02x\n", value); -#endif s->comp_reg &= 0xff00; s->comp_reg |= 0x00ff & value; return; case 0x50: /* RTC_COMP_MSB_REG */ -#ifdef ALMDEBUG - printf("RTC COMPMSB <-- %02x\n", value); -#endif s->comp_reg &= 0x00ff; s->comp_reg |= 0xff00 & (value << 8); return; From patchwork Thu Feb 27 17:01:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 868979 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1561:b0:38f:210b:807b with SMTP id 1csp366537wrz; Thu, 27 Feb 2025 09:04:01 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVPguUGDpmDqTaxB98xU0sQLqpXMfLsh+zK7N1hbk0mWU4noA3vG34CbpKQx6v/dBFegKg9Zg==@linaro.org X-Google-Smtp-Source: AGHT+IGryUFlhrsSyUZlOkwM8luGr89KWx00fQvjrl/G+Cg5m0xOaVbZnpsSRJxEHKPTUDHrZxON X-Received: by 2002:ac8:598b:0:b0:472:95f:d25e with SMTP id d75a77b69052e-4722473cfb4mr364156171cf.19.1740675841228; Thu, 27 Feb 2025 09:04:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740675841; cv=none; d=google.com; s=arc-20240605; b=OTUApaFQ7Zoam+x+sFwCnwhEaqJVU8JCR7gBUJO7xTpPufRoRett9uAuoE8SOUIIKB h+yBBa6i53ZxnBp87aYHNg2TY4MTgWT1sH8MOgiGSBAqyL8LEhDrlA7NILzDbwV83bbw Fg1tOxyu5LSdYaTkN6osAOU+9nWclK845NhEprencAnVY6a8jbwO7I8IQ+P/+wtllT3g bweNL/Z3xIWSS8b5J4XRtF3M5Kdka+NKG610z7H4lWMZKJsX+CdHpdrG2oop4+DssLXr j+A1LffDZXmuLXhVqza7D3MByoaNEVGm98PumL4AoNqW9RQkwxteJi8oHDw3E/v7EO+u mWLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=x0ydyJO+hAGBCmhuOK11rHsC8IExSp5z9xqzobRVKxY=; fh=z7537GXWlUqmuTKoeXU88MsPgYESq3+Dz9D/2o2RXG0=; b=Io1IQrrTdfjSkcGbVyZFqpfd1rC4zuInFS96EMfrj1lsLXHLjHTAM8uBOuAAzHlRtR ENCUs1SRtj+7NQiZ+5/FrA/7uqYbxP7tDYI+rSZ1vSyPTq43UYdx3BepkOQUXmtMmPOa tst09FOwiR1ylcL/VgROOcCmkqa03HgZyymCrwNwK3y5GVNnltJjKWcHitgnQs5/3hpD 2Xf22ztP0B7QTBLuJyyVaa4ATcLvNVFEnvESkwyPHytKssc64sStBJMUfAc075LwkdrE wu8go0nHyedsHL/uRKrNeXyjRLKKAbonroF5Y2ZiJIZwGzZCLau9JIEUusG8M+q6p1AQ KeBQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UuoCST2+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474723fb6casi16358701cf.327.2025.02.27.09.04.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Feb 2025 09:04:01 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UuoCST2+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnhIT-0006ya-3S; Thu, 27 Feb 2025 12:03:41 -0500 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 1tnhGV-0005Cm-Rr for qemu-devel@nongnu.org; Thu, 27 Feb 2025 12:01:43 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnhGQ-0002La-Ul for qemu-devel@nongnu.org; Thu, 27 Feb 2025 12:01:39 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4397dff185fso10930055e9.2 for ; Thu, 27 Feb 2025 09:01:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740675685; x=1741280485; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=x0ydyJO+hAGBCmhuOK11rHsC8IExSp5z9xqzobRVKxY=; b=UuoCST2+HnJsjq2u+WdfkPf1/ZWMcZuW+Ly8KMHfkLJgYkAXdVoVNFfNtxiyF/QRXC A7w1l/EYXyY2cN8LT1EZPo5FpsYghiRJ/NayRib8703cK3TRtnVn5kKxgcUH8VB8S+QI 5ttquJtbwOtcCQXGy5ffMSeeTfCFBYCL7KMziK8mWSlVVXJmz5/yB8soM/dB9goTzuiC 1Mc+NcQvQOItvpmXsgx8akdHJQx93ae0FhNdUBQXrjUDaiKLnwdGyqABHubSRvVh+kYj aOUT+GuBArn9x17g8U/MZEa4vEDjZVcERFEFxr6w+J84G0Y+BQHeSgmal9Wl05IkPLfw Zg/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740675685; x=1741280485; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x0ydyJO+hAGBCmhuOK11rHsC8IExSp5z9xqzobRVKxY=; b=SuH9lUUJBHEaVHTiz9Xe0YeHHG9Kc2ekMXVn4qQq6B7IS7AlaJA5g7UEL3Jdlo8a25 lQncg9NIEzV4e/j/FPvpnQHdIfpOCNRVuIjfFXzeE4uMDkaJkB47U2Hqs7q1rXbKPmrQ 4dz7uE5QwOE9BF3uZX4a8IthY66b7WqyHuzyn0arTObI4K20WE2xK5L/bmiJSJLqa6dT las4j/h0KDnXZyK+3opSbmORSwE1CCuassUSysRR5GcRz2UuqX53QqUwNbB0DoEGJ8LB jmPpZOur8s/iLyCngH3Qbuj3LOulyfqk9KzCgJS/gzn6cF/vjEPieOmrDn1FKPRlVfWQ xt3w== X-Forwarded-Encrypted: i=1; AJvYcCXoxiuxrRwAeimAso9Gvrk3RRmI+RiXUnYJM/HtLz0CyqIw+M9vDWCWGha3UzMZx8fr26kUWK5f+xc9@nongnu.org X-Gm-Message-State: AOJu0YwR+0rDsj5E1nQynJpYhtEJkL/f+OeNnxM6nVHlRqvf8ASM/5/H 7LK2Yk3JLosipuMW/Wn34j6bW2yArrhkf0v7ZEhOcl3YZqAWXn02F9HuL7yvbSdjFyiI8y65dDA 2 X-Gm-Gg: ASbGncv1Q3tWWpbCFShjrsTOiNTyq+sqX4qhz0yG7u8kTl1Kr4kxuETkqkeCRLnWbOD oOTBkzmD4V+ZxpJT0lxqRyeXIcTTWkzqBl00p/nVTwt3SdbqzMkG3gMQwMM0lMW40zxQ+PwJeot we3GFFdh1XkfHTzZeo/JO4Q0GtT2+mHsHNA3avyFXkeKUlo868mlYRDy5Ad7fBc/LTPFNqU7Nwj XoL1hlyktnqRfHHYQNGuWkgK+zb9pFXClMsaqJeYIOIH6KrOsqCcUvlDaxEaH0HqK58u1xW/jNE x1/pxS5yymemYPr6WaI2cJVwPpw3YKIp X-Received: by 2002:a05:600c:4e8b:b0:439:6101:5440 with SMTP id 5b1f17b1804b1-43ab8fd875dmr70840565e9.8.1740675683826; Thu, 27 Feb 2025 09:01:23 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba5871f4sm62747565e9.39.2025.02.27.09.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 09:01:23 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 3/5] hw/arm/omap1: Convert information printfs to tracepoints Date: Thu, 27 Feb 2025 17:01:15 +0000 Message-ID: <20250227170117.1726895-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250227170117.1726895-1-peter.maydell@linaro.org> References: <20250227170117.1726895-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The omap1 code uses raw printf() statements to print information about some events; convert these to tracepoints. In particular, this will stop the functional test for the sx1 from printing the not-very-helpful note "omap_clkm_write: clocking scheme set to synchronous scalable" to the test's default.log. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- hw/arm/omap1.c | 27 ++++++++++++++------------- hw/arm/trace-events | 7 +++++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 8f5bb81c96a..605e733459c 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -42,6 +42,7 @@ #include "qemu/cutils.h" #include "qemu/bcd.h" #include "target/arm/cpu-qom.h" +#include "trace.h" static inline void omap_log_badwidth(const char *funcname, hwaddr addr, int sz) { @@ -1731,8 +1732,7 @@ static void omap_clkm_write(void *opaque, hwaddr addr, case 0x18: /* ARM_SYSST */ if ((s->clkm.clocking_scheme ^ (value >> 11)) & 7) { s->clkm.clocking_scheme = (value >> 11) & 7; - printf("%s: clocking scheme set to %s\n", __func__, - clkschemename[s->clkm.clocking_scheme]); + trace_omap1_clocking_scheme(clkschemename[s->clkm.clocking_scheme]); } s->clkm.cold_start &= value & 0x3f; return; @@ -2335,7 +2335,7 @@ static void omap_pwl_update(struct omap_pwl_s *s) if (output != s->output) { s->output = output; - printf("%s: Backlight now at %i/256\n", __func__, output); + trace_omap1_backlight(output); } } @@ -2470,8 +2470,8 @@ static void omap_pwt_write(void *opaque, hwaddr addr, break; case 0x04: /* VRC */ if ((value ^ s->vrc) & 1) { - if (value & 1) - printf("%s: %iHz buzz on\n", __func__, (int) + if (value & 1) { + trace_omap1_buzz( /* 1.5 MHz from a 12-MHz or 13-MHz PWT_CLK */ ((omap_clk_getrate(s->clk) >> 3) / /* Pre-multiplexer divider */ @@ -2487,8 +2487,9 @@ static void omap_pwt_write(void *opaque, hwaddr addr, /* 80/127 divider */ ((value & (1 << 5)) ? 80 : 127) / (107 * 55 * 63 * 127))); - else - printf("%s: silence!\n", __func__); + } else { + trace_omap1_silence(); + } } s->vrc = value & 0x7f; break; @@ -3494,7 +3495,7 @@ static void omap_lpg_tick(void *opaque) timer_mod(s->tm, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + s->on); s->cycle = !s->cycle; - printf("%s: LED is %s\n", __func__, s->cycle ? "on" : "off"); + trace_omap1_led(s->cycle ? "on" : "off"); } static void omap_lpg_update(struct omap_lpg_s *s) @@ -3514,11 +3515,11 @@ static void omap_lpg_update(struct omap_lpg_s *s) } timer_del(s->tm); - if (on == period && s->on < s->period) - printf("%s: LED is on\n", __func__); - else if (on == 0 && s->on) - printf("%s: LED is off\n", __func__); - else if (on && (on != s->on || period != s->period)) { + if (on == period && s->on < s->period) { + trace_omap1_led("on"); + } else if (on == 0 && s->on) { + trace_omap1_led("off"); + } else if (on && (on != s->on || period != s->period)) { s->cycle = 0; s->on = on; s->period = period; diff --git a/hw/arm/trace-events b/hw/arm/trace-events index 7790db780e0..70b137a6cfd 100644 --- a/hw/arm/trace-events +++ b/hw/arm/trace-events @@ -1,5 +1,12 @@ # See docs/devel/tracing.rst for syntax documentation. +# omap1.c +omap1_clocking_scheme(const char *scheme) "omap1 CLKM: clocking scheme set to %s" +omap1_backlight(int output) "omap1 PWL: backlight now at %d/256" +omap1_buzz(int freq) "omap1 PWT: %dHz buzz on" +omap1_silence(void) "omap1 PWT: buzzer silenced" +omap1_led(const char *onoff) "omap1 LPG: LED is %s" + # virt-acpi-build.c virt_acpi_setup(void) "No fw cfg or ACPI disabled. Bailing out." From patchwork Thu Feb 27 17:01:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 868978 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1561:b0:38f:210b:807b with SMTP id 1csp366534wrz; Thu, 27 Feb 2025 09:04:01 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXdUZUpdVPs2/6Tf52XWy+FhrIF+hwf/+axIDfxXJvmCB5hq2Ole0W1kky3D9OxEuE4sHnn+Q==@linaro.org X-Google-Smtp-Source: AGHT+IEVXWVZsCn/s12MyIzFeJ+9U+KKKGw1LH9N+6uKzv+5AeL6plEsMghfTTIgPrWdeQboCm1s X-Received: by 2002:a05:620a:3913:b0:7c0:7b72:ea96 with SMTP id af79cd13be357-7c247f22b7bmr912991385a.14.1740675841105; Thu, 27 Feb 2025 09:04:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740675841; cv=none; d=google.com; s=arc-20240605; b=N1j4hPEw2QDepec1Lf1trtuqu90rAGja/R43nsapqe9Q33Q7usLAEJxivc4yqmlXO7 FrCTT3k91g54JSBJ39u0X4CUehTSpIps98eN/+HnTREVc5i1gfO6kMA7+n4g3S5qZEzm vKUKTcaHXIMzyIWbQcPxXNUpmZUQScXCnJZI2P0GL26PKS+foGsYdicjgdZAbC1Ctuk0 6vH0NVj83zN4MIOyYlwaTL6ykSqyPj2nNrUjmVtVSngC2iRBY1Ftpx1hL/rAtshQMlc0 4t3C6ddHnIVmCSjnAShEH0TAzkf3rFydJLU5YZsjuFZfRinKEqZG1s2UhOzQiPrEI9y4 jAng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=v8PhnXMjZeodBD0z3UBX0mp4g/I3gCrKUSNVDYtiv1E=; fh=kqE/9ELTFHquepuul8Ns5YLpiZc/zAkQOXsG3DWR5bA=; b=cDjE1xJ+nAG6A9Yvnys5aX/3R2pYuHDC/nlJzEA0hKnbpCCDUpcg1U94kxvlwwqk// AYCtH2nIjbpsc7944XcvILU/kmqwbVWLt8RPRv0culoF+VDAMcGHthM6MdzVxTaw6hjA noG+6aDgLiGkiHW2uwMu3THwOWDbO7fiFQgCZsckqKCf03u6QPgX72l0jTM5fIeVZr2V KIZq/GnPap2Zu4L/r/8nzECmlSg2a9fPfpUh5Vn4v7anlawqtIoyvgoWcZCHqEep8fFD 2eUg394KQejQ8Sybmm1bEA25foZ/khp47fqx67vce3rgqASMb5Jlg1dDhNHt0KNxZhxo CjdQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oD81KmF9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e8976c063esi15347246d6.210.2025.02.27.09.04.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Feb 2025 09:04:01 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oD81KmF9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnhIX-00078y-1g; Thu, 27 Feb 2025 12:03:45 -0500 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 1tnhGV-0005Cd-9t for qemu-devel@nongnu.org; Thu, 27 Feb 2025 12:01:43 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnhGR-0002LS-0G for qemu-devel@nongnu.org; Thu, 27 Feb 2025 12:01:37 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4394a823036so12282775e9.0 for ; Thu, 27 Feb 2025 09:01:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740675685; x=1741280485; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=v8PhnXMjZeodBD0z3UBX0mp4g/I3gCrKUSNVDYtiv1E=; b=oD81KmF9HL6Spe13KPVjNgRCcy/WvNPUhBJ/tGNnktaeawEPR6u9LriSpQBJ1OKW7u 7cRO+phn9Vjtgc2I+olNaIIA7Je+p/lQUunNJDjk7wMRz5DIA3w7ZWdYwfxAFNHoZTM6 5iuah0vTQdBgKln6bYCiCqjriihkNMCXIwvrl16U+tlYjjojswxUMY/K1CMUA/yQCt3d 0JiqBIAn7ZJRZNpqx7IPCU+3gVfw56KBKuxJQ+q5wvZbyu907u9AlI+XjJLVFqUi3EJc tOjDOdF8eG68qH2IB6/SVTLgX+O+0FRqeQ+H5prSLN24jbSdrN1PDS2JHaHx8NhAMwU+ 0NxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740675685; x=1741280485; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v8PhnXMjZeodBD0z3UBX0mp4g/I3gCrKUSNVDYtiv1E=; b=ReQDIYbGllZG457kzY8QVffzHZaiVfYgFHFWwI10Joi9eefVCuLmYcUR3TaxMMOuv1 6ByiaHXNyN/gYIuoM1x9pUmRBolRtQ4GXC6P+6LC2IREq+Vi3RLv0DZkIkUDv3IePEKV Owfmge6wmSpr9PdFUc8XfNIk2Ev87rRQMmE10fzvBRE9fAMABcik8OjbmjLcENYpWNro 5PxCCpa2DeX4YfSJork4J1ak1DIHgewjoks1e3lD4JsyqWxVLBAmROOk10kqqGx1bbEx QTdrQqt8gSwVXruCXdDd8dkcQquMx430JPRHMD68w2EMxTW9oyXsqBqRqDv4Npz3hlJJ M43A== X-Forwarded-Encrypted: i=1; AJvYcCW6kr45v1fk4+m9ynWuEAeFKKLj3LMhLJB2X/OKTAoRjBf4pptJZl4Qra6E1clpcpavUukgJbQGPCCM@nongnu.org X-Gm-Message-State: AOJu0YxiYzWG4f4qGG86/TAvwpRkKVDUF2XcEY/depfK9VmvRRR4An7A he+RuT6910IAL/bgbOujobC8sSZdDKpoThFrNfluOcA85mo8UlLn6nmVqmj46uI9XlGnf6GdYvU 8 X-Gm-Gg: ASbGnct28KPotDo1gmAEjRjEFIGMrbOIYBLxvjYRMllku3QHQ/UNRDiZbwyZO3ksF2H 545fuYrT/T1z1fpumW2HncyYTPW8AsDOWZKLHk+VSx1rw/T1Qcz0jBKtgUzyJDpssdhbsO8N9nf Ann0k3EiXijssK3UY1iWQHCtSgPe95w1JgUqKwJ4s8Xnh2tP5skWT/tGdRg8lwvlabqzr5OoQHq pgxh8UcOfMRn1rOACEL8vkyHQydFGefm6pkF4j+Gx5NVHdAidYKZtXwE16wTzwYojJ5tY+2dG0a eQTehqek0KCE2DQ6CCILHw+nTCwbn8N0 X-Received: by 2002:a05:600c:4687:b0:439:9aca:3285 with SMTP id 5b1f17b1804b1-439b6ad5cbfmr199130035e9.6.1740675684699; Thu, 27 Feb 2025 09:01:24 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba5871f4sm62747565e9.39.2025.02.27.09.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 09:01:24 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 4/5] hw/arm/omap_sx1.c: Remove ifdeffed out debug printf Date: Thu, 27 Feb 2025 17:01:16 +0000 Message-ID: <20250227170117.1726895-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250227170117.1726895-1-peter.maydell@linaro.org> References: <20250227170117.1726895-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Remove an ifdeffed out debug printf from the static_write() function in omap_sx1.c. In theory we could turn this into a tracepoint, but for code this old it doesn't seem worthwhile. We can add tracepoints if and when we have a reason to debug something. Signed-off-by: Peter Maydell --- hw/arm/omap_sx1.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index c6b0bed0796..24b40431832 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -76,10 +76,6 @@ static uint64_t static_read(void *opaque, hwaddr offset, static void static_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { -#ifdef SPY - printf("%s: value %" PRIx64 " %u bytes written at 0x%x\n", - __func__, value, size, (int)offset); -#endif } static const MemoryRegionOps static_ops = { From patchwork Thu Feb 27 17:01:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 868981 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1561:b0:38f:210b:807b with SMTP id 1csp367552wrz; Thu, 27 Feb 2025 09:05:24 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUneTGP25IHVaoCz+52vgytJzYbdiLG7GhuFpbSKocNQjTm/c8enu1z8678BhZ/Bqe1Q6pYEQ==@linaro.org X-Google-Smtp-Source: AGHT+IHLOK9gYbvKWUdpLMwaQjsZm06KmgnjVYknUfKUXiuTrOz+tHb3YIe6WYP6AkxvTCiSoIeT X-Received: by 2002:a05:600c:34c2:b0:439:9828:c447 with SMTP id 5b1f17b1804b1-439aecf1426mr237036075e9.17.1740675924593; Thu, 27 Feb 2025 09:05:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740675924; cv=none; d=google.com; s=arc-20240605; b=TawXrBziyfyBx3dHWyVvAqbvbXbdu6IRIRU45Q7I+6Ess/oRkgRoKUKl8mykrfZTLl 44Guat0OErCb8qkDm4FMLbXtg+ODjpsBmeMaITSS3nBA9sS76OhLhJhpx9Kl6+xPxxxC eZ6HQxs1wUtxNlyWoQ6KTEjbY9JbQ6n6OMeAfGUb2mNoKArJSMKpgfjqFqmS2W0PnZRB 0AmFoni3nFzprLuCQTFJSajlEYf1E+cRmidQweAXnD/LtZX+ykPhKQK90WR32MlhwGNf TRZa8pFdQyUgHKTN5ccqwOQ//ENHzqTU6RXCofTBbKmxtNPwMSdluCt03WF6+J7qwck6 WNMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=3K/8zo+OPQ7fiQIh7CxNG3iVbX/8VRGnrPe58kHl2iU=; fh=IG2cyYazX6rzjhpzLtaSlUEecd7y0IBQ0UBVJneVXLM=; b=EOEIQlhC5KKwdxmGk8GHlxUD89ICQWmq6WL84LvU4qe4Hk7ScqqgAT3/jjoCGnZyMq vhjFiQo7c0EtZBI9gRg4fPc67BptpdZtnktcCu/q+JHqhYDkrCI2hMspvSRKfzStni8M MMYDWgc271UcLbmWqxWtuWXszbVUAOyBFRYmusbbhdqcwZ+Z10I8v5yUtb63XHIEdahJ yDZ3xMkovcGeQrdQJNLZ1gM2eV70IYWiEBOQq+sIGI9+DBCj3nKXeyqR7vPpGIZqvf2z fKfoC7rLVYDYS2BXj02++WUhss05vfqEnaaCfusCjVfTY8xaZgGtqmX5ZOvbJGJ8BDGi NCWA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uyImSSoy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 5b1f17b1804b1-43b7a27dd75si13684355e9.129.2025.02.27.09.05.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Feb 2025 09:05:24 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uyImSSoy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnhIf-0007ai-CF; Thu, 27 Feb 2025 12:03:53 -0500 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 1tnhGX-0005D2-2n for qemu-devel@nongnu.org; Thu, 27 Feb 2025 12:01:44 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnhGQ-0002Lr-W8 for qemu-devel@nongnu.org; Thu, 27 Feb 2025 12:01:40 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43aac0390e8so8419695e9.2 for ; Thu, 27 Feb 2025 09:01:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740675686; x=1741280486; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3K/8zo+OPQ7fiQIh7CxNG3iVbX/8VRGnrPe58kHl2iU=; b=uyImSSoyNnxcxSJnKA2iwvKKvbEYpc4gM3bjIXFWP7laxmiU5he5YeLIxL70FuzS1k 8w44UkOOqNYiD/R8GHWrQrSC3AqG2amU1NBndULtjFmJGzYX3cz412HCo6N/7C9BBV4/ zJlUUDtuzqlr023XAzdxyBr0mfRU3ngbCasxa2muA0Zf0AIBd1jS74np+cmHnGb76miE ud2dMUae+wI9layQOSFro0L/dgu/JI7Hu9FsXqXG6eSj2tK+vkG+NzqzkpTAd2gynQfB 3y9bKbttB3WLvmpdHOXT5I3RhSPngRzAI3KM++8n5eVwk9AB/L2r2KYgsysW9L6FBam+ ClOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740675686; x=1741280486; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3K/8zo+OPQ7fiQIh7CxNG3iVbX/8VRGnrPe58kHl2iU=; b=vEAE8EKXo0E4uXbxAINqXEC3MEyaTAKeyW8Icq8qFa8BczajaPQ6Gf4ZabKI2gvcrD uGS0wqKG/+ayRwZEvrB5bNu1RS5GyYaZSFirn1vZcnEzcWSWMn9gsG54Y3FlKb1n6G9z 27oc2pbbddFhzG1CoFLqsrWvU6RXB9AAkfWlJHnNhU2K4+Re59egZDd5keYEwVbKtAPZ f1mCEIZMy2k9Lr9lS39WBpoqgNzQ83podSLN8aeDdCGBcDLA6w6pTn1UgKTyDb95KDFS TtwPFX3OYIUP+6s9omwJZPGNRaQzcsHuemDi0Yr76oO3WnelMFTBKK9I/nVjV6UNPCRT iUHQ== X-Forwarded-Encrypted: i=1; AJvYcCXAR8CdUB4/W23999FBhIZ63uyD/kU89dRDS4yzhmOY6IACRWkS2U9KS7Dc56LZL/PmjNU7Z6mHBLtA@nongnu.org X-Gm-Message-State: AOJu0Yx6mxrQIAlQcokcKqx6dOZq2JbFoweyOaih8nRSdb6wLDidaTz5 o5Mrp7KcUmgzKUft5TxaABh3JxFUbZmvMUm7qUiSwPrqO010Q4dJoYIRaKQNbJs= X-Gm-Gg: ASbGncvjII5CQ7Rnm4YhUMsJercFLdtLmRWWMbt/Nan9Uj91ba3J4MXq5Z0w6IQjVoe YcyieHsryiAFK8OkJCyM3JkbjNkjkqI53r6t9RtWJFdMnw7zea35S4BdLtulqaCyH0195Lejvet 7xPSAnPE1KJ1Uto1VmRC4yHqebV1g8Hx0xSfWFXwChEzemsxYj+TkxQSv7Nod2Mek6/Gj5NSkJG 7JyxE9G6rs+kXmQ5sdNoN5dTGcDrkm0e8NPKhPHuI+0FjHvqIapXcLJD5r43bwQTGuv+tebjyZ+ AcBgi1b30WOwzfvZrxY9vW5KYucshbBA X-Received: by 2002:a05:600c:4686:b0:439:a25b:e7d3 with SMTP id 5b1f17b1804b1-439ae1f4153mr274745565e9.14.1740675685648; Thu, 27 Feb 2025 09:01:25 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba5871f4sm62747565e9.39.2025.02.27.09.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 09:01:24 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 5/5] hw/arm/versatilepb: Convert printfs to LOG_GUEST_ERROR Date: Thu, 27 Feb 2025 17:01:17 +0000 Message-ID: <20250227170117.1726895-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250227170117.1726895-1-peter.maydell@linaro.org> References: <20250227170117.1726895-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Convert some printf() calls for attempts to access nonexistent registers into LOG_GUEST_ERROR logging. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- hw/arm/versatilepb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 941616cd25b..35766445fa4 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -27,6 +27,7 @@ #include "qom/object.h" #include "audio/audio.h" #include "target/arm/cpu-qom.h" +#include "qemu/log.h" #define VERSATILE_FLASH_ADDR 0x34000000 #define VERSATILE_FLASH_SIZE (64 * 1024 * 1024) @@ -110,7 +111,8 @@ static uint64_t vpb_sic_read(void *opaque, hwaddr offset, case 8: /* PICENABLE */ return s->pic_enable; default: - printf ("vpb_sic_read: Bad register offset 0x%x\n", (int)offset); + qemu_log_mask(LOG_GUEST_ERROR, + "vpb_sic_read: Bad register offset 0x%x\n", (int)offset); return 0; } } @@ -144,7 +146,8 @@ static void vpb_sic_write(void *opaque, hwaddr offset, vpb_sic_update_pic(s); break; default: - printf ("vpb_sic_write: Bad register offset 0x%x\n", (int)offset); + qemu_log_mask(LOG_GUEST_ERROR, + "vpb_sic_write: Bad register offset 0x%x\n", (int)offset); return; } vpb_sic_update(s);