Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Timur Tabi
Scott Wood wrote: > For hypercalls and other paravirt. That's the point -- they're not > kernel headers. They're guest API headers. Well, IMHO, guest API != user-space. Maybe we should have a parallel mechanism to uapi to make the kvm guest header files available. -- Timur Tabi Linux kernel

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Scott Wood
On 10/11/2012 12:24:59 PM, Timur Tabi wrote: Scott Wood wrote: >> > My concern is that when I think of a user-space header file, I think >> > of a >> > user-space application that calls ioctls. I know that KVM guest >> > kernels >> > run as user-space processes, but that does not seem like a

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Timur Tabi
Scott Wood wrote: >> > My concern is that when I think of a user-space header file, I think >> > of a >> > user-space application that calls ioctls. I know that KVM guest >> > kernels >> > run as user-space processes, but that does not seem like a reason to >> > combine all of the header files

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Scott Wood
On 10/11/2012 10:55:42 AM, Timur Tabi wrote: Alexander Graf wrote: > This is about kvm_host.h, which is the part that is exported to user > space. It usually contains constants and structs that are required for > the API. Which API? I'm not familiar with KVM internals. My concern is that

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Scott Wood
On 10/11/2012 10:56:51 AM, Alexander Graf wrote: On 11.10.2012, at 17:50, Scott Wood wrote: > On 10/11/2012 08:04:58 AM, Alexander Graf wrote: >> On 11.10.2012, at 05:32, Tabi Timur-B04825 wrote: >> > On Wed, Oct 10, 2012 at 9:47 PM, Stephen Rothwell wrote: >> > >> >> Commit 549d62d889b4 ("

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread David Howells
Alexander Graf wrote: > Do I have to move them to their own header file or can I just #ifdef > __KERNEL__ around the place where __ASSEMBLY__ starts to the end of the > file? That depends on whether it happens before or after my disintegration script is run on the header. Ben has pulled my powe

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Alexander Graf
On 11.10.2012, at 17:50, Scott Wood wrote: > On 10/11/2012 08:04:58 AM, Alexander Graf wrote: >> On 11.10.2012, at 05:32, Tabi Timur-B04825 wrote: >> > On Wed, Oct 10, 2012 at 9:47 PM, Stephen Rothwell >> > wrote: >> > >> >> Commit 549d62d889b4 ("KVM: PPC: use definitions in epapr header >> >>

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Timur Tabi
Alexander Graf wrote: > This is about kvm_host.h, which is the part that is exported to user > space. It usually contains constants and structs that are required for > the API. Which API? I'm not familiar with KVM internals. My concern is that when I think of a user-space header file, I think

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Scott Wood
On 10/11/2012 08:04:58 AM, Alexander Graf wrote: On 11.10.2012, at 05:32, Tabi Timur-B04825 wrote: > On Wed, Oct 10, 2012 at 9:47 PM, Stephen Rothwell wrote: > >> Commit 549d62d889b4 ("KVM: PPC: use definitions in epapr header >> for hcalls") from the kvm-ppc tree added an include of asm/

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Alexander Graf
On 11.10.2012, at 11:27, David Howells wrote: > Stephen Rothwell wrote: > >> I just removed epapr_hcalls.h from the Kbuild file as I am not sure how >> it should be broken up. David, can you have a look at this, please? > > Files should be broken up along around __KERNEL__ conditionals. If t

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Alexander Graf
On 11.10.2012, at 05:32, Tabi Timur-B04825 wrote: > On Wed, Oct 10, 2012 at 9:47 PM, Stephen Rothwell > wrote: > >> Commit 549d62d889b4 ("KVM: PPC: use definitions in epapr header >> for hcalls") from the kvm-ppc tree added an include of asm/epapr_hcall.h >> to the user visible part of asm/kvm

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread David Howells
Tabi Timur-B04825 wrote: > What is include/uapi? Take a look at http://lwn.net/Articles/507794/ David -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.ht

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread David Howells
Stephen Rothwell wrote: > I just removed epapr_hcalls.h from the Kbuild file as I am not sure how > it should be broken up. David, can you have a look at this, please? Files should be broken up along around __KERNEL__ conditionals. If there are no __KERNEL__ conditionals, it is assumed that th

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-10 Thread Tabi Timur-B04825
On Wed, Oct 10, 2012 at 9:47 PM, Stephen Rothwell wrote: > Commit 549d62d889b4 ("KVM: PPC: use definitions in epapr header > for hcalls") from the kvm-ppc tree added an include of asm/epapr_hcall.h > to the user visible part of asm/kvm_para.h so asm/epapr_hcall.h became a > user visible header fi

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-10 Thread Stephen Rothwell
On Thu, 11 Oct 2012 01:47:13 + Tabi Timur-B04825 wrote: > > On Wed, Oct 10, 2012 at 8:18 PM, Stephen Rothwell > wrote: > > > arch/powerpc/include/asm/epapr_hcalls.h | 511 > > -- > > arch/powerpc/include/uapi/asm/Kbuild |1 + > > arch/powerpc/inc

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-10 Thread Tabi Timur-B04825
On Wed, Oct 10, 2012 at 8:18 PM, Stephen Rothwell wrote: > arch/powerpc/include/asm/epapr_hcalls.h | 511 > -- > arch/powerpc/include/uapi/asm/Kbuild |1 + > arch/powerpc/include/uapi/asm/epapr_hcalls.h | 511 > ++ What is incl

linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-10 Thread Stephen Rothwell
Hi Alexander, Today's linux-next merge of the kvm-ppc tree got a conflict in arch/powerpc/include/asm/kvm_para.h between commit c3617f72036c ("UAPI: (Scripted) Disintegrate arch/powerpc/include/asm") from the powerpc-merge tree and commit 549d62d889b4 ("KVM: PPC: use definitions in epapr header fo

linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-10 Thread Stephen Rothwell
Hi Alexander, Today's linux-next merge of the kvm-ppc tree got a conflict in arch/powerpc/include/asm/Kbuild between commit c3617f72036c ("UAPI: (Scripted) Disintegrate arch/powerpc/include/asm") from the powerpc-merge tree and commit 4c09029a5639 ("KVM: PPC: Add support for ePAPR idle hcall in ho