From nobody Thu Jan 26 18:54:24 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P2qcw4DTxz3bPVH; Thu, 26 Jan 2023 18:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P2qcw3MC7z467R; Thu, 26 Jan 2023 18:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674759264; h=from:from: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; bh=Bt/dIhLaf2mldzhnfMawW4eCuuxoR3625DW/O2mZGz8=; b=no4D4sptPyNRcltrWu3g72IAZ4gDlPSFBXhzo7XjD11cBUfJm1SYiBYnwxQK27HkxcRMav EJCHAj/iUKbBbitN650NNvl+5Fq54r9T+KBZ88WVs+FP93fBEOqigAp2Fim3/7sKQPFJD0 SohwyQGH1HBd4poe4U1pjLzx6V9BEGYdRj49AfDRrzs0f5U3n65jNmA3PovNcsaxqneBHX 8cf87tUmzQSl63W8RpeCx2HXhvcCDkrp54VzD7yMuYevEUq0isuhO9zXu3gROE1qCFzkKU OcqO4teJDGPCsJ1nOO0nJtpPYY3HUQd1S1g4LkDVQxSyR0RwEwhs2izMJ1TV2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674759264; h=from:from: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; bh=Bt/dIhLaf2mldzhnfMawW4eCuuxoR3625DW/O2mZGz8=; b=TZsPsdTtFg1P81u27RVjc6XXaDG1jpJmPLMCQwKRGi6r2rciHjdWmIggfe6JZ15kDKEsKr BMTddIOf5fSjxPsSz1VmSs5RZD6OqcJIkHKU1pWccTj0dHWMaGAoaLk9ouEH186F+PL0w+ oVIgoIqAXsc+1LAn7k17FnuZIq+fGkDQeGxfWWIBgaPTWGLIEHCqtpUzsM3ZSUbviX7KFW 8auW41vpQ4J+ZzNOd5EAs7pEqJvK2Uz4c2jOfyVT5E7GdIO4HkxhmZUIeqxpy0iFDDYH7f bIiQs2pLxRh6g94gM6YX8Tcmg4wjtBxn7jkIf4wQgUBVPbEqeXsy2zoerMf3+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674759264; a=rsa-sha256; cv=none; b=UxQYnKGHYg33bTFX1ALRd0wurNk8DNVl1bNMVniU/ms416fjixYQZpJNlX3KiaJgvet6z+ PPUJ4OkHVOEzny45Zd2rftSHWEvf/C36eT/oUVCzKM3Nhw23VAw4SYg47ad9uCsyjj0Mpi xFfmnXCkQCTmjTREL3drFJZGVYvYn65hYn1XHOFF42OeewyG1Vzp5tkSblohBZ24JS9EYO 7/2OIVwjDTqWQHiNSLGiS1sxoWRrElgLvjNjD3zsrDJQIYgnKtPKseR1Tl3317Q5KbVb74 NmdbyYoDBb49T3fuh4U+zwJlZDBwvcJBCkH45OQiEhzGwn/AB9s67VdiEfceVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P2qcw2GSfzgPp; Thu, 26 Jan 2023 18:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30QIsOaD034159; Thu, 26 Jan 2023 18:54:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QIsOw8034158; Thu, 26 Jan 2023 18:54:24 GMT (envelope-from git) Date: Thu, 26 Jan 2023 18:54:24 GMT Message-Id: <202301261854.30QIsOw8034158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 1b85302234dd - stable/13 - bhyve/snapshot: fix pthread_create() error check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b85302234dd6afb33d8a6494de6a79a8e7f6f48 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1b85302234dd6afb33d8a6494de6a79a8e7f6f48 commit 1b85302234dd6afb33d8a6494de6a79a8e7f6f48 Author: Robert Wing AuthorDate: 2022-01-19 17:40:06 +0000 Commit: John Baldwin CommitDate: 2023-01-26 18:46:49 +0000 bhyve/snapshot: fix pthread_create() error check pthread_create() returns 0 on success or an error number on failure. Reviewed by: khng, markj Differential Revision: https://reviews.freebsd.org/D33930 (cherry picked from commit 51fbd894ddadd6a1bc4cb72de8ac4e92c013bd36) --- usr.sbin/bhyve/snapshot.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index b99c8beed2be..85c56d519390 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -1520,7 +1520,7 @@ init_checkpoint_thread(struct vmctx *ctx) int socket_fd; pthread_t checkpoint_pthread; char vmname_buf[MAX_VMNAME]; - int ret, err = 0; + int err; memset(&addr, 0, sizeof(addr)); @@ -1555,12 +1555,10 @@ init_checkpoint_thread(struct vmctx *ctx) checkpoint_info->ctx = ctx; checkpoint_info->socket_fd = socket_fd; - ret = pthread_create(&checkpoint_pthread, NULL, checkpoint_thread, + err = pthread_create(&checkpoint_pthread, NULL, checkpoint_thread, checkpoint_info); - if (ret < 0) { - err = ret; + if (err != 0) goto fail; - } return (0); fail: