From patchwork Thu Sep 22 07:56:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Herongguang (Stephen)" X-Patchwork-Id: 673200 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sfqBB5MQcz9rxv for ; Thu, 22 Sep 2016 18:18:10 +1000 (AEST) Received: from localhost ([::1]:59548 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmzCq-0000zN-AW for incoming@patchwork.ozlabs.org; Thu, 22 Sep 2016 04:18:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmysY-00048W-RV for qemu-devel@nongnu.org; Thu, 22 Sep 2016 03:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmysT-0000hX-3p for qemu-devel@nongnu.org; Thu, 22 Sep 2016 03:57:09 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:18081) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmysS-0000fn-B3 for qemu-devel@nongnu.org; Thu, 22 Sep 2016 03:57:05 -0400 Received: from 172.24.1.60 (EHLO SZXEML423-HUB.china.huawei.com) ([172.24.1.60]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DRK16394; Thu, 22 Sep 2016 15:56:47 +0800 (CST) Received: from [127.0.0.1] (10.177.19.20) by SZXEML423-HUB.china.huawei.com (10.82.67.154) with Microsoft SMTP Server id 14.3.235.1; Thu, 22 Sep 2016 15:56:34 +0800 To: , , , , , , References: <57D90289.6020003@huawei.com> From: "Herongguang (Stephen)" Message-ID: <57E38EAC.3020108@huawei.com> Date: Thu, 22 Sep 2016 15:56:28 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <57D90289.6020003@huawei.com> X-Originating-IP: [10.177.19.20] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020201.57E38EC1.00AD, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 589a115fa82e4a233ebac813afc6f46c X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 58.251.152.64 Subject: [Qemu-devel] [RFC/PATCH 3] kvm: fix events.flags (KVM_VCPUEVENT_VALID_SMM) overwritten by 0 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: arei.gonglei@huawei.com, "Huangweidong \(C\)" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Fix events.flags (KVM_VCPUEVENT_VALID_SMM) overwritten by 0. Signed-off-by: He Rongguang --- Note without patch 2, this would result in kvm-kmod crash, as described in patch 2 --- target-i386/kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.3.4 diff --git a/target-i386/kvm.c b/target-i386/kvm.c index d1a25c5..7db33d2 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -2456,6 +2456,7 @@ static int kvm_put_vcpu_events(X86CPU *cpu, int level) events.sipi_vector = env->sipi_vector; + events.flags = 0; if (has_msr_smbase) { events.smi.smm = !!(env->hflags & HF_SMM_MASK); events.smi.smm_inside_nmi = !!(env->hflags2 & HF2_SMM_INSIDE_NMI_MASK); @@ -2474,7 +2475,6 @@ static int kvm_put_vcpu_events(X86CPU *cpu, int level) events.flags |= KVM_VCPUEVENT_VALID_SMM; } - events.flags = 0; if (level >= KVM_PUT_RESET_STATE) { events.flags |= KVM_VCPUEVENT_VALID_NMI_PENDING | KVM_VCPUEVENT_VALID_SIPI_VECTOR;