On 25/01/20 09:29, Christian Borntraeger wrote: > > > On 24.01.20 09:38, Paolo Bonzini wrote: >> Linux-next merge reported some bad mistakes on my part, so I'm >> force-pushing kvm/next. Since it was pushed only yesterday and the code >> is the same except for two changed lines, it shouldn't be a big deal. >> >> Paolo >> > current KVM/next has the following compile error (due to Seans rework). > > CC [M] arch/s390/kvm/kvm-s390.o > arch/s390/kvm/kvm-s390.c: In function ‘kvm_arch_vcpu_create’: > arch/s390/kvm/kvm-s390.c:3026:32: error: ‘id’ undeclared (first use in this function); did you mean ‘fd’? > 3026 | vcpu->arch.sie_block->icpua = id; > | ^~ > | fd > arch/s390/kvm/kvm-s390.c:3026:32: note: each undeclared identifier is reported only once for each function it appears in > arch/s390/kvm/kvm-s390.c:3028:39: error: ‘kvm’ undeclared (first use in this function) > 3028 | vcpu->arch.sie_block->gd = (u32)(u64)kvm->arch.gisa_int.origin; > | ^~~ > make[2]: *** [scripts/Makefile.build:266: arch/s390/kvm/kvm-s390.o] Error 1 > make[1]: *** [scripts/Makefile.build:503: arch/s390/kvm] Error 2 > make: *** [Makefile:1693: arch/s390] Error 2 > > Is this part of the fixup that you will do or another issue? Nope, I trusted Conny's review on that. :( Is this enough? diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index c059b86aacd4..0f475af84c0a 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -3023,9 +3023,9 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) vcpu->arch.sie_block->mso = 0; vcpu->arch.sie_block->msl = sclp.hamax; - vcpu->arch.sie_block->icpua = id; + vcpu->arch.sie_block->icpua = vcpu->vcpu_id; spin_lock_init(&vcpu->arch.local_int.lock); - vcpu->arch.sie_block->gd = (u32)(u64)kvm->arch.gisa_int.origin; + vcpu->arch.sie_block->gd = (u32)(u64)vcpu->kvm->arch.gisa_int.origin; if (vcpu->arch.sie_block->gd && sclp.has_gisaf) vcpu->arch.sie_block->gd |= GISA_FORMAT1; seqcount_init(&vcpu->arch.cputm_seqcount); @@ -3061,9 +3061,9 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) goto out_free_sie_block; } - VM_EVENT(kvm, 3, "create cpu %d at 0x%pK, sie block at 0x%pK", id, vcpu, + VM_EVENT(kvm, 3, "create cpu %d at 0x%pK, sie block at 0x%pK", vcpu->vcpu_id, vcpu, vcpu->arch.sie_block); - trace_kvm_s390_create_vcpu(id, vcpu, vcpu->arch.sie_block); + trace_kvm_s390_create_vcpu(vcpu->vcpu_id, vcpu, vcpu->arch.sie_block); rc = kvm_s390_vcpu_setup(vcpu); if (rc) Paolo
