From patchwork Tue Sep 29 20:48:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 34491 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 94639B7C18 for ; Wed, 30 Sep 2009 08:05:53 +1000 (EST) Received: from localhost ([127.0.0.1]:38981 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MskpS-0000xg-Tu for incoming@patchwork.ozlabs.org; Tue, 29 Sep 2009 18:05:50 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MsjeJ-0005fi-SJ for qemu-devel@nongnu.org; Tue, 29 Sep 2009 16:50:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MsjeF-0005ZC-0L for qemu-devel@nongnu.org; Tue, 29 Sep 2009 16:50:15 -0400 Received: from [199.232.76.173] (port=55253 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MsjeE-0005Ym-M4 for qemu-devel@nongnu.org; Tue, 29 Sep 2009 16:50:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56078) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MsjeD-0002cT-GX for qemu-devel@nongnu.org; Tue, 29 Sep 2009 16:50:10 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8TKo7bS026573 for ; Tue, 29 Sep 2009 16:50:08 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8TKnHYD006885; Tue, 29 Sep 2009 16:50:06 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 29 Sep 2009 22:48:57 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 38/49] x86: mcg_cap is never 0 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- target-i386/machine.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/target-i386/machine.c b/target-i386/machine.c index 77c7bcc..3c0ffc2 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -154,12 +154,10 @@ void cpu_save(QEMUFile *f, void *opaque) /* MCE */ qemu_put_be64s(f, &env->mcg_cap); - if (env->mcg_cap) { - qemu_put_be64s(f, &env->mcg_status); - qemu_put_be64s(f, &env->mcg_ctl); - for (i = 0; i < MCE_BANKS_DEF * 4; i++) { - qemu_put_be64s(f, &env->mce_banks[i]); - } + qemu_put_be64s(f, &env->mcg_status); + qemu_put_be64s(f, &env->mcg_ctl); + for (i = 0; i < MCE_BANKS_DEF * 4; i++) { + qemu_put_be64s(f, &env->mce_banks[i]); } } @@ -348,12 +346,10 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) if (version_id >= 10) { qemu_get_be64s(f, &env->mcg_cap); - if (env->mcg_cap) { - qemu_get_be64s(f, &env->mcg_status); - qemu_get_be64s(f, &env->mcg_ctl); - for (i = 0; i < MCE_BANKS_DEF * 4; i++) { - qemu_get_be64s(f, &env->mce_banks[i]); - } + qemu_get_be64s(f, &env->mcg_status); + qemu_get_be64s(f, &env->mcg_ctl); + for (i = 0; i < MCE_BANKS_DEF * 4; i++) { + qemu_get_be64s(f, &env->mce_banks[i]); } }