From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI1vt-0001CR-DE for qemu-devel@nongnu.org; Thu, 14 Aug 2014 16:47:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XI1vn-0001Fc-NQ for qemu-devel@nongnu.org; Thu, 14 Aug 2014 16:47:37 -0400 Message-ID: <53ED205F.3030202@redhat.com> Date: Thu, 14 Aug 2014 22:47:27 +0200 From: Laszlo Ersek MIME-Version: 1.0 References: <20140814191147.13303.61655.stgit@gimli.home> <20140814192403.13303.69084.stgit@gimli.home> In-Reply-To: <20140814192403.13303.69084.stgit@gimli.home> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/3] x86: Use common variable range MTRR counts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson , qemu-devel@nongnu.org, kvm@vger.kernel.org Cc: qemu-stable@nongnu.org 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 > Cc: Laszlo Ersek > 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