From: Paolo Bonzini <pbonzini@redhat.com>
To: Mark Brown <broonie@kernel.org>, Sean Christopherson <seanjc@google.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Yosry Ahmed <yosry@kernel.org>
Subject: Re: linux-next: manual merge of the kvm-x86 tree with the kvm-fixes tree
Date: Thu, 12 Mar 2026 18:54:18 +0100 [thread overview]
Message-ID: <a48b3130-54d6-4cf4-a059-e576f163ebcd@redhat.com> (raw)
In-Reply-To: <abL2MPhXKOn_Zdz9@sirena.org.uk>
On 3/12/26 18:21, Mark Brown wrote:
> diff --cc arch/x86/kvm/svm/svm.c
> index e6477affac9a0,3407deac90bd6..0000000000000
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@@ -4880,15 -5030,11 +5030,11 @@@ static int svm_leave_smm(struct kvm_vcp
> vmcb12 = map.hva;
> nested_copy_vmcb_control_to_cache(svm, &vmcb12->control);
> nested_copy_vmcb_save_to_cache(svm, &vmcb12->save);
> - ret = enter_svm_guest_mode(vcpu, smram64->svm_guest_vmcb_gpa, false);
>
> - if (nested_svm_check_cached_vmcb12(vcpu) < 0)
> - goto unmap_save;
The right resolution is to keep these two lines...
> -
> - if (enter_svm_guest_mode(vcpu, smram64->svm_guest_vmcb_gpa,
> - vmcb12, false) != 0)
> - if (ret)
> ++ if (enter_svm_guest_mode(vcpu, smram64->svm_guest_vmcb_gpa, false) != 0)
... while of course this part is okay.
Paolo
> goto unmap_save;
>
> + ret = 0;
> svm->nested.nested_run_pending = 1;
>
> unmap_save:
next prev parent reply other threads:[~2026-03-12 17:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-12 17:21 linux-next: manual merge of the kvm-x86 tree with the kvm-fixes tree Mark Brown
2026-03-12 17:54 ` Paolo Bonzini [this message]
2026-03-12 17:58 ` Sean Christopherson
2026-03-12 17:58 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2024-04-03 0:53 Stephen Rothwell
2024-04-03 13:30 ` Sean Christopherson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a48b3130-54d6-4cf4-a059-e576f163ebcd@redhat.com \
--to=pbonzini@redhat.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=seanjc@google.com \
--cc=yosry@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox