[PATCHv2 7/7] perf test: Create kernel maps properly for hist entries test

[Jiri Olsa <jolsa@redhat.com>]

On Fri, Dec 04, 2015 at 10:23:37PM +0900, Namhyung Kim wrote:
> On Thu, Dec 03, 2015 at 09:34:18AM +0100, Jiri Olsa wrote:
> > It fixes segfault within machine__exit, that's caused
> > but not creating kernel maps for machine.. We're calling
> > machine__destroy_kernel_maps in machine__exit since commit:
> > 
> >   ebe9729c8c31 perf machine: Fix to destroy kernel maps when machine exits
> > 
> > Link: http://lkml.kernel.org/n/tip-k4snzv5t4dvdckggzwdzyljo@git.kernel.org
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> >  tools/perf/tests/hists_common.c | 7 +++++++
> >  1 file changed, 7 insertions(+)
> > 
> > diff --git a/tools/perf/tests/hists_common.c b/tools/perf/tests/hists_common.c
> > index ce80b274b097..6ccdc8ac9578 100644
> > --- a/tools/perf/tests/hists_common.c
> > +++ b/tools/perf/tests/hists_common.c
> > @@ -87,6 +87,11 @@ struct machine *setup_fake_machine(struct machines *machines)
> >  		return NULL;
> >  	}
> >  
> > +	if (machine__create_kernel_maps(machine)) {
> > +		pr_debug("Not enough memory for machine setup\n");
> > +		goto out_maps;
> 
> Why not just doing 'goto out'?
> 

right.. v2 attached, perf-fixes branch updated

thanks,
jirka


---
Subject: [PATCH] perf test: Create kernel maps properly for hist entries test

It fixes segfault within machine__exit, that's caused
but not creating kernel maps for machine.. We're calling
machine__destroy_kernel_maps in machine__exit since commit:

  ebe9729c8c31 perf machine: Fix to destroy kernel maps when machine exits

Link: http://lkml.kernel.org/n/tip-k4snzv5t4dvdckggzwdzyljo@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/tests/hists_common.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/perf/tests/hists_common.c b/tools/perf/tests/hists_common.c
index ce80b274b097..46f453b1de60 100644
--- a/tools/perf/tests/hists_common.c
+++ b/tools/perf/tests/hists_common.c
@@ -87,6 +87,11 @@ struct machine *setup_fake_machine(struct machines *machines)
 		return NULL;
 	}
 
+	if (machine__create_kernel_maps(machine)) {
+		pr_debug("Not enough memory for machine setup\n");
+		goto out;
+	}
+
 	for (i = 0; i < ARRAY_SIZE(fake_threads); i++) {
 		struct thread *thread;
 
-- 
2.4.3