Wei Jiangang <weijg.f...@cn.fujitsu.com> writes:
> Signed-off-by: Wei Jiangang <weijg.f...@cn.fujitsu.com>
> Signed-off-by: Cao jin <caoj.f...@cn.fujitsu.com>
> ---
> hw/pci-bridge/pci_expander_bridge.c | 18 +++++-------------
> 1 file changed, 5 insertions(+), 13 deletions(-)
>
> diff --git a/hw/pci-bridge/pci_expander_bridge.c
> b/hw/pci-bridge/pci_expander_bridge.c
> index cc5074d..64267d8 100644
> --- a/hw/pci-bridge/pci_expander_bridge.c
> +++ b/hw/pci-bridge/pci_expander_bridge.c
> @@ -314,22 +314,14 @@ static const TypeInfo pxb_dev_info = {
> .class_init = pxb_dev_class_init,
> };
>
> -static int pxb_pcie_dev_initfn(PCIDevice *dev)
> +static void pxb_pcie_dev_realize(PCIDevice *dev, Error **errp)
> {
> - Error *err = NULL;
> -
> if (!pci_bus_is_express(dev->bus)) {
> - error_report("pxb-pcie devices cannot reside on a PCI bus!");
> - return -EINVAL;
> - }
> -
> - pxb_dev_realize_common(dev, true, &err);
> - if (err) {
> - error_report_err(err);
> - return -EINVAL;
> + error_setg(errp, "pxb-pcie devices cannot reside on a PCI bus!");
Suggest to use the occasion to drop the exclamation mark.
> + return;
> }
>
> - return 0;
> + pxb_dev_realize_common(dev, true, errp);
> }
>
> static void pxb_pcie_dev_class_init(ObjectClass *klass, void *data)
> @@ -337,7 +329,7 @@ static void pxb_pcie_dev_class_init(ObjectClass *klass,
> void *data)
> DeviceClass *dc = DEVICE_CLASS(klass);
> PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
>
> - k->init = pxb_pcie_dev_initfn;
> + k->realize = pxb_pcie_dev_realize;
> k->exit = pxb_dev_exitfn;
> k->vendor_id = PCI_VENDOR_ID_REDHAT;
> k->device_id = PCI_DEVICE_ID_REDHAT_PXB_PCIE;
I'd be tempted to squash PATCH 1-3 together, with only the bug fix from
PATCH 1 (assuming it is a bug fix) separate. Clearly a matter of taste.
