Merge commit 'f1665b21f16c5dc0ac37de60233a4975aff31193' into upstream-merge

* commit 'f1665b21f16c5dc0ac37de60233a4975aff31193':
  kvm: Enable XSAVE live migration support
  Enable XSAVE related CPUID

Conflicts:
	target-i386/cpu.h
	target-i386/machine.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/kvm.h b/kvm.h
index 2107be6e3..95f841922 100644
--- a/kvm.h
+++ b/kvm.h
@@ -43,6 +43,8 @@ int kvm_has_sync_mmu(void);
 int kvm_has_vcpu_events(void);
 int kvm_has_robust_singlestep(void);
 int kvm_has_debugregs(void);
+int kvm_has_xsave(void);
+int kvm_has_xcrs(void);
 
 #ifdef NEED_CPU_H
 int kvm_init_vcpu(CPUState *env);