| Message ID | 1435611725-15161-6-git-send-email-konrad.wilk@oracle.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 29 Jun 2015, Konrad Rzeszutek Wilk wrote: > We seem to only use these functions when de-activating the > MSI - so just log errors. > > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > hw/xen/xen_pt_msi.c | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c > index 5822df5..e3d7194 100644 > --- a/hw/xen/xen_pt_msi.c > +++ b/hw/xen/xen_pt_msi.c > @@ -75,19 +75,29 @@ static int msi_msix_enable(XenPCIPassthroughState *s, > bool enable) > { > uint16_t val = 0; > + int rc; > > if (!address) { > return -1; > } > > - xen_host_pci_get_word(&s->real_device, address, &val); > + rc = xen_host_pci_get_word(&s->real_device, address, &val); > + if (rc) { > + XEN_PT_ERR(&s->dev, "Failed to read MSI/MSI-X register (0x%x), rc:%d\n", > + address, rc); > + return rc; > + } > if (enable) { > val |= flag; > } else { > val &= ~flag; > } > - xen_host_pci_set_word(&s->real_device, address, val); > - return 0; > + rc = xen_host_pci_set_word(&s->real_device, address, val); > + if (rc) { > + XEN_PT_ERR(&s->dev, "Failed to write MSI/MSI-X register (0x%x), rc:%d\n", > + address, rc); > + } > + return rc; > } > > static int msi_msix_setup(XenPCIPassthroughState *s, > @@ -276,7 +286,7 @@ void xen_pt_msi_disable(XenPCIPassthroughState *s) > return; > } > > - xen_pt_msi_set_enable(s, false); > + (void)xen_pt_msi_set_enable(s, false); > > msi_msix_disable(s, msi_addr64(msi), msi->data, msi->pirq, false, > msi->initialized); > -- > 2.1.0 >
diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 5822df5..e3d7194 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -75,19 +75,29 @@ static int msi_msix_enable(XenPCIPassthroughState *s, bool enable) { uint16_t val = 0; + int rc; if (!address) { return -1; } - xen_host_pci_get_word(&s->real_device, address, &val); + rc = xen_host_pci_get_word(&s->real_device, address, &val); + if (rc) { + XEN_PT_ERR(&s->dev, "Failed to read MSI/MSI-X register (0x%x), rc:%d\n", + address, rc); + return rc; + } if (enable) { val |= flag; } else { val &= ~flag; } - xen_host_pci_set_word(&s->real_device, address, val); - return 0; + rc = xen_host_pci_set_word(&s->real_device, address, val); + if (rc) { + XEN_PT_ERR(&s->dev, "Failed to write MSI/MSI-X register (0x%x), rc:%d\n", + address, rc); + } + return rc; } static int msi_msix_setup(XenPCIPassthroughState *s, @@ -276,7 +286,7 @@ void xen_pt_msi_disable(XenPCIPassthroughState *s) return; } - xen_pt_msi_set_enable(s, false); + (void)xen_pt_msi_set_enable(s, false); msi_msix_disable(s, msi_addr64(msi), msi->data, msi->pirq, false, msi->initialized);
We seem to only use these functions when de-activating the MSI - so just log errors. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- hw/xen/xen_pt_msi.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)