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

vmxnet3: remove unnecessary internal msi state flag 



Internal flag msi_used is unnecessary, it has the same effect as msi_enabled().
msi_uninit() could be called directly without risk.

cc: Paolo Bonzini <pbonzini@redhat.com>
cc: Dmitry Fleytman <dmitry@daynix.com>
cc: Markus Armbruster <armbru@redhat.com>
cc: Marcel Apfelbaum <marcel@redhat.com>
cc: Michael S. Tsirkin <mst@redhat.com>

Reviewed-by: default avatarMarkus Armbruster <armbru@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 2e2aa316

hw/net/vmxnet3.c

+6 −11
Original line number Diff line number Diff line
@@ -283,8 +283,6 @@ typedef struct { 


        /* Whether MSI-X support was installed successfully */

        bool msix_used;

        /* Whether MSI support was installed successfully */

        bool msi_used;

        hwaddr drv_shmem;

        hwaddr temp_shared_guest_driver_memory;
@@ -366,7 +364,7 @@ static bool _vmxnet3_assert_interrupt_line(VMXNET3State *s, uint32_t int_idx) 
        msix_notify(d, int_idx);

        return false;

    }

    if (s->msi_used && msi_enabled(d)) {

    if (msi_enabled(d)) {

        VMW_IRPRN("Sending MSI notification for vector %u", int_idx);

        msi_notify(d, int_idx);

        return false;
@@ -390,7 +388,7 @@ static void _vmxnet3_deassert_interrupt_line(VMXNET3State *s, int lidx) 
     * This function should never be called for MSI(X) interrupts

     * because deassertion never required for message interrupts

     */

    assert(!s->msi_used || !msi_enabled(d));

    assert(!msi_enabled(d));



    VMW_IRPRN("Deasserting line for interrupt %u", lidx);

    pci_irq_deassert(d);
@@ -427,7 +425,7 @@ static void vmxnet3_trigger_interrupt(VMXNET3State *s, int lidx) 
        goto do_automask;

    }



    if (s->msi_used && msi_enabled(d) && s->auto_int_masking) {

    if (msi_enabled(d) && s->auto_int_masking) {

        goto do_automask;

    }
@@ -1425,8 +1423,8 @@ static void vmxnet3_update_features(VMXNET3State *s) 


static bool vmxnet3_verify_intx(VMXNET3State *s, int intx)

{

    return s->msix_used || s->msi_used || (intx ==

           (pci_get_byte(s->parent_obj.config + PCI_INTERRUPT_PIN) - 1));

    return s->msix_used || msi_enabled(PCI_DEVICE(s))

        || intx == pci_get_byte(s->parent_obj.config + PCI_INTERRUPT_PIN) - 1;

}



static void vmxnet3_validate_interrupt_idx(bool is_msix, int idx)
@@ -2221,10 +2219,8 @@ vmxnet3_cleanup_msi(VMXNET3State *s) 
{

    PCIDevice *d = PCI_DEVICE(s);



    if (s->msi_used) {

    msi_uninit(d);

}

}



static void

vmxnet3_msix_save(QEMUFile *f, void *opaque)
@@ -2314,7 +2310,6 @@ static void vmxnet3_pci_realize(PCIDevice *pci_dev, Error **errp) 
    /* Any error other than -ENOTSUP(board's MSI support is broken)

     * is a programming error. Fall back to INTx silently on -ENOTSUP */

    assert(!ret || ret == -ENOTSUP);

    s->msi_used = !ret;



    if (!vmxnet3_init_msix(s)) {

        VMW_WRPRN("Failed to initialize MSI-X, configuration is inconsistent.");