Date: Fri, 13 Dec 2019 02:15:35 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355686 - head/usr.sbin/bhyve Message-ID: <201912130215.xBD2FZdn046772@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912130215.xBD2FZdn046772>