From nobody Mon Feb 9 01:22:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1638543643; cv=none; d=zohomail.com; s=zohoarc; b=eb8/dmB8+eV8fnBq41fa29bic7UVWRqjYQl7mNZwN9N4HeY0Am4xDK4u0Ht2zgNpIVJTXlYgMHFYxMNczIzU2fmrD2z3579lRHirwUxos2oZY1fQzvdv/NxGxGIUv4j1zJPSEaEjmWy+Ju41RDBC5QPupebze8LOBmCMbNqfJtA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638543643; h=Content-Type:Content-Transfer-Encoding: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=Y+BA3LGVIObTA1lmdAtYtgeK07yLoW0ubXtlUmerfOs=; b=f5XoPBwvFt9kn4Ao//dCpxK2Ma3GKBe+NbCMjViZKYxWTf6EO0FVf/o40ml8U4YjLBiUDGTAlVrh9qAo5sUQyB7lBnuTf5prdBP9I7cIqxlpbwVBF4faod4hX3qEzvPabEfkWc6NyeWkyH+wWZHiuEuARQmuBSP9LBmxtAGLHYE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 163854364308983.39082661497321; Fri, 3 Dec 2021 07:00:43 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-205-j49WZi-QO9qifnQtDVewRA-1; Fri, 03 Dec 2021 10:00:40 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC10A100C677; Fri, 3 Dec 2021 15:00:33 +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 AACD85DAA5; Fri, 3 Dec 2021 15:00:33 +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 764171806D2D; Fri, 3 Dec 2021 15:00:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B3Evsd1029625 for ; Fri, 3 Dec 2021 09:57:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id F339E10023AE; Fri, 3 Dec 2021 14:57:53 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5682410246EB for ; Fri, 3 Dec 2021 14:57:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638543641; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=Y+BA3LGVIObTA1lmdAtYtgeK07yLoW0ubXtlUmerfOs=; b=O5MP8966mu1svihxH5lI0k+0OHN39r/izxp0TQiew00P7KZ4O1DgEoMXCuuYWYt9eZpLUJ TpHKavKt2RSzbjGyX8saUnOOTv5XZzw3MshgkQDt/9gSmyt+YB8OW7g+7Yo/cdEPmKNder iCeWJnG9kjmo9S6Ua6aVYAVchbb4dGU= X-MC-Unique: j49WZi-QO9qifnQtDVewRA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/16] virLogDaemonPostExecRestart: Refactor cleanup Date: Fri, 3 Dec 2021 15:57:35 +0100 Message-Id: <0bfbc1f5ee412f2ba3653458a748fd3897e2d441.1638543041.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com 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.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1638543643912100001 Content-Type: text/plain; charset="utf-8" Move the unlinking of the state file right after reading it so that we can get rid of the cleanup section. Signed-off-by: Peter Krempa --- src/logging/log_daemon.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index a2a5b5f547..de6bf082e8 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -436,61 +436,56 @@ virLogDaemonPostExecRestart(const char *state_file, { const char *gotmagic; g_autofree char *wantmagic =3D NULL; - int ret =3D -1; g_autofree char *state =3D NULL; g_autoptr(virJSONValue) object =3D NULL; + int rc; VIR_DEBUG("Running post-restart exec"); if (!virFileExists(state_file)) { VIR_DEBUG("No restart state file %s present", state_file); - ret =3D 0; - goto cleanup; + return 0; } - if (virFileReadAll(state_file, - 1024 * 1024 * 10, /* 10 MB */ - &state) < 0) - goto cleanup; + rc =3D virFileReadAll(state_file, 1024 * 1024 * 10, /* 10 MB */ &state= ); + unlink(state_file); + + if (rc < 0) + return -1; VIR_DEBUG("Loading state %s", state); if (!(object =3D virJSONValueFromString(state))) - goto cleanup; + return -1; gotmagic =3D virJSONValueObjectGetString(object, "magic"); if (!gotmagic) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing magic data in JSON document")); - goto cleanup; + return -1; } if (!(wantmagic =3D virLogDaemonGetExecRestartMagic())) - goto cleanup; + return -1; if (STRNEQ(gotmagic, wantmagic)) { VIR_WARN("Found restart exec file with old magic %s vs wanted %s", gotmagic, wantmagic); - ret =3D 0; - goto cleanup; + return 0; } /* Re-claim PID file now as we will not be daemonizing */ if (pid_file && (*pid_file_fd =3D virPidFileAcquirePath(pid_file, false, getpid())= ) < 0) - goto cleanup; + return -1; if (!(logDaemon =3D virLogDaemonNewPostExecRestart(object, privileged, config))) - goto cleanup; - - ret =3D 1; + return -1; - cleanup: - unlink(state_file); - return ret; + return 1; } --=20 2.31.1