gwj / at91sam9263 · Commits

Commit 9d4520d0e06a7dda8f3bf515e2b51fc240db698a

Authored by bellard
1 parent 5b9f457a

update 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@425 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
qemu-doc.texi
  View file @9d4520d
@@ -426,14 +426,14 @@ A 2.5.74 kernel is also included in the archive. Just @@ -426,14 +426,14 @@ A 2.5.74 kernel is also included in the archive. Just
426 replace the bzImage in qemu.sh to try it. 426 replace the bzImage in qemu.sh to try it.
427 427
428 @item 428 @item
429 -vl creates a temporary file in @var{$QEMU_TMPDIR} (@file{/tmp} is the 429 +qemu creates a temporary file in @var{$QEMU_TMPDIR} (@file{/tmp} is the
430 default) containing all the simulated PC memory. If possible, try to use 430 default) containing all the simulated PC memory. If possible, try to use
431 a temporary directory using the tmpfs filesystem to avoid too many 431 a temporary directory using the tmpfs filesystem to avoid too many
432 unnecessary disk accesses. 432 unnecessary disk accesses.
433 433
434 @item 434 @item
435 -In order to exit cleanly for vl, you can do a @emph{shutdown} inside  
436 -vl. vl will automatically exit when the Linux shutdown is done. 435 +In order to exit cleanly from qemu, you can do a @emph{shutdown} inside
  436 +qemu. qemu will automatically exit when the Linux shutdown is done.
437 437
438 @item 438 @item
439 You can boot slightly faster by disabling the probe of non present IDE 439 You can boot slightly faster by disabling the probe of non present IDE
@@ -458,7 +458,7 @@ usage: qemu [options] [disk_image] @@ -458,7 +458,7 @@ usage: qemu [options] [disk_image]
458 @end example 458 @end example
459 459
460 @c man begin OPTIONS 460 @c man begin OPTIONS
461 -@var{disk_image} is a raw hard image image for IDE hard disk 0. 461 +@var{disk_image} is a raw hard disk image for IDE hard disk 0.
462 462
463 General options: 463 General options:
464 @table @option 464 @table @option
@@ -476,7 +476,7 @@ the write back by pressing @key{C-a s} (@xref{disk_images}). @@ -476,7 +476,7 @@ the write back by pressing @key{C-a s} (@xref{disk_images}).
476 Set virtual RAM size to @var{megs} megabytes. 476 Set virtual RAM size to @var{megs} megabytes.
477 477
478 @item -n script 478 @item -n script
479 -Set network init script [default=/etc/vl-ifup]. This script is 479 +Set network init script [default=/etc/qemu-ifup]. This script is
480 launched to configure the host network interface (usually tun0) 480 launched to configure the host network interface (usually tun0)
481 corresponding to the virtual NE2000 card. 481 corresponding to the virtual NE2000 card.
482 482
@@ -519,7 +519,7 @@ Wait gdb connection to port 1234 (@xref{gdb_usage}). @@ -519,7 +519,7 @@ Wait gdb connection to port 1234 (@xref{gdb_usage}).
519 @item -p port 519 @item -p port
520 Change gdb connection port. 520 Change gdb connection port.
521 @item -d 521 @item -d
522 -Output log in /tmp/vl.log 522 +Output log in /tmp/qemu.log
523 @end table 523 @end table
524 524
525 During emulation, use @key{C-a h} to get terminal commands: 525 During emulation, use @key{C-a h} to get terminal commands:
@@ -704,10 +704,10 @@ exactly the same kernel as you would boot on your PC (in @@ -704,10 +704,10 @@ exactly the same kernel as you would boot on your PC (in
704 QEMU has a primitive support to work with gdb, so that you can do 704 QEMU has a primitive support to work with gdb, so that you can do
705 'Ctrl-C' while the virtual machine is running and inspect its state. 705 'Ctrl-C' while the virtual machine is running and inspect its state.
706 706
707 -In order to use gdb, launch vl with the '-s' option. It will wait for a 707 +In order to use gdb, launch qemu with the '-s' option. It will wait for a
708 gdb connection: 708 gdb connection:
709 @example 709 @example
710 -> vl -s arch/i386/boot/bzImage -hda root-2.4.20.img root=/dev/hda 710 +> qemu -s arch/i386/boot/bzImage -hda root-2.4.20.img root=/dev/hda
711 Connected to host network interface: tun0 711 Connected to host network interface: tun0
712 Waiting gdb connection on port 1234 712 Waiting gdb connection on port 1234
713 @end example 713 @end example