From nobody Fri Apr 28 12:03:49 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 4Q7B8j5X9qz48P05; Fri, 28 Apr 2023 12:03:49 +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 4Q7B8j535Yz3hvh; Fri, 28 Apr 2023 12:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682683429; 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=qdf/xExm/6H/Og1bwQxKR7M0HncnA6gwR548UPl0og8=; b=aRIbQxxzRdgN7qGYKsDI5iJcbeL1NQtGDTzDToyazHOIwozBXb1xyQqTnwgYMxlFCzsK8u nY+I4zAWtOiLQZybivikhb14cN+rx+POY8Ei63f1aOJlXjHKxtRTkK47JfpTLWnfKP0APJ hucRKjyXrrEqUNDriuZHLu76fAxWlkmg814rvQL/0uLl9GvIcZxRO/LNkWPmGFJla71EVt 3gaT7toZRPRGOQJW8Eu/jNXzVlfpC0DChLGV0rIMT5y/LkVhGZHJfgxTW48NArsY3J9fY5 BJrwzR7+yTMErfiVPNkX3Qny/ztcmMc79D2XUBPtj1sswCdQFVV/vyoitmjKkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682683429; 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=qdf/xExm/6H/Og1bwQxKR7M0HncnA6gwR548UPl0og8=; b=Ho0qCkNy+w23NwvkXwlsauOz2vWQavxItYiviPLAEgZTJCGzjk3Uyl/UiL7r7Q9PCzbQo4 +xSO2FPtPQEX/YuJD++l+tp4S8EnIoKWHl+EgkKknFlY6DjZegZkNc9esctgsI/cqEMhaP BNWr8NPz52o5NSFgAp6dm/6MBlyu8wMeBE4vsXbZgw9RTn8qI8ip9qAhB8Qiftk4sWv9j+ 5tEPoPL9n5hDDeCGkfIjDgQ+76N+G1WPdOX5sdidgMvim3k+m8pld601vZqJMdmqBlDQmi uDt+KUZiA3hrF/SDmdRjvav7Wz9pjIHmKjYPkw1PH6dEKLVZLWWhbktKWwdXyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682683429; a=rsa-sha256; cv=none; b=HmjKdiYcnX7a75rleyVpQJmpsWho3Dx2rx28FtawaQkUgVks4VhbkvkqS8vGrs2MjLcG1X RUls+nhHtoXz7pHFzIKEiznIanityD2mE4a38LyspIyFxhOS+jlKcscSY3Xf3iyuaTqled y7sep3q+ROmb23/5GY6Q5dntCVBysbfsJ0tZPK2gCYA+vSywzAu+qR5dB9R1iUT+AjtVJZ DMspK2QHbs1zg76Qb20diXvpMs6ZOPcpEbpCHWzv2PXIbX/1Gc8fawfPNcI6VWKyvf9kKr 3bjzrGIu+LKmn94KJkqnF2JgD4kLOBI79oYewy4K4MU3H0VPJSDPnEOAWKQ2xQ== 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 4Q7B8j47N8zyvF; Fri, 28 Apr 2023 12:03:49 +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 33SC3nqM032342; Fri, 28 Apr 2023 12:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SC3nKg032341; Fri, 28 Apr 2023 12:03:49 GMT (envelope-from git) Date: Fri, 28 Apr 2023 12:03:49 GMT Message-Id: <202304281203.33SC3nKg032341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: b8cca0cdc0c1 - stable/13 - bhyve: remove redundant variable 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b8cca0cdc0c1efe6282028de47ae7f56dc4fa6b1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b8cca0cdc0c1efe6282028de47ae7f56dc4fa6b1 commit b8cca0cdc0c1efe6282028de47ae7f56dc4fa6b1 Author: Vitaliy Gusev AuthorDate: 2023-03-01 07:45:46 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 12:01:23 +0000 bhyve: remove redundant variable Reviewed by: corvink,markj Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D38836 --- usr.sbin/bhyve/bhyverun.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 5c8265571be9..dd30eb4405ef 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1243,7 +1243,7 @@ set_defaults(void) int main(int argc, char *argv[]) { - int c, error, err; + int c, error; int max_vcpus, memflags; struct vmctx *ctx; uint64_t rip; @@ -1444,8 +1444,8 @@ main(int argc, char *argv[]) if (get_config_bool_default("memory.guest_in_core", false)) memflags |= VM_MEM_F_INCORE; vm_set_memflags(ctx, memflags); - err = vm_setup_memory(ctx, memsize, VM_MMAP_ALL); - if (err) { + error = vm_setup_memory(ctx, memsize, VM_MMAP_ALL); + if (error) { fprintf(stderr, "Unable to setup memory (%d)\n", errno); exit(4); }