cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch

958e1b
From 7266fe6b09986cfa24d704075d940022cabdc8f5 Mon Sep 17 00:00:00 2001
958e1b
From: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
Date: Fri, 14 Nov 2014 08:28:01 +0100
958e1b
Subject: [PATCH 32/41] ] Use qemu-kvm in documentation instead of
958e1b
 qemu-system-i386
958e1b
958e1b
Message-id: <1415953681-20015-1-git-send-email-mrezanin@redhat.com>
958e1b
Patchwork-id: 62376
958e1b
O-Subject: [RHEL-7.1 qemu-kvm PATCHv4]] Use qemu-kvm in documentation instead of qemu-system-i386
958e1b
Bugzilla: 1140618
958e1b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
958e1b
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
958e1b
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
958e1b
958e1b
From: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
958e1b
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1140618
958e1b
Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=8244530
958e1b
958e1b
We change the name and location of qemu-kvm binaries. Update documentation
958e1b
to reflect this change.
958e1b
958e1b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
---
958e1b
v4:
958e1b
 - Replace qemu with qemu-kvm
958e1b
958e1b
v3:
958e1b
 - Use qemu-kvm instead of /usr/libexec/qemu-kvm
958e1b
 - Replace qemu-system-x86_64 too
958e1b
958e1b
v2:
958e1b
 - do not replace qemu-system-i386.exe
958e1b
---
958e1b
 qemu-doc.texi   |  98 ++++++++++++++++++++++-----------------------
958e1b
 qemu-options.hx | 120 ++++++++++++++++++++++++++++----------------------------
958e1b
 2 files changed, 109 insertions(+), 109 deletions(-)
958e1b
958e1b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
---
958e1b
 qemu-doc.texi   |  98 ++++++++++++++++++++++-----------------------
958e1b
 qemu-options.hx | 120 ++++++++++++++++++++++++++++----------------------------
958e1b
 2 files changed, 109 insertions(+), 109 deletions(-)
958e1b
958e1b
diff --git a/qemu-doc.texi b/qemu-doc.texi
958e1b
index 0f7e5f8..ff124fe 100644
958e1b
--- a/qemu-doc.texi
958e1b
+++ b/qemu-doc.texi
958e1b
@@ -226,12 +226,12 @@ Note that, by default, GUS shares IRQ(7) with parallel ports and so
958e1b
 QEMU must be told to not have parallel ports to have working GUS.
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 dos.img -soundhw gus -parallel none
958e1b
+qemu-kvm dos.img -soundhw gus -parallel none
958e1b
 @end example
958e1b
 
958e1b
 Alternatively:
958e1b
 @example
958e1b
-qemu-system-i386 dos.img -device gus,irq=5
958e1b
+qemu-kvm dos.img -device gus,irq=5
958e1b
 @end example
958e1b
 
958e1b
 Or some other unclaimed IRQ.
958e1b
@@ -247,7 +247,7 @@ CS4231A is the chip used in Windows Sound System and GUSMAX products
958e1b
 Download and uncompress the linux image (@file{linux.img}) and type:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 linux.img
958e1b
+qemu-kvm linux.img
958e1b
 @end example
958e1b
 
958e1b
 Linux should boot and give you a prompt.
958e1b
@@ -257,7 +257,7 @@ Linux should boot and give you a prompt.
958e1b
 
958e1b
 @example
958e1b
 @c man begin SYNOPSIS
958e1b
-usage: qemu-system-i386 [options] [@var{disk_image}]
958e1b
+usage: qemu-kvm [options] [@var{disk_image}]
958e1b
 @c man end
958e1b
 @end example
958e1b
 
958e1b
@@ -766,7 +766,7 @@ QEMU can automatically create a virtual FAT disk image from a
958e1b
 directory tree. In order to use it, just type:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 linux.img -hdb fat:/my_directory
958e1b
+qemu-kvm linux.img -hdb fat:/my_directory
958e1b
 @end example
958e1b
 
958e1b
 Then you access access to all the files in the @file{/my_directory}
958e1b
@@ -776,14 +776,14 @@ them via SAMBA or NFS. The default access is @emph{read-only}.
958e1b
 Floppies can be emulated with the @code{:floppy:} option:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 linux.img -fda fat:floppy:/my_directory
958e1b
+qemu-kvm linux.img -fda fat:floppy:/my_directory
958e1b
 @end example
958e1b
 
958e1b
 A read/write support is available for testing (beta stage) with the
958e1b
 @code{:rw:} option:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 linux.img -fda fat:floppy:rw:/my_directory
958e1b
+qemu-kvm linux.img -fda fat:floppy:rw:/my_directory
958e1b
 @end example
958e1b
 
958e1b
 What you should @emph{never} do:
958e1b
@@ -801,14 +801,14 @@ QEMU can access directly to block device exported using the Network Block Device
958e1b
 protocol.
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 linux.img -hdb nbd://my_nbd_server.mydomain.org:1024/
958e1b
+qemu-kvm linux.img -hdb nbd://my_nbd_server.mydomain.org:1024/
958e1b
 @end example
958e1b
 
958e1b
 If the NBD server is located on the same host, you can use an unix socket instead
958e1b
 of an inet socket:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 linux.img -hdb nbd+unix://?socket=/tmp/my_socket
958e1b
+qemu-kvm linux.img -hdb nbd+unix://?socket=/tmp/my_socket
958e1b
 @end example
958e1b
 
958e1b
 In this case, the block device must be exported using qemu-nbd:
958e1b
@@ -825,23 +825,23 @@ qemu-nbd --socket=/tmp/my_socket --share=2 my_disk.qcow2
958e1b
 @noindent
958e1b
 and then you can use it with two guests:
958e1b
 @example
