From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXzaE-0002Rv-Nw for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:18 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXzZw-000231-RQ for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:05 -0400 Received: from [199.232.76.173] (port=39444 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXzZw-00022m-78 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:00 -0400 Received: from mx2.redhat.com ([66.187.237.31]:42769) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXzZv-0004ew-J4 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:35:59 -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 n73FZxli001480 for ; Mon, 3 Aug 2009 11:35:59 -0400 From: Gerd Hoffmann Date: Mon, 3 Aug 2009 17:35:24 +0200 Message-Id: <1249313748-6459-9-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> Subject: [Qemu-devel] [PATCH 08/32] qdev/prop: convert etraxfs_pic.c to helper macros. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/etraxfs_pic.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/etraxfs_pic.c b/hw/etraxfs_pic.c index e627218..4527d98 100644 --- a/hw/etraxfs_pic.c +++ b/hw/etraxfs_pic.c @@ -39,7 +39,7 @@ struct etrax_pic { SysBusDevice busdev; - uint32_t *interrupt_vector; + void *interrupt_vector; qemu_irq parent_irq; qemu_irq parent_nmi; uint32_t regs[R_MAX]; @@ -71,7 +71,8 @@ static void pic_update(struct etrax_pic *fs) } if (fs->interrupt_vector) { - *fs->interrupt_vector = vector; + /* hack alert: ptr property */ + *(uint32_t*)(fs->interrupt_vector) = vector; } qemu_set_irq(fs->parent_irq, !!vector); } @@ -153,12 +154,8 @@ static SysBusDeviceInfo etraxfs_pic_info = { .qdev.name = "etraxfs,pic", .qdev.size = sizeof(struct etrax_pic), .qdev.props = (Property[]) { - { - .name = "interrupt_vector", - .info = &qdev_prop_ptr, - .offset = offsetof(struct etrax_pic, interrupt_vector), - }, - {/* end of list */} + DEFINE_PROP_PTR("interrupt_vector", struct etrax_pic, interrupt_vector), + DEFINE_PROP_END_OF_LIST(), } }; -- 1.6.2.5