From 0b731978818ff4dd21eb250e8d8d2803015afba3 Mon Sep 17 00:00:00 2001 From: Bharata B Rao Date: Thu, 2 Jan 2020 11:11:55 +0530 Subject: [PATCH] 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 Fixes: 4930c1966249 ("ppc/spapr: Support reboot of secure pseries guest") Signed-off-by: Bharata B Rao Message-Id: <20200102054155.13175-1-bharata@linux.ibm.com> Signed-off-by: David Gibson --- target/ppc/kvm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 45a26c0fc6..b5799e62b4 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -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"); }