From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c2BHU-00074G-OI for qemu-devel@nongnu.org; Thu, 03 Nov 2016 02:13:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c2BHR-0000SO-H8 for qemu-devel@nongnu.org; Thu, 03 Nov 2016 02:13:44 -0400 Received: from [59.151.112.132] (port=55415 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c2BHR-0000S2-5H for qemu-devel@nongnu.org; Thu, 03 Nov 2016 02:13:41 -0400 References: <1478145997-28865-1-git-send-email-caoj.fnst@cn.fujitsu.com> <1478145997-28865-11-git-send-email-caoj.fnst@cn.fujitsu.com> From: Cao jin Message-ID: <581AD628.2020501@cn.fujitsu.com> Date: Thu, 3 Nov 2016 14:16:08 +0800 MIME-Version: 1.0 In-Reply-To: <1478145997-28865-11-git-send-email-caoj.fnst@cn.fujitsu.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v5 10/10] msi_init: convert assert to return -errno List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , "Michael S. Tsirkin" Please ignore this one, I forget to commit the amendment... Already send the right one. Cao jin On 11/03/2016 12:06 PM, Cao jin wrote: > According to the disscussion: > http://lists.nongnu.org/archive/html/qemu-devel/2016-09/msg08215.html > > Let leaf function returns reasonable -errno, let caller decide how to > handle the return value. > > Suggested-by: Markus Armbruster > CC: Markus Armbruster > CC: Michael S. Tsirkin > CC: Marcel Apfelbaum > > Reviewed-by: Markus Armbruster > Signed-off-by: Cao jin > --- > hw/pci/msi.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/hw/pci/msi.c b/hw/pci/msi.c > index a87b227..443682b 100644 > --- a/hw/pci/msi.c > +++ b/hw/pci/msi.c > @@ -201,9 +201,14 @@ int msi_init(struct PCIDevice *dev, uint8_t offset, > " 64bit %d mask %d\n", > offset, nr_vectors, msi64bit, msi_per_vector_mask); > > - assert(!(nr_vectors & (nr_vectors - 1))); /* power of 2 */ > - assert(nr_vectors > 0); > - assert(nr_vectors <= PCI_MSI_VECTORS_MAX); > + /* vector sanity test: should in range 1 - 32, should be power of 2 */ > + if ((nr_vectors == 0) || > + (nr_vectors > PCI_MSI_VECTORS_MAX) || > + (nr_vectors & (nr_vectors - 1))) { > + error_setg(errp, "Invalid vector number: %d", nr_vectors); > + return -EINVAL; > + } > + > /* the nr of MSI vectors is up to 32 */ > vectors_order = ctz32(nr_vectors); > >