git: 956171d5bc29 - main - bhyve: remove redundant variable

From: Robert Wing <rew_at_FreeBSD.org>
Date: Wed, 01 Mar 2023 16:52:55 UTC
The branch main has been updated by rew:

URL: https://cgit.FreeBSD.org/src/commit/?id=956171d5bc2945bb8740ca8d3c2fcb6c5cc76954

commit 956171d5bc2945bb8740ca8d3c2fcb6c5cc76954
Author:     Vitaliy Gusev <gusev.vitaliy@gmail.com>
AuthorDate: 2023-03-01 07:45:46 +0000
Commit:     Robert Wing <rew@FreeBSD.org>
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);
 	}