Re: [Xen-devel] [PATCH 3/4] x86/traps: undo the PVHv1 bodge in NMI delivery path

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Fri, Mar 17, 2017 at 11:11:17AM +0000, Andrew Cooper wrote:
> On 17/03/17 11:10, Wei Liu wrote:
> > On Fri, Mar 17, 2017 at 11:06:41AM +0000, Andrew Cooper wrote:
> >> On 17/03/17 11:02, Wei Liu wrote:
> >>> A bodge was added in 21c9fce8efb to skip delivering NMI to PVHv1 guest.
> >>> Now that PVHv1 is gone, undo that bodge and remove the fixme.
> >>>
> >>> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
> >> This unfortunately needs to stay, although perhaps it wants rewording.
> >>
> >> send_guest_trap() just out of context below is PV-specific, making this
> >> path unsuitable for any HVM guests.
> >>
> > Just removing the comment should be fine then.
> 
> Ok then.


From 3f4e56ed1990926ce642317093dd7e24a47f2647 Mon Sep 17 00:00:00 2001
From: Wei Liu <wei.liu2@xxxxxxxxxx>
Date: Thu, 16 Mar 2017 19:11:56 +0000
Subject: [PATCH] x86/traps: remove PVH fixme in NMI delivery path

A bodge was added in 21c9fce8efb to skip delivering NMI to PVHv1 guest.
Although PVHv1 is gone, the check for PV domain is still needed as this
function is PV specific.

Just remove the PVH fixme comment.

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 xen/arch/x86/traps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 0d54baf20e..c51e9cc2cc 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -3537,7 +3537,7 @@ static void nmi_hwdom_report(unsigned int reason_idx)
 {
     struct domain *d = hardware_domain;
 
-    if ( !d || !d->vcpu || !d->vcpu[0] || !is_pv_domain(d) /* PVH fixme */ )
+    if ( !d || !d->vcpu || !d->vcpu[0] || !is_pv_domain(d) )
         return;
 
     set_bit(reason_idx, nmi_reason(d));
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel