From patchwork Thu Dec 13 14:54:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 153682 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp927527ljp; Thu, 13 Dec 2018 07:22:14 -0800 (PST) X-Google-Smtp-Source: AFSGD/Uz/z89AkDJogONSEFu/6fhqFtuy7dLTkjUl7Rqsjjg2OA0seemMHXYzqWXShaEYpq1T1zM X-Received: by 2002:ac8:31ed:: with SMTP id i42mr23747309qte.323.1544714533933; Thu, 13 Dec 2018 07:22:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544714533; cv=none; d=google.com; s=arc-20160816; b=Pw2L9apsbXXeyHCXHvh2j+jYsxbbVZz6hzbD21GCkEYyEuO0Ikk/XiF+Q74UAfMUeL 7HaaWQ2XVZmama41gSyQKNMz/nbZ8Nrqc6po6zUUQjMdYiSytck95d5R0usM1Xq0Nnj0 K3EMTFzNnhuNtPKjZgOSCw2DlqL6tCxWlDQtFTfc7Iuh4oFGaWr/7jzX3FEfdYd2XoRs 5dFVo4vEH+UArJpg5QpnbFBql0i9miJsR104dLjaG81I03gJkRHl3g7E1r7YntHimJLN GdocBbrdi8sYsCWVmPaJBeTefyGGNFKnUJdRMb3X3MhbNWpZntUhDpT5hVHIRCSowtw+ gj/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=4VehUEAZprzH67BsV4OIm0Vb7ao/w7+9683Vu9KFNng=; b=029fNcPh3cZKvWbUaUyebbyuIWyBJU3PmurRw1wxuxPneMPkeeiB83iNBfNn0RL0UB tyAVLTyK/0wHvFrtNSExsWMSLWgBRAGWoH3+r+pzZnvEuFymMEXD/7dTwsPECiY8HZe0 e1I2+RXU3eiewDzxCr/yuI6vVohYfzkCoOHUCXc0M10c7jHkh5rsTXJf1A8jPXUijHdS ru7ujPLsfJucfoGvjFUNbdDtY277jCemND3LVt+UGuUas5FMs+poLo74U57yCSAa/JMO 4Um3TkBNipnMAfAOX82VCiwnp7VPU53hymkLnQbYUGv8+PsU/1buDCJpIz8dUpmACg6a Ke8w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e56si1238256qtc.139.2018.12.13.07.22.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 07:22:13 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53220 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXSoX-0002eO-8M for patch@linaro.org; Thu, 13 Dec 2018 10:22:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXSPS-0005MZ-CR for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:56:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXSPR-0000eo-FI for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:56:18 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:53510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXSPR-000747-6p for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:56:17 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gXSO7-0007JI-AW for qemu-devel@nongnu.org; Thu, 13 Dec 2018 14:54:55 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 14:54:25 +0000 Message-Id: <20181213145445.17935-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181213145445.17935-1-peter.maydell@linaro.org> References: <20181213145445.17935-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 17/37] pci-bridge/dec: Convert sysbus init function to realize function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Mao Zhongyi Use DeviceClass rather than SysBusDeviceClass in pci_dec_21154_device_class_init(). Cc: david@gibson.dropbear.id.au Cc: mst@redhat.com Cc: marcel.apfelbaum@gmail.com Cc: qemu-ppc@nongnu.org Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju Reviewed-by: David Gibson Acked-by: David Gibson Message-id: 20181130093852.20739-16-maozhongyi@cmss.chinamobile.com Signed-off-by: Peter Maydell --- hw/pci-bridge/dec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.19.2 diff --git a/hw/pci-bridge/dec.c b/hw/pci-bridge/dec.c index 84492d5e5f9..8484bfd4345 100644 --- a/hw/pci-bridge/dec.c +++ b/hw/pci-bridge/dec.c @@ -98,9 +98,10 @@ PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int devfn) return pci_bridge_get_sec_bus(br); } -static int pci_dec_21154_device_init(SysBusDevice *dev) +static void pci_dec_21154_device_realize(DeviceState *dev, Error **errp) { PCIHostState *phb; + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); phb = PCI_HOST_BRIDGE(dev); @@ -108,9 +109,8 @@ static int pci_dec_21154_device_init(SysBusDevice *dev) dev, "pci-conf-idx", 0x1000); memory_region_init_io(&phb->data_mem, OBJECT(dev), &pci_host_data_le_ops, dev, "pci-data-idx", 0x1000); - sysbus_init_mmio(dev, &phb->conf_mem); - sysbus_init_mmio(dev, &phb->data_mem); - return 0; + sysbus_init_mmio(sbd, &phb->conf_mem); + sysbus_init_mmio(sbd, &phb->data_mem); } static void dec_21154_pci_host_realize(PCIDevice *d, Error **errp) @@ -150,9 +150,9 @@ static const TypeInfo dec_21154_pci_host_info = { static void pci_dec_21154_device_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); - sdc->init = pci_dec_21154_device_init; + dc->realize = pci_dec_21154_device_realize; } static const TypeInfo pci_dec_21154_device_info = {