From patchwork Wed Mar 26 14:37:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 27139 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2678B20062 for ; Wed, 26 Mar 2014 14:38:42 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id lx4sf7405793iec.3 for ; Wed, 26 Mar 2014 07:38:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=Wvr/xjhwmbZDauL1rrD03W91p29fK1yRH/3RS56ywH0=; b=N/Y9dvDfr20VLA6kBDCQfxyx+RbwjzXBQIorZJJuIhxDr0AwEbp/ruYAwZqIccrA8R YcaxmqCfOSCCtpAPD+BpF4CTuVZ1Us1yn7INVSOfn5/J1EiFs40scAXalfy5mv+eNGze 67QXn+pBVWnViAD5iItTy/W+cZhGSN9uxcDczXbHt3QsQwqysPHQ7bUp3PX/37xP5MAy fEvskSe22oYRPnMKcsU46rhWhhGg/zKPlUjBvehymzXsAljx+KHwOe/u3mFqXZQg3MdJ 66Xj4LnxPmZbqTFmx9ENh7bwTTURKB3/UccZmGbhMl+PGVUnnsxvouLIy6Ixmp3kmhF5 rZhA== X-Gm-Message-State: ALoCoQlCIUbaIea+oJFd9GgntYdkrsLpN2CGwVrNrVEasgY/d8fM2LJsjR7oqHZ6fsQXAiiK05xF X-Received: by 10.182.219.226 with SMTP id pr2mr17336387obc.44.1395844721574; Wed, 26 Mar 2014 07:38:41 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.33.203 with SMTP id j69ls667464qgj.27.gmail; Wed, 26 Mar 2014 07:38:41 -0700 (PDT) X-Received: by 10.58.150.68 with SMTP id ug4mr254327veb.50.1395844721326; Wed, 26 Mar 2014 07:38:41 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id h18si4505558vco.88.2014.03.26.07.38.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Mar 2014 07:38:41 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id oz11so2414114veb.6 for ; Wed, 26 Mar 2014 07:38:41 -0700 (PDT) X-Received: by 10.220.114.135 with SMTP id e7mr11814013vcq.23.1395844721258; Wed, 26 Mar 2014 07:38:41 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp51459vck; Wed, 26 Mar 2014 07:38:40 -0700 (PDT) X-Received: by 10.224.22.147 with SMTP id n19mr2732185qab.93.1395844720006; Wed, 26 Mar 2014 07:38:40 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 68si11768272qgk.12.2014.03.26.07.38.39 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 26 Mar 2014 07:38:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:48408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSoyV-000266-IE for patch@linaro.org; Wed, 26 Mar 2014 10:38:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSoxM-0000pG-Sn for qemu-devel@nongnu.org; Wed, 26 Mar 2014 10:37:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSoxF-0004Er-Rg for qemu-devel@nongnu.org; Wed, 26 Mar 2014 10:37:28 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:60656 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSoxF-0004El-Jd for qemu-devel@nongnu.org; Wed, 26 Mar 2014 10:37:21 -0400 Received: from localhost ([127.0.0.1] helo=zen.linaro.local) by socrates.bennee.com with esmtp (Exim 4.80) (envelope-from ) id 1WSoxd-00040a-6a; Wed, 26 Mar 2014 15:37:45 +0100 From: alex.bennee@linaro.org To: qemu-devel@nongnu.org Date: Wed, 26 Mar 2014 14:37:12 +0000 Message-Id: <1395844634-11729-3-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1395844634-11729-1-git-send-email-alex.bennee@linaro.org> References: <1395844634-11729-1-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: alex.bennee@linaro.org X-SA-Exim-Scanned: No (on socrates.bennee.com); SAEximRunCond expanded to false X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 88.198.71.155 Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [Qemu-devel] [RFC PATCH 2/4] qemu-log: support simple pid substitution in logfile X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: alex.bennee@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Alex Bennée When debugging stuff that occurs over several forks it would be useful not to keep overwriting the one logfile you've set-up. This allows a simple %d to be included once in the logfile parameter which is substituted with getpid(). Signed-off-by: Alex Bennée Reviewed-by: Leandro Dorileo diff --git a/qemu-log.c b/qemu-log.c index 35bbb56..2897596 100644 --- a/qemu-log.c +++ b/qemu-log.c @@ -81,11 +81,24 @@ void do_qemu_set_log(int log_flags, bool use_own_buffers) qemu_log_close(); } } - +/* + * 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. + */ void qemu_set_log_filename(const char *filename) { g_free(logfilename); - logfilename = g_strdup(filename); + if (g_strrstr(filename, "%d")) { + /* if we are going to format this we'd better validate first */ + if (g_regex_match_simple("^[^%]+%d[^%]+$", filename, 0, 0)) { + logfilename = g_strdup_printf(filename, getpid()); + } else { + g_error("Bad logfile format: %s", filename); + } + } else { + logfilename = g_strdup(filename); + } qemu_log_close(); qemu_set_log(qemu_loglevel); }