From 4af2b9793ef68d110ccdb2ec124f99788ac8fc61 Mon Sep 17 00:00:00 2001
From: Robert Wing <rew@FreeBSD.org>
Date: Thu, 17 Dec 2020 19:49:17 +0000
Subject: MFC r368519:

Add deprecation notice for bvmconsole and bvmdebug.

Now that bhyve(8) supports UART, bvmconsole and bvmdebug are no longer needed.

Mark the '-b' and '-g' flag as deprecated for bhyve(8).

These will be removed/gone in 13.
---
 sys/dev/bvm/bvm_console.c | 2 ++
 sys/dev/bvm/bvm_dbg.c     | 2 ++
 usr.sbin/bhyve/bhyve.8    | 8 +++++---
 usr.sbin/bhyve/bhyverun.c | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/sys/dev/bvm/bvm_console.c b/sys/dev/bvm/bvm_console.c
index bc66dfa3bcb5..c73f462ed84f 100644
--- a/sys/dev/bvm/bvm_console.c
+++ b/sys/dev/bvm/bvm_console.c
@@ -107,6 +107,8 @@ static void
 cn_drvinit(void *unused)
 {
 	struct tty *tp;
+    
+	gone_in(13, "bvmconsole");
 
 	if (bvm_consdev.cn_pri != CN_DEAD) {
 		tp = tty_alloc(&bvm_ttydevsw, NULL);
diff --git a/sys/dev/bvm/bvm_dbg.c b/sys/dev/bvm/bvm_dbg.c
index 5aa0fe731d79..9aff8c10c8fb 100644
--- a/sys/dev/bvm/bvm_dbg.c
+++ b/sys/dev/bvm/bvm_dbg.c
@@ -61,6 +61,8 @@ bvm_dbg_probe(void)
 	disabled = 0;
 	resource_int_value("bvmdbg", 0, "disabled", &disabled);
 
+	gone_in(13, "bvmdebug");
+
 	if (!disabled) {
 		if (resource_int_value("bvmdbg", 0, "port", &port) == 0)
 			bvm_dbg_port = port;
diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8
index d6fdb471eab2..a104a60ab21f 100644
--- a/usr.sbin/bhyve/bhyve.8
+++ b/usr.sbin/bhyve/bhyve.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 22, 2020
+.Dd December 8, 2020
 .Dt BHYVE 8
 .Os
 .Sh NAME
@@ -103,7 +103,8 @@ Enable a low-level console device supported by
 .Fx
 kernels compiled with
 .Cd "device bvmconsole" .
-This option will be deprecated in a future version.
+This option is deprecated and will be removed in
+.Fx 13.0 .
 .It Fl c Op Ar setting ...
 Number of guest virtual CPUs
 and/or the CPU topology.
@@ -144,7 +145,8 @@ kernels compiled with
 .Cd "device bvmdebug" ,
 allow a remote kernel kgdb to be relayed to the guest kernel gdb stub
 via a local IPv4 address and this port.
-This option will be deprecated in a future version.
+This option is deprecated and will be removed in
+.Fx 13.0 .
 .It Fl G Ar port
 Start a debug server that uses the GDB protocol to export guest state to a
 debugger.
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index cd4790fd14a2..c2990d480808 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -1034,6 +1034,7 @@ main(int argc, char *argv[])
 			acpi = 1;
 			break;
 		case 'b':
+			warnx("-b flag is deprecated and will be removed in FreeBSD 13.0");
 			bvmcons = 1;
 			break;
 		case 'D':
@@ -1055,6 +1056,7 @@ main(int argc, char *argv[])
 			memflags |= VM_MEM_F_INCORE;
 			break;
 		case 'g':
+			warnx("-g flag is deprecated and will be removed in FreeBSD 13.0");
 			dbg_port = atoi(optarg);
 			break;
 		case 'G':
-- 
cgit v1.2.3