From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bK72n-0003cg-EE for qemu-devel@nongnu.org; Mon, 04 Jul 2016 12:48:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bK72l-0002nG-Er for qemu-devel@nongnu.org; Mon, 04 Jul 2016 12:48:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37878) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bK72l-0002nB-6k for qemu-devel@nongnu.org; Mon, 04 Jul 2016 12:48:23 -0400 Date: Mon, 4 Jul 2016 19:48:18 +0300 From: "Michael S. Tsirkin" Message-ID: <20160704194818-mutt-send-email-mst@redhat.com> References: <1467650742-17580-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1467650742-17580-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 33/36] mptsas: remove unnecessary internal msi state flag 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 , Paolo Bonzini From: Cao jin internal flag msi_in_use in unnecessary, msi_uninit() could be called directly, and msi_enabled() is enough to check device msi state. cc: Markus Armbruster cc: Marcel Apfelbaum cc: Paolo Bonzini cc: Michael S. Tsirkin Reviewed-by: Markus Armbruster Signed-off-by: Cao jin Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/scsi/mptsas.h | 2 -- hw/scsi/mptsas.c | 18 ++++++------------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/hw/scsi/mptsas.h b/hw/scsi/mptsas.h index 0436a33..da014a3 100644 --- a/hw/scsi/mptsas.h +++ b/hw/scsi/mptsas.h @@ -31,8 +31,6 @@ struct MPTSASState { OnOffAuto msi; uint64_t sas_addr; - bool msi_in_use; - /* Doorbell register */ uint32_t state; uint8_t who_init; diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index bb056c4..1ae32fb 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -63,7 +63,7 @@ static void mptsas_update_interrupt(MPTSASState *s) PCIDevice *pci = (PCIDevice *) s; uint32_t state = s->intr_status & ~(s->intr_mask | MPI_HIS_IOP_DOORBELL_STATUS); - if (s->msi_in_use && msi_enabled(pci)) { + if (msi_enabled(pci)) { if (state) { trace_mptsas_irq_msi(s); msi_notify(pci, 0); @@ -1289,15 +1289,12 @@ static void mptsas_scsi_init(PCIDevice *dev, Error **errp) error_append_hint(&err, "You have to use msi=auto (default) or " "msi=off with this machine type.\n"); error_propagate(errp, err); - s->msi_in_use = false; return; - } else if (ret) { - /* With msi=auto, we fall back to MSI off silently */ - error_free(err); - s->msi_in_use = false; - } else { - s->msi_in_use = true; } + assert(!err || s->msi == ON_OFF_AUTO_AUTO); + /* With msi=auto, we fall back to MSI off silently */ + error_free(err); + } memory_region_init_io(&s->mmio_io, OBJECT(s), &mptsas_mmio_ops, s, @@ -1337,9 +1334,7 @@ static void mptsas_scsi_uninit(PCIDevice *dev) MPTSASState *s = MPT_SAS(dev); qemu_bh_delete(s->request_bh); - if (s->msi_in_use) { - msi_uninit(dev); - } + msi_uninit(dev); } static void mptsas_reset(DeviceState *dev) @@ -1375,7 +1370,6 @@ static const VMStateDescription vmstate_mptsas = { .post_load = mptsas_post_load, .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, MPTSASState), - VMSTATE_BOOL(msi_in_use, MPTSASState), VMSTATE_UINT32(state, MPTSASState), VMSTATE_UINT8(who_init, MPTSASState), -- MST