From patchwork Thu May 19 11:17:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9126471 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 49C6C9F1C3 for ; Thu, 19 May 2016 11:19:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6AF2520172 for ; Thu, 19 May 2016 11:19:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8E4AD20160 for ; Thu, 19 May 2016 11:19:35 +0000 (UTC) Received: from localhost ([::1]:49684 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3LzK-000434-8t for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 May 2016 07:19:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lyi-00041f-Uy for qemu-devel@nongnu.org; Thu, 19 May 2016 07:18:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3Lyg-000423-K3 for qemu-devel@nongnu.org; Thu, 19 May 2016 07:18:55 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:36477) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lyg-00041z-9V for qemu-devel@nongnu.org; Thu, 19 May 2016 07:18:54 -0400 Received: by mail-wm0-x243.google.com with SMTP id w143so20024301wmw.3 for ; Thu, 19 May 2016 04:18:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z34Hr6x32cRAJ6/Px29SyaziaauyJeH3BGjcqbDKXUU=; b=aZ12nB9w4XWkFmXgDPWEXnBJlnnAspgDKOl4srPbCvXgLQDPFNW2DCOWpXH9z830QD pYf6zffUvNTbuGGZ8O9vnhonvCVZEUbto5JtOIU6h5PKnld5xTQoPkk6WiAvKUtwjCJo P7f9mI2XKH//HFQO2y5OT4SVLVO5+jNblO0cn3ItGOEmePVCIcguZ3k5OyC3ssjSADhz 2ZWh2r1Jsn0IiPgloujCzPfyy70BlqnefGZlZ9HQXmqKSlZdyVkJ5nWeaL5HrZArDD8X 4epcyHLgKlNo6Q1ew/8NViznMk4smLHQbv2LgEKmmLHh5kDG2RX0J4mCCameHi8I4IAk AsaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=z34Hr6x32cRAJ6/Px29SyaziaauyJeH3BGjcqbDKXUU=; b=CoAzHoeY15Ar7v3MY608cgMUbeFlA6h0FlKVutvTyFFkbsNzbhjjmeF/CmR7WWPOgJ Kb/GGrDlEITHyA+jTR2Vy+tV00a9SWt3ZW9eIaJN2Nz2t1iWpwccDy7+sFDOl3QITOi0 S/VusgodElFMKE4QoVByOQB82LteDVx4yANUX6Vn2Ep3Bvc5+/itjiMot4RCmz7b2yPn Qcxza97fUw7LZa7L4fSvE6sP3i0iIuTzaeoOZhDcr0l9Xig9yHAG4i/7Vm2vHeerslQi /jOpTGMNfIumUQnarG6mEU/n3qPkPDsvTeNYyD6Bq7d8z72iwOKF2t/luV4ngqA/eQ8s 3rmA== X-Gm-Message-State: AOPr4FVq2pzkKFMJrPUrE6ZvB/Q+A8YrZNBF1AG2effnRAG5KlDs2JH15llPlhpK6zsQHQ== X-Received: by 10.28.22.65 with SMTP id 62mr36702481wmw.32.1463656733612; Thu, 19 May 2016 04:18:53 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id c7sm8374317wji.38.2016.05.19.04.18.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:18:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 19 May 2016 13:17:58 +0200 Message-Id: <1463656726-35952-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1463656726-35952-1-git-send-email-pbonzini@redhat.com> References: <1463656726-35952-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 04/52] log: do not use CONFIG_USER_ONLY X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This decouples logging further from config-target.h Reviewed-by: Alex Bennée Signed-off-by: Paolo Bonzini --- bsd-user/main.c | 1 + include/qemu/log.h | 17 ++--------------- linux-user/main.c | 1 + util/log.c | 12 ++++++++++-- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 27854c1..058eaca 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -849,6 +849,7 @@ int main(int argc, char **argv) } /* init debug */ + qemu_log_needs_buffers(); qemu_set_log_filename(log_file); if (log_mask) { int mask; diff --git a/include/qemu/log.h b/include/qemu/log.h index c52f136..234fa81 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -104,21 +104,8 @@ typedef struct QEMULogItem { extern const QEMULogItem qemu_log_items[]; -/* This is the function that actually does the work of - * changing the log level; it should only be accessed via - * the qemu_set_log() wrapper. - */ -void do_qemu_set_log(int log_flags, bool use_own_buffers); - -static inline void qemu_set_log(int log_flags) -{ -#ifdef CONFIG_USER_ONLY - do_qemu_set_log(log_flags, true); -#else - do_qemu_set_log(log_flags, false); -#endif -} - +void qemu_set_log(int log_flags); +void qemu_log_needs_buffers(void); void qemu_set_log_filename(const char *filename); void qemu_set_dfilter_ranges(const char *ranges); bool qemu_log_in_addr_range(uint64_t addr); diff --git a/linux-user/main.c b/linux-user/main.c index 5f3ec97..2b7fa9c 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3760,6 +3760,7 @@ static void handle_arg_log(const char *arg) qemu_print_log_usage(stdout); exit(EXIT_FAILURE); } + qemu_log_needs_buffers(); qemu_set_log(mask); } diff --git a/util/log.c b/util/log.c index 1857730..5ad72c1 100644 --- a/util/log.c +++ b/util/log.c @@ -42,8 +42,10 @@ void qemu_log(const char *fmt, ...) va_end(ap); } +static bool log_uses_own_buffers; + /* enable or disable low levels log */ -void do_qemu_set_log(int log_flags, bool use_own_buffers) +void qemu_set_log(int log_flags) { qemu_loglevel = log_flags; #ifdef CONFIG_TRACE_LOG @@ -70,7 +72,7 @@ void do_qemu_set_log(int log_flags, bool use_own_buffers) qemu_logfile = stderr; } /* must avoid mmap() usage of glibc by setting a buffer "by hand" */ - if (use_own_buffers) { + if (log_uses_own_buffers) { static char logfile_buf[4096]; setvbuf(qemu_logfile, logfile_buf, _IOLBF, sizeof(logfile_buf)); @@ -89,6 +91,12 @@ void do_qemu_set_log(int log_flags, bool use_own_buffers) qemu_log_close(); } } + +void qemu_log_needs_buffers(void) +{ + log_uses_own_buffers = true; +} + /* * Allow the user to include %d in their logfile which will be * substituted with the current PID. This is useful for debugging many