[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 10/10] msi_init: convert assert to return -er
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH v4 10/10] msi_init: convert assert to return -errno |
Date: |
Wed, 02 Nov 2016 13:37:26 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Cao jin <address@hidden> writes:
> 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 <address@hidden>
> CC: Markus Armbruster <address@hidden>
> CC: Alex Williamson <address@hidden>
> CC: Michael S. Tsirkin <address@hidden>
> CC: Marcel Apfelbaum <address@hidden>
> Signed-off-by: Cao jin <address@hidden>
> ---
> 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))) {
Suggest
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH v4 10/10] msi_init: convert assert to return -errno,
Markus Armbruster <=