From nobody Wed Mar 1 16:52:55 2023 X-Original-To: dev-commits-src-all@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 4PRgK34R8vz3v5YF; Wed, 1 Mar 2023 16:52:55 +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 4PRgK33WCSz3w6t; Wed, 1 Mar 2023 16:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677689575; 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=PZd0iMa+Ore57ic6TgSK9iWtZjYJ8laCfi2ONu8fW9o=; b=QjSu5IKCBd66pAQ4/LD79yJIEMNtD4/WqpVtuGBAaN+Ap0+xJPvvAlxEnaVJqwnBvOUeIy k3u3wzgtrGOb7Fi2u9A+LCHOMIE/SznqpncAL7wVc9afQ/9D4Ql75Geb2vLLpnXd3HoeG4 ip7GIJdZ1lYyH8KDk4FP0PN4eyYAx2NILjEjjKWB3YZbJJB7I4ivDild9RTQEaS+Tx5i6W RKz9fHr6/xDbGarTJy62PHts8/1S2go8N7Llhywm3UFparDzfxXme+nFQWH1CXRCHWfWdF XvlPBwN8EspvVJExK6oUlLyeL+8dOOc+W5sM/IrKUhEJUL9kEySP+whwp2kfMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677689575; 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=PZd0iMa+Ore57ic6TgSK9iWtZjYJ8laCfi2ONu8fW9o=; b=xf29viQH02NA1jqBuVzmXp6BWFgLujALlzo2+UDjWVeUvu/qkmaMNM70rcRBulsXT2JOND b54vBaWiUC/pk0rEe7CB779fCPUbz/fotxhcrVeuvMeJY21eGbCKigeHOIbBw86Z8DyeYZ GGwPZ7lNmS6DrY/PmazJHoMz+i7ol/DDjTXRzwXd0QmghHMAC4YyrRCXE9tB4wxk1R7yO+ PbRqfBYYSeu+JJ4UhrwcnkJMCFxKwMLsrxVGtQBPnAsXyxKsueVBHWd9lPqaqfzbAiiTum wMKKwiahJXb3flp53ASQBupnJfVCmPl3G1DN7PGTTpXKBGkvEHI6m1S1M+H3rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677689575; a=rsa-sha256; cv=none; b=Qk621yA32DlSU3CMdlnEx1oPQBrXa73KvKsw6ASeFxM+6u2l5i5cAryr7hLf4oC7dDeNGA tL4TzMudgQ/ZjOifv1cv3EAWn58kcgce28I3BlHrH/N04GWPq9oGs3T8dUX8AvPOYuB6ld VC4ACEUK2ctiH++yXpV0i5q+JWZPNn90j0TX1Cq3r4KTfA7S4kdXR4s2aKKVzDvFAhg0pO mKmqqVm2062B2Gn5NfsOFqQ06/jBSO8Xq0bKWhUaF6wo+AIaxNPWAZVyoleBMTyKh7jW3p lnNQmFhFpSYxwjnCf2TVpPTKRNM/eR6HQX67akX4aUGoKm4VNeuMsmeniigc9A== 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 4PRgK32ZgBzhZC; Wed, 1 Mar 2023 16:52:55 +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 321Gqtm0034039; Wed, 1 Mar 2023 16:52:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321Gqt8f034038; Wed, 1 Mar 2023 16:52:55 GMT (envelope-from git) Date: Wed, 1 Mar 2023 16:52:55 GMT Message-Id: <202303011652.321Gqt8f034038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 956171d5bc29 - main - bhyve: remove redundant variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 956171d5bc2945bb8740ca8d3c2fcb6c5cc76954 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=956171d5bc2945bb8740ca8d3c2fcb6c5cc76954 commit 956171d5bc2945bb8740ca8d3c2fcb6c5cc76954 Author: Vitaliy Gusev AuthorDate: 2023-03-01 07:45:46 +0000 Commit: Robert Wing CommitDate: 2023-03-01 07:45:46 +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 3ff83f55474b..2c1fee23cc13 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1236,7 +1236,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; @@ -1437,8 +1437,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); }