* linux-next: manual merge of the kvms390 tree with the kvm tree
@ 2020-07-13 4:50 Stephen Rothwell
2020-07-15 16:25 ` Collin Walling
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2020-07-13 4:50 UTC (permalink / raw)
To: Christian Borntraeger, Janosch Frank, Paolo Bonzini, KVM
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Jim Mattson,
Collin Walling
[-- Attachment #1: Type: text/plain, Size: 1193 bytes --]
Hi all,
Today's linux-next merge of the kvms390 tree got a conflict in:
include/uapi/linux/kvm.h
between commit:
1aa561b1a4c0 ("kvm: x86: Add "last CPU" to some KVM_EXIT information")
from the kvm tree and commit:
23a60f834406 ("s390/kvm: diagnose 0x318 sync and reset")
from the kvms390 tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/uapi/linux/kvm.h
index ff9b335620d0,35cdb4307904..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1032,7 -1031,7 +1032,8 @@@ struct kvm_ppc_resize_hpt
#define KVM_CAP_PPC_SECURE_GUEST 181
#define KVM_CAP_HALT_POLL 182
#define KVM_CAP_ASYNC_PF_INT 183
-#define KVM_CAP_S390_DIAG318 184
+#define KVM_CAP_LAST_CPU 184
++#define KVM_CAP_S390_DIAG318 185
#ifdef KVM_CAP_IRQ_ROUTING
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the kvms390 tree with the kvm tree
2020-07-13 4:50 linux-next: manual merge of the kvms390 tree with the kvm tree Stephen Rothwell
@ 2020-07-15 16:25 ` Collin Walling
2020-07-15 16:59 ` Christian Borntraeger
0 siblings, 1 reply; 6+ messages in thread
From: Collin Walling @ 2020-07-15 16:25 UTC (permalink / raw)
To: Stephen Rothwell, Christian Borntraeger, Janosch Frank,
Paolo Bonzini, KVM
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Jim Mattson
On 7/13/20 12:50 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> include/uapi/linux/kvm.h
>
> between commit:
>
> 1aa561b1a4c0 ("kvm: x86: Add "last CPU" to some KVM_EXIT information")
>
> from the kvm tree and commit:
>
> 23a60f834406 ("s390/kvm: diagnose 0x318 sync and reset")
>
> from the kvms390 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
Much appreciated. This change is acceptable and should be properly
reflected in a header sync for QEMU (which I believe just copies the
files from the kernel?)
Thanks for the update.
--
Regards,
Collin
Stay safe and stay healthy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the kvms390 tree with the kvm tree
2020-07-15 16:25 ` Collin Walling
@ 2020-07-15 16:59 ` Christian Borntraeger
0 siblings, 0 replies; 6+ messages in thread
From: Christian Borntraeger @ 2020-07-15 16:59 UTC (permalink / raw)
To: Collin Walling, Stephen Rothwell, Janosch Frank, Paolo Bonzini, KVM
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Jim Mattson
On 15.07.20 18:25, Collin Walling wrote:
> On 7/13/20 12:50 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the kvms390 tree got a conflict in:
>>
>> include/uapi/linux/kvm.h
>>
>> between commit:
>>
>> 1aa561b1a4c0 ("kvm: x86: Add "last CPU" to some KVM_EXIT information")
>>
>> from the kvm tree and commit:
>>
>> 23a60f834406 ("s390/kvm: diagnose 0x318 sync and reset")
>>
>> from the kvms390 tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary. This
>> is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging. You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
>>
>
> Much appreciated. This change is acceptable and should be properly
> reflected in a header sync for QEMU (which I believe just copies the
> files from the kernel?)
>
> Thanks for the update.
Yes, we will take care of the final number when merging in Paolos tree.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the kvms390 tree with the kvm tree
2015-11-20 1:47 Stephen Rothwell
@ 2015-11-20 10:01 ` Christian Borntraeger
0 siblings, 0 replies; 6+ messages in thread
From: Christian Borntraeger @ 2015-11-20 10:01 UTC (permalink / raw)
To: Stephen Rothwell, Cornelia Huck, Marcelo Tosatti, Gleb Natapov, kvm
Cc: linux-next, linux-kernel, David Hildenbrand
On 11/20/2015 02:47 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> include/linux/kvm_host.h
> arch/s390/kvm/interrupt.c
> arch/s390/kvm/sigp.c
>
> between commits:
>
> db27a7a37aa0 ("KVM: Provide function for VCPU lookup by id")
> b85de33a1a34 ("KVM: s390: avoid memory overwrites on emergency signal injection")
> 152e9f65d66f ("KVM: s390: fix wrong lookup of VCPUs by array index")
>
> from the kvm tree and commit:
>
> a8ab7a5fd13b ("KVM: Provide function for VCPU lookup by id")
> e896d1d08efc ("KVM: s390: avoid memory overwrites on emergency signal injection")
> 32d7bd98e799 ("KVM: s390: fix wrong lookup of VCPUs by array index")
>
> from the kvms390 tree.
>
> These patches used different names for the added function. I used the
> name from the kvm tree (kvm_get_vcpu_by_id).
Yes, correct.
> This should probably all be cleaned up in the kvms390 tree.
Absolutely. Sorry for the hazzle. I had fixed that up but forgot to
push out. Should be fixed now.
Christian
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the kvms390 tree with the kvm tree
@ 2015-11-20 1:47 Stephen Rothwell
2015-11-20 10:01 ` Christian Borntraeger
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2015-11-20 1:47 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck, Marcelo Tosatti, Gleb Natapov, kvm
Cc: linux-next, linux-kernel, David Hildenbrand
Hi all,
Today's linux-next merge of the kvms390 tree got a conflict in:
include/linux/kvm_host.h
arch/s390/kvm/interrupt.c
arch/s390/kvm/sigp.c
between commits:
db27a7a37aa0 ("KVM: Provide function for VCPU lookup by id")
b85de33a1a34 ("KVM: s390: avoid memory overwrites on emergency signal injection")
152e9f65d66f ("KVM: s390: fix wrong lookup of VCPUs by array index")
from the kvm tree and commit:
a8ab7a5fd13b ("KVM: Provide function for VCPU lookup by id")
e896d1d08efc ("KVM: s390: avoid memory overwrites on emergency signal injection")
32d7bd98e799 ("KVM: s390: fix wrong lookup of VCPUs by array index")
from the kvms390 tree.
These patches used different names for the added function. I used the
name from the kvm tree (kvm_get_vcpu_by_id).
This also required the following merge patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 20 Nov 2015 12:42:17 +1100
Subject: [PATCH] KVM: s390: update for kvm_lookup_vcpu name change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/kvm/book3s_hv.c | 2 +-
arch/s390/kvm/diag.c | 2 +-
virt/kvm/kvm_main.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 904b3b0afb48..a29da44cdc6c 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -311,7 +311,7 @@ static struct kvm_vcpu *kvmppc_find_vcpu(struct kvm *kvm, int id)
struct kvm_vcpu *ret;
mutex_lock(&kvm->lock);
- ret = kvm_lookup_vcpu(kvm, id);
+ ret = kvm_get_vcpu_by_id(kvm, id);
mutex_unlock(&kvm->lock);
return ret;
}
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
index aaa7cc041335..05f7de9869a9 100644
--- a/arch/s390/kvm/diag.c
+++ b/arch/s390/kvm/diag.c
@@ -165,7 +165,7 @@ static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu)
if (tid == vcpu->vcpu_id)
return 0;
- tcpu = kvm_lookup_vcpu(vcpu->kvm, tid);
+ tcpu = kvm_get_vcpu_by_id(vcpu->kvm, tid);
if (tcpu)
kvm_vcpu_yield_to(tcpu);
return 0;
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 1ee2f738bf61..1f0f8c4ca345 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2358,7 +2358,7 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)
r = -EINVAL;
goto unlock_vcpu_destroy;
}
- if (kvm_lookup_vcpu(kvm, id)) {
+ if (kvm_get_vcpu_by_id(kvm, id)) {
r = -EEXIST;
goto unlock_vcpu_destroy;
}
--
2.6.2
This should probably all be cleaned up in the kvms390 tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply related [flat|nested] 6+ messages in thread
* linux-next: manual merge of the kvms390 tree with the kvm tree
@ 2015-04-07 8:41 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2015-04-07 8:41 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck, Marcelo Tosatti, Gleb Natapov
Cc: linux-next, linux-kernel, James Hogan, Jens Freimann
[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]
Hi all,
Today's linux-next merge of the kvms390 tree got a conflict in
include/uapi/linux/kvm.h between commits 5fafd8748b36 ("MIPS: KVM: Wire
up FPU capability") and d952bd070f79 ("MIPS: KVM: Wire up MSA
capability") from the kvm tree and commits 47b43c52ee4b ("KVM: s390:
add ioctl to inject local interrupts") and 816c7667ea97 ("KVM: s390:
migrate vcpu interrupt state") from the kvms390 tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/uapi/linux/kvm.h
index 05a2083f7a28,c045c725e521..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -802,8 -809,8 +809,10 @@@ struct kvm_ppc_smmu_info
#define KVM_CAP_S390_MEM_OP 108
#define KVM_CAP_S390_USER_STSI 109
#define KVM_CAP_S390_SKEYS 110
+#define KVM_CAP_MIPS_FPU 111
+#define KVM_CAP_MIPS_MSA 112
+ #define KVM_CAP_S390_INJECT_IRQ 113
+ #define KVM_CAP_S390_IRQ_STATE 114
#ifdef KVM_CAP_IRQ_ROUTING
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-07-15 16:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-13 4:50 linux-next: manual merge of the kvms390 tree with the kvm tree Stephen Rothwell
2020-07-15 16:25 ` Collin Walling
2020-07-15 16:59 ` Christian Borntraeger
-- strict thread matches above, loose matches on Subject: below --
2015-11-20 1:47 Stephen Rothwell
2015-11-20 10:01 ` Christian Borntraeger
2015-04-07 8:41 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).