From patchwork Mon Aug 3 15:35:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 30626 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 1451FB6F2B for ; Tue, 4 Aug 2009 04:01:28 +1000 (EST) Received: from localhost ([127.0.0.1]:40116 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MY1qd-0003ae-Lc for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 14:01:23 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXzaH-0002bJ-F0 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:21 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXza3-0002Ed-6x for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:12 -0400 Received: from [199.232.76.173] (port=39462 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXza2-0002E1-J1 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:06 -0400 Received: from mx2.redhat.com ([66.187.237.31]:42797) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXza2-0004gw-1g for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:06 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73Fa5gl001584 for ; Mon, 3 Aug 2009 11:36:05 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73Fa4Qx015499; Mon, 3 Aug 2009 11:36:04 -0400 Received: from zweiblum.home.kraxel.org (vpn2-8-59.ams2.redhat.com [10.36.8.59]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with SMTP id n73FZxS6014223; Mon, 3 Aug 2009 11:36:00 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 8EB5A700E3; Mon, 3 Aug 2009 17:35:49 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 17:35:32 +0200 Message-Id: <1249313748-6459-17-git-send-email-kraxel@redhat.com> In-Reply-To: <1249313748-6459-1-git-send-email-kraxel@redhat.com> References: <1249313748-6459-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 16/32] qdev/prop: convert slavio_timer.c to helper macros. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/slavio_timer.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c index 69c9f3b..131e903 100644 --- a/hw/slavio_timer.c +++ b/hw/slavio_timer.c @@ -61,6 +61,7 @@ typedef struct SLAVIO_TIMERState { // processor only uint32_t running; struct SLAVIO_TIMERState *master; + void *m; uint32_t slave_index; // system only uint32_t num_slaves; @@ -395,6 +396,7 @@ static void slavio_timer_init1(SysBusDevice *dev) sysbus_init_irq(dev, &s->irq); + s->master = s->m; /* hack alert: ptr property */ if (!s->master || s->slave_index < s->master->num_slaves) { bh = qemu_bh_new(slavio_timer_irq, s); s->timer = ptimer_init(bh); @@ -436,22 +438,10 @@ static SysBusDeviceInfo slavio_timer_info = { .qdev.name = "slavio_timer", .qdev.size = sizeof(SLAVIO_TIMERState), .qdev.props = (Property[]) { - { - .name = "num_slaves", - .info = &qdev_prop_uint32, - .offset = offsetof(SLAVIO_TIMERState, num_slaves), - }, - { - .name = "slave_index", - .info = &qdev_prop_uint32, - .offset = offsetof(SLAVIO_TIMERState, slave_index), - }, - { - .name = "master", - .info = &qdev_prop_ptr, - .offset = offsetof(SLAVIO_TIMERState, master), - }, - {/* end of property list */} + DEFINE_PROP_UINT32("num_slaves", SLAVIO_TIMERState, num_slaves, 0), + DEFINE_PROP_UINT32("slave_index", SLAVIO_TIMERState, slave_index, 0), + DEFINE_PROP_PTR("master", SLAVIO_TIMERState, m), + DEFINE_PROP_END_OF_LIST(), } };