From patchwork Tue Jun 19 16:40:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 139229 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5428906lji; Tue, 19 Jun 2018 09:41:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJft1JRT3YrnFugssPAhgwU06aMeJ3iU1RXFsiMEJzyE76gLwxb6sP6Zw2YuErzUpbqShT6 X-Received: by 2002:a9d:1846:: with SMTP id t6-v6mr11683993ott.63.1529426500944; Tue, 19 Jun 2018 09:41:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529426500; cv=none; d=google.com; s=arc-20160816; b=GdA+9pYHw7TIahkUuZV0QM+TXkaFUBUwLn/jSZDEe8Jy9zYU1BfFibwxFnYfB4ct2l dJgeNrKQxNUndsEsK2AneG4d54pjiWYsF7MPQPH8XkmxV1Th1GaK32w0z/gFgCxVX7Xn 9paVYvPLa+rjjWQnXW/24GXOpADF1n5jz6yYJ3NI1xQwLWJZfaFQkqvTAi43k7kcQWBh txSHPBKOKXmaRcMgTWqQUROTDiLwEFx+jmepVPTL7tlfLdA9JX8qZcxr/Id4EaSkrb1d n5bIbCU2eloFQHeiVrcvmaFk9hjgcslsOnp4Fnfj7MG4Oyb0FBWuPq0lDHOa4sVg4SJy k7Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=Pvn3JDVlC3z66dxdQUsXODZxaBJnXXUvyUeEjA2RI0s=; b=XKCJSfSBZhFc8Se9En/l0FM5s364PnXxA5txLaODa4H2kBJ5e33HOsSDucIHBUhmj6 iUmulorWRApiW4fIO4XaL9XAKRLcfd/eqjvKzEeDD+Qk5LXxs/EuScuSKEXHcndZQHge oAywx5FrH3zrfu6oxSAHdTz3c/+NUk736vdyS6kWP2DglA7p6sjJXgU1ZeksEAeyrRHN dRbxOe2hULN/o93VzgjqoRL8zDD9jW29rkBCATT0fPlIfDGqtgYcG/Ctr0QSslBD51p+ sKfrw5siGmebyMiztkacj6mYDj4arMmVYm7utkN7J6p6xB76DM3ubjMHtVz6R8Y14NlL RhDA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id a20-v6si38645oiy.296.2018.06.19.09.41.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Jun 2018 09:41:40 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5923B13AA4; Tue, 19 Jun 2018 16:41:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FE165D9C7; Tue, 19 Jun 2018 16:41:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BFA4518052EA; Tue, 19 Jun 2018 16:41:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5JGfECw011292 for ; Tue, 19 Jun 2018 12:41:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id AE479201807A; Tue, 19 Jun 2018 16:41:14 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.bos.redhat.com (dhcp-17-157.bos.redhat.com [10.18.17.157]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94A882026D68; Tue, 19 Jun 2018 16:41:14 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Tue, 19 Jun 2018 12:40:52 -0400 Message-Id: <9db0a71c70e54b2774892ef62cfa1c12bf4ee717.1529426092.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/6] qemu: command: vhost: cleanup error reporting X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 19 Jun 2018 16:41:40 +0000 (UTC) - Switch to cleanup: label and share free calls - Don't overwrite qemuBuildNicDevStr error Signed-off-by: Cole Robinson --- src/qemu/qemu_command.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) -- 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f2dbb3fadd..1ffcb5b1ae 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8147,11 +8147,12 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, char *netdev = NULL; unsigned int queues = net->driver.virtio.queues; char *nic = NULL; + int ret = -1; if (!qemuDomainSupportsNicdev(def, net)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Nicdev support unavailable")); - goto error; + goto cleanup; } switch ((virDomainChrType)net->data.vhostuser->type) { @@ -8160,7 +8161,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, net->data.vhostuser, net->info.alias, qemuCaps, false, chardevStdioLogd))) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_NULL: @@ -8179,7 +8180,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, virReportError(VIR_ERR_INTERNAL_ERROR, _("vhost-user type '%s' not supported"), virDomainChrTypeToString(net->data.vhostuser->type)); - goto error; + goto cleanup; } if (queues > 1 && @@ -8187,45 +8188,38 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("multi-queue is not supported for vhost-user " "with this QEMU binary")); - goto error; + goto cleanup; } if (!(netdev = qemuBuildHostNetStr(net, driver, NULL, 0, NULL, 0))) - goto error; + goto cleanup; if (virNetDevOpenvswitchGetVhostuserIfname(net->data.vhostuser->data.nix.path, &net->ifname) < 0) - goto error; + goto cleanup; virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, chardev); - VIR_FREE(chardev); virCommandAddArg(cmd, "-netdev"); virCommandAddArg(cmd, netdev); - VIR_FREE(netdev); if (!(nic = qemuBuildNicDevStr(def, net, bootindex, queues, qemuCaps))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Error generating NIC -device string")); - goto error; + goto cleanup; } virCommandAddArgList(cmd, "-device", nic, NULL); - VIR_FREE(nic); - virObjectUnref(cfg); - return 0; - - error: + ret = 0; + cleanup: virObjectUnref(cfg); VIR_FREE(netdev); VIR_FREE(chardev); VIR_FREE(nic); - return -1; + return ret; } static int