Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

This commit is contained in:
Anthony Liguori 2011-08-08 14:38:42 -05:00
commit 986563b173
7 changed files with 44 additions and 19 deletions

View file

@ -743,6 +743,7 @@ typedef struct CPUX86State {
uint32_t cpuid_kvm_features;
uint32_t cpuid_svm_features;
bool tsc_valid;
int tsc_khz;
/* in order to simplify APIC support, we leave this pointer to the
user */