[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 14/15] mptsas: remove unnecessary internal msi st
From: |
Cao jin |
Subject: |
[Qemu-devel] [PATCH v7 14/15] mptsas: remove unnecessary internal msi state flag |
Date: |
Mon, 6 Jun 2016 16:01:01 +0800 |
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 <address@hidden>
cc: Marcel Apfelbaum <address@hidden>
cc: Paolo Bonzini <address@hidden>
cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Cao jin <address@hidden>
---
hw/scsi/mptsas.c | 18 ++++++------------
hw/scsi/mptsas.h | 2 --
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
index 5bde3cd..249c976 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);
@@ -1290,15 +1290,12 @@ static void mptsas_scsi_realize(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,
@@ -1338,9 +1335,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)
@@ -1376,7 +1371,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),
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;
--
2.1.0
- [Qemu-devel] [PATCH v7 00/15] Add param Error ** for msi_init(), Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 10/15] pci bridge dev: change msi property type, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 01/15] pci core: assert ENOSPC when add capability, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 02/15] fix some coding style problems, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 06/15] usb xhci: change msi/msix property type, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 08/15] mptsas: change msi property type, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 04/15] megasas: Fix check for msi_init() failure, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 14/15] mptsas: remove unnecessary internal msi state flag,
Cao jin <=
- [Qemu-devel] [PATCH v7 03/15] change pvscsi_init_msi() type to void, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 07/15] intel-hda: change msi property type, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 05/15] mptsas: change .realize function name, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 15/15] vmw_pvscsi: remove unnecessary internal msi state flag, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 12/15] pci: Convert msi_init() to Error and fix callers to check it, Cao jin, 2016/06/06