Am 13.06.2012 06:46, schrieb Peter A. G. Crosthwaite: > Changed device name to xlnx,axi-ethernet. This is the exact name of the > device in the xilinx EDK development tools. > > Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwa...@petalogix.com>
Commit message doesn't match the change. Which one is right? /-F > --- > hw/xilinx.h | 4 ++-- > hw/xilinx_axienet.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/xilinx.h b/hw/xilinx.h > index 5108cf5..52fce01 100644 > --- a/hw/xilinx.h > +++ b/hw/xilinx.h > @@ -54,9 +54,9 @@ xilinx_axiethernet_create(void *dmach, > int txmem, int rxmem) > { > DeviceState *dev; > - qemu_check_nic_model(nd, "xilinx-axienet"); > + qemu_check_nic_model(nd, "xlnx.axi-ethernet"); > > - dev = qdev_create(NULL, "xilinx,axienet"); > + dev = qdev_create(NULL, "xlnx.axi-ethernet"); > qdev_set_nic_properties(dev, nd); > qdev_prop_set_uint32(dev, "rxmem", rxmem); > qdev_prop_set_uint32(dev, "txmem", txmem); > diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c > index d383aee..2e8d8a5 100644 > --- a/hw/xilinx_axienet.c > +++ b/hw/xilinx_axienet.c > @@ -889,7 +889,7 @@ static void xilinx_enet_class_init(ObjectClass *klass, > void *data) > } > > static TypeInfo xilinx_enet_info = { > - .name = "xilinx,axienet", > + .name = "xlnx.axi-ethernet", > .parent = TYPE_SYS_BUS_DEVICE, > .instance_size = sizeof(struct XilinxAXIEnet), > .class_init = xilinx_enet_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