From nobody Thu May 2 13:11:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1559133844; cv=none; d=zoho.com; s=zohoarc; b=ViFJUIeb482HFxyaT0xFA5UJaj45dWjriYamyQlt3GvfVTVlKO3Iwxe81tU19US8hHAqs1MzlLHDKyzzH31Z0DrbN+UZ4N+JwLZNVLb7KCW3dabOBZTIIvVpTOjKezA7zicl8vjsNgpwkpssT1Mp9XZjJzuwKmZ/H25snR2bQfQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559133844; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=7j8p3kcA0QkiZAiNnK5vkozSQAnmLTqnMvBObhg/elI=; b=nf1IE/PEbn5eCvWxaHBtUDfGRbfWBQj5NMiedHbMqeRBdT5iqBfCwGTJYTehEd0BjVJDC53tRFh+gcE+OE76cQhlS6Vd27PDZMryQU8wP6si85pj7G9KNA/KCQ4yumfZRuxhptsw5esIGMfWlFtHuzQMuSOxq+MlPUPJEEpdqGQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559133844816703.6476188415116; Wed, 29 May 2019 05:44:04 -0700 (PDT) Received: from localhost ([127.0.0.1]:53659 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVxvw-0002MB-Oz for importer@patchew.org; Wed, 29 May 2019 08:43:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVxu4-0001EC-4Q for qemu-devel@nongnu.org; Wed, 29 May 2019 08:42:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVxu3-0004ba-8a for qemu-devel@nongnu.org; Wed, 29 May 2019 08:42:00 -0400 Received: from mail.ispras.ru ([83.149.199.45]:56908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVxu3-0004aN-2R for qemu-devel@nongnu.org; Wed, 29 May 2019 08:41:59 -0400 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id C71DF540081; Wed, 29 May 2019 15:41:56 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Wed, 29 May 2019 15:41:56 +0300 Message-ID: <155913371654.8429.1659082639780315242.stgit@pasha-Precision-3630-Tower> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [PATCH] target/i386: save EFER for 32-bit targets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, dovgaluk@ispras.ru, ehabkost@redhat.com, pavel.dovgaluk@ispras.ru, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" i386 (32 bit) emulation uses EFER in wrmsr and in MMU fault processing. But it does not included in VMState, because "efer" field is disabled with #ifdef TARGET_X86_64 This patch adds a section for 32-bit targets which saves EFER when it's value is non-zero. Signed-off-by: Pavel Dovgalyuk Reviewed-by: Peter Xu --- target/i386/machine.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/target/i386/machine.c b/target/i386/machine.c index 225b5d433b..b5bfc5803e 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -964,6 +964,27 @@ static const VMStateDescription vmstate_svm_npt =3D { } }; =20 +#ifndef TARGET_X86_64 +static bool intel_efer32_needed(void *opaque) +{ + X86CPU *cpu =3D opaque; + CPUX86State *env =3D &cpu->env; + + return env->efer !=3D 0; +} + +static const VMStateDescription vmstate_efer32 =3D { + .name =3D "cpu/efer32", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D intel_efer32_needed, + .fields =3D (VMStateField[]) { + VMSTATE_UINT64(env.efer, X86CPU), + VMSTATE_END_OF_LIST() + } +}; +#endif + VMStateDescription vmstate_x86_cpu =3D { .name =3D "cpu", .version_id =3D 12, @@ -1089,6 +1110,9 @@ VMStateDescription vmstate_x86_cpu =3D { &vmstate_msr_intel_pt, &vmstate_msr_virt_ssbd, &vmstate_svm_npt, +#ifndef TARGET_X86_64 + &vmstate_efer32, +#endif NULL } };