From: Peter A. G. Crosthwaite Date: Wed, 13 Jun 2012 04:46:46 +0000 (+1000) Subject: xilinx_ethlite: tweaked naming of ping-pong props X-Git-Tag: v1.2.0-rc0~279 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2d85c3492dc8ec930976b6ead3c573d343b34a5;p=thirdparty%2Fqemu.git xilinx_ethlite: tweaked naming of ping-pong props Changed "txpingpong" prop to "tx-ping-pong". Same for rx. This is done to make the property name exactly match what is output by the xilinx tools for this IP. Signed-off-by: Peter A. G. Crosthwaite Signed-off-by: Edgar E. Iglesias --- diff --git a/hw/xilinx.h b/hw/xilinx.h index dc6599c83c6..d814cb72d21 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -40,8 +40,8 @@ xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq, dev = qdev_create(NULL, "xilinx,ethlite"); qdev_set_nic_properties(dev, nd); - qdev_prop_set_uint32(dev, "txpingpong", txpingpong); - qdev_prop_set_uint32(dev, "rxpingpong", rxpingpong); + qdev_prop_set_uint32(dev, "tx-ping-pong", txpingpong); + qdev_prop_set_uint32(dev, "rx-ping-pong", rxpingpong); qdev_init_nofail(dev); sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c index 857b33d1724..aa0271536b0 100644 --- a/hw/xilinx_ethlite.c +++ b/hw/xilinx_ethlite.c @@ -227,8 +227,8 @@ static int xilinx_ethlite_init(SysBusDevice *dev) } static Property xilinx_ethlite_properties[] = { - DEFINE_PROP_UINT32("txpingpong", struct xlx_ethlite, c_tx_pingpong, 1), - DEFINE_PROP_UINT32("rxpingpong", struct xlx_ethlite, c_rx_pingpong, 1), + DEFINE_PROP_UINT32("tx-ping-pong", struct xlx_ethlite, c_tx_pingpong, 1), + DEFINE_PROP_UINT32("rx-ping-pong", struct xlx_ethlite, c_rx_pingpong, 1), DEFINE_NIC_PROPERTIES(struct xlx_ethlite, conf), DEFINE_PROP_END_OF_LIST(), };