[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 40/47] megasas: undo the overwrites of msi user confi
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 40/47] megasas: undo the overwrites of msi user configuration |
Date: |
Thu, 10 Nov 2016 18:14:20 +0200 |
From: Cao jin <address@hidden>
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>
Acked-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <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,
--
MST
- [Qemu-devel] [PULL 29/47] nvdimm acpi: define DSM return codes, (continued)
- [Qemu-devel] [PULL 29/47] nvdimm acpi: define DSM return codes, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 30/47] nvdimm acpi: fix two comments, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 31/47] nvdimm acpi: rename nvdimm_dsm_reserved_root, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 32/47] nvdimm acpi: use aml_name_decl to define named object, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 33/47] nvdimm acpi: introduce NVDIMM_DSM_MEMORY_SIZE, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 34/47] msix: Follow CODING_STYLE, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 35/47] hcd-xhci: check & correct param before using it, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 38/47] hcd-xhci: change behaviour of msix switch, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 37/47] megasas: change behaviour of msix switch, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 40/47] megasas: undo the overwrites of msi user configuration,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 36/47] pci: Convert msix_init() to Error and fix callers to check it, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 39/47] megasas: remove unnecessary megasas_use_msix(), Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 42/47] vmxnet3: remove unnecessary internal msix flag, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 41/47] vmxnet3: fix reference leak issue, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 43/47] msi_init: convert assert to return -errno, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 45/47] vhost: drop legacy vring layout bits, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 44/47] vhost: adapt vhost_verify_ring_mappings() to virtio 1 ring layout, Michael S. Tsirkin, 2016/11/10