From: Tom Lendacky Date: Thu, 20 Mar 2025 13:26:52 +0000 (-0500) Subject: KVM: SVM: Include the vCPU ID when dumping a VMCB X-Git-Tag: v6.16-rc1~78^2~4^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e6b677de730bec4113c466861968e38c4018c50;p=thirdparty%2Flinux.git KVM: SVM: Include the vCPU ID when dumping a VMCB Provide the vCPU ID of the VMCB in dump_vmcb(). Signed-off-by: Tom Lendacky Acked-by: Borislav Petkov (AMD) Tested-by: Kim Phillips Link: https://lore.kernel.org/r/ee0af5a6c1a49aebb4a8291071c3f68cacf107b2.1742477213.git.thomas.lendacky@amd.com Signed-off-by: Sean Christopherson --- diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 71a5d96f9a04e..272ce4bdbf111 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3408,8 +3408,8 @@ static void dump_vmcb(struct kvm_vcpu *vcpu) sev_es_guest(vcpu->kvm) ? "SEV-ES" : sev_guest(vcpu->kvm) ? "SEV" : "SVM"; - pr_err("%s VMCB %p, last attempted VMRUN on CPU %d\n", - vm_type, svm->current_vmcb->ptr, vcpu->arch.last_vmentry_cpu); + pr_err("%s vCPU%u VMCB %p, last attempted VMRUN on CPU %d\n", + vm_type, vcpu->vcpu_id, svm->current_vmcb->ptr, vcpu->arch.last_vmentry_cpu); pr_err("VMCB Control Area:\n"); pr_err("%-20s%04x\n", "cr_read:", control->intercepts[INTERCEPT_CR] & 0xffff); pr_err("%-20s%04x\n", "cr_write:", control->intercepts[INTERCEPT_CR] >> 16);