From patchwork Mon Mar 7 03:12:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 8514961 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7171DC0553 for ; Mon, 7 Mar 2016 03:21:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AFDE320117 for ; Mon, 7 Mar 2016 03:21:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0384320115 for ; Mon, 7 Mar 2016 03:21:23 +0000 (UTC) Received: from localhost ([::1]:53235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acljW-0007D2-D8 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 06 Mar 2016 22:21:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aclcS-0002ot-4b for qemu-devel@nongnu.org; Sun, 06 Mar 2016 22:14:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aclcO-00007I-VO for qemu-devel@nongnu.org; Sun, 06 Mar 2016 22:14:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52057) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aclcO-00007C-R4 for qemu-devel@nongnu.org; Sun, 06 Mar 2016 22:14:00 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 8A2F91839; Mon, 7 Mar 2016 03:14:00 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (vpn1-5-187.pek2.redhat.com [10.72.5.187]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u273D2MM023865; Sun, 6 Mar 2016 22:13:56 -0500 From: Jason Wang To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Mon, 7 Mar 2016 11:12:55 +0800 Message-Id: <1457320380-5111-10-git-send-email-jasowang@redhat.com> In-Reply-To: <1457320380-5111-1-git-send-email-jasowang@redhat.com> References: <1457320380-5111-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Jiri Pirko , Jason Wang Subject: [Qemu-devel] [PULL 09/14] rocker: return -ENOMEM in case of some world alloc fails 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jiri Pirko Until now, 0 is returned in this error case. Fix it ro return -ENOMEM. Signed-off-by: Jiri Pirko Signed-off-by: Jason Wang --- hw/net/rocker/rocker.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index a1d921d..104c097 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -1301,6 +1301,7 @@ static int pci_rocker_init(PCIDevice *dev) for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) { if (!r->worlds[i]) { + err = -ENOMEM; goto err_world_alloc; } }