From patchwork Mon Jun 22 16:05:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 6657171 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C61F09F380 for ; Mon, 22 Jun 2015 16:05:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 212DC205F1 for ; Mon, 22 Jun 2015 16:05:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62A77205EB for ; Mon, 22 Jun 2015 16:05:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753770AbbFVQFw (ORCPT ); Mon, 22 Jun 2015 12:05:52 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:4554 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753605AbbFVQFo (ORCPT ); Mon, 22 Jun 2015 12:05:44 -0400 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id t5MG5099028530; Mon, 22 Jun 2015 19:05:20 +0300 (MSK) From: "Denis V. Lunev" Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, Andrey Smetanin , "Denis V. Lunev" , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH 11/11] qemu/kvm: mark in cpu state that hyper-v crash occured Date: Mon, 22 Jun 2015 19:05:08 +0300 Message-Id: <1434989108-20924-12-git-send-email-den@openvz.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434989108-20924-1-git-send-email-den@openvz.org> References: <1434989108-20924-1-git-send-email-den@openvz.org> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andrey Smetanin It's usually impossible to understand from Hyper-V crash msr's that crash happened because ctl msr always contains the same value HV_X64_MSR_CRASH_CTL_NOTIFY. To solve it add a particalar value hv_crash_occurred inside CPU state and migrate this value with crash msr's. Signed-off-by: Andrey Smetanin Signed-off-by: Denis V. Lunev CC: Paolo Bonzini CC: Andreas Färber --- target-i386/cpu.h | 1 + target-i386/kvm.c | 1 + target-i386/machine.c | 1 + 3 files changed, 3 insertions(+) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 474a93e..2958cdc 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -907,6 +907,7 @@ typedef struct CPUX86State { uint64_t msr_hv_tsc; uint64_t msr_hv_crash_prm[HV_X64_MSR_CRASH_PARAMS]; uint64_t msr_hv_crash_ctl; + uint8_t hv_crash_occurred; /* exception/interrupt handling */ int error_code; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 690677b..2c8d00f 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -2616,6 +2616,7 @@ int kvm_arch_handle_hv_crash(CPUState *cs) break; } } + env->hv_crash_occurred = 1; return 0; } diff --git a/target-i386/machine.c b/target-i386/machine.c index 15b3f31..4f72ba8 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -679,6 +679,7 @@ static const VMStateDescription vmstate_msr_hyperv_crash = { VMSTATE_UINT64(env.msr_hv_crash_ctl, X86CPU), VMSTATE_UINT64_ARRAY(env.msr_hv_crash_prm, X86CPU, HV_X64_MSR_CRASH_PARAMS), + VMSTATE_UINT8(env.hv_crash_occurred, X86CPU), VMSTATE_END_OF_LIST() } };