From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfUiT-0000j6-6z for qemu-devel@nongnu.org; Fri, 15 Jun 2012 07:29:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SfUiM-0007zc-V6 for qemu-devel@nongnu.org; Fri, 15 Jun 2012 07:29:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:39651 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfUiM-0007zE-ML for qemu-devel@nongnu.org; Fri, 15 Jun 2012 07:29:18 -0400 Message-ID: <4FDB1C88.8000506@suse.de> Date: Fri, 15 Jun 2012 13:29:12 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <2fe15430c9332b3de9ba6969ca5303ba45be5b51.1339562634.git.peter.crosthwaite@petalogix.com> In-Reply-To: <2fe15430c9332b3de9ba6969ca5303ba45be5b51.1339562634.git.peter.crosthwaite@petalogix.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 09/11] xilinx_axienet: changed device name List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Peter A. G. Crosthwaite" , edgar.iglesias@gmail.com Cc: monstr@monstr.eu, qemu-devel@nongnu.org, john.williams@petalogix.com 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. >=20 > Signed-off-by: Peter A. G. Crosthwaite 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(-) >=20 > 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"); > =20 > - dev =3D qdev_create(NULL, "xilinx,axienet"); > + dev =3D 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 *kla= ss, void *data) > } > =20 > static TypeInfo xilinx_enet_info =3D { > - .name =3D "xilinx,axienet", > + .name =3D "xlnx.axi-ethernet", > .parent =3D TYPE_SYS_BUS_DEVICE, > .instance_size =3D sizeof(struct XilinxAXIEnet), > .class_init =3D xilinx_enet_class_init, --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg