From: Liran Alon <liran.alon@oracle.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, mtosatti@redhat.com, rth@twiddle.net,
ehabkost@redhat.com, kvm@vger.kernel.org, jmattson@google.com,
maran.wilson@oracle.com, dgilbert@redhat.com,
Liran Alon <liran.alon@oracle.com>
Subject: [QEMU PATCH v3 9/9] KVM: i386: Remove VMX migration blocker
Date: Mon, 17 Jun 2019 20:56:58 +0300 [thread overview]
Message-ID: <20190617175658.135869-10-liran.alon@oracle.com> (raw)
In-Reply-To: <20190617175658.135869-1-liran.alon@oracle.com>
This effectively reverts d98f26073beb ("target/i386: kvm: add VMX migration blocker").
This can now be done because previous commits added support for Intel VMX migration.
AMD SVM migration is still blocked. This is because kernel
KVM_CAP_{GET,SET}_NESTED_STATE in case of AMD SVM is not
implemented yet. Therefore, required vCPU nested state is still
missing in order to perform valid migration for vCPU exposed with SVM.
Signed-off-by: Liran Alon <liran.alon@oracle.com>
---
target/i386/kvm.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index 797f8ac46435..772c8619efc4 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -948,7 +948,7 @@ static int hyperv_init_vcpu(X86CPU *cpu)
}
static Error *invtsc_mig_blocker;
-static Error *nested_virt_mig_blocker;
+static Error *svm_mig_blocker;
#define KVM_MAX_CPUID_ENTRIES 100
@@ -1313,13 +1313,13 @@ int kvm_arch_init_vcpu(CPUState *cs)
!!(c->ecx & CPUID_EXT_SMX);
}
- if (cpu_has_nested_virt(env) && !nested_virt_mig_blocker) {
- error_setg(&nested_virt_mig_blocker,
- "Nested virtualization does not support live migration yet");
- r = migrate_add_blocker(nested_virt_mig_blocker, &local_err);
+ if (cpu_has_svm(env) && !svm_mig_blocker) {
+ error_setg(&svm_mig_blocker,
+ "AMD SVM does not support live migration yet");
+ r = migrate_add_blocker(svm_mig_blocker, &local_err);
if (local_err) {
error_report_err(local_err);
- error_free(nested_virt_mig_blocker);
+ error_free(svm_mig_blocker);
return r;
}
}
--
2.20.1
next prev parent reply other threads:[~2019-06-17 17:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 17:56 [QEMU PATCH v3 0/9]: KVM: i386: Add support for save and restore of nested state Liran Alon
2019-06-17 17:56 ` [QEMU PATCH v3 1/9] KVM: Introduce kvm_arch_destroy_vcpu() Liran Alon
2019-06-18 22:15 ` [Qemu-devel] " Maran Wilson
2019-06-17 17:56 ` [QEMU PATCH v3 2/9] KVM: i386: Use symbolic constant for #DB/#BP exception constants Liran Alon
2019-06-17 17:56 ` [QEMU PATCH v3 3/9] KVM: i386: Re-inject #DB to guest with updated DR6 Liran Alon
2019-06-17 17:56 ` [QEMU PATCH v3 4/9] KVM: i386: Block migration for vCPUs exposed with nested virtualization Liran Alon
2019-06-18 8:44 ` Dr. David Alan Gilbert
2019-06-18 22:16 ` [Qemu-devel] " Maran Wilson
2019-06-17 17:56 ` [QEMU PATCH v3 5/9] linux-headers: i386: Modify struct kvm_nested_state to have explicit fields for data Liran Alon
2019-06-18 22:16 ` [Qemu-devel] " Maran Wilson
2019-06-17 17:56 ` [QEMU PATCH v3 6/9] vmstate: Add support for kernel integer types Liran Alon
2019-06-18 8:55 ` Dr. David Alan Gilbert
2019-06-18 15:36 ` Liran Alon
2019-06-18 15:42 ` Dr. David Alan Gilbert
2019-06-18 16:44 ` Paolo Bonzini
2019-06-17 17:56 ` [QEMU PATCH v3 7/9] KVM: i386: Add support for save and restore nested state Liran Alon
2019-06-18 9:03 ` Dr. David Alan Gilbert
2019-06-18 15:40 ` Liran Alon
2019-06-18 15:48 ` Dr. David Alan Gilbert
2019-06-18 15:50 ` Liran Alon
2019-06-18 16:16 ` Paolo Bonzini
2019-06-18 22:16 ` [Qemu-devel] " Maran Wilson
2019-06-17 17:56 ` [QEMU PATCH v3 8/9] KVM: i386: Add support for KVM_CAP_EXCEPTION_PAYLOAD Liran Alon
2019-06-18 9:07 ` Dr. David Alan Gilbert
2019-06-18 15:45 ` Liran Alon
2019-06-17 17:56 ` Liran Alon [this message]
2019-06-18 22:17 ` [Qemu-devel] [QEMU PATCH v3 9/9] KVM: i386: Remove VMX migration blocker Maran Wilson
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=20190617175658.135869-10-liran.alon@oracle.com \
--to=liran.alon@oracle.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=maran.wilson@oracle.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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;
as well as URLs for NNTP newsgroup(s).