diff options
| author | Liran Alon | 2019-06-19 18:21:35 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2019-06-21 13:23:44 +0200 |
| commit | 18ab37ba1cee290923240744288dbee8be9355fb (patch) | |
| tree | 428d2947719dd27983a242a3b665b5dd5eb451ee /target/i386/cpu.c | |
| parent | target/i386: kvm: Re-inject #DB to guest with updated DR6 (diff) | |
| download | qemu-18ab37ba1cee290923240744288dbee8be9355fb.tar.gz qemu-18ab37ba1cee290923240744288dbee8be9355fb.tar.xz qemu-18ab37ba1cee290923240744288dbee8be9355fb.zip | |
target/i386: kvm: Block migration for vCPUs exposed with nested virtualization
Commit d98f26073beb ("target/i386: kvm: add VMX migration blocker")
added a migration blocker for vCPU exposed with Intel VMX.
However, migration should also be blocked for vCPU exposed with
AMD SVM.
Both cases should be blocked because QEMU should extract additional
vCPU state from KVM that should be migrated as part of vCPU VMState.
E.g. Whether vCPU is running in guest-mode or host-mode.
Fixes: d98f26073beb ("target/i386: kvm: add VMX migration blocker")
Reviewed-by: Maran Wilson <maran.wilson@oracle.com>
Signed-off-by: Liran Alon <liran.alon@oracle.com>
Message-Id: <20190619162140.133674-6-liran.alon@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target/i386/cpu.c')
| -rw-r--r-- | target/i386/cpu.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c330fd9067..61e44cb859 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5215,12 +5215,6 @@ static int x86_cpu_filter_features(X86CPU *cpu) return rv; } -#define IS_INTEL_CPU(env) ((env)->cpuid_vendor1 == CPUID_VENDOR_INTEL_1 && \ - (env)->cpuid_vendor2 == CPUID_VENDOR_INTEL_2 && \ - (env)->cpuid_vendor3 == CPUID_VENDOR_INTEL_3) -#define IS_AMD_CPU(env) ((env)->cpuid_vendor1 == CPUID_VENDOR_AMD_1 && \ - (env)->cpuid_vendor2 == CPUID_VENDOR_AMD_2 && \ - (env)->cpuid_vendor3 == CPUID_VENDOR_AMD_3) static void x86_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); |