From 94bd9df0f7efad8038d99ec52ba56ecec4191248 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 12 Nov 2018 14:04:59 +0000 Subject: [PATCH] x86: fix hvm_migrate_irq assertion MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Jan Beulich Reviewed-by: Roger Pau Monné --- 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)); if ( (pirq_dpci->flags & HVM_IRQ_DPCI_MACH_MSI) && /* Needn't migrate pirq if this pirq is delivered to guest directly.*/ -- 2.30.2