958e1b
-qemu-system-i386 linux1.img -hdb nbd+unix://?socket=/tmp/my_socket
958e1b
-qemu-system-i386 linux2.img -hdb nbd+unix://?socket=/tmp/my_socket
958e1b
+qemu-kvm linux1.img -hdb nbd+unix://?socket=/tmp/my_socket
958e1b
+qemu-kvm linux2.img -hdb nbd+unix://?socket=/tmp/my_socket
958e1b
 @end example
958e1b
 
958e1b
 If the nbd-server uses named exports (supported since NBD 2.9.18, or with QEMU's
958e1b
 own embedded NBD server), you must specify an export name in the URI:
958e1b
 @example
958e1b
-qemu-system-i386 -cdrom nbd://localhost/debian-500-ppc-netinst
958e1b
-qemu-system-i386 -cdrom nbd://localhost/openSUSE-11.1-ppc-netinst
958e1b
+qemu-kvm -cdrom nbd://localhost/debian-500-ppc-netinst
958e1b
+qemu-kvm -cdrom nbd://localhost/openSUSE-11.1-ppc-netinst
958e1b
 @end example
958e1b
 
958e1b
 The URI syntax for NBD is supported since QEMU 1.3.  An alternative syntax is
958e1b
 also available.  Here are some example of the older syntax:
958e1b
 @example
958e1b
-qemu-system-i386 linux.img -hdb nbd:my_nbd_server.mydomain.org:1024
958e1b
-qemu-system-i386 linux2.img -hdb nbd:unix:/tmp/my_socket
958e1b
-qemu-system-i386 -cdrom nbd:localhost:10809:exportname=debian-500-ppc-netinst
958e1b
+qemu-kvm linux.img -hdb nbd:my_nbd_server.mydomain.org:1024
958e1b
+qemu-kvm linux2.img -hdb nbd:unix:/tmp/my_socket
958e1b
+qemu-kvm -cdrom nbd:localhost:10809:exportname=debian-500-ppc-netinst
958e1b
 @end example
958e1b
 
958e1b
 @node disk_images_sheepdog
958e1b
@@ -866,7 +866,7 @@ qemu-img convert @var{filename} sheepdog:///@var{image}
958e1b
 
958e1b
 You can boot from the Sheepdog disk image with the command:
958e1b
 @example
958e1b
-qemu-system-i386 sheepdog:///@var{image}
958e1b
+qemu-kvm sheepdog:///@var{image}
958e1b
 @end example
958e1b
 
958e1b
 You can also create a snapshot of the Sheepdog image like qcow2.
958e1b
@@ -878,7 +878,7 @@ where @var{tag} is a tag name of the newly created snapshot.
958e1b
 To boot from the Sheepdog snapshot, specify the tag name of the
958e1b
 snapshot.
958e1b
 @example
958e1b
-qemu-system-i386 sheepdog:///@var{image}#@var{tag}
958e1b
+qemu-kvm sheepdog:///@var{image}#@var{tag}
958e1b
 @end example
958e1b
 
958e1b
 You can create a cloned image from the existing snapshot.
958e1b
@@ -891,14 +891,14 @@ is its tag name.
958e1b
 You can use an unix socket instead of an inet socket:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 sheepdog+unix:///@var{image}?socket=@var{path}
958e1b
+qemu-kvm sheepdog+unix:///@var{image}?socket=@var{path}
958e1b
 @end example
958e1b
 
958e1b
 If the Sheepdog daemon doesn't run on the local host, you need to
958e1b
 specify one of the Sheepdog servers to connect to.
958e1b
 @example
958e1b
 qemu-img create sheepdog://@var{hostname}:@var{port}/@var{image} @var{size}
958e1b
-qemu-system-i386 sheepdog://@var{hostname}:@var{port}/@var{image}
958e1b
+qemu-kvm sheepdog://@var{hostname}:@var{port}/@var{image}
958e1b
 @end example
958e1b
 
958e1b
 @node disk_images_iscsi
958e1b
@@ -940,7 +940,7 @@ Various session related parameters can be set via special options, either
958e1b
 in a configuration file provided via '-readconfig' or directly on the
958e1b
 command line.
958e1b
 
958e1b
-If the initiator-name is not specified qemu will use a default name
958e1b
+If the initiator-name is not specified qemu-kvm will use a default name
958e1b
 of 'iqn.2008-11.org.linux-kvm[:<name>'] where <name> is the name of the
958e1b
 virtual machine.
958e1b
 
958e1b
@@ -987,7 +987,7 @@ cat >iscsi.conf <
958e1b
   header-digest = "CRC32C"
958e1b
 EOF
958e1b
 
958e1b
-qemu-system-i386 -drive file=iscsi://127.0.0.1/iqn.qemu.test/1 \
958e1b
+qemu-kvm -drive file=iscsi://127.0.0.1/iqn.qemu.test/1 \
958e1b
     -readconfig iscsi.conf
958e1b
 @end example
958e1b
 
958e1b
@@ -1006,7 +1006,7 @@ tgtadm --lld iscsi --mode logicalunit --op new --tid 1 --lun 2 \
958e1b
     -b /IMAGES/cd.iso --device-type=cd
958e1b
 tgtadm --lld iscsi --op bind --mode target --tid 1 -I ALL
958e1b
 
958e1b
-qemu-system-i386 -iscsi initiator-name=iqn.qemu.test:my-initiator \
958e1b
+qemu-kvm -iscsi initiator-name=iqn.qemu.test:my-initiator \
958e1b
     -boot d -drive file=iscsi://127.0.0.1/iqn.qemu.test/1 \
958e1b
     -cdrom iscsi://127.0.0.1/iqn.qemu.test/2
958e1b
 @end example
958e1b
@@ -1018,7 +1018,7 @@ GlusterFS is an user space distributed file system.
958e1b
 
958e1b
 You can boot from the GlusterFS disk image with the command:
958e1b
 @example
