Message ID | 20181213145445.17935-7-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 4dbf209d424e234bdb45af2709fa9e4f6a2df8c0 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp894878ljp; Thu, 13 Dec 2018 06:55:19 -0800 (PST) X-Google-Smtp-Source: AFSGD/XgqaKFFb95GK+QUmTwy0CvaJCbjrStetmY1m5jm5xx9iXRp8tVCjSSrzUH+txVCH8wVD7G X-Received: by 2002:ac8:892:: with SMTP id v18mr23796653qth.297.1544712919536; Thu, 13 Dec 2018 06:55:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544712919; cv=none; d=google.com; s=arc-20160816; b=JN5H1sQGqkFysDQTfq7y0OST0D/a7HZOlckSoB78/CEDaJwd9PcBNOEBDzVSpfw+GM wzA9f11qH3DUFVZOoN6HOHm5Yimyiunf/3RPEYOrClo374Frp5e8IX/Hm+egHSzkowVR mSNIyEF15uMyFkus8j2t3OnM3tqI73r+Et6FrgwmC3KG9NBPCPhdvCxoSRITE0sUk7aX 6u82BrlEDffZWW6vQMRHzHhhHWlBoU9Ag886P2HgUTY4MOJfbEWEWlU16cbs3XFwp469 mxnGfBKoUxtw+8CORfrS4IhlWxLSy4X8fZR/rc/jwsNV6Am2p7e1cI/HVzaLqmLIyIsC Qe+g== 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=8NfuPQQf5LLxQUgZx02cM4vl9TSzH4yyUbLPCQ6m1cg=; b=SJx38XC4jc9Af/7vC86tTprvXgg64Do61ztMXN+W3W7EX2+SMNGiFFiZ8PSLrfWBDd /oilvK32zLgl7OJxlaQ3URMxLFeL267DU1a4+DXKwVTZhJsnL9OCXyjNetGEpNVRxcuy iMJYCm1tRLdwzXBzjltUeSlLBdqN3YEv7hHBLxFvq9Iv5GeGXIWGGtLyOWXIX24T+36O josDEiyvxiTKIjNsK0lT6lypCseT1+duQ9+b4XC+x0yhsGUADxxKomWm7mwrv35Alrom oOKqnh/xxcd8chZTHcckvf3INjCCRgwyUP5ymBcw3FA5oK0xzzTXf2W0miUIVI0H6jKM 9zmA== 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 p27si1043342qvf.190.2018.12.13.06.55.19 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 06:55:19 -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]:53063 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gXSOU-000425-Vy for patch@linaro.org; Thu, 13 Dec 2018 09:55:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSO4-0003z7-JJ for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:54:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSO3-00072y-DW for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:54:52 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:53504) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSO3-0006w2-30 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:54:51 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1gXSO1-0007GM-65 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 14:54:49 +0000 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 14:54:14 +0000 Message-Id: <20181213145445.17935-7-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 06/37] core/empty_slot: 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/core/empty_slot.c b/hw/core/empty_slot.c index c1b9c2b1041..239f78e2a77 100644 --- a/hw/core/empty_slot.c +++ b/hw/core/empty_slot.c @@ -71,21 +71,20 @@ void empty_slot_init(hwaddr addr, uint64_t slot_size) } } -static int empty_slot_init1(SysBusDevice *dev) +static void empty_slot_realize(DeviceState *dev, Error **errp) { EmptySlot *s = EMPTY_SLOT(dev); memory_region_init_io(&s->iomem, OBJECT(s), &empty_slot_ops, s, "empty-slot", s->size); - sysbus_init_mmio(dev, &s->iomem); - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); } static void empty_slot_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); - k->init = empty_slot_init1; + dc->realize = empty_slot_realize; } static const TypeInfo empty_slot_info = {