pci: Merge pci_nic_init() into pci_nic_init_nofail()
commit51f7cb974ba1af9f68302f2bae4bf0161fb0ab03
authorThomas Huth <thuth@redhat.com>
Tue, 28 Apr 2015 10:50:07 +0000 (28 12:50 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Tue, 28 Apr 2015 15:42:56 +0000 (28 17:42 +0200)
treed9007ce9a960ff05e1634441be560b978f5a2b62
parent7824df3889499acc7466317175a3fb24a0824002
pci: Merge pci_nic_init() into pci_nic_init_nofail()

The error reporting in pci_nic_init() is quite erratic: Some errors
are printed directly with error_report(), and some are passed back
to the caller pci_nic_init_nofail() via an Error pointer.
Since pci_nic_init() is only used by pci_nic_init_nofail(), the
functions can be simply merged to clean up this inconsistency.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
hw/pci/pci.c