From patchwork Tue Nov 7 15:31:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 835350 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SHJ/wrfP"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yWYTR5X5Dz9s7c for ; Wed, 8 Nov 2017 02:37:31 +1100 (AEDT) Received: from localhost ([::1]:54027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eC5wP-0001ow-Nl for incoming@patchwork.ozlabs.org; Tue, 07 Nov 2017 10:37:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eC5tG-0008Gm-Sl for qemu-devel@nongnu.org; Tue, 07 Nov 2017 10:34:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eC5tB-0007wX-5G for qemu-devel@nongnu.org; Tue, 07 Nov 2017 10:34:14 -0500 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:49336) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eC5tB-0007w9-04 for qemu-devel@nongnu.org; Tue, 07 Nov 2017 10:34:09 -0500 Received: by mail-pg0-x243.google.com with SMTP id g6so11308338pgn.6 for ; Tue, 07 Nov 2017 07:34:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MX9fcn6tdHKyiCq0S4kLz5EQJ4cpghHZhR8ZebojkCs=; b=SHJ/wrfP4GR/YtJibFO0gIEjjhC/Fwhrx7IhIME1uKm/D0svBU9QQkVJ8NMJ7XQQpJ wjRD7HbLZHc8+w4ohnIpoxpslvgZjt45FQ9DUQkk17vQKBccwj3zjCetC5n3KDutyqzX 9TF2UbDqhJ6wrvUpiZVIrnO3/Ve83fKsEvmpCJyShlgudfef1qk5Mz9gy1T24L95L4Il 47jfEk2Pg7LjtXXgSN7+QkWiuI0ogG6676U/gE9GJEX35cckIlLrVaP7TosAvmRHM0xx /eSvDgIcgJV8pIVkJhNEr6Gnu/fTCziWs3vxp7dF+BBVoe9FbT42xgLF+LhLfErQ28vS 6BHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MX9fcn6tdHKyiCq0S4kLz5EQJ4cpghHZhR8ZebojkCs=; b=sNuR2qdalzQOsFUt1ewIoFz+J8we3aaoRXenpo2Y46RcOKlMxW5OhZJyztf/yKXySS YI6gVwR7SEWaHCzvEMV9XEutDusBVF19DPXR/yYIA2+eh4+q0MAe5Hb8/Uv8SAn0aRmV cWryiFzkTU5OvZbp53aVwlnuxloS3J/lHMdbypSC/HDRgxys6wIwOfTZDmOhbHoCECwH TPIB5AWE9sY18Gfrr8JJINRLCU7W9fFrceyZLMN8BD/Y45mfFBjvk1a8PVMmCdYpHn// Fz2lf1e4oIuBL5H89lkM86b8E+H5srTbMx+rdJpcDDcdShXCtcKctpQOK/I4KbH6YgeI AxaA== X-Gm-Message-State: AMCzsaV6yEqSN17MFUDPZO6e/Egawy2qy406MkU+4uqMe0GFrGF4sVVK RuiEvtz17L0MYIP9wuX0bpJChQ== X-Google-Smtp-Source: ABhQp+SPPvie/wb8hV+5hrHC4TlAem9NFJc9tozUDro+KUQ/V3n/2Kcp+ULmgsALTrgQ66OnJCm+tQ== X-Received: by 10.99.104.6 with SMTP id d6mr19016247pgc.319.1510068848068; Tue, 07 Nov 2017 07:34:08 -0800 (PST) Received: from danjae.aot.lge.com ([59.12.60.183]) by smtp.gmail.com with ESMTPSA id z13sm3416330pgc.29.2017.11.07.07.34.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Nov 2017 07:34:07 -0800 (PST) From: Namhyung Kim To: Stefan Hajnoczi Date: Wed, 8 Nov 2017 00:31:35 +0900 Message-Id: <20171107153136.19426-2-namhyung@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171107153136.19426-1-namhyung@gmail.com> References: <20171107153136.19426-1-namhyung@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::243 Subject: [Qemu-devel] [PATCH 2/3] trace: Generalize searching for debugfs 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: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The find_debugfs() can be shared to find a different filesystem like tracefs. So make it more general and rename to find_mount(). Signed-off-by: Namhyung Kim --- trace/ftrace.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/trace/ftrace.c b/trace/ftrace.c index bfa38e71f0..213cb2205f 100644 --- a/trace/ftrace.c +++ b/trace/ftrace.c @@ -15,7 +15,7 @@ int trace_marker_fd; -static int find_debugfs(char *debugfs) +static int find_mount(char *mount_point, const char *fstype) { char type[100]; FILE *fp; @@ -27,8 +27,8 @@ static int find_debugfs(char *debugfs) } while (fscanf(fp, "%*s %" STR(PATH_MAX) "s %99s %*s %*d %*d\n", - debugfs, type) == 2) { - if (strcmp(type, "debugfs") == 0) { + mount_point, type) == 2) { + if (strcmp(type, fstype) == 0) { ret = 1; break; } @@ -40,14 +40,14 @@ static int find_debugfs(char *debugfs) bool ftrace_init(void) { - char debugfs[PATH_MAX]; + char mount_point[PATH_MAX]; char path[PATH_MAX]; int debugfs_found; int trace_fd = -1; - debugfs_found = find_debugfs(debugfs); + debugfs_found = find_mount(mount_point, "debugfs"); if (debugfs_found) { - snprintf(path, PATH_MAX, "%s/tracing/tracing_on", debugfs); + snprintf(path, PATH_MAX, "%s/tracing/tracing_on", mount_point); trace_fd = open(path, O_WRONLY); if (trace_fd < 0) { if (errno == EACCES) { @@ -66,7 +66,7 @@ bool ftrace_init(void) } close(trace_fd); } - snprintf(path, PATH_MAX, "%s/tracing/trace_marker", debugfs); + snprintf(path, PATH_MAX, "%s/tracing/trace_marker", mount_point); trace_marker_fd = open(path, O_WRONLY); if (trace_marker_fd < 0) { perror("Could not open ftrace 'trace_marker' file");