svn commit: r368289 - stable/12/usr.sbin/bhyve

[John Baldwin]

Author: jhb
Date: Wed Dec  2 23:16:24 2020
New Revision: 368289
URL: https://svnweb.freebsd.org/changeset/base/368289

Log:
  MFC 355686: Fix a mismerge in r355683 and remove the local gdb_port from main.
  
  PR:		251501
  Reported by:	Yuichiro NAITO <naito.yuichiro at gmail.com>

Modified:
  stable/12/usr.sbin/bhyve/bhyverun.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/bhyve/bhyverun.c
==============================================================================
--- stable/12/usr.sbin/bhyve/bhyverun.c	Wed Dec  2 22:44:40 2020	(r368288)
+++ stable/12/usr.sbin/bhyve/bhyverun.c	Wed Dec  2 23:16:24 2020	(r368289)
@@ -1003,7 +1003,7 @@ do_open(const char *vmname)
 int
 main(int argc, char *argv[])
 {
-	int c, error, dbg_port, gdb_port, err, bvmcons;
+	int c, error, dbg_port, err, bvmcons;
 	int max_vcpus, mptgen, memflags;
 	int rtc_localtime;
 	bool gdb_stop;
@@ -1015,7 +1015,6 @@ main(int argc, char *argv[])
 	bvmcons = 0;
 	progname = basename(argv[0]);
 	dbg_port = 0;
-	gdb_port = 0;
 	gdb_stop = false;
 	guest_ncpus = 1;
 	sockets = cores = threads = 1;