From patchwork Wed Feb 18 10:08:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 440870 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 370F0140168 for ; Wed, 18 Feb 2015 21:11:37 +1100 (AEDT) Received: from localhost ([::1]:49603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO1bS-00006u-Rb for incoming@patchwork.ozlabs.org; Wed, 18 Feb 2015 05:11:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO1Yh-0003sc-Jm for qemu-devel@nongnu.org; Wed, 18 Feb 2015 05:08:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO1Yb-0008Lr-0g for qemu-devel@nongnu.org; Wed, 18 Feb 2015 05:08:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO1Ya-0008Lc-Ph for qemu-devel@nongnu.org; Wed, 18 Feb 2015 05:08:36 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1IA8Xvm019022 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 18 Feb 2015 05:08:33 -0500 Received: from nilsson.home.kraxel.org (ovpn-116-44.ams2.redhat.com [10.36.116.44]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1IA8WKM004701; Wed, 18 Feb 2015 05:08:32 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 48C7B818BB; Wed, 18 Feb 2015 11:08:31 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 18 Feb 2015 11:08:18 +0100 Message-Id: <1424254105-30237-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1424254105-30237-1-git-send-email-kraxel@redhat.com> References: <1424254105-30237-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Samuel Thibault , Markus Armbruster , Gerd Hoffmann Subject: [Qemu-devel] [PULL 1/8] usb: usb_create() can't fail, drop useless error handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Gerd Hoffmann --- hw/usb/bus.c | 4 ---- hw/usb/dev-bluetooth.c | 6 +----- hw/usb/dev-network.c | 3 --- hw/usb/dev-serial.c | 3 --- hw/usb/dev-storage.c | 3 --- 5 files changed, 1 insertion(+), 18 deletions(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 986b2d8..eeb6872 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -320,10 +320,6 @@ USBDevice *usb_create_simple(USBBus *bus, const char *name) USBDevice *dev = usb_create(bus, name); int rc; - if (!dev) { - error_report("Failed to create USB device '%s'", name); - return NULL; - } rc = qdev_init(&dev->qdev); if (rc < 0) { error_report("Failed to initialize USB device '%s'", name); diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c index 390d475..8b3b316 100644 --- a/hw/usb/dev-bluetooth.c +++ b/hw/usb/dev-bluetooth.c @@ -530,14 +530,10 @@ static USBDevice *usb_bt_init(USBBus *bus, const char *cmdline) } else { hci = bt_new_hci(qemu_find_bt_vlan(0)); } - if (!hci) return NULL; + dev = usb_create(bus, name); - if (!dev) { - error_report("Failed to create USB device '%s'", name); - return NULL; - } s = DO_UPCAST(struct USBBtState, dev, dev); s->hci = hci; if (qdev_init(&dev->qdev) < 0) { diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 5b95d5c..620fc11 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1405,9 +1405,6 @@ static USBDevice *usb_net_init(USBBus *bus, const char *cmdline) } dev = usb_create(bus, "usb-net"); - if (!dev) { - return NULL; - } qdev_set_nic_properties(&dev->qdev, &nd_table[idx]); qdev_init_nofail(&dev->qdev); return dev; diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 1cee450..f347c05 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -544,9 +544,6 @@ static USBDevice *usb_serial_init(USBBus *bus, const char *filename) return NULL; dev = usb_create(bus, "usb-serial"); - if (!dev) { - return NULL; - } qdev_prop_set_chr(&dev->qdev, "chardev", cdrv); if (vendorid) qdev_prop_set_uint16(&dev->qdev, "vendorid", vendorid); diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 4539733..5f22275 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -706,9 +706,6 @@ static USBDevice *usb_msd_init(USBBus *bus, const char *filename) /* create guest device */ dev = usb_create(bus, "usb-storage"); - if (!dev) { - return NULL; - } if (qdev_prop_set_drive(&dev->qdev, "drive", blk_by_legacy_dinfo(dinfo)) < 0) { object_unparent(OBJECT(dev));