Re: [Xen-devel] [PATCH] x86: fix hvm_migrate_irq assertion

[Roger Pau Monné <roger.pau@xxxxxxxxxx>]

On Mon, Nov 12, 2018 at 02:04:59PM +0000, Wei Liu wrote:
> 782cf8ba46 ("pass-through: adjust pIRQ migration") added an assertion
> to hvm_migrate_irq.
> 
> PVH Dom0 is broken because it doesn't have dpci allocated. Add an
> is_hardware_domain check to the assertion.
> 
> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>

Reviewed-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>

> ---
>  xen/arch/x86/hvm/hvm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
> index 519282937b..5d263c4090 100644
> --- a/xen/arch/x86/hvm/hvm.c
> +++ b/xen/arch/x86/hvm/hvm.c
> @@ -464,7 +464,8 @@ void hvm_migrate_timers(struct vcpu *v)
>  
>  void hvm_migrate_pirq(struct hvm_pirq_dpci *pirq_dpci, const struct vcpu *v)
>  {
> -    ASSERT(iommu_enabled && hvm_domain_irq(v->domain)->dpci);
> +    ASSERT(iommu_enabled &&
> +           (is_hardware_domain(v->domain) || 
> hvm_domain_irq(v->domain)->dpci));

Albeit I would just remove the hvm_domain_irq(v->domain)->dpci part of
the assert, AFAICT the function doesn't use it at all.

Thanks, Roger.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel