From fafeb41cd0abac412d7c77da1b680d5df805b454 Mon Sep 17 00:00:00 2001 From: Mao Zhongyi Date: Wed, 26 Jul 2017 16:41:53 +0800 Subject: [PATCH] hw/scsi/vmw_pvscsi: Convert to realize Convert a device model where initialization obviously can't fail, make it implement realize() rather than init(). Reviewed-by: Dmitry Fleytman Cc: Paolo Bonzini Cc: Markus Armbruster Signed-off-by: Mao Zhongyi Message-Id: <20170726084153.10121-2-maozy.fnst@cn.fujitsu.com> Signed-off-by: Paolo Bonzini --- hw/scsi/vmw_pvscsi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index d92973ede1..77d8b6f9e2 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -1103,8 +1103,8 @@ static const struct SCSIBusInfo pvscsi_scsi_info = { .cancel = pvscsi_request_cancelled, }; -static int -pvscsi_init(PCIDevice *pci_dev) +static void +pvscsi_realizefn(PCIDevice *pci_dev, Error **errp) { PVSCSIState *s = PVSCSI(pci_dev); @@ -1144,8 +1144,6 @@ pvscsi_init(PCIDevice *pci_dev) /* override default SCSI bus hotplug-handler, with pvscsi's one */ qbus_set_hotplug_handler(BUS(&s->bus), DEVICE(s), &error_abort); pvscsi_reset_state(s); - - return 0; } static void @@ -1278,7 +1276,7 @@ static void pvscsi_class_init(ObjectClass *klass, void *data) PVSCSIClass *pvs_k = PVSCSI_DEVICE_CLASS(klass); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass); - k->init = pvscsi_init; + k->realize = pvscsi_realizefn; k->exit = pvscsi_uninit; k->vendor_id = PCI_VENDOR_ID_VMWARE; k->device_id = PCI_DEVICE_ID_VMWARE_PVSCSI;