Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 25 Sep 2018 02:33:52 -0700
From:   "tip-bot for =?UTF-8?Q?J=C3=A9r=C3=A9mie?= Galarneau" 
        <tipbot@zytor.com>
Message-ID: <tip-c04c859f439fb4de9039246370d60a07b9b5bcb5@git.kernel.org>
Cc:     acme@redhat.com, jolsa@kernel.org, tglx@linutronix.de,
        peterz@infradead.org, alexander.shishkin@linux.intel.com,
        linux-kernel@vger.kernel.org, jeremie.galarneau@efficios.com,
        mingo@kernel.org, hpa@zytor.com
Reply-To: alexander.shishkin@linux.intel.com,
          jeremie.galarneau@efficios.com, linux-kernel@vger.kernel.org,
          mingo@kernel.org, hpa@zytor.com, acme@redhat.com,
          jolsa@kernel.org, tglx@linutronix.de, peterz@infradead.org
In-Reply-To: <20180829201648.19588-1-jeremie.galarneau@efficios.com>
References: <20180829201648.19588-1-jeremie.galarneau@efficios.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:perf/core] perf tools: Initialize perf_data_file fd field
Git-Commit-ID: c04c859f439fb4de9039246370d60a07b9b5bcb5
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  c04c859f439fb4de9039246370d60a07b9b5bcb5
Gitweb:     https://git.kernel.org/tip/c04c859f439fb4de9039246370d60a07b9b5bcb5
Author:     Jérémie Galarneau <jeremie.galarneau@efficios.com>
AuthorDate: Wed, 29 Aug 2018 16:16:48 -0400
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 19 Sep 2018 10:25:13 -0300

perf tools: Initialize perf_data_file fd field

Building the perf CTF converter fails with gcc 4.8.4 on Ubuntu 14.04
with the following error:

  error: missing initializer for field ‘fd’ of ‘struct perf_data_file’
  [-Werror=missing-field-initializers]

Per 4b838b0db4e9 ("perf tools: Add compression id into 'struct
kmod_path'") and the ensuing discussion on the mailing list, it appears
that this affects other distributions and gcc versions.

Signed-off-by: Jeremie Galarneau <jeremie.galarneau@efficios.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180829201648.19588-1-jeremie.galarneau@efficios.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/data-convert-bt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-convert-bt.c
index abd38abf1d91..f75d4aa612c5 100644
--- a/tools/perf/util/data-convert-bt.c
+++ b/tools/perf/util/data-convert-bt.c
@@ -1578,7 +1578,7 @@ int bt_convert__perf2ctf(const char *input, const char *path,
 {
 	struct perf_session *session;
 	struct perf_data data = {
-		.file.path = input,
+		.file      = { .path = input, .fd = -1 },
 		.mode      = PERF_DATA_MODE_READ,
 		.force     = opts->force,
 	};