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

vmw_pvscsi: remove unnecessary internal msi state flag 



Internal flag msi_used is uncesessary, msi_uninit() could be called
directly, msi_enabled() is enough to check device msi state.

But for migration compatibility, keep the field in structure.

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>

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>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 66bf7d58

hw/scsi/vmw_pvscsi.c

+3 −6
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ typedef struct { 
    uint8_t msg_ring_info_valid;         /* Whether message ring initialized */

    uint8_t use_msg;                     /* Whether to use message ring      */



    uint8_t msi_used;    /* Whether MSI support was installed successfully   */



    uint8_t msi_used;                    /* For migration compatibility      */

    PVSCSIRingInfo rings;                /* Data transfer rings manager      */

    uint32_t resetting;                  /* Reset in progress                */
@@ -362,7 +361,7 @@ pvscsi_update_irq_status(PVSCSIState *s) 
    trace_pvscsi_update_irq_level(should_raise, s->reg_interrupt_enabled,

                                  s->reg_interrupt_status);



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

    if (msi_enabled(d)) {

        if (should_raise) {

            trace_pvscsi_update_irq_msi();

            msi_notify(d, PVSCSI_VECTOR_COMPLETION);
@@ -1077,10 +1076,8 @@ pvscsi_cleanup_msi(PVSCSIState *s) 
{

    PCIDevice *d = PCI_DEVICE(s);



    if (s->msi_used) {

    msi_uninit(d);

}

}



static const MemoryRegionOps pvscsi_ops = {

        .read = pvscsi_io_read,