[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 07/11] megasas: undo the overwrites of msi user c
From: |
Cao jin |
Subject: |
[Qemu-devel] [PATCH v9 07/11] megasas: undo the overwrites of msi user configuration |
Date: |
Tue, 17 Jan 2017 14:18:52 +0800 |
Commit afea4e14 seems forgetting to undo the overwrites, which is
unsuitable.
CC: Hannes Reinecke <address@hidden>
CC: Paolo Bonzini <address@hidden>
CC: Markus Armbruster <address@hidden>
CC: Marcel Apfelbaum <address@hidden>
CC: Michael S. Tsirkin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Acked-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Cao jin <address@hidden>
---
hw/scsi/megasas.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 14d6e0c6d565..c208d520c4df 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -2350,11 +2350,10 @@ static void megasas_scsi_realize(PCIDevice *dev, Error
**errp)
"msi=off with this machine type.\n");
error_propagate(errp, err);
return;
- } else if (ret) {
- /* With msi=auto, we fall back to MSI off silently */
- s->msi = ON_OFF_AUTO_OFF;
- error_free(err);
}
+ assert(!err || s->msix == 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), &megasas_mmio_ops, s,
--
2.1.0
- Re: [Qemu-devel] [PATCH v9 04/11] msix: check msix_init's return value, (continued)
[Qemu-devel] [PATCH v9 03/11] pci: Convert msix_init() to Error and fix callers, Cao jin, 2017/01/17
[Qemu-devel] [PATCH v9 11/11] megasas: remove unnecessary megasas_use_msix(), Cao jin, 2017/01/17
[Qemu-devel] [PATCH v9 09/11] vmxnet3: remove unnecessary internal msix flag, Cao jin, 2017/01/17
[Qemu-devel] [PATCH v9 06/11] hcd-xhci: change behaviour of msix switch, Cao jin, 2017/01/17
[Qemu-devel] [PATCH v9 07/11] megasas: undo the overwrites of msi user configuration,
Cao jin <=
[Qemu-devel] [PATCH v9 08/11] vmxnet3: fix reference leak issue, Cao jin, 2017/01/17
Re: [Qemu-devel] [PATCH v9 00/11] Convert msix_init() to error, Michael S. Tsirkin, 2017/01/24