The branch stable/13 has been updated by 0mp (doc, ports committer):

URL: 
https://cgit.FreeBSD.org/src/commit/?id=12ad3e2b41cc82fa4896f6719c688d4182e61509

commit 12ad3e2b41cc82fa4896f6719c688d4182e61509
Author:     Mateusz Piotrowski <[email protected]>
AuthorDate: 2021-04-18 18:13:54 +0000
Commit:     Mateusz Piotrowski <[email protected]>
CommitDate: 2021-08-16 08:14:58 +0000

    bhyve: Improve the option description in the usage message
    
    - Sort options as suggested by style(9)
    - Capitalize some words like CPU and HLT
    - Add a missing description for the -G flag
    
    MFC after:      2 weeks
    
    (cherry picked from commit b6a572d03f654236b929b91d376ad1a6dfaa2e9a)
---
 usr.sbin/bhyve/bhyverun.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index 8c87a0e7328e..d14219bbef65 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -226,30 +226,31 @@ usage(int code)
                "       %*s [-c 
[[cpus=]numcpus][,sockets=n][,cores=n][,threads=n]]\n"
                "       %*s [-G port] [-k file] [-l lpc] [-m mem] [-o 
var=value]\n"
                "       %*s [-p vcpu:hostcpu] [-r file] [-s pci] [-U uuid] 
vmname\n"
-               "       -a: local apic is in xAPIC mode (deprecated)\n"
                "       -A: create ACPI tables\n"
-               "       -c: number of cpus and/or topology specification\n"
+               "       -a: local apic is in xAPIC mode (deprecated)\n"
                "       -C: include guest memory in core file\n"
+               "       -c: number of CPUs and/or topology specification\n"
                "       -D: destroy on power-off\n"
                "       -e: exit on unhandled I/O access\n"
+               "       -G: start a debug server\n"
+               "       -H: vmexit from the guest on HLT\n"
                "       -h: help\n"
-               "       -H: vmexit from the guest on hlt\n"
                "       -k: key=value flat config file\n"
                "       -l: LPC device configuration\n"
                "       -m: memory size in MB\n"
                "       -o: set config 'var' to 'value'\n"
-               "       -p: pin 'vcpu' to 'hostcpu'\n"
                "       -P: vmexit from the guest on pause\n"
+               "       -p: pin 'vcpu' to 'hostcpu'\n"
 #ifdef BHYVE_SNAPSHOT
                "       -r: path to checkpoint file\n"
 #endif
-               "       -s: <slot,driver,configinfo> PCI slot config\n"
                "       -S: guest memory cannot be swapped\n"
+               "       -s: <slot,driver,configinfo> PCI slot config\n"
+               "       -U: UUID\n"
                "       -u: RTC keeps UTC time\n"
-               "       -U: uuid\n"
-               "       -w: ignore unimplemented MSRs\n"
                "       -W: force virtio to use single-vector MSI\n"
-               "       -x: local apic is in x2APIC mode\n"
+               "       -w: ignore unimplemented MSRs\n"
+               "       -x: local APIC is in x2APIC mode\n"
                "       -Y: disable MPtable generation\n",
                progname, (int)strlen(progname), "", (int)strlen(progname), "",
                (int)strlen(progname), "");
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to