Patchwork kvm: powerpc: book3s: Fix build break for BOOK3S_32

login
register
mail settings
Submitter Aneesh Kumar K.V
Date Oct. 2, 2013, 2:38 p.m.
Message ID <1380724724-12892-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/279748/
State New
Headers show

Comments

Aneesh Kumar K.V - Oct. 2, 2013, 2:38 p.m.
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>

This was introduced by 85a0d845d8bb5df5d2669416212f56cbe1474c6b

arch/powerpc/kvm/book3s_pr.c: In function 'kvmppc_core_vcpu_create':
arch/powerpc/kvm/book3s_pr.c:1182:30: error: 'struct kvmppc_vcpu_book3s' has no member named 'shadow_vcpu'
make[1]: *** [arch/powerpc/kvm/book3s_pr.o] Error 1

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 arch/powerpc/kvm/book3s_pr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Paul Mackerras - Oct. 3, 2013, 4:14 a.m.
On Wed, Oct 02, 2013 at 08:08:44PM +0530, Aneesh Kumar K.V wrote:
> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
> 
> This was introduced by 85a0d845d8bb5df5d2669416212f56cbe1474c6b

It's a good idea to give the headline of the commit as well as the ID.
I also like to trim the ID to 10 characters or so.  So it should look
like this:

