Re: [Qemu-devel] [PATCH v2 07/11] xilinx_ethlite: changed device name

["Andreas Färber" <afaerber@suse.de>]

Am 13.06.2012 06:46, schrieb Peter A. G. Crosthwaite:
> Changed device name to xlnx,xps-ethernetlite. This is the exact name of the
> device in the xilinx EDK development tools.
> 
> Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>

Dito.

/-F

> ---
>  hw/xilinx.h         |    4 ++--
>  hw/xilinx_ethlite.c |    5 +++--
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/xilinx.h b/hw/xilinx.h
> index 7776e1b..5f7c5e9 100644
> --- a/hw/xilinx.h
> +++ b/hw/xilinx.h
> @@ -36,9 +36,9 @@ xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq,
>  {
>      DeviceState *dev;
>  
> -    qemu_check_nic_model(nd, "xilinx-ethlite");
> +    qemu_check_nic_model(nd, "xlnx.xps-ethernetlite");
>  
> -    dev = qdev_create(NULL, "xilinx,ethlite");
> +    dev = qdev_create(NULL, "xlnx.xps-ethernetlite");
>      qdev_set_nic_properties(dev, nd);
>      qdev_prop_set_uint32(dev, "tx-ping-pong", txpingpong);
>      qdev_prop_set_uint32(dev, "rx-ping-pong", rxpingpong);
> diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c
> index aa02715..affbb8b 100644
> --- a/hw/xilinx_ethlite.c
> +++ b/hw/xilinx_ethlite.c
> @@ -216,7 +216,8 @@ static int xilinx_ethlite_init(SysBusDevice *dev)
>      sysbus_init_irq(dev, &s->irq);
>      s->rxbuf = 0;
>  
> -    memory_region_init_io(&s->mmio, &eth_ops, s, "xilinx-ethlite", R_MAX * 4);
> +    memory_region_init_io(&s->mmio, &eth_ops, s, "xlnx.xps-ethernetlite",
> +                                                                    R_MAX * 4);
>      sysbus_init_mmio(dev, &s->mmio);
>  
>      qemu_macaddr_default_if_unset(&s->conf.macaddr);
> @@ -243,7 +244,7 @@ static void xilinx_ethlite_class_init(ObjectClass *klass, void *data)
>  }
>  
>  static TypeInfo xilinx_ethlite_info = {
> -    .name          = "xilinx,ethlite",
> +    .name          = "xlnx.xps-ethernetlite",
>      .parent        = TYPE_SYS_BUS_DEVICE,
>      .instance_size = sizeof(struct xlx_ethlite),
>      .class_init    = xilinx_ethlite_class_init,


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg