diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-10-05 18:10:19 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-10-05 18:10:19 +0200 |
| commit | c0923d5a5d3a5ee9134909cdd82578de45cb93a0 (patch) | |
| tree | 9869220dcc21f42c6228b52799a06d1d33fd10c6 /target-i386/cpu.h | |
| parent | ksm support (diff) | |
| parent | vga: move back dirty_log functions to vga.c (diff) | |
| download | qemu-kvm-c0923d5a5d3a5ee9134909cdd82578de45cb93a0.tar.gz qemu-kvm-c0923d5a5d3a5ee9134909cdd82578de45cb93a0.tar.bz2 qemu-kvm-c0923d5a5d3a5ee9134909cdd82578de45cb93a0.zip | |
Merge commit '50af324697cb91d3e7a820e2b94ee0237c0103e2' into upstream-merge
* commit '50af324697cb91d3e7a820e2b94ee0237c0103e2': (48 commits)
vga: move back dirty_log functions to vga.c
cirrus_vga: also assign gr0/1 when writting shadow_gr0/1
Revert "eepro100: Remove unused device status entries"
target-i386: Fix exceptions for fxsave/fxrstor
tcg: allocate s->op_dead_iargs dynamically
tcg: remove dead code
bsd-user: fix "#if 0"'d printf()
eepro100: Add more i825xx devices
eepro100: Remove unused device status entries
target-i386: add RDTSCP support
target-i386: add SSE4a instruction support
target-i386: add lock mov cr0 = cr8
tcg/i386: add support for ext{8,16}u_i32 TCG ops
tcg/x86_64: add support for ext{8,16,32}u_i{32,64} TCG ops
tcg: add ext{8,16,32}u_i{32,64} TCG ops
linux-user: fix "#if 0"'d printf()
Check availability of uuid header / library
hw/omap_dma: add matching {} in if 0
oss/alsa: Do not invoke UB described in 7.15.1.1 (this time for ADC)
libuser is a generated directory
...
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-i386/cpu.h')
| -rw-r--r-- | target-i386/cpu.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index a866c1056..90c6909f9 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -338,6 +338,7 @@ #define MSR_FSBASE 0xc0000100 #define MSR_GSBASE 0xc0000101 #define MSR_KERNELGSBASE 0xc0000102 +#define MSR_TSC_AUX 0xc0000103 #define MSR_VM_HSAVE_PA 0xc0010117 @@ -713,6 +714,8 @@ typedef struct CPUX86State { uint64 mcg_status; uint64 mcg_ctl; uint64 *mce_banks; + + uint64_t tsc_aux; } CPUX86State; CPUX86State *cpu_x86_init(const char *cpu_model); @@ -873,7 +876,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); #define cpu_signal_handler cpu_x86_signal_handler #define cpu_list x86_cpu_list -#define CPU_SAVE_VERSION 10 +#define CPU_SAVE_VERSION 11 /* MMU modes definitions */ #define MMU_MODE0_SUFFIX _kernel |