From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648301372; cv=none; d=zohomail.com; s=zohoarc; b=OqVqtOtOezNqDaX5V97DHJNB2k6O9c710jIAcGHJJZLv20npg83DpQBfBCGDqmS4jPJmBenJUhQ1wvEbLrOBppTVMbPsNUiTtRFsSZi7bfgZCsvKgVc2dEvC1IwmuWlG1DT5/Vvp6MFJyQeyVYRdCFXX9TGmE8jXh8yheSdDeT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648301372; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JqvjDBxg6dzVMRz9GXbJw/AGrIZfs63ojgJ9mrqtjWE=; b=FApkwKdvTi+BOUTOE2GArERygGTMUTd40tAJbO1jdhT1hcyHi3/eDm9v9OOtqzBLZy8CSB+J7vGFM4DWCDziswiB9IA9jNsY/Cs5iVKzF6QmPEgaNi2I1qVGmSKAVeZIEAV4puTAWuobr3rHLK5Z+oxNebQchclECb6abYEOZhM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648301372630120.87193500916464; Sat, 26 Mar 2022 06:29:32 -0700 (PDT) Received: from localhost ([::1]:37584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6Tz-0001QP-6F for importer@patchew.org; Sat, 26 Mar 2022 09:29:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QH-0006gj-Pz for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:42 -0400 Received: from [2607:f8b0:4864:20::330] (port=41879 helo=mail-ot1-x330.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QG-0005Jv-5t for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:41 -0400 Received: by mail-ot1-x330.google.com with SMTP id x8-20020a9d6288000000b005b22c373759so7458363otk.8 for ; Sat, 26 Mar 2022 06:25:39 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JqvjDBxg6dzVMRz9GXbJw/AGrIZfs63ojgJ9mrqtjWE=; b=LKRHN2T6UpNIqCVNFfdgoIfv6jE76vXzTrQqllhcn68jFhH+eo5tke5n3pJC45BxHf zP2QRhfeHndG7im3+/nDCA87Fh/9cXrE/BAvVMyV0S5pYfUt8QXlfhP+3F+wKW+o+H33 8FWA3soc1PX6pn8OzHd6Mnf6xvEjp+O4Ky4kw98jNSwGbmUX1Xogwoa8ONRSthU1ZZSe kSmNPqnwiSuulxRWs+l4YlzfReTlEmBUEqPDb/LaiHmsxW6BUtEIM4uyrsqF6qxchPH7 09e7/ryDIIP3Z1g8HB/FgHDtCAIq7dZTfYL5P+JnlMUls96mmL9+6p52NC6bDWMdo4FV u4nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JqvjDBxg6dzVMRz9GXbJw/AGrIZfs63ojgJ9mrqtjWE=; b=BGHly0Ne9VT3NUdS+y2ON2maUvLsdFkTKGhKnG6dJ2Efvf1sW2KMxL4S3DNTuK5WmT eLVTPoAKWlaLBaSkRwv4xEjqM4LokUPucD9HF21C6/KXIPH0r+6IhZnx3IdJSgtLZ3eF +6I4Etq9zd3Lk48oC7cEdQlXRTt1DVjAIUgnXzpYqg2nt4mFwohpRzCrEqL/xLKDn6U9 G9jdMRr58szPm5o25Thv/EZeXLJUvgfytQAPWad+KAzUt86+G/gN1hIjL/K9P/R9B190 y+O8AWyt3yRs+sRUx8RrP8ec/d7yNb6pnh59nOYNubeJc5w7qcJkd1AmHJsuFBT9Mycx A8OA== X-Gm-Message-State: AOAM531UsPA+g8ym6xfvaqcpulHQM0NJQ/D75aIDkysKq2W2GjD7iMDL rPPi0kmIN0xxIPQvpgmyEIPgxDGIjXzx2fM+ X-Google-Smtp-Source: ABdhPJzre4h85ihMCaPF/Rn2W4bO07TC7qnBjLfvfHbYEEy7Ysrxl26/QUHwqPoHjGGKRvs7c2oXEA== X-Received: by 2002:a05:6830:20cc:b0:5ad:95:66e3 with SMTP id z12-20020a05683020cc00b005ad009566e3mr6459170otq.347.1648301139059; Sat, 26 Mar 2022 06:25:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 1/8] linux-user/nios2: Hoist pc advance to the top of EXCP_TRAP Date: Sat, 26 Mar 2022 07:24:48 -0600 Message-Id: <20220326132534.543738-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::330 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::330; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x330.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648301373897100001 Content-Type: text/plain; charset="utf-8" Note that this advance *should* be done by the translator, as that's the pc value that's supposed to be generated by hardware. However, that's a much larger change across sysemu as well. In the meantime, produce the correct PC for any signals raised by the trap instruction. Signed-off-by: Richard Henderson --- linux-user/nios2/cpu_loop.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c index 1e93ef34e6..2768ae61dd 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -40,6 +40,12 @@ void cpu_loop(CPUNios2State *env) break; =20 case EXCP_TRAP: + /* + * TODO: This advance should be done in the translator, as + * hardware produces an advanced pc as part of all exceptions. + */ + env->regs[R_PC] +=3D 4; + switch (env->error_code) { case 0: qemu_log_mask(CPU_LOG_INT, "\nSyscall\n"); @@ -56,7 +62,6 @@ void cpu_loop(CPUNios2State *env) env->regs[2] =3D abs(ret); /* Return value is 0..4096 */ env->regs[7] =3D ret > 0xfffff000u; - env->regs[R_PC] +=3D 4; break; =20 case 1: @@ -99,7 +104,6 @@ void cpu_loop(CPUNios2State *env) o =3D env->regs[5]; n =3D env->regs[6]; env->regs[2] =3D qatomic_cmpxchg(h, o, n) - o; - env->regs[R_PC] +=3D 4; } break; } --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648301382; cv=none; d=zohomail.com; s=zohoarc; b=XxVCrAxorMlFTSWase09uUrBpY5/pNTWX574LKB3DZFTMCG34VMO+V5qL4UddW32j8C8eFJj7bHUog4m39RuEPXwCJfdHHKvmOeaJgZvTEaUAHuknKtoqayrvgvZyhbm8KScU3I7O61f1qHOp3TdfU7mHATYBHTh56+x6Ke4KVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648301382; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hSJXBg/184u8r3uaJrOb0GqfAeU9RlxZON49hn1UzLA=; b=DrBzM94QlUpPAFq/RMVL/0J2R+C5R8VBEGviyjlOjuTW+Bh/5ZypTOUl5ATyaGkrOOmkX79Xo+EreiYadN/MzoMix4LdrUzzrA2wjJrvEsDWxg0Onn4a34paVFXVw0SqNLOVNEJ8Rn5mhOfVgXlTaL+Obj3v9QzrWycuGozTDlw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648301382203237.30206333204285; Sat, 26 Mar 2022 06:29:42 -0700 (PDT) Received: from localhost ([::1]:37712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6U8-0001Vb-Nl for importer@patchew.org; Sat, 26 Mar 2022 09:29:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QI-0006gt-Tp for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:43 -0400 Received: from [2607:f8b0:4864:20::332] (port=41881 helo=mail-ot1-x332.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QH-0005K8-EB for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:42 -0400 Received: by mail-ot1-x332.google.com with SMTP id x8-20020a9d6288000000b005b22c373759so7458391otk.8 for ; Sat, 26 Mar 2022 06:25:40 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hSJXBg/184u8r3uaJrOb0GqfAeU9RlxZON49hn1UzLA=; b=d9+mBv8ATMAyxST15UWaLaiKLPuFHQk9/J+ariGOfKEnfXIy+Y6CKtvZLai1G4/mo6 rSkMZ1uzgO08IctjYUsr62z6ijXbyOQnyg/IYfnQPls9Ug3CsDO4lCA4dw0fOqLY12uQ +BeeH1GsjD4ejQucsGq+emaTHazdh9J11s3xNLbqyp+dTxjA8Mf/bVb6tt7QuHu94/p7 IXh2Ku37uc/u/Jod1unNLikrvdnO9s+BqyHyz12sJf6cUL91ug0AulrcS1RmvrH2zN+9 mvgYY1Ynmm2aEUXd4zjkfybl8aU7Q6Llf9FxhWO3erC/cbJ1yTGmtrr4/nrBs4919NqX wGTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hSJXBg/184u8r3uaJrOb0GqfAeU9RlxZON49hn1UzLA=; b=26C4CjSnpIl7ZYjQwkxdb521Dz+xivyYGFLmrlfClgXqLX1LOCJAa2mGUQX7FKibLq +JIgbvDgKh6NFBkb84sCyvYJCV4izRGTL5m3NJVp95S9HHfWaB18HHD/7w/eYuWJriFw RYf+k1cyaQ/1UFnpCpMmoO/gni8lv9fYyhC/eEfhBG3a+fSAnoRi4epg0NAs8QKQQQBY WQRlLWiAaUF3EWmkBrw/ISXWHtq7sKCiJjDoWCuA6Qtna5ItzOjqPaurPgDMElL1dgVB XWEMTgWvhkmj7MjWUuVNQkti16z+4K00Npy+ipiIhoD/GpHrVLEijnSPqi1OzDNM9VMu bhpg== X-Gm-Message-State: AOAM533WZuVOflhbmddPzUZvul286W7/1XM2XjBbG+KwdLnnr5RqkQdw LIcyDsuRFoZ6L2cmQm0+e7YDB7teuJpEeuxV X-Google-Smtp-Source: ABdhPJx1+hr5JZppsjkYZbQVsIfVB6heeF0Q/AMeT6V8L0yJDTD2+UDtfmTTW0HLxvFpRb6cAreTnw== X-Received: by 2002:a05:6830:2419:b0:5ad:1086:4397 with SMTP id j25-20020a056830241900b005ad10864397mr6310864ots.337.1648301140336; Sat, 26 Mar 2022 06:25:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 01/39] util/log: Drop manual log buffering Date: Sat, 26 Mar 2022 07:24:49 -0600 Message-Id: <20220326132534.543738-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::332 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::332; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x332.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648301383300100001 This buffering was introduced during the Paleozoic: 9fa3e853531. There has never been an explanation as to why we may not allow glibc to allocate the file buffer itself. We certainly have many other uses of mmap and malloc during user-only startup, so presumably whatever the issue was, it has been fixed during the preceeding 18 years. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- include/qemu/log.h | 1 - bsd-user/main.c | 1 - linux-user/main.c | 1 - util/log.c | 21 ++++----------------- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index 5739c7e6d8..ed59ebd4a2 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -148,7 +148,6 @@ typedef struct QEMULogItem { extern const QEMULogItem qemu_log_items[]; =20 void qemu_set_log(int log_flags); -void qemu_log_needs_buffers(void); void qemu_set_log_filename(const char *filename, Error **errp); void qemu_set_dfilter_ranges(const char *ranges, Error **errp); bool qemu_log_in_addr_range(uint64_t addr); diff --git a/bsd-user/main.c b/bsd-user/main.c index 88d347d05e..08f43af235 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -405,7 +405,6 @@ int main(int argc, char **argv) } =20 /* init debug */ - qemu_log_needs_buffers(); qemu_set_log_filename(log_file, &error_fatal); if (log_mask) { int mask; diff --git a/linux-user/main.c b/linux-user/main.c index fbc9bcfd5f..2b06350688 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -679,7 +679,6 @@ int main(int argc, char **argv, char **envp) =20 log_mask =3D last_log_mask | (enable_strace ? LOG_STRACE : 0); if (log_mask) { - qemu_log_needs_buffers(); qemu_set_log(log_mask); } =20 diff --git a/util/log.c b/util/log.c index 2ee1500bee..ffa66a267e 100644 --- a/util/log.c +++ b/util/log.c @@ -72,8 +72,6 @@ static void qemu_logfile_free(QemuLogFile *logfile) g_free(logfile); } =20 -static bool log_uses_own_buffers; - /* enable or disable low levels log */ void qemu_set_log(int log_flags) { @@ -121,29 +119,18 @@ void qemu_set_log(int log_flags) assert(!is_daemonized()); logfile->fd =3D stderr; } - /* must avoid mmap() usage of glibc by setting a buffer "by hand" = */ - if (log_uses_own_buffers) { - static char logfile_buf[4096]; =20 - setvbuf(logfile->fd, logfile_buf, _IOLBF, sizeof(logfile_buf)); - } else { #if defined(_WIN32) - /* Win32 doesn't support line-buffering, so use unbuffered out= put. */ - setvbuf(logfile->fd, NULL, _IONBF, 0); + /* Win32 doesn't support line-buffering, so use unbuffered output.= */ + setvbuf(logfile->fd, NULL, _IONBF, 0); #else - setvbuf(logfile->fd, NULL, _IOLBF, 0); + setvbuf(logfile->fd, NULL, _IOLBF, 0); #endif - log_append =3D 1; - } + log_append =3D 1; qatomic_rcu_set(&qemu_logfile, logfile); } } =20 -void qemu_log_needs_buffers(void) -{ - log_uses_own_buffers =3D true; -} - /* * Allow the user to include %d in their logfile which will be * substituted with the current PID. This is useful for debugging many --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164830158603443.102667211792436; Sat, 26 Mar 2022 06:33:06 -0700 (PDT) Received: from localhost ([::1]:46086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6XQ-0007G4-TB for importer@patchew.org; Sat, 26 Mar 2022 09:33:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QL-0006hh-Mj for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:45 -0400 Received: from [2607:f8b0:4864:20::32d] (port=36779 helo=mail-ot1-x32d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QI-0005KR-PY for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:43 -0400 Received: by mail-ot1-x32d.google.com with SMTP id y3-20020a056830070300b005cd9c4d03feso7463862ots.3 for ; Sat, 26 Mar 2022 06:25:42 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h84Ot6YbttCAVb4FAH99rqg1sJS9c+ZhMv9JcX0XF9Q=; b=IrAnnaRQ0P++IPAx4ctp/wjX5atENOhpaTM0ZkIerw4ApgM5by22UbJWBxwYVXkdwd b3WHga6ZS+M+1fU+dtKjf8yqPVdIrPrA1/Wwkc6iceNInFzdqVlB5lmzuhOx6lTFZLtn 4zZUyZlcoyKaFnARHdYKLzNmPIW3P7S8aNkdM88S0lrj2xFWVQ4CPSU9htqN2huLEhAO 5QKRDF6WwP0O1DA4rdJ+Tm94maHynvJMTRw+x1XVeBLLiwGJr9EAecUwBLHzzTI5T3q8 wzuX6Zy8zjfCisLM+GlB+ZdMGCsZjQWgesOlZ4VgUjnk01OcGd0wbKFri5eNfbi+vPB/ TPfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h84Ot6YbttCAVb4FAH99rqg1sJS9c+ZhMv9JcX0XF9Q=; b=CUb3qxHn07OvY8nJ8YSns66/7hdCfGfHfp1pmjZ0/qbqdyfds7Y7ht+6WHggcAiIS9 W0IydEp86b5traWgEyAGq4rApvVxCaj5VBGg9D88H6DK97qKTccFplTU4d+G0wEmIDhC 1BfIWbX8aOMPNx5WAnDaKwPLDffftEj2z/7AAcFawSsocIPaxir5Arl0o5mouyeBytRF FAwGSgtVVWxxei4gpgn1+Vws5mBqZ8N9nVrdA8m8QMV8CDXhGnDE/kGcIVKwh2v+kMUP fsbIufEXmnkEYBYf2rjF2mNHoezfkzEMjXrkEozzet4MQtU34zdJBGlKzLhuaS9iin3/ oM7w== X-Gm-Message-State: AOAM5339r/CCM1k+2rg/m35d0AUdsIndPY7NSsjBy448EKE0lTs6rnML /Pkyrvcb2YnBxAGXyMFvuTQDCpmp1PEXLMYU X-Google-Smtp-Source: ABdhPJz5ZNohx2hM1HPNhA7YOPSZRTIH6zYyKJTrBRQO1LjIF0TV1VqdIsBaq74ufvHhKnR7AXa/Qg== X-Received: by 2002:a9d:69c4:0:b0:5b2:3abb:612a with SMTP id v4-20020a9d69c4000000b005b23abb612amr6516463oto.319.1648301141787; Sat, 26 Mar 2022 06:25:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 2/8] linux-user/nios2: Fix clone child return Date: Sat, 26 Mar 2022 07:24:50 -0600 Message-Id: <20220326132534.543738-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::32d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::32d; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x32d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Peter Maydell , alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648301587925100001 Content-Type: text/plain; charset="utf-8" The child side of clone needs to set the secondary syscall return value, r7, to indicate syscall success. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/nios2/target_cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-user/nios2/target_cpu.h b/linux-user/nios2/target_cpu.h index 2d2008f002..830b4c0741 100644 --- a/linux-user/nios2/target_cpu.h +++ b/linux-user/nios2/target_cpu.h @@ -27,6 +27,7 @@ static inline void cpu_clone_regs_child(CPUNios2State *en= v, target_ulong newsp, env->regs[R_SP] =3D newsp; } env->regs[R_RET0] =3D 0; + env->regs[7] =3D 0; } =20 static inline void cpu_clone_regs_parent(CPUNios2State *env, unsigned flag= s) --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648301588; cv=none; d=zohomail.com; s=zohoarc; b=G1zTBAzRtujYs7YkuQlMUgLciMjsVEnGrM1cNVShXdRAqFCOAlvIKITB47XlUYTX6ye9G4RFnSlHrx47PPwy2ELS8PGYW9FqJnLeasxfh7cQDrphKpyHxQ9acFPV503/Ib5r4+siUQyCfGQkrjNOw1gOC/P7/2vbFa6QHEG3ZJw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648301588; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RUBe0C4iT5t4/OHe4DJ+hJf3HvDnr2dd4byJPft2OJg=; b=eHjTIhgop/5zLifIyrLSq/Yyi/2vVD/DceuB/cDbfPfjyNl2lZbm2RkQOPft0M/T9hjZgT0I5EoUzGkVw/Yyav/KS3W9RCGJXuT8omxoYDfZ3UGC1sFyOYQCKtBvUg9zGCLE5UVkagx0YB+oGDdE2WloCiRxRG4vM0aubNpy9yY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648301588094334.62075678582823; Sat, 26 Mar 2022 06:33:08 -0700 (PDT) Received: from localhost ([::1]:46174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6XS-0007JU-Ur for importer@patchew.org; Sat, 26 Mar 2022 09:33:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QM-0006k0-Ue for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:46 -0400 Received: from [2001:4860:4864:20::2b] (port=45849 helo=mail-oa1-x2b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QL-0005Kb-EB for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:46 -0400 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-d6ca46da48so10698454fac.12 for ; Sat, 26 Mar 2022 06:25:44 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RUBe0C4iT5t4/OHe4DJ+hJf3HvDnr2dd4byJPft2OJg=; b=SS7zup/SZrIrLiMXZnwvbwZjRdq7LBu/EkobD595kZy9Z7pP/vxiFBZAIFnAKh4WWk pc2xu6WI2Pz1CufeZG9pgKJzAMeQ8P/waZu4NjbmSESFvQbTm8BoWgCKh08tESN8V/a5 B6rJjEPPS+sOXF0If5xMGV0vfZzsAMEadC9bVTMNjKEt855Ht/xdEeZ2Bn1IVoqnMHVh bZ447rWDcMuuAG5wt91pH6v3To4ridHOYE6HIeWiVN+3WcjwKT0PbtRdq/QCzVDnMJgA NKuvG5lfjgMrdQes3I6njT01abWH8FP18TplyObdAflPOI6gc2oQtm3JKN1eBYFGqW5Z KSQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RUBe0C4iT5t4/OHe4DJ+hJf3HvDnr2dd4byJPft2OJg=; b=RFS4Q6za2wzjqzFnjPRKIDjD4nPOn/L/SIBnbw40b5su5qaKF8Z6F4JCYEPIPQLdZW cv0WA8t5U1HIc4CBdjFnR9zqoi3cRLW21dejjTYw70ZAOM2KHo3dWI/9Irlq2sx2UKJv TI3cGseHjWCf5AMPXwN9TMJyqr+M2NhZIuTi8u1pjgirCOBBUNATC+/BfoCzq3FrKVO+ VwHUamGeeRsRGln4+m6zvs+UWWecuiGXn0MrGMxnF0s7yomQ3BRy57vtCuw+jo7KP7Cr Ll2/YlInHCIxhDJKsEYQODy3TZsfj88SmliDoRl9Rg9yWGPXzfWQF2t40ACl3nxr7T8X r3mw== X-Gm-Message-State: AOAM53023uo6tsV1BXsntOjBZsWffyiUYyCenwYYqGEG1171ADN4Ns92 9lRPz2PQOHtEZ38wfu6TI1TQJdqbtR9Al2AP X-Google-Smtp-Source: ABdhPJwtMtTk5i3Q21A9G0mNZ/nfU2Qqz6c2mIw5AsOSpAmIrwVFJecFSj/KXjR/3Yo67gyx1Q3hoA== X-Received: by 2002:a05:6870:14d6:b0:dd:9907:2c4c with SMTP id l22-20020a05687014d600b000dd99072c4cmr7200126oab.70.1648301143026; Sat, 26 Mar 2022 06:25:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 02/39] target/hexagon: Remove qemu_set_log in hexagon_translate_init Date: Sat, 26 Mar 2022 07:24:51 -0600 Message-Id: <20220326132534.543738-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2b; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648301589974100001 This code appears to be trying to make sure there is a logfile. But that's already true -- the logfile will either be set by -D, or will be stderr. In either case, not appropriate here. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/hexagon/translate.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index b6f541ecb2..98f1452cad 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -874,12 +874,6 @@ void hexagon_translate_init(void) =20 opcode_init(); =20 - if (HEX_DEBUG) { - if (!qemu_logfile) { - qemu_set_log(qemu_loglevel); - } - } - for (i =3D 0; i < TOTAL_PER_THREAD_REGS; i++) { hex_gpr[i] =3D tcg_global_mem_new(cpu_env, offsetof(CPUHexagonState, gpr[i]), --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648301753036462.05783386508597; Sat, 26 Mar 2022 06:35:53 -0700 (PDT) Received: from localhost ([::1]:54672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6a8-0004Um-02 for importer@patchew.org; Sat, 26 Mar 2022 09:35:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QN-0006ka-6a for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:47 -0400 Received: from [2001:4860:4864:20::2e] (port=39772 helo=mail-oa1-x2e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QL-0005Kk-Kz for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:46 -0400 Received: by mail-oa1-x2e.google.com with SMTP id 586e51a60fabf-deb9295679so3475175fac.6 for ; Sat, 26 Mar 2022 06:25:45 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pd5+yLliVhBXIEFxiOo2I5aLF4BKy2rSqhZkhW/VVIE=; b=NwZVntCms6Y0SeW9amg3ctADWKd0YF/hKhl4W/6Y2id4PRaMkkBk9u/YgXLSBkJYaF LulxTIVoeHeIDr1fZO+nyaCnxtoB5G0A8GgxZgChl184+jZeS6U0202Qh/PiZQszM8DV UFCwUnHRIk8taYfEzNJmicPBZGkO7zzCUpS3O/m3vFYhO7mGpRDXToOlUcPy8uYllTDb inbOS9BJjqBe8J7rjw/3S5FakdwzpzAd6g5y/4w2bQaN12wMFFXxcaVrOW5LwyuiZ4tF JRXZrfDZybTqy7+KYpAr+lD/8KnceqT9QHA+M746JFv429nFn5ZC14VrdpNNt9SgvNeq cPCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pd5+yLliVhBXIEFxiOo2I5aLF4BKy2rSqhZkhW/VVIE=; b=OCsg9AaKpyDV39r9D+xqfjgQDagdtiLOxlRs7h9dzB1yatJ7F6wzC9SoWImLIkI8Ut ZUwgMIrAqLvupqdwSs7eq2ItBLA1l8dyMp5FjYVO1dZjCjN/ZFJBQuAi0c4Ir0zEHXS/ Ue8BrrXpWGKyTrljOsecWVzVDH6zQsAceOeOp0MCGDlmOO1iMIvx2xZUiYjMXyUMp/Oh 0g+RIhUjbUpva5f3LSmZEMEaZ9kA10qwFyJX2MWPG+taT1HfTQplsxEHbAuftToQSNTZ TwIc24khbAK8cUg13NSn01gbDwgB+jy54FJaynghJ5vLnXjnMrKoqcg2BbRxPjuj41LB Ulsg== X-Gm-Message-State: AOAM530cIL4xVlwtfjul6nqDZ9mMDIEdLe9eIOL4w0IWbgV12cHQMux5 1W5/My0e4UxHrXcsY0/mUx7xUsOfBb9WUS0W X-Google-Smtp-Source: ABdhPJw57EEAaGAoIO348alh84Jrms1TYZyhBpM6Gs7zeHsO7T5i2zoTSGNAos4ZepDhdo7utYkISQ== X-Received: by 2002:a05:6870:9720:b0:de:8a16:e27 with SMTP id n32-20020a056870972000b000de8a160e27mr6927734oaq.292.1648301144527; Sat, 26 Mar 2022 06:25:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 3/8] linux-user/nios2: Drop syscall 0 "workaround" Date: Sat, 26 Mar 2022 07:24:52 -0600 Message-Id: <20220326132534.543738-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2e (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2e; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Peter Maydell , alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648301755071100003 Content-Type: text/plain; charset="utf-8" Syscall 0 is __NR_io_setup for this target; there is nothing to work around. Reviewed-by: Peter Maydell Fixes: a0a839b65b6 ("nios2: Add usermode binaries emulation") Signed-off-by: Richard Henderson --- linux-user/nios2/cpu_loop.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c index 2768ae61dd..a285781fc5 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -55,10 +55,6 @@ void cpu_loop(CPUNios2State *env) env->regs[7], env->regs[8], env->regs[9], 0, 0); =20 - if (env->regs[2] =3D=3D 0) { /* FIXME: syscall 0 workar= ound */ - ret =3D 0; - } - env->regs[2] =3D abs(ret); /* Return value is 0..4096 */ env->regs[7] =3D ret > 0xfffff000u; --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648301494; cv=none; d=zohomail.com; s=zohoarc; b=d7mtFVjtawC5QrEMPjLpafEkrJPxaJKe/8jF3PHDljU+J0mOMErKFpmlvey6IbOE78ZmkdFf/FhNkuwvbSIflb9O6ovBBwyUu6qIqKPcUeWvP+bFLA5IlR7X38QBl+uqyBlRLVEr6tDdb+v+H9C98a+vH6jTt0of/hs9VjWWksE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648301494; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gySRxuYYwrwZO32brZVPz3NY1et5tLsOdakLrHT0vtA=; b=BOy5n+GqkYNqQA5utdEGOU7Y1Qznl3HcS98/IEiUstSNBjmaVX4HQ6+0Svch4BRaWALAObGtIlExI8eOACu4jHkLehlvHSjmEhOtapaW6Dusxf4QRDgX+g9yvSvORVoEjfk8x8seVV3uicLM33R5lJaPE5tc13LDUmFnhdE2oBU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648301494337644.1272034817182; Sat, 26 Mar 2022 06:31:34 -0700 (PDT) Received: from localhost ([::1]:40902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6Vx-0003jH-A6 for importer@patchew.org; Sat, 26 Mar 2022 09:31:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QS-0006oA-8s for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:52 -0400 Received: from [2001:4860:4864:20::2a] (port=40494 helo=mail-oa1-x2a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QM-0005Ky-TZ for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:48 -0400 Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-d6e29fb3d7so10738185fac.7 for ; Sat, 26 Mar 2022 06:25:46 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gySRxuYYwrwZO32brZVPz3NY1et5tLsOdakLrHT0vtA=; b=Y/wzKajXr3cj1SxddHduccwLyYID/tL3C4uIlWReUbPpz7UExtCrJXQ33nFWzuhZaC +kcrDYW3EQhCHTWuN0qyv26YR8LvByAarhvXWyI8a0s46dVcv/Ybxp6v0y86Id60PSlV RMFpT8YkkwUA1q+t9OB3Cn+AIrbd7NBm5YNzvBKXFj3Z/T+z8e6v/s3wlShM7aoZknig F0HFs7OdhapA6/6aWrI3CnT7tLNYs4CUHaWGtrGKC+FqxgbUmFc9yHrQSA9XSWzyB1dp 5UNSdBcbuvSmWj9smosJ84hiqECy4k7APgzmC4HdWglmxhtaF0PXFP41voatzW4mrveA Q9tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gySRxuYYwrwZO32brZVPz3NY1et5tLsOdakLrHT0vtA=; b=iSc+y+3w+SD/UlxgxPxv1XerMsRH5hPLSpxtbX+j8zJ1hdjjtcazTFwCgWP46HBtlS QYPFlNczL8UHbLD3xEa76HfmYyNIpF5lTJ98tnEHy4yHYiN2mPV3jExosMMCV1eo8bLx t4W0Nb6VuZe2LMFNcMyUXhipXiQudVEJraDjabdOaBFMIUbMydgFypHmfbmh5RP3AbuP GC3e7w6b3gCpKR/AKiLFbsJf44Q2BnlMqdTr0B08VxrzK8aVfG6yB0MINPDUd9Fx3MxS 8ieQsE0+QP64A8m2Xg9csUY2f8X5HuTV+O8p6F8CYGFwN27TQmUwd7q46YwMVFjxrE2i cvxw== X-Gm-Message-State: AOAM533lB0As2sdkhudekOq4Ssaui1aXcLbAcisL16PBlxkoxCC6mfzW xiWm9QfI5bl09OXp2t98hwJcTLx13YdGQefD X-Google-Smtp-Source: ABdhPJyqGPD2KVxxU4I9vmUpQHpx7sEDkOEhyHsKHcmIQBefpkQUZXpCivxnAQ2EfhM9d1Geee5M6Q== X-Received: by 2002:a05:6870:785:b0:da:ac31:3e04 with SMTP id en5-20020a056870078500b000daac313e04mr10690591oab.270.1648301145853; Sat, 26 Mar 2022 06:25:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 03/39] util/log: Return bool from qemu_set_log_filename Date: Sat, 26 Mar 2022 07:24:53 -0600 Message-Id: <20220326132534.543738-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2a; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648301500187100001 Content-Type: text/plain; charset="utf-8" Per the recommendations in qapi/error.h, return false on failure. Use the return value in the monitor, the only place we aren't already passing error_fatal or error_abort. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- include/qemu/log.h | 2 +- monitor/misc.c | 3 +-- util/log.c | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index ed59ebd4a2..fabfbe41da 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -148,7 +148,7 @@ typedef struct QEMULogItem { extern const QEMULogItem qemu_log_items[]; =20 void qemu_set_log(int log_flags); -void qemu_set_log_filename(const char *filename, Error **errp); +bool qemu_set_log_filename(const char *filename, Error **errp); void qemu_set_dfilter_ranges(const char *ranges, Error **errp); bool qemu_log_in_addr_range(uint64_t addr); int qemu_str_to_log_mask(const char *str); diff --git a/monitor/misc.c b/monitor/misc.c index a756dbd6db..04ec0711da 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -419,8 +419,7 @@ static void hmp_logfile(Monitor *mon, const QDict *qdic= t) { Error *err =3D NULL; =20 - qemu_set_log_filename(qdict_get_str(qdict, "filename"), &err); - if (err) { + if (!qemu_set_log_filename(qdict_get_str(qdict, "filename"), &err)) { error_report_err(err); } } diff --git a/util/log.c b/util/log.c index ffa66a267e..a838686a18 100644 --- a/util/log.c +++ b/util/log.c @@ -138,7 +138,7 @@ void qemu_set_log(int log_flags) * * filename may be NULL. In that case, log output is sent to stderr */ -void qemu_set_log_filename(const char *filename, Error **errp) +bool qemu_set_log_filename(const char *filename, Error **errp) { g_free(logfilename); logfilename =3D NULL; @@ -149,7 +149,7 @@ void qemu_set_log_filename(const char *filename, Error = **errp) /* We only accept one %d, no other format strings */ if (pidstr[1] !=3D 'd' || strchr(pidstr + 2, '%')) { error_setg(errp, "Bad logfile format: %s", filename); - return; + return false; } else { logfilename =3D g_strdup_printf(filename, getpid()); } @@ -160,6 +160,7 @@ void qemu_set_log_filename(const char *filename, Error = **errp) =20 qemu_log_close(); qemu_set_log(qemu_loglevel); + return true; } =20 /* Returns true if addr is in our debug filter or no filter defined --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648301589; cv=none; d=zohomail.com; s=zohoarc; b=OZU9hrWT0B3yDn+QIm8If5rUfUQb/V8a/o7uG3apWdmsqx5Op5pF2Cp6z+iaFfkIjH+Jjt8BHIdxl+weWQxGZrmMJ3QzKxqjKzwE1n7qI33QWwdkILQyQkjapM7gq1X4Y2H3l5H2ziGpT5kL1l2rci+vBk/tEgDtxKO0TXz1Zt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648301589; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=26hq51RiROI5XzJelEXkN2uWQhOSPbaaTZ3h8qaX6EQ=; b=VptqSd49k+NKrMotXIpi/ZbkRZDUPBbjg8GTbI5LE9lM+uOHjH+x8vMPQ3kcISTcD+85YlxkMqnHt26AlIDpHn2N25PRVFjFKL1etS7tzjHCNvgSEtnRqNM1VPN7ARWAgJEdhkcCHT6+g5ONIDGrIILf66zgSFvTA63h5pXM8Oc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648301589858201.5712706555879; Sat, 26 Mar 2022 06:33:09 -0700 (PDT) Received: from localhost ([::1]:46368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6XU-0007RQ-JX for importer@patchew.org; Sat, 26 Mar 2022 09:33:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QT-0006s4-Fv for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:53 -0400 Received: from [2001:4860:4864:20::2d] (port=43740 helo=mail-oa1-x2d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QR-0005LI-Vz for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:53 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-de2cb87f6aso10701951fac.10 for ; Sat, 26 Mar 2022 06:25:47 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=26hq51RiROI5XzJelEXkN2uWQhOSPbaaTZ3h8qaX6EQ=; b=tmp1KyD2RxKn8kkjT/Pq/xtKXGmQuRbrstjmfzhPbR2m3ehHWVK7Qihw7UoLYgIQQ+ CburleEMw7mmkyscoqqSU0cKSn+RU3jkueJfIAOrZKujoC9jCwVm7OchO2XbTW6fyyxj QvrzjkpNHfbZY6EqnOtmwYC5YB95uEJWhpJLkJzgFtSbgFPLv/MG7fG+g/to7gbq01LH 06NTba4kr17+0Ve9jbAfdB7qwqI2bW1u+4Dn89/gSxtA1htaPaaarEgb02PMCEE+mIIe Laa+lyxksZrKBGO/hkQOSapZ9y1nCWRFMtpAQhKplqoPZXtoeMN1mm7w8yHOkZrormCZ TYkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=26hq51RiROI5XzJelEXkN2uWQhOSPbaaTZ3h8qaX6EQ=; b=otsr+34VDebvEJUQTa45lKhyL46aQl9Je8duDGLetopfgtnyMJ2VTe8hrM44/O/c99 sqZl3tc9FRmQgOgiQmzEhCx3GWJgKJk5kdn3NXHcnkyhwofkzyM//XFDSfd3MPlJP90a s079p00GMUowTQu0Mk2v5RTGzT0ejMU7bmCLfmiMiw4gasZzwevfyIOIvpB5tlC+9CJc 2QtJ3uHlBLs8zyFM725/ViTI1oYH+ovYVXXadnYG+0ykNRzWZS8o9knyAS2WCzJ4UIgJ VXhDAYKSvw3HWNUQUSCYVEbkBZC9tZnpOrAKph73JesoZyUgPZz0yo/jHbmMGyCjBrQg zQAQ== X-Gm-Message-State: AOAM533N+ePPnXapf4wErRdNG16kE5MXgNe4R/yzZJd0oW9Faq7yxwxr gpkQujEY+KS9k4nAC5HxI8jrn/MQLiraYc2a X-Google-Smtp-Source: ABdhPJxemYPCpugvFQmdrRJh9qiImeQJjwy1JMCMNLoYPSEDZ8np2dBx/wjG6YasVVlc3hkQhy0HYw== X-Received: by 2002:a05:6870:3394:b0:dd:cfdd:34c9 with SMTP id w20-20020a056870339400b000ddcfdd34c9mr11506299oae.31.1648301147081; Sat, 26 Mar 2022 06:25:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 4/8] linux-user/nios2: Adjust error return Date: Sat, 26 Mar 2022 07:24:54 -0600 Message-Id: <20220326132534.543738-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2d; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648301591885100003 Content-Type: text/plain; charset="utf-8" Follow the kernel assembly, which considers all negative return values to be errors. Signed-off-by: Richard Henderson --- linux-user/nios2/cpu_loop.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c index a285781fc5..969460df58 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -55,9 +55,14 @@ void cpu_loop(CPUNios2State *env) env->regs[7], env->regs[8], env->regs[9], 0, 0); =20 + /* + * See the code after translate_rc_and_ret: all negative + * values are errors (aided by userspace restricted to 2G), + * errno is returned positive in r2, and error indication + * is a boolean in r7. + */ env->regs[2] =3D abs(ret); - /* Return value is 0..4096 */ - env->regs[7] =3D ret > 0xfffff000u; + env->regs[7] =3D ret < 0; break; =20 case 1: --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648301655; cv=none; d=zohomail.com; s=zohoarc; b=ktdJiBiLLipxKzlCt8yoPNrahqXlgiSi71F89jT2ps55tc48DOghAyXyV6XT8dcSTkQkJNE0gccf9om+E2exwy2rV2fJ2sixKyk2S19BjH3D4tRvcbevBtQpr2bcSnehsApjB4ykv7ww6LjBiN+A90Xotx+DJlEvXnLBZl/ccKg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648301655; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oaXwga+g5R/JKjoHtndVsrz+M2TVRW+szFU+P0fXIFc=; b=m00cfEfjS6ITpCdJu6MILyCxv1kYmEPGbhDUVQiiJ3gA0ziuIZ7BLV/KBghLWHfc89QM9riFVQyiQO/tOeyayNereu+OEzhc6BSAXP+PodMCUWe4NrXGVV9OsFHVgyXhHsM6jbIt/6Gb/dqLAsGCMfGci7iinfiSTkosF+akMG0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648301655357809.0554530580135; Sat, 26 Mar 2022 06:34:15 -0700 (PDT) Received: from localhost ([::1]:49554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6YY-00017I-BY for importer@patchew.org; Sat, 26 Mar 2022 09:34:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QV-0006xt-5v for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:55 -0400 Received: from [2607:f8b0:4864:20::22b] (port=37466 helo=mail-oi1-x22b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QS-0005LQ-0s for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:54 -0400 Received: by mail-oi1-x22b.google.com with SMTP id q129so11100925oif.4 for ; Sat, 26 Mar 2022 06:25:49 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oaXwga+g5R/JKjoHtndVsrz+M2TVRW+szFU+P0fXIFc=; b=V9c4NHPyoeBOrKygROSsXVdzPuEEw2FgIlMqVXx7Yszdm047Kj+8oeJsbpkqiNjgh9 /6uXSCI+emLxu8NZFdxx1nTaq650gu2rYNgd754mQTzMcx+9iSOJYAAmAhU3D78JxFqu +hm1hEXjdAZJ7mY6FeVapbH0TRr/JIZm2WANEFpaDvd6qyNTk2boJI6jp3crNMexEEpm Li0HOkoOSbUKd97koxcPfg6WQGGIdECCZCb9FWP6YTMMTmqdqkYI67iYQXshZE/g7Z9n kNGBDHs7tJyOPkcjc1ErdNASGlRB1VHI/V2y5zOFbl4jVQ6S+hcrj9lLcb75o5FSL91Q ephw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oaXwga+g5R/JKjoHtndVsrz+M2TVRW+szFU+P0fXIFc=; b=YdbLNeJw+430Zov64GeH9SUOoOzDkujx78MdILgak8IEguYFzWFfvDA/qt8r2yOJk2 ZHt80HZnELGpJg/X+HZvQIR3zJIkMTAtIjTg3jxVd/L0AXJE129YtDOF64JdDOFezZjQ o72jJPf8bw7s8bfWLQPJ2YP4NyjeZGkcGPFXvK6QlHjc7dWpe9Iscv4FwadcLxpdF5+/ ziqMdp5FmXqplb/yo1g+81CPIwbFMpxgY8PCYDPrOTdPCgpWNO3rxtVyeEPdw5GEAs81 6UTOP+jyKUcbYEMwlhrcOTcxD8/HVuQFQrQwN/0KJc5XU9WQ4HdNvvBDGwc9j9ssxZQ1 67TQ== X-Gm-Message-State: AOAM531o+S8YE58aym/pVdJ1KklryyLKmHf7P4mBXYz7FJ0nQ4ZVbK9W 2mTqrc8zWe/GYEzWtuFYn/SerZJGq5UEB9FG X-Google-Smtp-Source: ABdhPJzsmviFVExBAso0U7bIh/KKqnIrZ39v8n6PI0JZdsrceJBP8QotPaa9DGEI3++YLFijiZYn7w== X-Received: by 2002:a05:6808:1a93:b0:2da:59cc:7aff with SMTP id bm19-20020a0568081a9300b002da59cc7affmr7996244oib.142.1648301148631; Sat, 26 Mar 2022 06:25:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 04/39] util/log: Pass Error pointer to qemu_set_log Date: Sat, 26 Mar 2022 07:24:55 -0600 Message-Id: <20220326132534.543738-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22b; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648301656368100001 Content-Type: text/plain; charset="utf-8" Do not force exit within qemu_set_log; return bool and pass an Error value back up the stack as per usual. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- v2: Return bool, per recommendations in qapi/error.h (phil). --- include/qemu/log.h | 2 +- bsd-user/main.c | 2 +- linux-user/main.c | 2 +- monitor/misc.c | 6 +++++- qemu-img.c | 2 +- qemu-io.c | 2 +- qemu-nbd.c | 2 +- scsi/qemu-pr-helper.c | 2 +- softmmu/vl.c | 4 ++-- storage-daemon/qemu-storage-daemon.c | 2 +- tests/unit/test-logging.c | 2 +- util/log.c | 12 ++++++------ 12 files changed, 22 insertions(+), 18 deletions(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index fabfbe41da..0b892f5e90 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -147,7 +147,7 @@ typedef struct QEMULogItem { =20 extern const QEMULogItem qemu_log_items[]; =20 -void qemu_set_log(int log_flags); +bool qemu_set_log(int log_flags, Error **errp); bool qemu_set_log_filename(const char *filename, Error **errp); void qemu_set_dfilter_ranges(const char *ranges, Error **errp); bool qemu_log_in_addr_range(uint64_t addr); diff --git a/bsd-user/main.c b/bsd-user/main.c index 08f43af235..0c8aa1ae90 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -414,7 +414,7 @@ int main(int argc, char **argv) qemu_print_log_usage(stdout); exit(1); } - qemu_set_log(mask); + qemu_set_log(mask, &error_fatal); } =20 if (optind >=3D argc) { diff --git a/linux-user/main.c b/linux-user/main.c index 2b06350688..6aed4929ab 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -679,7 +679,7 @@ int main(int argc, char **argv, char **envp) =20 log_mask =3D last_log_mask | (enable_strace ? LOG_STRACE : 0); if (log_mask) { - qemu_set_log(log_mask); + qemu_set_log(log_mask, &error_fatal); } =20 if (!trace_init_backends()) { diff --git a/monitor/misc.c b/monitor/misc.c index 04ec0711da..b16334b75a 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -428,6 +428,7 @@ static void hmp_log(Monitor *mon, const QDict *qdict) { int mask; const char *items =3D qdict_get_str(qdict, "items"); + Error *err =3D NULL; =20 if (!strcmp(items, "none")) { mask =3D 0; @@ -438,7 +439,10 @@ static void hmp_log(Monitor *mon, const QDict *qdict) return; } } - qemu_set_log(mask); + + if (!qemu_set_log(mask, &err)) { + error_report_err(err); + } } =20 static void hmp_singlestep(Monitor *mon, const QDict *qdict) diff --git a/qemu-img.c b/qemu-img.c index 1caddfb23a..9c05c6275d 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -5442,7 +5442,7 @@ int main(int argc, char **argv) exit(1); } trace_init_file(); - qemu_set_log(LOG_TRACE); + qemu_set_log(LOG_TRACE, &error_fatal); =20 /* find the command */ for (cmd =3D img_cmds; cmd->name !=3D NULL; cmd++) { diff --git a/qemu-io.c b/qemu-io.c index eb8afc8b41..38321a27a3 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -634,7 +634,7 @@ int main(int argc, char **argv) exit(1); } trace_init_file(); - qemu_set_log(LOG_TRACE); + qemu_set_log(LOG_TRACE, &error_fatal); =20 /* initialize commands */ qemuio_add_command(&quit_cmd); diff --git a/qemu-nbd.c b/qemu-nbd.c index 713e7557a9..bf9c5fedce 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -804,7 +804,7 @@ int main(int argc, char **argv) exit(1); } trace_init_file(); - qemu_set_log(LOG_TRACE); + qemu_set_log(LOG_TRACE, &error_fatal); =20 socket_activation =3D check_socket_activation(); if (socket_activation =3D=3D 0) { diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c index f281daeced..1f2a84c534 100644 --- a/scsi/qemu-pr-helper.c +++ b/scsi/qemu-pr-helper.c @@ -1001,7 +1001,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } trace_init_file(); - qemu_set_log(LOG_TRACE); + qemu_set_log(LOG_TRACE, &error_fatal); =20 #ifdef CONFIG_MPATH dm_init(); diff --git a/softmmu/vl.c b/softmmu/vl.c index 6f646531a0..a74d0a44a2 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2569,9 +2569,9 @@ static void qemu_process_early_options(void) qemu_print_log_usage(stdout); exit(1); } - qemu_set_log(mask); + qemu_set_log(mask, &error_fatal); } else { - qemu_set_log(0); + qemu_set_log(0, &error_fatal); } =20 qemu_add_default_firmwarepath(); diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-sto= rage-daemon.c index eb72407257..1398f0443d 100644 --- a/storage-daemon/qemu-storage-daemon.c +++ b/storage-daemon/qemu-storage-daemon.c @@ -392,7 +392,7 @@ int main(int argc, char *argv[]) if (!trace_init_backends()) { return EXIT_FAILURE; } - qemu_set_log(LOG_TRACE); + qemu_set_log(LOG_TRACE, &error_fatal); =20 qemu_init_main_loop(&error_fatal); process_options(argc, argv, false); diff --git a/tests/unit/test-logging.c b/tests/unit/test-logging.c index ccb819f193..93c6d666e8 100644 --- a/tests/unit/test-logging.c +++ b/tests/unit/test-logging.c @@ -123,7 +123,7 @@ static void test_logfile_write(gconstpointer data) * In cases where a logging backend other than log is used, * this is needed. */ - qemu_set_log(CPU_LOG_TB_OUT_ASM); + qemu_set_log(CPU_LOG_TB_OUT_ASM, &error_abort); file_path =3D g_build_filename(dir, "qemu_test_log_write0.log", NULL); file_path1 =3D g_build_filename(dir, "qemu_test_log_write1.log", NULL); =20 diff --git a/util/log.c b/util/log.c index a838686a18..bab4d29ecb 100644 --- a/util/log.c +++ b/util/log.c @@ -73,7 +73,7 @@ static void qemu_logfile_free(QemuLogFile *logfile) } =20 /* enable or disable low levels log */ -void qemu_set_log(int log_flags) +bool qemu_set_log(int log_flags, Error **errp) { bool need_to_open_file =3D false; QemuLogFile *logfile; @@ -103,9 +103,9 @@ void qemu_set_log(int log_flags) if (logfilename) { logfile->fd =3D fopen(logfilename, log_append ? "a" : "w"); if (!logfile->fd) { - g_free(logfile); - perror(logfilename); - _exit(1); + error_setg_errno(errp, errno, "Error opening logfile %s", + logfilename); + return false; } /* In case we are a daemon redirect stderr to logfile */ if (is_daemonized()) { @@ -129,6 +129,7 @@ void qemu_set_log(int log_flags) log_append =3D 1; qatomic_rcu_set(&qemu_logfile, logfile); } + return true; } =20 /* @@ -159,8 +160,7 @@ bool qemu_set_log_filename(const char *filename, Error = **errp) } =20 qemu_log_close(); - qemu_set_log(qemu_loglevel); - return true; + return qemu_set_log(qemu_loglevel, errp); } =20 /* Returns true if addr is in our debug filter or no filter defined --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648301921479168.07885244926752; Sat, 26 Mar 2022 06:38:41 -0700 (PDT) Received: from localhost ([::1]:34944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6cq-0001o6-1M for importer@patchew.org; Sat, 26 Mar 2022 09:38:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QU-0006wr-UH for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:54 -0400 Received: from [2001:4860:4864:20::2d] (port=34141 helo=mail-oa1-x2d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QS-0005LY-36 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:54 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-de3f2a19c8so10757408fac.1 for ; Sat, 26 Mar 2022 06:25:50 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nsjNufQ73Pa+Yv0ODGLjHkWTidw02PpY5LiPgXHEvoE=; b=gZXGGyjY/uBZ7z16FOHeILiIdWKrHwkBArJIoWSLSLA0NqQgF/zsENd0svLblWhm73 330M94R0bcsONJicGQ4KFP27BUH6dDzSjbvnGIWIRhb2KdcY7rQC2jgltRbdWTL+30IM HOpIdMRRUgAYZQd3ttNryHzboDPzL5UxHq3WFvP6y2ZZCydeS/ZZfyPUL1opYvsGe9dM QEgQGClnmB/oaCep8kaliPC2MPiT56EvzBoRFtZhHH9R76QgpAxj+sDtmzpu97t2Ifvd f2D9gtqPhaq4tHR/HlG3I6e9CngqjN6N3zU6cgu5EpEaGNXkA7zLnnRXNwSOKoRxVp5l Dp8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nsjNufQ73Pa+Yv0ODGLjHkWTidw02PpY5LiPgXHEvoE=; b=YcQ4Ltty53zWZeS4swTPuHyA8KVrtSX4uuYdapPvCJ7BTYKP+mtF27Se814RdDOaIZ +VlxyTrNbn3iCW3XpxPahCkyzKMlvdjZYtwUIi4CCaFRNrWpHQPVWfLN8UD3m9MOgyIb VHQ/wdkX4Llwl3f8AxgPzpigPDblxwaLN6/xf4qkRZBADCUQ7zRsy4xrlUchgADCvVSO Mw/Id9pEzy1L/FIVebl73Vk6rsgoU6TUSg8coK8/R9xzc+RocoCSRxog3ftYLAWWVpqH DP4f7cTqCYwYmeouZNmo+TyiVju8K+aBUXHlC95IQKUtl0lNdqXGDifkQqEk75iNAVqs CU/w== X-Gm-Message-State: AOAM531Y0XEBPs9GWmGbq5dFfm9KtQolgmbewVkrAOYUgvt05K4Jpmrq khJhsdNYChBXxpqOeu9TPLRT8c+/I5WlHEdk X-Google-Smtp-Source: ABdhPJyFMSk4Uy6zF8RzzfB0wN/DM92X6tfII2GVz438sOgZz6jqJvG/TCGMyCSHYQL8M8PLBWdQUA== X-Received: by 2002:a05:6870:4617:b0:de:7c85:37e6 with SMTP id z23-20020a056870461700b000de7c8537e6mr8046932oao.169.1648301149962; Sat, 26 Mar 2022 06:25:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 5/8] linux-user/nios2: Handle special qemu syscall return values Date: Sat, 26 Mar 2022 07:24:56 -0600 Message-Id: <20220326132534.543738-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2d; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Peter Maydell , alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648301922250100001 Content-Type: text/plain; charset="utf-8" Honor QEMU_ESIGRETURN and QEMU_ERESTARTSYS. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/nios2/cpu_loop.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c index 969460df58..dffe48b8e8 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -55,6 +55,14 @@ void cpu_loop(CPUNios2State *env) env->regs[7], env->regs[8], env->regs[9], 0, 0); =20 + if (ret =3D=3D -QEMU_ESIGRETURN) { + /* rt_sigreturn has set all state. */ + break; + } + if (ret =3D=3D -QEMU_ERESTARTSYS) { + env->regs[R_PC] -=3D 4; + break; + } /* * See the code after translate_rc_and_ret: all negative * values are errors (aided by userspace restricted to 2G), --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648301752; cv=none; d=zohomail.com; s=zohoarc; b=hBNDJ1pN/eKjWZ/im7NQ7uL/pQ3ozFgi4szKqEUTFE7XYs2YlE3UlWN9poAxuDJ6Bznyz+bwE/EHEtp3e9LIXusP9dnGCH23ojiGMPHss4KZIS7PNYlwh0Bs7AKExWsVtIZZF3YNQL/KfXdF1Q3DBUMcvW6J0N0cB7XqIiPxfsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648301752; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=alXSIX3aVlQbR+ahH+ZLhiXZst3M9kUZiv2iZp+a95Y=; b=nEPMzlt7FVHgvqm4gHUPdinfNWzKiZYl8Val6n4Fezycr14WPI8tiuZGTyojzfc8cTjpklwbDJkBsA+JQJRNtg5Wwd098esU+QA+N3gxCf+RFceRXAYK8LuI+Dj/WrNpfele6vT37VOTsqcbXZmLqUAa2TA52TE8rEZutUm4lU0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16483017526741000.9323223333847; Sat, 26 Mar 2022 06:35:52 -0700 (PDT) Received: from localhost ([::1]:54574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6a7-0004Qg-NW for importer@patchew.org; Sat, 26 Mar 2022 09:35:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QU-0006ww-Uf for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:54 -0400 Received: from [2607:f8b0:4864:20::22b] (port=45002 helo=mail-oi1-x22b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QS-0005Ld-6D for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:54 -0400 Received: by mail-oi1-x22b.google.com with SMTP id t21so6202061oie.11 for ; Sat, 26 Mar 2022 06:25:51 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=alXSIX3aVlQbR+ahH+ZLhiXZst3M9kUZiv2iZp+a95Y=; b=lCu0jtZ/X8jjLDdXgF35fC5uZeCKlSelXqx6UIHSvBMtox7fpxccKvkLtezfM+/4e3 Pmzd1kNZ9ieiuSjUhNCsLOINWIQwfUHb4EAT6WdJIzrWvs51b9OuJeCNjytSFxr+bHxA eA71zmYsETBdkTO5TpUsJ+rj2yqxsEILZ++6L+euUIXpiSxvak0xAR/ZBa4lo0caUZda 9xfmnktfibYds2BYr0XJK2vIQBDleQBmBXXK/9YU6ZVH6AgUSxDf8fzK1Kq3A5KF5iFl u+r+SHx0lib2iJf9ycB6sf1sU00Y/N3o9o1wMu56KuFIklFD6RIdPsJh/ugPmOLDV8iH CWbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=alXSIX3aVlQbR+ahH+ZLhiXZst3M9kUZiv2iZp+a95Y=; b=X2aDjj1740ryMVItVfBvYg8PcGD944rFqWcbXrtBcFWpJpzP/SvPMXXHHNp1iLb+pC lj+ktW2VvfaHmx+fClXkkmpjxvtPjXQoXvOqEZw9RBMmFFRpE+k9H1v7WnGDMzWUcsPr mUAkS0AujTW9vpWP0co9LtPK1wpGQ0GRnwf1gfyqXyMEqM9uBdpvhXqBg+aEjmd19QS7 s8ylbRX3BLtaX/THPQ5skQk1ROhTJU/KJRki34aINrvSKvhRKHGoioBPJkcNGqx2NoVD qIe+5YNgxZueXXWeih+66FUr9f6N9WE9zzTYcqbeEOUzfI8XS6nqrpJzXQL3w9oV7ixb HpTA== X-Gm-Message-State: AOAM531hv5s6IRXJlRVgXRzMDbfPDFdfT0rSDrZF+R7AdlTqkdykwc0s znajXdCagekmjWfx/46ticAz8oHfUYHgjR6s X-Google-Smtp-Source: ABdhPJxQpffzyI1/IX60wHm+N5fqJ0RLEsYo6RQuXAa8Svy7MgjbJGnfCozLGOQQHXxRS/yVQLQXzw== X-Received: by 2002:a05:6808:23cc:b0:2d9:dc76:1f36 with SMTP id bq12-20020a05680823cc00b002d9dc761f36mr8093205oib.292.1648301151155; Sat, 26 Mar 2022 06:25:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 05/39] os-posix: Use qemu_log_enabled Date: Sat, 26 Mar 2022 07:24:57 -0600 Message-Id: <20220326132534.543738-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22b; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648301753115100001 Do not reference qemu_logfile directly; use the predicate provided by qemu/log.h. Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- os-posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os-posix.c b/os-posix.c index 24692c8593..20d31fc518 100644 --- a/os-posix.c +++ b/os-posix.c @@ -292,7 +292,7 @@ void os_setup_post(void) dup2(fd, 0); dup2(fd, 1); /* In case -D is given do not redirect stderr to /dev/null */ - if (!qemu_logfile) { + if (!qemu_log_enabled()) { dup2(fd, 2); } =20 --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648301756114288.9005644209801; Sat, 26 Mar 2022 06:35:56 -0700 (PDT) Received: from localhost ([::1]:54894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6aB-0004f8-3X for importer@patchew.org; Sat, 26 Mar 2022 09:35:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QW-00071m-7F for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:56 -0400 Received: from [2001:4860:4864:20::2d] (port=37200 helo=mail-oa1-x2d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QT-0005Ln-9G for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:55 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-dee0378ce7so360212fac.4 for ; Sat, 26 Mar 2022 06:25:52 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TOJF6hs6MIWp7u5IOBbMVU2hqWWBLm4vep8AaaojE1I=; b=fBlXKjbR5gpIbkK9Q5Knhcq7zY+B5/ShAUt1I6RcwgleJHdeakoTeXP6hrUEXvSu/L Gaotd8+EXHS34bzIpKHqoNKqPNr2CCaXE+Hl77TGRa29SZ7vdzLmT+5YQsL2B5OFoeEB fexMjxNFrhl6bfcxsK82V7AUgcGGXnJyhgJWLSZpA4C3em00mjLAliomKegrmInuHeyV h5m62/aEc4bc5FADkyHCSSQLKIVFVVU8j64C+OJXY9+4T7ndcdHS9eXxOcWW0yEFdL1/ 8k2Qu0/lYphUC37cknd7r5Bgfi+OPVkdSIeFy2HxC8tsUxYndZ0zwMUV41PPP4vpl8Tc +vYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TOJF6hs6MIWp7u5IOBbMVU2hqWWBLm4vep8AaaojE1I=; b=uydTUs8fqbTb2jZyxdUq4pDEt/AIEipiJskRRHUPBvDkVH33C8JkTEniq8VhXZRkmX YoHznifk3GT0cSKyWPCiUiYffngZ2HDixeVd/J1X93VLZ4OA+vhwA5ciyp2Jm0+EDYKv US9YbSlx8ypiWAKrqEFx0+besFaYegPux+ww7mnBBJ0fPwloJetpl15E4msOuwzcRdIt dqaguHlC8IcarDMzcPc30pUc7ql0F1MjhCedAvTofF3vyDtLdoXMNiWcF71xZBrP7jK6 ws5b77DuLuJ2u0GcUiTfsAVWVKnAWbHDvCK90wULCgDI6eUrEbTQbai3lGjAFTDZG/fb 2wgw== X-Gm-Message-State: AOAM530nUTKdKc+8v8q5qYi00uR9rlGlgSDWGtp5X5xWYZ041eUf3Rhu Esw0MhQA5Gy6ArlQw2iKu8qiyRD4JLaa+Jqg X-Google-Smtp-Source: ABdhPJwK2d9IuQc+YfxbiUTtGTFC3kQ0GnmHLaF2RDQRiFtHykkGBLCVwie+weoG+nEjwNlxFeQ5dA== X-Received: by 2002:a05:6870:9893:b0:d2:87e4:c71c with SMTP id eg19-20020a056870989300b000d287e4c71cmr7126176oab.132.1648301152316; Sat, 26 Mar 2022 06:25:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 6/8] linux-user/nios2: Remove do_sigreturn Date: Sat, 26 Mar 2022 07:24:58 -0600 Message-Id: <20220326132534.543738-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2d; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Peter Maydell , alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648301757009100005 Content-Type: text/plain; charset="utf-8" There is no sigreturn syscall, only rt_sigreturn. This function is unused. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/nios2/signal.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/linux-user/nios2/signal.c b/linux-user/nios2/signal.c index 517cd39270..133bc05673 100644 --- a/linux-user/nios2/signal.c +++ b/linux-user/nios2/signal.c @@ -185,13 +185,6 @@ void setup_rt_frame(int sig, struct target_sigaction *= ka, unlock_user_struct(frame, frame_addr, 1); } =20 -long do_sigreturn(CPUNios2State *env) -{ - trace_user_do_sigreturn(env, 0); - qemu_log_mask(LOG_UNIMP, "do_sigreturn: not implemented\n"); - return -TARGET_ENOSYS; -} - long do_rt_sigreturn(CPUNios2State *env) { /* Verify, can we follow the stack back */ --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648301798; cv=none; d=zohomail.com; s=zohoarc; b=Jf08PCikYs53EkQADo3bWWqr+87sFEKkTretQK4z2pVjOk8y1EBj69P2gORG34T0G67qcenzGA5QJhMbV0V93fzeEEO5NzLLny0qxX3usztBTlj8Vu/4HSSyhk+JE9uQlgcbk2SnXYxpfw1b30uClalGLyrwwcFGGTbn6j36FZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648301798; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Rr/RffNvDVGLD4+joN+/CEx/FD3wfnt5ywEdlwbeVrE=; b=dEcam7L5hw8D++ymmDcgQzRtXCdhcISaXQcxJQFKNFWpGla4VY0wRyo1eMROw53aEVh6L1GjDsk+Y6TnJNLwXQsz+YHFYZfENsLzwKZT4Y4qXALZwEUAkefqCq87eXV0PngnON69ThK1hMbzJGr/yFtp/4u4Bjha/EbogENPhBM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648301798852703.3674122480236; Sat, 26 Mar 2022 06:36:38 -0700 (PDT) Received: from localhost ([::1]:58216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6ar-0006tr-QR for importer@patchew.org; Sat, 26 Mar 2022 09:36:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QW-00073Y-JS for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:56 -0400 Received: from [2607:f8b0:4864:20::233] (port=45010 helo=mail-oi1-x233.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QV-0005M7-12 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:56 -0400 Received: by mail-oi1-x233.google.com with SMTP id t21so6202162oie.11 for ; Sat, 26 Mar 2022 06:25:54 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Rr/RffNvDVGLD4+joN+/CEx/FD3wfnt5ywEdlwbeVrE=; b=vf02uyaw8WiWLaH7s58pCO3RRldHu6Wp+MIbSq7J03ATGXueAh55QwbS1t15fzE55x 7Ac+UHENCYQmkL6hEK0KlYW30rwWl/xvyztGPoFV/DmNzKXgMk2+1Fm2B+wRPIQfyCAk U4CEBtQb7FwpfizCkccJJ8qCggsfc/6kMmKb/+KcuDCKm6Z8/tOlSuKC5DAoEwO7yzP0 dG+955nrqsCtSdiEEM/fZxNU1Nv9twNvJxrEzBLxdrCN1IJ3sLcub+RUDRoJ30Gmu+of AiJVgg2pWtsUbncNWtlmd1Wv6le798eIU2EGVQacARMEOzC22ksWYnvRDz4rU1OAzM05 dA0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rr/RffNvDVGLD4+joN+/CEx/FD3wfnt5ywEdlwbeVrE=; b=0Tn3YQbFn7EMJvFOPJOosXJMsLv7NsiCXXFwx5K1Ru4rjrycugO5u4B8mkAaCKPSNX kMAzEWvO+dpZveDVYvFcYqWyqj+PST/Ux+KblmvSRWAGmr0d8gaxxAIZZSdX00i8SdgO v2xwbXRHMwYs+sgjto4sApPX6ur9xJu0/TGHGPXavr1RAt35cq2mcdKfgJl7brbYHItw dkKFLo16SkQRE3+czJxKZBhUT2H86AJqqxTytiLqmmvTBzKIo3HI8/U0awwaTzpH6Fc4 bBMb+RArwmAkccqdxG5uEfzdmLwBh8VLkPO8KBFnoppO5Owp6sFsWRylorvtQzNlPA4m iahQ== X-Gm-Message-State: AOAM531YTH37nzIn5S1N3ExchrEjoI7jTgghVaCDmBpJq5TDO3BQtnUf wxeS77B+jMe2mHG648orC8fXtgd8VnWf5g7h X-Google-Smtp-Source: ABdhPJwHC7KeJgwPkYUzK0F5sIdvtUU2QMvpaCqBMMZsQiG1hQ5TdPKc6gxxicNHeRcbA7l1I1pFnA== X-Received: by 2002:a05:6808:14cf:b0:2d9:dcc6:8792 with SMTP id f15-20020a05680814cf00b002d9dcc68792mr12852310oiw.219.1648301153915; Sat, 26 Mar 2022 06:25:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 06/39] util/log: Move qemu_log_lock, qemu_log_unlock out of line Date: Sat, 26 Mar 2022 07:24:59 -0600 Message-Id: <20220326132534.543738-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::233 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::233; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x233.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648301799388100001 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- include/qemu/log.h | 28 +++------------------------- util/log.c | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index 0b892f5e90..6a6b1efce5 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -65,32 +65,10 @@ static inline bool qemu_log_separate(void) /* LOG_STRACE is used for user-mode strace logging. */ #define LOG_STRACE (1 << 19) =20 -/* Lock output for a series of related logs. Since this is not needed - * for a single qemu_log / qemu_log_mask / qemu_log_mask_and_addr, we - * assume that qemu_loglevel_mask has already been tested, and that - * qemu_loglevel is never set when qemu_logfile is unset. - */ +/* Lock/unlock output. */ =20 -static inline FILE *qemu_log_lock(void) -{ - QemuLogFile *logfile; - rcu_read_lock(); - logfile =3D qatomic_rcu_read(&qemu_logfile); - if (logfile) { - qemu_flockfile(logfile->fd); - return logfile->fd; - } else { - return NULL; - } -} - -static inline void qemu_log_unlock(FILE *fd) -{ - if (fd) { - qemu_funlockfile(fd); - } - rcu_read_unlock(); -} +FILE *qemu_log_lock(void); +void qemu_log_unlock(FILE *fd); =20 /* Logging functions: */ =20 diff --git a/util/log.c b/util/log.c index bab4d29ecb..1a3121610a 100644 --- a/util/log.c +++ b/util/log.c @@ -34,6 +34,29 @@ int qemu_loglevel; static int log_append =3D 0; static GArray *debug_regions; =20 +/* Lock/unlock output. */ + +FILE *qemu_log_lock(void) +{ + QemuLogFile *logfile; + rcu_read_lock(); + logfile =3D qatomic_rcu_read(&qemu_logfile); + if (logfile) { + qemu_flockfile(logfile->fd); + return logfile->fd; + } else { + return NULL; + } +} + +void qemu_log_unlock(FILE *fd) +{ + if (fd) { + qemu_funlockfile(fd); + } + rcu_read_unlock(); +} + /* Return the number of characters emitted. */ int qemu_log(const char *fmt, ...) { --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648302124; cv=none; d=zohomail.com; s=zohoarc; b=nH79+K6iJXQ407jNEDDAJMAC42jgyzaJ3+fmuZIPVdiMZvnq8p3CHqcVSHUGMwk7UkBux3SKI6XnLuEgEQToGs/QR7DRV+nESE7wMQu+0BbVl2N4bBS7H7uegE1wpNwhiRc7lLKzTut6ud1yQrxV0ZzWt0PsdUzonRSNZ5EduyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648302124; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Jb3sLSwq3e8jLhUS1JuAKUAWnlmxlh9RM1IiT7+4r04=; b=gFVJRjhoZAVFOPfFDKxZ4Ek7YouMb3+slLOoW6bwRMgOFghiqctl6RhUYtd2taY/H1PmEX49CotYqTaDQGg4zll2c8QAgqfXLiJvEj5l0QS99oaDXGQ7Xi1yMnGX5adRv5y5WC2rgpA6MQB+ix5qYXxSGjdt8KESqID2aR/DkVs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648302124397222.068669366133; Sat, 26 Mar 2022 06:42:04 -0700 (PDT) Received: from localhost ([::1]:43530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6g7-0007b7-5r for importer@patchew.org; Sat, 26 Mar 2022 09:42:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QZ-0007CY-49 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:59 -0400 Received: from [2607:f8b0:4864:20::234] (port=42682 helo=mail-oi1-x234.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QX-0005Mo-5L for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:58 -0400 Received: by mail-oi1-x234.google.com with SMTP id q189so11067733oia.9 for ; Sat, 26 Mar 2022 06:25:56 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jb3sLSwq3e8jLhUS1JuAKUAWnlmxlh9RM1IiT7+4r04=; b=UYUABIR1WCbJya7H4gjzz5qs6UGZVliImq9dTHUYUJYaFBTkxJ6qK+c4LaEeVLSs2u BcZgnBBvtd+emJGrTw3N6RDB6E2rrE39r7ltI3oOq9AI45JEe5FrsAbQkxeoHoafU/yz 4pW4xZEfwro/I+yOEmdTwF6HrXevdxbUYa6YErwYL+nLUXJKFy8EByJJaUIYg5ymoEGA aXC/hfmYAI7pUyg8yxB1eS+6PYpNxyNn7kSXgIQ7et7tRLz6zvojrRjFLZa0USaoIIFv GNPaUU2b66wmkGLT5Ic0zljfCzL1yrbG/iaHqm66EvofxB12+FfXX+QXgaoijV1oSqyk v3gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jb3sLSwq3e8jLhUS1JuAKUAWnlmxlh9RM1IiT7+4r04=; b=AfhD6xewR2vGX7fnLWi+/shz+ijxF5bXYyBeWCoyaljEEfxO5SQH+1tKCxHNN62AVS M6Kb+dKUWtMj6VXa7gR1oKRPLGPv/Zve8rNjTztaRtiDpiYbLGt7rz58VorkeqLw4Me+ DqRhAkuaT2kHjeb2/0DNY+H8Ol8rthp/5x3lAypnRqVbFT53T2oahXVa+1Xcc3eDQWiQ dTKoRuC5Q87v9i9ZFgMmJVqXHBMo75Jgi1A8aTZ5L4AFNWpYXbujpwxZH3xgLS0Hyb19 b61duvd1dnxSkJC+s5Eosf5ttkMP3R54lyk9TnAJ04wcmbUVkqAinsc3is+r4EgsBjtT 7nMQ== X-Gm-Message-State: AOAM530fScCeeuMbYQrZIJ8z24WMSVOJqeuCWyP53McC+L7c4V3Tayg4 4i5uny9pSCWSGDlN4/7Sp2NDpMpyXtiuR/zA X-Google-Smtp-Source: ABdhPJwV9oYLO3FqRgcPekKVQeaSImaRwcTBdcDjY+6TJUx3LOptCk4uupJ8MnP2aowx7G0jgbw9Ig== X-Received: by 2002:a05:6808:302b:b0:2cb:2fea:cf9 with SMTP id ay43-20020a056808302b00b002cb2fea0cf9mr7920832oib.117.1648301156109; Sat, 26 Mar 2022 06:25:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 07/39] util/log: Rename qemu_log_lock to qemu_log_trylock Date: Sat, 26 Mar 2022 07:25:01 -0600 Message-Id: <20220326132534.543738-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::234 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::234; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x234.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648302125437100001 Content-Type: text/plain; charset="utf-8" This function can fail, which makes it more like ftrylockfile or pthread_mutex_trylock than flockfile or pthread_mutex_lock, so rename it. To closer match the other trylock functions, release rcu_read_lock along the failure path, so that qemu_log_unlock need not be called on failure. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- v2: Rename the function as well as change the semantics, so drop r-b. --- include/exec/log.h | 2 +- include/qemu/log.h | 2 +- accel/tcg/cpu-exec.c | 2 +- accel/tcg/translate-all.c | 2 +- accel/tcg/translator.c | 2 +- cpu.c | 2 +- hw/net/can/can_sja1000.c | 2 +- net/can/can_socketcan.c | 2 +- target/i386/tcg/translate.c | 2 +- tcg/tcg.c | 8 ++++---- tests/unit/test-logging.c | 2 +- util/log.c | 6 ++++-- 12 files changed, 18 insertions(+), 16 deletions(-) diff --git a/include/exec/log.h b/include/exec/log.h index 3c7fa65ead..fb595d1eb7 100644 --- a/include/exec/log.h +++ b/include/exec/log.h @@ -71,7 +71,7 @@ static inline void log_disas(const void *code, unsigned l= ong size) /* page_dump() output to the log file: */ static inline void log_page_dump(const char *operation) { - FILE *logfile =3D qemu_log_lock(); + FILE *logfile =3D qemu_log_trylock(); if (logfile) { qemu_log("page layout changed following %s\n", operation); page_dump(logfile); diff --git a/include/qemu/log.h b/include/qemu/log.h index 6a6b1efce5..d090faf22a 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -67,7 +67,7 @@ static inline bool qemu_log_separate(void) =20 /* Lock/unlock output. */ =20 -FILE *qemu_log_lock(void); +FILE *qemu_log_trylock(void); void qemu_log_unlock(FILE *fd); =20 /* Logging functions: */ diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index c997c2e8e0..8d0315de75 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -215,7 +215,7 @@ static inline void log_cpu_exec(target_ulong pc, CPUSta= te *cpu, =20 #if defined(DEBUG_DISAS) if (qemu_loglevel_mask(CPU_LOG_TB_CPU)) { - FILE *logfile =3D qemu_log_lock(); + FILE *logfile =3D qemu_log_trylock(); int flags =3D 0; =20 if (qemu_loglevel_mask(CPU_LOG_TB_FPU)) { diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 5971cd53ab..71ab863c18 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1528,7 +1528,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM) && qemu_log_in_addr_range(tb->pc)) { - FILE *logfile =3D qemu_log_lock(); + FILE *logfile =3D qemu_log_trylock(); int code_size, data_size; const tcg_target_ulong *rx_data_gen_ptr; size_t chunk_start; diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index f06c314266..1506755f3c 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -139,7 +139,7 @@ void translator_loop(const TranslatorOps *ops, DisasCon= textBase *db, #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) && qemu_log_in_addr_range(db->pc_first)) { - FILE *logfile =3D qemu_log_lock(); + FILE *logfile =3D qemu_log_trylock(); qemu_log("----------------\n"); ops->disas_log(db, cpu); qemu_log("\n"); diff --git a/cpu.c b/cpu.c index be1f8b074c..ddcbfc724d 100644 --- a/cpu.c +++ b/cpu.c @@ -400,7 +400,7 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) fprintf(stderr, "\n"); cpu_dump_state(cpu, stderr, CPU_DUMP_FPU | CPU_DUMP_CCOP); if (qemu_log_separate()) { - FILE *logfile =3D qemu_log_lock(); + FILE *logfile =3D qemu_log_trylock(); qemu_log("qemu: fatal: "); qemu_log_vprintf(fmt, ap2); qemu_log("\n"); diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c index 3ba803e947..300313dfb8 100644 --- a/hw/net/can/can_sja1000.c +++ b/hw/net/can/can_sja1000.c @@ -247,7 +247,7 @@ int can_sja_accept_filter(CanSJA1000State *s, static void can_display_msg(const char *prefix, const qemu_can_frame *msg) { int i; - FILE *logfile =3D qemu_log_lock(); + FILE *logfile =3D qemu_log_trylock(); =20 qemu_log("%s%03X [%01d] %s %s", prefix, diff --git a/net/can/can_socketcan.c b/net/can/can_socketcan.c index 4b68f60c6b..4a505643e9 100644 --- a/net/can/can_socketcan.c +++ b/net/can/can_socketcan.c @@ -76,7 +76,7 @@ QEMU_BUILD_BUG_ON(offsetof(qemu_can_frame, data) static void can_host_socketcan_display_msg(struct qemu_can_frame *msg) { int i; - FILE *logfile =3D qemu_log_lock(); + FILE *logfile =3D qemu_log_trylock(); qemu_log("[cansocketcan]: %03X [%01d] %s %s", msg->can_id & QEMU_CAN_EFF_MASK, msg->can_dlc, diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index c393913fe0..3fb8b530d8 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2580,7 +2580,7 @@ static void gen_unknown_opcode(CPUX86State *env, Disa= sContext *s) gen_illegal_opcode(s); =20 if (qemu_loglevel_mask(LOG_UNIMP)) { - FILE *logfile =3D qemu_log_lock(); + FILE *logfile =3D qemu_log_trylock(); target_ulong pc =3D s->pc_start, end =3D s->pc; =20 qemu_log("ILLOPC: " TARGET_FMT_lx ":", pc); diff --git a/tcg/tcg.c b/tcg/tcg.c index 33a97eabdb..2f09114bf9 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -756,7 +756,7 @@ void tcg_prologue_init(TCGContext *s) =20 #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM)) { - FILE *logfile =3D qemu_log_lock(); + FILE *logfile =3D qemu_log_trylock(); qemu_log("PROLOGUE: [size=3D%zu]\n", prologue_size); if (s->data_gen_ptr) { size_t code_size =3D s->data_gen_ptr - s->code_gen_ptr; @@ -4200,7 +4200,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) #ifdef DEBUG_DISAS if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP) && qemu_log_in_addr_range(tb->pc))) { - FILE *logfile =3D qemu_log_lock(); + FILE *logfile =3D qemu_log_trylock(); qemu_log("OP:\n"); tcg_dump_ops(s, false); qemu_log("\n"); @@ -4245,7 +4245,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) #ifdef DEBUG_DISAS if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP_IND) && qemu_log_in_addr_range(tb->pc))) { - FILE *logfile =3D qemu_log_lock(); + FILE *logfile =3D qemu_log_trylock(); qemu_log("OP before indirect lowering:\n"); tcg_dump_ops(s, false); qemu_log("\n"); @@ -4266,7 +4266,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) #ifdef DEBUG_DISAS if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP_OPT) && qemu_log_in_addr_range(tb->pc))) { - FILE *logfile =3D qemu_log_lock(); + FILE *logfile =3D qemu_log_trylock(); qemu_log("OP after optimization and liveness analysis:\n"); tcg_dump_ops(s, true); qemu_log("\n"); diff --git a/tests/unit/test-logging.c b/tests/unit/test-logging.c index 93c6d666e8..54d7e8e33b 100644 --- a/tests/unit/test-logging.c +++ b/tests/unit/test-logging.c @@ -163,7 +163,7 @@ static void test_logfile_lock(gconstpointer data) * our handle remains valid for use due to RCU. */ qemu_set_log_filename(file_path, &error_abort); - logfile =3D qemu_log_lock(); + logfile =3D qemu_log_trylock(); g_assert(logfile); fprintf(logfile, "%s 1st write to file\n", __func__); fflush(logfile); diff --git a/util/log.c b/util/log.c index 1a3121610a..6b7b358573 100644 --- a/util/log.c +++ b/util/log.c @@ -36,15 +36,17 @@ static GArray *debug_regions; =20 /* Lock/unlock output. */ =20 -FILE *qemu_log_lock(void) +FILE *qemu_log_trylock(void) { QemuLogFile *logfile; + rcu_read_lock(); logfile =3D qatomic_rcu_read(&qemu_logfile); if (logfile) { qemu_flockfile(logfile->fd); return logfile->fd; } else { + rcu_read_unlock(); return NULL; } } @@ -53,8 +55,8 @@ void qemu_log_unlock(FILE *fd) { if (fd) { qemu_funlockfile(fd); + rcu_read_unlock(); } - rcu_read_unlock(); } =20 /* Return the number of characters emitted. */ --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648301980; cv=none; d=zohomail.com; s=zohoarc; b=gdLSodBN7Tyl34MmwG5NA7ZEr/I30SGcdZmOIwEGsZ1sRz2hhJWBdg2O5dAgYZRKmEh3scwO5jMcLQBL4ucl8Ly0Raxveen9QjHwxoYqW8hjoXMZ4x+qdzpr63kiQJSnudHCtticbuvPYWIJNsA6ENanfALhANSYVqRcITpJpjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648301980; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xYuWaRD3BVfH07lx10ciC+hnANbY9oKSD0sVPEBlcEQ=; b=EU6qCxUVHVC5IxA1Mht5RDIbG6r+roMXcPBjPuuDpZZwuGghiN56Uat0rkpEkwVGidoJvxrm3QFLpx5EmHEb+cgu6SS1tlqoTHpqmlDW+DiEJCyYWbwRD4zIIFIpKRpX54AglIr/2IdPPkkLFrZBco8XOjwy0oach0jXzaVLba0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16483019804541013.5456637410388; Sat, 26 Mar 2022 06:39:40 -0700 (PDT) Received: from localhost ([::1]:38592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6dn-0004Eb-5q for importer@patchew.org; Sat, 26 Mar 2022 09:39:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QX-000777-L9 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:57 -0400 Received: from [2607:f8b0:4864:20::22f] (port=43751 helo=mail-oi1-x22f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QW-0005MW-1M for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:57 -0400 Received: by mail-oi1-x22f.google.com with SMTP id w127so11074209oig.10 for ; Sat, 26 Mar 2022 06:25:55 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xYuWaRD3BVfH07lx10ciC+hnANbY9oKSD0sVPEBlcEQ=; b=J1aFLgD+2IRA6gLwVZNtDRKl0b+nN+IMO+TqYrEGCk78SNjgeSQ7/V2fvnan+nwwhY mbL28JPUwbCYX9vAUAC0gPYYbiwnRo4qW7nEwL4bVqTewlrirLo6/3dLKzLBRY739PoV iUAkQrS6s+J43fCMj3HBrcO/zpatf/ghtzvXv/iFci8IfuggNopqzHTZUUdZTxma9zFP sR/vSjOzAIQs7uMtGjNd53Kd+QvrPmmRrhXnnBPXlidXO9CZvHfiaxzRSLuEQHSUCOMk e13CpZKaD7sfK20WdSYZ3zxO5p5tQPBR+WCKAkOn5x60mQS5PDbpwWXooPJkChhqOtvc IxfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xYuWaRD3BVfH07lx10ciC+hnANbY9oKSD0sVPEBlcEQ=; b=ziqC7gby4mhQ4vJ98xubPSwbAexdoYTMt4LVUBk4FKxNM9mWVOLa6yEaKWlz5womFt iVNAwVQAPrzrSKyi7+qBYi8kqqOEgy7EwrrTQnkd31KZ51D9CQ/4bKL86f8c8EI4jMK+ bK3ba8I07GfduqrlgiNv15UFGmNVNch/ETubYkuifdk4O3qoV5YSdUW4yWaJcCx8iraO 5ezFeH+bZLhwymZN65LhIIjHsp/7N2fB1vJuZkDV9O2a/88lDWxqk9ICu5KQti+/KKM0 XhXCfXqZ9LYhCZKVTzhXrcyJfqEEl7KrBD/mDbNcDxk3KLldfRB5gsJWIqPJ+g/0YVT5 PuMQ== X-Gm-Message-State: AOAM531tAZbgm7gHs4kZ34YpxY4U9Nk/vSOLg10ZCHjWZol1oblloFd3 fo5NMzJoCvyiBHw02Y1VN+9vYKnY1Ly7sL0F X-Google-Smtp-Source: ABdhPJxZVU5PewVpy6xi5gyrkOTvkczsEarfvMIj8fVq6YCEISgRK1Jwrsk5y10n7GtCU6OoNu2ifw== X-Received: by 2002:a05:6808:2218:b0:2d9:c3f2:4042 with SMTP id bd24-20020a056808221800b002d9c3f24042mr11825314oib.270.1648301155023; Sat, 26 Mar 2022 06:25:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 7/8] linux-user/nios2: Use QEMU_ESIGRETURN from do_rt_sigreturn Date: Sat, 26 Mar 2022 07:25:00 -0600 Message-Id: <20220326132534.543738-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22f (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22f; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648301982743100001 Content-Type: text/plain; charset="utf-8" Drop the kernel-specific "pr2" code structure and use the qemu-specific error return value. Signed-off-by: Richard Henderson --- linux-user/nios2/signal.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/linux-user/nios2/signal.c b/linux-user/nios2/signal.c index 133bc05673..9aa525e723 100644 --- a/linux-user/nios2/signal.c +++ b/linux-user/nios2/signal.c @@ -77,8 +77,7 @@ static void rt_setup_ucontext(struct target_ucontext *uc,= CPUNios2State *env) __put_user(env->regs[R_SP], &gregs[28]); } =20 -static int rt_restore_ucontext(CPUNios2State *env, struct target_ucontext = *uc, - int *pr2) +static int rt_restore_ucontext(CPUNios2State *env, struct target_ucontext = *uc) { int temp; unsigned long *gregs =3D uc->tuc_mcontext.gregs; @@ -128,8 +127,6 @@ static int rt_restore_ucontext(CPUNios2State *env, stru= ct target_ucontext *uc, __get_user(env->regs[R_SP], &gregs[28]); =20 target_restore_altstack(&uc->tuc_stack, env); - - *pr2 =3D env->regs[2]; return 0; } =20 @@ -191,7 +188,6 @@ long do_rt_sigreturn(CPUNios2State *env) abi_ulong frame_addr =3D env->regs[R_SP]; struct target_rt_sigframe *frame; sigset_t set; - int rval; =20 if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) { goto badframe; @@ -200,15 +196,15 @@ long do_rt_sigreturn(CPUNios2State *env) target_to_host_sigset(&set, &frame->uc.tuc_sigmask); set_sigmask(&set); =20 - if (rt_restore_ucontext(env, &frame->uc, &rval)) { + if (rt_restore_ucontext(env, &frame->uc)) { goto badframe; } =20 unlock_user_struct(frame, frame_addr, 0); - return rval; + return -QEMU_ESIGRETURN; =20 badframe: unlock_user_struct(frame, frame_addr, 0); force_sig(TARGET_SIGSEGV); - return 0; + return -QEMU_ESIGRETURN; } --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648301921; cv=none; d=zohomail.com; s=zohoarc; b=GGUfbSMmAes2d+W3cdJO0F/3rHiVwOW97rjZJa6ZYidaldBMWyErugboLxcXG+2CE/ObgUSHQ2uaRvExPLcamYGmN+ch/JavYXxhveHnFc5idvFvRv89cB0bnQpe5KFwK7tFOoaXN4JqYKNNylijUDuGl3cf+tGSgUGuEq0syw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648301921; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kPR3QL2zkjcobuOtk7sTr4ObN7Yl/0yBneTbMcqTLmw=; b=HMnQeNCjnCApBGt/tO/STr10Afaay3mGQxXIvSbE2fRlDKPX46vCdVhHbPekf2WN2mwvi+zR7XshdmGbpWQ6Akdmj9r7d5YBae+ISKbRl9BxPCJPHGP3xzVx/1NGM4mzEwA58NkKEOo7byCjiLyrxPP2VRTR3kFLpDPqrPAGQGc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164830192199395.25704073625229; Sat, 26 Mar 2022 06:38:41 -0700 (PDT) Received: from localhost ([::1]:34942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6cq-0001nz-QJ for importer@patchew.org; Sat, 26 Mar 2022 09:38:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qb-0007Hf-5N for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:01 -0400 Received: from [2607:f8b0:4864:20::232] (port=43754 helo=mail-oi1-x232.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QY-0005N3-L8 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:00 -0400 Received: by mail-oi1-x232.google.com with SMTP id w127so11074273oig.10 for ; Sat, 26 Mar 2022 06:25:58 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kPR3QL2zkjcobuOtk7sTr4ObN7Yl/0yBneTbMcqTLmw=; b=CF0vW+cXHZI6FalbhwNhBqD4kjpPCJZAOLBgfnf6nrJQAfMe/jIkmdhVYY+fC09v8m uTom8A99Bl6sHEfI/R3AjNaqqFTkacyHKFiqRaEd5vKQcCiPM54fRPHDLy92zldkwSnJ 9KRwuZpbGBXIuM1xr/T94YWr/VD3PbW2IdJNTvCFSLA4NBd14oGi0vxwzY22p8OATBIx IsSkgeVdbP+XRpPP0tXijDiGCxqrvQ+gAhHhk/B2qpg0Wl5OgblMOVZbUCmKB4YA0wkn AtWtd8bWaI7I2xBtKJh7ooXbCl+QImxM3SZFLxrP+9Jc2Y6mOSIbT3CecPPCDM8VqAmA I79g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kPR3QL2zkjcobuOtk7sTr4ObN7Yl/0yBneTbMcqTLmw=; b=ZVzc92uTGbB6tGfjR57MiqAWZDjh+VXp+a75LXiFUr3iteeAx0nNFJKcZES7DZ4VED fFFGbklgkIWTBjYpo1kgKOOrMllNPoTyEGGiqZa73fZ5JsaNqeaGjgPwoHBTOympyO2S cB7i9SAnDBo0hwtbLV0NmzTyy7an09evwoOuTai0+YebFxgtna46+4nJc2f2aXoKS+6M 5P6H8IwEZBt42Go3X9uP4XfgkXHr/5+pyk9+RL5puxpVoLdBjs3zu75OQJAcl+eKyqsp l5MkN9YbAiHehssxHVSJxqnNhVliZNNEmlwlGqsG6twdJP6ohjBYLyqHPH475zG6kxEf xa3w== X-Gm-Message-State: AOAM532RccPNjKw/IV7OTtcXDlG+dpoygc2bj2vjrXlUYic9xybPYNAF 27sKWQ2y5LExWeWofrSyBBoKGYVy8Jd/mtJj X-Google-Smtp-Source: ABdhPJzDxGO028uc59qBJsWz0YBWHwIpr0nz3YWxpiy4+vPiHCcusjuhmqQDbz9xIipL0U6PoxuUCg== X-Received: by 2002:a05:6808:3021:b0:2d4:40f3:6b30 with SMTP id ay33-20020a056808302100b002d440f36b30mr12720638oib.31.1648301157550; Sat, 26 Mar 2022 06:25:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 08/39] hw/xen: Split out xen_pv_output_msg Date: Sat, 26 Mar 2022 07:25:02 -0600 Message-Id: <20220326132534.543738-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::232 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::232; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x232.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648301924316100001 Do not replicate the individual logging statements. Use qemu_log_trylock/unlock instead of qemu_log directly. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- hw/xen/xen_pvdev.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c index 8ab458922a..0423c61158 100644 --- a/hw/xen/xen_pvdev.c +++ b/hw/xen/xen_pvdev.c @@ -196,34 +196,38 @@ const char *xenbus_strstate(enum xenbus_state state) * 2 =3D=3D noisy debug messages (logfile only). * 3 =3D=3D will flood your log (logfile only). */ +static void xen_pv_output_msg(struct XenLegacyDevice *xendev, + FILE *f, const char *fmt, va_list args) +{ + if (xendev) { + fprintf(f, "xen be: %s: ", xendev->name); + } else { + fprintf(f, "xen be core: "); + } + vfprintf(f, fmt, args); +} + void xen_pv_printf(struct XenLegacyDevice *xendev, int msg_level, const char *fmt, ...) { + FILE *logfile; va_list args; =20 - if (xendev) { - if (msg_level > xendev->debug) { - return; - } - qemu_log("xen be: %s: ", xendev->name); - if (msg_level =3D=3D 0) { - fprintf(stderr, "xen be: %s: ", xendev->name); - } - } else { - if (msg_level > debug) { - return; - } - qemu_log("xen be core: "); - if (msg_level =3D=3D 0) { - fprintf(stderr, "xen be core: "); - } + if (msg_level > (xendev ? xendev->debug : debug)) { + return; } - va_start(args, fmt); - qemu_log_vprintf(fmt, args); - va_end(args); + + logfile =3D qemu_log_trylock(); + if (logfile) { + va_start(args, fmt); + xen_pv_output_msg(xendev, logfile, fmt, args); + va_end(args); + qemu_log_unlock(logfile); + } + if (msg_level =3D=3D 0) { va_start(args, fmt); - vfprintf(stderr, fmt, args); + xen_pv_output_msg(xendev, stderr, fmt, args); va_end(args); } qemu_log_flush(); --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648302426650876.7609330903759; Sat, 26 Mar 2022 06:47:06 -0700 (PDT) Received: from localhost ([::1]:52084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6kz-00050z-Cu for importer@patchew.org; Sat, 26 Mar 2022 09:47:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qb-0007IY-Do for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:01 -0400 Received: from [2607:f8b0:4864:20::c29] (port=43539 helo=mail-oo1-xc29.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6QZ-0005NJ-RH for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:01 -0400 Received: by mail-oo1-xc29.google.com with SMTP id h3-20020a4ae8c3000000b00324b9ae6ff2so1678953ooe.10 for ; Sat, 26 Mar 2022 06:25:59 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b49/gyL3nhPHdkIknNEuvRr52AV4Z59e2KtiOdvbnJc=; b=wyX6TeSYvtGM1rk5hB+bge/MFQWhSY5m6HuQi/ePZjxqdp33XB7nFUYvA3/UVJMELV uE2ZIc6W5En+OZDAAAoAmq1QBCCRWv0/Nc3BjKy7ym7Gc5fm8Pti1FaFxL6bgtIk+V0N 4EEpwwpTXxf34YGVzqqf8Kzq1XZPbzbn+PG0xlXqfnnaiUEsiaYUG6VogPYwRXkcM8vN 1DKdrQ2HQ3KKypG3jRnuaT5A1PVWXyL50Z1z/1ncFHPVrE8P5w4qPSfaxQbWm3QHI7Vb eWDV7L9YEGzaGbfrOzWRWUdI/znGZeuuJ3MCWxadwh6vhw0MpLSCEyYsKJ5z9GSB1NEl Voqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b49/gyL3nhPHdkIknNEuvRr52AV4Z59e2KtiOdvbnJc=; b=XSDO1GRMMAmdJ+wRaSjlEF+rM2GRNh5BbLQN7T7jI5iO1f0DWfQmyXUGWtAiAbV/DP GDMqw3H8TrhT3Y8KbvPx0rmK84w0CaS2nx+8y19iN56r1mEWJ0j+AQYhiUsoi2Mnys9F zSRUCs3tQvun20SOOaN9yw1RJvHTwXkpfe9JujYbVE+ENBAWdyPBHoX0jqY/Jhdc6cn7 JKChg8mtkcDO7God/hKu/GFRqPh5rt42m8A7bRdkhyXBUDB5K9y1uZPEHlMmbI+5tnNM b0NkUND7IFfZdztgm8sPXv7OBACOn+Ji6h2FiYF/ZGlVMPuhHzL1Ikh6113B/c6yaY/d LtMQ== X-Gm-Message-State: AOAM533I8OsWgUxhhjUVxTtwKehCLyByrGQ4O2ldRVqM+y2QHBkSJbYb jwW1TPD0IKzhQcsI+AEq8cE/m5nzlRsW7zDq X-Google-Smtp-Source: ABdhPJzhF2kr/AgUAVeBeqvMlOGMLVzdu6iboPO64EJ4G5R1ZFdaI9XNBQaN35NuJeN/R9qGQHUOKg== X-Received: by 2002:a4a:bb91:0:b0:321:1c31:ae98 with SMTP id h17-20020a4abb91000000b003211c31ae98mr5700087oop.48.1648301158681; Sat, 26 Mar 2022 06:25:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 8/8] tests/tcg/nios2: Re-enable linux-user tests Date: Sat, 26 Mar 2022 07:25:03 -0600 Message-Id: <20220326132534.543738-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::c29 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::c29; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc29.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Peter Maydell , alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648302427401100001 Content-Type: text/plain; charset="utf-8" Now that signal handling has been fixed, re-enable tests. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- tests/tcg/nios2/Makefile.target | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 tests/tcg/nios2/Makefile.target diff --git a/tests/tcg/nios2/Makefile.target b/tests/tcg/nios2/Makefile.tar= get deleted file mode 100644 index b38e2352b7..0000000000 --- a/tests/tcg/nios2/Makefile.target +++ /dev/null @@ -1,11 +0,0 @@ -# nios2 specific test tweaks - -# Currently nios2 signal handling is broken -run-signals: signals - $(call skip-test, $<, "BROKEN") -run-plugin-signals-with-%: - $(call skip-test, $<, "BROKEN") -run-linux-test: linux-test - $(call skip-test, $<, "BROKEN") -run-plugin-linux-test-with-%: - $(call skip-test, $<, "BROKEN") --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648302837; cv=none; d=zohomail.com; s=zohoarc; b=hQY2ZcrjWDwxUkfDWau9smscChNWqQDgwXrkE/9YkIlLgDxvbZJdzcG8/AaJ+FhX89m5sIFQlrB28fTiRbpnstTMO9XjgBHoPDsmi5ufqGNdJ64/e8rifFfaLNQHaHFxkildc1NMgD0y+rM4ccUVAq5IqAMt78Pgdgu8xznDIPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648302837; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iK8lqn1SAGzUB+I8J8nn0GkTbUc6hKanTx9K30kUSGw=; b=YoQYfuFc6RKK1d/Wrmf2X5dtROjP7mUdtm1z1dSBU6SXc9NFnnojVI3//I8cA2ufb9ZexICh/Zaqn0mmyNeHaeB4BXw6umrmmpUJ/YhLPi2yrxpBwGf5hEQUNpIoP/9Fhe6nd1b6DnPGz55OrAJH/8XAAg0ckOPVaCA+KElbO2Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164830283760993.51601132792177; Sat, 26 Mar 2022 06:53:57 -0700 (PDT) Received: from localhost ([::1]:60510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6rc-0002SH-49 for importer@patchew.org; Sat, 26 Mar 2022 09:53:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qd-0007MM-Hw for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:05 -0400 Received: from [2607:f8b0:4864:20::c2e] (port=36768 helo=mail-oo1-xc2e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qb-0005NT-6T for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:03 -0400 Received: by mail-oo1-xc2e.google.com with SMTP id s1-20020a05682003c100b00324b888f165so1708798ooj.3 for ; Sat, 26 Mar 2022 06:26:00 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iK8lqn1SAGzUB+I8J8nn0GkTbUc6hKanTx9K30kUSGw=; b=sD/p6eZnoI/30jrjNN1tNlQRQ4BwyzrqSVa/JGRsWFPW4xwSS8T7A4I/Mr1MldClBF RcOlZSVHmI//Bpqu+iYiscmRxTlF4j/VBYSt4Nrm74QzV6Rht+MpUo/EnA/8/2jYNVTp x1Oj3bUr7ZIIHNLZle8b1VpmUZDWk6NntSCNnlFv6Q8FrTX3dKeJakmKZMUcE/xrqGQD jru0m1+phXWda+TZGGVGxewDYBFV6qoX6PHuw7ZZNR1MnhepXFZGfkdyidqZ1Qa0rC1P Uy5+6Y5qxueiIAHE58t1YHRW9ZJ9nMabPttKG9Dv1tvs7tOzMxst46I2WALP+HA7xreO e6mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iK8lqn1SAGzUB+I8J8nn0GkTbUc6hKanTx9K30kUSGw=; b=euPuu83j4lPaAKqg2/G3osmTfho4CCRcyEhmLMYhFNTunvafI9vVT2M3TUSNrH9lse /dIoCn5bRJJBrR6zwryD8h+wtI4+P9LnWSqIuvQ7scg8LSf0W/oCkDbcLn2hUtMfunTI xxNyDmtgcAq0UTke3fJfIjS16tzbdTNZRi1b3eOyTcVVmTFliA5UQPXlkuYnaSndD47Z 1YBVpoX+QwkvnZQ2dlsqXPCSfEeKV9RCL2jOxR05mNHSZXJgY2KCjDapTf1vOtIkKAh7 RLGs3KFRbhHGo7Tvt/Lhwd9oPRgHp0oGTjtfgwI3qXAd0OFhFAE5alW+iR5kcPGnW4XT oopQ== X-Gm-Message-State: AOAM532aBHC3AnIeKONaKTLx0mhXCzFDFbDqGuZ4GZWzXF9r3QzFPGBi DIdvnIJ7KEBzN28yn7EoFNJ/S+2iTijQtLEI X-Google-Smtp-Source: ABdhPJzANQJywO4Hmxm8Fri5vPgYcOgQYayqY71XYNiWYgGE8I5MZ8BxU1vROH56Im/ot0MklnbaAg== X-Received: by 2002:a4a:b343:0:b0:324:512e:e340 with SMTP id n3-20020a4ab343000000b00324512ee340mr5741745ooo.59.1648301160056; Sat, 26 Mar 2022 06:26:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 09/39] *: Use fprintf between qemu_log_trylock/unlock Date: Sat, 26 Mar 2022 07:25:04 -0600 Message-Id: <20220326132534.543738-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::c2e (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::c2e; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc2e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648302838608100001 Content-Type: text/plain; charset="utf-8" Inside qemu_log, we perform qemu_log_trylock/unlock, which need not be done if we have already performed the lock beforehand. Always check the result of qemu_log_trylock -- only checking qemu_loglevel_mask races with the acquisition of the lock on the logfile. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- include/exec/log.h | 2 +- accel/tcg/cpu-exec.c | 16 ++--- accel/tcg/translate-all.c | 117 +++++++++++++++++++----------------- accel/tcg/translator.c | 10 +-- cpu.c | 14 +++-- hw/net/can/can_sja1000.c | 24 ++++---- net/can/can_socketcan.c | 23 ++++--- target/i386/tcg/translate.c | 14 +++-- tcg/tcg.c | 74 +++++++++++++---------- 9 files changed, 162 insertions(+), 132 deletions(-) diff --git a/include/exec/log.h b/include/exec/log.h index fb595d1eb7..648f4d2263 100644 --- a/include/exec/log.h +++ b/include/exec/log.h @@ -73,7 +73,7 @@ static inline void log_page_dump(const char *operation) { FILE *logfile =3D qemu_log_trylock(); if (logfile) { - qemu_log("page layout changed following %s\n", operation); + fprintf(logfile, "page layout changed following %s\n", operation); page_dump(logfile); } qemu_log_unlock(logfile); diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 8d0315de75..8a896e772d 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -216,16 +216,18 @@ static inline void log_cpu_exec(target_ulong pc, CPUS= tate *cpu, #if defined(DEBUG_DISAS) if (qemu_loglevel_mask(CPU_LOG_TB_CPU)) { FILE *logfile =3D qemu_log_trylock(); - int flags =3D 0; + if (logfile) { + int flags =3D 0; =20 - if (qemu_loglevel_mask(CPU_LOG_TB_FPU)) { - flags |=3D CPU_DUMP_FPU; - } + if (qemu_loglevel_mask(CPU_LOG_TB_FPU)) { + flags |=3D CPU_DUMP_FPU; + } #if defined(TARGET_I386) - flags |=3D CPU_DUMP_CCOP; + flags |=3D CPU_DUMP_CCOP; #endif - log_cpu_state(cpu, flags); - qemu_log_unlock(logfile); + log_cpu_state(cpu, flags); + qemu_log_unlock(logfile); + } } #endif /* DEBUG_DISAS */ } diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 71ab863c18..4812619f00 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1529,68 +1529,75 @@ TranslationBlock *tb_gen_code(CPUState *cpu, if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM) && qemu_log_in_addr_range(tb->pc)) { FILE *logfile =3D qemu_log_trylock(); - int code_size, data_size; - const tcg_target_ulong *rx_data_gen_ptr; - size_t chunk_start; - int insn =3D 0; + if (logfile) { + int code_size, data_size; + const tcg_target_ulong *rx_data_gen_ptr; + size_t chunk_start; + int insn =3D 0; =20 - if (tcg_ctx->data_gen_ptr) { - rx_data_gen_ptr =3D tcg_splitwx_to_rx(tcg_ctx->data_gen_ptr); - code_size =3D (const void *)rx_data_gen_ptr - tb->tc.ptr; - data_size =3D gen_code_size - code_size; - } else { - rx_data_gen_ptr =3D 0; - code_size =3D gen_code_size; - data_size =3D 0; - } - - /* Dump header and the first instruction */ - qemu_log("OUT: [size=3D%d]\n", gen_code_size); - qemu_log(" -- guest addr 0x" TARGET_FMT_lx " + tb prologue\n", - tcg_ctx->gen_insn_data[insn][0]); - chunk_start =3D tcg_ctx->gen_insn_end_off[insn]; - log_disas(tb->tc.ptr, chunk_start); - - /* - * Dump each instruction chunk, wrapping up empty chunks into - * the next instruction. The whole array is offset so the - * first entry is the beginning of the 2nd instruction. - */ - while (insn < tb->icount) { - size_t chunk_end =3D tcg_ctx->gen_insn_end_off[insn]; - if (chunk_end > chunk_start) { - qemu_log(" -- guest addr 0x" TARGET_FMT_lx "\n", - tcg_ctx->gen_insn_data[insn][0]); - log_disas(tb->tc.ptr + chunk_start, chunk_end - chunk_star= t); - chunk_start =3D chunk_end; + if (tcg_ctx->data_gen_ptr) { + rx_data_gen_ptr =3D tcg_splitwx_to_rx(tcg_ctx->data_gen_pt= r); + code_size =3D (const void *)rx_data_gen_ptr - tb->tc.ptr; + data_size =3D gen_code_size - code_size; + } else { + rx_data_gen_ptr =3D 0; + code_size =3D gen_code_size; + data_size =3D 0; } - insn++; - } =20 - if (chunk_start < code_size) { - qemu_log(" -- tb slow paths + alignment\n"); - log_disas(tb->tc.ptr + chunk_start, code_size - chunk_start); - } + /* Dump header and the first instruction */ + fprintf(logfile, "OUT: [size=3D%d]\n", gen_code_size); + fprintf(logfile, + " -- guest addr 0x" TARGET_FMT_lx " + tb prologue\n", + tcg_ctx->gen_insn_data[insn][0]); + chunk_start =3D tcg_ctx->gen_insn_end_off[insn]; + disas(logfile, tb->tc.ptr, chunk_start); =20 - /* Finally dump any data we may have after the block */ - if (data_size) { - int i; - qemu_log(" data: [size=3D%d]\n", data_size); - for (i =3D 0; i < data_size / sizeof(tcg_target_ulong); i++) { - if (sizeof(tcg_target_ulong) =3D=3D 8) { - qemu_log("0x%08" PRIxPTR ": .quad 0x%016" TCG_PRIlx = "\n", - (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_p= tr[i]); - } else if (sizeof(tcg_target_ulong) =3D=3D 4) { - qemu_log("0x%08" PRIxPTR ": .long 0x%08" TCG_PRIlx "= \n", - (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_p= tr[i]); - } else { - qemu_build_not_reached(); + /* + * Dump each instruction chunk, wrapping up empty chunks into + * the next instruction. The whole array is offset so the + * first entry is the beginning of the 2nd instruction. + */ + while (insn < tb->icount) { + size_t chunk_end =3D tcg_ctx->gen_insn_end_off[insn]; + if (chunk_end > chunk_start) { + fprintf(logfile, " -- guest addr 0x" TARGET_FMT_lx "\= n", + tcg_ctx->gen_insn_data[insn][0]); + disas(logfile, tb->tc.ptr + chunk_start, + chunk_end - chunk_start); + chunk_start =3D chunk_end; + } + insn++; + } + + if (chunk_start < code_size) { + fprintf(logfile, " -- tb slow paths + alignment\n"); + disas(logfile, tb->tc.ptr + chunk_start, + code_size - chunk_start); + } + + /* Finally dump any data we may have after the block */ + if (data_size) { + int i; + fprintf(logfile, " data: [size=3D%d]\n", data_size); + for (i =3D 0; i < data_size / sizeof(tcg_target_ulong); i+= +) { + if (sizeof(tcg_target_ulong) =3D=3D 8) { + fprintf(logfile, + "0x%08" PRIxPTR ": .quad 0x%016" TCG_PRI= lx "\n", + (uintptr_t)&rx_data_gen_ptr[i], rx_data_ge= n_ptr[i]); + } else if (sizeof(tcg_target_ulong) =3D=3D 4) { + fprintf(logfile, + "0x%08" PRIxPTR ": .long 0x%08" TCG_PRIl= x "\n", + (uintptr_t)&rx_data_gen_ptr[i], rx_data_ge= n_ptr[i]); + } else { + qemu_build_not_reached(); + } } } + fprintf(logfile, "\n"); + qemu_log_flush(); + qemu_log_unlock(logfile); } - qemu_log("\n"); - qemu_log_flush(); - qemu_log_unlock(logfile); } #endif =20 diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 1506755f3c..af8798f98b 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -140,10 +140,12 @@ void translator_loop(const TranslatorOps *ops, DisasC= ontextBase *db, if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) && qemu_log_in_addr_range(db->pc_first)) { FILE *logfile =3D qemu_log_trylock(); - qemu_log("----------------\n"); - ops->disas_log(db, cpu); - qemu_log("\n"); - qemu_log_unlock(logfile); + if (logfile) { + fprintf(logfile, "----------------\n"); + ops->disas_log(db, cpu); + fprintf(logfile, "\n"); + qemu_log_unlock(logfile); + } } #endif } diff --git a/cpu.c b/cpu.c index ddcbfc724d..3340bb7538 100644 --- a/cpu.c +++ b/cpu.c @@ -401,12 +401,14 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) cpu_dump_state(cpu, stderr, CPU_DUMP_FPU | CPU_DUMP_CCOP); if (qemu_log_separate()) { FILE *logfile =3D qemu_log_trylock(); - qemu_log("qemu: fatal: "); - qemu_log_vprintf(fmt, ap2); - qemu_log("\n"); - log_cpu_state(cpu, CPU_DUMP_FPU | CPU_DUMP_CCOP); - qemu_log_flush(); - qemu_log_unlock(logfile); + if (logfile) { + fprintf(logfile, "qemu: fatal: "); + vfprintf(logfile, fmt, ap2); + fprintf(logfile, "\n"); + cpu_dump_state(cpu, logfile, CPU_DUMP_FPU | CPU_DUMP_CCOP); + qemu_log_flush(); + qemu_log_unlock(logfile); + } qemu_log_close(); } va_end(ap2); diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c index 300313dfb8..23d634af6f 100644 --- a/hw/net/can/can_sja1000.c +++ b/hw/net/can/can_sja1000.c @@ -249,19 +249,21 @@ static void can_display_msg(const char *prefix, const= qemu_can_frame *msg) int i; FILE *logfile =3D qemu_log_trylock(); =20 - qemu_log("%s%03X [%01d] %s %s", - prefix, - msg->can_id & QEMU_CAN_EFF_MASK, - msg->can_dlc, - msg->can_id & QEMU_CAN_EFF_FLAG ? "EFF" : "SFF", - msg->can_id & QEMU_CAN_RTR_FLAG ? "RTR" : "DAT"); + if (logfile) { + fprintf(logfile, "%s%03X [%01d] %s %s", + prefix, + msg->can_id & QEMU_CAN_EFF_MASK, + msg->can_dlc, + msg->can_id & QEMU_CAN_EFF_FLAG ? "EFF" : "SFF", + msg->can_id & QEMU_CAN_RTR_FLAG ? "RTR" : "DAT"); =20 - for (i =3D 0; i < msg->can_dlc; i++) { - qemu_log(" %02X", msg->data[i]); + for (i =3D 0; i < msg->can_dlc; i++) { + fprintf(logfile, " %02X", msg->data[i]); + } + fprintf(logfile, "\n"); + qemu_log_flush(); + qemu_log_unlock(logfile); } - qemu_log("\n"); - qemu_log_flush(); - qemu_log_unlock(logfile); } =20 static void buff2frame_pel(const uint8_t *buff, qemu_can_frame *frame) diff --git a/net/can/can_socketcan.c b/net/can/can_socketcan.c index 4a505643e9..a6388563c3 100644 --- a/net/can/can_socketcan.c +++ b/net/can/can_socketcan.c @@ -77,18 +77,21 @@ static void can_host_socketcan_display_msg(struct qemu_= can_frame *msg) { int i; FILE *logfile =3D qemu_log_trylock(); - qemu_log("[cansocketcan]: %03X [%01d] %s %s", - msg->can_id & QEMU_CAN_EFF_MASK, - msg->can_dlc, - msg->can_id & QEMU_CAN_EFF_FLAG ? "EFF" : "SFF", - msg->can_id & QEMU_CAN_RTR_FLAG ? "RTR" : "DAT"); =20 - for (i =3D 0; i < msg->can_dlc; i++) { - qemu_log(" %02X", msg->data[i]); + if (logfile) { + fprintf(logfile, "[cansocketcan]: %03X [%01d] %s %s", + msg->can_id & QEMU_CAN_EFF_MASK, + msg->can_dlc, + msg->can_id & QEMU_CAN_EFF_FLAG ? "EFF" : "SFF", + msg->can_id & QEMU_CAN_RTR_FLAG ? "RTR" : "DAT"); + + for (i =3D 0; i < msg->can_dlc; i++) { + fprintf(logfile, " %02X", msg->data[i]); + } + fprintf(logfile, "\n"); + qemu_log_flush(); + qemu_log_unlock(logfile); } - qemu_log("\n"); - qemu_log_flush(); - qemu_log_unlock(logfile); } =20 static void can_host_socketcan_read(void *opaque) diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 3fb8b530d8..d71bd2b0f4 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2581,14 +2581,16 @@ static void gen_unknown_opcode(CPUX86State *env, Di= sasContext *s) =20 if (qemu_loglevel_mask(LOG_UNIMP)) { FILE *logfile =3D qemu_log_trylock(); - target_ulong pc =3D s->pc_start, end =3D s->pc; + if (logfile) { + target_ulong pc =3D s->pc_start, end =3D s->pc; =20 - qemu_log("ILLOPC: " TARGET_FMT_lx ":", pc); - for (; pc < end; ++pc) { - qemu_log(" %02x", cpu_ldub_code(env, pc)); + fprintf(logfile, "ILLOPC: " TARGET_FMT_lx ":", pc); + for (; pc < end; ++pc) { + fprintf(logfile, " %02x", cpu_ldub_code(env, pc)); + } + fprintf(logfile, "\n"); + qemu_log_unlock(logfile); } - qemu_log("\n"); - qemu_log_unlock(logfile); } } =20 diff --git a/tcg/tcg.c b/tcg/tcg.c index 2f09114bf9..892f640fce 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -757,31 +757,35 @@ void tcg_prologue_init(TCGContext *s) #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM)) { FILE *logfile =3D qemu_log_trylock(); - qemu_log("PROLOGUE: [size=3D%zu]\n", prologue_size); - if (s->data_gen_ptr) { - size_t code_size =3D s->data_gen_ptr - s->code_gen_ptr; - size_t data_size =3D prologue_size - code_size; - size_t i; + if (logfile) { + fprintf(logfile, "PROLOGUE: [size=3D%zu]\n", prologue_size); + if (s->data_gen_ptr) { + size_t code_size =3D s->data_gen_ptr - s->code_gen_ptr; + size_t data_size =3D prologue_size - code_size; + size_t i; =20 - log_disas(s->code_gen_ptr, code_size); + disas(logfile, s->code_gen_ptr, code_size); =20 - for (i =3D 0; i < data_size; i +=3D sizeof(tcg_target_ulong)) { - if (sizeof(tcg_target_ulong) =3D=3D 8) { - qemu_log("0x%08" PRIxPTR ": .quad 0x%016" PRIx64 "\n= ", - (uintptr_t)s->data_gen_ptr + i, - *(uint64_t *)(s->data_gen_ptr + i)); - } else { - qemu_log("0x%08" PRIxPTR ": .long 0x%08x\n", - (uintptr_t)s->data_gen_ptr + i, - *(uint32_t *)(s->data_gen_ptr + i)); + for (i =3D 0; i < data_size; i +=3D sizeof(tcg_target_ulon= g)) { + if (sizeof(tcg_target_ulong) =3D=3D 8) { + fprintf(logfile, + "0x%08" PRIxPTR ": .quad 0x%016" PRIx64 = "\n", + (uintptr_t)s->data_gen_ptr + i, + *(uint64_t *)(s->data_gen_ptr + i)); + } else { + fprintf(logfile, + "0x%08" PRIxPTR ": .long 0x%08x\n", + (uintptr_t)s->data_gen_ptr + i, + *(uint32_t *)(s->data_gen_ptr + i)); + } } + } else { + disas(logfile, s->code_gen_ptr, prologue_size); } - } else { - log_disas(s->code_gen_ptr, prologue_size); + fprintf(logfile, "\n"); + qemu_log_flush(); + qemu_log_unlock(logfile); } - qemu_log("\n"); - qemu_log_flush(); - qemu_log_unlock(logfile); } #endif =20 @@ -4201,10 +4205,12 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *t= b) if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP) && qemu_log_in_addr_range(tb->pc))) { FILE *logfile =3D qemu_log_trylock(); - qemu_log("OP:\n"); - tcg_dump_ops(s, false); - qemu_log("\n"); - qemu_log_unlock(logfile); + if (logfile) { + fprintf(logfile, "OP:\n"); + tcg_dump_ops(s, false); + fprintf(logfile, "\n"); + qemu_log_unlock(logfile); + } } #endif =20 @@ -4246,10 +4252,12 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *t= b) if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP_IND) && qemu_log_in_addr_range(tb->pc))) { FILE *logfile =3D qemu_log_trylock(); - qemu_log("OP before indirect lowering:\n"); - tcg_dump_ops(s, false); - qemu_log("\n"); - qemu_log_unlock(logfile); + if (logfile) { + fprintf(logfile, "OP before indirect lowering:\n"); + tcg_dump_ops(s, false); + fprintf(logfile, "\n"); + qemu_log_unlock(logfile); + } } #endif /* Replace indirect temps with direct temps. */ @@ -4267,10 +4275,12 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *t= b) if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP_OPT) && qemu_log_in_addr_range(tb->pc))) { FILE *logfile =3D qemu_log_trylock(); - qemu_log("OP after optimization and liveness analysis:\n"); - tcg_dump_ops(s, true); - qemu_log("\n"); - qemu_log_unlock(logfile); + if (logfile) { + fprintf(logfile, "OP after optimization and liveness analysis:= \n"); + tcg_dump_ops(s, true); + fprintf(logfile, "\n"); + qemu_log_unlock(logfile); + } } #endif =20 --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648302255; cv=none; d=zohomail.com; s=zohoarc; b=jAdpr/m8x1u1LY9wccuWAZRlEVTI4luSNs7Te+A2jdZanrwTdqf2uADdW5Vr3hjR9lqo9rnXZlXkIiv6N8JD4+YnlURBpGqgz4IOT4jnv3TKI7GkZdQg8q9eaDWqgb7nTznW+IzkFmyMaByzLSvtx3+5G/BXv7s6myEElpwvL+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648302255; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KQ2Hs1fcPO+xNkXsj5Tr5G1f8x8slUJxiO5yDeUu3l4=; b=RJJp6Syf35CmPF1ECJKt1/gXnVMyFcSerxgdfe5mMqutZwE9RGjH+/p/E6cv/uQWlM8/ebpH52+K5Ve468PyYMSJqKcm4J/TUZwSpi7ix0MSgIYIn6XKjix/HY+EsuV6Fe8dUyIIkTuydyIcVGD7T/U/xtTZqHBetlspnFWuCe4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648302255439671.4825965176393; Sat, 26 Mar 2022 06:44:15 -0700 (PDT) Received: from localhost ([::1]:47198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6iA-0001cf-Dl for importer@patchew.org; Sat, 26 Mar 2022 09:44:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qe-0007Me-24 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:05 -0400 Received: from [2607:f8b0:4864:20::c2a] (port=38733 helo=mail-oo1-xc2a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qc-0005Ni-Lf for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:03 -0400 Received: by mail-oo1-xc2a.google.com with SMTP id v19-20020a056820101300b0032488bb70f5so1783278oor.5 for ; Sat, 26 Mar 2022 06:26:02 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KQ2Hs1fcPO+xNkXsj5Tr5G1f8x8slUJxiO5yDeUu3l4=; b=ofby79uCP/bmBC59WvrK2z2MWJPkO4+HYsTugTZVeQXakzc6dlyN+d0MskEFFpew5N RHVIH1dASecnf7PPF27jGOf7DEzlIW6VADNCfqrL8CQZ4sTivhjD/rHH08K0K4aRm7JL n9ckgS7Mn3MqNxI86K3f1omVT9FyjApjo3ACsPNU3B9c06U9xcf5vO/Vqos8W7/ckneN EqFveCIF4X8SQ831L8CcSdKLrEfsXHIPEgAJRQhzgySgt91i6tG2CQsz32itnvZCo2w1 CUZbJsHXLhJ4XoxQzdrk6ZFIyXfwQcx6RqRuWG5DFFco9MqrUTzLCXeQAcsr+1CirwGf ZQEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KQ2Hs1fcPO+xNkXsj5Tr5G1f8x8slUJxiO5yDeUu3l4=; b=PXC24XqsDFzGsLBNZ/JutSXBgRG9Q6AzVyWelkOxaZIJkdM2tTmx4Rnrn1VJsOnDQ2 FHFQTN+6+JiN/ANIBZ8hHnO66Qr6SYdtXItU9OGp2v8UGteRuYz/NjMrf3TzUh57mB0L P2dzODLjPOwctdKAVoyYwhJK9420mMCmyGMOmJBTS1lN7tkxp6OozZYsFEh/oXy/ZqXf qTjd/IJKhwfbJJIhD7TQqY0l3Cb4cawBVwxNcy336TOYiGj5M+jFIxvGn5ZG3wu9duCP hYf6lw1jncoHXn5+SWBxhPZPjfe6Pte8B1t6ateSOOfECSyYY4PvSEgfSRMv05ACdz4a H0qg== X-Gm-Message-State: AOAM531FHSTyntbP7/3FBdwV4J7tyhvmIEfevMpQd+n2y+vQRqzlAAIG 4mNtV8b/XpVz+JrmUVsIzMh2KpOjT8nlanAL X-Google-Smtp-Source: ABdhPJx37KXKPbZvJMgvtcbPOdWd+U9MXJ82DXEIL/kMYplIr3zBBDnR+mn//93+XlYmKZj9MHBL1Q== X-Received: by 2002:a05:6820:350:b0:320:be2b:4fb8 with SMTP id m16-20020a056820035000b00320be2b4fb8mr5719283ooe.2.1648301161579; Sat, 26 Mar 2022 06:26:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 10/39] util/log: Remove qemu_log_vprintf Date: Sat, 26 Mar 2022 07:25:05 -0600 Message-Id: <20220326132534.543738-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::c2a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::c2a; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc2a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648302256402100001 This function is no longer used. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- include/qemu/log.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index d090faf22a..2d9455dc85 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -72,21 +72,6 @@ void qemu_log_unlock(FILE *fd); =20 /* Logging functions: */ =20 -/* vfprintf-like logging function - */ -static inline void G_GNUC_PRINTF(1, 0) -qemu_log_vprintf(const char *fmt, va_list va) -{ - QemuLogFile *logfile; - - rcu_read_lock(); - logfile =3D qatomic_rcu_read(&qemu_logfile); - if (logfile) { - vfprintf(logfile->fd, fmt, va); - } - rcu_read_unlock(); -} - /* log only if a bit is set on the current loglevel mask: * @mask: bit to check in the mask * @fmt: printf-style format string --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648302651; cv=none; d=zohomail.com; s=zohoarc; b=NiLDjCBGJ2JiXGiJ4+kJ/NO/UlxRudqw4KAUJUKtgFU39OF+yHuD8Stj6I61f6rpGqHhOp1r6abx7s49m06pDYzPno9iS0C5x87L83rQDvV1XeGmazux9rq+8qNH+2I4aMYgRYozfPTuuOLlcWnlvGX9hj/bVGKqvRX+r9NceCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648302651; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NkGsSfn2WSH+h/mnqwQgaV+ZVNnbzH10Q2LstATJxHc=; b=OXaDcXMEJyO8zwuCVunIWmbBTYoqi229fvCmp/Z99/OXXPX+sKEJagks8nwqt9Lx3jcW5QrRR0YeBJmFdPJzSN8P0ibabqCrEX4fsNSFw1UC2m7QvvakS4UKG8v70d0zT2G/tl+ZYeEfvZuRTDSVU1YfoWeOhCHrjxjziaKLCpU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648302651670788.2648558085333; Sat, 26 Mar 2022 06:50:51 -0700 (PDT) Received: from localhost ([::1]:55808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6oc-0007W8-C4 for importer@patchew.org; Sat, 26 Mar 2022 09:50:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qm-0007U0-QT for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:20 -0400 Received: from [2607:f8b0:4864:20::335] (port=34638 helo=mail-ot1-x335.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qe-0005Nw-2S for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:05 -0400 Received: by mail-ot1-x335.google.com with SMTP id n19-20020a9d7113000000b005cd9cff76c3so7470058otj.1 for ; Sat, 26 Mar 2022 06:26:03 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NkGsSfn2WSH+h/mnqwQgaV+ZVNnbzH10Q2LstATJxHc=; b=ZKGzLeY7Qs1k4/RCASRlXIPZvqt/2exaMzA0Wv95BYMxOHLz2V0Xtn2zea20IfFuKI yCzGzecQV74pvDbP/jLhmGhPnXypBclIZznvv12N3IGAj6w6yO4v09682l5YTYeFHpmN qYrf+33blP9c2TrlZit2SCDC7zYq05GsqKdBSpIYKqZlFfMivcRr2BAdowCR2mwioUGj P7/Tt+acap9X5j4o+xJRJCQVIjfhuGolFkvaXZiuxBKKgeULohhDewA9qasUQvqjC4q0 H3iStPF+ga86UCfWEKAEjX7z9GFG7EPpQI8jzLhIsmxOk7v9B3lG5Qd2nl40dNOIz2LY eQMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NkGsSfn2WSH+h/mnqwQgaV+ZVNnbzH10Q2LstATJxHc=; b=IYPdEyNRqudOzvrL3a12GYySGnhSpxXC2wJQDlbjEGuK/2yOdjDS6CwUeHuytAob4J UtRPHNAn9FX0YIVEOcJjMOnikbA000/8WL4FfuTeSQ9QFbD3MWYxNez/uACBlzN5Hpyr JSTnMBixJFlfbcuSTolbfD3F+wnueQyXizPtSgRblnIBjxzbu77hHmjeFPRl5BVhjLIW gA0zzOwtVyjOY0vwuHk/olbX1smcu4LXpugmki5Qc7FIVKQExNrsXUSWI+XGnqHqD8A2 ZfzQDODk8P0nJcvXt6ccWf7xhXS4lAtJ6umZ64Zemh594LkoXrLRb9MXH28gF1+wXmtp du+Q== X-Gm-Message-State: AOAM530GWNSv4312IOmHEvH0BQDrIfkdtGOT6oOxaFarcBbJF9K9h+pl UMGJKQH9c/vinNvRGYT2IngvBV4C68Ox/coC X-Google-Smtp-Source: ABdhPJz1YO3PF5EhaIJTSqDzuneUZqy3+2rxjToQl58zbSj5xd63Pw4Qsx1ItIJJnIQnV6rmD/E32g== X-Received: by 2002:a05:6830:14d3:b0:5b2:49d9:17b6 with SMTP id t19-20020a05683014d300b005b249d917b6mr6243703otq.321.1648301162910; Sat, 26 Mar 2022 06:26:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 11/39] tcg: Pass the locked filepointer to tcg_dump_ops Date: Sat, 26 Mar 2022 07:25:06 -0600 Message-Id: <20220326132534.543738-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::335 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::335; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x335.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648302653001100001 Content-Type: text/plain; charset="utf-8" We have already looked up and locked the filepointer. Use fprintf instead of qemu_log directly for output in and around tcg_dump_ops. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- tcg/tcg.c | 109 ++++++++++++++++++++++++++---------------------------- 1 file changed, 52 insertions(+), 57 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 892f640fce..25e987d881 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1808,7 +1808,11 @@ static inline TCGReg tcg_regset_first(TCGRegSet d) } } =20 -static void tcg_dump_ops(TCGContext *s, bool have_prefs) +/* Return only the number of characters output -- no error return. */ +#define ne_fprintf(...) \ + ({ int ret_ =3D fprintf(__VA_ARGS__); ret_ >=3D 0 ? ret_ : 0; }) + +static void tcg_dump_ops(TCGContext *s, FILE *f, bool have_prefs) { char buf[128]; TCGOp *op; @@ -1824,7 +1828,7 @@ static void tcg_dump_ops(TCGContext *s, bool have_pre= fs) =20 if (c =3D=3D INDEX_op_insn_start) { nb_oargs =3D 0; - col +=3D qemu_log("\n ----"); + col +=3D ne_fprintf(f, "\n ----"); =20 for (i =3D 0; i < TARGET_INSN_START_WORDS; ++i) { target_ulong a; @@ -1833,7 +1837,7 @@ static void tcg_dump_ops(TCGContext *s, bool have_pre= fs) #else a =3D op->args[i]; #endif - col +=3D qemu_log(" " TARGET_FMT_lx, a); + col +=3D ne_fprintf(f, " " TARGET_FMT_lx, a); } } else if (c =3D=3D INDEX_op_call) { const TCGHelperInfo *info =3D tcg_call_info(op); @@ -1844,7 +1848,7 @@ static void tcg_dump_ops(TCGContext *s, bool have_pre= fs) nb_iargs =3D TCGOP_CALLI(op); nb_cargs =3D def->nb_cargs; =20 - col +=3D qemu_log(" %s ", def->name); + col +=3D ne_fprintf(f, " %s ", def->name); =20 /* * Print the function name from TCGHelperInfo, if available. @@ -1852,15 +1856,15 @@ static void tcg_dump_ops(TCGContext *s, bool have_p= refs) * but the actual function pointer comes from the plugin. */ if (func =3D=3D info->func) { - col +=3D qemu_log("%s", info->name); + col +=3D ne_fprintf(f, "%s", info->name); } else { - col +=3D qemu_log("plugin(%p)", func); + col +=3D ne_fprintf(f, "plugin(%p)", func); } =20 - col +=3D qemu_log(",$0x%x,$%d", info->flags, nb_oargs); + col +=3D ne_fprintf(f, ",$0x%x,$%d", info->flags, nb_oargs); for (i =3D 0; i < nb_oargs; i++) { - col +=3D qemu_log(",%s", tcg_get_arg_str(s, buf, sizeof(bu= f), - op->args[i])); + col +=3D ne_fprintf(f, ",%s", tcg_get_arg_str(s, buf, size= of(buf), + op->args[i])); } for (i =3D 0; i < nb_iargs; i++) { TCGArg arg =3D op->args[nb_oargs + i]; @@ -1868,34 +1872,32 @@ static void tcg_dump_ops(TCGContext *s, bool have_p= refs) if (arg !=3D TCG_CALL_DUMMY_ARG) { t =3D tcg_get_arg_str(s, buf, sizeof(buf), arg); } - col +=3D qemu_log(",%s", t); + col +=3D ne_fprintf(f, ",%s", t); } } else { - col +=3D qemu_log(" %s ", def->name); + col +=3D ne_fprintf(f, " %s ", def->name); =20 nb_oargs =3D def->nb_oargs; nb_iargs =3D def->nb_iargs; nb_cargs =3D def->nb_cargs; =20 if (def->flags & TCG_OPF_VECTOR) { - col +=3D qemu_log("v%d,e%d,", 64 << TCGOP_VECL(op), - 8 << TCGOP_VECE(op)); + col +=3D ne_fprintf(f, "v%d,e%d,", 64 << TCGOP_VECL(op), + 8 << TCGOP_VECE(op)); } =20 k =3D 0; for (i =3D 0; i < nb_oargs; i++) { - if (k !=3D 0) { - col +=3D qemu_log(","); - } - col +=3D qemu_log("%s", tcg_get_arg_str(s, buf, sizeof(buf= ), - op->args[k++])); + const char *sep =3D k ? "," : ""; + col +=3D ne_fprintf(f, "%s%s", sep, + tcg_get_arg_str(s, buf, sizeof(buf), + op->args[k++])); } for (i =3D 0; i < nb_iargs; i++) { - if (k !=3D 0) { - col +=3D qemu_log(","); - } - col +=3D qemu_log("%s", tcg_get_arg_str(s, buf, sizeof(buf= ), - op->args[k++])); + const char *sep =3D k ? "," : ""; + col +=3D ne_fprintf(f, "%s%s", sep, + tcg_get_arg_str(s, buf, sizeof(buf), + op->args[k++])); } switch (c) { case INDEX_op_brcond_i32: @@ -1910,9 +1912,9 @@ static void tcg_dump_ops(TCGContext *s, bool have_pre= fs) case INDEX_op_cmpsel_vec: if (op->args[k] < ARRAY_SIZE(cond_name) && cond_name[op->args[k]]) { - col +=3D qemu_log(",%s", cond_name[op->args[k++]]); + col +=3D ne_fprintf(f, ",%s", cond_name[op->args[k++]]= ); } else { - col +=3D qemu_log(",$0x%" TCG_PRIlx, op->args[k++]); + col +=3D ne_fprintf(f, ",$0x%" TCG_PRIlx, op->args[k++= ]); } i =3D 1; break; @@ -1927,12 +1929,12 @@ static void tcg_dump_ops(TCGContext *s, bool have_p= refs) unsigned ix =3D get_mmuidx(oi); =20 if (op & ~(MO_AMASK | MO_BSWAP | MO_SSIZE)) { - col +=3D qemu_log(",$0x%x,%u", op, ix); + col +=3D ne_fprintf(f, ",$0x%x,%u", op, ix); } else { const char *s_al, *s_op; s_al =3D alignment_name[(op & MO_AMASK) >> MO_ASHI= FT]; s_op =3D ldst_name[op & (MO_BSWAP | MO_SSIZE)]; - col +=3D qemu_log(",%s%s,%u", s_al, s_op, ix); + col +=3D ne_fprintf(f, ",%s%s,%u", s_al, s_op, ix); } i =3D 1; } @@ -1950,9 +1952,9 @@ static void tcg_dump_ops(TCGContext *s, bool have_pre= fs) name =3D bswap_flag_name[flags]; } if (name) { - col +=3D qemu_log(",%s", name); + col +=3D ne_fprintf(f, ",%s", name); } else { - col +=3D qemu_log(",$0x%" TCG_PRIlx, flags); + col +=3D ne_fprintf(f, ",$0x%" TCG_PRIlx, flags); } i =3D k =3D 1; } @@ -1967,49 +1969,42 @@ static void tcg_dump_ops(TCGContext *s, bool have_p= refs) case INDEX_op_brcond_i32: case INDEX_op_brcond_i64: case INDEX_op_brcond2_i32: - col +=3D qemu_log("%s$L%d", k ? "," : "", - arg_label(op->args[k])->id); + col +=3D ne_fprintf(f, "%s$L%d", k ? "," : "", + arg_label(op->args[k])->id); i++, k++; break; default: break; } for (; i < nb_cargs; i++, k++) { - col +=3D qemu_log("%s$0x%" TCG_PRIlx, k ? "," : "", op->ar= gs[k]); + col +=3D ne_fprintf(f, "%s$0x%" TCG_PRIlx, k ? "," : "", + op->args[k]); } } =20 if (have_prefs || op->life) { - - QemuLogFile *logfile; - - rcu_read_lock(); - logfile =3D qatomic_rcu_read(&qemu_logfile); - if (logfile) { - for (; col < 40; ++col) { - putc(' ', logfile->fd); - } + for (; col < 40; ++col) { + putc(' ', f); } - rcu_read_unlock(); } =20 if (op->life) { unsigned life =3D op->life; =20 if (life & (SYNC_ARG * 3)) { - qemu_log(" sync:"); + ne_fprintf(f, " sync:"); for (i =3D 0; i < 2; ++i) { if (life & (SYNC_ARG << i)) { - qemu_log(" %d", i); + ne_fprintf(f, " %d", i); } } } life /=3D DEAD_ARG; if (life) { - qemu_log(" dead:"); + ne_fprintf(f, " dead:"); for (i =3D 0; life; ++i, life >>=3D 1) { if (life & 1) { - qemu_log(" %d", i); + ne_fprintf(f, " %d", i); } } } @@ -2020,28 +2015,28 @@ static void tcg_dump_ops(TCGContext *s, bool have_p= refs) TCGRegSet set =3D op->output_pref[i]; =20 if (i =3D=3D 0) { - qemu_log(" pref=3D"); + ne_fprintf(f, " pref=3D"); } else { - qemu_log(","); + ne_fprintf(f, ","); } if (set =3D=3D 0) { - qemu_log("none"); + ne_fprintf(f, "none"); } else if (set =3D=3D MAKE_64BIT_MASK(0, TCG_TARGET_NB_REG= S)) { - qemu_log("all"); + ne_fprintf(f, "all"); #ifdef CONFIG_DEBUG_TCG } else if (tcg_regset_single(set)) { TCGReg reg =3D tcg_regset_first(set); - qemu_log("%s", tcg_target_reg_names[reg]); + ne_fprintf(f, "%s", tcg_target_reg_names[reg]); #endif } else if (TCG_TARGET_NB_REGS <=3D 32) { - qemu_log("%#x", (uint32_t)set); + ne_fprintf(f, "%#x", (uint32_t)set); } else { - qemu_log("%#" PRIx64, (uint64_t)set); + ne_fprintf(f, "%#" PRIx64, (uint64_t)set); } } } =20 - qemu_log("\n"); + putc('\n', f); } } =20 @@ -4207,7 +4202,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) FILE *logfile =3D qemu_log_trylock(); if (logfile) { fprintf(logfile, "OP:\n"); - tcg_dump_ops(s, false); + tcg_dump_ops(s, logfile, false); fprintf(logfile, "\n"); qemu_log_unlock(logfile); } @@ -4254,7 +4249,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) FILE *logfile =3D qemu_log_trylock(); if (logfile) { fprintf(logfile, "OP before indirect lowering:\n"); - tcg_dump_ops(s, false); + tcg_dump_ops(s, logfile, false); fprintf(logfile, "\n"); qemu_log_unlock(logfile); } @@ -4277,7 +4272,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) FILE *logfile =3D qemu_log_trylock(); if (logfile) { fprintf(logfile, "OP after optimization and liveness analysis:= \n"); - tcg_dump_ops(s, true); + tcg_dump_ops(s, logfile, true); fprintf(logfile, "\n"); qemu_log_unlock(logfile); } --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648302430; cv=none; d=zohomail.com; s=zohoarc; b=N+Y9Jh4NDmvc9j6HCb0zdOrgvRNDvpb7/0GkSnaMCZ0Cq67wTIZVtdVQLv5oTQtiUE0QhPW5v6vQxqaK6BHkHwzAQcI5coQ8dQJQPa0hOwJ3uc4fTssWOG6XmVmrXWUvG0ZNRicWdvdRMzN9/tKQwMUv4Ydwhr7S7HWA+LQXCbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648302430; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=srb8zYnrls4BFF2+J2DHCJQ2uN96wtiF9F7er96M9hY=; b=Lgpfy1ll89/+HWZ6f4Z8dQSJuoJDlnek71RBN51iFKaFREy2k/MRJwtWq9MKtlqnWAgAuir+Yv3e2am+7r21gbZz+sNLdXOljZZVzp0QmXlSzuvsFfdyvLyngyeG2KI/vLBz5BKlElt0xh7yyYtmGHlt/xvA+pizQeZvFWaAPwg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648302429928642.3622131958675; Sat, 26 Mar 2022 06:47:09 -0700 (PDT) Received: from localhost ([::1]:52186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6l2-000555-9r for importer@patchew.org; Sat, 26 Mar 2022 09:47:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qt-0007V8-5D for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:22 -0400 Received: from [2001:4860:4864:20::2a] (port=42179 helo=mail-oa1-x2a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qm-0005O6-3p for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:14 -0400 Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-de3ca1efbaso10716476fac.9 for ; Sat, 26 Mar 2022 06:26:05 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=srb8zYnrls4BFF2+J2DHCJQ2uN96wtiF9F7er96M9hY=; b=FX1UT3paPQJP0shwoIwQJ8m+73l3C5Deh02NEOi5L2qAXv4ozTmaj4w1H2j05uNpAa EaGl5Rq/uLyjylw60X2rW2mTIggrX322x3J23Khs//Nb0Zhcnv4M6+ETCKR3TkNT9Dok hYUaWRJwrIiaPt1Es0usxiMmNRuTbd+jRSQvUSht+bpkqGJQzNd1TqyoM7xPFRAS8aZ7 1G3Qbct256VW8hA1bwudExbvS7/4dlQAAglQRfpOp1LbeGe8j2L5Tbs6EjurnDT74xgw 8JbrkYaBjjcnkfYOAcRuHUlsRvE5xAXxbJYJxiSBFkIuf2m3lj6L5iT2I4m3GZPJ/aSl e32w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=srb8zYnrls4BFF2+J2DHCJQ2uN96wtiF9F7er96M9hY=; b=z5JgtPunT+JyE+6f0p+2NPZaf+4kbHyZSpe2m+5UcvARvnDuxUVZnbcDk7xC1hnFMV 53TqvX1FIltTrx8UOyZp2EvWEiV1f4WoVGL83PzGBLk81Nuz+7sa/K96YQ+FK3SzqD8V KvODFF+irBdJXNUBpBuPUHXpMAM09ji8H+bOpptmpRT2shXY7AEL3QwsQnchL64PDTjO Ju+XV48z63mWnF/WgvFAW2x5yWTzhas6JFaOTOxjs3I6WzGdYHo3oAb7nlZQOLIdfZpb mZxuGquAIZe9VUqCmQX9HeAxSv/L5otwsGrg8DBs8wqR5uQ725QfcTpersrZil71hqGo fRcQ== X-Gm-Message-State: AOAM532URR9bvBZpSrHNq+9Kno/i8mdjmGyxwTtYMu1vpIVvj0OgDhVY jKIOtaWTPhJubHAmrGG6sClsJS5Zoud8I5cS X-Google-Smtp-Source: ABdhPJyok8pXOCl2ssKSYnjfHgS2q37dh9h4E7stWDd8Z8tociWw8JNqjhw+N1OuBl/VDgbYmaet6A== X-Received: by 2002:a05:6870:4688:b0:dd:b535:f9c1 with SMTP id a8-20020a056870468800b000ddb535f9c1mr11291065oap.37.1648301164315; Sat, 26 Mar 2022 06:26:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 12/39] exec/translator: Pass the locked filepointer to disas_log hook Date: Sat, 26 Mar 2022 07:25:07 -0600 Message-Id: <20220326132534.543738-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2a; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648302431293100001 Content-Type: text/plain; charset="utf-8" We have fetched and locked the logfile in translator_loop. Pass the filepointer down to the disas_log hook so that it need not be fetched and locked again. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- include/exec/translator.h | 2 +- accel/tcg/translator.c | 2 +- target/alpha/translate.c | 7 ++++--- target/arm/translate-a64.c | 6 +++--- target/arm/translate.c | 7 ++++--- target/avr/translate.c | 7 ++++--- target/cris/translate.c | 7 ++++--- target/hexagon/translate.c | 7 ++++--- target/hppa/translate.c | 15 ++++++++------- target/i386/tcg/translate.c | 6 +++--- target/m68k/translate.c | 7 ++++--- target/microblaze/translate.c | 7 ++++--- target/mips/tcg/translate.c | 7 ++++--- target/nios2/translate.c | 7 ++++--- target/openrisc/translate.c | 7 ++++--- target/ppc/translate.c | 7 ++++--- target/riscv/translate.c | 10 ++++++---- target/rx/translate.c | 7 ++++--- target/s390x/tcg/translate.c | 11 ++++++----- target/sh4/translate.c | 7 ++++--- target/sparc/translate.c | 7 ++++--- target/tricore/translate.c | 7 ++++--- target/xtensa/translate.c | 7 ++++--- 23 files changed, 92 insertions(+), 72 deletions(-) diff --git a/include/exec/translator.h b/include/exec/translator.h index 9bc46eda59..31d3fa76ff 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -118,7 +118,7 @@ typedef struct TranslatorOps { void (*insn_start)(DisasContextBase *db, CPUState *cpu); void (*translate_insn)(DisasContextBase *db, CPUState *cpu); void (*tb_stop)(DisasContextBase *db, CPUState *cpu); - void (*disas_log)(const DisasContextBase *db, CPUState *cpu); + void (*disas_log)(const DisasContextBase *db, CPUState *cpu, FILE *f); } TranslatorOps; =20 /** diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index af8798f98b..fe7af9b943 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -142,7 +142,7 @@ void translator_loop(const TranslatorOps *ops, DisasCon= textBase *db, FILE *logfile =3D qemu_log_trylock(); if (logfile) { fprintf(logfile, "----------------\n"); - ops->disas_log(db, cpu); + ops->disas_log(db, cpu, logfile); fprintf(logfile, "\n"); qemu_log_unlock(logfile); } diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 66768ab47a..b1f78cff53 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -3027,10 +3027,11 @@ static void alpha_tr_tb_stop(DisasContextBase *dcba= se, CPUState *cpu) } } =20 -static void alpha_tr_disas_log(const DisasContextBase *dcbase, CPUState *c= pu) +static void alpha_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cpu, FILE *logfile) { - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cpu, dcbase->pc_first, dcbase->tb->size); } =20 static const TranslatorOps alpha_tr_ops =3D { diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index d1a59fad9c..87ae8b7571 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -14962,12 +14962,12 @@ static void aarch64_tr_tb_stop(DisasContextBase *= dcbase, CPUState *cpu) } =20 static void aarch64_tr_disas_log(const DisasContextBase *dcbase, - CPUState *cpu) + CPUState *cpu, FILE *logfile) { DisasContext *dc =3D container_of(dcbase, DisasContext, base); =20 - qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); - log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dc->base.pc_first)); + target_disas(logfile, cpu, dc->base.pc_first, dc->base.tb->size); } =20 const TranslatorOps aarch64_translator_ops =3D { diff --git a/target/arm/translate.c b/target/arm/translate.c index bf2196b9e2..783a43b4ae 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9891,12 +9891,13 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase= , CPUState *cpu) } } =20 -static void arm_tr_disas_log(const DisasContextBase *dcbase, CPUState *cpu) +static void arm_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cpu, FILE *logfile) { DisasContext *dc =3D container_of(dcbase, DisasContext, base); =20 - qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); - log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dc->base.pc_first)); + target_disas(logfile, cpu, dc->base.pc_first, dc->base.tb->size); } =20 static const TranslatorOps arm_translator_ops =3D { diff --git a/target/avr/translate.c b/target/avr/translate.c index af8a3e0f9c..dc9c3d6bcc 100644 --- a/target/avr/translate.c +++ b/target/avr/translate.c @@ -3015,10 +3015,11 @@ static void avr_tr_tb_stop(DisasContextBase *dcbase= , CPUState *cs) } } =20 -static void avr_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs) +static void avr_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cs, FILE *logfile) { - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cs, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cs, dcbase->pc_first, dcbase->tb->size); } =20 static const TranslatorOps avr_tr_ops =3D { diff --git a/target/cris/translate.c b/target/cris/translate.c index 3656cd6db1..ac101344a3 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -3268,11 +3268,12 @@ static void cris_tr_tb_stop(DisasContextBase *dcbas= e, CPUState *cpu) } } =20 -static void cris_tr_disas_log(const DisasContextBase *dcbase, CPUState *cp= u) +static void cris_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cpu, FILE *logfile) { if (!DISAS_CRIS) { - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cpu, dcbase->pc_first, dcbase->tb->size); } } =20 diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 98f1452cad..d4fc92f7e9 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -833,10 +833,11 @@ static void hexagon_tr_tb_stop(DisasContextBase *dcba= se, CPUState *cpu) } } =20 -static void hexagon_tr_disas_log(const DisasContextBase *dcbase, CPUState = *cpu) +static void hexagon_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cpu, FILE *logfile) { - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cpu, dcbase->pc_first, dcbase->tb->size); } =20 =20 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 5c0b1eb274..c24d3ce3b8 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -4305,29 +4305,30 @@ static void hppa_tr_tb_stop(DisasContextBase *dcbas= e, CPUState *cs) } } =20 -static void hppa_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs) +static void hppa_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cs, FILE *logfile) { target_ulong pc =3D dcbase->pc_first; =20 #ifdef CONFIG_USER_ONLY switch (pc) { case 0x00: - qemu_log("IN:\n0x00000000: (null)\n"); + fprintf(logfile, "IN:\n0x00000000: (null)\n"); return; case 0xb0: - qemu_log("IN:\n0x000000b0: light-weight-syscall\n"); + fprintf(logfile, "IN:\n0x000000b0: light-weight-syscall\n"); return; case 0xe0: - qemu_log("IN:\n0x000000e0: set-thread-pointer-syscall\n"); + fprintf(logfile, "IN:\n0x000000e0: set-thread-pointer-syscall\n"); return; case 0x100: - qemu_log("IN:\n0x00000100: syscall\n"); + fprintf(logfile, "IN:\n0x00000100: syscall\n"); return; } #endif =20 - qemu_log("IN: %s\n", lookup_symbol(pc)); - log_target_disas(cs, pc, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(pc)); + target_disas(logfile, cs, pc, dcbase->tb->size); } =20 static const TranslatorOps hppa_tr_ops =3D { diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index d71bd2b0f4..4659a212b2 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -8690,12 +8690,12 @@ static void i386_tr_tb_stop(DisasContextBase *dcbas= e, CPUState *cpu) } =20 static void i386_tr_disas_log(const DisasContextBase *dcbase, - CPUState *cpu) + CPUState *cpu, FILE *logfile) { DisasContext *dc =3D container_of(dcbase, DisasContext, base); =20 - qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); - log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dc->base.pc_first)); + target_disas(logfile, cpu, dc->base.pc_first, dc->base.tb->size); } =20 static const TranslatorOps i386_tr_ops =3D { diff --git a/target/m68k/translate.c b/target/m68k/translate.c index af43c8eab8..4026572ed8 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -6257,10 +6257,11 @@ static void m68k_tr_tb_stop(DisasContextBase *dcbas= e, CPUState *cpu) } } =20 -static void m68k_tr_disas_log(const DisasContextBase *dcbase, CPUState *cp= u) +static void m68k_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cpu, FILE *logfile) { - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cpu, dcbase->pc_first, dcbase->tb->size); } =20 static const TranslatorOps m68k_tr_ops =3D { diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 2561b904b9..bf01384d33 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -1833,10 +1833,11 @@ static void mb_tr_tb_stop(DisasContextBase *dcb, CP= UState *cs) } } =20 -static void mb_tr_disas_log(const DisasContextBase *dcb, CPUState *cs) +static void mb_tr_disas_log(const DisasContextBase *dcb, + CPUState *cs, FILE *logfile) { - qemu_log("IN: %s\n", lookup_symbol(dcb->pc_first)); - log_target_disas(cs, dcb->pc_first, dcb->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcb->pc_first)); + target_disas(logfile, cs, dcb->pc_first, dcb->tb->size); } =20 static const TranslatorOps mb_tr_ops =3D { diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index b82a7ec6ad..6de5b66650 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -16141,10 +16141,11 @@ static void mips_tr_tb_stop(DisasContextBase *dcb= ase, CPUState *cs) } } =20 -static void mips_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs) +static void mips_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cs, FILE *logfile) { - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cs, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cs, dcbase->pc_first, dcbase->tb->size); } =20 static const TranslatorOps mips_tr_ops =3D { diff --git a/target/nios2/translate.c b/target/nios2/translate.c index f89271dbed..89b97ef520 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -833,10 +833,11 @@ static void nios2_tr_tb_stop(DisasContextBase *dcbase= , CPUState *cs) } } =20 -static void nios2_tr_disas_log(const DisasContextBase *dcbase, CPUState *c= pu) +static void nios2_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cpu, FILE *logfile) { - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cpu, dcbase->pc_first, dcbase->tb->size); } =20 static const TranslatorOps nios2_tr_ops =3D { diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index ca79e609da..7b8ad43d5f 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -1687,12 +1687,13 @@ static void openrisc_tr_tb_stop(DisasContextBase *d= cbase, CPUState *cs) } } =20 -static void openrisc_tr_disas_log(const DisasContextBase *dcbase, CPUState= *cs) +static void openrisc_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cs, FILE *logfile) { DisasContext *s =3D container_of(dcbase, DisasContext, base); =20 - qemu_log("IN: %s\n", lookup_symbol(s->base.pc_first)); - log_target_disas(cs, s->base.pc_first, s->base.tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(s->base.pc_first)); + target_disas(logfile, cs, s->base.pc_first, s->base.tb->size); } =20 static const TranslatorOps openrisc_tr_ops =3D { diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 408ae26173..e0c9f74da4 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -7769,10 +7769,11 @@ static void ppc_tr_tb_stop(DisasContextBase *dcbase= , CPUState *cs) } } =20 -static void ppc_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs) +static void ppc_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cs, FILE *logfile) { - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cs, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cs, dcbase->pc_first, dcbase->tb->size); } =20 static const TranslatorOps ppc_tr_ops =3D { diff --git a/target/riscv/translate.c b/target/riscv/translate.c index fac998a6b5..6495726302 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -1155,18 +1155,20 @@ static void riscv_tr_tb_stop(DisasContextBase *dcba= se, CPUState *cpu) } } =20 -static void riscv_tr_disas_log(const DisasContextBase *dcbase, CPUState *c= pu) +static void riscv_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cpu, FILE *logfile) { #ifndef CONFIG_USER_ONLY RISCVCPU *rvcpu =3D RISCV_CPU(cpu); CPURISCVState *env =3D &rvcpu->env; #endif =20 - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); #ifndef CONFIG_USER_ONLY - qemu_log("Priv: "TARGET_FMT_ld"; Virt: "TARGET_FMT_ld"\n", env->priv, = env->virt); + fprintf(logfile, "Priv: "TARGET_FMT_ld"; Virt: "TARGET_FMT_ld"\n", + env->priv, env->virt); #endif - log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size); + target_disas(logfile, cpu, dcbase->pc_first, dcbase->tb->size); } =20 static const TranslatorOps riscv_tr_ops =3D { diff --git a/target/rx/translate.c b/target/rx/translate.c index 5db8f79a82..c8a8991a63 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -2342,10 +2342,11 @@ static void rx_tr_tb_stop(DisasContextBase *dcbase,= CPUState *cs) } } =20 -static void rx_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs) +static void rx_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cs, FILE *logfile) { - qemu_log("IN:\n"); /* , lookup_symbol(dcbase->pc_first)); */ - log_target_disas(cs, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cs, dcbase->pc_first, dcbase->tb->size); } =20 static const TranslatorOps rx_tr_ops =3D { diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 5acfc0ff9b..1e7f470c4b 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -6660,16 +6660,17 @@ static void s390x_tr_tb_stop(DisasContextBase *dcba= se, CPUState *cs) } } =20 -static void s390x_tr_disas_log(const DisasContextBase *dcbase, CPUState *c= s) +static void s390x_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cs, FILE *logfile) { DisasContext *dc =3D container_of(dcbase, DisasContext, base); =20 if (unlikely(dc->ex_value)) { - /* ??? Unfortunately log_target_disas can't use host memory. */ - qemu_log("IN: EXECUTE %016" PRIx64, dc->ex_value); + /* ??? Unfortunately target_disas can't use host memory. */ + fprintf(logfile, "IN: EXECUTE %016" PRIx64, dc->ex_value); } else { - qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); - log_target_disas(cs, dc->base.pc_first, dc->base.tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dc->base.pc_first)); + target_disas(logfile, cs, dc->base.pc_first, dc->base.tb->size); } } =20 diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 43bc88b7b3..f1b190e7cf 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -2352,10 +2352,11 @@ static void sh4_tr_tb_stop(DisasContextBase *dcbase= , CPUState *cs) } } =20 -static void sh4_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs) +static void sh4_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cs, FILE *logfile) { - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cs, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cs, dcbase->pc_first, dcbase->tb->size); } =20 static const TranslatorOps sh4_tr_ops =3D { diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 4c7c7b5347..2e28222d31 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -5901,10 +5901,11 @@ static void sparc_tr_tb_stop(DisasContextBase *dcba= se, CPUState *cs) } } =20 -static void sparc_tr_disas_log(const DisasContextBase *dcbase, CPUState *c= pu) +static void sparc_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cpu, FILE *logfile) { - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cpu, dcbase->pc_first, dcbase->tb->size); } =20 static const TranslatorOps sparc_tr_ops =3D { diff --git a/target/tricore/translate.c b/target/tricore/translate.c index 417edbd3f0..d170500fa5 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -8861,10 +8861,11 @@ static void tricore_tr_tb_stop(DisasContextBase *dc= base, CPUState *cpu) } } =20 -static void tricore_tr_disas_log(const DisasContextBase *dcbase, CPUState = *cpu) +static void tricore_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cpu, FILE *logfile) { - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cpu, dcbase->pc_first, dcbase->tb->size); } =20 static const TranslatorOps tricore_tr_ops =3D { diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index b1491ed625..a9e69c4153 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -1296,10 +1296,11 @@ static void xtensa_tr_tb_stop(DisasContextBase *dcb= ase, CPUState *cpu) } } =20 -static void xtensa_tr_disas_log(const DisasContextBase *dcbase, CPUState *= cpu) +static void xtensa_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cpu, FILE *logfile) { - qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size); + fprintf(logfile, "IN: %s\n", lookup_symbol(dcbase->pc_first)); + target_disas(logfile, cpu, dcbase->pc_first, dcbase->tb->size); } =20 static const TranslatorOps xtensa_translator_ops =3D { --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648301924; cv=none; d=zohomail.com; s=zohoarc; b=PCxktfOEq2VGp65ibzlbE0BrVUqJuk/h/DY7jBWw069ecXqIusxI5e0iZtYDLmBneCdg+nJQGaPAXGbKl1n88g/gnJyJCaj53hyFJVAtW1/pq9wGJILnTAIWt+Top01bRfkdIS/0Nofux4PtIsilDgb56xFFVr/DNat2jpTNdYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648301924; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ehH7VDCeW4WIVxtWVdIPmUT3p2JNkhZIJXr8A+U3FbU=; b=XKlbTdIUUm7G1kd3kJcLZrxKEXUrpDkwKScUehmMSVs0A8hRfMOSIVEaM0xf0g5UX7xZAgBV5QUvP246Yp/foro+ofkplHdeXzYG6OqCJPFlwzpxo4xFSypWjfoaTVX/fjGQBZHbAVGcJ4XC0AdaKEfQeNJ82pH5t15momnoD4g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648301924021157.71459662810037; Sat, 26 Mar 2022 06:38:44 -0700 (PDT) Received: from localhost ([::1]:35272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6cs-000225-VU for importer@patchew.org; Sat, 26 Mar 2022 09:38:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qn-0007Ub-VT for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:20 -0400 Received: from [2607:f8b0:4864:20::332] (port=46628 helo=mail-ot1-x332.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qm-0005To-Il for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:13 -0400 Received: by mail-ot1-x332.google.com with SMTP id z9-20020a05683020c900b005b22bf41872so7440111otq.13 for ; Sat, 26 Mar 2022 06:26:12 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ehH7VDCeW4WIVxtWVdIPmUT3p2JNkhZIJXr8A+U3FbU=; b=XlUfWle768YnLvhEfaiOFzfGBUbIrB5d1sgNsEMx6n0gxra81GShAMGC8tNYIjRXg0 sFVaN/hj+cmcIcrcNlefDwGcUd4nU5d0oh7Ox8RLO6i2K0cjNaMZw4B24XTcjPJ5nKL8 +ui7qDppQdU1Glsel0GMYPMuLgZHOkd4V25qq1SVtsNA+F/jhRYshrtmunIQSt+bnbRt QLG7egn9x7NtonrsQDgj1VzIarBNaUfKHBeApQcARTTJaXuukvwxlisa+Sqem7sXVkfP eviuMYsqIGJ15oq7vAnNZU2jdLdLiHwjfINUOZHY4PEu9q8ESGqLlRTsPpyuneTsN4OI IisA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ehH7VDCeW4WIVxtWVdIPmUT3p2JNkhZIJXr8A+U3FbU=; b=SK+3JoVYpZjAsqP89C+QQcGdhySxRFBZOtFv/USSDLGuf0JKAoZoAhAes3j7Q34rIY FKWDGXFEfnkYDmQvxtQYjM76VEXe0Tv7sRSGdJOKgJVkV0GS0sM1ZRDhD1L6Ox51BTG8 hrdz2KtUSz1D2bKQahQEkqBYaJ+/oBSUf9CmAkbj7CkIV8wfqKbd/MTLsPi6OkGOOa2f UqsTfaUVqs9IRPj0/Posg3qj9mdkwXGAFhfh/27Kfe4YU+z81mWvOfQaGqlF9J1kXet+ Yxmocbjf7VxO6sLnJAO7CL/ptP9eW3gqDvID2pMnvM61ABzLFlyOI8gEtPqootYQwQhn 0jNw== X-Gm-Message-State: AOAM533bzNLPh+0lEYKguuHBlyslePvA+xms2gLcJxIh4Ywqm+FmXeUo /Y7vOXxt9/8J7uF/AQ6QS8O/64mvR7QeATvb X-Google-Smtp-Source: ABdhPJwpw4+ypJ1gEwOuWsRZVLCfiZ+tdw/Yo7Wi5RFvkFTsSb3L2AClQELqIvUP+OtYrvTpjTRw2A== X-Received: by 2002:a9d:7751:0:b0:5b2:49ae:76c6 with SMTP id t17-20020a9d7751000000b005b249ae76c6mr6272485otl.18.1648301171448; Sat, 26 Mar 2022 06:26:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 13/39] exec/log: Remove log_disas and log_target_disas Date: Sat, 26 Mar 2022 07:25:08 -0600 Message-Id: <20220326132534.543738-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::332 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::332; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x332.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648301926157100003 Content-Type: text/plain; charset="utf-8" These functions are no longer used. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- include/exec/log.h | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/include/exec/log.h b/include/exec/log.h index 648f4d2263..06ab9841ee 100644 --- a/include/exec/log.h +++ b/include/exec/log.h @@ -43,30 +43,6 @@ static inline void log_cpu_state_mask(int mask, CPUState= *cpu, int flags) } =20 #ifdef NEED_CPU_H -/* disas() and target_disas() to qemu_logfile: */ -static inline void log_target_disas(CPUState *cpu, target_ulong start, - target_ulong len) -{ - QemuLogFile *logfile; - rcu_read_lock(); - logfile =3D qatomic_rcu_read(&qemu_logfile); - if (logfile) { - target_disas(logfile->fd, cpu, start, len); - } - rcu_read_unlock(); -} - -static inline void log_disas(const void *code, unsigned long size) -{ - QemuLogFile *logfile; - rcu_read_lock(); - logfile =3D qatomic_rcu_read(&qemu_logfile); - if (logfile) { - disas(logfile->fd, code, size); - } - rcu_read_unlock(); -} - #if defined(CONFIG_USER_ONLY) /* page_dump() output to the log file: */ static inline void log_page_dump(const char *operation) --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648302124; cv=none; d=zohomail.com; s=zohoarc; b=KunaXUAZYZwq9bwGoEpxiRtXptpUcYpeGpVdno8Se5fTW0UldbV4iaSRo+5NpqcWXYB/pCTjyvHfsVGp0fjIqzx7EKGYw8g6dqdc5tx77nvluxDpDxB/GC4YmfI1In+JBBjTdIAnc759ENFrI8dkWzNL29arCPwLmOFXsdl0Eio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648302124; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L2qbFaN7OaGfKK0O5CG7ZbPVEQZ58wXHUVGPEOy9UfM=; b=lqcJl6S3ahN+67+uWW9rb2y+pVbZtwTP/Mjn4zZhsD4MkDriH+rSKZciThmV9qOtyOgClqpqlied9MltcexhbZEMkq1cCYAiOT2ZoUBwyqxewitgJfwP1oWVvo9Zlue9CX1lPDCSq79nhW+iCFwXAx+jyL5scSN4hLxPv3gQpyA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648302124981687.4956208592437; Sat, 26 Mar 2022 06:42:04 -0700 (PDT) Received: from localhost ([::1]:43572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6g7-0007ca-SH for importer@patchew.org; Sat, 26 Mar 2022 09:42:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qv-0007VG-84 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:22 -0400 Received: from [2607:f8b0:4864:20::22d] (port=34575 helo=mail-oi1-x22d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qs-0005V3-Vt for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:20 -0400 Received: by mail-oi1-x22d.google.com with SMTP id v75so11116007oie.1 for ; Sat, 26 Mar 2022 06:26:14 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L2qbFaN7OaGfKK0O5CG7ZbPVEQZ58wXHUVGPEOy9UfM=; b=oHKAD+8lhiXdJD4nu6JXyrx/7AnFLCmFzjhSIJzeSxlijFVfN/hPIvIsoUCBiZT22k rRXSctSUD8wmr2lkJqk8Y3sK0zUIfL+WwfRDdlIoU4Pn5jYzrZLPUcK+MIxhUDvL9TtV wsJ3fe/JHBDUytggjSlo5J74imcEKkcULPgrK56Vw77JCAeIRC/M7+D6DElHZNMrdvj0 SmoMfr9KKxq8gxtaxvq5FXx+3D8N06EGOBjMwMpz5dtMXy2c83a8h7HcvHpFkQtStRfz E/NaJfRJ4erC36qJahK16MH6U/P8FPL0gDiVeygXjwd83315TqSyaSNmuc96Q0GZPyK7 Jriw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L2qbFaN7OaGfKK0O5CG7ZbPVEQZ58wXHUVGPEOy9UfM=; b=mr4bdvFZoFRmIyLwrCC5FqDeDYcovANTLl9FxzZuLlliUDX08SSQg005TFA0MBHGlS K/ymnPKJFM0US2ilapzKr4pk/tN6CnI5k3RLFCTNdRJTegl4oFtV0dij3wwVeczmW9il nV/y9KSraxHmOJKi2u9v58Rv4W4DQf3WmfSS5BJZQEp7NpJRWo1uPQ7zl59t04iyUgwN VHnnpC3AXWwPNy1mIkOfcHbxmjSGhMRER6EafYqglVRn9vUrasGFyDeaNzsX9gSNS1cw t60KAntc24X49hvEWFsdHz2gNidxMc2xMRfRjO9pmIVis2IEcEbW/GM5fqEvE+D6vHiZ FgpA== X-Gm-Message-State: AOAM531Y1epzPdWNxiP0qdHKSM7b2A7l551mWgpM844ly1VlqJorKMmM gS38EHZdL3xtoRQQ1ZcpqDU4m+iUtTU0UudB X-Google-Smtp-Source: ABdhPJwXjwERuAvQzv4rGTuykg1OyiEz3bXhBawnnZBKkcganR42d4vNxnhgRV4fCxKwqN3QyWxcOw== X-Received: by 2002:a05:6808:1183:b0:2d4:5eeb:1ca3 with SMTP id j3-20020a056808118300b002d45eeb1ca3mr7997460oil.8.1648301173377; Sat, 26 Mar 2022 06:26:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 14/39] accel/tcg: Use cpu_dump_state between qemu_log_trylock/unlock Date: Sat, 26 Mar 2022 07:25:09 -0600 Message-Id: <20220326132534.543738-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22d; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648302125508100003 Content-Type: text/plain; charset="utf-8" Inside log_cpu_state, we perform qemu_log_trylock/unlock, which need not be done if we have already performed the lock beforehand. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- accel/tcg/cpu-exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 8a896e772d..931643a510 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -225,7 +225,7 @@ static inline void log_cpu_exec(target_ulong pc, CPUSta= te *cpu, #if defined(TARGET_I386) flags |=3D CPU_DUMP_CCOP; #endif - log_cpu_state(cpu, flags); + cpu_dump_state(cpu, logfile, flags); qemu_log_unlock(logfile); } } --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303171; cv=none; d=zohomail.com; s=zohoarc; b=a6j/0mDXc/Ij37oepGQ+cAk3i3kk4bPgpfrJX1IW8tnG9kAQqiminc1RlLGTdlSOxm3KWoKx7+ffoVJ5t7HYc0a95BX28DK1wihjOVN3TpYGXh3lJorFBmztC5cbfgmFRaCM4AbzcQ8MaMV00kYBpkH+ZWs4VP8jU69fo7S0ptI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303171; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KChjyOMgpewWdFnPU3AHhb0wY0pkdi2s50pAiOY+Ng8=; b=gFZ1WIzpZ6Zk+RwTZMeV41xIhTo4Z3g4meYQ0W6jZQ/46BozBldoDjsixJ/L7yI8hQ7VqqhZtFs+/JocreQoQtXaIlll46p8fLsNqzhG3sddRBCkz/4B5iFt4ULLWf1TXZgDXNi3csR5iXDjz36gQnbuf2poQmBVvMHOHY7dThI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303171034954.4490796568371; Sat, 26 Mar 2022 06:59:31 -0700 (PDT) Received: from localhost ([::1]:44530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6wz-0002aW-TD for importer@patchew.org; Sat, 26 Mar 2022 09:59:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qw-0007VS-Fe for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:24 -0400 Received: from [2607:f8b0:4864:20::22d] (port=36803 helo=mail-oi1-x22d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qt-0005VE-0b for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:22 -0400 Received: by mail-oi1-x22d.google.com with SMTP id z8so11090882oix.3 for ; Sat, 26 Mar 2022 06:26:15 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KChjyOMgpewWdFnPU3AHhb0wY0pkdi2s50pAiOY+Ng8=; b=HHH80PaAu3a6VUCSwDDLdmgo42fE5cIr7+YVCinZmBjrGUnOJq6A1KkI2zXZaRshTR QpkNbAx+01RauFbeL9Cx/7buc9S7BHxPgJZs4YBJjanz84ci/65XBXArDdHBY5N9egD7 pAZOKFBjpsflIa20pOhiXe18prOWj5tXfTQ2nZ9zGmJuSQFw94ZQaYZ0UDjAYe4rMNwd PvrQCtjgAoK8dgwGcDoJ0YItOGak/Xf/+HBPnZGVlVItMCq4PTQUcNoT2yYv7sSJkyfI f1FUKTDnHVkjAD8xfqllRsX3dtvSmAyBvI/WEE7Gt7PqvwX/ilQCBH7s85OlPStl5PLB 51XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KChjyOMgpewWdFnPU3AHhb0wY0pkdi2s50pAiOY+Ng8=; b=7iFIeQtdWgWNPqNeDH1sMCSmAS2PMisSn7eLSvvYAtp1YFgSpbM8xRXts/on9TG3Tb oRAp/5j98jI4S36543VS5tF4SGmYA+9+6SNJJ8NRPD2ULSGF8TijaosA7wzYI6ml5Iuz YAGi5/OSbHsIFAG5bSSpJ7PI/Sub/SpX0ukJT4dwgQJW3RejH7w1UyG/ogwxkgkP2bep kqCN250eZT9j5o0FZvbpg5YHv+JQITbz1lh01DQtGWFIT6tCIfvICmORXowRva3+1D3U YEyZ6wgrCqrSe9UBcbCkShJZkwYMYhxPmCynl04RIusnAiu3bJy66Cv50if/Mkq8YRkN 4DCQ== X-Gm-Message-State: AOAM531VCuPTFy4Hn28F9m43mejw6xBZS4sC0dsSpAIkc25XTaV5WZs2 HtozD0L8BqP+zOVixfmjAkPJ/gI7w6XK5NsU X-Google-Smtp-Source: ABdhPJyUQplKUtGJBAE/ibRLhEiJ4QfQMZvMINLA2SnIptEn2yAg1heHC1rwVjM2T9nLO3B7XLj2cA== X-Received: by 2002:aca:ad15:0:b0:2da:692e:fe97 with SMTP id w21-20020acaad15000000b002da692efe97mr12464292oie.26.1648301174616; Sat, 26 Mar 2022 06:26:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 15/39] target/nios2: Remove log_cpu_state from reset Date: Sat, 26 Mar 2022 07:25:10 -0600 Message-Id: <20220326132534.543738-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22d; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303173051100005 This is redundant with the logging done in cpu_common_reset. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- target/nios2/cpu.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index 6975ae4bdb..b0877cb39e 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -46,11 +46,6 @@ static void nios2_cpu_reset(DeviceState *dev) Nios2CPUClass *ncc =3D NIOS2_CPU_GET_CLASS(cpu); CPUNios2State *env =3D &cpu->env; =20 - if (qemu_loglevel_mask(CPU_LOG_RESET)) { - qemu_log("CPU Reset (CPU %d)\n", cs->cpu_index); - log_cpu_state(cs, 0); - } - ncc->parent_reset(dev); =20 memset(env->regs, 0, sizeof(uint32_t) * NUM_CORE_REGS); --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303359; cv=none; d=zohomail.com; s=zohoarc; b=k0JAdJtHio1mTuVO5fseuQJ56gl4joz0+9TMDFvjNqvP1V6smsgopePlTU+bvwQ+XkaLg6ZTgmEs3i+M/fFbxf9ftjSpne4JYsFsJ0zvOr6a4G6fVPXVWQgcvJHs1K+RwmS0jSkRrIAOU/W+T1S7CW6+eSfZPD+3aLV9euoPqdY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303359; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aDLKHovI8bxO2d9YjJwk21iI6jYdGi7gzankaymnjFw=; b=bNF9d+0b+4RqlAU8thKEKeUHPbb/K83ZfslUQpikKb+XQTswDHTqbS5xueVb5tE178N+dQR3g/6m3xWd+r3ak4rwU/2wRgxz9hu9lqQriuG3N9A9ttAoy6F8S4ZZwM3qFjBmvgr9JC9RCARPzJXh2LndUgRn9rCb9iSB+FxHa0Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303359555780.4534544055228; Sat, 26 Mar 2022 07:02:39 -0700 (PDT) Received: from localhost ([::1]:49174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY702-0005m8-AQ for importer@patchew.org; Sat, 26 Mar 2022 10:02:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qw-0007VV-J4 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:24 -0400 Received: from [2001:4860:4864:20::2c] (port=45853 helo=mail-oa1-x2c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qt-0005VM-0N for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:22 -0400 Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-d6ca46da48so10699303fac.12 for ; Sat, 26 Mar 2022 06:26:16 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aDLKHovI8bxO2d9YjJwk21iI6jYdGi7gzankaymnjFw=; b=iJP4RDwEAHqJze+/ngkwoyGpNYqp9ae9Fq4hoWkXqnpIpHSZcUMrxAdKD9FTDHWRU8 s9NyOYP9LXk6AlIz8VZycYZvLtzbqKb4gW2M2yQsm0vbqtex141DxvRnZdJcSimClcBo THkfIeCnvo0AtpQRSOImXr2tJUo3PxjsGctk8yFzUoNYon+FJRNo0AHCCb//ZXO5ydiN zRhb/07rF2+f0dKT9m5BbY6ic2/s2S9Dvhx9wlODId8hS+O6SeR5UtM9Hv7uIse2IzfL r9RJ4ja7ThXCFQqjQgrl8Xk+v0mKCD2+gVlQ4lhy4O1A6j6/sg5AGMTN12qi8SZ933DJ nJbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aDLKHovI8bxO2d9YjJwk21iI6jYdGi7gzankaymnjFw=; b=O0IhjoA0goWHA4oQofncdxdYixXDUVxi2u7p161dQf0U7rzthZ8gVnoKSDEcthtaSs fpuBT1wxI0uHOAuCeYH3G3a88rZ2pWfQgG112HS3s+SLDCx4OsGq9scBOaUMzkrgUpJx 1AK5lJtcNwbR6DEihl1wcABaTvwvv0kAs14qymgLDZne4OM67GoPl/hWum+zPW/CCQ0Y gBhnICgijG6qMOVpNfQXoImrK4tnVWaV7yaqT5VvLZe1YzFBiSxGvBLDBMAqyVRxoBi8 g/1HUCxgyFlfHJY2BNNoIX5RNOqOW7I4ILvoQwCU/JBsvmi3kGaABR6ZfE2Ig5FxG/Qz QdeA== X-Gm-Message-State: AOAM532lVikDdgPbvpV1jbG32pLr0rxjdwR/SuzCaAvkfiaTk2hJMxwU 9MtucnMe7fU9YsTXc9UcoJTuyPYHV46xnqHa X-Google-Smtp-Source: ABdhPJyllrpK756Cshvv5df9dHdTJ8O+Kzwd6amZ7IHcw+tVziofnnmA+hD7OCWxzD0G+Q2qZH4RCg== X-Received: by 2002:a05:6870:4341:b0:d3:1412:8ecb with SMTP id x1-20020a056870434100b000d314128ecbmr7282678oah.36.1648301175855; Sat, 26 Mar 2022 06:26:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 16/39] util/log: Use qemu_log_trylock/unlock in qemu_log Date: Sat, 26 Mar 2022 07:25:11 -0600 Message-Id: <20220326132534.543738-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2c; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303360522100001 Avoid using QemuLogFile and RCU directly. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- util/log.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/util/log.c b/util/log.c index 6b7b358573..090bc3bc39 100644 --- a/util/log.c +++ b/util/log.c @@ -62,23 +62,22 @@ void qemu_log_unlock(FILE *fd) /* Return the number of characters emitted. */ int qemu_log(const char *fmt, ...) { + FILE *f =3D qemu_log_trylock(); int ret =3D 0; - QemuLogFile *logfile; =20 - rcu_read_lock(); - logfile =3D qatomic_rcu_read(&qemu_logfile); - if (logfile) { + if (f) { va_list ap; + va_start(ap, fmt); - ret =3D vfprintf(logfile->fd, fmt, ap); + ret =3D vfprintf(f, fmt, ap); va_end(ap); + qemu_log_unlock(f); =20 /* Don't pass back error results. */ if (ret < 0) { ret =3D 0; } } - rcu_read_unlock(); return ret; } =20 --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303429; cv=none; d=zohomail.com; s=zohoarc; b=N5tXKRbo0jEjMGqh1D+uYzHUijiMTnfHPxHsUbdi5E8XuZ070nWc0QLfEai+kObkGJccFaglVuwovpXWVQwbJCEInIoq5tXGVnIIosi6rADQyhNJi+YUM0kCRGXeahtsVaZtrvP5D+YuBweYpZuHpT0fJ0fglMUQP4KrcB0+rL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303429; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+xjD1qAJWzXfAAWXnNvtlNLURWCMMJVP8eMsZZN2BUQ=; b=Xz0/BEdI6gJbLmd5P9j3K/QX9s9fBif31l99YQuRUEB0xkv0yAyP0Qua1+SQzfevexKNCmOtPuzxityAHaCeqdEDiEM+mmnGEsw5KTRr7/U6dK/wm4LRMmaKZbldHPcwLcN1GpGyzKaPjqAqenNtYJbUlq12TdD0iBVFJc+EmUc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303429508662.6339269959863; Sat, 26 Mar 2022 07:03:49 -0700 (PDT) Received: from localhost ([::1]:52930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY71A-0008P2-6i for importer@patchew.org; Sat, 26 Mar 2022 10:03:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qw-0007VW-Im for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:24 -0400 Received: from [2607:f8b0:4864:20::230] (port=33751 helo=mail-oi1-x230.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qt-0005VS-RX for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:22 -0400 Received: by mail-oi1-x230.google.com with SMTP id k10so11116612oia.0 for ; Sat, 26 Mar 2022 06:26:17 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+xjD1qAJWzXfAAWXnNvtlNLURWCMMJVP8eMsZZN2BUQ=; b=qj0TLghBoERWaS6lk9Z96whqdlYNurZOH9bzyGmBHP4YCaIKWRYlV5mVKzosuzBbdo rE3EdoX/PKoACqoi5j+KUlQfXAioQr0ulMntiaTBEe1K5Zba/CH0mmJ5ZWkCv2+YISmj JlDeB/EBV1mlHSS2N+kKrrvf+fyZaJyeoNuq+mwMr+qrSZgTIbMDQryUElBQFfV/Q3xv ibMeVEbZcsrITCwFz7pRkn2AS8fkpP4jon5xv9zCEBlTBoPV4vCTPmSJmbMAumixXRwk 5HPxXq865oq8Xbh5v5GblymRLHJ9SETw3/5HvTdZMDyD6a23AU5xYiijdt9jR0+tKCM4 qBZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+xjD1qAJWzXfAAWXnNvtlNLURWCMMJVP8eMsZZN2BUQ=; b=DHi5l84PKaE+vx8ac1bbFiKrvIUDN/TMF1qQrs1FoCUFNuFpiwu/72DM+TmzXg+etX kpDUgNXhxtWsMzWQ1eJoW4JJhana2LtYDxmdA30fSJyIq6b5zSUOPfcn01BvSPUfb+Ch y2+VQIFcVqaKvUlR0apWL9IOIRD5Sw0lIosLkfKd2xNviVDinIYDFZJbAcxQERuewDZV OVz/trBng5KhzSdVRRQdpgE//BVCWLWylzStZfq2hLHCyQ50kLRHzcDZEMJEBwhSeI6K Oj7tAzcbLOaAdt7sDDSazMPS49L58ncLv5Osd5g63544P7ipjXrtNLPLqZBGcG/HLPJu T8MA== X-Gm-Message-State: AOAM530Lw/NI+8CFE/4k6LcqvDoHpD7fgMiF6WbrC8VXqcYeS/I+Mf0P jCSpGth/bkaP1fBzfatxVvF+umSGoTLEj/KL X-Google-Smtp-Source: ABdhPJyAyLd6v1RyBtkf3fxys7CaqZkq2R3Dko4mlwHgW12gRl/bV6FUbR0jK0fU+qCjX9b0qZRR5w== X-Received: by 2002:a05:6808:164e:b0:2ef:8736:8eab with SMTP id az14-20020a056808164e00b002ef87368eabmr7735829oib.208.1648301177088; Sat, 26 Mar 2022 06:26:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 17/39] util/log: Drop return value from qemu_log Date: Sat, 26 Mar 2022 07:25:12 -0600 Message-Id: <20220326132534.543738-26-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::230 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::230; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x230.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303431035100001 Content-Type: text/plain; charset="utf-8" The only user of this feature, tcg_dump_ops, has been converted to use fprintf directly. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- include/qemu/log-for-trace.h | 2 +- util/log.c | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/include/qemu/log-for-trace.h b/include/qemu/log-for-trace.h index 5e41517227..d47c9cd446 100644 --- a/include/qemu/log-for-trace.h +++ b/include/qemu/log-for-trace.h @@ -30,6 +30,6 @@ static inline bool qemu_loglevel_mask(int mask) } =20 /* main logging function */ -int G_GNUC_PRINTF(1, 2) qemu_log(const char *fmt, ...); +void G_GNUC_PRINTF(1, 2) qemu_log(const char *fmt, ...); =20 #endif diff --git a/util/log.c b/util/log.c index 090bc3bc39..2bd4dfba1b 100644 --- a/util/log.c +++ b/util/log.c @@ -59,26 +59,17 @@ void qemu_log_unlock(FILE *fd) } } =20 -/* Return the number of characters emitted. */ -int qemu_log(const char *fmt, ...) +void qemu_log(const char *fmt, ...) { FILE *f =3D qemu_log_trylock(); - int ret =3D 0; - if (f) { va_list ap; =20 va_start(ap, fmt); - ret =3D vfprintf(f, fmt, ap); + vfprintf(f, fmt, ap); va_end(ap); qemu_log_unlock(f); - - /* Don't pass back error results. */ - if (ret < 0) { - ret =3D 0; - } } - return ret; } =20 static void __attribute__((__constructor__)) qemu_logfile_init(void) --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648302969; cv=none; d=zohomail.com; s=zohoarc; b=naAqM+g6AOuTqVO3k5Aat/L8ykWpIt35kdoMfBFuW3PuzXiwbIeLKn7tsKtIC968gvc2gSnfMIwORF1NxgU3vL1wlRBBhX1wzL6iFAoJV2EWO0sFtoBHDQ7EX76svqjJaVFfC6vve0YGK9BD8K6PWqVaA0Ym1/KgXRlk06uBmDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648302969; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7UhpieTmtFS288gQ6ONEYE1O22i32fWGmp3rPIltdFw=; b=C4VjNeEjrOmInoDfk8DYi+O96SiOaSVVxggOwipF0+UwFLU2L2qqw/TQwqyhfjKxTPvr6SYgb5Xnlww3BEP6fEWXXshKxmPtbvU7ISrW4JrSBxzWidnRYGUe/SpI8lF54Vppr+gAK5M2zKy4JGY9wGBOzFtf/qd9Yjs1vH9HHHI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648302969113205.9520124530494; Sat, 26 Mar 2022 06:56:09 -0700 (PDT) Received: from localhost ([::1]:36076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6tj-000570-No for importer@patchew.org; Sat, 26 Mar 2022 09:56:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qw-0007VQ-FG for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:24 -0400 Received: from [2001:4860:4864:20::2b] (port=41702 helo=mail-oa1-x2b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qu-0005Ve-Hc for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:22 -0400 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-dd9d3e7901so10708454fac.8 for ; Sat, 26 Mar 2022 06:26:19 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7UhpieTmtFS288gQ6ONEYE1O22i32fWGmp3rPIltdFw=; b=hQEOV8VFb8U9KhfIMtbSVRjj4U8dQIg6g8SdNRWniBGSgJEbFp1ta/BicT2kRr6XKU QB7qn/cTuHEaOIdnfg/XifD1Ym44NxBCv7CRvUmBcsoK+4trJrlr048utnd54hU7GZOE rzNm/YrgNpYYYLnqwhRXbGiKlmv7kkoBTmrYaVGXn+nzjpN/mgBaSFE5VLg+14vqlxxB HvtvibTT82IGmSul/uxPxgBD8yYmy+IVdjazde6Ztp0vjQhFE5sBpTRWPVS6VN/aRh2A 2suEdU7cLxf22Mh3E3rLwK5WciIf0PvX/rmtYfnu+FMhw4wV48QufNaJ7DplQ/eSB3Lm ZDmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7UhpieTmtFS288gQ6ONEYE1O22i32fWGmp3rPIltdFw=; b=meTj54hABm2q7Ro7X9zme30V4YHszF73xVaytlVLL56lKqSS2Z8EYw54O63U5FFsUf FSNvVGgP8Db+jFay/nMsf/G+xEpkCXsLag0NDF2A+VrBRif63TrTmu8IjgFJqu36ceJS aDukJ75j/lkS5At6UUpZir61uYaSPJa2/Bl14d6OS+F48t9wf41B7BZILbG/XzAdrIsx uSQyani+IvhuuzNx88OoeX61EUgatGKye1LDN1Q5JWNUCxwMRA72T7RR/v51F8oFilvM wSy2HpOe6EsiHHReYhLV92TZ0E93CILtZz8e/bGj2Gdsbtxg1bbISMutV44LVv2LzYAf CiGA== X-Gm-Message-State: AOAM532zvIhLar7G4SoC4EfAiYO2lhZ1uC7jK9kn2sVo6p5tzLop0Ol8 XNodYXKys2ZresKjyXRKWmALZZgv0VH4z+IW X-Google-Smtp-Source: ABdhPJzxF6BgUz7ehH/eGBQ9bWLjnG9Yom1Ajl8XtNENIXbAmKyr4F9e1NUEpDwbIJtMdC418bPSpg== X-Received: by 2002:a05:6870:204c:b0:de:10fe:ba3b with SMTP id l12-20020a056870204c00b000de10feba3bmr7190665oad.80.1648301178861; Sat, 26 Mar 2022 06:26:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 18/39] util/log: Mark qemu_log_trylock as G_GNUC_WARN_UNUSED_RESULT Date: Sat, 26 Mar 2022 07:25:13 -0600 Message-Id: <20220326132534.543738-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2b; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648302970928100001 Content-Type: text/plain; charset="utf-8" Now that all uses have been updated, consider a missing test of the result of qemu_log_trylock a bug and Werror. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- include/qemu/log.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index 2d9455dc85..3a1f3a6020 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -67,7 +67,7 @@ static inline bool qemu_log_separate(void) =20 /* Lock/unlock output. */ =20 -FILE *qemu_log_trylock(void); +FILE *qemu_log_trylock(void) G_GNUC_WARN_UNUSED_RESULT; void qemu_log_unlock(FILE *fd); =20 /* Logging functions: */ --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303096; cv=none; d=zohomail.com; s=zohoarc; b=hORiCJIy04ph+vvR4RrcaE//D+3UaOx0BPfeH3kdsHG8sYEgGx0phsoc3D62+JihLaUi2+GFhjLzeMU+96a+4sko3kS4FJvpNFBpOjAXRgchSzXfUE7Zp2x9Pbc1y8DOnYRn7KHbsppOuwrlGm/lRuuhfOkUsYdfE7OCm2twdKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303096; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HCB05Inte9LF7rNCvDwYZMk3/K4+jeUff4g5SjwTBWk=; b=gCZ1+OoukgvcdEaMffIbIFjAj1Q+GYlv4TcrGMN+XbMjAv9wP7TQmMst0hRLS8kCamkX86d05JGqHVu38witXSZGgO/TYHU9UOsFABtaKmlywLfZ1uZLBekwOm4hsZvA2ijhChqFUH5E1e+ndO8FOC6fogpHsES35bDKaKAI8zc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303096161285.8989277580856; Sat, 26 Mar 2022 06:58:16 -0700 (PDT) Received: from localhost ([::1]:40836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6vn-0008SQ-3j for importer@patchew.org; Sat, 26 Mar 2022 09:58:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qx-0007Va-Lc for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:24 -0400 Received: from [2001:4860:4864:20::2a] (port=43741 helo=mail-oa1-x2a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qv-0005Vm-P4 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:23 -0400 Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-de2cb87f6aso10702807fac.10 for ; Sat, 26 Mar 2022 06:26:21 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HCB05Inte9LF7rNCvDwYZMk3/K4+jeUff4g5SjwTBWk=; b=h/d1M3QX7NQyvcr60/4rpCWpZhAuc4mXqkIgy9Vxh9y7UP12aBI6sx9B6Edde0gJlU 2ABB8VVdxQD85FLUcg57poXkC8fdCIYAheQnXVzvysjJnGmFbNVJTvzoSm251HwDTolP uTOfIz66vjGJ7+ZJwDxVQ+Dd/K3ru18c7OG7s7SyZ6fgPRx0+JuL73UGWDtIMHVCb5cc WN27DI+EvLQOPBDIk1juOctUTlGreK0jYw7M7S/AjH6sQCXr0GoI/LpEd50CIVB/kag8 GqEpIOLHVrfEl/YE6qRcdriO8Q0+zJHQWBCtqxX5wtjL4PQg9JcDpzf3cgKhEHd3UCr/ tYVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HCB05Inte9LF7rNCvDwYZMk3/K4+jeUff4g5SjwTBWk=; b=ptaA1IsEPyvv1DnJugR3SwFpv5L7A0bpAHhmrtAgYwOpb34+rEViA7EFy5xuTDsMl5 GPMOfumi9PrMs62x47XBsf6TV/pSiEs3gyWXmeNim/YkH1XRK4Xx+E87Y1k9vZpiBhNU LbrmEyBKnGNOo2e+csJW4Jna4iShQXBW5f8gIhkplqJb0AyCZ5y8+te+oYlrFeNbqeW/ hTmrnP2/o7EdhWdPvFVkkO95M0WXsyAwvRKTCOckEL1N3iJPigVl/y+3MyMV4vXS06CB SAf4MwKcK52gJ+G3Ou5jUegLNt89rUdlATzP8ajbT9NXRP4EBz7nv3o6CI0PewabF1PA qzuA== X-Gm-Message-State: AOAM5303pKSu9PECDd/iz2SwdGcbXaRSRLEq1reDz4QUnWGX6y++FVfo YwRF+7WqXGVZrGl4NTKwxafo0HpaX6P7jES0 X-Google-Smtp-Source: ABdhPJz1PXl5eo8VdPP+GYBbAyxmQBQ8dm+PM+6+p+0Vpy3MR3Y9VBS0X8KnW62LAwWx724B4XUcNQ== X-Received: by 2002:a05:6870:a1a0:b0:dd:e471:8baf with SMTP id a32-20020a056870a1a000b000dde4718bafmr11195479oaf.40.1648301180369; Sat, 26 Mar 2022 06:26:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 19/39] util/log: Remove qemu_log_flush Date: Sat, 26 Mar 2022 07:25:14 -0600 Message-Id: <20220326132534.543738-28-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2a; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303096556100001 All uses flush output immediately before or after qemu_log_unlock. Instead of a separate call, move the flush into qemu_log_unlock. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- include/qemu/log.h | 2 -- accel/tcg/translate-all.c | 1 - cpu.c | 1 - hw/net/can/can_sja1000.c | 1 - hw/xen/xen_pvdev.c | 1 - net/can/can_socketcan.c | 1 - tcg/tcg.c | 1 - util/log.c | 14 +------------- 8 files changed, 1 insertion(+), 21 deletions(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index 3a1f3a6020..75973111bb 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -121,8 +121,6 @@ int qemu_str_to_log_mask(const char *str); */ void qemu_print_log_usage(FILE *f); =20 -/* fflush() the log file */ -void qemu_log_flush(void); /* Close the log file */ void qemu_log_close(void); =20 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 4812619f00..6080ea997a 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1595,7 +1595,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, } } fprintf(logfile, "\n"); - qemu_log_flush(); qemu_log_unlock(logfile); } } diff --git a/cpu.c b/cpu.c index 3340bb7538..bfa4db9cd8 100644 --- a/cpu.c +++ b/cpu.c @@ -406,7 +406,6 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) vfprintf(logfile, fmt, ap2); fprintf(logfile, "\n"); cpu_dump_state(cpu, logfile, CPU_DUMP_FPU | CPU_DUMP_CCOP); - qemu_log_flush(); qemu_log_unlock(logfile); } qemu_log_close(); diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c index 23d634af6f..e0f76d3eb3 100644 --- a/hw/net/can/can_sja1000.c +++ b/hw/net/can/can_sja1000.c @@ -261,7 +261,6 @@ static void can_display_msg(const char *prefix, const q= emu_can_frame *msg) fprintf(logfile, " %02X", msg->data[i]); } fprintf(logfile, "\n"); - qemu_log_flush(); qemu_log_unlock(logfile); } } diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c index 0423c61158..037152f063 100644 --- a/hw/xen/xen_pvdev.c +++ b/hw/xen/xen_pvdev.c @@ -230,7 +230,6 @@ void xen_pv_printf(struct XenLegacyDevice *xendev, int = msg_level, xen_pv_output_msg(xendev, stderr, fmt, args); va_end(args); } - qemu_log_flush(); } =20 void xen_pv_evtchn_event(void *opaque) diff --git a/net/can/can_socketcan.c b/net/can/can_socketcan.c index a6388563c3..c1a1ad0563 100644 --- a/net/can/can_socketcan.c +++ b/net/can/can_socketcan.c @@ -89,7 +89,6 @@ static void can_host_socketcan_display_msg(struct qemu_ca= n_frame *msg) fprintf(logfile, " %02X", msg->data[i]); } fprintf(logfile, "\n"); - qemu_log_flush(); qemu_log_unlock(logfile); } } diff --git a/tcg/tcg.c b/tcg/tcg.c index 25e987d881..124d8be1a0 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -783,7 +783,6 @@ void tcg_prologue_init(TCGContext *s) disas(logfile, s->code_gen_ptr, prologue_size); } fprintf(logfile, "\n"); - qemu_log_flush(); qemu_log_unlock(logfile); } } diff --git a/util/log.c b/util/log.c index 2bd4dfba1b..cab0642a7f 100644 --- a/util/log.c +++ b/util/log.c @@ -54,6 +54,7 @@ FILE *qemu_log_trylock(void) void qemu_log_unlock(FILE *fd) { if (fd) { + fflush(fd); qemu_funlockfile(fd); rcu_read_unlock(); } @@ -269,19 +270,6 @@ out: g_strfreev(ranges); } =20 -/* fflush() the log file */ -void qemu_log_flush(void) -{ - QemuLogFile *logfile; - - rcu_read_lock(); - logfile =3D qatomic_rcu_read(&qemu_logfile); - if (logfile) { - fflush(logfile->fd); - } - rcu_read_unlock(); -} - /* Close the log file */ void qemu_log_close(void) { --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648302839; cv=none; d=zohomail.com; s=zohoarc; b=ZWuyybLm3lhMLfE+bCst8EC6ru5S0GwsgM9EZTZ45gTYrXDBkq0ERvD0zxp4iaOcjgN0Xw9lNBBdxhnSKkoimGtyJZEpdcxXHK1fY34gYHvMPMc9j9jZo+3KzRdjQ+e447q7IsfnhAoMHJzYwZQMQZd8QwS021nKO3XkuSQrv5s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648302839; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i47bs5CBOE5da9L+yyKjt/bVgLDqpLar0tLDMlVsDtQ=; b=f2VPnCHzxPHiNS7YGGAhrBrMn1bKfdjS4NKvKV3haBhhOvF9LyoJwcCwYQVftjQrntQNPaGumEgV5/2iMDnb/LkpGxh77FMGeoXACwriI7GK+h9CfP7hB7P8qUwJTaUCFOob6jrNhG9Sox14kKRTSaMJXlFfi31GQoOo/140iCM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648302839314969.3837278453707; Sat, 26 Mar 2022 06:53:59 -0700 (PDT) Received: from localhost ([::1]:60706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6re-0002aS-4n for importer@patchew.org; Sat, 26 Mar 2022 09:53:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qy-0007XU-GO for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:24 -0400 Received: from [2001:4860:4864:20::2e] (port=43745 helo=mail-oa1-x2e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qx-0005W3-5H for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:24 -0400 Received: by mail-oa1-x2e.google.com with SMTP id 586e51a60fabf-de2cb87f6aso10702848fac.10 for ; Sat, 26 Mar 2022 06:26:22 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i47bs5CBOE5da9L+yyKjt/bVgLDqpLar0tLDMlVsDtQ=; b=NAu8kTcbn09tztmTi28UI3LWvUPYTfZq37ZUq9q4LPv+l0pVnQ/KTxgivz/XmGxCty UaqslFrhY4pkVIWt1AVMRoBZljqKVi3RHVatcI0h63hxZPgbY76hjGXA2Omhk+OHmUo/ jx8B7u5ym1t9T/FVK23drvT2OJhviOv6qdKU61jytJu7yPg8rLR8PdUH08Rysruabc0V RV3j6wE00a7E8ttpAf9quEjgKvlaxvCVOm2QEv9sw/HPmAyP/SZdYOnQFsD/mS69ZlJs o/rDa2N8/i+r7xTnIF8AgCYeKdKoDiU0I9yI49sBgvHQ5vEOUmiVg3olhIalCg2ERhe+ W5qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i47bs5CBOE5da9L+yyKjt/bVgLDqpLar0tLDMlVsDtQ=; b=DIlttt93rtG59rtg8jD1VOdQjMkVKg46ld/1FXEbIKVj9mc/G0rITZh+lWoIJIhywR ZZA8sPYjqxT4ZU8F7xdrFAoTjwGGiBO/Bbw3k83ieV4ldT/ImpwD4iUVvMUtSefFBj67 hs0T7i2ykO4wzbD8sZCTsSGV4BOFZjIv8vSp4zhqSp7BhRB6k9SjEifkaxv8WTVeY2jL jX64papRzLkmcjASCzdzGzcnketjx/Ij73HdoxPavDM27OQfPnaRGQVKXO/1SxIDtTQK hENpaJfTlOwZLe8gIs0yNhX8NOzIr9T4mGFt3Q0eVM08bbeqEvkimYMmoukL6/fxrkxx lSLQ== X-Gm-Message-State: AOAM532nB2/dRmyum+tjRZMzSMPaEod2lKwxV/ZgUgibLzgMew44dXTm Qk3BA7VCjU/Xtg25Fl9YU+8ZQGKPUd/vDl83 X-Google-Smtp-Source: ABdhPJyIChODOvIcIjEApj3Sd0DYWTSQZdfwA8pOuUreHGacrKkzUw/T011lhphfGLZdy/3dqda7Uw== X-Received: by 2002:a05:6871:5c8:b0:de:75a7:1a45 with SMTP id v8-20020a05687105c800b000de75a71a45mr6907895oan.181.1648301181841; Sat, 26 Mar 2022 06:26:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 20/39] util/log: Drop call to setvbuf Date: Sat, 26 Mar 2022 07:25:15 -0600 Message-Id: <20220326132534.543738-29-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2e (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2e; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648302840024100003 Content-Type: text/plain; charset="utf-8" Now that the log buffer is flushed after every qemu_log_unlock, which includes every call to qemu_log, we do not need to force line buffering (or unbuffering for windows). Block buffer the entire loggable unit. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- util/log.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/util/log.c b/util/log.c index cab0642a7f..caa38e707b 100644 --- a/util/log.c +++ b/util/log.c @@ -136,12 +136,6 @@ bool qemu_set_log(int log_flags, Error **errp) logfile->fd =3D stderr; } =20 -#if defined(_WIN32) - /* Win32 doesn't support line-buffering, so use unbuffered output.= */ - setvbuf(logfile->fd, NULL, _IONBF, 0); -#else - setvbuf(logfile->fd, NULL, _IOLBF, 0); -#endif log_append =3D 1; qatomic_rcu_set(&qemu_logfile, logfile); } --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303684; cv=none; d=zohomail.com; s=zohoarc; b=dGwFd1k/tnJOt3r7Y9BLFpRzxNvuaZNe1mcASP0zOndjqYwolWCztCOEwSWe2JLQ25QHYvpydTH5/p6lNx7i3Iai0YSsT5w2YpMhq4NGEQIl6K3JfpUIMLHRjC6t4L/4g3pnikjD8nZgT/keZ65B8/kcu+bO6/lDj+P5gqWlXnI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303684; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m34esa3hgxLOFhKAAREVlVqf9cUjZXCYhsy9QojcN0M=; b=CLJiqxtibb1l9F1iGYfXAEcdkMu5fL9PnwdXMLK9MuXvCp1ySZ+JQg+Vam1QAxOR+rqWrCg7wbPxpZc3yYUuGZlIty/vRNthsklj5NmRigcdDBc+URWDwBAqE2hGr9B4kMy82VkoGLTtoxvWlcT9Tbzk4VV0nOdY6/zhfA7kosg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303684494374.5697367880823; Sat, 26 Mar 2022 07:08:04 -0700 (PDT) Received: from localhost ([::1]:37496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY75H-0000ET-GK for importer@patchew.org; Sat, 26 Mar 2022 10:08:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Qz-0007Zl-M9 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:29 -0400 Received: from [2607:f8b0:4864:20::22e] (port=45694 helo=mail-oi1-x22e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6Qy-0005WR-4X for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:25 -0400 Received: by mail-oi1-x22e.google.com with SMTP id 12so11067460oix.12 for ; Sat, 26 Mar 2022 06:26:23 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m34esa3hgxLOFhKAAREVlVqf9cUjZXCYhsy9QojcN0M=; b=TRHgZ/oJCFEh5u52Hgg3SbEKowSq0DISpl9ug9e7+JsZm9zSjgNeMlt4eN78uAlh92 JWDVtXTHdxWsgxO3fpWpU9qZnB6gMFi8a+/Qp87JklqG9ovwqAYRqSYEN8n/H/g3wjGV vdSXA5Fvbg3G8xxadKiZNcdkbY7vaNJqhZ/9y9+XOcSEyTEMlnGtHx9ORRSBIcEaZCJ/ PwKf3/ux0uSWhijgPQ0HXHv/B2r700gnucYfCjiuUWP+0XvU1CoMHAhJW0p1Se259IUR Jl4XihDi0rGOToH8lzd2LiN7KPW/xm//qq2aI0DV0Oe5gIyp+rowZwMUxTiUOm80Cnys c2wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m34esa3hgxLOFhKAAREVlVqf9cUjZXCYhsy9QojcN0M=; b=E3vDnzaMj48gnaMDOBOv8RNpmuOyDcdsk55WXq0Lfgu+o37UmpF50DR3FHFZ1RF2+h YaXvin1wufN2Y8TjTTexzAP8KKxzMqrjeBXeVZ19c3qfsd2WvwcLtS0/5r5CXyRpB65E TJlwLOTwtDGSO6dZ47dWLp3hnFw63tPpHTz+aU2aiKvDV3CzjJ50FWe/n3TtFuyOwU8I /KhNbmyWtMuACUBs2yhEluWJ+EjR3s7IJgcp0HauDoBlOo3mA7PIljm86Yke4sDm83e9 fx35DdPm3xef/b8de9HYrOOzWcZqz3K3fIpFe/hoKQ9d/tPZ38DT6IAFMYhGc9AMxhkG 0GSQ== X-Gm-Message-State: AOAM530wM6vnktPvmfG15npHd6lNTP6NgPu6PcbjQC81DyFyZzdvwBxx JwTC5tYnugu94yyrzWmbhMfTrrKYSY9e5Aqf X-Google-Smtp-Source: ABdhPJzhkOgq8FTScios2a4t14dxhjb6SH3aCFVMG3T7RWplDtpQLTUaBYvP0rfWcKWFdy/bRqK26g== X-Received: by 2002:aca:2b0b:0:b0:2da:3ed3:f862 with SMTP id i11-20020aca2b0b000000b002da3ed3f862mr12544027oik.65.1648301183062; Sat, 26 Mar 2022 06:26:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 21/39] bsd-user: Expand log_page_dump inline Date: Sat, 26 Mar 2022 07:25:16 -0600 Message-Id: <20220326132534.543738-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22e (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22e; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303685531100001 Content-Type: text/plain; charset="utf-8" We have extra stuff to log at the same time. Hoist the qemu_log_trylock/unlock to the caller and use fprintf. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- bsd-user/main.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 0c8aa1ae90..ed26fc5acb 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -503,20 +503,29 @@ int main(int argc, char **argv) g_free(target_environ); =20 if (qemu_loglevel_mask(CPU_LOG_PAGE)) { - qemu_log("guest_base %p\n", (void *)guest_base); - log_page_dump("binary load"); + FILE *f =3D qemu_log_trylock(); + if (f) { + fprintf(f, "guest_base %p\n", (void *)guest_base); + fprintf(f, "page layout changed following binary load\n"); + page_dump(f); =20 - qemu_log("start_brk 0x" TARGET_ABI_FMT_lx "\n", info->start_brk); - qemu_log("end_code 0x" TARGET_ABI_FMT_lx "\n", info->end_code); - qemu_log("start_code 0x" TARGET_ABI_FMT_lx "\n", - info->start_code); - qemu_log("start_data 0x" TARGET_ABI_FMT_lx "\n", - info->start_data); - qemu_log("end_data 0x" TARGET_ABI_FMT_lx "\n", info->end_data); - qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n", - info->start_stack); - qemu_log("brk 0x" TARGET_ABI_FMT_lx "\n", info->brk); - qemu_log("entry 0x" TARGET_ABI_FMT_lx "\n", info->entry); + fprintf(f, "start_brk 0x" TARGET_ABI_FMT_lx "\n", + info->start_brk); + fprintf(f, "end_code 0x" TARGET_ABI_FMT_lx "\n", + info->end_code); + fprintf(f, "start_code 0x" TARGET_ABI_FMT_lx "\n", + info->start_code); + fprintf(f, "start_data 0x" TARGET_ABI_FMT_lx "\n", + info->start_data); + fprintf(f, "end_data 0x" TARGET_ABI_FMT_lx "\n", + info->end_data); + fprintf(f, "start_stack 0x" TARGET_ABI_FMT_lx "\n", + info->start_stack); + fprintf(f, "brk 0x" TARGET_ABI_FMT_lx "\n", info->brk); + fprintf(f, "entry 0x" TARGET_ABI_FMT_lx "\n", info->entr= y); + + qemu_log_unlock(f); + } } =20 /* build Task State */ --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303144; cv=none; d=zohomail.com; s=zohoarc; b=L0xwQ1qOLX2L0BlUlj0FFV3k5Q4z+FSbZLDNFjYMaZ/Yf+sULygdYoRHz5CfWXLWRO31ze8prXWks+/WTwz6iLssm8DyN+z1XDjvbkIb2qM9Sm/A6u9/jZwwVcCY2DA2Lf1wL//palY3dx/P7EtuaiB/UD1vJEonvTe36T3nQYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303144; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UBUdVtyUYy7eWABhSXggubY5JYSwV4Dsg0nD3y0Kids=; b=YzdTgfgXssdRd2F1jqITsyEiyp6utQZCWvuQwMykuARxUvxcYQZq9H6DD9r89NsTUNWlnlwMFr9DBm8rXLwHGNeRkcOEv1O87V8zq3PYPGggyaQ/0kZtSwNFffFXzqsBGwNmn8i2FQtxYjDHt+hh2CVBgDaPR1mC6LSSRmu4HCk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303143995484.22322888408996; Sat, 26 Mar 2022 06:59:03 -0700 (PDT) Received: from localhost ([::1]:43768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6wY-00025J-SD for importer@patchew.org; Sat, 26 Mar 2022 09:59:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6R3-0007Zq-Bc for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:30 -0400 Received: from [2001:4860:4864:20::29] (port=36754 helo=mail-oa1-x29.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6R1-0005X0-DN for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:29 -0400 Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-dda559a410so10744415fac.3 for ; Sat, 26 Mar 2022 06:26:25 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UBUdVtyUYy7eWABhSXggubY5JYSwV4Dsg0nD3y0Kids=; b=AvpCW/zWvmQyC8hmYLgUDJUqOXSmzDau5tDMvG8/dWPZtQ713EThwvN8xebcNxGcsn q9LLQ+Pvs+Fvom6xbZcVb4KVlkaIhZp96eyCZAcuy2RRLj4YuHLXJGuii/uwc4cqCjPu D6weYNq19yPZ1s0h2IJ5yIj93JXkaG7DkusNIZfLlMo3XewSOxZgJpPJy1CW8qZxASAm ePd/2Zi2c3Y5LGVJZkjRIMz5P3ubrIiCoZ3vaDa4OXkJPcC8g0GKCoqALD6kC16B15ao nJ1G0LyX5pQVmfcWY4yHn+RoJyWLXGRtC26Z4908nXPfMstaZU1ksdPiuBUE/eqREkUq 8KGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UBUdVtyUYy7eWABhSXggubY5JYSwV4Dsg0nD3y0Kids=; b=Qru9pu20KiqP4z8fjTHS6UjPH6WwHIdV8ffO4Jn2uVl8Pfc4yCBKeJLXCPjq0JTZMT o6o5MjiO1QaZh9KmACshMOdHz7M8dYoCvzIbgtxZBbP31Rbr7Ao/c8MWUjut11/V9yST u8vqBIAL754ildNS1V87Yl09TjprFuzpzTR317AKPxuzEBwy+IrGAF2wI1JjzraIrxop Wg+77N3R9kJnLRM/1sNPCUnEC3BlFY2Olal+V93L6m3LNyS0L+j0mVJXWKw08B6xr4E1 6icMcsxiWV2BGokjsEOr4JXAhHbVjbxUnaBwNC5/272SdPerwt1XKG29o0N6E96lf/B/ /wKQ== X-Gm-Message-State: AOAM530UIneXK217aZJARJjvHGbGJaO8LB0+ZjtTFXakfki+jHFTJ9xH AKFtTcfREsGETGDutBlLznY2uSIVTdj5K0bX X-Google-Smtp-Source: ABdhPJwsSMIzGP/ly6h+calhR+aG1bDzCT+a+dQYARJ0CKW4fYI8g0ijkGJ4Ul6kCVp66qQ1dlXvzg== X-Received: by 2002:a05:6870:14d6:b0:dd:9907:2c4c with SMTP id l22-20020a05687014d600b000dd99072c4cmr7201371oab.70.1648301184793; Sat, 26 Mar 2022 06:26:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 22/39] linux-user: Expand log_page_dump inline Date: Sat, 26 Mar 2022 07:25:17 -0600 Message-Id: <20220326132534.543738-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::29 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::29; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x29.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303144762100001 Content-Type: text/plain; charset="utf-8" We have extra stuff to log at the same time. Hoist the qemu_log_lock/unlock to the caller and use fprintf. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- include/exec/log.h | 15 --------------- linux-user/main.c | 43 +++++++++++++++++++++++++++++-------------- linux-user/mmap.c | 7 ++++++- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/include/exec/log.h b/include/exec/log.h index 06ab9841ee..ad0a40cfeb 100644 --- a/include/exec/log.h +++ b/include/exec/log.h @@ -42,19 +42,4 @@ static inline void log_cpu_state_mask(int mask, CPUState= *cpu, int flags) } } =20 -#ifdef NEED_CPU_H -#if defined(CONFIG_USER_ONLY) -/* page_dump() output to the log file: */ -static inline void log_page_dump(const char *operation) -{ - FILE *logfile =3D qemu_log_trylock(); - if (logfile) { - fprintf(logfile, "page layout changed following %s\n", operation); - page_dump(logfile); - } - qemu_log_unlock(logfile); -} -#endif -#endif - #endif diff --git a/linux-user/main.c b/linux-user/main.c index 6aed4929ab..d263b2a669 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -857,21 +857,36 @@ int main(int argc, char **argv, char **envp) g_free(target_environ); =20 if (qemu_loglevel_mask(CPU_LOG_PAGE)) { - qemu_log("guest_base %p\n", (void *)guest_base); - log_page_dump("binary load"); + FILE *f =3D qemu_log_trylock(); + if (f) { + fprintf(f, "guest_base %p\n", (void *)guest_base); + fprintf(f, "page layout changed following binary load\n"); + page_dump(f); =20 - qemu_log("start_brk 0x" TARGET_ABI_FMT_lx "\n", info->start_brk); - qemu_log("end_code 0x" TARGET_ABI_FMT_lx "\n", info->end_code); - qemu_log("start_code 0x" TARGET_ABI_FMT_lx "\n", info->start_code= ); - qemu_log("start_data 0x" TARGET_ABI_FMT_lx "\n", info->start_data= ); - qemu_log("end_data 0x" TARGET_ABI_FMT_lx "\n", info->end_data); - qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n", info->start_stac= k); - qemu_log("brk 0x" TARGET_ABI_FMT_lx "\n", info->brk); - qemu_log("entry 0x" TARGET_ABI_FMT_lx "\n", info->entry); - qemu_log("argv_start 0x" TARGET_ABI_FMT_lx "\n", info->arg_start); - qemu_log("env_start 0x" TARGET_ABI_FMT_lx "\n", - info->arg_end + (abi_ulong)sizeof(abi_ulong)); - qemu_log("auxv_start 0x" TARGET_ABI_FMT_lx "\n", info->saved_auxv= ); + fprintf(f, "start_brk 0x" TARGET_ABI_FMT_lx "\n", + info->start_brk); + fprintf(f, "end_code 0x" TARGET_ABI_FMT_lx "\n", + info->end_code); + fprintf(f, "start_code 0x" TARGET_ABI_FMT_lx "\n", + info->start_code); + fprintf(f, "start_data 0x" TARGET_ABI_FMT_lx "\n", + info->start_data); + fprintf(f, "end_data 0x" TARGET_ABI_FMT_lx "\n", + info->end_data); + fprintf(f, "start_stack 0x" TARGET_ABI_FMT_lx "\n", + info->start_stack); + fprintf(f, "brk 0x" TARGET_ABI_FMT_lx "\n", + info->brk); + fprintf(f, "entry 0x" TARGET_ABI_FMT_lx "\n", + info->entry); + fprintf(f, "argv_start 0x" TARGET_ABI_FMT_lx "\n", + info->arg_start); + fprintf(f, "env_start 0x" TARGET_ABI_FMT_lx "\n", + info->arg_end + (abi_ulong)sizeof(abi_ulong)); + fprintf(f, "auxv_start 0x" TARGET_ABI_FMT_lx "\n", + info->saved_auxv); + qemu_log_unlock(f); + } } =20 target_set_brk(info->brk); diff --git a/linux-user/mmap.c b/linux-user/mmap.c index c125031b90..bbb2c2e178 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -630,7 +630,12 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, i= nt target_prot, the_end: trace_target_mmap_complete(start); if (qemu_loglevel_mask(CPU_LOG_PAGE)) { - log_page_dump(__func__); + FILE *f =3D qemu_log_trylock(); + if (f) { + fprintf(f, "page layout changed following mmap\n"); + page_dump(f); + qemu_log_unlock(f); + } } tb_invalidate_phys_range(start, start + len); mmap_unlock(); --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303554; cv=none; d=zohomail.com; s=zohoarc; b=i/LGlGTX5d1Aq406QGtB41VXWyol8T+AxtNT38Lf4ooxwmT73YI9a/az6C0d4DbpGq9Xy4fSKu3hpS5tstgIBqd9jMlo3cWVynmmRcIeYY2qG83Qx1+lvAO1YnFX2esi1wqWSuiNDh/pLSfj/eluurv/TQK+DmidGAXD6LCrR8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303554; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xvpxj4nK9wpX7Z4tgHMyHFYd/y+hd6ZVPNnNHANWilg=; b=BL08n7efPcL7xB49/nzkpMvubaTUyUbexyijwOHHajQ5cIr7k8lnBWfGRBMH+UKh/r/37+rYeF8aHeXqIT0WaJDLC4CWzkR9HfwllVQaTQ1TJFfR/ITKkt3tgyTc5FeRWWVbcuDIIu+oAymned+yKIRwBGHScImkHKCiEY0XycQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303554244887.2192204004077; Sat, 26 Mar 2022 07:05:54 -0700 (PDT) Received: from localhost ([::1]:57648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY73A-00037t-1C for importer@patchew.org; Sat, 26 Mar 2022 10:05:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6R3-0007Zp-9B for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:30 -0400 Received: from [2607:f8b0:4864:20::234] (port=34583 helo=mail-oi1-x234.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6R1-0005X8-Og for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:29 -0400 Received: by mail-oi1-x234.google.com with SMTP id v75so11116308oie.1 for ; Sat, 26 Mar 2022 06:26:26 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xvpxj4nK9wpX7Z4tgHMyHFYd/y+hd6ZVPNnNHANWilg=; b=TgEJo57iboti6CrVqfODuxx/cJ8iwhTI/hF+IObiEq38zwUhFdpf4IxOdTOIolQ4Ry 2MTO8/582lZkrfar8tv5ZYu8AtBQOUKrJjIFLnbWVvAIm3TGtIM15NhA9l2AC5ld2EI6 qmvPu16X/FzHK2xibb734uIJPPfNMftXmp7RB+V4zZdjyCqlg86m8i8aYzW8YugLr22Q nAzaPy67cZxD7veWqbioSTiF7Ex1ENdSJx29GQmt3sbFvbfm8bDdBCn0uPGl6jSbgA9r kV8MSbxsguMYsVWUULhPblC1Gc5mzjCcicZMtPOZboEhBLk+P4H9p6loDP9xqEAJPvq6 U+Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xvpxj4nK9wpX7Z4tgHMyHFYd/y+hd6ZVPNnNHANWilg=; b=ntsfXHxiyevs9KMeOlohCGtkw6XdJNa0nmIqDiOFNd6v8mx+9QkiIaqB7IF9ey2hPG qyEyllt/DhLpU0RGdB9C7tIdgylA97wLhxT4SwypGqNrJToO2ywj4XsAEDKwytWJUL9W /r9mYZKNwHe7asXL5pS4VVhbTbZFmxU5dCCfFtxYDLn8X6D58UyyAzTFycd/YHIRzpZ3 faVNNmL1sSNh9cC06XBbxi1UZ9nM7crmratQqIrXiVm0nXmPB9aURqkbD0VXRXj9801N +zAokjDVY1Uk/SVMv4mEMha6GyKTjl93JQfAUqvWYDBWQaVA2iwkqRDZnzfA9ere+hnu tLuQ== X-Gm-Message-State: AOAM532YWVN2DjMVQPB8iSXjZYBxngp2ewuIZW1FTNB0CYAni2OeIZIU vIOMumAOi0k8ULrKbDyVDideGpPgcsv99eSI X-Google-Smtp-Source: ABdhPJwsRQp4vwFYQiKKqEdd2m9Kizp8EfQ3frakC6JIWcbRnngvSnTMYUy74ZNggIQ7rTheDO1Zcg== X-Received: by 2002:aca:4b88:0:b0:2d9:f709:2c07 with SMTP id y130-20020aca4b88000000b002d9f7092c07mr7339543oia.212.1648301186044; Sat, 26 Mar 2022 06:26:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 23/39] tests/unit: Do not reference QemuLogFile directly Date: Sat, 26 Mar 2022 07:25:18 -0600 Message-Id: <20220326132534.543738-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::234 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::234; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x234.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303554905100001 Content-Type: text/plain; charset="utf-8" Use qemu_log_lock/unlock instead of the raw rcu_read. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- tests/unit/test-logging.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/tests/unit/test-logging.c b/tests/unit/test-logging.c index 54d7e8e33b..dcb8ac70df 100644 --- a/tests/unit/test-logging.c +++ b/tests/unit/test-logging.c @@ -110,12 +110,10 @@ static void test_parse_path(gconstpointer data) =20 static void test_logfile_write(gconstpointer data) { - QemuLogFile *logfile; - QemuLogFile *logfile2; + FILE *logfile0, *logfile1; gchar const *dir =3D data; - g_autofree gchar *file_path =3D NULL; + g_autofree gchar *file_path0 =3D NULL; g_autofree gchar *file_path1 =3D NULL; - FILE *orig_fd; =20 /* * Before starting test, set log flags, to ensure the file gets @@ -124,29 +122,28 @@ static void test_logfile_write(gconstpointer data) * this is needed. */ qemu_set_log(CPU_LOG_TB_OUT_ASM, &error_abort); - file_path =3D g_build_filename(dir, "qemu_test_log_write0.log", NULL); + file_path0 =3D g_build_filename(dir, "qemu_test_log_write0.log", NULL); file_path1 =3D g_build_filename(dir, "qemu_test_log_write1.log", NULL); =20 /* * Test that even if an open file handle is changed, * our handle remains valid due to RCU. */ - qemu_set_log_filename(file_path, &error_abort); - rcu_read_lock(); - logfile =3D qatomic_rcu_read(&qemu_logfile); - orig_fd =3D logfile->fd; - g_assert(logfile && logfile->fd); - fprintf(logfile->fd, "%s 1st write to file\n", __func__); - fflush(logfile->fd); + qemu_set_log_filename(file_path0, &error_abort); + logfile0 =3D qemu_log_trylock(); + g_assert(logfile0); + fprintf(logfile0, "%s 1st write to file\n", __func__); + fflush(logfile0); =20 /* Change the logfile and ensure that the handle is still valid. */ qemu_set_log_filename(file_path1, &error_abort); - logfile2 =3D qatomic_rcu_read(&qemu_logfile); - g_assert(logfile->fd =3D=3D orig_fd); - g_assert(logfile2->fd !=3D logfile->fd); - fprintf(logfile->fd, "%s 2nd write to file\n", __func__); - fflush(logfile->fd); - rcu_read_unlock(); + logfile1 =3D qemu_log_trylock(); + g_assert(logfile1); + g_assert(logfile0 !=3D logfile1); + fprintf(logfile0, "%s 2nd write to file\n", __func__); + fflush(logfile0); + qemu_log_unlock(logfile0); + qemu_log_unlock(logfile1); } =20 static void test_logfile_lock(gconstpointer data) --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303843; cv=none; d=zohomail.com; s=zohoarc; b=N2j9jRPW4AUoS0NpJtkejRLKydynIZ92FkI/0QApg6GmNYXFDZx1YoK08ytLvlDTvvzk+J7SyMtK9vNHwL5+n4SsaR3hcYoqeHfQjvdDCj6hWz4Uw80O9POSY96gITbR3Bfa+YkzIHCPMW11J/Pz30niu3ye0hDQlsfUyDfHvX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303843; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8o87i5bNiHOl6x8JfiL+JMb4mpGfXlTZfUHEJQ6T1J8=; b=hPGLxCUiexab/ezZRKSqU8bIEqtnjm7CxchPRwl3ILrACoTZRmIcDAofesBnxj6QyDM6MvV4EQJXgddds2OMtorUSBcDnz5ASs04n/BJib8ZP+Inzy9th/2YtcrDwJf9cZpCX2j5EYmhcgEidsWDXyCXtdlYIuEOLNbLMfkPfC8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303843639968.7039820582593; Sat, 26 Mar 2022 07:10:43 -0700 (PDT) Received: from localhost ([::1]:43928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY77q-0004VQ-K3 for importer@patchew.org; Sat, 26 Mar 2022 10:10:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6R4-0007bE-Gj for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:30 -0400 Received: from [2001:4860:4864:20::2b] (port=46989 helo=mail-oa1-x2b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6R2-0005XD-9k for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:30 -0400 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-d39f741ba0so10714425fac.13 for ; Sat, 26 Mar 2022 06:26:27 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8o87i5bNiHOl6x8JfiL+JMb4mpGfXlTZfUHEJQ6T1J8=; b=GMUfV9LIn5X04ckDRGKfffTTG6MFcPgZyf+hGkNjiO0WxgRNxFKRW4DZk5nlB6kPT+ IIuuoX6G4qK3IWr3fjdC5sq7juDqtqMeA/IXQmGx3A2mK1cC/PenWADP9PHkkp7zGPYu 8YvADF64DuSAIvJ7GErcXH08uzPtvsM31k17EPwhhB5WSX6Yl0ydFkG3cFb5twsTBW54 h9dQWERhrzfb4AYlSkjxjb+eq3N4oHf5VrqbL3BYX3eqlAyqvh9GQ+AgUje1I5rKNidk ENhTgLtdMdPsBScubniO35xW8hBJ/T+1O34tZHfvh113x/d1F8kya2A3dBOJrpG6fcxi Kpnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8o87i5bNiHOl6x8JfiL+JMb4mpGfXlTZfUHEJQ6T1J8=; b=2FHoNAZgW+tRk93Z5opZfRGiGlYkI8ApGY6QRjDkUsFYlODsBEBH/1s3kTmriLyzTP rVFA0d9wR0Y15CMC94NSra4Yr0cRWD5L0MZE9CmGYvQxKNpqPj8wE29dN9tV0yDs+2ZO TI0wCxsCCnVgcMfC2HchRR9fzN1FHTlPK/S7yPUAnJoAwcwzkxIlh9x8ruWEqXBkdWhB oI80ux0V6a0//Kd19vMW79gn+tbKyBZ8lKiKSdEb4hWojowF6O4RO3U4M3Y3bjLedrlc XlO9uPRhkUu+hb+e7wB9/xbkBLjs6SRS5O0iBL5hLRXb2gDa9EnL7JxiabQsbo8/ZW1w 7GEg== X-Gm-Message-State: AOAM5301DrSFcVNz4DTpDk9kU2HgIp+lUJ7l+saD3/yLC9i23IO9v4ML 5TipLQ+p+g8VaYT7znwQzb4wVs+w4dhWYk6h X-Google-Smtp-Source: ABdhPJwP3U7hpUS0FrZVGrEDxZrXX02R8/CWo8lx/6HaKBejYAAcZX/n92L/go7mw/z3MDUhePCV9Q== X-Received: by 2002:a05:6870:582:b0:d7:5fed:b7b1 with SMTP id m2-20020a056870058200b000d75fedb7b1mr7326769oap.78.1648301187346; Sat, 26 Mar 2022 06:26:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 24/39] include/exec/log: Do not reference QemuLogFile directly Date: Sat, 26 Mar 2022 07:25:19 -0600 Message-Id: <20220326132534.543738-33-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2b; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303844643100001 Content-Type: text/plain; charset="utf-8" Use qemu_log_trylock/unlock instead of the raw rcu_read. Signed-off-by: Richard Henderson --- include/exec/log.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/include/exec/log.h b/include/exec/log.h index ad0a40cfeb..4a7375a45f 100644 --- a/include/exec/log.h +++ b/include/exec/log.h @@ -15,15 +15,10 @@ */ static inline void log_cpu_state(CPUState *cpu, int flags) { - QemuLogFile *logfile; - - if (qemu_log_enabled()) { - rcu_read_lock(); - logfile =3D qatomic_rcu_read(&qemu_logfile); - if (logfile) { - cpu_dump_state(cpu, logfile->fd, flags); - } - rcu_read_unlock(); + FILE *f =3D qemu_log_trylock(); + if (f) { + cpu_dump_state(cpu, f, flags); + qemu_log_unlock(f); } } =20 --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303421; cv=none; d=zohomail.com; s=zohoarc; b=TxnTy6xxH8f08yo90RyExTqmbc6XcL7yfb7w+5Ffrc7bbZC2yuPtjetRCnFBSTFQssPW7bUa+rt04ns3WqqgWeHYDEz5nSl6aA+RpouzGlnS7VJaamZcSFpjVALPTnwDX3GKbzYJhk+KmoE2jDe0xLT7qsTtQAV0CvLI+BuBHZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303421; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kCBAoENAiY9tRs3tDbNuJNsMArF3Wl4ZlwA9j6bO048=; b=hbX44+E4OxCkd+2KHWzR9BBpH6BTFXH0ARNKhMM//mU7sXkRTPTAJIn2Vkoft2NQ1alciVMvtTtYAJV4Cqdq2GDC+9GE4zuTuOBbg8C5U9kTmXWxBEEwJ2mWEaDQA7PMWwegqBBjS4LawUiKi8A70MduKRerfHZF6m+9MEBRexw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303421822689.4954024268012; Sat, 26 Mar 2022 07:03:41 -0700 (PDT) Received: from localhost ([::1]:52314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY712-0007yx-IA for importer@patchew.org; Sat, 26 Mar 2022 10:03:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6R5-0007cH-TR for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:34 -0400 Received: from [2607:f8b0:4864:20::229] (port=41731 helo=mail-oi1-x229.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6R3-0005XW-U5 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:31 -0400 Received: by mail-oi1-x229.google.com with SMTP id e189so11079165oia.8 for ; Sat, 26 Mar 2022 06:26:29 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kCBAoENAiY9tRs3tDbNuJNsMArF3Wl4ZlwA9j6bO048=; b=Qi3kLmiWUXji1lVQ5t8FaRlLaxVjkvMMOQwv7qbEiqIQUwA4KaKrSSK/3Q0c5e2qXv jTvaBPKNgwMGFzcWP0sSNIWNzTf5WU6TaHLvgKlIvWPax7r2++4vpiRymaQHSDuDoId+ Xnfhh8TUqUo4N5WrWFCmpO0c1wm3D59PxsLuwIZkCmcC1s0LqD3DbTpxn5BXLI/Q2GjH IEwlxJhYjEyuYny+YRU8yXfhbpU1mDVO9r5t00QFo1thq4qHarR9Uxqo8zruLIrkNom5 /LQsN/LIjp64FjzAYcL7ulf1ociELXFDftiHQeA5OK/QlQUt4tXpLgMVutwT8XMVdV/o OWXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kCBAoENAiY9tRs3tDbNuJNsMArF3Wl4ZlwA9j6bO048=; b=YUgg7rChMZMaz2MaQCEGtUG/BcmQ0MwE/SXoosdiK78XyK3B4xGwGs+BKQATE0qCys hTsCRunQ6puuJFdcbN3D0oJyGY4zz9v8Dv3fwFXFcUxPe/O/23wC3AT6jv1zqVD9iY1W 1S48UiNxL+yTzv52SXYnzDbZZ5rUIX+TYVC6vgBrd5TP0MF3w5INhQJKWcWTPot9G+cA A0VQz/PcwVY+Muf12Qo4RT0garmggiVmUQ+AY9DYjrRMm5hy/1i1BmKLpvuRiW4jRSRQ EfEm5F0q9MCxWULGyNgU69pIVCJ1WHq0ibXrX0Gaya+GwVOUqRW1GjBhwQlo+1VBgysX o7lQ== X-Gm-Message-State: AOAM533BKWQ7RyZhB/zaWeEIUftaZItyeuvqXf0QwtUbQdDPeSKn27lR Hu0/xsjgH4qRaO1qiGBxbdfqzmFurA6i4AVP X-Google-Smtp-Source: ABdhPJwxUiFZj0mp6shMAcGUEMeesRutWxrIPM/LhUu2Lcu3rBmIxG2TD/r+GLVphAUd1ux+lgCmkg== X-Received: by 2002:a05:6808:2204:b0:2da:30c1:dd4c with SMTP id bd4-20020a056808220400b002da30c1dd4cmr8000386oib.195.1648301188974; Sat, 26 Mar 2022 06:26:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 25/39] include/qemu/log: Move entire implementation out-of-line Date: Sat, 26 Mar 2022 07:25:20 -0600 Message-Id: <20220326132534.543738-34-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::229 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::229; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x229.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303423019100001 Content-Type: text/plain; charset="utf-8" Move QemuLogFile, qemu_logfile, and all inline functions into qemu/log.c. No need to expose these implementation details in the api. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- include/qemu/log.h | 38 ++++---------------------------------- tests/unit/test-logging.c | 1 + util/log.c | 30 +++++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index 75973111bb..42d545f77a 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -3,46 +3,16 @@ =20 /* A small part of this API is split into its own header */ #include "qemu/log-for-trace.h" -#include "qemu/rcu.h" - -typedef struct QemuLogFile { - struct rcu_head rcu; - FILE *fd; -} QemuLogFile; - -/* Private global variable, don't use */ -extern QemuLogFile *qemu_logfile; - =20 /*=20 * The new API: - * */ =20 -/* Log settings checking macros: */ +/* Returns true if qemu_log() will really write somewhere. */ +bool qemu_log_enabled(void); =20 -/* Returns true if qemu_log() will really write somewhere - */ -static inline bool qemu_log_enabled(void) -{ - return qemu_logfile !=3D NULL; -} - -/* Returns true if qemu_log() will write somewhere else than stderr - */ -static inline bool qemu_log_separate(void) -{ - QemuLogFile *logfile; - bool res =3D false; - - rcu_read_lock(); - logfile =3D qatomic_rcu_read(&qemu_logfile); - if (logfile && logfile->fd !=3D stderr) { - res =3D true; - } - rcu_read_unlock(); - return res; -} +/* Returns true if qemu_log() will write somewhere other than stderr. */ +bool qemu_log_separate(void); =20 #define CPU_LOG_TB_OUT_ASM (1 << 0) #define CPU_LOG_TB_IN_ASM (1 << 1) diff --git a/tests/unit/test-logging.c b/tests/unit/test-logging.c index dcb8ac70df..9b87af75af 100644 --- a/tests/unit/test-logging.c +++ b/tests/unit/test-logging.c @@ -30,6 +30,7 @@ #include "qemu-common.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/rcu.h" =20 static void test_parse_range(void) { diff --git a/util/log.c b/util/log.c index caa38e707b..8b8b6a5d83 100644 --- a/util/log.c +++ b/util/log.c @@ -26,14 +26,42 @@ #include "trace/control.h" #include "qemu/thread.h" #include "qemu/lockable.h" +#include "qemu/rcu.h" + + +typedef struct QemuLogFile { + struct rcu_head rcu; + FILE *fd; +} QemuLogFile; =20 static char *logfilename; static QemuMutex qemu_logfile_mutex; -QemuLogFile *qemu_logfile; +static QemuLogFile *qemu_logfile; int qemu_loglevel; static int log_append =3D 0; static GArray *debug_regions; =20 +/* Returns true if qemu_log() will really write somewhere. */ +bool qemu_log_enabled(void) +{ + return qemu_logfile !=3D NULL; +} + +/* Returns true if qemu_log() will write somewhere other than stderr. */ +bool qemu_log_separate(void) +{ + QemuLogFile *logfile; + bool res =3D false; + + rcu_read_lock(); + logfile =3D qatomic_rcu_read(&qemu_logfile); + if (logfile && logfile->fd !=3D stderr) { + res =3D true; + } + rcu_read_unlock(); + return res; +} + /* Lock/unlock output. */ =20 FILE *qemu_log_trylock(void) --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303625; cv=none; d=zohomail.com; s=zohoarc; b=MpxlFUgmrDSpG6JUzi2JOM6CHgDfSF+u5HbbMLxV5MthoFFUM2ZbM5UO2HOlveitbWqEI+s4QabWu4n/fzv/43QmFO5n6JqQNfM6B30UfysrlrAkmhCs3iyYaN0MGK+repGD2oAEi8kv5+lXFyIptF80FjnM7E+fgm3IcuwuJR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303625; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jIFec7vua8qaqcC2DD7t6o1d/RYkHEXO2+luYM5xdxE=; b=nJqF2aNqPnMUdyd9QjZKRNj2X2BJHKVyZ7rEjtmHj50AF1dWIv+lfLZIvNMWlMzoq9Vl7Irtlbz1gQX1n2t33U35Q1/I7ugLT4IC7hvk6lMyB67T6RvBZRIUe9Ykt+qsMAEwje970jUProAQ/nce80tcc4+YG4BMGIJnrbteIYw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303625176254.13597677611926; Sat, 26 Mar 2022 07:07:05 -0700 (PDT) Received: from localhost ([::1]:33262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY74K-0005rt-2I for importer@patchew.org; Sat, 26 Mar 2022 10:07:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6R7-0007cK-2x for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:34 -0400 Received: from [2001:4860:4864:20::2d] (port=40501 helo=mail-oa1-x2d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6R5-0005Xk-Lk for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:32 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-d6e29fb3d7so10739419fac.7 for ; Sat, 26 Mar 2022 06:26:30 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jIFec7vua8qaqcC2DD7t6o1d/RYkHEXO2+luYM5xdxE=; b=LJH1D9DbfWNaHSJUKadfyGXds7LKEXGGGNMLTunGmKjnEJvEuQo6OIU5QKOgyVxMEg 95JWlPr2ItggpBb47HcR/A3PwDLfw1hpNlT5dHFAVHkI/mkeWf0CHMG3tgZ87u98/Lhh lo4c2afi1FoWpBMsR2md3duNM5YdiI6QX1k9oaZVqPLl5oeSHmGPLJ+fkYF8W0/M8jxp 9zQ30u00cof6XWbAQcnKdFquoYlZvbwg/vnR4K3CxXIrDUpD7juWB6kCozyhgCOzSI+2 jMkWBkL93zAIQwhZtKxKDm9l6gTBdmn158tSPSrrMRQVlY7LqzdSM5HCu3wH87w92Bd0 rISg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jIFec7vua8qaqcC2DD7t6o1d/RYkHEXO2+luYM5xdxE=; b=OBBRxXA0WRe+ZpSjKeasREsTuNOUv1mvyYGtWTqM/V5UTB/fNp92uqOnOljWbzs60X n14B7/z8le9Xqz2l6VDQg9MmU/heA/+L9PDtKVkq09O8h+hDwwmVfZ3kcmZYPdH/PFxs dWWaoVG4A1lmf3vu3bkcHFYROhMdk00TMwmPKuFzKVroogStWnZ0jhOdfAJU9gyX0nt+ ScfaWb0rhnP3S/DGyu2qApB4wFbpXkzDVEskW7FPPwjxMfyXxAV46tJCWczvzG+lV1LS VkV+39KrK2u3663NjCsNRQY7HWDX8MH6Ujk9NWpcCoea9stvD0WCt3xQEJfrrdLiHYBS qCiQ== X-Gm-Message-State: AOAM533RTX7NheJuqKzeaG/2FRVPy2EMJlJkqKNpmev//0PHJ2oqMXiz 0MqLxuNGOgGEXVKP/oUJ0H8AqR6rXVDACqFA X-Google-Smtp-Source: ABdhPJxX+b4BeftR71qN7ct+jU+IOHV71V19x6A874HUgMXtC7YNFinvqpBMCOAIYKIZisPgYdU6tA== X-Received: by 2002:a05:6870:b623:b0:de:899:774 with SMTP id cm35-20020a056870b62300b000de08990774mr11583049oab.219.1648301190284; Sat, 26 Mar 2022 06:26:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 26/39] sysemu/os-win32: Test for and use _lock_file/_unlock_file Date: Sat, 26 Mar 2022 07:25:21 -0600 Message-Id: <20220326132534.543738-35-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2d; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303627198100001 Content-Type: text/plain; charset="utf-8" The bug referenced in os-win32.h was fixed in mingw-w64 v6. According to repology, version 5 used by ubuntu 18, which is not yet out of support, so provide a meson link test for it. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- meson.build | 12 ++++++++++++ include/sysemu/os-win32.h | 16 +++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index aef724ad3c..93a05b8e92 100644 --- a/meson.build +++ b/meson.build @@ -2054,6 +2054,18 @@ foreach k, v: config_host endif endforeach =20 +# Older versions of MinGW do not import _lock_file and _unlock_file proper= ly. +# This was fixed for v6.0.0 with commit b48e3ac8969d. +if targetos =3D=3D 'windows' + config_host_data.set('HAVE__LOCK_FILE', cc.links(''' + #include + int main(void) { + _lock_file(NULL); + _unlock_file(NULL); + return 0; + }''', name: '_lock_file and _unlock_file')) +endif + ######################## # Target configuration # ######################## diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index 770752222a..649f417d39 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -113,20 +113,22 @@ static inline char *realpath(const char *path, char *= resolved_path) return resolved_path; } =20 -/* ??? Mingw appears to export _lock_file and _unlock_file as the functions - * with which to lock a stdio handle. But something is wrong in the marku= p, - * either in the header or the library, such that we get undefined referen= ces - * to "_imp___lock_file" etc when linking. Since we seem to have no other - * alternative, and the usage within the logging functions isn't critical, - * ignore FILE locking. +/* + * Older versions of MinGW do not import _lock_file and _unlock_file prope= rly. + * This was fixed for v6.0.0 with commit b48e3ac8969d. */ - static inline void qemu_flockfile(FILE *f) { +#ifdef HAVE__LOCK_FILE + _lock_file(f); +#endif } =20 static inline void qemu_funlockfile(FILE *f) { +#ifdef HAVE__LOCK_FILE + _unlock_file(f); +#endif } =20 /* We wrap all the sockets functions so that we can --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303617; cv=none; d=zohomail.com; s=zohoarc; b=mGJnO4YMGvRCKPysoqxKRQPF2cfq0mX4/rduj/vGccnlO9tySZTVSbuy4Ow1uv7cc3OptlAjMQhT5taDmTSe4iz8IQQ+cY1zfwEefP+lpOrOzP4wzSy2c9LJxuHgU2eyttf04p/6/bKhMDVQwTurrhqHHcL0aU5SykUuExyhY6E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303617; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=weAzEbOYWT6pn/rsG4fbAVbqxomesdIK5x2EPw6yBPM=; b=KtiPhI4QOSloPx35yDhJSV23hEx/ROp9RKphk5R0k4eVqBBqJk8NIoE0/fBRv1oxt5HWGKO6tlG9lKYMy6QPeDOZFNDwdIyBcd9QoubS0rhnWerMiZR8LvYGGjH9yIAAaUchoRcNXLBehPtrGej0P1DLwbnETOXf05Ybl983Gc8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164830361734082.13566911527585; Sat, 26 Mar 2022 07:06:57 -0700 (PDT) Received: from localhost ([::1]:60872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY74C-0005Rm-7L for importer@patchew.org; Sat, 26 Mar 2022 10:06:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6R8-0007cj-Ii for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:39 -0400 Received: from [2001:4860:4864:20::36] (port=42193 helo=mail-oa1-x36.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6R6-0005Xt-OB for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:34 -0400 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-de3ca1efbaso10717206fac.9 for ; Sat, 26 Mar 2022 06:26:32 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=weAzEbOYWT6pn/rsG4fbAVbqxomesdIK5x2EPw6yBPM=; b=bgVWVn6ltPSxghTpyzxRfQz3NDuoCM8EYLaToOhKzB7mDUAlos29tDqNayXj9wwySG 6fAKq0cDOQKd0uV+oed+OEbM4w+YtA0M8g/BnxlSgId9B2Y1GWVWB3Hi4m7vPD6sYFX/ VLyJWw40D6YechiQ+v7yrADrivyjB4Lq3oD0JoENDjOI+mTtsEEK6bZow9YcNr1uyxk4 0N3HOtMO0tnz8FSY/uNWDzgY+fiG6Hqjw1FYFQx6MDcbL31Yemo2sC3qgmmNLTh68mSv GOrCiH90Agqkp3xbuyfwYW3m0i5ALZjLDl6IjsCW4FqA+PBkZZJ89s9cEEPghbDczGRx BVRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=weAzEbOYWT6pn/rsG4fbAVbqxomesdIK5x2EPw6yBPM=; b=Qg+wpZ1EPPQmy/1W9MBUyqcfJOVOsryhDrUKEt4BqqouZDchHhr8t/IsAeERtrntDZ +M3sqkFMCoLvwnwuUDxvjuTuIfbGl2B9JB3/dPwrwrLeI36ZCLtO8C1XRk9QHSuFDywv iB/71Y92RzGBJixUF4+nGp3Kx7ZM+53vvKN4W9LVjEOZOusWmp1XqdBmJObrIPianR1P MbXkhEm0vyqnQ5MVyex5fhcAmSnPSMZ+x8jNhW4oPsmBJfWHp+YbMRBmgjG/VlDKNhwG xL67CC6CLNeYLtvCUrvub539I858cCVMb3BBC8VAK4R+aKHsnImJaeyobai4ZVWvaeAS paqA== X-Gm-Message-State: AOAM530ZSgKEa72q1CRsfotHPScMs0OQ8vZuUEpACujpLc8cK5tLAe1t nte6zPjWm+I/BBTFfYQYHAQolhAKHpqg9ybc X-Google-Smtp-Source: ABdhPJzIVDdhwlSLsuB71cnCkK5GczcFjsVPqewnJuuyBa+/KavpVnuGtOaC9pPVaGLyCIX6Lkl/OA== X-Received: by 2002:a05:6870:785:b0:da:ac31:3e04 with SMTP id en5-20020a056870078500b000daac313e04mr10691756oab.270.1648301191725; Sat, 26 Mar 2022 06:26:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 27/39] util/log: Introduce qemu_set_log_filename_flags Date: Sat, 26 Mar 2022 07:25:22 -0600 Message-Id: <20220326132534.543738-36-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::36 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::36; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x36.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303619085100001 Content-Type: text/plain; charset="utf-8" Provide a function to set both filename and flags at the same time. This is the common case at startup. Signed-off-by: Richard Henderson --- v2: Return bool, per recommendations in qapi/error.h (phil). --- include/qemu/log.h | 1 + util/log.c | 122 ++++++++++++++++++++++++++++----------------- 2 files changed, 77 insertions(+), 46 deletions(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index 42d545f77a..b6c73376b5 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -82,6 +82,7 @@ extern const QEMULogItem qemu_log_items[]; =20 bool qemu_set_log(int log_flags, Error **errp); bool qemu_set_log_filename(const char *filename, Error **errp); +bool qemu_set_log_filename_flags(const char *name, int flags, Error **errp= ); void qemu_set_dfilter_ranges(const char *ranges, Error **errp); bool qemu_log_in_addr_range(uint64_t addr); int qemu_str_to_log_mask(const char *str); diff --git a/util/log.c b/util/log.c index 8b8b6a5d83..2152d5591e 100644 --- a/util/log.c +++ b/util/log.c @@ -117,15 +117,58 @@ static void qemu_logfile_free(QemuLogFile *logfile) } =20 /* enable or disable low levels log */ -bool qemu_set_log(int log_flags, Error **errp) +static bool qemu_set_log_internal(const char *filename, bool changed_name, + int log_flags, Error **errp) { - bool need_to_open_file =3D false; + bool need_to_open_file; QemuLogFile *logfile; =20 - qemu_loglevel =3D log_flags; + QEMU_LOCK_GUARD(&qemu_logfile_mutex); + logfile =3D qemu_logfile; + + if (changed_name) { + char *newname =3D NULL; + + /* + * Allow the user to include %d in their logfile which will be + * substituted with the current PID. This is useful for debugging = many + * nested linux-user tasks but will result in lots of logs. + * + * filename may be NULL. In that case, log output is sent to stderr + */ + if (filename) { + char *pidstr =3D strstr(filename, "%"); + + if (pidstr) { + /* We only accept one %d, no other format strings */ + if (pidstr[1] !=3D 'd' || strchr(pidstr + 2, '%')) { + error_setg(errp, "Bad logfile format: %s", filename); + return false; + } + newname =3D g_strdup_printf(filename, getpid()); + } else { + newname =3D g_strdup(filename); + } + } + + g_free(logfilename); + logfilename =3D newname; + filename =3D newname; + + if (logfile) { + qatomic_rcu_set(&qemu_logfile, NULL); + call_rcu(logfile, qemu_logfile_free, rcu); + logfile =3D NULL; + } + } else { + filename =3D logfilename; + } + #ifdef CONFIG_TRACE_LOG - qemu_loglevel |=3D LOG_TRACE; + log_flags |=3D LOG_TRACE; #endif + qemu_loglevel =3D log_flags; + /* * In all cases we only log if qemu_loglevel is set. * Also: @@ -134,71 +177,58 @@ bool qemu_set_log(int log_flags, Error **errp) * If we are daemonized, * we will only log if there is a logfilename. */ - if (qemu_loglevel && (!is_daemonized() || logfilename)) { - need_to_open_file =3D true; - } - QEMU_LOCK_GUARD(&qemu_logfile_mutex); - if (qemu_logfile && !need_to_open_file) { - logfile =3D qemu_logfile; + need_to_open_file =3D log_flags && (!is_daemonized() || filename); + + if (logfile && !need_to_open_file) { qatomic_rcu_set(&qemu_logfile, NULL); call_rcu(logfile, qemu_logfile_free, rcu); - } else if (!qemu_logfile && need_to_open_file) { - logfile =3D g_new0(QemuLogFile, 1); - if (logfilename) { - logfile->fd =3D fopen(logfilename, log_append ? "a" : "w"); - if (!logfile->fd) { + return true; + } + if (!logfile && need_to_open_file) { + FILE *fd; + + if (filename) { + fd =3D fopen(filename, log_append ? "a" : "w"); + if (!fd) { error_setg_errno(errp, errno, "Error opening logfile %s", - logfilename); + filename); return false; } /* In case we are a daemon redirect stderr to logfile */ if (is_daemonized()) { - dup2(fileno(logfile->fd), STDERR_FILENO); - fclose(logfile->fd); + dup2(fileno(fd), STDERR_FILENO); + fclose(fd); /* This will skip closing logfile in qemu_log_close() */ - logfile->fd =3D stderr; + fd =3D stderr; } } else { /* Default to stderr if no log file specified */ assert(!is_daemonized()); - logfile->fd =3D stderr; + fd =3D stderr; } =20 log_append =3D 1; + + logfile =3D g_new0(QemuLogFile, 1); + logfile->fd =3D fd; qatomic_rcu_set(&qemu_logfile, logfile); } return true; } =20 -/* - * Allow the user to include %d in their logfile which will be - * substituted with the current PID. This is useful for debugging many - * nested linux-user tasks but will result in lots of logs. - * - * filename may be NULL. In that case, log output is sent to stderr - */ +bool qemu_set_log(int log_flags, Error **errp) +{ + return qemu_set_log_internal(NULL, false, log_flags, errp); +} + bool qemu_set_log_filename(const char *filename, Error **errp) { - g_free(logfilename); - logfilename =3D NULL; + return qemu_set_log_internal(filename, true, qemu_loglevel, errp); +} =20 - if (filename) { - char *pidstr =3D strstr(filename, "%"); - if (pidstr) { - /* We only accept one %d, no other format strings */ - if (pidstr[1] !=3D 'd' || strchr(pidstr + 2, '%')) { - error_setg(errp, "Bad logfile format: %s", filename); - return false; - } else { - logfilename =3D g_strdup_printf(filename, getpid()); - } - } else { - logfilename =3D g_strdup(filename); - } - } - - qemu_log_close(); - return qemu_set_log(qemu_loglevel, errp); +bool qemu_set_log_filename_flags(const char *name, int flags, Error **errp) +{ + return qemu_set_log_internal(name, true, flags, errp); } =20 /* Returns true if addr is in our debug filter or no filter defined --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648304035; cv=none; d=zohomail.com; s=zohoarc; b=fHzt/717aYcKcyjzYdf9I7qL4DpPWE8r3G2rcEMIAYaaCIXS7qMhFvGwC5Id061ae6EMCbObGSIChftHy1aM+GbNxCkbJFNv8hze99S/hXV10D05vGMda362wCKtxICJLrTsU4y7Tw5S5gYJu9lqXHZiBRADGgqvrW0MTRkhwbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648304035; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jlMPZ5+ciovunZH+v/owH8Odf5O35GcMQuqFyPTC+AM=; b=dIwi9SrXBC58wIaXQ+1wEzWvY6p86+m3wtP456aJ25CWZrUvIaTDq36eQ7btJyMn+PoiWCne/3og4vJy/z/++uzb6HqFOBwFLYdzr0vkeA8rDYFsE07CG29XS4mWcwkpwWLDWmyWBoWyrw7tIxfL2GBtX/tfpW2nz3jcs9TAdhE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648304035582746.4913105175164; Sat, 26 Mar 2022 07:13:55 -0700 (PDT) Received: from localhost ([::1]:50520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY7Aw-0000bD-G1 for importer@patchew.org; Sat, 26 Mar 2022 10:13:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6RA-0007dE-Cw for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:40 -0400 Received: from [2001:4860:4864:20::36] (port=45864 helo=mail-oa1-x36.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6R7-0005Y3-OH for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:35 -0400 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-d6ca46da48so10699744fac.12 for ; Sat, 26 Mar 2022 06:26:33 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jlMPZ5+ciovunZH+v/owH8Odf5O35GcMQuqFyPTC+AM=; b=XfnJR1AFNM+2CYc0XgXZ/qDrYf7l8Y5TX8rNg11+KAsASBSycNgeCmeXZEfBejPF9n 2DExRC6Di2Op4ZlwIRsalqnb9WKq5sPvey9wmRq8yQ0MQwrrVsKxL0MjTaD7Rug5pXDw zhIkfXTqiQjQCMj3YiGSUEBC3Arf5jyiiN6VTKzNQ30JoKFGzjIk+lQRHJqGHgGlHaPJ eOfn81QApvnAQ5dNUcCTQL7MDHdxW1AhDHaNS1AurynO8HTuPBAeIaPbvgG/Z5NXuQOd Ts/wuBu1Bn87jb/S7iFK1AdBMV8tGt+p//PE01w1b9g5xx/4/i0zn0VgaU69OXbiFb0o jquA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jlMPZ5+ciovunZH+v/owH8Odf5O35GcMQuqFyPTC+AM=; b=GW0RGMXlDqPJenZtly2lvUrjI7TAsnoImgpPn8GDv59p4xeZaVP32VMOhLNR/Ukfgw savTD+gvLHCvfGS9kaqByzt7w+NfxibhyFZfJX14iG6W/YPEC8qkBXKbiPzDkIX0pbzj 1w0HsMu1olTlXoSRJS7um8Pu/4Qs5FIJp40VXl2lKJ/CPrwRgkRGCC3XMDTai0Ml9By3 hGS/EyhWFj9cgE/rHMzZfSb7bExhKOe2R34PEAPwTw9PWTv1b/Ir7b3jifvneNPIexex KPBFKb5xNWrRl53TWfx5R/MtqyLMHPsHOVI+1I5mhwFN6/QikLiHk96ClMT1umgiHvHF WE2A== X-Gm-Message-State: AOAM530p+CkjWbyjyJMy8P84l2VNuqpzPSZXaRrC7qGCAGv8UfSlyL90 bl+NcpRWXXMqaWhhxMtItRaFZN4hcOKIyarz X-Google-Smtp-Source: ABdhPJzS2TOO6FYWmebKr9JVg7ljGj94mnF3SjbRdZ4uauu5Ym5ymUuBpWXkfP2zVARPoJRJtWFsuA== X-Received: by 2002:a05:6870:3394:b0:dd:cfdd:34c9 with SMTP id w20-20020a056870339400b000ddcfdd34c9mr11507614oae.31.1648301192843; Sat, 26 Mar 2022 06:26:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 28/39] bsd-user: Use qemu_set_log_filename_flags Date: Sat, 26 Mar 2022 07:25:23 -0600 Message-Id: <20220326132534.543738-37-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::36 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::36; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x36.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648304037892100001 Content-Type: text/plain; charset="utf-8" Perform all logfile setup in one step. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- bsd-user/main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index ed26fc5acb..aa13eae7f3 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -405,16 +405,16 @@ int main(int argc, char **argv) } =20 /* init debug */ - qemu_set_log_filename(log_file, &error_fatal); - if (log_mask) { - int mask; - - mask =3D qemu_str_to_log_mask(log_mask); - if (!mask) { - qemu_print_log_usage(stdout); - exit(1); + { + int mask =3D 0; + if (log_mask) { + mask =3D qemu_str_to_log_mask(log_mask); + if (!mask) { + qemu_print_log_usage(stdout); + exit(1); + } } - qemu_set_log(mask, &error_fatal); + qemu_set_log_filename_flags(log_file, mask, &error_fatal); } =20 if (optind >=3D argc) { --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303921; cv=none; d=zohomail.com; s=zohoarc; b=VTkuHymRl1Ffd6XCVJxXel9JRdGUXOSRp8s9fiEOO8LhEOdMltTAzuU4awa94e0P94Jwk2+WKVUTsiG4Dw/0Y9eeSQ57Cpzz/j0xwi+7pQfvh2S45tBXfu+UTIDhWY3R7pM23f7iaa4ZgRJt5eVGs6QKO9OKV9Nna/I5BnL1YVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303921; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lb1+Il1eKojAxX+nWwkLAHUYjVhh/WZK+1C1/5aXdGI=; b=OLwv17DkHE37aat6tU/pfkbJsAFxvClB1OZrJNO8KWSBJULoWQLWNjdLup2cpcR4lpSNKFCAbiSc2PDVxK2DG9sgLIQjc6IEkj0aDtQ903L5y5nqom4/aSEOKYJFoPkz/U39qkWtQ7j9BWTNJ1rjjSWsUdHWZNqwvZC8Wb8Vctw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303921848796.417886380975; Sat, 26 Mar 2022 07:12:01 -0700 (PDT) Received: from localhost ([::1]:46356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY796-0006Ck-5R for importer@patchew.org; Sat, 26 Mar 2022 10:12:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Ra-0007sC-Cu for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:27:02 -0400 Received: from [2001:4860:4864:20::2b] (port=45854 helo=mail-oa1-x2b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6RS-0005YH-QE for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:56 -0400 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-d6ca46da48so10699819fac.12 for ; Sat, 26 Mar 2022 06:26:35 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lb1+Il1eKojAxX+nWwkLAHUYjVhh/WZK+1C1/5aXdGI=; b=ntkMSatQNWi3Iw6d9a742+4oLl0NPa/m6t0X6VAgU+/za/OGHh5/ThztlcIj2w5Qhm w9JIKTPe9yoqEqcz6jVH0XQUjapx2/OKb/bda4VVx+OJ+CX9zrDvHUp/HrGFc0aLaML8 GbSfX+fWpKm7Mmxrc8Pw0N1RTkJGKOFb1TGNHUixs1w1Rq1JwyiigKgcTA2J7Cu3MM+L rGotRTOvQlX+sUGJsSBFdHWAHrSubqwTKxTfzFxjdWSd/B6YGWZQhunpCd80xhE2aY+o 8xGb+Kf6CbRotUwluGMtiZuPt+6OHQyzAGsAtoQNiLck2FpAMfnuKzcdWDwN3B1peQ/p rE2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lb1+Il1eKojAxX+nWwkLAHUYjVhh/WZK+1C1/5aXdGI=; b=kZ8bdYhqiT3P6+CjgJDkxMLxaLcVLcGSFn1Pj24ygFMsA4f/gmWzoHd5y7J6aYLbTY pKq3eaWrhC9aSyEeHlGVy1E31/4RHNIVcdAVRCGIyKEou0ETD++hPe2o+sZCKVk2nFV3 OsA4i0P5I/7Pa71PSZD0zmTwf5aicCMq+NFVrfysU0+DnLs6zJ/WQwHBk9gEL8snySdM O/6nnAHHkV7bBdrsOna/rcO2bsPHLpxhlFk4vi+9VIJrr84MzEy8QT2AwThjKt1/s8CV xnDFXELr0HalxsoaFAQiBLipELej4NUxaSaMBG2rwNB4wrXq/H2K41T5RHR8RC3Bo1v8 JpFA== X-Gm-Message-State: AOAM533JlCpf1QEoZA7VheleCRjxQmamTxJ/0jTvp1BTZvIrGoEKpQrL vF4522DMW4SvVUALokWAYuhTwIAUPjyexoda X-Google-Smtp-Source: ABdhPJyQVUsU3E010BP8lQmQ+9U85ZzRL+dDaLgU1LMXrBTmsIGe2n1ECuFg/KGlD73Rw6MX00/LRQ== X-Received: by 2002:a05:6870:601b:b0:de:c5bd:e36b with SMTP id t27-20020a056870601b00b000dec5bde36bmr1946038oaa.89.1648301194946; Sat, 26 Mar 2022 06:26:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 29/39] linux-user: Use qemu_set_log_filename_flags Date: Sat, 26 Mar 2022 07:25:24 -0600 Message-Id: <20220326132534.543738-38-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2b; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303923183100001 Content-Type: text/plain; charset="utf-8" Perform all logfile setup in one step. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- linux-user/main.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index d263b2a669..0297ae8321 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -85,6 +85,7 @@ static bool enable_strace; * Used to support command line arguments overriding environment variables. */ static int last_log_mask; +static const char *last_log_filename; =20 /* * When running 32-on-64 we should make sure we can fit all of the possible @@ -257,7 +258,7 @@ static void handle_arg_dfilter(const char *arg) =20 static void handle_arg_log_filename(const char *arg) { - qemu_set_log_filename(arg, &error_fatal); + last_log_filename =3D arg; } =20 static void handle_arg_set_env(const char *arg) @@ -643,7 +644,6 @@ int main(int argc, char **argv, char **envp) int i; int ret; int execfd; - int log_mask; unsigned long max_reserved_va; bool preserve_argv0; =20 @@ -677,10 +677,9 @@ int main(int argc, char **argv, char **envp) =20 optind =3D parse_args(argc, argv); =20 - log_mask =3D last_log_mask | (enable_strace ? LOG_STRACE : 0); - if (log_mask) { - qemu_set_log(log_mask, &error_fatal); - } + qemu_set_log_filename_flags(last_log_filename, + last_log_mask | (enable_strace * LOG_STRAC= E), + &error_fatal); =20 if (!trace_init_backends()) { exit(1); --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303726; cv=none; d=zohomail.com; s=zohoarc; b=IYkZ9yW9SBxNa/zVNiq5Iu6Zbl8kDVioy+x3XVDVS0r6EJYsxq7ux0GLpinaZYHxYKYqbguRMjo5JWEwR3TGLjCJ9G5w08ypMHJAV6yXAHt5ZFRetH79MI2k9Pt1WXfCTuo27pj3SzSO+BLyjOS6/Kekop7QL6d5cGvk7iimj+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303726; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jzU0lMIGHRXlXJG9JfTKmdopHzJcZP5ngZbLDRCyMfA=; b=bHjtAOp2SWDgMOuI4m25RRcU4Ivdi2OBDobIyO7L7lcnE39GT6B6oLPaPs9zAr0CKigAfmbcNo8fjlAXOvu3WrINwZiqknpM9kmymC/QOcvm6qW14UNDYYyLaCNHFEc0GKOd5+ec1DRIZvmxIe9wCYuASAcy647/Pr2LRp1MOJk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164830372617466.46960439949555; Sat, 26 Mar 2022 07:08:46 -0700 (PDT) Received: from localhost ([::1]:39950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY75x-0001qs-77 for importer@patchew.org; Sat, 26 Mar 2022 10:08:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Ra-0007sH-8a for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:27:02 -0400 Received: from [2607:f8b0:4864:20::235] (port=39737 helo=mail-oi1-x235.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6RS-0005YR-Qo for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:56 -0400 Received: by mail-oi1-x235.google.com with SMTP id j83so11086126oih.6 for ; Sat, 26 Mar 2022 06:26:36 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jzU0lMIGHRXlXJG9JfTKmdopHzJcZP5ngZbLDRCyMfA=; b=e4AW8isiiagHmsxuBHXQJRphddATA9qjirymc9621qEcxML4m7wDMqI6yMQKusrrsf x/1yHYF+qoMDmi7lX6aaEL92DwTo+CHIGt5aBAyJl3QFu1+huCH6jYsBAUZvXa42til1 DAxD81Ame2GyAjN9v+RTjXUIPEAyXqBsoy3rWV3R1QUVfAGLa90XTr0GuDTNLS0hXKZK /6ehd5IUc9364xHEUoK61JA2JsLA0VmgPEc1VK1xY60TtB3DQqp6vRi40G4Uw32f1xZQ gmDHpE5SuNNy4vzaJXH1mD8F/RFPntPV9HaJDYCPs6LdTsi7ZvM4crwI8oEzcu+T5HTv 13iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jzU0lMIGHRXlXJG9JfTKmdopHzJcZP5ngZbLDRCyMfA=; b=Cfny2DwTfG0O1GVHGo7r+SPE2N+j7FTPTEqyyUHQG0TaOdBfaJRmWQmoXMymDbj5Q0 /tTkvfosMSGamaNHREp7ngmvJm74spmOmJ009jdSnS2oq8wZESp0kjM0Iy6xq9oFR6b+ kQrjA+N+a+eTdVwZMkyFgtfz6PS+k/3XBb+76t1VI7hDiZxX4qRTMibUQ8L1MZxQtNMU PH+2wAdSo6dwxfTVMxMIZLufkg/fl1aqEgt/609icWbex4dgeHYjKdP9yPoXaj1DmAxL LRgsQwsifomvnojrfntjE45nrLsLaodKrL64kqmuPbM5V3o50nf2idvfSZt2IJhFW5Eq JomA== X-Gm-Message-State: AOAM530RrT1xDXyEqO6ACEZ75EGcGcRiD/AgggDYHe/xMuee64AkJk0O CPi9l1F84r/y33H1Ai/RWt5ImVnre5tidS9K X-Google-Smtp-Source: ABdhPJxSDHAgXRq/uUwK+10T6z6awHXzeUBZttKgYPUaD4s7iZZIhwNcjgxzoZ4UnXf31o71J4k/9w== X-Received: by 2002:aca:1817:0:b0:2ec:f542:c96c with SMTP id h23-20020aca1817000000b002ecf542c96cmr8117276oih.36.1648301196058; Sat, 26 Mar 2022 06:26:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 30/39] softmmu: Use qemu_set_log_filename_flags Date: Sat, 26 Mar 2022 07:25:25 -0600 Message-Id: <20220326132534.543738-39-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::235 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::235; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x235.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303727826100001 Content-Type: text/plain; charset="utf-8" Perform all logfile setup at startup in one step. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- softmmu/vl.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index a74d0a44a2..65c02963b6 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2559,19 +2559,16 @@ static void qemu_process_early_options(void) #endif =20 /* Open the logfile at this point and set the log mask if necessary. = */ - if (log_file) { - qemu_set_log_filename(log_file, &error_fatal); - } - if (log_mask) { - int mask; - mask =3D qemu_str_to_log_mask(log_mask); - if (!mask) { - qemu_print_log_usage(stdout); - exit(1); + { + int mask =3D 0; + if (log_mask) { + mask =3D qemu_str_to_log_mask(log_mask); + if (!mask) { + qemu_print_log_usage(stdout); + exit(1); + } } - qemu_set_log(mask, &error_fatal); - } else { - qemu_set_log(0, &error_fatal); + qemu_set_log_filename_flags(log_file, mask, &error_fatal); } =20 qemu_add_default_firmwarepath(); --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303739; cv=none; d=zohomail.com; s=zohoarc; b=R5mdYwaykn8lIY8O3ne3IWL3GA/3catJNVGjRM+lVUm63gtCYPAnr9wiaGI5KMH4Cy068pLTkMZZTwJErWK6jSgTAum95lKx/cgJkEIncqUyMxcVmwu312tQTmEufvShe2xzUw/cBkZaRJwoV26hpJVxiWx0IEeMna4IJP5Esy4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303739; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6RmSObI8TwqseZSqimQUfXxvb0G/cAqhY8HopOTgyxA=; b=Vmz/VuCEpj2diCMjKKtVrI9tIF3Y3Chzc1yFdz0xCbAPRB/hcYw/UKh92bJA4v2rs+A/eJQKkrwUJS9SsemyjHjW7l1eZiwF8koZgC3LyBq5ptU5LStqWHQTErrJGIGMOnHpY77bZz7DeUTzPwlXpTnLwDCMcghf3jUDie4kWwU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303739931702.2908283458701; Sat, 26 Mar 2022 07:08:59 -0700 (PDT) Received: from localhost ([::1]:40374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY76A-00028Y-18 for importer@patchew.org; Sat, 26 Mar 2022 10:08:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6Ra-0007sG-8R for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:27:02 -0400 Received: from [2001:4860:4864:20::2d] (port=34147 helo=mail-oa1-x2d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6RS-0005YV-Qp for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:26:57 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-de3f2a19c8so10758622fac.1 for ; Sat, 26 Mar 2022 06:26:37 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:26:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6RmSObI8TwqseZSqimQUfXxvb0G/cAqhY8HopOTgyxA=; b=hvfVxFF4zHagRIOIgbERJ3AIQx+eQbD+PtEcV7fE4yl07CxMwP+hkEVTWYja5erWSo Dsf+rTKOiX6ffufAgjoKe7EIOdRfKaBzPH+rnixbQ45+jJohNwYbcaM312nCMl/fIame pGd+HYyAOdUE5ywtE9+33XTsphjy3uvdRZNIgodhYQguBPR2XtAA+LzRTTLvxdA/sJf2 XVBQ15lYRtUq1itfnSKvU3QI0+V/OeBgu4T7Y8EI0zaJxEeTMgFzN9ry+FGhwM9tllFN t5Mqq4FLzwym9FzrDm3GQMptZt8Hfr1VPiuDu3HMZvM3iMw0GKHeQ2G5zEFWPPYwyM79 RrJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6RmSObI8TwqseZSqimQUfXxvb0G/cAqhY8HopOTgyxA=; b=lfFQG9eygUROtSGWeLeThnaPpwAjfDqRRAUHaGlTwVa0/gOpJvazoNu4bvz2vT6bHr rfROKDPXC5tWk5jssp3RZRfHhFGHUN4CRnfGRlSKxuXNAPUF6GRKFqus3PigeOKWsodu mINao/+WHrBJHUJQdcNsa3vKAjE+sNhN5VOz8H6TNoEBdIQcb0fZiUzzFGYBw6GNJkkv GASA7HK5VZlBWVPyyw/GwYGuRBIPiorjwf3rVHtBANZnbyt2Vz7Z3of6kMjWsLC6ML75 CLESx8dFvfk1kH//lAQEptE4ZicttWSNmkc3lU4OpVIm4pDy5Mv0idEXSwrIJisSFVm+ z3HQ== X-Gm-Message-State: AOAM532BnmZmjCm9dwQtwHCrRApU2lr9CvKq4PXmyL5SuhR47l4jCXVk kL/bJwH3cie9x1PfChHuqnDECcMCGGhhRFwy X-Google-Smtp-Source: ABdhPJzYjT1hGjKCj94C40ozgOtDZrmLa3WWf334oMsYjDh8hpuJpLGGHWwECn6X8hbMQ/Iho6WfOg== X-Received: by 2002:a05:6870:4790:b0:dd:cd0f:e00b with SMTP id c16-20020a056870479000b000ddcd0fe00bmr11254147oaq.120.1648301197306; Sat, 26 Mar 2022 06:26:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 31/39] util/log: Remove qemu_log_close Date: Sat, 26 Mar 2022 07:25:26 -0600 Message-Id: <20220326132534.543738-40-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2d; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303741910100001 Content-Type: text/plain; charset="utf-8" The only real use is in cpu_abort, where we have just flushed the file via qemu_log_unlock, and are just about to force-crash the application via abort. We do not really need to close the FILE before the abort. The two uses in test-logging.c can be handled with qemu_set_log_filename_flags. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- include/qemu/log.h | 3 --- cpu.c | 1 - tests/unit/test-logging.c | 4 ++-- util/log.c | 17 +---------------- 4 files changed, 3 insertions(+), 22 deletions(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index b6c73376b5..a325bca661 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -92,7 +92,4 @@ int qemu_str_to_log_mask(const char *str); */ void qemu_print_log_usage(FILE *f); =20 -/* Close the log file */ -void qemu_log_close(void); - #endif diff --git a/cpu.c b/cpu.c index bfa4db9cd8..7df12537d5 100644 --- a/cpu.c +++ b/cpu.c @@ -408,7 +408,6 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) cpu_dump_state(cpu, logfile, CPU_DUMP_FPU | CPU_DUMP_CCOP); qemu_log_unlock(logfile); } - qemu_log_close(); } va_end(ap2); va_end(ap); diff --git a/tests/unit/test-logging.c b/tests/unit/test-logging.c index 9b87af75af..74ec89f1a8 100644 --- a/tests/unit/test-logging.c +++ b/tests/unit/test-logging.c @@ -170,7 +170,7 @@ static void test_logfile_lock(gconstpointer data) * Initiate a close file and make sure our handle remains * valid since we still have the logfile lock. */ - qemu_log_close(); + qemu_set_log_filename_flags(NULL, 0, &error_abort); fprintf(logfile, "%s 2nd write to file\n", __func__); fflush(logfile); qemu_log_unlock(logfile); @@ -208,7 +208,7 @@ int main(int argc, char **argv) tmp_path, test_logfile_lock); =20 rc =3D g_test_run(); - qemu_log_close(); + qemu_set_log_filename_flags(NULL, 0, &error_abort); drain_call_rcu(); =20 rmdir_full(tmp_path); diff --git a/util/log.c b/util/log.c index 2152d5591e..491a8f97f9 100644 --- a/util/log.c +++ b/util/log.c @@ -198,7 +198,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, if (is_daemonized()) { dup2(fileno(fd), STDERR_FILENO); fclose(fd); - /* This will skip closing logfile in qemu_log_close() */ + /* This will skip closing logfile in qemu_logfile_free. */ fd =3D stderr; } } else { @@ -322,21 +322,6 @@ out: g_strfreev(ranges); } =20 -/* Close the log file */ -void qemu_log_close(void) -{ - QemuLogFile *logfile; - - qemu_mutex_lock(&qemu_logfile_mutex); - logfile =3D qemu_logfile; - - if (logfile) { - qatomic_rcu_set(&qemu_logfile, NULL); - call_rcu(logfile, qemu_logfile_free, rcu); - } - qemu_mutex_unlock(&qemu_logfile_mutex); -} - const QEMULogItem qemu_log_items[] =3D { { CPU_LOG_TB_OUT_ASM, "out_asm", "show generated host assembly code for each compiled TB" }, --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648302537; cv=none; d=zohomail.com; s=zohoarc; b=Aw3qfZ3e3uSdm0EoYWkCvKk+erCUpM5fMyu4qgWqS2uZ7CLzF4gEZ3LHmPHJU51jxavfiU96x5y9Mv5VIm2nqgvt7MuIID4/ujXrFBUMqNhtfg7N+JQWt3ZSrPx+X3kv5eEzf7171gJFDEY0hqgPX26b+z1bVZ6DnsdcuaQ/PyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648302537; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tAM8l8umDTOu711aIMp31KRAq18xpQUFDBfm3PD7em4=; b=M9+oXyTWHVeMhyUINkaiaiET3ohwHCTltAT3zCilFH7K26CdJiqaTFG8ofgiW5ZZZY6+M+5J2nId6SaWIeokA8mJKXlIVskBFPdCtA6XBfT6HNbELzJrpCARWNp8Le8v2Bl0cHaaE1qnKUwctaroNyZQnW6IljkZxaFq1tAHyKc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648302537740193.12996484113933; Sat, 26 Mar 2022 06:48:57 -0700 (PDT) Received: from localhost ([::1]:54746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6mm-0006nc-AQ for importer@patchew.org; Sat, 26 Mar 2022 09:48:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6U9-0002ov-Tj for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:41 -0400 Received: from [2607:f8b0:4864:20::234] (port=45720 helo=mail-oi1-x234.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6U8-0005yS-EQ for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:41 -0400 Received: by mail-oi1-x234.google.com with SMTP id 12so11072747oix.12 for ; Sat, 26 Mar 2022 06:29:40 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id s24-20020a056808209800b002da3b9bf8e0sm4394509oiw.32.2022.03.26.06.29.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:29:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tAM8l8umDTOu711aIMp31KRAq18xpQUFDBfm3PD7em4=; b=BNQUIdUyW12rPVzyDZtNkkk27GgsLQDiq0rWh5/IsmhUcyQLn2lMCdiKExaECvNE1Y EhHVsLDhQhI1rtUEON3yuxufOH4wdIJTzGFmsTvCznYy6KhJXqIo8R9Ysw598Q+i8vNB Vw4iePBT8S8+HW98dZe4xwJf/iR8ZIRXWfUH+Qd7+DCdcini/+n5prIzEJ8+14CY/mxS XhrUe1FLPtshVU4qgEPKoi6h8yKeEFjijD68AUzEW97CuILFJwBfM61B/q94kQ4Od5N/ pt96y5lku82eAhRKLLn8n0vrk8o9VBnjJUvmP89MOc2gIbg3RuGSD4scYHsng1yL+mfU gK0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tAM8l8umDTOu711aIMp31KRAq18xpQUFDBfm3PD7em4=; b=ylSvkJrw9mlzEG0Xz7F+XN1pYv+bSle9PpiKbWYmnpKKyAIrQECI0uI8S6FqwDWDFu Yp/6IR/4wkCOJIo+pH7cCUGom7hSuaKa+LetzdiqoFr/7VGRBCM+boDZmupvuFA60MqQ 3Zk5a6ej+G9/Z2cpykVjBs9t9flxJAead7MYASCTBSomXJhBMWdOwtSCkjWvQIbMCn/H GC/Ia3ncQAXjezfRbaie/x5/PwqHT5gfqfN45CUzpyABKkk6Q7sIMDpZOJF6TaRlEhxr /7zdVik9htLGfHROXkrBlC28zazi3nKXM431QA9Yh12WbOrcd6CixxRUgEgiGLUca+4o PMtA== X-Gm-Message-State: AOAM532fuLxDEMiTjGVkh2wRWCrx68H5pj3e7xFcKDGz0AqwfgRrxsnw lHkqldKl+xZWXYNtaw+Ts8L5TtHb/6MO3JxM X-Google-Smtp-Source: ABdhPJwfIkkLaRq+SQgqCsdqjItym0Cu4n1liJI6ifCavW0nYxOuMh/C8WjLjWgbfcbGCeNW+ULbWg== X-Received: by 2002:a05:6808:9b4:b0:2ef:9e41:4f6f with SMTP id e20-20020a05680809b400b002ef9e414f6fmr7752317oig.40.1648301379350; Sat, 26 Mar 2022 06:29:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 32/39] util/log: Rename logfilename to global_filename Date: Sat, 26 Mar 2022 07:25:27 -0600 Message-Id: <20220326132534.543738-41-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::234 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::234; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x234.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648302540099100001 Rename to emphasize this is the file-scope global variable. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- util/log.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/util/log.c b/util/log.c index 491a8f97f9..b3f79deb6c 100644 --- a/util/log.c +++ b/util/log.c @@ -34,7 +34,7 @@ typedef struct QemuLogFile { FILE *fd; } QemuLogFile; =20 -static char *logfilename; +static char *global_filename; static QemuMutex qemu_logfile_mutex; static QemuLogFile *qemu_logfile; int qemu_loglevel; @@ -151,8 +151,8 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, } } =20 - g_free(logfilename); - logfilename =3D newname; + g_free(global_filename); + global_filename =3D newname; filename =3D newname; =20 if (logfile) { @@ -161,7 +161,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, logfile =3D NULL; } } else { - filename =3D logfilename; + filename =3D global_filename; } =20 #ifdef CONFIG_TRACE_LOG @@ -173,9 +173,8 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, * In all cases we only log if qemu_loglevel is set. * Also: * If not daemonized we will always log either to stderr - * or to a file (if there is a logfilename). - * If we are daemonized, - * we will only log if there is a logfilename. + * or to a file (if there is a filename). + * If we are daemonized, we will only log if there is a filename. */ need_to_open_file =3D log_flags && (!is_daemonized() || filename); =20 --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303960; cv=none; d=zohomail.com; s=zohoarc; b=GPbZG7W9OKKQ9uz8QmbsvIXzLAAqCU80XmCePqf3afYwraBTTWSzPZgJXgyMyAbYcVpjwsKRyVAU7RGJPJVrQb5BykVSX/NEaiYbtNyep9GzvX6O7fA+nSsrpGbZw0Hh7dyuwKIdP8p9Qve3YS982W98QOw9AHGVEK/ZjcEU/TI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303960; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=a5VbL0aLAFbBvi7mnSV6DMzP+5DCyDQb6KaEjRaA8Sc=; b=Rjjr5BIOtqW37mvsKzZ9qv//Oczt1bXPoTKxjUJ5DqGTen3ykdMl1+WVkK1Pl1WOWDy/n+TSqq1BsfEun2a8TB5kWHS71+wi6kVJNICaajjr/gtBiXd01HO0weW9A+XIEm5rCWknNOLRtzKs71UrPOXDR+OR3YmEN0Mcd/Yqi/E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303959260337.627580351167; Sat, 26 Mar 2022 07:12:39 -0700 (PDT) Received: from localhost ([::1]:46936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY79h-0006aF-VZ for importer@patchew.org; Sat, 26 Mar 2022 10:12:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6UA-0002qf-T2 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:43 -0400 Received: from [2607:f8b0:4864:20::22e] (port=34598 helo=mail-oi1-x22e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6U9-0005yX-FA for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:42 -0400 Received: by mail-oi1-x22e.google.com with SMTP id v75so11121451oie.1 for ; Sat, 26 Mar 2022 06:29:41 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id s24-20020a056808209800b002da3b9bf8e0sm4394509oiw.32.2022.03.26.06.29.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:29:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a5VbL0aLAFbBvi7mnSV6DMzP+5DCyDQb6KaEjRaA8Sc=; b=t/wnCmSsPWixkZqh01op/f9tlACDvGRWYzrDg6QTXXiGRNVTMIuaAawuxuStGWix12 C5RH9fdh7EsQ2NNqFc6+ugp5gko0JrtNbPCnMkt229NNfCVRteDcDt/xbbFoUfBbfzjt KnG4s6G+qJkGJZ99UW/F1EwAnX4eIPY2N1lBV2bsjItG5y2koE4AyGVYFvjFQGESv2sT RwAHOC/e1+TnpImPadqPFEdcZ2nAgnXjRjIIaO1ZCRZZ0v12+JqcCS9Qao0P03uYvGEa 2fhSKvGcDTU9b7M9n8ADZvFlEF/BgO84okuhnEgNn9+Tn4Rbx9lw/bbLgoBPstsJtIb3 7iIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a5VbL0aLAFbBvi7mnSV6DMzP+5DCyDQb6KaEjRaA8Sc=; b=LuwsVd4JhjWwDD/0T2mOUlr+Rx2qyfVLWZKrXc+hLD+7RHIwcHKzPZUnRn8v2m1Zax B7U7qg1xiTd0cGquqTPZf/PPbDkwjgzuePqiZCuP1WykOOT4+lhh3JvQzV+uwSGOsJav g+yqJ8nFWNX7DpOxKapTY/08iXSxOUCT49OJ2Z61dNepWdg9e90UXR5Hg/VjgoHpB21C l9BqRbtBd/sMZDOVwhaXQLBGFg5poRXTc7lgiB7vVjScsiQfD4C1vetpyC8qJ2u1vRTh PYCs5Q2f1ve4MwdDjcjm+iRcIflBxfQBAyhK7BJ4rfprHxn29UPeXizC7541pagbTZmR iUig== X-Gm-Message-State: AOAM5334qNOUsZM6uGwXcWocZvWXjQA8ypHyZUxaIPwcrfAVDrOUk0EX qi9WRFSSX6PIkb//Kwo+TIz7fDxShEWfCpno X-Google-Smtp-Source: ABdhPJyZ18WHl0XuUbTMTaPv6gQcC8PcQdxQJM/Jrer9D+xOm+MsDK2FsqJAz/hi+N0qa4iQ06BZtA== X-Received: by 2002:a05:6808:14ca:b0:2da:2fbd:ebad with SMTP id f10-20020a05680814ca00b002da2fbdebadmr12102815oiw.24.1648301380533; Sat, 26 Mar 2022 06:29:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 33/39] util/log: Rename qemu_logfile to global_file Date: Sat, 26 Mar 2022 07:25:28 -0600 Message-Id: <20220326132534.543738-42-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22e (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22e; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303961844100001 Rename to emphasize this is the file-scope global variable. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- util/log.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/util/log.c b/util/log.c index b3f79deb6c..425f0064b0 100644 --- a/util/log.c +++ b/util/log.c @@ -36,7 +36,7 @@ typedef struct QemuLogFile { =20 static char *global_filename; static QemuMutex qemu_logfile_mutex; -static QemuLogFile *qemu_logfile; +static QemuLogFile *global_file; int qemu_loglevel; static int log_append =3D 0; static GArray *debug_regions; @@ -44,7 +44,7 @@ static GArray *debug_regions; /* Returns true if qemu_log() will really write somewhere. */ bool qemu_log_enabled(void) { - return qemu_logfile !=3D NULL; + return global_file !=3D NULL; } =20 /* Returns true if qemu_log() will write somewhere other than stderr. */ @@ -54,7 +54,7 @@ bool qemu_log_separate(void) bool res =3D false; =20 rcu_read_lock(); - logfile =3D qatomic_rcu_read(&qemu_logfile); + logfile =3D qatomic_rcu_read(&global_file); if (logfile && logfile->fd !=3D stderr) { res =3D true; } @@ -69,7 +69,7 @@ FILE *qemu_log_trylock(void) QemuLogFile *logfile; =20 rcu_read_lock(); - logfile =3D qatomic_rcu_read(&qemu_logfile); + logfile =3D qatomic_rcu_read(&global_file); if (logfile) { qemu_flockfile(logfile->fd); return logfile->fd; @@ -124,7 +124,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, QemuLogFile *logfile; =20 QEMU_LOCK_GUARD(&qemu_logfile_mutex); - logfile =3D qemu_logfile; + logfile =3D global_file; =20 if (changed_name) { char *newname =3D NULL; @@ -156,7 +156,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, filename =3D newname; =20 if (logfile) { - qatomic_rcu_set(&qemu_logfile, NULL); + qatomic_rcu_set(&global_file, NULL); call_rcu(logfile, qemu_logfile_free, rcu); logfile =3D NULL; } @@ -179,7 +179,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, need_to_open_file =3D log_flags && (!is_daemonized() || filename); =20 if (logfile && !need_to_open_file) { - qatomic_rcu_set(&qemu_logfile, NULL); + qatomic_rcu_set(&global_file, NULL); call_rcu(logfile, qemu_logfile_free, rcu); return true; } @@ -210,7 +210,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, =20 logfile =3D g_new0(QemuLogFile, 1); logfile->fd =3D fd; - qatomic_rcu_set(&qemu_logfile, logfile); + qatomic_rcu_set(&global_file, logfile); } return true; } --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648304267; cv=none; d=zohomail.com; s=zohoarc; b=Ro7Ys8T6O+y41QdTGfHeBIRstvxFQNm94na1TWxc8gA3MKlElMfijxkq6wgsTEE0fXmtlk+2Pj90Rp+3hKmAoMypOSSXiLBwutHURUHnads+efgmHaFjZlYbHysvna9MR2TSpWuwmabwm5RKJoxK/lVQVlwNQlHj09VGN5Cgl14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648304267; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=31e7uABinGNdcjY/s1pEdjv5HJDeYHfqF6kH7oc0qxw=; b=I/swAUHtAY8APmr73psJ6gxu6FcRIWCQJbsgDZOavute5dnXKAh7rpqol0rUrmQVjrZvZtDgDkwoe63M+sByiimd/DhOWQkewIY2wktDstWpYrJav7Pj9vhkPSo4/LJxgQXf9CTt6T+YrxcA6G4yj6zxHy8URc+4Xo7UB1BtZTk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648304267964197.12189402805927; Sat, 26 Mar 2022 07:17:47 -0700 (PDT) Received: from localhost ([::1]:56912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY7Eg-0004xu-EJ for importer@patchew.org; Sat, 26 Mar 2022 10:17:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6UB-0002sZ-RE for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:44 -0400 Received: from [2607:f8b0:4864:20::22b] (port=35702 helo=mail-oi1-x22b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6UA-0005yh-Ft for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:43 -0400 Received: by mail-oi1-x22b.google.com with SMTP id e4so11104319oif.2 for ; Sat, 26 Mar 2022 06:29:42 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id s24-20020a056808209800b002da3b9bf8e0sm4394509oiw.32.2022.03.26.06.29.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:29:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=31e7uABinGNdcjY/s1pEdjv5HJDeYHfqF6kH7oc0qxw=; b=BIMpVWQukU8Pz45UwKC45D0tSbdN+9fkit1+duChgFwIlSy1BSvsunRjaF7IAc3vTg yBwuKpUDPd6DMy1IMmMfYqgakXWcC0ipKsQuXG2GWvxEJBTJA/rpFhnJbdYLW6eVyM40 hujFFz2muIsa9/DvAtvoWNQ92HbhtWJIu5C2sI7y9aA+5SPWbGdG2YZjTORfHjsxOF3K nwFRDFcryVI9UeqrCDUeHvBAeDXPBhOvvuIAln1Q9f5MAzO1QfHUU3xssh9TKH66IgU8 d3VGBh9ZvsDeNQC6UC1HaD2yr5iLkOtOAXgdY1gJJXJktMr74dT1V4vQaOYgx8YZiFhw qPRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=31e7uABinGNdcjY/s1pEdjv5HJDeYHfqF6kH7oc0qxw=; b=3AuPV+ed8SWRfogBXwAKCOGywoiAzx3ml+WEQyUqKQiw6FP0X+5LZe2DAtcptl3IkI 4WS9BlPdUQiL/1DwJL+lrlAsgmr4lSiH6nUQs7NWXU7kt1LgupwW3hzRgfAYMJF8rZMg pYjEsagXD1oWwDxlLWT3ofsAlQGD3BJKgNxsOqM9vJQKRL2/dArb2dWT+495D6ajMfku 6quC4GcffDJKQjZKj+rglZYBfM7uJocBKH9pdmwzx5JF4IJqs3IpPVvOURw3PGLkpVjw VWudRMhUNypyKEcC3i5tsWzRW1kxlbyfgr7VVB8B/hOOja5kByUonMNpzh5XNduJFT8o kbEg== X-Gm-Message-State: AOAM53327aTvgc3j2yK2XqgNajnzxlYInN/yfHq7y3A1X87VMwQZMbiv /nUB8TsGEvamXG6c1C3Yu+A/d/QHkCoj30ex X-Google-Smtp-Source: ABdhPJybvmO8BwbGzHAcWAqK5LSoeyyEJAScbl00vHfe/fj28JeRcMd2Nx+tZEdj4q2aRfPQsy9H0Q== X-Received: by 2002:a05:6808:7c2:b0:2d9:cf1b:bb2f with SMTP id f2-20020a05680807c200b002d9cf1bbb2fmr7880225oij.287.1648301381553; Sat, 26 Mar 2022 06:29:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 34/39] util/log: Rename qemu_logfile_mutex to global_mutex Date: Sat, 26 Mar 2022 07:25:29 -0600 Message-Id: <20220326132534.543738-43-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22b; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648304269617100001 Content-Type: text/plain; charset="utf-8" Rename to emphasize this covers the file-scope global variables. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- util/log.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/util/log.c b/util/log.c index 425f0064b0..bb201664ac 100644 --- a/util/log.c +++ b/util/log.c @@ -34,9 +34,11 @@ typedef struct QemuLogFile { FILE *fd; } QemuLogFile; =20 +/* Mutex covering the other global_* variables. */ +static QemuMutex global_mutex; static char *global_filename; -static QemuMutex qemu_logfile_mutex; static QemuLogFile *global_file; + int qemu_loglevel; static int log_append =3D 0; static GArray *debug_regions; @@ -101,9 +103,9 @@ void qemu_log(const char *fmt, ...) } } =20 -static void __attribute__((__constructor__)) qemu_logfile_init(void) +static void __attribute__((__constructor__)) startup(void) { - qemu_mutex_init(&qemu_logfile_mutex); + qemu_mutex_init(&global_mutex); } =20 static void qemu_logfile_free(QemuLogFile *logfile) @@ -123,7 +125,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, bool need_to_open_file; QemuLogFile *logfile; =20 - QEMU_LOCK_GUARD(&qemu_logfile_mutex); + QEMU_LOCK_GUARD(&global_mutex); logfile =3D global_file; =20 if (changed_name) { --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648304085; cv=none; d=zohomail.com; s=zohoarc; b=SdyR9zKEsU+XpmFD1PQEFizYRTi+PxIhOuRvN9jMLDI3CqJCBwbEiGgR5f+jmIXYQfUrfFvisiZL86flyAWd0wpxVGdN6SEA5dlARdeFw57KtjgMD4OkjUqrzfjxI5a8OtnNTiXGa5UgGctDg7PE9uIm/EyUcvJxrhxSXncFmO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648304085; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8IUyfSympPHVcXXqktu1H7rxzjIdvEh5QtmnECcsrkY=; b=fLS4PPbcViSk+D1xIUDVyqpWrtmFJZaN+BNckNjccebMAdDwC7PCvpArtJqRs7KDw5KwLWgkRoH/e5H4YLXPjUguIVeydU1tdwUGihWfv4Rlpf2PHFIpSj87uA5erhn2E1E3pOFHiof30+vC7j7VtnnVocu7103OkXDdwKMl+Os= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164830408579530.321937958235253; Sat, 26 Mar 2022 07:14:45 -0700 (PDT) Received: from localhost ([::1]:53486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY7Bk-0002X1-Q5 for importer@patchew.org; Sat, 26 Mar 2022 10:14:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6UD-0002uL-58 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:45 -0400 Received: from [2607:f8b0:4864:20::22a] (port=33767 helo=mail-oi1-x22a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6UB-0005yu-MU for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:44 -0400 Received: by mail-oi1-x22a.google.com with SMTP id k10so11121935oia.0 for ; Sat, 26 Mar 2022 06:29:43 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id s24-20020a056808209800b002da3b9bf8e0sm4394509oiw.32.2022.03.26.06.29.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:29:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8IUyfSympPHVcXXqktu1H7rxzjIdvEh5QtmnECcsrkY=; b=IKlD8bVa2Xe1puGxVnGrt5HiftufZ2/k0vjbvAfUVM8ff0BJmA+wnPVIVxz4OBrsmd 7LAy2v1kfhSSc40b9THPzYy8bXechskS+EpKDchFLL+XSgSSey2kFK4Yq77mmBSDbKO1 7NTMTXj6jJmUj/wWZko3+GuM6/JLXAgFZvhOSk2mXQSNB34Nzl3lSqBfZNwsAsNiFvDE UcMHtFFTKgzGVlP9X9kBYwUZOw0cTpFacO/v5jgkI57lvLWnHJAQBx40WHUsblE5OH3I SePoC4sf/P3eibo4ygpOU8MCrejIeNrWWCIUDmanjn/eP6rZanzPG1l2CKvfSL8netIp ok/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8IUyfSympPHVcXXqktu1H7rxzjIdvEh5QtmnECcsrkY=; b=FJiyzs+JeCGLH75y0CK+AzkPVZvO7z0w/IzuvX3xShVHshgjd9MD6rCL8EQHaZ21JO SDRBuvpy4Vbi/yEfOYeEN7QN2KcTFOE4ZdCu6oQM3KWw7mmfTNJyYIPNyETqrGsd+33X es7mAZ14GRmRgFGSPm9JEoOt1U9SI00zvx9yf4qVvAEDJeHj4zzqWCmqiu0iFJH+B/iH r7UA7AWp2JfUdiuYJ8dIl/3AWZ/7qZbZIdF9zLB5o+nqLY7rUEQR2RcJZPgIFYLbdMmL fKS7gCqV07Old2WPr6ZqgDs3KBrPY1MKnBDihHoNSPK4cLxan2nnGlEnSALldXtMiVfh 8EFw== X-Gm-Message-State: AOAM5304ELdRKg9+5g564Jj92YBrqkYBuNis6pglGWcSALLxrXmupOww 2k5VO7qmUfJY/5cDKKlsf1W+p5sEZy1mPjjx X-Google-Smtp-Source: ABdhPJwn1+KDoTh1Tix1Lntok1COBizFl+mEBMPRw7z0GRfsNWfMQpdHw/pc6r8Ej4syD5CVzkJJpg== X-Received: by 2002:aca:b01:0:b0:2ee:bfb8:7312 with SMTP id 1-20020aca0b01000000b002eebfb87312mr7779732oil.22.1648301382714; Sat, 26 Mar 2022 06:29:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 35/39] util/log: Hoist the eval of is_daemonized in qemu_set_log_internal Date: Sat, 26 Mar 2022 07:25:30 -0600 Message-Id: <20220326132534.543738-44-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22a; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648304086172100001 Only call is_daemonized once. We require the result on all paths after this point. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- util/log.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/util/log.c b/util/log.c index bb201664ac..631856e231 100644 --- a/util/log.c +++ b/util/log.c @@ -123,6 +123,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, int log_flags, Error **errp) { bool need_to_open_file; + bool daemonized; QemuLogFile *logfile; =20 QEMU_LOCK_GUARD(&global_mutex); @@ -178,7 +179,8 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, * or to a file (if there is a filename). * If we are daemonized, we will only log if there is a filename. */ - need_to_open_file =3D log_flags && (!is_daemonized() || filename); + daemonized =3D is_daemonized(); + need_to_open_file =3D log_flags && (!daemonized || filename); =20 if (logfile && !need_to_open_file) { qatomic_rcu_set(&global_file, NULL); @@ -196,7 +198,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, return false; } /* In case we are a daemon redirect stderr to logfile */ - if (is_daemonized()) { + if (daemonized) { dup2(fileno(fd), STDERR_FILENO); fclose(fd); /* This will skip closing logfile in qemu_logfile_free. */ @@ -204,7 +206,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, } } else { /* Default to stderr if no log file specified */ - assert(!is_daemonized()); + assert(!daemonized); fd =3D stderr; } =20 --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648302946; cv=none; d=zohomail.com; s=zohoarc; b=OtmOkChjAc0t5SbXxARtE5BVU/aEKUr043FfNc4UEsIVi4An5R3XxN6/S5cXiDH+Nd8kDXbfU6to5bzNIc93Qt+wMQ4/RKC1Uao2rh51av8ll9PjSWfyXWWUqowVoyr/SPKUzZzND36ZYwdPvxZNNZ+U4SdUnd5CKs7Bx4Vxe64= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648302946; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=go+GYnXGkWPQcv2j/hc2xPgBqJ1JmT544mDHf3z2u08=; b=Dek/0H6A+84ZEK/8Yl3KNJ/b5wwIQsG3sHV3dJ3nC0SBBcc34J+trjegUyMDX1n2tAfIZdbhq7mJhweFhEM00Arnmt6jIxy7GTgvgsVGlLg/8HMGREgy0LGk1Jk8SVuJn8dDslO4heXtdvN7C+WaCQrOJddfBMnW7bVHD+cojXQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648302946515187.00809682890906; Sat, 26 Mar 2022 06:55:46 -0700 (PDT) Received: from localhost ([::1]:34908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6tN-0004HS-Ek for importer@patchew.org; Sat, 26 Mar 2022 09:55:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6UE-0002wP-7R for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:46 -0400 Received: from [2607:f8b0:4864:20::232] (port=46670 helo=mail-oi1-x232.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6UC-0005z6-RL for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:45 -0400 Received: by mail-oi1-x232.google.com with SMTP id b188so11067759oia.13 for ; Sat, 26 Mar 2022 06:29:44 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id s24-20020a056808209800b002da3b9bf8e0sm4394509oiw.32.2022.03.26.06.29.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:29:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=go+GYnXGkWPQcv2j/hc2xPgBqJ1JmT544mDHf3z2u08=; b=CCv+fh7ZkpClVw+E0S4VVEZMtdFZr3mW+CJPCh2g7x3iI3TrxX46577jrrNa5W1qEp QVhZt1i07+mC4iCBRO9Wg27AFmel5m32WfR6Rf8jnQy/blT0bOgU9hfkhS8KxmP2pnr3 G8VhwPFrtCHAvWwQ3nirKhe3GLd3Epi0tAC+eUBX6vpSiYK5JU3yCYz8r5cKxD3/B1b9 Ky8mJ0qmwUdA2hOk2Ty/SsfscCoZQB48//8/BCAAyXv+gdapB8rlqYM+HZfR5N15M6US SmmC/HTkkQup3Hbux0E5vxrZu0W1oC/tuAJpe9DR4Y1x4557Bx/iLcnj3L0by+Ow0Ff0 MdeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=go+GYnXGkWPQcv2j/hc2xPgBqJ1JmT544mDHf3z2u08=; b=yfX8rYkFLH6Jwogh2lOf7McKsYToXWFR75/zcREkriD5ykHFpChPCBu/QWiADvg3qc +hkkSvPLKGiliatfsxy/Kkk7EXdx4fRDt5spfxPcXll1GCufp+QvrsoQ8UCMauXSf+dx vTBm5/Yj/M/gXmaw3PjUNNpc9cjiaxAfeYNlN1nanZZrSOjRABg4zXZqwmH5IoooOsQN lGuIKo3t0c4eDS112SetscgccWt4OetLVqA47Ub9VL6XwtbkOoMRzo9fsuFAT2pubYJR 5KLxZyfGWKBUH+E6LSj1+gQBa+rI5i2v+HlABfjv3gM99KNQfN4vcXmiCBNDHGlt1+sX exmw== X-Gm-Message-State: AOAM5338BDzayLJzjrnFI2oTjb/EMADfpQb6QZZwVfQMk8OCggs9Dj1r nbUMpe5Su4xc27ouOV0zImWSRaM6cVAHcrp2 X-Google-Smtp-Source: ABdhPJxDnS9u6nlYfs5bIJ336eFOfcu16IG+UYrhrQYnvF6CZRvrLzm8AXO5C12jY++5dy3lQG6HIw== X-Received: by 2002:a05:6808:11cd:b0:2d9:a01a:4bc6 with SMTP id p13-20020a05680811cd00b002d9a01a4bc6mr8176506oiv.237.1648301383855; Sat, 26 Mar 2022 06:29:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 36/39] util/log: Combine two logfile closes Date: Sat, 26 Mar 2022 07:25:31 -0600 Message-Id: <20220326132534.543738-45-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::232 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::232; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x232.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648302948764100001 Content-Type: text/plain; charset="utf-8" Merge the close from the changed_name block with the close from the !need_to_open_file block. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- util/log.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/util/log.c b/util/log.c index 631856e231..21da961d8d 100644 --- a/util/log.c +++ b/util/log.c @@ -157,12 +157,6 @@ static bool qemu_set_log_internal(const char *filename= , bool changed_name, g_free(global_filename); global_filename =3D newname; filename =3D newname; - - if (logfile) { - qatomic_rcu_set(&global_file, NULL); - call_rcu(logfile, qemu_logfile_free, rcu); - logfile =3D NULL; - } } else { filename =3D global_filename; } @@ -182,11 +176,12 @@ static bool qemu_set_log_internal(const char *filenam= e, bool changed_name, daemonized =3D is_daemonized(); need_to_open_file =3D log_flags && (!daemonized || filename); =20 - if (logfile && !need_to_open_file) { + if (logfile && (!need_to_open_file || changed_name)) { qatomic_rcu_set(&global_file, NULL); call_rcu(logfile, qemu_logfile_free, rcu); - return true; + logfile =3D NULL; } + if (!logfile && need_to_open_file) { FILE *fd; =20 --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648304392; cv=none; d=zohomail.com; s=zohoarc; b=Zedvbxmedeu9es6X6A1mhFbvs67wXgboYvQA6+dBl+S3bbfUtn0Ls3MyuFDYN8+fpYIyHzHXFyrsEEfbrimhUMxtScGKaRkeqdAyuH2kNMb12VgABFE2r5QjmmiJBXzY6ci6lRDayEHsY1qErbgz06Ty5B7fpvkJoKSfvZTE+E8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648304392; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7gCOVHpiUyMRDpJzcLkdT+SsxIqZ0YBDWLphLP/PUG0=; b=ni2qc6uTzeeqJx4ycg1CQmrJQfqozqY/tH8XVF3fn5VwDiBhoi5nZ3sLzj7w0YfEnwMOQPfZVAEFLd6KWqNUWFFqn6WejRKd8XdwKVz+kDnOxuHQvHfYzL3n7fA4T3p3CI4t6bu+vH+RzM2P3LrNHqBSB47X6WiTpnpZ986IWKs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648304392342501.12916825037337; Sat, 26 Mar 2022 07:19:52 -0700 (PDT) Received: from localhost ([::1]:35066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY7Gg-0000oC-TZ for importer@patchew.org; Sat, 26 Mar 2022 10:19:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6UF-0002yS-GT for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:49 -0400 Received: from [2607:f8b0:4864:20::22c] (port=33769 helo=mail-oi1-x22c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6UD-0005zH-VU for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:47 -0400 Received: by mail-oi1-x22c.google.com with SMTP id k10so11121997oia.0 for ; Sat, 26 Mar 2022 06:29:45 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id s24-20020a056808209800b002da3b9bf8e0sm4394509oiw.32.2022.03.26.06.29.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7gCOVHpiUyMRDpJzcLkdT+SsxIqZ0YBDWLphLP/PUG0=; b=peStyffkPKLqPkMkPjdm7qjkhZ7J5paLvW4tPuX1EREkbJUD+JMsMPFc+S2ENBlV52 TZCuTfPo+s7u2d8vlTtuVKQzgmxibuX1Ma6i2nk3Ss9PaBzfr6gJXsKkqRZyx+ssWWDw kZb23B3o851ZuDV1aiA9dHwzh3I2O9o5zYnRHPTqDee/yo9S6+DyZ0LNFF230dmGhAwL 8jggsj3d7FxWAqwVBaiyhZANgyu/NX7rZcrEurcjgEApDCFrgmmhf/SRATxhheoX2vAP AqJljjcKTZl/SkKp4dc9EpTRY+9kpJup9Bb2BORF8Zvtnp+ZDVceHpbVIpgcRLZRSR7o L2xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7gCOVHpiUyMRDpJzcLkdT+SsxIqZ0YBDWLphLP/PUG0=; b=YnDMs+x04XLFYeAuJobb8J7kJH4JrhY6SeRxtnXY51BC1ejdPb+fEwAr0gS1nM5oLz p1pRwnVrQ7bSz04XwYzoayzPYs9e3mlpg2rh6nJuAxj6RaWz8sbHtszKUGmWgYRcwIdd xSp0aDc86ld2Bq5TJrzmwNkzHPqWpZ2wPwqPvaf5uZuEPqwO0WGVLA+n8nm/3C0Xz3c5 fGvOJ9Gn2qgiIFwnH15UhxE/xXUgeBvcs0SBmhzNT9luysuC8obO7CDKmwm0n0dClzxF HgHKDR3NJDc8K2algOf7K6wOUxemXQg8XHTP7dkDix8fuZ3UOwAu4lFIWv6OrLIzkyoU Yw4g== X-Gm-Message-State: AOAM5319VoWEL0Xa+Cp2nTDjYv+aAi/DwYPr1gNvEWxVPHyfFnpBvSdl bW/J6100pkdB+JZTsx+0dc61peW7EjBw4442 X-Google-Smtp-Source: ABdhPJwadsXK3+gHo992BQ3PcIOtFkoxWSqWP2PYNS8rNaDK1CiqPs13cb72yudgvnvmtk9qE6wQmA== X-Received: by 2002:aca:aa55:0:b0:2ee:e8e8:cf80 with SMTP id t82-20020acaaa55000000b002eee8e8cf80mr12641473oie.64.1648301384947; Sat, 26 Mar 2022 06:29:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 37/39] util/log: Rename QemuLogFile to RCUCloseFILE Date: Sat, 26 Mar 2022 07:25:32 -0600 Message-Id: <20220326132534.543738-46-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22c; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648304395425100001 s/QemuLogFile/RCUCloseFILE/ s/qemu_logfile_free/rcu_close_file/ Emphasize that this is only a carrier for passing a pointer to call_rcu for closing, and not the real logfile. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- util/log.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/util/log.c b/util/log.c index 21da961d8d..eb6e85b2f0 100644 --- a/util/log.c +++ b/util/log.c @@ -29,15 +29,15 @@ #include "qemu/rcu.h" =20 =20 -typedef struct QemuLogFile { +typedef struct RCUCloseFILE { struct rcu_head rcu; FILE *fd; -} QemuLogFile; +} RCUCloseFILE; =20 /* Mutex covering the other global_* variables. */ static QemuMutex global_mutex; static char *global_filename; -static QemuLogFile *global_file; +static RCUCloseFILE *global_file; =20 int qemu_loglevel; static int log_append =3D 0; @@ -52,7 +52,7 @@ bool qemu_log_enabled(void) /* Returns true if qemu_log() will write somewhere other than stderr. */ bool qemu_log_separate(void) { - QemuLogFile *logfile; + RCUCloseFILE *logfile; bool res =3D false; =20 rcu_read_lock(); @@ -68,7 +68,7 @@ bool qemu_log_separate(void) =20 FILE *qemu_log_trylock(void) { - QemuLogFile *logfile; + RCUCloseFILE *logfile; =20 rcu_read_lock(); logfile =3D qatomic_rcu_read(&global_file); @@ -108,14 +108,12 @@ static void __attribute__((__constructor__)) startup(= void) qemu_mutex_init(&global_mutex); } =20 -static void qemu_logfile_free(QemuLogFile *logfile) +static void rcu_close_file(RCUCloseFILE *r) { - g_assert(logfile); - - if (logfile->fd !=3D stderr) { - fclose(logfile->fd); + if (r->fd !=3D stderr) { + fclose(r->fd); } - g_free(logfile); + g_free(r); } =20 /* enable or disable low levels log */ @@ -124,7 +122,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, { bool need_to_open_file; bool daemonized; - QemuLogFile *logfile; + RCUCloseFILE *logfile; =20 QEMU_LOCK_GUARD(&global_mutex); logfile =3D global_file; @@ -178,7 +176,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, =20 if (logfile && (!need_to_open_file || changed_name)) { qatomic_rcu_set(&global_file, NULL); - call_rcu(logfile, qemu_logfile_free, rcu); + call_rcu(logfile, rcu_close_file, rcu); logfile =3D NULL; } =20 @@ -196,7 +194,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, if (daemonized) { dup2(fileno(fd), STDERR_FILENO); fclose(fd); - /* This will skip closing logfile in qemu_logfile_free. */ + /* This will skip closing logfile in rcu_close_file. */ fd =3D stderr; } } else { @@ -207,7 +205,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, =20 log_append =3D 1; =20 - logfile =3D g_new0(QemuLogFile, 1); + logfile =3D g_new0(RCUCloseFILE, 1); logfile->fd =3D fd; qatomic_rcu_set(&global_file, logfile); } --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648303128; cv=none; d=zohomail.com; s=zohoarc; b=jitqracmKnA/dSGVATLUi9gXObQ8C3Lfc4/kfN0z7TCRo7oW18SYoRodGr/9t7cP9l1C+kJAgQ4yP5H/fF4jDU6lOyLb0e9G3w7vhFYFjkT+wFdCEHj3FTk/DWtLutOCPYfOMSOlKjxhRZyviBRM/BgLB0snts2pgU0jsXdmQfs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648303128; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aXHC8lLdzIN7Te/CRAft3NVYbrUQIuuG52xMXpJ9gWU=; b=oKW4dj+NEFFvMmzeFefHPymHxqWALZmlHclzANglFoNXmXCgHjI4JYVmKkat7K6QK4ooPDkleumdITpFiFx0XYv42ZY+V40CSkc3j+KLuTra+LA92lXpYz2h9R4mTT+NCzqtknSw4hgpY3/ovhQ3VTylyc+9sXbeZ9AYveKDbE0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648303128429974.9811070804781; Sat, 26 Mar 2022 06:58:48 -0700 (PDT) Received: from localhost ([::1]:43470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6wJ-0001r5-5y for importer@patchew.org; Sat, 26 Mar 2022 09:58:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6UG-0002yt-Ev for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:49 -0400 Received: from [2001:4860:4864:20::2b] (port=43761 helo=mail-oa1-x2b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6UE-0005zS-TC for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:48 -0400 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-de2cb87f6aso10708639fac.10 for ; Sat, 26 Mar 2022 06:29:46 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id s24-20020a056808209800b002da3b9bf8e0sm4394509oiw.32.2022.03.26.06.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:29:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aXHC8lLdzIN7Te/CRAft3NVYbrUQIuuG52xMXpJ9gWU=; b=LunsatfujAtg43ZGgevckQNX/CqHKuYL6aBGWGKcvEyz+MoX5JaM7kUf+WTkIj5gx2 PE55uFgHMsL81mjt34cdgzxKJobhvCrDo0qUwjDMdPXG+MHW+gkVQintXOCF4eM7X8Rx VE/WJ84uGfAtPG92LUqP2+P59n33MgcyKIy45jfQn02ITZMQ6/BiEtbE79uorvH1r7CV naxJDtz78LKu+ksFWSWB5T7AeULZ++LgEfw3hkOKnbpoil6yarqW0KbhRcci1VsP1fI/ /oLHLAOqhjjZqvAWbta8A0tInF191bcnOva7lT03gawAWwJt9sjzDExj1lFMh0Sqo6r7 w5Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aXHC8lLdzIN7Te/CRAft3NVYbrUQIuuG52xMXpJ9gWU=; b=5aH8eP0frvlQytiAA8Vgoe0z69PJ0EW6NxJufK8egGDpdqbimf7rlezH9PP9hla2cg SSy9ZVXvnOqFvNHjwvR0e4T4EwrMfRaUITgNW6MBSV/pxxV/9IKrkkauCSvDnyLKuCeK aMZGyYaIHxa/OgC4Cs5IyobHcwFnGFMgJfVfyYs8f8WE48wVlwx/Fy1ORvNOzNLoPUmS YXALvbQw84bwrj9WOZcSipnxyLx0JsGhl3ARmU3+JsqVhaA3Rh3xt9cNv1CFcypFj5ps Uu99ZzmESL7dpMWWOeEvTnXGYTZJgzGP45ObcBAfweYliygT0/aI4bJUpahYBImwhVTX zkrg== X-Gm-Message-State: AOAM532dYJ8F+xjm3PEkFenP54FkRlBXNPIacp2wmZGM2BSVTdSBINpe 82N26aQ99063HfAs0NxPSyMF5tV4LZ2KrB2m X-Google-Smtp-Source: ABdhPJzRXnYZCQO403uBAwAvgNUDwavbMMWRN+XU4VSKbFiJW+brE2v834P4tWZuLd7cQS+BklUraw== X-Received: by 2002:a05:6871:28b:b0:de:282:34ef with SMTP id i11-20020a056871028b00b000de028234efmr7076648oae.287.1648301385957; Sat, 26 Mar 2022 06:29:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 38/39] util/log: Limit RCUCloseFILE to file closing Date: Sat, 26 Mar 2022 07:25:33 -0600 Message-Id: <20220326132534.543738-47-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2b; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648303128674100001 Content-Type: text/plain; charset="utf-8" Use FILE* for global_file. We can perform an rcu_read on that just as easily as RCUCloseFILE*. This simplifies a couple of places, where previously we required taking the rcu_read_lock simply to avoid racing to dereference RCUCloseFile->fd. Only allocate the RCUCloseFile prior to call_rcu. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- v2: Work around problem with qatomic_rcu_read vs struct _IO_FILE on musl. --- util/log.c | 68 +++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/util/log.c b/util/log.c index eb6e85b2f0..df0710720f 100644 --- a/util/log.c +++ b/util/log.c @@ -37,7 +37,7 @@ typedef struct RCUCloseFILE { /* Mutex covering the other global_* variables. */ static QemuMutex global_mutex; static char *global_filename; -static RCUCloseFILE *global_file; +static FILE *global_file; =20 int qemu_loglevel; static int log_append =3D 0; @@ -46,46 +46,44 @@ static GArray *debug_regions; /* Returns true if qemu_log() will really write somewhere. */ bool qemu_log_enabled(void) { - return global_file !=3D NULL; + return qatomic_read(&global_file) !=3D NULL; } =20 /* Returns true if qemu_log() will write somewhere other than stderr. */ bool qemu_log_separate(void) { - RCUCloseFILE *logfile; - bool res =3D false; - - rcu_read_lock(); - logfile =3D qatomic_rcu_read(&global_file); - if (logfile && logfile->fd !=3D stderr) { - res =3D true; - } - rcu_read_unlock(); - return res; + FILE *logfile =3D qatomic_read(&global_file); + return logfile && logfile !=3D stderr; } =20 /* Lock/unlock output. */ =20 FILE *qemu_log_trylock(void) { - RCUCloseFILE *logfile; + FILE *logfile; =20 rcu_read_lock(); - logfile =3D qatomic_rcu_read(&global_file); + /* + * FIXME: typeof_strip_qual, as used by qatomic_rcu_read, + * does not work with pointers to undefined structures, + * such as we have with struct _IO_FILE and musl libc. + * Since all we want is a read of a pointer, cast to void**, + * which does work with typeof_strip_qual. + */ + logfile =3D qatomic_rcu_read((void **)&global_file); if (logfile) { - qemu_flockfile(logfile->fd); - return logfile->fd; + qemu_flockfile(logfile); } else { rcu_read_unlock(); - return NULL; } + return logfile; } =20 -void qemu_log_unlock(FILE *fd) +void qemu_log_unlock(FILE *logfile) { - if (fd) { - fflush(fd); - qemu_funlockfile(fd); + if (logfile) { + fflush(logfile); + qemu_funlockfile(logfile); rcu_read_unlock(); } } @@ -110,9 +108,7 @@ static void __attribute__((__constructor__)) startup(vo= id) =20 static void rcu_close_file(RCUCloseFILE *r) { - if (r->fd !=3D stderr) { - fclose(r->fd); - } + fclose(r->fd); g_free(r); } =20 @@ -122,7 +118,7 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, { bool need_to_open_file; bool daemonized; - RCUCloseFILE *logfile; + FILE *logfile; =20 QEMU_LOCK_GUARD(&global_mutex); logfile =3D global_file; @@ -176,37 +172,37 @@ static bool qemu_set_log_internal(const char *filenam= e, bool changed_name, =20 if (logfile && (!need_to_open_file || changed_name)) { qatomic_rcu_set(&global_file, NULL); - call_rcu(logfile, rcu_close_file, rcu); + if (logfile !=3D stderr) { + RCUCloseFILE *r =3D g_new0(RCUCloseFILE, 1); + r->fd =3D logfile; + call_rcu(r, rcu_close_file, rcu); + } logfile =3D NULL; } =20 if (!logfile && need_to_open_file) { - FILE *fd; - if (filename) { - fd =3D fopen(filename, log_append ? "a" : "w"); - if (!fd) { + logfile =3D fopen(filename, log_append ? "a" : "w"); + if (!logfile) { error_setg_errno(errp, errno, "Error opening logfile %s", filename); return false; } /* In case we are a daemon redirect stderr to logfile */ if (daemonized) { - dup2(fileno(fd), STDERR_FILENO); - fclose(fd); + dup2(fileno(logfile), STDERR_FILENO); + fclose(logfile); /* This will skip closing logfile in rcu_close_file. */ - fd =3D stderr; + logfile =3D stderr; } } else { /* Default to stderr if no log file specified */ assert(!daemonized); - fd =3D stderr; + logfile =3D stderr; } =20 log_append =3D 1; =20 - logfile =3D g_new0(RCUCloseFILE, 1); - logfile->fd =3D fd; qatomic_rcu_set(&global_file, logfile); } return true; --=20 2.25.1 From nobody Mon Feb 9 19:09:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648304313; cv=none; d=zohomail.com; s=zohoarc; b=Yd0JoTJi8SeOWRopR0S6ya5Xrtc0XsaiTpfpvxgmHrYTVU/I6TbHMxN1vcM4nZn+T3ervnorZu4c4Zzs7UkVFLiUt4AT/xhCa/rkikFNRSWD8jch56H392dxGNtOq45qj8ZPNfRj/t7rAc3i02dNof3iJF+0KIMGbLitHdH9UZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648304313; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kcCuxlkVT075lpymlA6JruiT9pScLcSGcIoU5KgWuJw=; b=MAkByRzG+5ulAf5fUZIYOMI7Owk0HtMRlCucsu5xRO/LSvyX2dzC9R9xh1jM3JpeQ4mKqu2S8StTyG/65jQkIHZZmL4l46MyVMTdLi7kUA+39hbNixmXHBgy7HMiqkEjDuqNk9Xu9zKXX2CQa5SvYbj45tCAbCjf3fzAhPIQwuU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648304313856826.4943720751014; Sat, 26 Mar 2022 07:18:33 -0700 (PDT) Received: from localhost ([::1]:60016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY7FQ-000743-DO for importer@patchew.org; Sat, 26 Mar 2022 10:18:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6UI-00030M-DE for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:51 -0400 Received: from [2001:4860:4864:20::2d] (port=32816 helo=mail-oa1-x2d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6UF-0005zb-Vy for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:49 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-de3eda6b5dso10779801fac.0 for ; Sat, 26 Mar 2022 06:29:47 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id s24-20020a056808209800b002da3b9bf8e0sm4394509oiw.32.2022.03.26.06.29.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:29:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kcCuxlkVT075lpymlA6JruiT9pScLcSGcIoU5KgWuJw=; b=u4ZSZkxsqAG1mYUX8YiHStfuMI9U7Bs+FMvrw/WlD5GAzWOp+5Q05v426CuKBZcyfJ uFl546MqcuAzz+eezB/HN5Y5Qfh0xGJUIdIYE/TGgcam8ncXXTGHeGlZO7sRShw9XZSR pBD43dnXthI9QrdRhz9fjeBPTFB9jTr18j7X2aaKC+5h2WRZ1Ca/LveXukY2liQ/aWQj dWdNtix2Dme7B/8Ld8jCPvcJEMuKNQ1v8Hb3vtkxUGdNjt257YBelC4yMt0tdOZJBzk0 lPwnN6S+nclZVNemy2nTSQcGniG6DA6EgvWpq+Dk5fhjeGOrpBENv1Gra7ewHXzzZvQE v8YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kcCuxlkVT075lpymlA6JruiT9pScLcSGcIoU5KgWuJw=; b=CkS3n6A4+2tuNtCoZAg3urOqsjeCmHsQbxTD2GGXfwGsi7Rm4o2ULIVtgDpg6W5aU8 HU6vW0PNuKIo+Ugj8Wejmi2HiqeZy6/Sx5giQkzt07wb03HPP0d/iXwfzYvhx023wvUP 1AvuNIt/97Px4MjxvPGCxjpH/lkGw9G1Dg9cTWTO0F+H29K+pZzHfPUm7wCS7kp6d0SJ yjFaTGgbRGBPwt9K325OI9SAD9BYjfbMtpK5vQrfi+7VKoCDxk7n+Mub6mSEeH1tRFyg SnTxAZOrk42zrSolod7YZwuliFomWJ+Wd5oOIvtVNu1ww1XAtYjfTvnH46/DL4dsRSI7 nUAw== X-Gm-Message-State: AOAM532KIk3Kz4RUeThFP0XXIsDLsRLDNoApKMKQ7aaCEvX3M5F2GpEI mQcy2NQ4ahnqTQDjsJ0dX91CGVAx8/ZO4j7/ X-Google-Smtp-Source: ABdhPJxNKOvJihQWBa7yc33j0u+TShzDrDgmjKnmNxPhWzJbiW/rQDsd+3obVTGjAMKSoCkbIKixUg== X-Received: by 2002:a05:6870:6108:b0:dd:ca26:f135 with SMTP id s8-20020a056870610800b000ddca26f135mr6978707oae.22.1648301386934; Sat, 26 Mar 2022 06:29:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 39/39] util/log: Support per-thread log files Date: Sat, 26 Mar 2022 07:25:34 -0600 Message-Id: <20220326132534.543738-48-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2d; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648304315704100001 Content-Type: text/plain; charset="utf-8" Add a new log flag, tid, to turn this feature on. Require the log filename to be set, and to contain %d. Do not allow tid to be turned off once it is on, nor let the filename be change thereafter. This avoids the need for signalling each thread to re-open on a name change. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- v2: Make use of CONFIG_GETTID, and fallback to SYS_gettid. --- include/qemu/log.h | 1 + util/log.c | 149 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 115 insertions(+), 35 deletions(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index a325bca661..c5643d8dd5 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -34,6 +34,7 @@ bool qemu_log_separate(void); #define CPU_LOG_PLUGIN (1 << 18) /* LOG_STRACE is used for user-mode strace logging. */ #define LOG_STRACE (1 << 19) +#define LOG_PER_THREAD (1 << 20) =20 /* Lock/unlock output. */ =20 diff --git a/util/log.c b/util/log.c index df0710720f..0bb2233788 100644 --- a/util/log.c +++ b/util/log.c @@ -27,6 +27,9 @@ #include "qemu/thread.h" #include "qemu/lockable.h" #include "qemu/rcu.h" +#ifdef CONFIG_LINUX +#include +#endif =20 =20 typedef struct RCUCloseFILE { @@ -38,22 +41,36 @@ typedef struct RCUCloseFILE { static QemuMutex global_mutex; static char *global_filename; static FILE *global_file; +static __thread FILE *thread_file; =20 int qemu_loglevel; -static int log_append =3D 0; +static bool log_append; +static bool log_per_thread; static GArray *debug_regions; =20 /* Returns true if qemu_log() will really write somewhere. */ bool qemu_log_enabled(void) { - return qatomic_read(&global_file) !=3D NULL; + return log_per_thread || qatomic_read(&global_file) !=3D NULL; } =20 /* Returns true if qemu_log() will write somewhere other than stderr. */ bool qemu_log_separate(void) { FILE *logfile =3D qatomic_read(&global_file); - return logfile && logfile !=3D stderr; + return log_per_thread || (logfile && logfile !=3D stderr); +} + +static int log_thread_id(void) +{ +#ifdef CONFIG_GETTID + return gettid(); +#elif defined(SYS_gettid) + return syscall(SYS_gettid); +#else + static int counter; + return qatomic_fetch_inc(&counter); +#endif } =20 /* Lock/unlock output. */ @@ -62,20 +79,34 @@ FILE *qemu_log_trylock(void) { FILE *logfile; =20 - rcu_read_lock(); - /* - * FIXME: typeof_strip_qual, as used by qatomic_rcu_read, - * does not work with pointers to undefined structures, - * such as we have with struct _IO_FILE and musl libc. - * Since all we want is a read of a pointer, cast to void**, - * which does work with typeof_strip_qual. - */ - logfile =3D qatomic_rcu_read((void **)&global_file); - if (logfile) { - qemu_flockfile(logfile); - } else { - rcu_read_unlock(); + logfile =3D thread_file; + if (!logfile) { + if (log_per_thread) { + g_autofree char *filename + =3D g_strdup_printf(global_filename, log_thread_id()); + logfile =3D fopen(filename, "w"); + if (!logfile) { + return NULL; + } + thread_file =3D logfile; + } else { + rcu_read_lock(); + /* + * FIXME: typeof_strip_qual, as used by qatomic_rcu_read, + * does not work with pointers to undefined structures, + * such as we have with struct _IO_FILE and musl libc. + * Since all we want is a read of a pointer, cast to void**, + * which does work with typeof_strip_qual. + */ + logfile =3D qatomic_rcu_read((void **)&global_file); + if (!logfile) { + rcu_read_unlock(); + return NULL; + } + } } + + qemu_flockfile(logfile); return logfile; } =20 @@ -84,7 +115,9 @@ void qemu_log_unlock(FILE *logfile) if (logfile) { fflush(logfile); qemu_funlockfile(logfile); - rcu_read_unlock(); + if (!log_per_thread) { + rcu_read_unlock(); + } } } =20 @@ -112,40 +145,74 @@ static void rcu_close_file(RCUCloseFILE *r) g_free(r); } =20 +/** + * valid_filename_template: + * + * Validate the filename template. Require %d if per_thread, allow it + * otherwise; require no other % within the template. + * Return 0 if invalid, 1 if stderr, 2 if strdup, 3 if pid printf. + */ +static int valid_filename_template(const char *filename, + bool per_thread, Error **errp) +{ + if (filename) { + char *pidstr =3D strstr(filename, "%"); + + if (pidstr) { + /* We only accept one %d, no other format strings */ + if (pidstr[1] !=3D 'd' || strchr(pidstr + 2, '%')) { + error_setg(errp, "Bad logfile template: %s", filename); + return 0; + } + return per_thread ? 2 : 3; + } + } + if (per_thread) { + error_setg(errp, "Filename template with '%%d' required for 'tid'"= ); + return 0; + } + return filename ? 2 : 1; +} + /* enable or disable low levels log */ static bool qemu_set_log_internal(const char *filename, bool changed_name, int log_flags, Error **errp) { bool need_to_open_file; bool daemonized; + bool per_thread; FILE *logfile; =20 QEMU_LOCK_GUARD(&global_mutex); logfile =3D global_file; =20 + per_thread =3D log_flags & LOG_PER_THREAD; + if (changed_name) { char *newname =3D NULL; =20 /* - * Allow the user to include %d in their logfile which will be - * substituted with the current PID. This is useful for debugging = many - * nested linux-user tasks but will result in lots of logs. - * - * filename may be NULL. In that case, log output is sent to stderr + * Once threads start opening their own log files, we have no + * easy mechanism to tell them all to close and re-open. + * There seems little cause to do so either -- this option + * will most often be used at user-only startup. */ - if (filename) { - char *pidstr =3D strstr(filename, "%"); + if (log_per_thread) { + error_setg(errp, "Cannot change log filename after setting 'ti= d'"); + return false; + } =20 - if (pidstr) { - /* We only accept one %d, no other format strings */ - if (pidstr[1] !=3D 'd' || strchr(pidstr + 2, '%')) { - error_setg(errp, "Bad logfile format: %s", filename); - return false; - } - newname =3D g_strdup_printf(filename, getpid()); - } else { - newname =3D g_strdup(filename); - } + switch (valid_filename_template(filename, per_thread, errp)) { + case 0: + return false; /* error */ + case 1: + break; /* stderr */ + case 2: + newname =3D g_strdup(filename); + break; + case 3: + newname =3D g_strdup_printf(filename, getpid()); + break; } =20 g_free(global_filename); @@ -153,8 +220,17 @@ static bool qemu_set_log_internal(const char *filename= , bool changed_name, filename =3D newname; } else { filename =3D global_filename; + if (per_thread && !valid_filename_template(filename, true, errp)) { + return false; /* error */ + } } =20 + /* Once the per-thread flag is set, it cannot be unset. */ + if (per_thread) { + log_per_thread =3D true; + } + /* The flag itself is not relevant for need_to_open_file. */ + log_flags &=3D ~LOG_PER_THREAD; #ifdef CONFIG_TRACE_LOG log_flags |=3D LOG_TRACE; #endif @@ -163,12 +239,13 @@ static bool qemu_set_log_internal(const char *filenam= e, bool changed_name, /* * In all cases we only log if qemu_loglevel is set. * Also: + * If per-thread, open the file for each thread in qemu_log_lock. * If not daemonized we will always log either to stderr * or to a file (if there is a filename). * If we are daemonized, we will only log if there is a filename. */ daemonized =3D is_daemonized(); - need_to_open_file =3D log_flags && (!daemonized || filename); + need_to_open_file =3D log_flags && !per_thread && (!daemonized || file= name); =20 if (logfile && (!need_to_open_file || changed_name)) { qatomic_rcu_set(&global_file, NULL); @@ -354,6 +431,8 @@ const QEMULogItem qemu_log_items[] =3D { #endif { LOG_STRACE, "strace", "log every user-mode syscall, its input, and its result" }, + { LOG_PER_THREAD, "tid", + "open a separate log file per thread; filename must contain '%d'" }, { 0, NULL, NULL }, }; =20 --=20 2.25.1