]> xenbits.xensource.com Git - people/pauldu/xen.git/commitdiff
x86: fix hvm_migrate_irq assertion
authorWei Liu <wei.liu2@citrix.com>
Mon, 12 Nov 2018 14:04:59 +0000 (14:04 +0000)
committerWei Liu <wei.liu2@citrix.com>
Mon, 12 Nov 2018 15:16:12 +0000 (15:16 +0000)
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@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
xen/arch/x86/hvm/hvm.c

index 519282937b5a63bbffeb349faf96cc22059a39c0..5d263c4090dba5ec66d7fd8cf14ce3fe370aa051 100644 (file)
@@ -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));
 
     if ( (pirq_dpci->flags & HVM_IRQ_DPCI_MACH_MSI) &&
          /* Needn't migrate pirq if this pirq is delivered to guest directly.*/