From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c6BbY-0006X8-4L for qemu-devel@nongnu.org; Mon, 14 Nov 2016 02:23:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c6BbW-00043a-Hz for qemu-devel@nongnu.org; Mon, 14 Nov 2016 02:23:00 -0500 Received: from [59.151.112.132] (port=17791 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c6BbV-0003zR-C1 for qemu-devel@nongnu.org; Mon, 14 Nov 2016 02:22:58 -0500 From: Cao jin Date: Mon, 14 Nov 2016 15:25:40 +0800 Message-ID: <1479108340-3453-11-git-send-email-caoj.fnst@cn.fujitsu.com> In-Reply-To: <1479108340-3453-1-git-send-email-caoj.fnst@cn.fujitsu.com> References: <1479108340-3453-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v7 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" , Marcel Apfelbaum 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 Reviewed-by: Marcel Apfelbaum Signed-off-by: Cao jin --- hw/pci/msi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/pci/msi.c b/hw/pci/msi.c index a87b227..af3efbe 100644 --- a/hw/pci/msi.c +++ b/hw/pci/msi.c @@ -201,9 +201,12 @@ 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 (!is_power_of_2(nr_vectors) || nr_vectors > PCI_MSI_VECTORS_MAX) { + 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); -- 2.1.0