From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MQLLS-0005cj-5F for qemu-devel@nongnu.org; Mon, 13 Jul 2009 09:13:26 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MQLLN-0005Y0-Fb for qemu-devel@nongnu.org; Mon, 13 Jul 2009 09:13:25 -0400 Received: from [199.232.76.173] (port=48477 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MQLLM-0005Xa-Hn for qemu-devel@nongnu.org; Mon, 13 Jul 2009 09:13:20 -0400 Received: from mx2.redhat.com ([66.187.237.31]:53906) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MQLLM-0004iq-2I for qemu-devel@nongnu.org; Mon, 13 Jul 2009 09:13:20 -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 n6DDDJN9006282 for ; Mon, 13 Jul 2009 09:13:19 -0400 From: Gerd Hoffmann Date: Mon, 13 Jul 2009 15:13:08 +0200 Message-Id: <1247490790-15783-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1247490790-15783-1-git-send-email-kraxel@redhat.com> References: <1247490790-15783-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 5/7] qdev/prop: convert m48t59 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/m48t59.c | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/hw/m48t59.c b/hw/m48t59.c index 798d292..7e53dce 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -43,11 +43,11 @@ struct m48t59_t { SysBusDevice busdev; /* Model parameters */ - int type; // 2 = m48t02, 8 = m48t08, 59 = m48t59 + uint32_t type; // 2 = m48t02, 8 = m48t08, 59 = m48t59 /* Hardware parameters */ qemu_irq IRQ; uint32_t io_base; - uint16_t size; + uint32_t size; /* RTC management */ time_t time_offset; time_t stop_time; @@ -623,9 +623,9 @@ m48t59_t *m48t59_init (qemu_irq IRQ, target_phys_addr_t mem_base, m48t59_t *d; dev = qdev_create(NULL, "m48t59"); - qdev_set_prop_int(dev, "type", type); - qdev_set_prop_int(dev, "size", size); - qdev_set_prop_int(dev, "io_base", io_base); + qdev_prop_set_uint32(dev, "type", type); + qdev_prop_set_uint32(dev, "size", size); + qdev_prop_set_uint32(dev, "io_base", io_base); qdev_init(dev); s = sysbus_from_qdev(dev); sysbus_connect_irq(s, 0, IRQ); @@ -647,11 +647,8 @@ static void m48t59_init1(SysBusDevice *dev) m48t59_t *s = FROM_SYSBUS(m48t59_t, dev); int mem_index; - s->size = qdev_get_prop_int(&dev->qdev, "size", -1); s->buffer = qemu_mallocz(s->size); sysbus_init_irq(dev, &s->IRQ); - s->io_base = qdev_get_prop_int(&dev->qdev, "io_base", 0); - s->type = qdev_get_prop_int(&dev->qdev, "type", -1); mem_index = cpu_register_io_memory(nvram_read, nvram_write, s); sysbus_init_mmio(dev, s->size, mem_index); @@ -666,9 +663,33 @@ static void m48t59_init1(SysBusDevice *dev) register_savevm("m48t59", -1, 1, m48t59_save, m48t59_load, s); } +static SysBusDeviceInfo m48t59_info = { + .init = m48t59_init1, + .qdev.name = "m48t59", + .qdev.size = sizeof(m48t59_t), + .qdev.props = (Property[]) { + { + .name = "size", + .info = &qdev_prop_uint32, + .offset = offsetof(m48t59_t, size), + .defval = (uint32_t[]) { -1 }, + },{ + .name = "type", + .info = &qdev_prop_uint32, + .offset = offsetof(m48t59_t, type), + .defval = (uint32_t[]) { -1 }, + },{ + .name = "io_base", + .info = &qdev_prop_hex32, + .offset = offsetof(m48t59_t, io_base), + }, + {/* end of list */} + } +}; + static void m48t59_register_devices(void) { - sysbus_register_dev("m48t59", sizeof(m48t59_t), m48t59_init1); + sysbus_register_withprop(&m48t59_info); } device_init(m48t59_register_devices) -- 1.6.2.5