From patchwork Fri Jan 31 17:49:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 11360341 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 90041924 for ; Fri, 31 Jan 2020 17:51:14 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 6C5872082E for ; Fri, 31 Jan 2020 17:51:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AioNmFb/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C5872082E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ixaR1-0006tQ-E6; Fri, 31 Jan 2020 17:50:27 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ixaQz-0006sG-Je for xen-devel@lists.xenproject.org; Fri, 31 Jan 2020 17:50:25 +0000 X-Inumbo-ID: 11d4d2ba-4452-11ea-a933-bc764e2007e4 Received: from mail-wr1-x443.google.com (unknown [2a00:1450:4864:20::443]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 11d4d2ba-4452-11ea-a933-bc764e2007e4; Fri, 31 Jan 2020 17:49:47 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id g17so9713435wro.2 for ; Fri, 31 Jan 2020 09:49:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CFk7NSQ22jtMnIw9gaYPgixmKD9SoghgRz4Gqj0PfqY=; b=AioNmFb/mEZABfVfLcSrj2dD4IlWxIoeRsEc5QuK9jtUDTtafpL6ZW67sYSmIvveYF gwFjmkN9A3pHzAIJF7DmfzlwHDC1nNdSSbB++IoUJxgM0ObM0k+NmUmj4dK7h9V/cvoi Ai8tJMnskKmeWlzaHchJDNdF1pfFFGi5YRRIVNzDh00Y6+vfastVjsSJ7Ix7mochAvcK 4bAecsntVsZYsHKghCypujkx6tkZPcqL5mqzptbs19ePipiBV80OuC8q2F4ZixNbA9Ck CEwXUA1KLL5xG1+xMmzMlo+xiqp3m/OmurIh2L7FifAQ+UHetyrvckZ+gmofXC9Dw1XS CImw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CFk7NSQ22jtMnIw9gaYPgixmKD9SoghgRz4Gqj0PfqY=; b=cPvUJpar3nA0Rbu13DXDr4rab9JpUIi599+xd9SXE4CkTBQ9cZexJpR1gDgCJ2n0jS 6EHepe0q0ks6TPR7+Wu0714qkFBxTIZTy95BQakouH1l4gqGAGp207k6+XJ6UrXQkgJz Cnb1X4DlUa3PesVW+CVLWWu47T6F8F1Tr+I/QVTSAKptzSGZhlnpPayBykih/Bmsgr5c X8D4gjRWzmHWbjroRW+swwZOAuuc5LOtw5LPdtKzQ0JTPCFmWnciT39/u/gU+z/ijaXT HM/wSfqTSeHhOkziVYCG8PK9gKyznwEuzzlr9oOHCHg4c0zVjhc8Xwq6G0vLKm0eEfxZ OlWw== X-Gm-Message-State: APjAAAXuWNfAfFgd922izrDpuZ7v2YL6CQYOfZXVVFEw4/1lN+Utm0fb Rwm04ToVvrnkoOeNF0fdhKBJ9HT6k94= X-Google-Smtp-Source: APXvYqwZpue5LqrdUbSfQBsytzq/1Lrz/k+iDVEGACdZOM8Dmc+NexpT60MLOw4Y8v0OREsaxTPDOQ== X-Received: by 2002:adf:b352:: with SMTP id k18mr13025612wrd.242.1580492986036; Fri, 31 Jan 2020 09:49:46 -0800 (PST) Received: from localhost.localdomain (41.142.6.51.dyn.plus.net. [51.6.142.41]) by smtp.gmail.com with ESMTPSA id 133sm4364352wmd.5.2020.01.31.09.49.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jan 2020 09:49:45 -0800 (PST) From: Wei Liu X-Google-Original-From: Wei Liu To: Xen Development List Date: Fri, 31 Jan 2020 17:49:29 +0000 Message-Id: <20200131174930.31045-11-liuwe@microsoft.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200131174930.31045-1-liuwe@microsoft.com> References: <20200131174930.31045-1-liuwe@microsoft.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v6 10/11] x86: move viridian_page_msr to hyperv-tlfs.h X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Wei Liu , Wei Liu , Andrew Cooper , Paul Durrant , Michael Kelley , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" And rename it to hv_vp_assist_page_msr. No functional change. Signed-off-by: Wei Liu Reviewed-by: Paul Durrant --- xen/arch/x86/hvm/viridian/viridian.c | 2 +- xen/include/asm-x86/guest/hyperv-tlfs.h | 11 +++++++++++ xen/include/asm-x86/hvm/viridian.h | 15 ++------------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c index 44c8e6cac6..9a6cafcb62 100644 --- a/xen/arch/x86/hvm/viridian/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -230,7 +230,7 @@ static void dump_guest_os_id(const struct domain *d) static void dump_hypercall(const struct domain *d) { - const union viridian_page_msr *hg; + const union hv_vp_assist_page_msr *hg; hg = &d->arch.hvm.viridian->hypercall_gpa; diff --git a/xen/include/asm-x86/guest/hyperv-tlfs.h b/xen/include/asm-x86/guest/hyperv-tlfs.h index 07db57b55f..0a0f3398c1 100644 --- a/xen/include/asm-x86/guest/hyperv-tlfs.h +++ b/xen/include/asm-x86/guest/hyperv-tlfs.h @@ -558,6 +558,17 @@ struct hv_nested_enlightenments_control { } hypercallControls; }; +union hv_vp_assist_page_msr +{ + uint64_t raw; + struct + { + uint64_t enabled:1; + uint64_t reserved_preserved:11; + uint64_t pfn:48; + }; +}; + /* Define virtual processor assist page structure. */ struct hv_vp_assist_page { __u32 apic_assist; diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h index d9138562e6..844e56b38f 100644 --- a/xen/include/asm-x86/hvm/viridian.h +++ b/xen/include/asm-x86/hvm/viridian.h @@ -11,20 +11,9 @@ #include -union viridian_page_msr -{ - uint64_t raw; - struct - { - uint64_t enabled:1; - uint64_t reserved_preserved:11; - uint64_t pfn:48; - }; -}; - struct viridian_page { - union viridian_page_msr msr; + union hv_vp_assist_page_msr msr; void *ptr; }; @@ -70,7 +59,7 @@ struct viridian_time_ref_count struct viridian_domain { union hv_guest_os_id guest_os_id; - union viridian_page_msr hypercall_gpa; + union hv_vp_assist_page_msr hypercall_gpa; struct viridian_time_ref_count time_ref_count; struct viridian_page reference_tsc; };