From: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
Date: Wed, 13 Jun 2012 04:46:49 +0000 (+1000)
Subject: xilinx_axienet: changed device name
X-Git-Tag: qemu-xen-4.3.0-rc1~993
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cec6f8ca5b22562ee757e2a55c21f7fa20d5200a;p=qemu-upstream-4.6-testing.git

xilinx_axienet: changed device name

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.crosthwaite@petalogix.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
---

diff --git a/hw/xilinx.h b/hw/xilinx.h
index 91be0b334..8f915b435 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 d383aeed4..2e8d8a59b 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,