[Qemu-devel] [PATCH 62/67] kvm: use include "kvm_ppc.h" consistently

Michael S. Tsirkin posted 67 patches 7 years, 5 months ago
[Qemu-devel] [PATCH 62/67] kvm: use include "kvm_ppc.h" consistently
Posted by Michael S. Tsirkin 7 years, 5 months ago
Some places include kvm_ppc.h, others target/ppc/kvm_ppc.h.
Let's be consistent.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/ppc/spapr_cpu_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index 94afeb3..312d6ed 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -15,7 +15,7 @@
 #include "qapi/error.h"
 #include "sysemu/cpus.h"
 #include "sysemu/kvm.h"
-#include "target/ppc/kvm_ppc.h"
+#include "kvm_ppc.h"
 #include "hw/ppc/ppc.h"
 #include "target/ppc/mmu-hash64.h"
 #include "sysemu/numa.h"
-- 
MST


Re: [Qemu-devel] [PATCH 62/67] kvm: use include "kvm_ppc.h" consistently
Posted by David Gibson 7 years, 5 months ago
On Thu, May 03, 2018 at 10:51:42PM +0300, Michael S. Tsirkin wrote:
> Some places include kvm_ppc.h, others target/ppc/kvm_ppc.h.
> Let's be consistent.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

One of your earlier patches in this series moved to using a full
target/ppc/whatever.h for includers outside target/ppc itself.  So I'm
not sure why you're standardizing on the short form here.

> ---
>  hw/ppc/spapr_cpu_core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
> index 94afeb3..312d6ed 100644
> --- a/hw/ppc/spapr_cpu_core.c
> +++ b/hw/ppc/spapr_cpu_core.c
> @@ -15,7 +15,7 @@
>  #include "qapi/error.h"
>  #include "sysemu/cpus.h"
>  #include "sysemu/kvm.h"
> -#include "target/ppc/kvm_ppc.h"
> +#include "kvm_ppc.h"
>  #include "hw/ppc/ppc.h"
>  #include "target/ppc/mmu-hash64.h"
>  #include "sysemu/numa.h"

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Re: [Qemu-devel] [PATCH 62/67] kvm: use include "kvm_ppc.h" consistently
Posted by Michael S. Tsirkin 7 years, 5 months ago
On Fri, May 04, 2018 at 10:17:01AM +1000, David Gibson wrote:
> On Thu, May 03, 2018 at 10:51:42PM +0300, Michael S. Tsirkin wrote:
> > Some places include kvm_ppc.h, others target/ppc/kvm_ppc.h.
> > Let's be consistent.
> > 
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> One of your earlier patches in this series moved to using a full
> target/ppc/whatever.h for includers outside target/ppc itself.  So I'm
> not sure why you're standardizing on the short form here.

It's not a short form. The specific header is kvm_ppc.h.  That's how
most files used it so I selected a location minimizing the churn.

I also don't know why is it kvm_ppc.h and not just kvm.h.

> > ---
> >  hw/ppc/spapr_cpu_core.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
> > index 94afeb3..312d6ed 100644
> > --- a/hw/ppc/spapr_cpu_core.c
> > +++ b/hw/ppc/spapr_cpu_core.c
> > @@ -15,7 +15,7 @@
> >  #include "qapi/error.h"
> >  #include "sysemu/cpus.h"
> >  #include "sysemu/kvm.h"
> > -#include "target/ppc/kvm_ppc.h"
> > +#include "kvm_ppc.h"
> >  #include "hw/ppc/ppc.h"
> >  #include "target/ppc/mmu-hash64.h"
> >  #include "sysemu/numa.h"
> 
> -- 
> David Gibson			| I'll have my music baroque, and my code
> david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
> 				| _way_ _around_!
> http://www.ozlabs.org/~dgibson



Re: [Qemu-devel] [PATCH 62/67] kvm: use include "kvm_ppc.h" consistently
Posted by David Gibson 7 years, 5 months ago
On Fri, May 04, 2018 at 05:44:02AM +0300, Michael S. Tsirkin wrote:
> On Fri, May 04, 2018 at 10:17:01AM +1000, David Gibson wrote:
> > On Thu, May 03, 2018 at 10:51:42PM +0300, Michael S. Tsirkin wrote:
> > > Some places include kvm_ppc.h, others target/ppc/kvm_ppc.h.
> > > Let's be consistent.
> > > 
> > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > 
> > One of your earlier patches in this series moved to using a full
> > target/ppc/whatever.h for includers outside target/ppc itself.  So I'm
> > not sure why you're standardizing on the short form here.
> 
> It's not a short form. The specific header is kvm_ppc.h.

I don't see what you're getting at.  Just a couple of lines below in
the context we have #include "target/ppc/mmu-hash64.h".  That's in
exactly the same directory as kvm_ppc.h - which does it get the path,
but this one doesn't?

> That's how
> most files used it so I selected a location minimizing the churn.
> 
> I also don't know why is it kvm_ppc.h and not just kvm.h.

Neither do I, it was like that when I started work on qemu and I've
never had a compelling reason to change it.

> 
> > > ---
> > >  hw/ppc/spapr_cpu_core.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
> > > index 94afeb3..312d6ed 100644
> > > --- a/hw/ppc/spapr_cpu_core.c
> > > +++ b/hw/ppc/spapr_cpu_core.c
> > > @@ -15,7 +15,7 @@
> > >  #include "qapi/error.h"
> > >  #include "sysemu/cpus.h"
> > >  #include "sysemu/kvm.h"
> > > -#include "target/ppc/kvm_ppc.h"
> > > +#include "kvm_ppc.h"
> > >  #include "hw/ppc/ppc.h"
> > >  #include "target/ppc/mmu-hash64.h"
> > >  #include "sysemu/numa.h"
> > 
> 
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson