diff options
author | Anthony Liguori | 2011-08-08 21:38:42 +0200 |
---|---|---|
committer | Anthony Liguori | 2011-08-08 21:38:42 +0200 |
commit | 986563b173ca2d4bd47b10455b19c86e5cd5bba2 (patch) | |
tree | 25db73df4cb973bf86c58341cb82415ab8d2c90b /target-i386/cpu.h | |
parent | pci: remove support for pre memory API BARs (diff) | |
parent | Remove #ifdef KVM_CAP_TSC_CONTROL (diff) | |
download | qemu-986563b173ca2d4bd47b10455b19c86e5cd5bba2.tar.gz qemu-986563b173ca2d4bd47b10455b19c86e5cd5bba2.tar.xz qemu-986563b173ca2d4bd47b10455b19c86e5cd5bba2.zip |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
Diffstat (limited to 'target-i386/cpu.h')
-rw-r--r-- | target-i386/cpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index ae0e4b1438..4a6f675f98 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -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 */ |