From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4rzo-00042l-Qs for qemu-devel@nongnu.org; Thu, 10 Nov 2016 11:14:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4rzl-0000hG-1T for qemu-devel@nongnu.org; Thu, 10 Nov 2016 11:14:36 -0500 Received: from mail.kernel.org ([198.145.29.136]:46212) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c4rzk-0000gh-Rt for qemu-devel@nongnu.org; Thu, 10 Nov 2016 11:14:32 -0500 Date: Thu, 10 Nov 2016 18:14:28 +0200 From: "Michael S. Tsirkin" Message-ID: <1478794177-29377-44-git-send-email-mst@redhat.com> References: <1478794177-29377-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1478794177-29377-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 43/47] 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: Peter Maydell , Cao jin , Markus Armbruster , Marcel Apfelbaum From: Cao jin 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 Acked-by: Marcel Apfelbaum Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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); -- MST