From patchwork Sat Mar 26 13:25:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 554383 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp6451385mag; Sat, 26 Mar 2022 07:08:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhQmiwUnsK+wRaLBSOn9noYfWqpXTT8wmsb4V0XRTR8hF+V0DpDy3E5JkU7Eeli8PwSlNL X-Received: by 2002:a05:620a:4691:b0:67d:9bab:33d7 with SMTP id bq17-20020a05620a469100b0067d9bab33d7mr10331765qkb.500.1648303694872; Sat, 26 Mar 2022 07:08:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648303694; cv=none; d=google.com; s=arc-20160816; b=gxakC1uydDSTgBDhOtbR6cJheaxIqVcJ1kXHT6y7ie9vsCxgn8KRjRCcJl0dpW7Wjj VeRp4KQoMymLcV5+wN/Tk13Xxybm3aZIyHRKvoFTcidM9tUReLj52TrTjKRkNVzcB0AV UNvq//jn0VbkYNSvZe5HKItFx3i8dlVMdQJpG+58g20kyqAsdLk7S1S7mnMC5IVnZv00 f9tsdQbT8nyY/+oIPBqJBBrpTyFRR0CsltrOjCylZ+wBFoISrdWHN0J43bTnQVahxS96 dRscQe9LFZDYFQVvoIE4VzpMx+JM0CcUi1vt24GchrTpz/457uTfldf5YZw+5437W1qo WqbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=jzU0lMIGHRXlXJG9JfTKmdopHzJcZP5ngZbLDRCyMfA=; b=w9ok34Ho2jchNX8JtkwM68iBbMIvTF9NAAMjcATCZU4l+NT+ACmT7c5/WVSQVETXWO LTvG2feC/Fh3QgNaIS+Gg4Qh9AKEnodHKMnESWyKSxINqYQ/X6ENE8YiiSkm9YB+PCLj QS4nl5uKv73fS5Xg5GkvQ/Puvwdw+TIgcpBjx2Q16pKVUQsbBJEafW3MSMZ2t8DJ2et+ /jTL+dYpevRLbPG3HbkSWduXdkO75yIbq04txpssER6Og8Fv0j8/UvRmL3B4zp/a6Rlk WfQMmPxXMYR4x8m36SN7AA2HiEYIGHD8mBrWQDVXMDxk5WSaml8zskdSSZZxhIuSbV9V 872Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e4AW8isi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d9-20020ac800c9000000b002e20929c1basi2912911qtg.136.2022.03.26.07.08.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 26 Mar 2022 07:08:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e4AW8isi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY75S-0008IE-EA for patch@linaro.org; Sat, 26 Mar 2022 10:08:14 -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) 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-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) 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) 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 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::235 (failed) 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Perform all logfile setup at startup in one step. Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- 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 /* 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 = qemu_str_to_log_mask(log_mask); - if (!mask) { - qemu_print_log_usage(stdout); - exit(1); + { + int mask = 0; + if (log_mask) { + mask = 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); } qemu_add_default_firmwarepath();