From patchwork Mon Dec 8 23:10:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin O'Connor X-Patchwork-Id: 418905 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AFD821400DE for ; Tue, 9 Dec 2014 10:13:16 +1100 (AEDT) Received: from localhost ([::1]:36562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xy7UQ-0001Fl-Ji for incoming@patchwork.ozlabs.org; Mon, 08 Dec 2014 18:13:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xy7SE-000689-MC for qemu-devel@nongnu.org; Mon, 08 Dec 2014 18:11:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xy7S8-0005wf-Rc for qemu-devel@nongnu.org; Mon, 08 Dec 2014 18:10:58 -0500 Received: from mail-qc0-f175.google.com ([209.85.216.175]:42029) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xy7S8-0005wJ-OX for qemu-devel@nongnu.org; Mon, 08 Dec 2014 18:10:52 -0500 Received: by mail-qc0-f175.google.com with SMTP id b13so4710220qcw.20 for ; Mon, 08 Dec 2014 15:10:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=oSMXeaP9xI1DGFZC56MGyKZV1Dpbv05jCq75qOJaZPc=; b=RMEjkUxG1Dyv0ARk1nja6Ih0NVf3SvGVDopXXfoWgHoKajNpxGKaOVHOAlL6HYes0B rQfYeMeKIC0zZL2ZWCEuyLy9Yd4PWF1HgkK7rDZz6vqu6Hsmq50BE2DQm2pXdSvazrmx vQmBw/RTp/K9aFBCpGdzIKuy2ppDY/QqiAxh26ljSJvH+N3R1V9zeEACvTpzzVHPKvIt 0w8P7TVK3nHhpK/BlHmjyuNYcfgHAsZjEqZPXU8b39HyD+O00Tl4hFpQGOXLRrrjB7zG CeLwMTJakx6umD+IAkFlKOhma4HE5O3l+y4/uy5HzIUciwn0c6ahX4j8SxnN1pc1vP38 gdIg== X-Gm-Message-State: ALoCoQnHzvSeBiOoL9XWUsVqsU9Tg37QW0VQ+tqFVj1Oc7MKqVuwCnXPjYRyPTdbe8I69TkXJMvs X-Received: by 10.140.21.106 with SMTP id 97mr56129657qgk.61.1418080252460; Mon, 08 Dec 2014 15:10:52 -0800 (PST) Received: from localhost (207-172-170-53.c3-0.avec-ubr1.nyr-avec.ny.cable.rcn.com. [207.172.170.53]) by mx.google.com with ESMTPSA id d32sm25566828qgf.28.2014.12.08.15.10.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Dec 2014 15:10:51 -0800 (PST) From: Kevin O'Connor To: qemu-devel@nongnu.org Date: Mon, 8 Dec 2014 18:10:31 -0500 Message-Id: <1418080234-31694-3-git-send-email-kevin@koconnor.net> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1418080234-31694-1-git-send-email-kevin@koconnor.net> References: <1418080234-31694-1-git-send-email-kevin@koconnor.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.216.175 Subject: [Qemu-devel] [PATCHv3 2/5] sdhci: Add "sysbus" to sdhci QOM types and methods X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Update the sdhci sysbus QOM types and methods so that sysbus is in their name. This is in preparation for adding PCI versions of these types and methods. Signed-off-by: Kevin O'Connor --- hw/sd/sdhci.c | 39 ++++++++++++++++++++++++--------------- hw/sd/sdhci.h | 6 +++--- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 65bb599..f474d2b 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1142,9 +1142,8 @@ static inline unsigned int sdhci_get_fifolen(SDHCIState *s) } } -static void sdhci_initfn(Object *obj) +static void sdhci_initfn(SDHCIState *s) { - SDHCIState *s = SDHCI(obj); DriveInfo *di; di = drive_get_next(IF_SD); @@ -1160,10 +1159,8 @@ static void sdhci_initfn(Object *obj) s->transfer_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_data_transfer, s); } -static void sdhci_uninitfn(Object *obj) +static void sdhci_uninitfn(SDHCIState *s) { - SDHCIState *s = SDHCI(obj); - timer_del(s->insert_timer); timer_free(s->insert_timer); timer_del(s->transfer_timer); @@ -1223,9 +1220,21 @@ static Property sdhci_properties[] = { DEFINE_PROP_END_OF_LIST(), }; -static void sdhci_realize(DeviceState *dev, Error ** errp) +static void sdhci_sysbus_init(Object *obj) +{ + SDHCIState *s = SYSBUS_SDHCI(obj); + sdhci_initfn(s); +} + +static void sdhci_sysbus_finalize(Object *obj) +{ + SDHCIState *s = SYSBUS_SDHCI(obj); + sdhci_uninitfn(s); +} + +static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) { - SDHCIState *s = SDHCI(dev); + SDHCIState *s = SYSBUS_SDHCI(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev); s->buf_maxsz = sdhci_get_fifolen(s); @@ -1236,27 +1245,27 @@ static void sdhci_realize(DeviceState *dev, Error ** errp) sysbus_init_mmio(sbd, &s->iomem); } -static void sdhci_class_init(ObjectClass *klass, void *data) +static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); dc->vmsd = &sdhci_vmstate; dc->props = sdhci_properties; - dc->realize = sdhci_realize; + dc->realize = sdhci_sysbus_realize; } -static const TypeInfo sdhci_type_info = { - .name = TYPE_SDHCI, +static const TypeInfo sdhci_sysbus_info = { + .name = TYPE_SYSBUS_SDHCI, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(SDHCIState), - .instance_init = sdhci_initfn, - .instance_finalize = sdhci_uninitfn, - .class_init = sdhci_class_init, + .instance_init = sdhci_sysbus_init, + .instance_finalize = sdhci_sysbus_finalize, + .class_init = sdhci_sysbus_class_init, }; static void sdhci_register_types(void) { - type_register_static(&sdhci_type_info); + type_register_static(&sdhci_sysbus_info); } type_init(sdhci_register_types) diff --git a/hw/sd/sdhci.h b/hw/sd/sdhci.h index 9a334ac..9fbf682 100644 --- a/hw/sd/sdhci.h +++ b/hw/sd/sdhci.h @@ -281,8 +281,8 @@ typedef struct SDHCIState { extern const VMStateDescription sdhci_vmstate; -#define TYPE_SDHCI "generic-sdhci" -#define SDHCI(obj) \ - OBJECT_CHECK(SDHCIState, (obj), TYPE_SDHCI) +#define TYPE_SYSBUS_SDHCI "generic-sdhci" +#define SYSBUS_SDHCI(obj) \ + OBJECT_CHECK(SDHCIState, (obj), TYPE_SYSBUS_SDHCI) #endif /* SDHCI_H */