ppc/spapr: Don't call KVM_SVM_OFF ioctl on TCG
PATCH 1/1 ppc/spapr: Don't call KVM_SVM_OFF ioctl on TCG
Invoking KVM_SVM_OFF ioctl for TCG guests will lead to a QEMU crash. Fix this by ensuring that we don't call KVM_SVM_OFF ioctl on TCG.
Reported-by Alexey Kardashevskiy <[email protected]>
Fixes 4930c1966249 ("ppc/spapr: Support reboot of secure pseries guest")
Signed-off-by Bharata B Rao <[email protected]>
--- target/ppc/kvm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
target/ppc/kvm.c +5 -2
@@ -2902,9 +2902,12 @@ void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset)void kvmppc_svm_off (Error **errp) {int rc; -KVMState *s =KVM_STATE (current_machine->accelerator); - rc =kvm_vm_ioctl (s,KVM_PPC_SVM_OFF ); +if (!kvm_enabled ()) { +return ; + } + + rc =kvm_vm_ioctl (KVM_STATE (current_machine->accelerator),KVM_PPC_SVM_OFF );if (rc && rc != -ENOTTY ) {error_setg_errno (errp, -rc,"KVM_PPC_SVM_OFF ioctl failed" ); }
Signature · 1 line
2.21.0
David Gibson
AppliedQuoted 6 lines · Bharata B Rao
Invoking
KVM_SVM_OFFioctl for TCG guests will lead to a QEMU crash. Fix this by ensuring that we don't callKVM_SVM_OFFioctl on TCG.Reported-by Alexey Kardashevskiy <[email protected]>Fixes 4930c1966249 ("ppc/spapr: Support reboot of secure pseries guest")Signed-off-by Bharata B Rao <[email protected]>
Applied to ppc-for-5.0, thanks.
Quoted 23 lines
--- target/ppc/kvm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)target/ppc/kvm.c +5
-2@@ -2902,9 +2902,12 @@ void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset)void kvmppc_svm_off (Error **errp) {int rc; -KVMState *s =KVM_STATE (current_machine->accelerator); - rc =kvm_vm_ioctl (s,KVM_PPC_SVM_OFF ); +if (!kvm_enabled ()) { +return ; + } + + rc =kvm_vm_ioctl (KVM_STATE (current_machine->accelerator),KVM_PPC_SVM_OFF );if (rc && rc != -ENOTTY ) {error_setg_errno (errp, -rc,"KVM_PPC_SVM_OFF ioctl failed" ); }
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson