From nobody Sun Feb 8 19:39:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578347931; cv=none; d=zohomail.com; s=zohoarc; b=fZHXP7qGLx8nRWUYqv95LbITS6WJ5320A5yL7hGzGyd160fjKuMjsw1TzOUAfyIA8x8WvBdrgj+yQKhpLf1CiKMpJCQneqYEsHysi+lLA2hZks2Qk2/Wvh4q4fwmZEvdEufeg6+H4TWt1Bd8EmsFucFxJyd90TTqmzpPJikTP/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578347931; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J1UFzhq2pXCuB/GxdlowEQXxfPw5Rm1NWSlh3Y3sRSc=; b=iieIg95T+12kWLNuEWp6MUxvvxFFqw7oEzGHC+F11ygBtyCTmU84AMcs8uouYiRB+AvjEBvAG1bk8JGI69B0AvxSG03+glKd/t3P+4T7Qku3KVFOHwLRYtwpa4KAXT8mllUU+Dw9Xav+esBdc0WD+qTzBWXv+Pfn0W2F6m3opPY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1578347931329256.7248810552385; Mon, 6 Jan 2020 13:58:51 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-413-aWh_UdYINw-15fJhr_7ERQ-1; Mon, 06 Jan 2020 16:58:47 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1A63BDC04; Mon, 6 Jan 2020 21:58: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 E0B4D101F942; Mon, 6 Jan 2020 21:58:38 +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 A06561800FCB; Mon, 6 Jan 2020 21:58:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 006LwOtH007313 for ; Mon, 6 Jan 2020 16:58:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id 97C1AF84E6; Mon, 6 Jan 2020 21:58:24 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 92EDF108BD7 for ; Mon, 6 Jan 2020 21:58:21 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A995F800147 for ; Mon, 6 Jan 2020 21:58:21 +0000 (UTC) Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-100-clK4XVSbPPmJW7WoXYEF-Q-1; Mon, 06 Jan 2020 16:58:16 -0500 Received: by mail-qk1-f181.google.com with SMTP id x1so40856041qkl.12 for ; Mon, 06 Jan 2020 13:58:16 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:655b:9e1c:e865:3705:e1df]) by smtp.gmail.com with ESMTPSA id x34sm23898440qtd.20.2020.01.06.13.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 13:58:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578347930; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=J1UFzhq2pXCuB/GxdlowEQXxfPw5Rm1NWSlh3Y3sRSc=; b=PWTfsEZPoc/vSkyY2odxQU2KeLIiWOZIQAQHvmrIsZtai4D5xMDOHYud9wfZ0NxkGYbEZ0 KAWFhd3/9+LHbeHPH6t+fgUH6oIiQtpwPSO6zUepWFkzA0WltexDiqkUHVn9ip0i5Tcdf8 RKDmDCdwIh2mbxUw2O448xIwoQHvXkM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2G/Rj1CDI/KLScFIcyidLIi2XZQDlT5Te5lC4M7YOj4=; b=bX1aIozt+7G6pGHpYqe+n3+g5717lPh+1P+QvCRmGdRiLFPjB441C5y13WeIGcKYAg rKSC8YZ1iihKPPKInXfMGL/OfZG0iLTzEC8HiHUfCVDq5ijB7HMfBjuuHTdspSbe4OQl Y7AYGkkITZscnW/zaEklSSOnznItPxsvUn6kGvHkinN4t3DRff31g8Nsc/M8ftOpGHoc buRXRLuWn6wRIDrNle2CukgkRndvJY+YrIHD5iqflHQHUdnRCyRDJj9JCzQGbofC9lu8 mroPR3Ii6kuPQIWd4FZZowzfnrEIZ9uwSemNXvTjmgN1TDXErVciTstMS9Znv8lBMdBT ufLA== X-Gm-Message-State: APjAAAVngZjZPPUZC9VJOCBXNq3ov61v5Vso4EnQWHOVwP8vW5evUn48 18DJVWyH8V6/egb5ZQKMe7YNbRJe X-Google-Smtp-Source: APXvYqzi30DQBGrUn9/aU8zqXWXgpEPt5xH8utJXMqe30gjZ2pXUCajYTndAdF7nNS2sMfU5izN7Rg== X-Received: by 2002:a37:ef07:: with SMTP id j7mr85669560qkk.354.1578347895618; Mon, 06 Jan 2020 13:58:15 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 6 Jan 2020 18:57:36 -0300 Message-Id: <20200106215750.361615-13-danielhb413@gmail.com> In-Reply-To: <20200106215750.361615-1-danielhb413@gmail.com> References: <20200106215750.361615-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: clK4XVSbPPmJW7WoXYEF-Q-1 X-MC-Unique: aWh_UdYINw-15fJhr_7ERQ-1 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 006LwOtH007313 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 12/26] lxc: remove unneeded labels 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- src/lxc/lxc_container.c | 7 ++----- src/lxc/lxc_controller.c | 10 ++++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 42ed08ede6..b44cc68e67 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -380,18 +380,15 @@ static int lxcContainerSetupFDs(int *ttyfd, */ int lxcContainerSendContinue(int control) { - int rc =3D -1; lxc_message_t msg =3D LXC_CONTINUE_MSG; int writeCount =3D 0; =20 VIR_DEBUG("Send continue on fd %d", control); writeCount =3D safewrite(control, &msg, sizeof(msg)); if (writeCount !=3D sizeof(msg)) - goto error_out; + return -1; =20 - rc =3D 0; - error_out: - return rc; + return 0; } =20 /** diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index e572c3f5fd..42c631ed0b 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1115,7 +1115,7 @@ static void virLXCControllerConsoleUpdateWatch(virLXC= ControllerConsolePtr consol virReportSystemError(errno, "%s", _("Unable to add epoll fd")); virNetDaemonQuit(console->daemon); - goto cleanup; + return; } console->hostEpoll =3D events; VIR_DEBUG("newHostEvents=3D%x oldHostEvents=3D%x", events, con= sole->hostEpoll); @@ -1127,7 +1127,7 @@ static void virLXCControllerConsoleUpdateWatch(virLXC= ControllerConsolePtr consol _("Unable to remove epoll fd")); VIR_DEBUG(":fail"); virNetDaemonQuit(console->daemon); - goto cleanup; + return; } console->hostEpoll =3D 0; } @@ -1153,7 +1153,7 @@ static void virLXCControllerConsoleUpdateWatch(virLXC= ControllerConsolePtr consol _("Unable to add epoll fd")); VIR_DEBUG(":fail"); virNetDaemonQuit(console->daemon); - goto cleanup; + return; } console->contEpoll =3D events; VIR_DEBUG("newHostEvents=3D%x oldHostEvents=3D%x", events, con= sole->contEpoll); @@ -1165,12 +1165,10 @@ static void virLXCControllerConsoleUpdateWatch(virL= XCControllerConsolePtr consol _("Unable to remove epoll fd")); VIR_DEBUG(":fail"); virNetDaemonQuit(console->daemon); - goto cleanup; + return; } console->contEpoll =3D 0; } - cleanup: - return; } =20 =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list