On 01/17/2017 07:18 AM, Cao jin wrote: > Commit afea4e14 seems forgetting to undo the overwrites, which is > unsuitable. > > CC: Hannes Reinecke <[email protected]> > CC: Paolo Bonzini <[email protected]> > CC: Markus Armbruster <[email protected]> > CC: Marcel Apfelbaum <[email protected]> > CC: Michael S. Tsirkin <[email protected]> > > Reviewed-by: Markus Armbruster <[email protected]> > Acked-by: Marcel Apfelbaum <[email protected]> > Signed-off-by: Cao jin <[email protected]> > --- > 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, > Reviewed-by: Hannes Reinecke <[email protected]>
Cheers, Hannes -- Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG Nürnberg)