958e1b
-qemu-system-x86_64 -drive file=gluster[+@var{transport}]://[@var{server}[:@var{port}]]/@var{volname}/@var{image}[?socket=...]
958e1b
+qemu-kvm -drive file=gluster[+@var{transport}]://[@var{server}[:@var{port}]]/@var{volname}/@var{image}[?socket=...]
958e1b
 @end example
958e1b
 
958e1b
 @var{gluster} is the protocol.
958e1b
@@ -1051,14 +1051,14 @@ qemu-img create gluster://@var{server}/@var{volname}/@var{image} @var{size}
958e1b
 
958e1b
 Examples
958e1b
 @example
958e1b
-qemu-system-x86_64 -drive file=gluster://1.2.3.4/testvol/a.img
958e1b
-qemu-system-x86_64 -drive file=gluster+tcp://1.2.3.4/testvol/a.img
958e1b
-qemu-system-x86_64 -drive file=gluster+tcp://1.2.3.4:24007/testvol/dir/a.img
958e1b
-qemu-system-x86_64 -drive file=gluster+tcp://[1:2:3:4:5:6:7:8]/testvol/dir/a.img
958e1b
-qemu-system-x86_64 -drive file=gluster+tcp://[1:2:3:4:5:6:7:8]:24007/testvol/dir/a.img
958e1b
-qemu-system-x86_64 -drive file=gluster+tcp://server.domain.com:24007/testvol/dir/a.img
958e1b
-qemu-system-x86_64 -drive file=gluster+unix:///testvol/dir/a.img?socket=/tmp/glusterd.socket
958e1b
-qemu-system-x86_64 -drive file=gluster+rdma://1.2.3.4:24007/testvol/a.img
958e1b
+qemu-kvm -drive file=gluster://1.2.3.4/testvol/a.img
958e1b
+qemu-kvm -drive file=gluster+tcp://1.2.3.4/testvol/a.img
958e1b
+qemu-kvm -drive file=gluster+tcp://1.2.3.4:24007/testvol/dir/a.img
958e1b
+qemu-kvm -drive file=gluster+tcp://[1:2:3:4:5:6:7:8]/testvol/dir/a.img
958e1b
+qemu-kvm -drive file=gluster+tcp://[1:2:3:4:5:6:7:8]:24007/testvol/dir/a.img
958e1b
+qemu-kvm -drive file=gluster+tcp://server.domain.com:24007/testvol/dir/a.img
958e1b
+qemu-kvm -drive file=gluster+unix:///testvol/dir/a.img?socket=/tmp/glusterd.socket
958e1b
+qemu-kvm -drive file=gluster+rdma://1.2.3.4:24007/testvol/a.img
958e1b
 @end example
958e1b
 
958e1b
 @node disk_images_ssh
958e1b
@@ -1068,13 +1068,13 @@ You can access disk images located on a remote ssh server
958e1b
 by using the ssh protocol:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-x86_64 -drive file=ssh://[@var{user}@@]@var{server}[:@var{port}]/@var{path}[?host_key_check=@var{host_key_check}]
958e1b
+qemu-kvm -drive file=ssh://[@var{user}@@]@var{server}[:@var{port}]/@var{path}[?host_key_check=@var{host_key_check}]
958e1b
 @end example
958e1b
 
958e1b
 Alternative syntax using properties:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-x86_64 -drive file.driver=ssh[,file.user=@var{user}],file.host=@var{server}[,file.port=@var{port}],file.path=@var{path}[,file.host_key_check=@var{host_key_check}]
958e1b
+qemu-kvm -drive file.driver=ssh[,file.user=@var{user}],file.host=@var{server}[,file.port=@var{port}],file.path=@var{path}[,file.host_key_check=@var{host_key_check}]
958e1b
 @end example
958e1b
 
958e1b
 @var{ssh} is the protocol.
958e1b
@@ -1211,7 +1211,7 @@ zero-copy communication to the application level of the guests.  The basic
958e1b
 syntax is:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 -device ivshmem,size=<size in format accepted by -m>[,shm=<shm name>]
958e1b
+qemu-kvm -device ivshmem,size=<size in format accepted by -m>[,shm=<shm name>]
958e1b
 @end example
958e1b
 
958e1b
 If desired, interrupts can be sent between guest VMs accessing the same shared
958e1b
@@ -1221,9 +1221,9 @@ is qemu.git/contrib/ivshmem-server.  An example syntax when using the shared
958e1b
 memory server is:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 -device ivshmem,size=<size in format accepted by -m>[,chardev=<id>]
958e1b
+qemu-kvm -device ivshmem,size=<size in format accepted by -m>[,chardev=<id>]
958e1b
                  [,msi=on][,ioeventfd=on][,vectors=n][,role=peer|master]
958e1b
-qemu-system-i386 -chardev socket,path=<path>,id=<id>
958e1b
+qemu-kvm -chardev socket,path=<path>,id=<id>
958e1b
 @end example
958e1b
 
958e1b
 When using the server, the guest will be assigned a VM ID (>=0) that allows guests
958e1b
@@ -1253,7 +1253,7 @@ kernel testing.
958e1b
 
958e1b
 The syntax is:
958e1b
 @example
958e1b
-qemu-system-i386 -kernel arch/i386/boot/bzImage -hda root-2.4.20.img -append "root=/dev/hda"
958e1b
+qemu-kvm -kernel arch/i386/boot/bzImage -hda root-2.4.20.img -append "root=/dev/hda"
958e1b
 @end example
958e1b
 
958e1b
 Use @option{-kernel} to provide the Linux kernel image and
958e1b
@@ -1268,7 +1268,7 @@ If you do not need graphical output, you can disable it and redirect
958e1b
 the virtual serial port and the QEMU monitor to the console with the
958e1b
 @option{-nographic} option. The typical command line is:
958e1b
 @example
