[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 07/10] megasas: undo the overwrites of msi user c
From: |
Cao jin |
Subject: |
[Qemu-devel] [PATCH v6 07/10] megasas: undo the overwrites of msi user configuration |
Date: |
Sat, 5 Nov 2016 10:07:26 +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>
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 ba79e7a..bbef9e9 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -2337,11 +2337,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
- [Qemu-devel] [PATCH v6 00/10] Convert msix_init() to error, Cao jin, 2016/11/04
- [Qemu-devel] [PATCH v6 02/10] hcd-xhci: check & correct param before using it, Cao jin, 2016/11/04
- [Qemu-devel] [PATCH v6 01/10] msix: Follow CODING_STYLE, Cao jin, 2016/11/04
- [Qemu-devel] [PATCH v6 10/10] msi_init: convert assert to return -errno, Cao jin, 2016/11/04
- [Qemu-devel] [PATCH v6 07/10] megasas: undo the overwrites of msi user configuration,
Cao jin <=
- [Qemu-devel] [PATCH v6 08/10] vmxnet3: fix reference leak issue, Cao jin, 2016/11/04
- [Qemu-devel] [PATCH v6 04/10] megasas: change behaviour of msix switch, Cao jin, 2016/11/04
- [Qemu-devel] [PATCH v6 05/10] hcd-xhci: change behaviour of msix switch, Cao jin, 2016/11/04
- [Qemu-devel] [PATCH v6 09/10] vmxnet3: remove unnecessary internal msix flag, Cao jin, 2016/11/04
- [Qemu-devel] [PATCH v6 06/10] megasas: remove unnecessary megasas_use_msix(), Cao jin, 2016/11/04
- [Qemu-devel] [PATCH v6 03/10] pci: Convert msix_init() to Error and fix callers to check it, Cao jin, 2016/11/04
- Re: [Qemu-devel] [PATCH v6 00/10] Convert msix_init() to error, Marcel Apfelbaum, 2016/11/09
- Re: [Qemu-devel] [PATCH v6 00/10] Convert msix_init() to error, Michael S. Tsirkin, 2016/11/11