diff options
Diffstat (limited to 'app-emulation/kvm/files/kvm-45-qemu-kvm-doc.patch')
| -rw-r--r-- | app-emulation/kvm/files/kvm-45-qemu-kvm-doc.patch | 269 |
1 files changed, 0 insertions, 269 deletions
diff --git a/app-emulation/kvm/files/kvm-45-qemu-kvm-doc.patch b/app-emulation/kvm/files/kvm-45-qemu-kvm-doc.patch deleted file mode 100644 index c34dea2..0000000 --- a/app-emulation/kvm/files/kvm-45-qemu-kvm-doc.patch +++ /dev/null @@ -1,269 +0,0 @@ ---- kvm-45/qemu/qemu-doc.texi 2007-10-02 01:36:33.000000000 -0700 -+++ kvm-45/qemu/qemu-doc.texi 2007-10-06 22:12:49.000000000 -0700 -@@ -186,7 +186,7 @@ - Download and uncompress the linux image (@file{linux.img}) and type: - - @example --qemu linux.img -+kvm linux.img - @end example - - Linux should boot and give you a prompt. -@@ -196,7 +196,7 @@ - - @example - @c man begin SYNOPSIS --usage: qemu [options] [disk_image] -+usage: kvm [options] [disk_image] - @c man end - @end example - -@@ -255,10 +255,10 @@ - available sound hardware. - - @example --qemu -soundhw sb16,adlib hda --qemu -soundhw es1370 hda --qemu -soundhw all hda --qemu -soundhw ? -+kvm -soundhw sb16,adlib hda -+kvm -soundhw es1370 hda -+kvm -soundhw all hda -+kvm -soundhw ? - @end example - - @item -localtime -@@ -437,18 +437,18 @@ - @item -net tap[,vlan=n][,fd=h][,ifname=name][,script=file] - Connect the host TAP network interface @var{name} to VLAN @var{n} and - use the network script @var{file} to configure it. The default --network script is @file{/etc/qemu-ifup}. Use @option{script=no} to -+network script is @file{/etc/kvm/qemu-ifup}. Use @option{script=no} to - disable script execution. If @var{name} is not - provided, the OS automatically provides one. @option{fd=h} can be - used to specify the handle of an already opened host TAP interface. Example: - - @example --qemu linux.img -net nic -net tap -+kvm linux.img -net nic -net tap - @end example - - More complicated example (two NICs, each one connected to a TAP device) - @example --qemu linux.img -net nic,vlan=0 -net tap,vlan=0,ifname=tap0 \ -+kvm linux.img -net nic,vlan=0 -net tap,vlan=0,ifname=tap0 \ - -net nic,vlan=1 -net tap,vlan=1,ifname=tap1 - @end example - -@@ -465,11 +465,11 @@ - Example: - @example - # launch a first QEMU instance --qemu linux.img -net nic,macaddr=52:54:00:12:34:56 \ -+kvm linux.img -net nic,macaddr=52:54:00:12:34:56 \ - -net socket,listen=:1234 - # connect the VLAN 0 of this instance to the VLAN 0 - # of the first instance --qemu linux.img -net nic,macaddr=52:54:00:12:34:57 \ -+kvm linux.img -net nic,macaddr=52:54:00:12:34:57 \ - -net socket,connect=127.0.0.1:1234 - @end example - -@@ -493,13 +493,13 @@ - Example: - @example - # launch one QEMU instance --qemu linux.img -net nic,macaddr=52:54:00:12:34:56 \ -+kvm linux.img -net nic,macaddr=52:54:00:12:34:56 \ - -net socket,mcast=230.0.0.1:1234 - # launch another QEMU instance on same "bus" --qemu linux.img -net nic,macaddr=52:54:00:12:34:57 \ -+kvm linux.img -net nic,macaddr=52:54:00:12:34:57 \ - -net socket,mcast=230.0.0.1:1234 - # launch yet another QEMU instance on same "bus" --qemu linux.img -net nic,macaddr=52:54:00:12:34:58 \ -+kvm linux.img -net nic,macaddr=52:54:00:12:34:58 \ - -net socket,mcast=230.0.0.1:1234 - @end example - -@@ -507,7 +507,7 @@ - @example - # launch QEMU instance (note mcast address selected - # is UML's default) --qemu linux.img -net nic,macaddr=52:54:00:12:34:56 \ -+kvm linux.img -net nic,macaddr=52:54:00:12:34:56 \ - -net socket,mcast=239.192.168.1:1102 - # launch UML - /path/to/linux ubd0=/path/to/root_fs eth0=mcast -@@ -532,7 +532,7 @@ - - Example (using pxelinux): - @example --qemu -hda linux.img -boot n -tftp /path/to/tftp/files -bootp /pxelinux.0 -+kvm -hda linux.img -boot n -tftp /path/to/tftp/files -bootp /pxelinux.0 - @end example - - @item -smb dir -@@ -566,7 +566,7 @@ - - @example - # on the host --qemu -redir tcp:6001::6000 [...] -+kvm -redir tcp:6001::6000 [...] - # this host xterm should open in the guest X11 server - xterm -display :1 - @end example -@@ -576,7 +576,7 @@ - - @example - # on the host --qemu -redir tcp:5555::23 [...] -+kvm -redir tcp:5555::23 [...] - telnet localhost 5555 - @end example - -@@ -650,19 +650,19 @@ - This implements UDP Net Console. When @var{remote_host} or @var{src_ip} are not specified they default to @code{0.0.0.0}. When not using a specified @var{src_port} a random port is automatically chosen. - - If you just want a simple readonly console you can use @code{netcat} or --@code{nc}, by starting qemu with: @code{-serial udp::4555} and nc as: --@code{nc -u -l -p 4555}. Any time qemu writes something to that port it -+@code{nc}, by starting kvm with: @code{-serial udp::4555} and nc as: -+@code{nc -u -l -p 4555}. Any time kvm writes something to that port it - will appear in the netconsole session. - - If you plan to send characters back via netconsole or you want to stop --and start qemu a lot of times, you should have qemu use the same -+and start kvm a lot of times, you should have kvm use the same - source port each time by using something like @code{-serial --udp::4555@@:4556} to qemu. Another approach is to use a patched -+udp::4555@@:4556} to kvm. Another approach is to use a patched - version of netcat which can listen to a TCP port and send and receive - characters via udp. If you have a patched version of netcat which - activates telnet remote echo and single char transfer, then you can - use the following options to step up a netcat redirector to allow --telnet on port 5555 to access the qemu port. -+telnet on port 5555 to access the kvm port. - @table @code - @item Qemu Options: - -serial udp::4555@@:4556 -@@ -1279,7 +1279,7 @@ - directory tree. In order to use it, just type: - - @example --qemu linux.img -hdb fat:/my_directory -+kvm linux.img -hdb fat:/my_directory - @end example - - Then you access access to all the files in the @file{/my_directory} -@@ -1289,14 +1289,14 @@ - Floppies can be emulated with the @code{:floppy:} option: - - @example --qemu linux.img -fda fat:floppy:/my_directory -+kvm linux.img -fda fat:floppy:/my_directory - @end example - - A read/write support is available for testing (beta stage) with the - @code{:rw:} option: - - @example --qemu linux.img -fda fat:floppy:rw:/my_directory -+kvm linux.img -fda fat:floppy:rw:/my_directory - @end example - - What you should @emph{never} do: -@@ -1334,7 +1334,7 @@ - @subsubsection Linux host - - As an example, you can download the @file{linux-test-xxx.tar.gz} --archive and copy the script @file{qemu-ifup} in @file{/etc} and -+archive and copy the script @file{qemu-ifup} in @file{/etc/kvm} and - configure properly @code{sudo} so that the command @code{ifconfig} - contained in @file{qemu-ifup} can be executed as root. You must verify - that your host kernel supports the TAP network interfaces: the -@@ -1402,7 +1402,7 @@ - - The syntax is: - @example --qemu -kernel arch/i386/boot/bzImage -hda root-2.4.20.img -append "root=/dev/hda" -+kvm -kernel arch/i386/boot/bzImage -hda root-2.4.20.img -append "root=/dev/hda" - @end example - - Use @option{-kernel} to provide the Linux kernel image and -@@ -1417,7 +1417,7 @@ - the virtual serial port and the QEMU monitor to the console with the - @option{-nographic} option. The typical command line is: - @example --qemu -kernel arch/i386/boot/bzImage -hda root-2.4.20.img \ -+kvm -kernel arch/i386/boot/bzImage -hda root-2.4.20.img \ - -append "root=/dev/hda console=ttyS0" -nographic - @end example - -@@ -1447,7 +1447,7 @@ - Virtual Mouse. This will override the PS/2 mouse emulation when activated. - @item @code{tablet} - Pointer device that uses absolute coordinates (like a touchscreen). --This means qemu is able to report the mouse position without having -+This means kvm is able to report the mouse position without having - to grab the mouse. Also overrides the PS/2 mouse emulation when activated. - @item @code{disk:file} - Mass storage device based on @var{file} (@pxref{disk_images}) -@@ -1536,7 +1536,7 @@ - socket only. For example - - @example --qemu [...OPTIONS...] -vnc unix:/home/joebloggs/.qemu-myvm-vnc -+kvm [...OPTIONS...] -vnc unix:/home/joebloggs/.qemu-myvm-vnc - @end example - - This ensures that only users on local box with read/write access to that -@@ -1557,7 +1557,7 @@ - the monitor is used to set the password all clients will be rejected. - - @example --qemu [...OPTIONS...] -vnc :1,password -monitor stdio -+kvm [...OPTIONS...] -vnc :1,password -monitor stdio - (qemu) change vnc password - Password: ******** - (qemu) -@@ -1574,7 +1574,7 @@ - client to connect, and provides an encrypted session. - - @example --qemu [...OPTIONS...] -vnc :1,tls,x509=/etc/pki/qemu -monitor stdio -+kvm [...OPTIONS...] -vnc :1,tls,x509=/etc/pki/qemu -monitor stdio - @end example - - In the above example @code{/etc/pki/qemu} should contain at least three files, -@@ -1592,7 +1592,7 @@ - in an environment with a private internal certificate authority. - - @example --qemu [...OPTIONS...] -vnc :1,tls,x509verify=/etc/pki/qemu -monitor stdio -+kvm [...OPTIONS...] -vnc :1,tls,x509verify=/etc/pki/qemu -monitor stdio - @end example - - -@@ -1603,7 +1603,7 @@ - to provide two layers of authentication for clients. - - @example --qemu [...OPTIONS...] -vnc :1,password,tls,x509verify=/etc/pki/qemu -monitor stdio -+kvm [...OPTIONS...] -vnc :1,password,tls,x509verify=/etc/pki/qemu -monitor stdio - (qemu) change vnc password - Password: ******** - (qemu) -@@ -1726,10 +1726,10 @@ - QEMU has a primitive support to work with gdb, so that you can do - 'Ctrl-C' while the virtual machine is running and inspect its state. - --In order to use gdb, launch qemu with the '-s' option. It will wait for a -+In order to use gdb, launch kvm with the '-s' option. It will wait for a - gdb connection: - @example --> qemu -s -kernel arch/i386/boot/bzImage -hda root-2.4.20.img \ -+> kvm -s -kernel arch/i386/boot/bzImage -hda root-2.4.20.img \ - -append "root=/dev/hda" - Connected to host network interface: tun0 - Waiting gdb connection on port 1234 |