From patchwork Tue Mar 29 15:55:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 8688741 Return-Path: X-Original-To: patchwork-xen-devel@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 763299F36E for ; Tue, 29 Mar 2016 16:11:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9BC822034C for ; Tue, 29 Mar 2016 16:11:29 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 39253202FF for ; Tue, 29 Mar 2016 16:11:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1akwCT-0002m4-Sr; Tue, 29 Mar 2016 16:09:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1akwCS-0002lw-Q1 for xen-devel@lists.xenproject.org; Tue, 29 Mar 2016 16:09:00 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 8A/28-12342-B98AAF65; Tue, 29 Mar 2016 16:08:59 +0000 X-Env-Sender: prvs=889c84d62=Paul.Durrant@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1459267737!31920550!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56250 invoked from network); 29 Mar 2016 16:08:58 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 29 Mar 2016 16:08:58 -0000 X-IronPort-AV: E=Sophos;i="5.24,411,1454976000"; d="scan'208";a="343104098" From: Paul Durrant To: Date: Tue, 29 Mar 2016 16:55:23 +0100 Message-ID: <1459266923-5243-1-git-send-email-paul.durrant@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA2 Cc: Wei Liu , Paul Durrant , Ian Jackson , Stefano Stabellini Subject: [Xen-devel] [PATCH] tools/misc/xen-hvmctx: fix the build X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable 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 Commit 78c5f59e "x86/hvm/viridian: save APIC assist vector" changed the name of a field in the viridian vcpu save record. Unfortunately this record has a decode function in xen-hvmctx and so it no longer builds. This patch fixes the field name in xen-hvmctx and also adds a decode of the additional field that was added to the save record. Signed-off-by: Paul Durrant Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu Acked-by: Wei Liu --- tools/misc/xen-hvmctx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/misc/xen-hvmctx.c b/tools/misc/xen-hvmctx.c index 5a69245..32be120 100644 --- a/tools/misc/xen-hvmctx.c +++ b/tools/misc/xen-hvmctx.c @@ -379,8 +379,9 @@ static void dump_viridian_vcpu(void) { HVM_SAVE_TYPE(VIRIDIAN_VCPU) p; READ(p); - printf(" VIRIDIAN_VCPU: apic_assist 0x%llx\n", - (unsigned long long) p.apic_assist); + printf(" VIRIDIAN_VCPU: apic_assist_msr 0x%llx, apic_assist_vector 0x%x\n", + (unsigned long long) p.apic_assist_msr, + p.apic_assist_vector); } static void dump_vmce_vcpu(void)