Commit ee640c62 authored by Cao jin's avatar Cao jin Committed by Michael S. Tsirkin
Browse files

pci: Convert msix_init() to Error and fix callers 



msix_init() reports errors with error_report(), which is wrong when
it's used in realize().  The same issue was fixed for msi_init() in
commit 1108b2f8. In order to make the API change as small as possible,
leave the return value check to later patch.

For some devices(like e1000e, vmxnet3, nvme) who won't fail because of
msix_init's failure, suppress the error report by passing NULL error
object.

Bonus: add comment for msix_init.

CC: Jiri Pirko <jiri@resnulli.us>
CC: Gerd Hoffmann <kraxel@redhat.com>
CC: Dmitry Fleytman <dmitry@daynix.com>
CC: Jason Wang <jasowang@redhat.com>
CC: Michael S. Tsirkin <mst@redhat.com>
CC: Hannes Reinecke <hare@suse.de>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Alex Williamson <alex.williamson@redhat.com>
CC: Markus Armbruster <armbru@redhat.com>
CC: Marcel Apfelbaum <marcel@redhat.com>
Signed-off-by: default avatarCao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 20729dbd

hw/block/nvme.c

+1 −1
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ static int nvme_init(PCIDevice *pci_dev) 
    pci_register_bar(&n->parent_obj, 0,

        PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_TYPE_64,

        &n->iomem);

    msix_init_exclusive_bar(&n->parent_obj, n->num_queues, 4);

    msix_init_exclusive_bar(&n->parent_obj, n->num_queues, 4, NULL);



    id->vid = cpu_to_le16(pci_get_word(pci_conf + PCI_VENDOR_ID));

    id->ssvid = cpu_to_le16(pci_get_word(pci_conf + PCI_SUBSYSTEM_VENDOR_ID));

hw/misc/ivshmem.c

+4 −4
Original line number Diff line number Diff line
@@ -749,13 +749,13 @@ static void ivshmem_reset(DeviceState *d) 
    }

}



static int ivshmem_setup_interrupts(IVShmemState *s)

static int ivshmem_setup_interrupts(IVShmemState *s, Error **errp)

{

    /* allocate QEMU callback data for receiving interrupts */

    s->msi_vectors = g_malloc0(s->vectors * sizeof(MSIVector));



    if (ivshmem_has_feature(s, IVSHMEM_MSI)) {

        if (msix_init_exclusive_bar(PCI_DEVICE(s), s->vectors, 1)) {

        if (msix_init_exclusive_bar(PCI_DEVICE(s), s->vectors, 1, errp)) {

            return -1;

        }
@@ -898,8 +898,8 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp) 
        qemu_chr_fe_set_handlers(&s->server_chr, ivshmem_can_receive,

                                 ivshmem_read, NULL, s, NULL, true);



        if (ivshmem_setup_interrupts(s) < 0) {

            error_setg(errp, "failed to initialize interrupts");

        if (ivshmem_setup_interrupts(s, errp) < 0) {

            error_prepend(errp, "Failed to initialize interrupts: ");

            return;

        }

    }

hw/net/e1000e.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ e1000e_init_msix(E1000EState *s) 
                        E1000E_MSIX_IDX, E1000E_MSIX_TABLE,

                        &s->msix,

                        E1000E_MSIX_IDX, E1000E_MSIX_PBA,

                        0xA0);

                        0xA0, NULL);



    if (res < 0) {

        trace_e1000e_msix_init_fail(res);

hw/net/rocker/rocker.c

+3 −1
Original line number Diff line number Diff line
@@ -1256,14 +1256,16 @@ static int rocker_msix_init(Rocker *r) 
{

    PCIDevice *dev = PCI_DEVICE(r);

    int err;

    Error *local_err = NULL;



    err = msix_init(dev, ROCKER_MSIX_VEC_COUNT(r->fp_ports),

                    &r->msix_bar,

                    ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_TABLE_OFFSET,

                    &r->msix_bar,

                    ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_PBA_OFFSET,

                    0);

                    0, &local_err);

    if (err) {

        error_report_err(local_err);

        return err;

    }

hw/net/vmxnet3.c

+1 −1
Original line number Diff line number Diff line
@@ -2191,7 +2191,7 @@ vmxnet3_init_msix(VMXNET3State *s) 
                        VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_TABLE,

                        &s->msix_bar,

                        VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_PBA(s),

                        VMXNET3_MSIX_OFFSET(s));

                        VMXNET3_MSIX_OFFSET(s), NULL);



    if (0 > res) {

        VMW_WRPRN("Failed to initialize MSI-X, error %d", res);