Attachment 158789 Details for Bug 201578 – chapter.xml igor cleanup rev 2

[patch] chapter.xml igor cleanup rev 2

untitled.diff (text/plain), 39.46 KB, created by Shawn Debnath on 2015-07-15 05:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shawn Debnath

Created: 2015-07-15 05:50:01 UTC

Size: 39.46 KB

patch

obsolete

>Index: chapter.xml
>===================================================================
>--- chapter.xml	(revision 46961)
>+++ chapter.xml	(working copy)
>@@ -605,533 +605,561 @@
> 	</sect3>
>       </sect2>
> -->
>-    <sect2 xml:id="virtualization-guest-virtualpc">
>-      <title><application>Virtual PC</application> on
>-	&windows;</title>
>+      <sect2 xml:id="virtualization-guest-virtualpc">
>+	<title><application>Virtual PC</application> on
>+	  &windows;</title>
> 
>-      <para><application>Virtual PC</application> for &windows; is a
>-	&microsoft; software product available for free download.  See
>-	this website for the <link
>-	  xlink:href="http://www.microsoft.com/windows/downloads/virtualpc/sysreq.mspx">system
>-	  requirements</link>.  Once <application>Virtual
>-	  PC</application> has been installed on &microsoft.windows;,
>-	the user can configure a virtual machine and then install the
>-	desired guest operating system.</para>
>+	<para><application>Virtual PC</application> for &windows; is a
>+	  &microsoft; software product available for free download.
>+	  See this website for the <link
>+	    xlink:href="http://www.microsoft.com/windows/downloads/virtualpc/sysreq.mspx">system
>+	    requirements</link>.  Once <application>Virtual
>+	    PC</application> has been installed on
>+	    &microsoft.windows;, the user can configure a virtual
>+	    machine and then install the desired guest operating
>+	    system.</para>
> 
>-      <sect3 xml:id="virtualization-guest-virtualpc-install">
>-	<title>Installing &os; on <application>Virtual
>-	    PC</application></title>
>+	  <sect3 xml:id="virtualization-guest-virtualpc-install">
>+	    <title>Installing &os; on <application>Virtual
>+		PC</application></title>
> 
>-	<para>The first step in installing &os; on
>-	  <application>Virtual PC </application> is to create a new
>-	  virtual machine for installing &os;.  Select
>-	  <guimenuitem>Create a virtual machine</guimenuitem> when
>-	  prompted:</para>
>+	    <para>The first step in installing &os; on
>+	      <application>Virtual PC </application> is to create a
>+	      new virtual machine for installing &os;.  Select
>+	      <guimenuitem>Create a virtual machine</guimenuitem> when
>+	      prompted:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd1"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd1"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd2"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd2"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>Select <guimenuitem>Other</guimenuitem> as the
>-	  <guimenuitem>Operating system</guimenuitem> when
>-	  prompted:</para>
>+	    <para>Select <guimenuitem>Other</guimenuitem> as the
>+	      <guimenuitem>Operating system</guimenuitem> when
>+	      prompted:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd3"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd3"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>Then, choose a reasonable amount of disk and memory
>-	  depending on the plans for this virtual &os; instance.
>-	  4GB of disk space and 512MB of RAM work well for most uses
>-	  of &os; under <application>Virtual PC</application>:</para>
>+	    <para>Then, choose a reasonable amount of disk and memory
>+	      depending on the plans for this virtual &os; instance.
>+	      4GB of disk space and 512MB of RAM work well for most
>+	      uses of &os; under
>+	      <application>Virtual PC</application>:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd4"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd4"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd5"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd5"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>Save and finish the configuration:</para>
>+	    <para>Save and finish the configuration:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd6"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd6"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>Select the &os; virtual machine and click
>-	  <guimenu>Settings</guimenu>, then set the type of networking
>-	  and a network interface:</para>
>+	    <para>Select the &os; virtual machine and click
>+	      <guimenu>Settings</guimenu>, then set the type of
>+	      networking and a network interface:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd7"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd7"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd8"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd8"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>After the &os; virtual machine has been created, &os;
>-	  can be installed on it.  This is best done with an
>-	  official &os; CD/DVD or with an ISO image downloaded from an
>-	  official FTP site.  Copy the appropriate ISO image to the
>-	  local &windows; filesystem or insert a CD/DVD in the CD
>-	  drive, then double click on the &os; virtual machine to
>-	  boot.  Then, click <guimenu>CD</guimenu> and choose
>-	  <guimenu>Capture ISO Image...</guimenu> on the
>-	  <application>Virtual PC</application> window.  This will
>-	  bring up a window where the CDROM drive in the virtual
>-	  machine can be associated with an ISO file on disk or
>-	  with the real CDROM drive.</para>
>+	    <para>After the &os; virtual machine has been created,
>+	      &os; can be installed on it.  This is best done with an
>+	      official &os; CD/DVD or with an ISO image downloaded
>+	      from an official FTP site.  Copy the appropriate ISO
>+	      image to the local &windows; filesystem or insert a
>+	      CD/DVD in the CD
>+	      drive, then double click on the &os; virtual machine to
>+	      boot.  Then, click <guimenu>CD</guimenu> and choose
>+	      <guimenu>Capture ISO Image...</guimenu> on the
>+	      <application>Virtual PC</application> window.  This will
>+	      bring up a window where the CDROM drive in the virtual
>+	      machine can be associated with an ISO file on disk or
>+	      with the real CDROM drive.</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd9"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd9"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd10"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd10"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>Once this association with the CDROM source has been
>-	  made, reboot the &os; virtual machine by clicking
>-	  <guimenu>Action</guimenu> and <guimenu>Reset</guimenu>.
>-	  <application>Virtual PC</application> will reboot with a
>-	  special BIOS that first checks for a CDROM.</para>
>+	    <para>Once this association with the CDROM source has been
>+	      made, reboot the &os; virtual machine by clicking
>+	      <guimenu>Action</guimenu> and <guimenu>Reset</guimenu>.
>+	      <application>Virtual PC</application> will reboot with a
>+	      special BIOS that first checks for a CDROM.</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd11"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd11"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>In this case it will find the &os; installation media
>-	  and begin a normal &os; installation.  Continue with the
>-	  installation, but do not attempt to configure
>-	  <application>&xorg;</application> at this time.</para>
>+	    <para>In this case it will find the &os; installation
>+	      media and begin a normal &os; installation.  Continue
>+	      with the installation, but do not attempt to configure
>+	      <application>&xorg;</application> at this time.</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd12"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd12"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>When the installation is finished, remember to eject
>-	  the CD/DVD or release the ISO image.  Finally, reboot into
>-	  the newly installed &os; virtual machine.</para>
>+	    <para>When the installation is finished, remember to eject
>+	      the CD/DVD or release the ISO image.  Finally, reboot
>+	      into the newly installed &os; virtual machine.</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/virtualpc-freebsd13"/>
>-	  </imageobject>
>-	</mediaobject>
>-      </sect3>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata
>+		  fileref="virtualization/virtualpc-freebsd13"/>
>+	      </imageobject>
>+	    </mediaobject>
>+	  </sect3>
> 
>-      <sect3 xml:id="virtualization-guest-virtualpc-configure">
>-	<title>Configuring &os; on <application>Virtual
>-	    PC</application></title>
>+	  <sect3 xml:id="virtualization-guest-virtualpc-configure">
>+	    <title>Configuring &os; on <application>Virtual
>+		PC</application></title>
> 
>-	<para>After &os; has been successfully installed on
>-	  &microsoft.windows; with <application>Virtual PC
>-	  </application>, there are a number of configuration
>-	  steps that can be taken to optimize the system for
>-	  virtualized operation.</para>
>+	    <para>After &os; has been successfully installed on
>+	      &microsoft.windows; with <application>Virtual PC
>+	      </application>, there are a number of configuration
>+	      steps that can be taken to optimize the system for
>+	      virtualized operation.</para>
> 
>-	<procedure>
>-	  <step>
>-	    <title>Set Boot Loader Variables</title>
>+	    <procedure>
>+	      <step>
>+		<title>Set Boot Loader Variables</title>
> 
>-	    <para>The most important step is to reduce the
>-	      <option>kern.hz</option> tunable to reduce the CPU
>-	      utilization of &os; under the <application>Virtual
>-		PC</application> environment.  This is accomplished
>-	      by adding the following line to
>-	      <filename> /boot/loader.conf</filename>:</para>
>+		<para>The most important step is to reduce the
>+		  <option>kern.hz</option> tunable to reduce the CPU
>+		  utilization of &os; under the <application>Virtual
>+		  PC</application> environment.  This is accomplished
>+		  by adding the following line to
>+		  <filename> /boot/loader.conf</filename>:</para>
> 
>-	      <programlisting>kern.hz=100</programlisting>
>+		  <programlisting>kern.hz=100</programlisting>
> 
>-	    <para>Without this setting, an idle &os;
>-	      <application>Virtual PC</application> guest OS will
>-	      use roughly 40% of the CPU of a single processor
>-	      computer.  After this change, the usage will be
>-	      closer to 3%.</para>
>-	  </step>
>+		<para>Without this setting, an idle &os;
>+		  <application>Virtual PC</application> guest OS will
>+		  use roughly 40% of the CPU of a single processor
>+		  computer.  After this change, the usage will be
>+		  closer to 3%.</para>
>+	      </step>
> 
>-	  <step>
>-	    <title>Create a New Kernel Configuration File</title>
>+	      <step>
>+		<title>Create a New Kernel Configuration File</title>
> 
>-	    <para>All of the SCSI, FireWire, and USB device drivers
>-	      can be removed from a custom kernel configuration file.
>-	      <application>Virtual PC</application> provides a virtual
>-	      network adapter used by the &man.de.4; driver, so all
>-	      network devices except for &man.de.4; and &man.miibus.4;
>-	      can be removed from the kernel.</para>
>-	  </step>
>+		<para>All of the SCSI, FireWire, and USB device
>+		  drivers can be removed from a custom kernel
>+		  configuration file.
>+		  <application>Virtual PC</application> provides
>+		  a virtual network adapter used by the &man.de.4;
>+		  driver, so all network devices except
>+		  for &man.de.4; and &man.miibus.4; can be removed
>+		  from the kernel.</para>
>+	      </step>
> 
>-	  <step>
>-	    <title>Configure Networking</title>
>+	      <step>
>+		<title>Configure Networking</title>
> 
>-	    <para>The most basic networking setup uses DHCP to connect
>-	      the virtual machine to the same local area network as
>-	      the &microsoft.windows; host.  This can be accomplished
>-	      by adding <literal>ifconfig_de0="DHCP"</literal> to
>-	      <filename>/etc/rc.conf</filename>.  More advanced
>-	      networking setups are described in
>-	      <xref linkend="advanced-networking"/>.</para>
>-	  </step>
>-	</procedure>
>-      </sect3>
>-    </sect2>
>+		<para>The most basic networking setup uses DHCP to
>+		  connect the virtual machine to the same local area
>+		  network as the &microsoft.windows; host.  This can
>+		  be accomplished by adding
>+		  <literal>ifconfig_de0="DHCP"</literal> to
>+		  <filename>/etc/rc.conf</filename>.  More advanced
>+		  networking setups are described in
>+		  <xref linkend="advanced-networking"/>.</para>
>+	      </step>
>+	    </procedure>
>+	  </sect3>
>+	</sect2>
> 
>-    <sect2 xml:id="virtualization-guest-vmware">
>-      <title><application>VMware Fusion</application> on
>-	&macos;</title>
>+	<sect2 xml:id="virtualization-guest-vmware">
>+	  <title><application>VMware Fusion</application> on
>+	    &macos;</title>
> 
>-      <para><application>VMware Fusion</application> for &mac; is a
>-	commercial software product available for &intel; based
>-	&apple; &mac; computers running &macos; 10.4.9 or higher.
>-	&os; is a fully supported guest operating system.  Once
>-	<application>VMware Fusion</application> has been
>-	installed on &macos; X, the user can configure a virtual
>-	machine and then install the desired guest operating
>-	system.</para>
>+	  <para><application>VMware Fusion</application> for &mac; is
>+	    a commercial software product available for &intel; based
>+	    &apple; &mac; computers running &macos; 10.4.9 or higher.
>+	    &os; is a fully supported guest operating system.  Once
>+	    <application>VMware Fusion</application> has been
>+	    installed on &macos; X, the user can configure a virtual
>+	    machine and then install the desired guest operating
>+	    system.</para>
> 
>-      <sect3 xml:id="virtualization-guest-vmware-install">
>-	<title>Installing &os; on <application>VMware
>-	    Fusion</application></title>
>+	  <sect3 xml:id="virtualization-guest-vmware-install">
>+	    <title>Installing &os; on <application>VMware
>+		Fusion</application></title>
> 
>-	<para>The first step is to start <application>VMware
>-	    Fusion</application> which will load the Virtual
>-	  Machine Library.  Click <guimenuitem>New</guimenuitem> to
>-	  create the virtual machine:</para>
>+	    <para>The first step is to start
>+	      <application>VMware Fusion</application>
>+	      which will load the Virtual Machine Library.  Click
>+	      <guimenuitem>New</guimenuitem>
>+	      to create the virtual machine:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/vmware-freebsd01"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata fileref="virtualization/vmware-freebsd01"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>This will load the New Virtual Machine Assistant.  Click
>-	  <guimenuitem>Continue</guimenuitem> to proceed:</para>
>+	    <para>This will load the New Virtual Machine Assistant.
>+	      Click <guimenuitem>Continue</guimenuitem> to
>+	      proceed:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/vmware-freebsd02"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata fileref="virtualization/vmware-freebsd02"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>Select <guimenuitem>Other</guimenuitem> as the
>-	  <guimenuitem>Operating System</guimenuitem> and either
>-	  <guimenuitem>&os;</guimenuitem> or
>-	  <guimenuitem>&os; 64-bit</guimenuitem>, as the
>-	  <guimenu>Version</guimenu> when prompted:</para>
>+	    <para>Select <guimenuitem>Other</guimenuitem> as the
>+	      <guimenuitem>Operating System</guimenuitem> and either
>+	      <guimenuitem>&os;</guimenuitem> or
>+	      <guimenuitem>&os; 64-bit</guimenuitem>, as the
>+	      <guimenu>Version</guimenu> when prompted:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/vmware-freebsd03"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata fileref="virtualization/vmware-freebsd03"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>Choose the name of the virtual machine and the directory
>-	  where it should be saved:</para>
>+	    <para>Choose the name of the virtual machine and the
>+	      directory where it should be saved:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/vmware-freebsd04"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata fileref="virtualization/vmware-freebsd04"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>Choose the size of the Virtual Hard Disk for the virtual
>-	  machine:</para>
>+	    <para>Choose the size of the Virtual Hard Disk for the
>+	      virtual machine:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/vmware-freebsd05"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata fileref="virtualization/vmware-freebsd05"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>Choose the method to install the virtual machine,
>-	  either from an ISO image or from a CD/DVD:</para>
>+	    <para>Choose the method to install the virtual machine,
>+	      either from an ISO image or from a CD/DVD:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/vmware-freebsd06"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata fileref="virtualization/vmware-freebsd06"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>Click <guimenuitem>Finish</guimenuitem> and the virtual
>-	  machine will boot:</para>
>+	    <para>Click <guimenuitem>Finish</guimenuitem> and the
>+	      virtual machine will boot:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/vmware-freebsd07"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata fileref="virtualization/vmware-freebsd07"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>Install &os; as usual:</para>
>+	    <para>Install &os; as usual:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/vmware-freebsd08"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata fileref="virtualization/vmware-freebsd08"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>Once the install is complete, the settings
>-	  of the virtual machine can be modified, such as memory
>-	  usage:</para>
>+	    <para>Once the install is complete, the settings
>+	      of the virtual machine can be modified, such as memory
>+	      usage:</para>
> 
>-	<note>
>-	  <para>The System Hardware settings of the virtual machine
>-	    cannot be modified while the virtual machine is
>-	    running.</para>
>-	</note>
>+	    <note>
>+	      <para>The System Hardware settings of the virtual
>+		machine cannot be modified while the virtual machine
>+		is running.</para>
>+	    </note>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/vmware-freebsd09"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata fileref="virtualization/vmware-freebsd09"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>The number of CPUs the virtual machine will have access
>-	  to:</para>
>+	    <para>The number of CPUs the virtual machine will have
>+	      access to:</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/vmware-freebsd10"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata fileref="virtualization/vmware-freebsd10"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>The status of the CDROM device.  Normally the
>-	  CD/DVD/ISO is disconnected from the virtual machine when it
>-	  is no longer needed.</para>
>+	    <para>The status of the CDROM device.  Normally the
>+	      CD/DVD/ISO is disconnected from the virtual machine when
>+	      it is no longer needed.</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/vmware-freebsd11"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata fileref="virtualization/vmware-freebsd11"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>The last thing to change is how the virtual machine will
>-	  connect to the network.  To allow connections to the virtual
>-	  machine from other machines besides the host, choose
>-	  <guimenuitem>Connect directly to the physical network
>-	  (Bridged)</guimenuitem>.  Otherwise, <guimenuitem>Share the
>-	    host's internet connection (NAT)</guimenuitem> is
>-	  preferred so that the virtual machine can have access to the
>-	  Internet, but the network cannot access the virtual
>-	  machine.</para>
>+	    <para>The last thing to change is how the virtual machine
>+	      will connect to the network.  To allow connections to
>+	      the virtual machine from other machines besides the
>+	      host, choose <guimenuitem>Connect directly to the
>+	      physical network (Bridged)</guimenuitem>.  Otherwise,
>+	      <guimenuitem>Share the
>+	      host's internet connection (NAT)</guimenuitem> is
>+	      preferred so that the virtual machine can have access
>+	      to the Internet, but the network cannot access the
>+	      virtual machine.</para>
> 
>-	<mediaobject>
>-	  <imageobject>
>-	    <imagedata fileref="virtualization/vmware-freebsd12"/>
>-	  </imageobject>
>-	</mediaobject>
>+	    <mediaobject>
>+	      <imageobject>
>+		<imagedata fileref="virtualization/vmware-freebsd12"/>
>+	      </imageobject>
>+	    </mediaobject>
> 
>-	<para>After modifying the settings, boot the newly installed
>-	  &os; virtual machine.</para>
>-      </sect3>
>+	    <para>After modifying the settings, boot the newly
>+	      installed &os; virtual machine.</para>
>+	  </sect3>
> 
>-      <sect3 xml:id="virtualization-guest-vmware-configure">
>-	<title>Configuring &os; on <application>VMware
>-	    Fusion</application></title>
>+	  <sect3 xml:id="virtualization-guest-vmware-configure">
>+	    <title>Configuring &os; on <application>VMware
>+		Fusion</application></title>
> 
>-	<para>After &os; has been successfully installed on &macos; X
>-	  with <application>VMware Fusion</application>, there are a
>-	  number of configuration steps that can be taken to optimize
>-	  the system for virtualized operation.</para>
>+	    <para>After &os; has been successfully installed on
>+	      &macos; X with <application>VMware Fusion</application>,
>+	      there are a number of configuration steps that can be
>+	      taken to optimize the system for virtualized
>+	      operation.</para>
> 
>-	<procedure>
>-	  <step>
>-	    <title>Set Boot Loader Variables</title>
>+	    <procedure>
>+	      <step>
>+		<title>Set Boot Loader Variables</title>
> 
>-	    <para>The most important step is to reduce the
>-	      <option>kern.hz</option> tunable to reduce the CPU
>-	      utilization of &os; under the
>-	      <application>VMware Fusion</application> environment.
>-	      This is accomplished by adding the following line to
>-	      <filename>/boot/loader.conf</filename>:</para>
>+		<para>The most important step is to reduce the
>+		  <option>kern.hz</option> tunable to reduce the CPU
>+		  utilization of &os; under the
>+		  <application>VMware Fusion</application>
>+		  environment.  This is accomplished by adding the
>+		  following line to
>+		  <filename>/boot/loader.conf</filename>:</para>
> 
>-	    <programlisting>kern.hz=100</programlisting>
>+		<programlisting>kern.hz=100</programlisting>
> 
>-	    <para>Without this setting, an idle &os;
>-	      <application>VMware Fusion</application> guest will use
>-	      roughly 15% of the CPU of a single processor &imac;.
>-	      After this change, the usage will be closer to
>-	      5%.</para>
>-	  </step>
>+		<para>Without this setting, an idle &os;
>+		  <application>VMware Fusion</application> guest will
>+		  use roughly 15% of the CPU of a single processor
>+		  &imac;.  After this change, the usage will be closer
>+		  to 5%.</para>
>+	      </step>
> 
>-	  <step>
>-	    <title>Create a New Kernel Configuration File</title>
>+	      <step>
>+		<title>Create a New Kernel Configuration File</title>
> 
>-	    <para>All of the FireWire, and USB device drivers can be
>-	      removed from a custom kernel configuration file.
>-	      <application>VMware Fusion</application> provides a
>-	      virtual network adapter used by the &man.em.4; driver,
>-	      so all  network devices except for &man.em.4; can be
>-	      removed from the kernel.</para>
>-	  </step>
>+		<para>All of the FireWire, and USB device drivers can
>+		  be removed from a custom kernel configuration file.
>+		  <application>VMware Fusion</application> provides a
>+		  virtual network adapter used by the &man.em.4;
>+		  driver, so all  network devices except for
>+		  &man.em.4; can be removed from the kernel.</para>
>+	      </step>
> 
>-	  <step>
>-	    <title>Configure Networking</title>
>+	      <step>
>+		<title>Configure Networking</title>
> 
>-	    <para>The most basic networking setup uses DHCP to connect
>-	      the virtual machine to the same local area network as
>-	      the host &mac;.  This can be accomplished by adding
>-	      <literal>ifconfig_em0="DHCP"</literal> to
>-	      <filename>/etc/rc.conf</filename>.  More advanced
>-	      networking setups are described in
>-	      <xref linkend="advanced-networking"/>.</para>
>-	  </step>
>-	</procedure>
>-      </sect3>
>-    </sect2>
>+		<para>The most basic networking setup uses DHCP to
>+		  connect the virtual machine to the same local area
>+		  network as the host &mac;.  This can be accomplished
>+		  by adding <literal>ifconfig_em0="DHCP"</literal> to
>+		  <filename>/etc/rc.conf</filename>.  More advanced
>+		  networking setups are described in
>+		  <xref linkend="advanced-networking"/>.</para>
>+	      </step>
>+	    </procedure>
>+	  </sect3>
>+	</sect2>
> 
>-    <sect2 xml:id="virtualization-guest-virtualbox-guest-additions">
>-      <title>&virtualbox; Guest Additions on a &os; Guest</title>
>+	<sect2
>+	  xml:id="virtualization-guest-virtualbox-guest-additions">
>+	  <title>&virtualbox; Guest Additions on a &os; Guest</title>
> 
>-      <para>The <application>&virtualbox;</application> guest
>-	additions provide support for:</para>
>+	  <para>The <application>&virtualbox;</application> guest
>+	    additions provide support for:</para>
> 
>-      <itemizedlist>
>-	<listitem>
>-	  <para>Clipboard sharing.</para>
>-	</listitem>
>+	  <itemizedlist>
>+	    <listitem>
>+	      <para>Clipboard sharing.</para>
>+	    </listitem>
> 
>-	<listitem>
>-	  <para>Mouse pointer integration.</para>
>-	</listitem>
>+	    <listitem>
>+	      <para>Mouse pointer integration.</para>
>+	    </listitem>
> 
>-	<listitem>
>-	  <para>Host time synchronization.</para>
>-	</listitem>
>+	    <listitem>
>+	      <para>Host time synchronization.</para>
>+	    </listitem>
> 
>-	<listitem>
>-	  <para>Window scaling.</para>
>-	</listitem>
>+	    <listitem>
>+	      <para>Window scaling.</para>
>+	    </listitem>
> 
>-	<listitem>
>-	  <para>Seamless mode.</para>
>-	</listitem>
>-      </itemizedlist>
>+	    <listitem>
>+	      <para>Seamless mode.</para>
>+	    </listitem>
>+	  </itemizedlist>
> 
>-      <note>
>-	<para>The following commands are run in the &os; guest.</para>
>-      </note>
>+	  <note>
>+	    <para>The following commands are run in the &os;
>+	      guest.</para>
>+	  </note>
> 
>-      <para>First, install the
>-	<package>emulators/virtualbox-ose-additions</package> package
>-	or port in the &os; guest.  This will install the port:</para>
>+	  <para>First, install the
>+	    <package>emulators/virtualbox-ose-additions</package>
>+	    package or port in the &os; guest.  This will install the
>+	    port:</para>
> 
>-      <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions &amp;&amp; make install clean</userinput></screen>
>+	  <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions &amp;&amp; make install clean</userinput></screen>
> 
>-      <para>Add these lines to
>-	<filename>/etc/rc.conf</filename>:</para>
>+	  <para>Add these lines to
>+	    <filename>/etc/rc.conf</filename>:</para>
> 
>-      <programlisting>vboxguest_enable="YES"
>-vboxservice_enable="YES"</programlisting>
>+	  <programlisting>vboxguest_enable="YES"
>+    vboxservice_enable="YES"</programlisting>
> 
>-      <para>When <application>Xorg</application> will be used in the
>-	guest, any required supporting services must also be enabled
>-	just as if the guest was a physical machine.  Typically, these
>-	lines would also be added to
>-	<filename>/etc/rc.conf</filename>:</para>
>+	  <para>When <application>Xorg</application> will be used in
>+	    the guest, any required supporting services must also be
>+	    enabled just as if the guest was a physical machine.
>+	    Typically, these lines would also be added to
>+	    <filename>/etc/rc.conf</filename>:</para>
> 
>-<programlisting>hald_enable="YES"
>-dbus_enable="YES"</programlisting>
>+	  <programlisting>hald_enable="YES"
>+	    dbus_enable="YES"</programlisting>
> 
>-      <para>See <xref linkend="x-config"/> for details.</para>
>+	  <para>See <xref linkend="x-config"/> for details.</para>
> 
>-      <para>If &man.ntpd.8; or &man.ntpdate.8; is used, disable host
>-	time synchronization:</para>
>+	  <para>If &man.ntpd.8; or &man.ntpdate.8; is used, disable
>+	    host time synchronization:</para>
> 
>-      <programlisting>vboxservice_flags="--disable-timesync"</programlisting>
>+	  <programlisting>vboxservice_flags="--disable-timesync"</programlisting>
> 
>-      <para><application>Xorg</application> will automatically
>-	recognize the <literal>vboxvideo</literal> driver.
>-	It can also be manually entered in
>-	<filename>/etc/X11/xorg.conf</filename>:</para>
>+	  <para><application>Xorg</application> will automatically
>+	    recognize the <literal>vboxvideo</literal> driver.
>+	    It can also be manually entered in
>+	    <filename>/etc/X11/xorg.conf</filename>:</para>
> 
>-      <programlisting>Section "Device"
>-	### Available Driver options are:-
>-	### Values: &lt;i&gt;: integer, &lt;f&gt;: float, &lt;bool&gt;: "True"/"False",
>-	### &lt;string&gt;: "String", &lt;freq&gt;: "&lt;f&gt; Hz/kHz/MHz"
>-	### [arg]: arg optional
>-	Identifier "Card0"
>-	Driver "vboxvideo"
>-	VendorName "InnoTek Systemberatung GmbH"
>-	BoardName "VirtualBox Graphics Adapter"
>-	BusID "PCI:0:2:0"
>-EndSection</programlisting>
>+	  <programlisting>Section "Device"
>+	    ### Available Driver options are:-
>+	    ### Values: &lt;i&gt;: integer, &lt;f&gt;: float, &lt;bool&gt;: "True"/"False",
>+	    ### &lt;string&gt;: "String", &lt;freq&gt;: "&lt;f&gt; Hz/kHz/MHz"
>+	    ### [arg]: arg optional
>+	    Identifier "Card0"
>+	    Driver "vboxvideo"
>+	    VendorName "InnoTek Systemberatung GmbH"
>+	    BoardName "VirtualBox Graphics Adapter"
>+	    BusID "PCI:0:2:0"
>+    EndSection</programlisting>
> 
>-      <para>To use the <literal>vboxmouse</literal> driver, adjust the
>-	mouse section in
>-	<filename>/etc/X11/xorg.conf</filename>:</para>
>+	  <para>To use the <literal>vboxmouse</literal> driver, adjust
>+	    the mouse section in
>+	    <filename>/etc/X11/xorg.conf</filename>:</para>
> 
>-      <programlisting>Section "InputDevice"
>-	Identifier "Mouse0"
>-	Driver "vboxmouse"
>-EndSection</programlisting>
>+	  <programlisting>Section "InputDevice"
>+	    Identifier "Mouse0"
>+	    Driver "vboxmouse"
>+    EndSection</programlisting>
> 
>-      <para><acronym>HAL</acronym> users should create the following
>-	<filename>/usr/local/etc/hal/fdi/policy/90-vboxguest.fdi</filename>
>-	or copy it from
>-	<filename>/usr/local/share/hal/fdi/policy/10osvendor/90-vboxguest.fdi</filename>:</para>
>+	  <para><acronym>HAL</acronym> users should create the
>+	    following
>+	    <filename>/usr/local/etc/hal/fdi/policy/90-vboxguest.fdi</filename>
>+	    or copy it from
>+	    <filename>/usr/local/share/hal/fdi/policy/10osvendor/90-vboxguest.fdi</filename>:</para>
> 
>-      <programlisting>&lt;?xml version="1.0" encoding="utf-8"?&gt;
>-&lt;!--
>+	  <programlisting>&lt;?xml version="1.0" encoding="utf-8"?&gt;
>+    &lt;!--
> # Sun VirtualBox
> # Hal driver description for the vboxmouse driver
> # $Id: chapter.xml,v 1.33 2012-03-17 04:53:52 eadler Exp $
> 
>-	Copyright (C) 2008-2009 Sun Microsystems, Inc.
>+	    Copyright (C) 2008-2009 Sun Microsystems, Inc.
> 
>-	This file is part of VirtualBox Open Source Edition (OSE, as
>-	available from http://www.virtualbox.org. This file is free software;
>-	you can redistribute it and/or modify it under the terms of the GNU
>-	General Public License (GPL) as published by the Free Software
>-	Foundation, in version 2 as it comes in the "COPYING" file of the
>-	VirtualBox OSE distribution. VirtualBox OSE is distributed in the
>-	hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
>+	    This file is part of VirtualBox Open Source Edition (OSE, as
>+	    available from http://www.virtualbox.org. This file is free software;
>+	    you can redistribute it and/or modify it under the terms of the GNU
>+	    General Public License (GPL) as published by the Free Software
>+	    Foundation, in version 2 as it comes in the "COPYING" file of the
>+	    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
>+	    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
> 
>-	Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
>-	Clara, CA 95054 USA or visit http://www.sun.com if you need
>-	additional information or have any questions.
>---&gt;
>-&lt;deviceinfo version="0.2"&gt;
>-  &lt;device&gt;
>-    &lt;match key="info.subsystem" string="pci"&gt;
>-      &lt;match key="info.product" string="VirtualBox guest Service"&gt;
>-        &lt;append key="info.capabilities" type="strlist"&gt;input&lt;/append&gt;
>-	&lt;append key="info.capabilities" type="strlist"&gt;input.mouse&lt;/append&gt;
>-        &lt;merge key="input.x11_driver" type="string"&gt;vboxmouse&lt;/merge&gt;
>-	&lt;merge key="input.device" type="string"&gt;/dev/vboxguest&lt;/merge&gt;
>-      &lt;/match&gt;
>-    &lt;/match&gt;
>-  &lt;/device&gt;
>-&lt;/deviceinfo&gt;</programlisting>
>+	    Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
>+	    Clara, CA 95054 USA or visit http://www.sun.com if you need
>+	    additional information or have any questions.
>+    --&gt;
>+    &lt;deviceinfo version="0.2"&gt;
>+      &lt;device&gt;
>+	&lt;match key="info.subsystem" string="pci"&gt;
>+	  &lt;match key="info.product" string="VirtualBox guest Service"&gt;
>+	    &lt;append key="info.capabilities" type="strlist"&gt;input&lt;/append&gt;
>+	    &lt;append key="info.capabilities" type="strlist"&gt;input.mouse&lt;/append&gt;
>+	    &lt;merge key="input.x11_driver" type="string"&gt;vboxmouse&lt;/merge&gt;
>+	    &lt;merge key="input.device" type="string"&gt;/dev/vboxguest&lt;/merge&gt;
>+	  &lt;/match&gt;
>+	&lt;/match&gt;
>+      &lt;/device&gt;
>+    &lt;/deviceinfo&gt;</programlisting>
>     </sect2>
>   </sect1>
> 
>@@ -1320,18 +1348,23 @@
>       requires a computer with a newer processor that supports &intel;
>       Extended Page Tables (<acronym>EPT</acronym>) or &amd; Rapid
>       Virtualization Indexing (<acronym>RVI</acronym>), also known as
>-      Nested Page Tables (<acronym>NPT</acronym>).  Most newer
>-      processors, specifically the &intel;&nbsp;&core; i3/i5/i7 and
>-      &intel;&nbsp;&xeon; E3/E5/E7, support this feature.  For a
>-      complete list of &intel; processors that support
>-      <acronym>EPT</acronym>, refer to <link
>+      Nested Page Tables (<acronym>NPT</acronym>).  In addition, to
>+      host &linux; guests, or &os; guests with more than one vCPU,
>+      VMX unrestricted mode support (<acronym>UG</acronym>) is also
>+      required.  Most newer processors, specifically the &intel;&nbsp;
>+      &core; i3/i5/i7 and &intel;&nbsp;&xeon; E3/E5/E7 support these
>+      features.  <acronym>UG</acronym> support was introduced with the
>+      Westmere micro-architecture.  For a complete list of &intel;
>+      processors that support <acronym>EPT</acronym>, refer to <link
>       xlink:href="http://ark.intel.com/search/advanced?s=t&amp;ExtendedPageTables=true">http://ark.intel.com/search/advanced?s=t&amp;ExtendedPageTables=true</link>.
>-      <acronym>RVI</acronym> is found on the 3rd  generation and later
>-      of the &amd.opteron; (Barcelona) processors.  The easiest way to
>-      check for support of <acronym>EPT</acronym> or
>-      <acronym>RVI</acronym> is to look for the
>-      <literal>POPCNT</literal> processor feature flag on the
>-      <literal>Features2</literal> line in <command>dmesg</command> or
>+      <acronym>RVI</acronym> is found on the Third generation and
>+      later of the &amd.opteron; (Barcelona) processors.  The easiest
>+      way to check for support of <acronym>EPT</acronym>,
>+      <acronym>RVI</acronym>, or <acronym>UG</acronym> is to look for
>+      the <literal>POPCNT</literal> processor feature flag on the
>+      <literal>Features2</literal> line and <literal>EPT</literal> and
>+      <literal>UG</literal> on the <literal>VT-x</literal> line in
>+      command>dmesg</command> or
>       <filename>/var/run/dmesg.boot</filename>.</para>
> 
>     <sect2 xml:id="virtualization-bhyve-prep">
>@@ -1506,6 +1539,24 @@
>       <screen>&prompt.root; <userinput>bhyvectl --destroy --vm=<replaceable>linuxguest</replaceable></userinput></screen>
>     </sect2>
> 
>+
>+    <sect2 xml:id="virtualization-bhyve-zfs">
>+      <title>Using ZFS with Bhyve Guests</title>
>+
>+      <para>If the host machine is running on ZFS, using ZFS volumes
>+	instead of disk image files may provide significant
>+	performance benefits for the bhyve guest VMs.  A ZFS volume
>+	can be created by:</para>
>+
>+      <screen>&prompt.root; <userinput>zfs create -V16G -o volmode=dev zroot/vdisk0 </screen></userinput> </screen>
>+
>+      <para>Once created, the ZFS volume can be specified as the disk
>+	drive when invoking bhyve to start the guest vm:</para>
>+
>+      <screen>&prompt.root; <userinput>bhyve -AI -H -P -s 0:0,hostbridge -s 1:0,lpc -s 2:0,virtio-net,tap1 -s3:0,ahci-hd,/dev/zroot/vdisk0 \
>+	-l com1,stdio -c <replaceable>4</replaceable> -m <replaceable>1024M</replaceable> <replaceable>linuxguest</replaceable></userinput></screen>
>+    </sect2>
>+
>     <sect2 xml:id="virtualization-bhyve-nmdm">
>       <title>Virtual Machine Consoles</title>
> 
>@@ -1525,6 +1576,9 @@
> 	(<filename>/dev/nmdm1A</filename> and
> 	<filename>/dev/nmdm1B</filename>).  See &man.nmdm.4; for more
> 	information.</para>
>+      <para>The example below shows how to boot the &linux; guest
>+	created above with the console redirected to the null modem.
>+	&os; guests can be configured similarly.</para>
> 
>       <screen>&prompt.root; <userinput>kldload nmdm</userinput>
> &prompt.root; <userinput>bhyve -AI -H -P -s 0:0,hostbridge -s 1:0,lpc -s 2:0,virtio-net,tap1 -s 3:0,virtio-blk,./linux.img \

Actions: View | Diff

Attachments on bug 201578: 158786 | 158788 | 158789 | 158813 | 159023