megasas: remove unnecessary megasas_use_msi()
megasas overwrites user configuration when msi_init fail to flag internal msi state, which is unsuitable. megasa_use_msi() is unnecessary, we can call msi_uninit() directly when unrealize, even no need to call msi_enabled() first. cc: Hannes Reinecke <hare@suse.de> cc: Paolo Bonzini <pbonzini@redhat.com> cc: Markus Armbruster <armbru@redhat.com> cc: Marcel Apfelbaum <marcel@redhat.com> cc: Michael S. Tsirkin <mst@redhat.com> Acked-by: Hannes Reinecke <hare@suse.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
1108b2f8a9
commit
afea4e1410
|
@ -155,11 +155,6 @@ static bool megasas_use_queue64(MegasasState *s)
|
||||||
return s->flags & MEGASAS_MASK_USE_QUEUE64;
|
return s->flags & MEGASAS_MASK_USE_QUEUE64;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool megasas_use_msi(MegasasState *s)
|
|
||||||
{
|
|
||||||
return s->msi != ON_OFF_AUTO_OFF;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool megasas_use_msix(MegasasState *s)
|
static bool megasas_use_msix(MegasasState *s)
|
||||||
{
|
{
|
||||||
return s->msix != ON_OFF_AUTO_OFF;
|
return s->msix != ON_OFF_AUTO_OFF;
|
||||||
|
@ -2307,9 +2302,7 @@ static void megasas_scsi_uninit(PCIDevice *d)
|
||||||
if (megasas_use_msix(s)) {
|
if (megasas_use_msix(s)) {
|
||||||
msix_uninit(d, &s->mmio_io, &s->mmio_io);
|
msix_uninit(d, &s->mmio_io, &s->mmio_io);
|
||||||
}
|
}
|
||||||
if (megasas_use_msi(s)) {
|
msi_uninit(d);
|
||||||
msi_uninit(d);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct SCSIBusInfo megasas_scsi_info = {
|
static const struct SCSIBusInfo megasas_scsi_info = {
|
||||||
|
@ -2340,7 +2333,7 @@ static void megasas_scsi_realize(PCIDevice *dev, Error **errp)
|
||||||
/* Interrupt pin 1 */
|
/* Interrupt pin 1 */
|
||||||
pci_conf[PCI_INTERRUPT_PIN] = 0x01;
|
pci_conf[PCI_INTERRUPT_PIN] = 0x01;
|
||||||
|
|
||||||
if (megasas_use_msi(s)) {
|
if (s->msi != ON_OFF_AUTO_OFF) {
|
||||||
ret = msi_init(dev, 0x50, 1, true, false, &err);
|
ret = msi_init(dev, 0x50, 1, true, false, &err);
|
||||||
/* Any error other than -ENOTSUP(board's MSI support is broken)
|
/* Any error other than -ENOTSUP(board's MSI support is broken)
|
||||||
* is a programming error */
|
* is a programming error */
|
||||||
|
|
Loading…
Reference in a new issue