From: Qing He Subject: [PATCH 2/2][RESEND] ioemu: guest MSI config on disable Date: Thu, 16 Apr 2009 17:18:44 +0800 Message-ID: <20090416091844.GA27272@ub-qhe2> References: <1239802877-8510-1-git-send-email-qing.he@intel.com> <1239802877-8510-3-git-send-email-qing.he@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1239802877-8510-3-git-send-email-qing.he@intel.com> 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 On Wed, 2009-04-15 at 21:41 +0800, Qing He wrote: > It's possible for a guest to change the MSI vector or flags > when MSI is disabled, after it's first initialized. This patch > handles the address and data update when it's disabled. > > Signed-off-by: Qing He > --- Just realized that I was not based on the latest code, here is the update patch, please ignore the previous one. --- diff --git a/hw/pass-through.c b/hw/pass-through.c index 11382fd..710acbf 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3436,7 +3436,7 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, /* update MSI */ if (cfg_entry->data != old_addr) { - if (ptdev->msi->flags & PCI_MSI_FLAGS_ENABLE) + if (ptdev->msi->flags & PT_MSI_MAPPED) pt_msi_update(ptdev); } @@ -3474,7 +3474,7 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, /* update MSI */ if (cfg_entry->data != old_addr) { - if (ptdev->msi->flags & PCI_MSI_FLAGS_ENABLE) + if (ptdev->msi->flags & PT_MSI_MAPPED) pt_msi_update(ptdev); } @@ -3516,7 +3516,7 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, /* update MSI */ if (cfg_entry->data != old_data) { - if (flags & PCI_MSI_FLAGS_ENABLE) + if (flags & PT_MSI_MAPPED) pt_msi_update(ptdev); } diff --git a/hw/pt-msi.c b/hw/pt-msi.c index 4a54ba3..9f4a3b3 100644 --- a/hw/pt-msi.c +++ b/hw/pt-msi.c @@ -110,10 +110,6 @@ uint32_t __get_msi_gflags(uint32_t data, uint64_t addr) return result; } -/* - * Update msi mapping, usually called when MSI enabled, - * except the first time - */ int pt_msi_update(struct pt_dev *d) { uint8_t gvec = 0; @@ -126,7 +122,8 @@ int pt_msi_update(struct pt_dev *d) addr = (uint64_t)d->msi->addr_hi << 32 | d->msi->addr_lo; gflags = __get_msi_gflags(d->msi->data, addr); - PT_LOG("Update msi with pirq %x gvec %x\n", d->msi->pirq, gvec); + PT_LOG("Update msi with pirq %x gvec %x gflags %x\n", + d->msi->pirq, gvec, gflags); ret = xc_domain_update_msi_irq(xc_handle, domid, gvec, d->msi->pirq, gflags, 0);