Merge commit 'f1665b21f16c5dc0ac37de60233a4975aff31193' into upstream-merge
commit231ba2cf0d8f0b835d0ea3618743444ec648021b
authorMarcelo Tosatti <mtosatti@redhat.com>
Sun, 4 Jul 2010 10:47:00 +0000 (4 07:47 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Sun, 4 Jul 2010 10:47:00 +0000 (4 07:47 -0300)
treebc6785c68d14eda72c80e0d57896cca7be98428e
parent94cb4a18f558057c73b22a4c52c844fbef02e4d2
parentf1665b21f16c5dc0ac37de60233a4975aff31193
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>
kvm-all.c
kvm.h
target-i386/kvm.c
target-i386/machine.c