| Message ID | 1465552478-5540-12-git-send-email-caoj.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On 06/10/2016 12:54 PM, Cao jin wrote: > No caller use its return value as msi capability offset, also in order > to make its return behaviour consistent with msix_init(). > > cc: Michael S. Tsirkin <mst@redhat.com> > cc: Paolo Bonzini <pbonzini@redhat.com> > cc: Hannes Reinecke <hare@suse.de> > cc: Markus Armbruster <armbru@redhat.com> > cc: Marcel Apfelbaum <marcel@redhat.com> > > Acked-by: Hannes Reinecke <hare@suse.com> > Reviewed-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> > --- > hw/pci/msi.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > Hi Hannes, > This version changed, If is ok with you, I will let your A-b still here. > > diff --git a/hw/pci/msi.c b/hw/pci/msi.c > index 359058e..ed79225 100644 > --- a/hw/pci/msi.c > +++ b/hw/pci/msi.c > @@ -173,8 +173,7 @@ bool msi_enabled(const PCIDevice *dev) > * If @msi64bit, make the device capable of sending a 64-bit message > * address. > * If @msi_per_vector_mask, make the device support per-vector masking. > - * Return the offset of capability MSI in config space on success, > - * return -errno on error. > + * Return 0 on success, return -errno on error. > * > * -ENOTSUP means lacking msi support for a msi-capable platform. > * -EINVAL means capability overlap, happens when @offset is non-zero, > @@ -236,7 +235,8 @@ int msi_init(struct PCIDevice *dev, uint8_t offset, > pci_set_long(dev->wmask + msi_mask_off(dev, msi64bit), > 0xffffffff >> (PCI_MSI_VECTORS_MAX - nr_vectors)); > } > - return config_offset; > + > + return 0; > } > > void msi_uninit(struct PCIDevice *dev) > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Thanks, Marcel
diff --git a/hw/pci/msi.c b/hw/pci/msi.c index 359058e..ed79225 100644 --- a/hw/pci/msi.c +++ b/hw/pci/msi.c @@ -173,8 +173,7 @@ bool msi_enabled(const PCIDevice *dev) * If @msi64bit, make the device capable of sending a 64-bit message * address. * If @msi_per_vector_mask, make the device support per-vector masking. - * Return the offset of capability MSI in config space on success, - * return -errno on error. + * Return 0 on success, return -errno on error. * * -ENOTSUP means lacking msi support for a msi-capable platform. * -EINVAL means capability overlap, happens when @offset is non-zero, @@ -236,7 +235,8 @@ int msi_init(struct PCIDevice *dev, uint8_t offset, pci_set_long(dev->wmask + msi_mask_off(dev, msi64bit), 0xffffffff >> (PCI_MSI_VECTORS_MAX - nr_vectors)); } - return config_offset; + + return 0; } void msi_uninit(struct PCIDevice *dev)