From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9ptQ-0005Zy-O6 for qemu-devel@nongnu.org; Mon, 06 Jun 2016 04:28:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9ptK-0007cK-Q0 for qemu-devel@nongnu.org; Mon, 06 Jun 2016 04:28:15 -0400 Received: from mx2.suse.de ([195.135.220.15]:32858) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9ptK-0007cD-Ji for qemu-devel@nongnu.org; Mon, 06 Jun 2016 04:28:10 -0400 References: <1465200062-13824-1-git-send-email-caoj.fnst@cn.fujitsu.com> <1465200062-13824-12-git-send-email-caoj.fnst@cn.fujitsu.com> From: Hannes Reinecke Message-ID: <57553419.7000801@suse.de> Date: Mon, 6 Jun 2016 10:28:09 +0200 MIME-Version: 1.0 In-Reply-To: <1465200062-13824-12-git-send-email-caoj.fnst@cn.fujitsu.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v7 11/15] msi_init: change return value to 0 on success List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cao jin , qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Paolo Bonzini , Markus Armbruster , Marcel Apfelbaum On 06/06/2016 10:00 AM, Cao jin wrote: > No caller use its return value as msi capability offset, in order > to make its return behaviour consistent with msix_init(). >=20 > cc: Michael S. Tsirkin > cc: Paolo Bonzini > cc: Hannes Reinecke > cc: Markus Armbruster > cc: Marcel Apfelbaum >=20 > Signed-off-by: Cao jin > --- > hw/pci/msi.c | 6 +++--- > hw/scsi/megasas.c | 2 +- > hw/scsi/mptsas.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/hw/pci/msi.c b/hw/pci/msi.c > index aa6cf49..70464bf 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; > } > =20 > void msi_uninit(struct PCIDevice *dev) > diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c > index 635be13..26119bf 100644 > --- a/hw/scsi/megasas.c > +++ b/hw/scsi/megasas.c > @@ -2346,7 +2346,7 @@ static void megasas_scsi_realize(PCIDevice *dev, = Error **errp) > "megasas-queue", 0x40000); > =20 > if (megasas_use_msi(s) && > - msi_init(dev, 0x50, 1, true, false) < 0) { > + msi_init(dev, 0x50, 1, true, false)) { > s->msi =3D ON_OFF_AUTO_OFF; > } > if (megasas_use_msix(s) && > diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c > index 4ff4d06..d4773e2 100644 > --- a/hw/scsi/mptsas.c > +++ b/hw/scsi/mptsas.c > @@ -1286,7 +1286,7 @@ static void mptsas_scsi_realize(PCIDevice *dev, E= rror **errp) > "mptsas-diag", 0x10000); > =20 > if (s->msi !=3D ON_OFF_AUTO_OFF && > - msi_init(dev, 0, 1, true, false) >=3D 0) { > + msi_init(dev, 0, 1, true, false) > 0) { > /* TODO check for errors */ > s->msi_in_use =3D true; > } >=20 Acked-by: Hannes Reinecke Cheers, Hannes --=20 Dr. Hannes Reinecke Teamlead Storage & Networking hare@suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N=FCrnberg GF: F. Imend=F6rffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG N=FCrnberg)