On 07.02.20 17:32, Thomas Huth wrote:
> On 07/02/2020 12.39, Christian Borntraeger wrote:
>> From: Janosch Frank <frankja@xxxxxxxxxxxxx>
>>
>> This contains 3 main changes:
>> 1. changes in SIE control block handling for secure guests
>> 2. helper functions for create/destroy/unpack secure guests
>> 3. KVM_S390_PV_COMMAND ioctl to allow userspace dealing with secure
>> machines
>>
>> Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx>
>> [borntraeger@xxxxxxxxxx: patch merging, splitting, fixing]
>> Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
>> ---
> [...]
>> diff --git a/arch/s390/include/asm/uv.h b/arch/s390/include/asm/uv.h
>> index e1cef772fde1..7c21d55d2e49 100644
>> --- a/arch/s390/include/asm/uv.h
>> +++ b/arch/s390/include/asm/uv.h
>> @@ -23,11 +23,19 @@
>> #define UVC_RC_INV_STATE 0x0003
>> #define UVC_RC_INV_LEN 0x0005
>> #define UVC_RC_NO_RESUME 0x0007
>> +#define UVC_RC_NEED_DESTROY 0x8000
>
> This define is never used. I'd suggest to drop it.
I should be used in
diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/pv.c
index da281d8dcc92..8cc927ca061f 100644
--- a/arch/s390/kvm/pv.c
+++ b/arch/s390/kvm/pv.c
@@ -189,7 +189,7 @@ int kvm_s390_pv_create_vm(struct kvm *kvm)
/* Outputs */
kvm->arch.pv.handle = uvcb.guest_handle;
- if (rc && (uvcb.header.rc & 0x8000)) {
+ if (rc && (uvcb.header.rc & UVC_RC_NEED_DESTROY)) {
kvm_s390_pv_destroy_vm(kvm);
return -EINVAL;
}
Will fix.
