Author: jhb
Date: Fri Dec 13 02:15:34 2019
New Revision: 355686
URL: https://svnweb.freebsd.org/changeset/base/355686
Log:
Fix a mismerge in r355683 and remove the local gdb_port from main.
Modified:
head/usr.sbin/bhyve/bhyverun.c
Modified: head/usr.sbin/bhyve/bhyverun.c
==============================================================================
--- head/usr.sbin/bhyve/bhyverun.c Fri Dec 13 01:38:48 2019
(r355685)
+++ head/usr.sbin/bhyve/bhyverun.c Fri Dec 13 02:15:34 2019
(r355686)
@@ -984,7 +984,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;
@@ -996,7 +996,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;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
