[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 08/11] mptsas: change msi property type
From: |
Cao jin |
Subject: |
[Qemu-devel] [PATCH v6 08/11] mptsas: change msi property type |
Date: |
Tue, 24 May 2016 12:04:46 +0800 |
>From uint32 to enum OnOffAuto, and give it a shorter name.
cc: Paolo Bonzini <address@hidden>
cc: Michael S. Tsirkin <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>
Signed-off-by: Cao jin <address@hidden>
---
hw/scsi/mptsas.c | 4 ++--
hw/scsi/mptsas.h | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
index 1c18c84..afee576 100644
--- a/hw/scsi/mptsas.c
+++ b/hw/scsi/mptsas.c
@@ -1285,7 +1285,7 @@ static void mptsas_scsi_realize(PCIDevice *dev, Error
**errp)
memory_region_init_io(&s->diag_io, OBJECT(s), &mptsas_diag_ops, s,
"mptsas-diag", 0x10000);
- if (s->msi_available &&
+ if ((s->msi == ON_OFF_AUTO_AUTO || s->msi == ON_OFF_AUTO_ON) &&
msi_init(dev, 0, 1, true, false) >= 0) {
s->msi_in_use = true;
}
@@ -1404,7 +1404,7 @@ static const VMStateDescription vmstate_mptsas = {
static Property mptsas_properties[] = {
DEFINE_PROP_UINT64("sas_address", MPTSASState, sas_addr, 0),
/* TODO: test MSI support under Windows */
- DEFINE_PROP_BIT("msi", MPTSASState, msi_available, 0, true),
+ DEFINE_PROP_ON_OFF_AUTO("msi", MPTSASState, msi, ON_OFF_AUTO_AUTO),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/scsi/mptsas.h b/hw/scsi/mptsas.h
index 595f81f..0436a33 100644
--- a/hw/scsi/mptsas.h
+++ b/hw/scsi/mptsas.h
@@ -27,7 +27,8 @@ struct MPTSASState {
MemoryRegion diag_io;
QEMUBH *request_bh;
- uint32_t msi_available;
+ /* properties */
+ OnOffAuto msi;
uint64_t sas_addr;
bool msi_in_use;
--
2.1.0
- [Qemu-devel] [PATCH v6 00/11] Add param Error ** for msi_init(), Cao jin, 2016/05/24
- [Qemu-devel] [PATCH v6 02/11] fix some coding style problems, Cao jin, 2016/05/24
- [Qemu-devel] [PATCH v6 01/11] pci core: assert ENOSPC when add capability, Cao jin, 2016/05/24
- [Qemu-devel] [PATCH v6 04/11] megasas: Fix, Cao jin, 2016/05/24
- [Qemu-devel] [PATCH v6 10/11] pci bridge dev: change msi property type, Cao jin, 2016/05/24
- [Qemu-devel] [PATCH v6 03/11] change pvscsi_init_msi() type to void, Cao jin, 2016/05/24
- [Qemu-devel] [PATCH v6 09/11] megasas: change msi/msix property type, Cao jin, 2016/05/24
- [Qemu-devel] [PATCH v6 08/11] mptsas: change msi property type,
Cao jin <=
- [Qemu-devel] [PATCH v6 05/11] mptsas: change .realize function name, Cao jin, 2016/05/24
- [Qemu-devel] [PATCH v6 11/11] pci: Convert msi_init() to Error and fix callers to check it, Cao jin, 2016/05/24
- [Qemu-devel] [PATCH v6 06/11] usb xhci: change msi/msix property type, Cao jin, 2016/05/24
- [Qemu-devel] [PATCH v6 07/11] intel-hda: change msi property type, Cao jin, 2016/05/24
- Re: [Qemu-devel] [PATCH v6 00/11] Add param Error ** for msi_init(), Cao jin, 2016/05/31