958e1b
-qemu-system-i386 -kernel arch/i386/boot/bzImage -hda root-2.4.20.img \
958e1b
+qemu-kvm -kernel arch/i386/boot/bzImage -hda root-2.4.20.img \
958e1b
                  -append "root=/dev/hda console=ttyS0" -nographic
958e1b
 @end example
958e1b
 
958e1b
@@ -1332,7 +1332,7 @@ Network adapter that supports CDC ethernet and RNDIS protocols.  @var{options}
958e1b
 specifies NIC options as with @code{-net nic,}@var{options} (see description).
958e1b
 For instance, user-mode networking can be used with
958e1b
 @example
958e1b
-qemu-system-i386 [...OPTIONS...] -net user,vlan=0 -usbdevice net:vlan=0
958e1b
+qemu-kvm [...OPTIONS...] -net user,vlan=0 -usbdevice net:vlan=0
958e1b
 @end example
958e1b
 Currently this cannot be used in machines that support PCI NICs.
958e1b
 @item bt[:@var{hci-type}]
958e1b
@@ -1342,7 +1342,7 @@ no type is given, the HCI logic corresponds to @code{-bt hci,vlan=0}.
958e1b
 This USB device implements the USB Transport Layer of HCI.  Example
958e1b
 usage:
958e1b
 @example
958e1b
-qemu-system-i386 [...OPTIONS...] -usbdevice bt:hci,vlan=3 -bt device:keyboard,vlan=3
958e1b
+qemu-kvm [...OPTIONS...] -usbdevice bt:hci,vlan=3 -bt device:keyboard,vlan=3
958e1b
 @end example
958e1b
 @end table
958e1b
 
958e1b
@@ -1420,7 +1420,7 @@ For this setup it is recommended to restrict it to listen on a UNIX domain
958e1b
 socket only. For example
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 [...OPTIONS...] -vnc unix:/home/joebloggs/.qemu-myvm-vnc
958e1b
+qemu-kvm [...OPTIONS...] -vnc unix:/home/joebloggs/.qemu-myvm-vnc
958e1b
 @end example
958e1b
 
958e1b
 This ensures that only users on local box with read/write access to that
958e1b
@@ -1443,7 +1443,7 @@ is running the password is set with the monitor. Until the monitor is used to
958e1b
 set the password all clients will be rejected.
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 [...OPTIONS...] -vnc :1,password -monitor stdio
958e1b
+qemu-kvm [...OPTIONS...] -vnc :1,password -monitor stdio
958e1b
 (qemu) change vnc password
958e1b
 Password: ********
958e1b
 (qemu)
958e1b
@@ -1460,7 +1460,7 @@ support provides a secure session, but no authentication. This allows any
958e1b
 client to connect, and provides an encrypted session.
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 [...OPTIONS...] -vnc :1,tls,x509=/etc/pki/qemu -monitor stdio
958e1b
+qemu-kvm [...OPTIONS...] -vnc :1,tls,x509=/etc/pki/qemu -monitor stdio
958e1b
 @end example
958e1b
 
958e1b
 In the above example @code{/etc/pki/qemu} should contain at least three files,
958e1b
@@ -1478,7 +1478,7 @@ then validate against the CA certificate. This is a good choice if deploying
958e1b
 in an environment with a private internal certificate authority.
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 [...OPTIONS...] -vnc :1,tls,x509verify=/etc/pki/qemu -monitor stdio
958e1b
+qemu-kvm [...OPTIONS...] -vnc :1,tls,x509verify=/etc/pki/qemu -monitor stdio
958e1b
 @end example
958e1b
 
958e1b
 
958e1b
@@ -1489,7 +1489,7 @@ Finally, the previous method can be combined with VNC password authentication
958e1b
 to provide two layers of authentication for clients.
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 [...OPTIONS...] -vnc :1,password,tls,x509verify=/etc/pki/qemu -monitor stdio
958e1b
+qemu-kvm [...OPTIONS...] -vnc :1,password,tls,x509verify=/etc/pki/qemu -monitor stdio
958e1b
 (qemu) change vnc password
958e1b
 Password: ********
958e1b
 (qemu)
958e1b
@@ -1512,7 +1512,7 @@ used for authentication, but assuming use of one supporting SSF,
958e1b
 then QEMU can be launched with:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 [...OPTIONS...] -vnc :1,sasl -monitor stdio
958e1b
+qemu-kvm [...OPTIONS...] -vnc :1,sasl -monitor stdio
958e1b
 @end example
958e1b
 
958e1b
 @node vnc_sec_certificate_sasl
958e1b
@@ -1526,7 +1526,7 @@ credentials. This can be enabled, by combining the 'sasl' option
958e1b
 with the aforementioned TLS + x509 options:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 [...OPTIONS...] -vnc :1,tls,x509,sasl -monitor stdio
958e1b
+qemu-kvm [...OPTIONS...] -vnc :1,tls,x509,sasl -monitor stdio
958e1b
 @end example
958e1b
 
958e1b
 
958e1b
@@ -1694,7 +1694,7 @@ QEMU has a primitive support to work with gdb, so that you can do
958e1b
 In order to use gdb, launch QEMU with the '-s' option. It will wait for a
958e1b
 gdb connection:
958e1b
 @example
958e1b
-qemu-system-i386 -s -kernel arch/i386/boot/bzImage -hda root-2.4.20.img \
958e1b
+qemu-kvm -s -kernel arch/i386/boot/bzImage -hda root-2.4.20.img \
958e1b
                     -append "root=/dev/hda"
958e1b
 Connected to host network interface: tun0
958e1b
 Waiting gdb connection on port 1234
958e1b
diff --git a/qemu-options.hx b/qemu-options.hx
958e1b
index 5d0f2cd..62c3e06 100644
958e1b
--- a/qemu-options.hx
958e1b
+++ b/qemu-options.hx
958e1b
@@ -124,7 +124,7 @@ This option defines a free-form string that can be used to describe @var{fd}.
958e1b
 
