From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EF53C3A5A0 for ; Mon, 19 Aug 2019 13:27:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D73A72085A for ; Mon, 19 Aug 2019 13:27:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D73A72085A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=ucloud.cn Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzhh5-0003aR-W5 for qemu-devel@archiver.kernel.org; Mon, 19 Aug 2019 09:27:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41826) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzeiw-0007YZ-ST for qemu-devel@nongnu.org; Mon, 19 Aug 2019 06:17:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hzeit-0006g0-WC for qemu-devel@nongnu.org; Mon, 19 Aug 2019 06:17:13 -0400 Received: from m9785.mail.qiye.163.com ([220.181.97.85]:10558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hzeit-0006d7-Lx for qemu-devel@nongnu.org; Mon, 19 Aug 2019 06:17:11 -0400 Received: from localhost.localdomain (unknown [120.132.1.230]) by m9785.mail.qiye.163.com (Hmail) with ESMTPA id 526C15C19D2 for ; Mon, 19 Aug 2019 18:11:41 +0800 (CST) From: Bingsong Si To: qemu-devel@nongnu.org Date: Mon, 19 Aug 2019 18:09:24 +0800 Message-Id: <20190819100924.14968-1-owen.si@ucloud.cn> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZT1VPTkpCQkJNTU9IS01NT1lXWShZQU lCN1dZLVlBSVdZCQ4XHghZQVk1NCk2OjckKS43PlkG X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6MxA6Shw5KTg*CzgeMAoaGjwv PxwwCxNVSlVKTk1NSUtCTktKTkxLVTMWGhIXVRQMHhVVCBI7DhgXFA4fVRgVRVlXWRILWUFZSklL VUpISVVKVUlIS1lXWQgBWUFKTkNONwY+ X-HM-Tid: 0a6ca95c68b52087kuqy526c15c19d2 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.97.85 X-Mailman-Approved-At: Mon, 19 Aug 2019 09:23:44 -0400 Subject: [Qemu-devel] [PATCH] Revert "i386: correct cpu_x86_cpuid(0xd)" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This reverts commit de2e68c902f7b6e438b0fa3cfedd74a06a20704f. Initial value of env->xcr0 =3D=3D 0, then CPUID(EAX=3D0xd,ECX=3D0).EBX =3D= =3D 0, after kvm upstream commit 412a3c41, It is ok. On host before commit 412a3c41, some legacy guest, i.e. CentOS 6, get xstate_size =3D=3D 0, will crash the guest. Signed-off-by: Bingsong Si --- target/i386/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index ff65e11008..69562e21ed 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4416,7 +4416,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index= , uint32_t count, *ecx =3D xsave_area_size(x86_cpu_xsave_components(cpu)); *eax =3D env->features[FEAT_XSAVE_COMP_LO]; *edx =3D env->features[FEAT_XSAVE_COMP_HI]; - *ebx =3D xsave_area_size(env->xcr0); + *ebx =3D *ecx; } else if (count =3D=3D 1) { *eax =3D env->features[FEAT_XSAVE]; } else if (count < ARRAY_SIZE(x86_ext_save_areas)) { --=20 2.22.0