| Message ID | 1484633936-25344-8-git-send-email-caoj.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/17/2017 07:18 AM, Cao jin wrote: > Commit afea4e14 seems forgetting to undo the overwrites, which is > unsuitable. > > 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> > > Reviewed-by: Markus Armbruster <armbru@redhat.com> > Acked-by: Marcel Apfelbaum <marcel@redhat.com> > Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> > --- > 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 <hare@suse.com> Cheers, Hannes
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,