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 v4 01/10] target/i386: kvm: Delete VMX migration blocker on vCPU init failure Date: Wed, 19 Jun 2019 19:21:31 +0300 [thread overview] Message-ID: <20190619162140.133674-2-liran.alon@oracle.com> (raw) In-Reply-To: <20190619162140.133674-1-liran.alon@oracle.com> Commit d98f26073beb ("target/i386: kvm: add VMX migration blocker") added migration blocker for vCPU exposed with Intel VMX because QEMU doesn't yet contain code to support migration of nested virtualization workloads. However, that commit missed adding deletion of the migration blocker in case init of vCPU failed. Similar to invtsc_mig_blocker. This commit fix that issue. Fixes: d98f26073beb ("target/i386: kvm: add VMX migration blocker") Signed-off-by: Liran Alon <liran.alon@oracle.com> --- target/i386/kvm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 3b29ce5c0d08..7aa7914a498c 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -940,7 +940,7 @@ int kvm_arch_init_vcpu(CPUState *cs) r = kvm_arch_set_tsc_khz(cs); if (r < 0) { - goto fail; + return r; } /* vcpu's TSC frequency is either specified by user, or following @@ -1295,7 +1295,7 @@ int kvm_arch_init_vcpu(CPUState *cs) if (local_err) { error_report_err(local_err); error_free(invtsc_mig_blocker); - return r; + goto fail2; } } } @@ -1346,6 +1346,9 @@ int kvm_arch_init_vcpu(CPUState *cs) fail: migrate_del_blocker(invtsc_mig_blocker); + fail2: + migrate_del_blocker(vmx_mig_blocker); + return r; } -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Liran Alon <liran.alon@oracle.com> To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, kvm@vger.kernel.org, maran.wilson@oracle.com, mtosatti@redhat.com, dgilbert@redhat.com, Liran Alon <liran.alon@oracle.com>, pbonzini@redhat.com, rth@twiddle.net, jmattson@google.com Subject: [Qemu-devel] [QEMU PATCH v4 01/10] target/i386: kvm: Delete VMX migration blocker on vCPU init failure Date: Wed, 19 Jun 2019 19:21:31 +0300 [thread overview] Message-ID: <20190619162140.133674-2-liran.alon@oracle.com> (raw) In-Reply-To: <20190619162140.133674-1-liran.alon@oracle.com> Commit d98f26073beb ("target/i386: kvm: add VMX migration blocker") added migration blocker for vCPU exposed with Intel VMX because QEMU doesn't yet contain code to support migration of nested virtualization workloads. However, that commit missed adding deletion of the migration blocker in case init of vCPU failed. Similar to invtsc_mig_blocker. This commit fix that issue. Fixes: d98f26073beb ("target/i386: kvm: add VMX migration blocker") Signed-off-by: Liran Alon <liran.alon@oracle.com> --- target/i386/kvm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 3b29ce5c0d08..7aa7914a498c 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -940,7 +940,7 @@ int kvm_arch_init_vcpu(CPUState *cs) r = kvm_arch_set_tsc_khz(cs); if (r < 0) { - goto fail; + return r; } /* vcpu's TSC frequency is either specified by user, or following @@ -1295,7 +1295,7 @@ int kvm_arch_init_vcpu(CPUState *cs) if (local_err) { error_report_err(local_err); error_free(invtsc_mig_blocker); - return r; + goto fail2; } } } @@ -1346,6 +1346,9 @@ int kvm_arch_init_vcpu(CPUState *cs) fail: migrate_del_blocker(invtsc_mig_blocker); + fail2: + migrate_del_blocker(vmx_mig_blocker); + return r; } -- 2.20.1
next prev parent reply other threads:[~2019-06-19 16:23 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-19 16:21 [QEMU PATCH v4 0/10]: target/i386: kvm: Add support for save and restore of nested state Liran Alon 2019-06-19 16:21 ` [Qemu-devel] " Liran Alon 2019-06-19 16:21 ` Liran Alon [this message] 2019-06-19 16:21 ` [Qemu-devel] [QEMU PATCH v4 01/10] target/i386: kvm: Delete VMX migration blocker on vCPU init failure Liran Alon 2019-06-19 20:30 ` Maran Wilson 2019-06-19 20:30 ` Maran Wilson 2019-06-19 20:33 ` Liran Alon 2019-06-19 20:33 ` Liran Alon 2019-06-19 20:48 ` Maran Wilson 2019-06-19 20:48 ` Maran Wilson 2019-06-19 16:21 ` [QEMU PATCH v4 02/10] KVM: Introduce kvm_arch_destroy_vcpu() Liran Alon 2019-06-19 16:21 ` [Qemu-devel] " Liran Alon 2019-06-19 16:21 ` [QEMU PATCH v4 03/10] target/i386: kvm: Use symbolic constant for #DB/#BP exception constants Liran Alon 2019-06-19 16:21 ` [Qemu-devel] " Liran Alon 2019-06-19 16:21 ` [QEMU PATCH v4 04/10] target/i386: kvm: Re-inject #DB to guest with updated DR6 Liran Alon 2019-06-19 16:21 ` [Qemu-devel] " Liran Alon 2019-06-19 16:21 ` [QEMU PATCH v4 05/10] target/i386: kvm: Block migration for vCPUs exposed with nested virtualization Liran Alon 2019-06-19 16:21 ` [Qemu-devel] " Liran Alon 2019-06-19 16:21 ` [QEMU PATCH v4 06/10] linux-headers: i386: Modify struct kvm_nested_state to have explicit fields for data Liran Alon 2019-06-19 16:21 ` [Qemu-devel] " Liran Alon 2019-06-19 21:17 ` Maran Wilson 2019-06-19 21:17 ` Maran Wilson 2019-06-19 16:21 ` [QEMU PATCH v4 07/10] vmstate: Add support for kernel integer types Liran Alon 2019-06-19 16:21 ` [Qemu-devel] " Liran Alon 2019-06-19 17:37 ` Dr. David Alan Gilbert 2019-06-19 17:37 ` [Qemu-devel] " Dr. David Alan Gilbert 2019-06-19 16:21 ` [QEMU PATCH v4 08/10] target/i386: kvm: Add support for save and restore nested state Liran Alon 2019-06-19 16:21 ` [Qemu-devel] " Liran Alon 2019-06-19 16:21 ` [QEMU PATCH v4 09/10] target/i386: kvm: Add support for KVM_CAP_EXCEPTION_PAYLOAD Liran Alon 2019-06-19 16:21 ` [Qemu-devel] " Liran Alon 2019-06-19 16:21 ` [QEMU PATCH v4 10/10] target/i386: kvm: Add nested migration blocker only when kernel lacks required capabilities Liran Alon 2019-06-19 16:21 ` [Qemu-devel] " Liran Alon 2019-06-19 23:52 ` Maran Wilson 2019-06-19 23:52 ` Maran Wilson 2019-06-20 12:38 ` [Qemu-devel] [QEMU PATCH v4 0/10]: target/i386: kvm: Add support for save and restore of nested state Paolo Bonzini 2019-06-20 12:38 ` Paolo Bonzini 2019-06-20 13:28 ` Liran Alon 2019-06-20 13:28 ` Liran Alon 2019-06-20 13:40 ` Liran Alon 2019-06-20 13:40 ` Liran Alon
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=20190619162140.133674-2-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.