From ee6847d19be16c789b8bd4e553b7cd6701ba1245 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 15 Jul 2009 13:43:31 +0200 Subject: qdev: rework device properties. This patch is a major overhaul of the device properties. The properties are saved directly in the device state struct now, the linked list of property values is gone. Advantages: * We don't have to maintain the list with the property values. * The value in the property list and the value actually used by the device can't go out of sync any more (used to happen for the pci.devfn == -1 case) because there is only one place where the value is stored. * A record describing the property is required now, you can't set random properties any more. There are bus-specific and device-specific properties. The former should be used for properties common to all bus drivers. Typical use case is bus addressing, i.e. pci.devfn and i2c.address. Properties have a PropertyInfo struct attached with name, size and function pointers to parse and print properties. A few common property types have PropertyInfos defined in qdev-properties.c. Drivers are free to implement their own very special property parsers if needed. Properties can have default values. If unset they are zero-filled. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- hw/xilinx_ethlite.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'hw/xilinx_ethlite.c') diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c index f4b40c7b73..b3fd25bb47 100644 --- a/hw/xilinx_ethlite.c +++ b/hw/xilinx_ethlite.c @@ -53,8 +53,8 @@ struct xlx_ethlite qemu_irq irq; VLANClientState *vc; - unsigned int c_tx_pingpong; - unsigned int c_rx_pingpong; + uint32_t c_tx_pingpong; + uint32_t c_rx_pingpong; unsigned int txbuf; unsigned int rxbuf; @@ -213,8 +213,6 @@ static void xilinx_ethlite_init(SysBusDevice *dev) int regs; sysbus_init_irq(dev, &s->irq); - s->c_tx_pingpong = qdev_get_prop_int(&dev->qdev, "txpingpong", 1); - s->c_rx_pingpong = qdev_get_prop_int(&dev->qdev, "rxpingpong", 1); s->rxbuf = 0; regs = cpu_register_io_memory(eth_read, eth_write, s); @@ -225,10 +223,29 @@ static void xilinx_ethlite_init(SysBusDevice *dev) eth_can_rx, eth_rx, NULL, eth_cleanup, s); } +static SysBusDeviceInfo xilinx_ethlite_info = { + .init = xilinx_ethlite_init, + .qdev.name = "xilinx,ethlite", + .qdev.size = sizeof(struct xlx_ethlite), + .qdev.props = (Property[]) { + { + .name = "txpingpong", + .info = &qdev_prop_uint32, + .offset = offsetof(struct xlx_ethlite, c_tx_pingpong), + .defval = (uint32_t[]) { 1 }, + },{ + .name = "rxpingpong", + .info = &qdev_prop_uint32, + .offset = offsetof(struct xlx_ethlite, c_rx_pingpong), + .defval = (uint32_t[]) { 1 }, + }, + {/* end of list */} + } +}; + static void xilinx_ethlite_register(void) { - sysbus_register_dev("xilinx,ethlite", sizeof (struct xlx_ethlite), - xilinx_ethlite_init); + sysbus_register_withprop(&xilinx_ethlite_info); } device_init(xilinx_ethlite_register) -- cgit v1.2.3