From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQG3D-0003UN-Ep for qemu-devel@nongnu.org; Tue, 24 Feb 2015 09:01:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQG31-0007ab-Rr for qemu-devel@nongnu.org; Tue, 24 Feb 2015 09:01:27 -0500 Received: from cantor2.suse.de ([195.135.220.15]:44186 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQG31-0007ZU-KI for qemu-devel@nongnu.org; Tue, 24 Feb 2015 09:01:15 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 24 Feb 2015 14:58:26 +0100 Message-Id: <1424786311-22387-7-git-send-email-afaerber@suse.de> In-Reply-To: <1424786311-22387-1-git-send-email-afaerber@suse.de> References: <1424786311-22387-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 06/10] etsec: Replace qdev_init() by qdev_init_nofail() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Markus Armbruster etsec_create() is a helper to create and realize the eTSEC. It's currently unused. Similar helpers for other NICs use qdev_init_nofail(). Match that. Signed-off-by: Markus Armbruster Signed-off-by: Andreas F=C3=A4rber --- hw/net/fsl_etsec/etsec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 2fbbc6c..c57365f 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -443,10 +443,7 @@ DeviceState *etsec_create(hwaddr base, =20 dev =3D qdev_create(NULL, "eTSEC"); qdev_set_nic_properties(dev, nd); - - if (qdev_init(dev)) { - return NULL; - } + qdev_init_nofail(dev); =20 sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, tx_irq); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, rx_irq); --=20 2.1.4