958e1b
 You can open an image using pre-opened file descriptors from an fd set:
958e1b
 @example
958e1b
-qemu-system-i386
958e1b
+qemu-kvm
958e1b
 -add-fd fd=3,set=2,opaque="rdwr:/path/to/file"
958e1b
 -add-fd fd=4,set=2,opaque="rdonly:/path/to/file"
958e1b
 -drive file=/dev/fdset/2,index=0,media=disk
958e1b
@@ -151,7 +151,7 @@ STEXI
958e1b
 Set default value of @var{driver}'s property @var{prop} to @var{value}, e.g.:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 -global ide-drive.physical_block_size=4096 -drive file=file,if=ide,index=0,media=disk
958e1b
+qemu-kvm -global ide-drive.physical_block_size=4096 -drive file=file,if=ide,index=0,media=disk
958e1b
 @end example
958e1b
 
958e1b
 In particular, you can use this to set driver properties for devices which are 
958e1b
@@ -189,7 +189,7 @@ the recommended is 320x240, 640x480, 800x640.
958e1b
 
958e1b
 A timeout could be passed to bios, guest will pause for @var{rb_timeout} ms
958e1b
 when boot failed, then reboot. If @var{rb_timeout} is '-1', guest will not
958e1b
-reboot, qemu passes '-1' to bios by default. Currently Seabios for X86
958e1b
+reboot, qemu-kvm passes '-1' to bios by default. Currently Seabios for X86
958e1b
 system support it.
958e1b
 
958e1b
 Do strict boot via @option{strict=on} as far as firmware/BIOS
958e1b
@@ -198,11 +198,11 @@ bootindex options. The default is non-strict boot.
958e1b
 
958e1b
 @example
958e1b
 # try to boot from network first, then from hard disk
958e1b
-qemu-system-i386 -boot order=nc
958e1b
+qemu-kvm -boot order=nc
958e1b
 # boot from CD-ROM first, switch back to default order after reboot
958e1b
-qemu-system-i386 -boot once=d
958e1b
+qemu-kvm -boot once=d
958e1b
 # boot with a splash picture for 5 seconds.
958e1b
-qemu-system-i386 -boot menu=on,splash=/root/boot.bmp,splash-time=5000
958e1b
+qemu-kvm -boot menu=on,splash=/root/boot.bmp,splash-time=5000
958e1b
 @end example
958e1b
 
958e1b
 Note: The legacy format '-boot @var{drives}' is still supported but its
958e1b
@@ -282,12 +282,12 @@ Enable audio and selected sound hardware. Use 'help' to print all
958e1b
 available sound hardware.
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 -soundhw sb16,adlib disk.img
958e1b
-qemu-system-i386 -soundhw es1370 disk.img
958e1b
-qemu-system-i386 -soundhw ac97 disk.img
958e1b
-qemu-system-i386 -soundhw hda disk.img
958e1b
-qemu-system-i386 -soundhw all disk.img
958e1b
-qemu-system-i386 -soundhw help
958e1b
+qemu-kvm -soundhw sb16,adlib disk.img
958e1b
+qemu-kvm -soundhw es1370 disk.img
958e1b
+qemu-kvm -soundhw ac97 disk.img
958e1b
+qemu-kvm -soundhw hda disk.img
958e1b
+qemu-kvm -soundhw all disk.img
958e1b
+qemu-kvm -soundhw help
958e1b
 @end example
958e1b
 
958e1b
 Note that Linux's i810_audio OSS kernel (for AC97) module might
958e1b
@@ -500,21 +500,21 @@ is off.
958e1b
 
958e1b
 Instead of @option{-cdrom} you can use:
958e1b
 @example
958e1b
-qemu-system-i386 -drive file=file,index=2,media=cdrom
958e1b
+qemu-kvm -drive file=file,index=2,media=cdrom
958e1b
 @end example
958e1b
 
958e1b
 Instead of @option{-hda}, @option{-hdb}, @option{-hdc}, @option{-hdd}, you can
958e1b
 use:
958e1b
 @example
958e1b
-qemu-system-i386 -drive file=file,index=0,media=disk
958e1b
-qemu-system-i386 -drive file=file,index=1,media=disk
958e1b
-qemu-system-i386 -drive file=file,index=2,media=disk
958e1b
-qemu-system-i386 -drive file=file,index=3,media=disk
958e1b
+qemu-kvm -drive file=file,index=0,media=disk
958e1b
+qemu-kvm -drive file=file,index=1,media=disk
958e1b
+qemu-kvm -drive file=file,index=2,media=disk
958e1b
+qemu-kvm -drive file=file,index=3,media=disk
958e1b
 @end example
958e1b
 
958e1b
 You can open an image using pre-opened file descriptors from an fd set:
958e1b
 @example
958e1b
-qemu-system-i386
958e1b
+qemu-kvm
958e1b
 -add-fd fd=3,set=2,opaque="rdwr:/path/to/file"
958e1b
 -add-fd fd=4,set=2,opaque="rdonly:/path/to/file"
958e1b
 -drive file=/dev/fdset/2,index=0,media=disk
958e1b
@@ -522,33 +522,33 @@ qemu-system-i386
958e1b
 
958e1b
 You can connect a CDROM to the slave of ide0:
958e1b
 @example
958e1b
-qemu-system-i386 -drive file=file,if=ide,index=1,media=cdrom
958e1b
+qemu-kvm -drive file=file,if=ide,index=1,media=cdrom
958e1b
 @end example
958e1b
 
958e1b
 If you don't specify the "file=" argument, you define an empty drive:
958e1b
 @example
958e1b
-qemu-system-i386 -drive if=ide,index=1,media=cdrom
958e1b
+qemu-kvm -drive if=ide,index=1,media=cdrom
958e1b
 @end example
958e1b
 