This was introduced by 85a0d845d8 ("KVM: PPC: Book3S PR: Allocate
kvm_vcpu structs from kvm_vcpu_cache").

> arch/powerpc/kvm/book3s_pr.c: In function 'kvmppc_core_vcpu_create':
> arch/powerpc/kvm/book3s_pr.c:1182:30: error: 'struct kvmppc_vcpu_book3s' has no member named 'shadow_vcpu'
> make[1]: *** [arch/powerpc/kvm/book3s_pr.o] Error 1
> 
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

Acked-by: Paul Mackerras <paulus@samba.org>

Paul.
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander Graf - Oct. 4, 2013, 12:23 p.m.
On 03.10.2013, at 06:14, Paul Mackerras wrote:

> On Wed, Oct 02, 2013 at 08:08:44PM +0530, Aneesh Kumar K.V wrote:
>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>> 
>> This was introduced by 85a0d845d8bb5df5d2669416212f56cbe1474c6b
> 
> It's a good idea to give the headline of the commit as well as the ID.
> I also like to trim the ID to 10 characters or so.  So it should look
> like this:
> 
> This was introduced by 85a0d845d8 ("KVM: PPC: Book3S PR: Allocate
> kvm_vcpu structs from kvm_vcpu_cache").
> 
>> arch/powerpc/kvm/book3s_pr.c: In function 'kvmppc_core_vcpu_create':
>> arch/powerpc/kvm/book3s_pr.c:1182:30: error: 'struct kvmppc_vcpu_book3s' has no member named 'shadow_vcpu'
>> make[1]: *** [arch/powerpc/kvm/book3s_pr.o] Error 1
>> 
>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> 
> Acked-by: Paul Mackerras <paulus@samba.org>

Would you guys mind if I merge this into the offending patch? It's not trickled into -next yet, so rebasing should work.

If not, please resend with the fixed commit message.


Alex

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander Graf - Oct. 4, 2013, 12:27 p.m.
On 04.10.2013, at 14:23, Alexander Graf wrote:

> 
> On 03.10.2013, at 06:14, Paul Mackerras wrote:
> 
>> On Wed, Oct 02, 2013 at 08:08:44PM +0530, Aneesh Kumar K.V wrote:
>>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>>> 
>>> This was introduced by 85a0d845d8bb5df5d2669416212f56cbe1474c6b
>> 
>> It's a good idea to give the headline of the commit as well as the ID.
>> I also like to trim the ID to 10 characters or so.  So it should look
>> like this:
>> 
>> This was introduced by 85a0d845d8 ("KVM: PPC: Book3S PR: Allocate
>> kvm_vcpu structs from kvm_vcpu_cache").
>> 
>>> arch/powerpc/kvm/book3s_pr.c: In function 'kvmppc_core_vcpu_create':
>>> arch/powerpc/kvm/book3s_pr.c:1182:30: error: 'struct kvmppc_vcpu_book3s' has no member named 'shadow_vcpu'
>>> make[1]: *** [arch/powerpc/kvm/book3s_pr.o] Error 1
>>> 
>>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
>> 
>> Acked-by: Paul Mackerras <paulus@samba.org>
> 
> Would you guys mind if I merge this into the offending patch? It's not trickled into -next yet, so rebasing should work.
> 
> If not, please resend with the fixed commit message.

Eh - I must've missed v2 :). So that leaves only the question on whether you'd be ok to squash the patch instead. It'd help bisectability.


Alex

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Paul Mackerras - Oct. 4, 2013, 12:35 p.m.
On Fri, Oct 04, 2013 at 02:27:02PM +0200, Alexander Graf wrote:
> 
> On 04.10.2013, at 14:23, Alexander Graf wrote:
> 
> > 
> > On 03.10.2013, at 06:14, Paul Mackerras wrote:
> > 
> >> On Wed, Oct 02, 2013 at 08:08:44PM +0530, Aneesh Kumar K.V wrote:
> >>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
> >>> 
> >>> This was introduced by 85a0d845d8bb5df5d2669416212f56cbe1474c6b
> >> 
> >> It's a good idea to give the headline of the commit as well as the ID.
> >> I also like to trim the ID to 10 characters or so.  So it should look
> >> like this:
> >> 
> >> This was introduced by 85a0d845d8 ("KVM: PPC: Book3S PR: Allocate
> >> kvm_vcpu structs from kvm_vcpu_cache").
> >> 
> >>> arch/powerpc/kvm/book3s_pr.c: In function 'kvmppc_core_vcpu_create':
> >>> arch/powerpc/kvm/book3s_pr.c:1182:30: error: 'struct kvmppc_vcpu_book3s' has no member named 'shadow_vcpu'
> >>> make[1]: *** [arch/powerpc/kvm/book3s_pr.o] Error 1
> >>> 
> >>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> >> 
> >> Acked-by: Paul Mackerras <paulus@samba.org>
> > 
> > Would you guys mind if I merge this into the offending patch? It's not trickled into -next yet, so rebasing should work.
> > 
> > If not, please resend with the fixed commit message.
> 
> Eh - I must've missed v2 :). So that leaves only the question on whether you'd be ok to squash the patch instead. It'd help bisectability.

I'm OK with that.  If you do, why don't you squash the first of the
two patches that I just sent into the commit it fixes as well?

Paul.
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander Graf - Oct. 4, 2013, 1 p.m.
On 04.10.2013, at 14:35, Paul Mackerras wrote:

> On Fri, Oct 04, 2013 at 02:27:02PM +0200, Alexander Graf wrote:
>> 
>> On 04.10.2013, at 14:23, Alexander Graf wrote:
>> 
>>> 
>>> On 03.10.2013, at 06:14, Paul Mackerras wrote:
>>> 
>>>> On Wed, Oct 02, 2013 at 08:08:44PM +0530, Aneesh Kumar K.V wrote:
>>>>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>>>>> 
>>>>> This was introduced by 85a0d845d8bb5df5d2669416212f56cbe1474c6b
>>>> 
>>>> It's a good idea to give the headline of the commit as well as the ID.
>>>> I also like to trim the ID to 10 characters or so.  So it should look
>>>> like this:
>>>> 
>>>> This was introduced by 85a0d845d8 ("KVM: PPC: Book3S PR: Allocate
>>>> kvm_vcpu structs from kvm_vcpu_cache").
>>>> 
>>>>> arch/powerpc/kvm/book3s_pr.c: In function 'kvmppc_core_vcpu_create':
>>>>> arch/powerpc/kvm/book3s_pr.c:1182:30: error: 'struct kvmppc_vcpu_book3s' has no member named 'shadow_vcpu'
>>>>> make[1]: *** [arch/powerpc/kvm/book3s_pr.o] Error 1
>>>>> 
>>>>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
>>>> 
>>>> Acked-by: Paul Mackerras <paulus@samba.org>
>>> 
>>> Would you guys mind if I merge this into the offending patch? It's not trickled into -next yet, so rebasing should work.
>>> 
>>> If not, please resend with the fixed commit message.
>> 
>> Eh - I must've missed v2 :). So that leaves only the question on whether you'd be ok to squash the patch instead. It'd help bisectability.
> 
> I'm OK with that.  If you do, why don't you squash the first of the
> two patches that I just sent into the commit it fixes as well?

Because patch 1/2 spans two separate commits it would have to get squashed into (6aa82e, 70afec) and patch 2/2 doesn't make sense to get squashed anywhere :).


Alex

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Aneesh Kumar K.V - Oct. 4, 2013, 2:24 p.m.
Alexander Graf <agraf@suse.de> writes:

> On 04.10.2013, at 14:23, Alexander Graf wrote:
>
>> 
>> On 03.10.2013, at 06:14, Paul Mackerras wrote:
>> 
>>> On Wed, Oct 02, 2013 at 08:08:44PM +0530, Aneesh Kumar K.V wrote:
>>>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>>>> 
>>>> This was introduced by 85a0d845d8bb5df5d2669416212f56cbe1474c6b
>>> 
>>> It's a good idea to give the headline of the commit as well as the ID.
>>> I also like to trim the ID to 10 characters or so.  So it should look
>>> like this:
>>> 
>>> This was introduced by 85a0d845d8 ("KVM: PPC: Book3S PR: Allocate
>>> kvm_vcpu structs from kvm_vcpu_cache").
>>> 
>>>> arch/powerpc/kvm/book3s_pr.c: In function 'kvmppc_core_vcpu_create':
>>>> arch/powerpc/kvm/book3s_pr.c:1182:30: error: 'struct kvmppc_vcpu_book3s' has no member named 'shadow_vcpu'
>>>> make[1]: *** [arch/powerpc/kvm/book3s_pr.o] Error 1
>>>> 
>>>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
>>> 
>>> Acked-by: Paul Mackerras <paulus@samba.org>
>> 
>> Would you guys mind if I merge this into the offending patch? It's not trickled into -next yet, so rebasing should work.
>> 
>> If not, please resend with the fixed commit message.
>
> Eh - I must've missed v2 :). So that leaves only the question on whether you'd be ok to squash the patch instead. It'd help bisectability.

Yes, it should be squashed if we can do that.

-aneesh

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Paul Mackerras - Oct. 4, 2013, 11:45 p.m.
On Fri, Oct 04, 2013 at 03:00:11PM +0200, Alexander Graf wrote:
> 
> On 04.10.2013, at 14:35, Paul Mackerras wrote:
> 
> > On Fri, Oct 04, 2013 at 02:27:02PM +0200, Alexander Graf wrote:
> >> 
> >> On 04.10.2013, at 14:23, Alexander Graf wrote:
> >> 
> >>> 
> >>> On 03.10.2013, at 06:14, Paul Mackerras wrote:
> >>> 
> >>>> On Wed, Oct 02, 2013 at 08:08:44PM +0530, Aneesh Kumar K.V wrote:
> >>>>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
> >>>>> 
> >>>>> This was introduced by 85a0d845d8bb5df5d2669416212f56cbe1474c6b
> >>>> 
> >>>> It's a good idea to give the headline of the commit as well as the ID.
> >>>> I also like to trim the ID to 10 characters or so.  So it should look
> >>>> like this:
> >>>> 
> >>>> This was introduced by 85a0d845d8 ("KVM: PPC: Book3S PR: Allocate
> >>>> kvm_vcpu structs from kvm_vcpu_cache").
> >>>> 
> >>>>> arch/powerpc/kvm/book3s_pr.c: In function 'kvmppc_core_vcpu_create':
> >>>>> arch/powerpc/kvm/book3s_pr.c:1182:30: error: 'struct kvmppc_vcpu_book3s' has no member named 'shadow_vcpu'
> >>>>> make[1]: *** [arch/powerpc/kvm/book3s_pr.o] Error 1
> >>>>> 
> >>>>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> >>>> 
> >>>> Acked-by: Paul Mackerras <paulus@samba.org>
> >>> 
> >>> Would you guys mind if I merge this into the offending patch? It's not trickled into -next yet, so rebasing should work.
> >>> 
> >>> If not, please resend with the fixed commit message.
> >> 
> >> Eh - I must've missed v2 :). So that leaves only the question on whether you'd be ok to squash the patch instead. It'd help bisectability.
> > 
> > I'm OK with that.  If you do, why don't you squash the first of the
> > two patches that I just sent into the commit it fixes as well?
> 
> Because patch 1/2 spans two separate commits it would have to get squashed into (6aa82e, 70afec) and patch 2/2 doesn't make sense to get squashed anywhere :).

Actually 70afec is fine, if you look at it, it's only 6aa82e that
needs fixing.

Paul.
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander Graf - Oct. 4, 2013, 11:59 p.m.
On 05.10.2013, at 01:45, Paul Mackerras wrote:

> On Fri, Oct 04, 2013 at 03:00:11PM +0200, Alexander Graf wrote:
>> 
>> On 04.10.2013, at 14:35, Paul Mackerras wrote:
>> 
>>> On Fri, Oct 04, 2013 at 02:27:02PM +0200, Alexander Graf wrote:
>>>> 
>>>> On 04.10.2013, at 14:23, Alexander Graf wrote:
>>>> 
>>>>> 
>>>>> On 03.10.2013, at 06:14, Paul Mackerras wrote:
>>>>> 
>>>>>> On Wed, Oct 02, 2013 at 08:08:44PM +0530, Aneesh Kumar K.V wrote:
>>>>>>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>>>>>>> 
>>>>>>> This was introduced by 85a0d845d8bb5df5d2669416212f56cbe1474c6b
>>>>>> 
>>>>>> It's a good idea to give the headline of the commit as well as the ID.
>>>>>> I also like to trim the ID to 10 characters or so.  So it should look
>>>>>> like this:
>>>>>> 
>>>>>> This was introduced by 85a0d845d8 ("KVM: PPC: Book3S PR: Allocate
>>>>>> kvm_vcpu structs from kvm_vcpu_cache").
>>>>>> 
>>>>>>> arch/powerpc/kvm/book3s_pr.c: In function 'kvmppc_core_vcpu_create':
>>>>>>> arch/powerpc/kvm/book3s_pr.c:1182:30: error: 'struct kvmppc_vcpu_book3s' has no member named 'shadow_vcpu'
>>>>>>> make[1]: *** [arch/powerpc/kvm/book3s_pr.o] Error 1
>>>>>>> 
>>>>>>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
>>>>>> 
>>>>>> Acked-by: Paul Mackerras <paulus@samba.org>
>>>>> 
>>>>> Would you guys mind if I merge this into the offending patch? It's not trickled into -next yet, so rebasing should work.
>>>>> 
>>>>> If not, please resend with the fixed commit message.
>>>> 
>>>> Eh - I must've missed v2 :). So that leaves only the question on whether you'd be ok to squash the patch instead. It'd help bisectability.
>>> 
>>> I'm OK with that.  If you do, why don't you squash the first of the
>>> two patches that I just sent into the commit it fixes as well?
>> 
>> Because patch 1/2 spans two separate commits it would have to get squashed into (6aa82e, 70afec) and patch 2/2 doesn't make sense to get squashed anywhere :).
> 
> Actually 70afec is fine, if you look at it, it's only 6aa82e that
> needs fixing.

True. Squashed them :).


Alex

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 8941885..6075dbd 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -1179,7 +1179,7 @@  struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
 
 #ifdef CONFIG_KVM_BOOK3S_32
 	vcpu->arch.shadow_vcpu =
-		kzalloc(sizeof(*vcpu_book3s->shadow_vcpu), GFP_KERNEL);
+		kzalloc(sizeof(*vcpu->arch.shadow_vcpu), GFP_KERNEL);
 	if (!vcpu->arch.shadow_vcpu)
 		goto free_vcpu3s;
 #endif