From: Qing He Subject: [PATCH] ioemu: msi/msix clean up on hotplug remove Date: Wed, 11 Mar 2009 22:28:11 +0800 Message-ID: <1236781691-5061-1-git-send-email-qing.he@intel.com> Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org The passthrough MSI/MSI-X should be unbound and unmapped when unregister_real_device is called, this patch fix this. Signed-off-by: Qing He diff --git a/hw/pass-through.c b/hw/pass-through.c index 4a86309..308bcc3 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3753,20 +3753,14 @@ int unregister_real_device(int php_slot) e_device, e_intx, 0); if ( rc < 0 ) { - /* TBD: unregister device in case of an error */ PT_LOG("Error: Unbinding of interrupt failed! rc=%d\n", rc); } } - else if (assigned_device->msi_trans_en) - { - rc = xc_domain_unbind_pt_irq(xc_handle, domid, assigned_device->msi->pirq, - PT_IRQ_TYPE_MSI_TRANSLATE, 0, - e_device, e_intx, 0); - if (rc < 0) - PT_LOG("Error: Unbinding pt irq for MSI-INTx failed! rc=%d\n", rc); - } - /* TODO: unmap passthrough MSI and MSI-X irqs */ + if (assigned_device->msi) + pt_msi_disable(assigned_device); + if (assigned_device->msix) + pt_msix_disable(assigned_device); /* delete all emulated config registers */ pt_config_delete(assigned_device);