958e1b
 You can connect a SCSI disk with unit ID 6 on the bus #0:
958e1b
 @example
958e1b
-qemu-system-i386 -drive file=file,if=scsi,bus=0,unit=6
958e1b
+qemu-kvm -drive file=file,if=scsi,bus=0,unit=6
958e1b
 @end example
958e1b
 
958e1b
 Instead of @option{-fda}, @option{-fdb}, you can use:
958e1b
 @example
958e1b
-qemu-system-i386 -drive file=file,index=0,if=floppy
958e1b
-qemu-system-i386 -drive file=file,index=1,if=floppy
958e1b
+qemu-kvm -drive file=file,index=0,if=floppy
958e1b
+qemu-kvm -drive file=file,index=1,if=floppy
958e1b
 @end example
958e1b
 
958e1b
 By default, @var{interface} is "ide" and @var{index} is automatically
958e1b
 incremented:
958e1b
 @example
958e1b
-qemu-system-i386 -drive file=a -drive file=b"
958e1b
+qemu-kvm -drive file=a -drive file=b"
958e1b
 @end example
958e1b
 is interpreted like:
958e1b
 @example
958e1b
-qemu-system-i386 -hda a -hdb b
958e1b
+qemu-kvm -hda a -hdb b
958e1b
 @end example
958e1b
 ETEXI
958e1b
 
958e1b
@@ -1477,7 +1477,7 @@ can not be resolved.
958e1b
 
958e1b
 Example:
958e1b
 @example
958e1b
-qemu -net user,dnssearch=mgmt.example.org,dnssearch=example.org [...]
958e1b
+qemu-kvm -net user,dnssearch=mgmt.example.org,dnssearch=example.org [...]
958e1b
 @end example
958e1b
 
958e1b
 @item tftp=@var{dir}
958e1b
@@ -1493,7 +1493,7 @@ a guest from a local directory.
958e1b
 
958e1b
 Example (using pxelinux):
958e1b
 @example
958e1b
-qemu-system-i386 -hda linux.img -boot n -net user,tftp=/path/to/tftp/files,bootfile=/pxelinux.0
958e1b
+qemu-kvm -hda linux.img -boot n -net user,tftp=/path/to/tftp/files,bootfile=/pxelinux.0
958e1b
 @end example
958e1b
 
958e1b
 @item smb=@var{dir}[,smbserver=@var{addr}]
958e1b
@@ -1528,7 +1528,7 @@ screen 0, use the following:
958e1b
 
958e1b
 @example
958e1b
 # on the host
958e1b
-qemu-system-i386 -net user,hostfwd=tcp:127.0.0.1:6001-:6000 [...]
958e1b
+qemu-kvm -net user,hostfwd=tcp:127.0.0.1:6001-:6000 [...]
958e1b
 # this host xterm should open in the guest X11 server
958e1b
 xterm -display :1
958e1b
 @end example
958e1b
@@ -1538,7 +1538,7 @@ the guest, use the following:
958e1b
 
958e1b
 @example
958e1b
 # on the host
958e1b
-qemu-system-i386 -net user,hostfwd=tcp::5555-:23 [...]
958e1b
+qemu-kvm -net user,hostfwd=tcp::5555-:23 [...]
958e1b
 telnet localhost 5555
958e1b
 @end example
958e1b
 
958e1b
@@ -1557,7 +1557,7 @@ lifetime, like in the following example:
958e1b
 @example
958e1b
 # open 10.10.1.1:4321 on bootup, connect 10.0.2.100:1234 to it whenever
958e1b
 # the guest accesses it
958e1b
-qemu -net user,guestfwd=tcp:10.0.2.100:1234-tcp:10.10.1.1:4321 [...]
958e1b
+qemu-kvm -net user,guestfwd=tcp:10.0.2.100:1234-tcp:10.10.1.1:4321 [...]
958e1b
 @end example
958e1b
 
958e1b
 Or you can execute a command on every TCP connection established by the guest,
958e1b
@@ -1566,7 +1566,7 @@ so that QEMU behaves similar to an inetd process for that virtual server:
958e1b
 @example
958e1b
 # call "netcat 10.10.1.1 4321" on every TCP connection to 10.0.2.100:1234
958e1b
 # and connect the TCP stream to its stdin/stdout
958e1b
-qemu -net 'user,guestfwd=tcp:10.0.2.100:1234-cmd:netcat 10.10.1.1 4321'
958e1b
+qemu-kvm -net 'user,guestfwd=tcp:10.0.2.100:1234-cmd:netcat 10.10.1.1 4321'
958e1b
 @end example
958e1b
 
958e1b
 @end table
958e1b
@@ -1598,13 +1598,13 @@ Examples:
958e1b
 
958e1b
 @example
958e1b
 #launch a QEMU instance with the default network script
958e1b
-qemu-system-i386 linux.img -net nic -net tap
958e1b
+qemu-kvm linux.img -net nic -net tap
958e1b
 @end example
958e1b
 
958e1b
 @example
958e1b
 #launch a QEMU instance with two NICs, each one connected
958e1b
 #to a TAP device
958e1b
-qemu-system-i386 linux.img \
958e1b
+qemu-kvm linux.img \
958e1b
                  -net nic,vlan=0 -net tap,vlan=0,ifname=tap0 \
958e1b
                  -net nic,vlan=1 -net tap,vlan=1,ifname=tap1
958e1b
 @end example
958e1b
@@ -1612,7 +1612,7 @@ qemu-system-i386 linux.img \
958e1b
 @example
958e1b
 #launch a QEMU instance with the default network helper to
958e1b
 #connect a TAP device to bridge br0
958e1b
-qemu-system-i386 linux.img \
958e1b
+qemu-kvm linux.img \
958e1b
                  -net nic -net tap,"helper=/path/to/qemu-bridge-helper"
958e1b
 @end example
