From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDd1E-0006VQ-J4 for qemu-devel@nongnu.org; Mon, 17 Sep 2012 11:14:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDd1A-0004uj-DK for qemu-devel@nongnu.org; Mon, 17 Sep 2012 11:13:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36137 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDd1A-0004uK-46 for qemu-devel@nongnu.org; Mon, 17 Sep 2012 11:13:48 -0400 Message-ID: <50573E28.2040608@suse.de> Date: Mon, 17 Sep 2012 17:13:44 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v1 5/6] xilinx: fix names of ethernet and dma links. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Peter A. G. Crosthwaite" Cc: edgar.iglesias@gmail.com, crwulff@gmail.com, qemu-devel@nongnu.org Hi, Am 17.09.2012 10:47, schrieb Peter A. G. Crosthwaite: > These names were incorrect. Fixed to match to actual link names >=20 > Signed-off-by: Peter A. G. Crosthwaite > --- > hw/xilinx.h | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) >=20 > diff --git a/hw/xilinx.h b/hw/xilinx.h > index 4d29265..6449bd4 100644 > --- a/hw/xilinx.h > +++ b/hw/xilinx.h > @@ -63,7 +63,8 @@ xilinx_axiethernet_create(NICInfo *nd, StreamSlave *p= eer, > qdev_set_nic_properties(dev, nd); > qdev_prop_set_uint32(dev, "rxmem", rxmem); > qdev_prop_set_uint32(dev, "txmem", txmem); > - object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", &err= p); > + object_property_set_link(OBJECT(dev), OBJECT(peer), "axistream-con= nected", > + &errp); > assert_no_error(errp); > qdev_init_nofail(dev); > sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); > @@ -80,7 +81,8 @@ xilinx_axiethernetdma_init(DeviceState *dev, StreamSl= ave *peer, > Error *errp =3D NULL; > =20 > qdev_prop_set_uint32(dev, "freqhz", freqhz); > - object_property_set_link(OBJECT(dev), OBJECT(peer), "tx_dev", &err= p); > + object_property_set_link(OBJECT(dev), OBJECT(peer), "axistream-con= nected", > + &errp); > assert_no_error(errp); > qdev_init_nofail(dev); > =20 Indentation of &errp looks odd despite no tabs - intentional? Andreas --=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