From: Cornelia Huck <cohuck@redhat.com>
To: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>,
Laura Abbott <labbott@redhat.com>,
Alexey Kardashevskiy <aik@ozlabs.ru>,
Alex Williamson <alex.williamson@redhat.com>,
kvm@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] vfio_pci: Add local source directory as include
Date: Mon, 7 Jan 2019 12:07:16 +0100 [thread overview]
Message-ID: <20190107120716.51d95854.cohuck@redhat.com> (raw)
In-Reply-To: <CAK7LNAQLEYc=czrJvzK8UXeXYm08TuLB62uMN2kFedkcW9b1pw@mail.gmail.com>
On Mon, 7 Jan 2019 19:12:10 +0900
Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
> On Mon, Jan 7, 2019 at 6:18 PM Michael Ellerman <mpe@ellerman.id.au> wrote:
> >
> > Laura Abbott <labbott@redhat.com> writes:
> > > Commit 7f92891778df ("vfio_pci: Add NVIDIA GV100GL [Tesla V100 SXM2]
> > > subdriver") introduced a trace.h file in the local directory but
> > > missed adding the local include path, resulting in compilation
> > > failures with tracepoints:
> > >
> > > In file included from drivers/vfio/pci/trace.h:102,
> > > from drivers/vfio/pci/vfio_pci_nvlink2.c:29:
> > > ./include/trace/define_trace.h:89:42: fatal error: ./trace.h: No such file or directory
> > > #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
> > >
> > > Fix this by adjusting the include path.
> > >
> > > Fixes: 7f92891778df ("vfio_pci: Add NVIDIA GV100GL [Tesla V100 SXM2] subdriver")
> > > Signed-off-by: Laura Abbott <labbott@redhat.com>
(...)
> > Alex I assume you'll merge this fix via the vfio tree?
> >
> > cheers
> >
> > > diff --git a/drivers/vfio/pci/Makefile b/drivers/vfio/pci/Makefile
> > > index 9662c063a6b1..08d4676a8495 100644
> > > --- a/drivers/vfio/pci/Makefile
> > > +++ b/drivers/vfio/pci/Makefile
> > > @@ -1,3 +1,4 @@
> > > +ccflags-y += -I$(src)
> > >
> > > vfio-pci-y := vfio_pci.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o
> > > vfio-pci-$(CONFIG_VFIO_PCI_IGD) += vfio_pci_igd.o
> > > --
> > > 2.20.1
>
>
> Hi.
>
> If I correctly understand the usage of TRACE_INCLUDE_PATH,
> the correct fix should be like follows:
>
>
> diff --git a/drivers/vfio/pci/trace.h b/drivers/vfio/pci/trace.h
> index 228ccdb..4d13e51 100644
> --- a/drivers/vfio/pci/trace.h
> +++ b/drivers/vfio/pci/trace.h
> @@ -94,7 +94,7 @@ TRACE_EVENT(vfio_pci_npu2_mmap,
> #endif /* _TRACE_VFIO_PCI_H */
>
> #undef TRACE_INCLUDE_PATH
> -#define TRACE_INCLUDE_PATH .
> +#define TRACE_INCLUDE_PATH ../../drivers/vfio/pci
> #undef TRACE_INCLUDE_FILE
> #define TRACE_INCLUDE_FILE trace
Going from the comments in samples/trace_events/trace-events-sample.h,
I think both approaches are possible, and I see both used in various
places.
Personally, I'd prefer Laura's patch, as it doesn't involve hardcoding
a path.
next prev parent reply other threads:[~2019-01-07 11:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-04 19:57 [PATCH] vfio_pci: Add local source directory as include Laura Abbott
2019-01-07 7:26 ` Alexey Kardashevskiy
2019-01-07 8:58 ` Michael Ellerman
2019-01-07 10:12 ` Masahiro Yamada
2019-01-07 11:07 ` Cornelia Huck [this message]
2019-01-07 11:39 ` Masahiro Yamada
2019-01-07 20:13 ` Alex Williamson
2019-01-07 23:52 ` Alexey Kardashevskiy
2019-01-08 0:24 ` Alex Williamson
2019-01-08 2:20 ` Alexey Kardashevskiy
2019-01-08 2:38 ` Masahiro Yamada
2019-01-08 2:57 ` Alexey Kardashevskiy
2019-01-08 3:19 ` Masahiro Yamada
2019-01-08 8:02 ` Michael Ellerman
2019-01-07 20:06 ` Laura Abbott
2019-01-07 11:12 ` Cornelia Huck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190107120716.51d95854.cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=aik@ozlabs.ru \
--cc=alex.williamson@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=labbott@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mpe@ellerman.id.au \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox