Message ID | 20140814192403.13303.69084.stgit@gimli.home |
---|---|
State | New |
Headers | show |
On 08/14/14 21:24, Alex Williamson wrote: > We currently define the number of variable range MTRR registers as 8 > in the CPUX86State structure and vmstate, but use MSR_MTRRcap_VCNT > (also 8) to report to guests the number available. Change this to > use MSR_MTRRcap_VCNT consistently. > > Signed-off-by: Alex Williamson <alex.williamson@redhat.com> > Cc: Laszlo Ersek <lersek@redhat.com> > Cc: qemu-stable@nongnu.org > --- > > target-i386/cpu.h | 2 +- > target-i386/machine.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target-i386/cpu.h b/target-i386/cpu.h > index e634d83..d37d857 100644 > --- a/target-i386/cpu.h > +++ b/target-i386/cpu.h > @@ -930,7 +930,7 @@ typedef struct CPUX86State { > /* MTRRs */ > uint64_t mtrr_fixed[11]; > uint64_t mtrr_deftype; > - MTRRVar mtrr_var[8]; > + MTRRVar mtrr_var[MSR_MTRRcap_VCNT]; > > /* For KVM */ > uint32_t mp_state; > diff --git a/target-i386/machine.c b/target-i386/machine.c > index 16d2f6a..fb89065 100644 > --- a/target-i386/machine.c > +++ b/target-i386/machine.c > @@ -677,7 +677,7 @@ VMStateDescription vmstate_x86_cpu = { > /* MTRRs */ > VMSTATE_UINT64_ARRAY_V(env.mtrr_fixed, X86CPU, 11, 8), > VMSTATE_UINT64_V(env.mtrr_deftype, X86CPU, 8), > - VMSTATE_MTRR_VARS(env.mtrr_var, X86CPU, 8, 8), > + VMSTATE_MTRR_VARS(env.mtrr_var, X86CPU, MSR_MTRRcap_VCNT, 8), > /* KVM-related states */ > VMSTATE_INT32_V(env.interrupt_injected, X86CPU, 9), > VMSTATE_UINT32_V(env.mp_state, X86CPU, 9), > Reviewed-by: Laszlo Ersek <lersek@redhat.com>
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index e634d83..d37d857 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -930,7 +930,7 @@ typedef struct CPUX86State { /* MTRRs */ uint64_t mtrr_fixed[11]; uint64_t mtrr_deftype; - MTRRVar mtrr_var[8]; + MTRRVar mtrr_var[MSR_MTRRcap_VCNT]; /* For KVM */ uint32_t mp_state; diff --git a/target-i386/machine.c b/target-i386/machine.c index 16d2f6a..fb89065 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -677,7 +677,7 @@ VMStateDescription vmstate_x86_cpu = { /* MTRRs */ VMSTATE_UINT64_ARRAY_V(env.mtrr_fixed, X86CPU, 11, 8), VMSTATE_UINT64_V(env.mtrr_deftype, X86CPU, 8), - VMSTATE_MTRR_VARS(env.mtrr_var, X86CPU, 8, 8), + VMSTATE_MTRR_VARS(env.mtrr_var, X86CPU, MSR_MTRRcap_VCNT, 8), /* KVM-related states */ VMSTATE_INT32_V(env.interrupt_injected, X86CPU, 9), VMSTATE_UINT32_V(env.mp_state, X86CPU, 9),
We currently define the number of variable range MTRR registers as 8 in the CPUX86State structure and vmstate, but use MSR_MTRRcap_VCNT (also 8) to report to guests the number available. Change this to use MSR_MTRRcap_VCNT consistently. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Cc: Laszlo Ersek <lersek@redhat.com> Cc: qemu-stable@nongnu.org --- target-i386/cpu.h | 2 +- target-i386/machine.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)