958e1b
 
958e1b
@@ -1630,13 +1630,13 @@ Examples:
958e1b
 @example
958e1b
 #launch a QEMU instance with the default network helper to
958e1b
 #connect a TAP device to bridge br0
958e1b
-qemu-system-i386 linux.img -net bridge -net nic,model=virtio
958e1b
+qemu-kvm linux.img -net bridge -net nic,model=virtio
958e1b
 @end example
958e1b
 
958e1b
 @example
958e1b
 #launch a QEMU instance with the default network helper to
958e1b
 #connect a TAP device to bridge qemubr0
958e1b
-qemu-system-i386 linux.img -net bridge,br=qemubr0 -net nic,model=virtio
958e1b
+qemu-kvm linux.img -net bridge,br=qemubr0 -net nic,model=virtio
958e1b
 @end example
958e1b
 
958e1b
 @item -netdev socket,id=@var{id}[,fd=@var{h}][,listen=[@var{host}]:@var{port}][,connect=@var{host}:@var{port}]
958e1b
@@ -1652,12 +1652,12 @@ specifies an already opened TCP socket.
958e1b
 Example:
958e1b
 @example
958e1b
 # launch a first QEMU instance
958e1b
-qemu-system-i386 linux.img \
958e1b
+qemu-kvm linux.img \
958e1b
                  -net nic,macaddr=52:54:00:12:34:56 \
958e1b
                  -net socket,listen=:1234
958e1b
 # connect the VLAN 0 of this instance to the VLAN 0
958e1b
 # of the first instance
958e1b
-qemu-system-i386 linux.img \
958e1b
+qemu-kvm linux.img \
958e1b
                  -net nic,macaddr=52:54:00:12:34:57 \
958e1b
                  -net socket,connect=127.0.0.1:1234
958e1b
 @end example
958e1b
@@ -1683,15 +1683,15 @@ Use @option{fd=h} to specify an already opened UDP multicast socket.
958e1b
 Example:
958e1b
 @example
958e1b
 # launch one QEMU instance
958e1b
-qemu-system-i386 linux.img \
958e1b
+qemu-kvm linux.img \
958e1b
                  -net nic,macaddr=52:54:00:12:34:56 \
958e1b
                  -net socket,mcast=230.0.0.1:1234
958e1b
 # launch another QEMU instance on same "bus"
958e1b
-qemu-system-i386 linux.img \
958e1b
+qemu-kvm linux.img \
958e1b
                  -net nic,macaddr=52:54:00:12:34:57 \
958e1b
                  -net socket,mcast=230.0.0.1:1234
958e1b
 # launch yet another QEMU instance on same "bus"
958e1b
-qemu-system-i386 linux.img \
958e1b
+qemu-kvm linux.img \
958e1b
                  -net nic,macaddr=52:54:00:12:34:58 \
958e1b
                  -net socket,mcast=230.0.0.1:1234
958e1b
 @end example
958e1b
@@ -1700,7 +1700,7 @@ Example (User Mode Linux compat.):
958e1b
 @example
958e1b
 # launch QEMU instance (note mcast address selected
958e1b
 # is UML's default)
958e1b
-qemu-system-i386 linux.img \
958e1b
+qemu-kvm linux.img \
958e1b
                  -net nic,macaddr=52:54:00:12:34:56 \
958e1b
                  -net socket,mcast=239.192.168.1:1102
958e1b
 # launch UML
958e1b
@@ -1709,7 +1709,7 @@ qemu-system-i386 linux.img \
958e1b
 
