Message ID | 20181213145445.17935-16-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 96cd4594989940852eb4aa91e6d3f8e777c98f42 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp928107ljp; Thu, 13 Dec 2018 07:22:42 -0800 (PST) X-Google-Smtp-Source: AFSGD/VWAY4PudPiMN8255sOuqH1l0qH/szb1bKXoK8xorxrZF5ZmZbVEtsQbZeidNMEr7EKT0b2 X-Received: by 2002:ac8:13c5:: with SMTP id i5mr24602099qtj.365.1544714562697; Thu, 13 Dec 2018 07:22:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544714562; cv=none; d=google.com; s=arc-20160816; b=Mxs3KylwhsDx/4ZEAwToSLRuw30mG40S8ZgsoFTpEJaMzPa2ByqyCG9GZ+cb/dX8/U Tnuk15X1HlS5iql/G8eS2HI5R4CgjFk/8XTtRQQyE3e8fehQq7/Slr7zV1VaYHR2vls5 KJwEp4UDvWNsai2U9Xkpyq1vB2Jk6Uu5wlFmCe4W7ft49p9OQfXyRpI1FRFViWZpoEeo Z4O0V+OymAlzcCxux/pHCLsjfXzps8JyNvoaS2RRr+GE9y+i/0exb+rP3B2kdRXE14U7 z+qEfP/yZ4/wPvtEAwSgKhdHql9Oin5Rin7+IX1omkBgJNIyHXO8l13sUwC3+UdBKMWo YTzw== 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=AYiLijUzs5+ibqmU6j0YVZs6cke6g2Cdh6InunnZj5g=; b=HIUr4VtJyWewLLlqEWhUdeFBvFFLTF3zus4iqkM0iFQScvLfHFzK83G7CKkW3uejza s9MjKOufokrM0rHrupaKaNcwIzguFMN1wdQhl7gPIZqVjWDIGTJodEkv6BODI4maz6jm CI35oj6DWl95hcYXWVAw3CPQPggT4+PYcuv6Q7pPHgnF0E3/FHzkEgUO2EasePfhyTdK MtglYAorCDRHpW9x2OoBMtlKh3y0RA1LBtIRXs0wgdgq3jXKrHKL+KpH7x3ASCLGRicS 4n3I2+02U1Lyt2XO+P1mvdwRgTm+N59I0IT2Je3Rir0B+mFEn7FjibnrcpMA/KjoNr+F K7bg== 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o7si849550qti.38.2018.12.13.07.22.42 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 07:22:42 -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]:53227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gXSp0-0003tl-3Z for patch@linaro.org; Thu, 13 Dec 2018 10:22:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSPU-0005Or-FM for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:56:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSPT-0000in-K5 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:56:20 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:53512) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSPT-0007J5-9b for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:56:19 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1gXSO6-0007Iq-AW for qemu-devel@nongnu.org; Thu, 13 Dec 2018 14:54:54 +0000 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 14:54:23 +0000 Message-Id: <20181213145445.17935-16-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 15/37] puv3_pm.c: Convert sysbus init function to realize function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/hw/misc/puv3_pm.c b/hw/misc/puv3_pm.c index 577cebaac78..afe191fbe1f 100644 --- a/hw/misc/puv3_pm.c +++ b/hw/misc/puv3_pm.c @@ -119,7 +119,7 @@ static const MemoryRegionOps puv3_pm_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int puv3_pm_init(SysBusDevice *dev) +static void puv3_pm_realize(DeviceState *dev, Error **errp) { PUV3PMState *s = PUV3_PM(dev); @@ -127,16 +127,14 @@ static int puv3_pm_init(SysBusDevice *dev) memory_region_init_io(&s->iomem, OBJECT(s), &puv3_pm_ops, s, "puv3_pm", PUV3_REGS_OFFSET); - sysbus_init_mmio(dev, &s->iomem); - - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); } static void puv3_pm_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); - sdc->init = puv3_pm_init; + dc->realize = puv3_pm_realize; } static const TypeInfo puv3_pm_info = {