| Message ID | 20170317110223.25130-4-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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@citrix.com> 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. ~Andrew > --- > 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..c785b3f353 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] ) > return; > > set_bit(reason_idx, nmi_reason(d));
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@citrix.com> > > 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.
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@citrix.com> >> 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. ~Andrew
On Fri, Mar 17, 2017 at 11:10:19AM +0000, 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@citrix.com> > > > > 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. This has reminded me that I should send a patch to prevent using nmi=dom0 with dom0=pvh. Roger.
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0d54baf20e..c785b3f353 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] ) return; set_bit(reason_idx, nmi_reason(d));
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@citrix.com> --- xen/arch/x86/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)