From owner-svn-src-all@FreeBSD.ORG Thu Jun 26 20:12:39 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2EB488C; Thu, 26 Jun 2014 20:12:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9572D2401; Thu, 26 Jun 2014 20:12:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QKCdBL093127; Thu, 26 Jun 2014 20:12:39 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QKCdAn093124; Thu, 26 Jun 2014 20:12:39 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201406262012.s5QKCdAn093124@svn.freebsd.org> From: John Baldwin Date: Thu, 26 Jun 2014 20:12:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267934 - head/usr.sbin/bhyve X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jun 2014 20:12:39 -0000 Author: jhb Date: Thu Jun 26 20:12:38 2014 New Revision: 267934 URL: http://svnweb.freebsd.org/changeset/base/267934 Log: - Document -b to enable the bvmcons console (but mark it as deprecated similar to -g.) - Document -U to set the SMBIOS UUID. - Add missing options to the usage output and to the manpage Synopsis. - Don't claim that bvmdebug is amd64-only (it is also a device, not an option). Modified: head/usr.sbin/bhyve/bhyve.8 head/usr.sbin/bhyve/bhyverun.c Modified: head/usr.sbin/bhyve/bhyve.8 ============================================================================== --- head/usr.sbin/bhyve/bhyve.8 Thu Jun 26 20:06:37 2014 (r267933) +++ head/usr.sbin/bhyve/bhyve.8 Thu Jun 26 20:12:38 2014 (r267934) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 2, 2014 +.Dd June 26, 2014 .Dt BHYVE 8 .Os .Sh NAME @@ -32,12 +32,14 @@ .Nd "run a guest operating system inside a virtual machine" .Sh SYNOPSIS .Nm -.Op Fl aehwxACHPW +.Op Fl abehwxACHPWY .Op Fl c Ar numcpus .Op Fl g Ar gdbport +.Op Fl m Ar size Ns Op Ar K|k|M|m|G|g|T|t .Op Fl p Ar vcpu:hostcpu .Op Fl s Ar slot,emulation Ns Op , Ns Ar conf .Op Fl l Ar lpcdev Ns Op , Ns Ar conf +.Op Fl U Ar uuid .Ar vmname .Sh DESCRIPTION .Nm @@ -66,6 +68,11 @@ Generate ACPI tables. Required for .Fx Ns /amd64 guests. +.It Fl b +Enable a low-level console device supported by +.Fx kernels compiled with +.Cd "device bvmconsole" . +This option will be deprecated in a future version. .It Fl c Ar numcpus Number of guest virtual CPUs. The default is 1 and the maximum is 16. @@ -76,8 +83,9 @@ Yield the virtual CPU thread when a HLT If this option is not specified, virtual CPUs will use 100% of a host CPU. .It Fl g Ar gdbport For -.Fx Ns /amd64 kernels compiled with -.Cd "option bvmdebug" , +.Fx +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. @@ -231,6 +239,12 @@ Force .Nm to exit when a guest issues an access to an I/O port that is not emulated. This is intended for debug purposes. +.It Fl U Ar uuid +Set the universally unique identifier +.Pq UUID +in the guest's System Management BIOS System Information structure. +By default a UUID is generated from the host's hostname and +.Ar vmname . .It Fl w Ignore accesses to unimplemented Model Specific Registers (MSRs). This is intended for debug purposes. .It Fl x Modified: head/usr.sbin/bhyve/bhyverun.c ============================================================================== --- head/usr.sbin/bhyve/bhyverun.c Thu Jun 26 20:06:37 2014 (r267933) +++ head/usr.sbin/bhyve/bhyverun.c Thu Jun 26 20:12:38 2014 (r267934) @@ -129,10 +129,10 @@ usage(int code) { fprintf(stderr, - "Usage: %s [-aehwAHIPW] [-g ] [-s ] [-c vcpus]\n" - " %*s [-p vcpu:hostcpu] [-m mem] [-l ] \n" + "Usage: %s [-abehwxACHPWY] [-g ] [-s ] [-c vcpus]\n" + " %*s [-p vcpu:hostcpu] [-m mem] [-l ] [-U uuid] \n" " -a: local apic is in xAPIC mode (deprecated)\n" - " -A: create an ACPI table\n" + " -A: create ACPI tables\n" " -g: gdb port\n" " -c: # cpus (default 1)\n" " -C: include guest memory in core file\n"