X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=qemu-sanity-check.pod.in;h=7ef32002101f2cfc8912246c2af1944929712ca1;hb=8d7e14545801c2341055bda9dfe0239e9279ce10;hp=da3f2370d2126e5054007fce304baa7f45fd0946;hpb=2e43e769fbb287fa3e25363e3f65f85e2123469b;p=qemu-sanity-check.git

diff --git a/qemu-sanity-check.pod.in b/qemu-sanity-check.pod.in
index da3f237..7ef3200 100644
--- a/qemu-sanity-check.pod.in
+++ b/qemu-sanity-check.pod.in
@@ -61,6 +61,29 @@ Initrd/initramfs (C<CONFIG_BLK_DEV_INITRD=y>)
 
 Display short help message and exit.
 
+=item B<--accel>=kvm
+
+=item B<--accel>=tcg
+
+=item B<--accel>=kvm:tcg
+
+This sets the C<-machine accel=...> parameter which is passed to
+qemu.
+
+If not set, then C<kvm:tcg> is the default, which means to try to use
+KVM (hardware-assisted virtualization), and fall back to software
+emulation if KVM is not possible.
+
+Other typical values of this parameter are: C<tcg>, which means to
+force software emulation.  C<kvm>, which means to force KVM and fail
+if KVM is unavailable.
+
+=item B<--cpu>=CPU
+
+Set the qemu I<--cpu> option.  If not set then a suitable default is
+picked depending on the architecture and whether KVM is available.
+You can also use I<--cpu=> to let qemu pick the default.
+
 =item B<-i> INITRD
 
 =item B<--initrd>=INITRD
@@ -74,6 +97,14 @@ Use the initramfs image named C<INITRD> instead of the default.
 Use the kernel image C<VMLINUZ> instead of searching for the latest
 kernel installed in C</boot>.
 
+=item B<-m> MACHINE
+
+=item B<--machine>=MACHINE
+
+Set the qemu I<-m> (machine type) option.  If not set then a suitable
+default is picked depending on the architecture.  You can also use
+I<--machine=> to let qemu pick the default.
+
 =item B<-q> QEMU
 
 =item B<--qemu>=QEMU
@@ -81,6 +112,21 @@ kernel installed in C</boot>.
 Use the qemu (or KVM) binary C<QEMU> instead of searching C<$PATH> for
 a suitable binary.
 
+=item B<-t> TIMEOUT
+
+=item B<--timeout>=TIMEOUT
+
+Specify a timeout instead of the default which is C<10m> (10 minutes).
+
+The syntax for the C<TIMEOUT> is described in full in the man page for
+L<timeout(1)>.
+
+=item B<-v>
+
+=item B<--verbose>
+
+Print extra debugging information.
+
 =item B<-V>
 
 =item B<--version>
@@ -110,16 +156,6 @@ test that userspace has been reached.
 
 =back
 
-=head1 BUGS
-
-=head2 TIMEOUTS
-
-Timeouts don't currently work because of some oddness with the
-coreutils L<timeout(1)> program and qemu.  Instead you should run the
-whole script with a timeout, like this:
-
- timeout 10m qemu-sanity-check
-
 =head1 SEE ALSO
 
 L<http://qemu.org>,
@@ -131,7 +167,7 @@ Richard W.M. Jones <rjones@redhat.com>
 
 =head1 COPYRIGHT
 
-(C) Copyright 2013 Red Hat Inc.
+(C) Copyright 2013-2020 Red Hat Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -143,6 +179,6 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.