[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 13/13] vmw_pvscsi: remove unnecessary internal ms
From: |
Cao jin |
Subject: |
[Qemu-devel] [PATCH v9 13/13] vmw_pvscsi: remove unnecessary internal msi state flag |
Date: |
Mon, 20 Jun 2016 14:13:44 +0800 |
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 <address@hidden>
cc: Dmitry Fleytman <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>
cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Cao jin <address@hidden>
---
hw/scsi/vmw_pvscsi.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
index ecd6077..da71c8c 100644
--- a/hw/scsi/vmw_pvscsi.c
+++ b/hw/scsi/vmw_pvscsi.c
@@ -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,9 +1076,7 @@ pvscsi_cleanup_msi(PVSCSIState *s)
{
PCIDevice *d = PCI_DEVICE(s);
- if (s->msi_used) {
- msi_uninit(d);
- }
+ msi_uninit(d);
}
static const MemoryRegionOps pvscsi_ops = {
--
2.1.0
- [Qemu-devel] [PATCH v9 00/13] Add param Error ** for msi_init()--part2, Cao jin, 2016/06/20
- [Qemu-devel] [PATCH v9 05/13] mptsas: change msi property type, Cao jin, 2016/06/20
- [Qemu-devel] [PATCH v9 07/13] pci bridge dev: change msi property type, Cao jin, 2016/06/20
- [Qemu-devel] [PATCH v9 04/13] intel-hda: change msi property type, Cao jin, 2016/06/20
- [Qemu-devel] [PATCH v9 01/13] change pvscsi_init_msi() type to void, Cao jin, 2016/06/20
- [Qemu-devel] [PATCH v9 02/13] mptsas: change .realize function name, Cao jin, 2016/06/20
- [Qemu-devel] [PATCH v9 06/13] megasas: change msi/msix property type, Cao jin, 2016/06/20
- [Qemu-devel] [PATCH v9 10/13] mptsas: remove unnecessary internal msi state flag, Cao jin, 2016/06/20
- [Qemu-devel] [PATCH v9 03/13] usb xhci: change msi/msix property type, Cao jin, 2016/06/20
- [Qemu-devel] [PATCH v9 13/13] vmw_pvscsi: remove unnecessary internal msi state flag,
Cao jin <=
- [Qemu-devel] [PATCH v9 12/13] e1000e: remove unnecessary internal msi state flag, Cao jin, 2016/06/20
- [Qemu-devel] [PATCH v9 11/13] vmxnet3: remove unnecessary internal msi state flag, Cao jin, 2016/06/20
- [Qemu-devel] [PATCH v9 09/13] megasas: remove unnecessary megasas_use_msi(), Cao jin, 2016/06/20
- [Qemu-devel] [PATCH v9 08/13] pci: Convert msi_init() to Error and fix callers to check it, Cao jin, 2016/06/20
- Re: [Qemu-devel] [PATCH v9 00/13] Add param Error ** for msi_init()--part2, Cao jin, 2016/06/28