958e1b
 Example (send packets from host's 1.2.3.4):
958e1b
 @example
958e1b
-qemu-system-i386 linux.img \
958e1b
+qemu-kvm linux.img \
958e1b
                  -net nic,macaddr=52:54:00:12:34:56 \
958e1b
                  -net socket,mcast=239.192.168.1:1102,localaddr=1.2.3.4
958e1b
 @end example
958e1b
@@ -1727,7 +1727,7 @@ Example:
958e1b
 # launch vde switch
958e1b
 vde_switch -F -sock /tmp/myswitch
958e1b
 # launch QEMU instance
958e1b
-qemu-system-i386 linux.img -net nic -net vde,sock=/tmp/myswitch
958e1b
+qemu-kvm linux.img -net nic -net vde,sock=/tmp/myswitch
958e1b
 @end example
958e1b
 
958e1b
 @item -netdev hubport,id=@var{id},hubid=@var{hubid}
958e1b
@@ -2043,28 +2043,28 @@ images for the guest storage. Both disk and cdrom images are supported.
958e1b
 Syntax for specifying iSCSI LUNs is
958e1b
 ``iscsi://<target-ip>[:<port>]/<target-iqn>/<lun>''
958e1b
 
958e1b
-By default qemu will use the iSCSI initiator-name
958e1b
+By default qemu-kvm will use the iSCSI initiator-name
958e1b
 'iqn.2008-11.org.linux-kvm[:<name>]' but this can also be set from the command
958e1b
 line or a configuration file.
958e1b
 
958e1b
 
958e1b
 Example (without authentication):
958e1b
 @example
958e1b
-qemu-system-i386 -iscsi initiator-name=iqn.2001-04.com.example:my-initiator \
958e1b
+qemu-kvm -iscsi initiator-name=iqn.2001-04.com.example:my-initiator \
958e1b
                  -cdrom iscsi://192.0.2.1/iqn.2001-04.com.example/2 \
958e1b
                  -drive file=iscsi://192.0.2.1/iqn.2001-04.com.example/1
958e1b
 @end example
958e1b
 
958e1b
 Example (CHAP username/password via URL):
958e1b
 @example
958e1b
-qemu-system-i386 -drive file=iscsi://user%password@@192.0.2.1/iqn.2001-04.com.example/1
958e1b
+qemu-kvm -drive file=iscsi://user%password@@192.0.2.1/iqn.2001-04.com.example/1
958e1b
 @end example
958e1b
 
958e1b
 Example (CHAP username/password via environment variables):
958e1b
 @example
958e1b
 LIBISCSI_CHAP_USERNAME="user" \
958e1b
 LIBISCSI_CHAP_PASSWORD="password" \
958e1b
-qemu-system-i386 -drive file=iscsi://192.0.2.1/iqn.2001-04.com.example/1
958e1b
+qemu-kvm -drive file=iscsi://192.0.2.1/iqn.2001-04.com.example/1
958e1b
 @end example
958e1b
 
958e1b
 iSCSI support is an optional feature of QEMU and only available when
958e1b
@@ -2093,12 +2093,12 @@ Syntax for specifying a NBD device using Unix Domain Sockets
958e1b
 
958e1b
 Example for TCP
958e1b
 @example
958e1b
-qemu-system-i386 --drive file=nbd:192.0.2.1:30000
958e1b
+qemu-kvm --drive file=nbd:192.0.2.1:30000
958e1b
 @end example
958e1b
 
958e1b
 Example for Unix Domain Sockets
958e1b
 @example
958e1b
-qemu-system-i386 --drive file=nbd:unix:/tmp/nbd-socket
958e1b
+qemu-kvm --drive file=nbd:unix:/tmp/nbd-socket
958e1b
 @end example
958e1b
 
958e1b
 @item SSH
958e1b
@@ -2106,8 +2106,8 @@ QEMU supports SSH (Secure Shell) access to remote disks.
958e1b
 
958e1b
 Examples:
958e1b
 @example
958e1b
-qemu-system-i386 -drive file=ssh://user@@host/path/to/disk.img
958e1b
-qemu-system-i386 -drive file.driver=ssh,file.user=user,file.host=host,file.port=22,file.path=/path/to/disk.img
958e1b
+qemu-kvm -drive file=ssh://user@@host/path/to/disk.img
958e1b
+qemu-kvm -drive file.driver=ssh,file.user=user,file.host=host,file.port=22,file.path=/path/to/disk.img
958e1b
 @end example
958e1b
 
958e1b
 Currently authentication must be done using ssh-agent.  Other
958e1b
@@ -2125,7 +2125,7 @@ sheepdog[+tcp|+unix]://[host:port]/vdiname[?socket=path][#snapid|#tag]
958e1b
 
958e1b
 Example
958e1b
 @example
958e1b
-qemu-system-i386 --drive file=sheepdog://192.0.2.1:30000/MyVirtualMachine
958e1b
+qemu-kvm --drive file=sheepdog://192.0.2.1:30000/MyVirtualMachine
958e1b
 @end example
958e1b
 
958e1b
 See also @url{http://http://www.osrg.net/sheepdog/}.
958e1b
@@ -2143,7 +2143,7 @@ gluster[+transport]://[server[:port]]/volname/image[?socket=...]
958e1b
 
958e1b
 Example
958e1b
 @example
958e1b
-qemu-system-x86_64 --drive file=gluster://192.0.2.1/testvol/a.img
958e1b
+qemu-kvm --drive file=gluster://192.0.2.1/testvol/a.img
958e1b
 @end example
958e1b
 
958e1b
 See also @url{http://www.gluster.org}.
958e1b
@@ -2209,7 +2209,7 @@ and communicate.  Requires the Linux @code{vhci} driver installed.  Can
958e1b
 be used as following:
958e1b
 
958e1b
 @example
958e1b
-qemu-system-i386 [...OPTIONS...] -bt hci,vlan=5 -bt vhci,vlan=5
958e1b
+qemu-kvm [...OPTIONS...] -bt hci,vlan=5 -bt vhci,vlan=5
958e1b
 @end example
958e1b
 
958e1b
 @item -bt device:@var{dev}[,vlan=@var{n}]
958e1b
@@ -2255,7 +2255,7 @@ Options to each backend are described below.
958e1b
 
958e1b
 Use 'help' to print all available TPM backend types.
958e1b
 @example
958e1b
-qemu -tpmdev help
958e1b
+qemu-kvm -tpmdev help
958e1b
 @end example
958e1b
 
958e1b
 @item -tpmdev passthrough, id=@var{id}, path=@var{path}, cancel-path=@var{cancel-path}
958e1b
@@ -2579,14 +2579,14 @@ ETEXI
958e1b
 
958e1b
 DEF("realtime", HAS_ARG, QEMU_OPTION_realtime,
958e1b
     "-realtime [mlock=on|off]\n"
958e1b
-    "                run qemu with realtime features\n"
958e1b
+    "                run qemu-kvm with realtime features\n"
958e1b
     "                mlock=on|off controls mlock support (default: on)\n",
958e1b
     QEMU_ARCH_ALL)
958e1b
 STEXI
958e1b
 @item -realtime mlock=on|off
958e1b
 @findex -realtime
958e1b
-Run qemu with realtime features.
958e1b
-mlocking qemu and guest memory can be enabled via @option{mlock=on}
958e1b
+Run qemu-kvm with realtime features.
958e1b
+mlocking qemu-kvm and guest memory can be enabled via @option{mlock=on}
958e1b
 (enabled by default).
958e1b
 ETEXI
958e1b
 
958e1b
@@ -2600,7 +2600,7 @@ connections will likely be TCP-based, but also UDP, pseudo TTY, or even
958e1b
 stdio are reasonable use case. The latter is allowing to start QEMU from
958e1b
 within gdb and establish the connection via a pipe:
958e1b
 @example
958e1b
-(gdb) target remote | exec qemu-system-i386 -gdb stdio ...
958e1b
+(gdb) target remote | exec qemu-kvm -gdb stdio ...
958e1b
 @end example
958e1b
 ETEXI
958e1b
 
958e1b
-- 
958e1b
1.8.3.1
958e1b