| Message ID | 1466403224-16604-3-git-send-email-caoj.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
Hi, I guess this one is suitable for trivial tree, so CC them On 06/20/2016 02:13 PM, Cao jin wrote: > All the other devices` .realize function name are xxx_realize, except this one. > > cc: Michael S. Tsirkin <mst@redhat.com> > cc: Marcel Apfelbaum <marcel@redhat.com> > cc: Paolo Bonzini <pbonzini@redhat.com> > cc: Markus Armbruster <armbru@redhat.com> > > Reviewed-by: Markus Armbruster <armbru@redhat.com> > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> > Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> > --- > hw/scsi/mptsas.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c > index be88e16..ae8514e 100644 > --- a/hw/scsi/mptsas.c > +++ b/hw/scsi/mptsas.c > @@ -1269,7 +1269,7 @@ static const struct SCSIBusInfo mptsas_scsi_info = { > .load_request = mptsas_load_request, > }; > > -static void mptsas_scsi_init(PCIDevice *dev, Error **errp) > +static void mptsas_scsi_realize(PCIDevice *dev, Error **errp) > { > DeviceState *d = DEVICE(dev); > MPTSASState *s = MPT_SAS(dev); > @@ -1412,7 +1412,7 @@ static void mptsas1068_class_init(ObjectClass *oc, void *data) > DeviceClass *dc = DEVICE_CLASS(oc); > PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc); > > - pc->realize = mptsas_scsi_init; > + pc->realize = mptsas_scsi_realize; > pc->exit = mptsas_scsi_uninit; > pc->romfile = 0; > pc->vendor_id = PCI_VENDOR_ID_LSI_LOGIC; >
20.06.2016 09:13, Cao jin wrote: > All the other devices` .realize function name are xxx_realize, except this one. Applied to -trivial, thanks! /mjt > cc: Michael S. Tsirkin <mst@redhat.com> > cc: Marcel Apfelbaum <marcel@redhat.com> > cc: Paolo Bonzini <pbonzini@redhat.com> > cc: Markus Armbruster <armbru@redhat.com> > > Reviewed-by: Markus Armbruster <armbru@redhat.com> > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> > Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> > --- > hw/scsi/mptsas.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c > index be88e16..ae8514e 100644 > --- a/hw/scsi/mptsas.c > +++ b/hw/scsi/mptsas.c > @@ -1269,7 +1269,7 @@ static const struct SCSIBusInfo mptsas_scsi_info = { > .load_request = mptsas_load_request, > }; > > -static void mptsas_scsi_init(PCIDevice *dev, Error **errp) > +static void mptsas_scsi_realize(PCIDevice *dev, Error **errp) > { > DeviceState *d = DEVICE(dev); > MPTSASState *s = MPT_SAS(dev); > @@ -1412,7 +1412,7 @@ static void mptsas1068_class_init(ObjectClass *oc, void *data) > DeviceClass *dc = DEVICE_CLASS(oc); > PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc); > > - pc->realize = mptsas_scsi_init; > + pc->realize = mptsas_scsi_realize; > pc->exit = mptsas_scsi_uninit; > pc->romfile = 0; > pc->vendor_id = PCI_VENDOR_ID_LSI_LOGIC; >
diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index be88e16..ae8514e 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -1269,7 +1269,7 @@ static const struct SCSIBusInfo mptsas_scsi_info = { .load_request = mptsas_load_request, }; -static void mptsas_scsi_init(PCIDevice *dev, Error **errp) +static void mptsas_scsi_realize(PCIDevice *dev, Error **errp) { DeviceState *d = DEVICE(dev); MPTSASState *s = MPT_SAS(dev); @@ -1412,7 +1412,7 @@ static void mptsas1068_class_init(ObjectClass *oc, void *data) DeviceClass *dc = DEVICE_CLASS(oc); PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc); - pc->realize = mptsas_scsi_init; + pc->realize = mptsas_scsi_realize; pc->exit = mptsas_scsi_uninit; pc->romfile = 0; pc->vendor_id = PCI_VENDOR_ID_LSI_LOGIC;