提交 ddde095c 编写于 作者: G Gerd Hoffmann 提交者: Anthony Liguori

qdev/prop: convert etraxfs_pic.c to helper macros.

Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-Id: 
上级 ec02f7de
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
struct etrax_pic struct etrax_pic
{ {
SysBusDevice busdev; SysBusDevice busdev;
uint32_t *interrupt_vector; void *interrupt_vector;
qemu_irq parent_irq; qemu_irq parent_irq;
qemu_irq parent_nmi; qemu_irq parent_nmi;
uint32_t regs[R_MAX]; uint32_t regs[R_MAX];
...@@ -71,7 +71,8 @@ static void pic_update(struct etrax_pic *fs) ...@@ -71,7 +71,8 @@ static void pic_update(struct etrax_pic *fs)
} }
if (fs->interrupt_vector) { 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); qemu_set_irq(fs->parent_irq, !!vector);
} }
...@@ -153,12 +154,8 @@ static SysBusDeviceInfo etraxfs_pic_info = { ...@@ -153,12 +154,8 @@ static SysBusDeviceInfo etraxfs_pic_info = {
.qdev.name = "etraxfs,pic", .qdev.name = "etraxfs,pic",
.qdev.size = sizeof(struct etrax_pic), .qdev.size = sizeof(struct etrax_pic),
.qdev.props = (Property[]) { .qdev.props = (Property[]) {
{ DEFINE_PROP_PTR("interrupt_vector", struct etrax_pic, interrupt_vector),
.name = "interrupt_vector", DEFINE_PROP_END_OF_LIST(),
.info = &qdev_prop_ptr,
.offset = offsetof(struct etrax_pic, interrupt_vector),
},
{/* end of list */}
} }
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册