Commit e03ba136 authored by Peter Maydell's avatar Peter Maydell Committed by Stefan Hajnoczi
Browse files

Typo, spelling and grammatical fixes 



Minor fixes to documentation and code comments.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 5947c697

docs/bootindex.txt

+5 −5
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ still be bootable. 


== Example ==



Lets assume we have QEMU machine with two NICs (virtio, e1000) and two

Let's assume we have a QEMU machine with two NICs (virtio, e1000) and two

disks (IDE, virtio):



qemu -drive file=disk1.img,if=none,id=disk1
@@ -20,7 +20,7 @@ qemu -drive file=disk1.img,if=none,id=disk1 
     -netdev type=user,id=net1 -device e1000,netdev=net1,bootindex=1



Given the command above, firmware should try to boot from the e1000 NIC

first.  If this fails, it should try the virtio NIC next, if this fails

first.  If this fails, it should try the virtio NIC next; if this fails

too, it should try the virtio disk, and then the IDE disk.



== Limitations ==
@@ -28,7 +28,7 @@ too, it should try the virtio disk, and then the IDE disk. 
1. Some firmware has limitations on which devices can be considered for

booting.  For instance, the PC BIOS boot specification allows only one

disk to be bootable.  If boot from disk fails for some reason, the BIOS

won't retry booting from other disk.  It still can try to boot from

won't retry booting from other disk.  It can still try to boot from

floppy or net, though.



2. Sometimes, firmware cannot map the device path QEMU wants firmware to
@@ -36,8 +36,8 @@ boot from to a boot method. It doesn't happen for devices the firmware 
can natively boot from, but if firmware relies on an option ROM for

booting, and the same option ROM is used for booting from more then one

device, the firmware may not be able to ask the option ROM to boot from

a particular device reliably.  For instance with PC BIOS, if a SCSI HBA

a particular device reliably.  For instance with the PC BIOS, if a SCSI HBA

has three bootable devices target1, target3, target5 connected to it,

the option ROM will have a boot method for each of them, but it is not

possible to map from boot method back to a specific target.  This is a

shortcoming of PC BIOS boot specification.
 
shortcoming of the PC BIOS boot specification.

docs/ccid.txt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ information see the specification: 
 Revision 1.1

 April 22rd, 2005



Smartcard are used for authentication, single sign on, decryption in

Smartcards are used for authentication, single sign on, decryption in

public/private schemes and digital signatures. A smartcard reader on the client

cannot be used on a guest with simple usb passthrough since it will then not be

available on the client, possibly locking the computer when it is "removed". On

hw/block/virtio-blk.c

+2 −2
Original line number Diff line number Diff line
@@ -494,10 +494,10 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) 
    blkcfg.heads = s->conf->heads;

    /*

     * We must ensure that the block device capacity is a multiple of

     * the logical block size. If that is not the case, lets use

     * the logical block size. If that is not the case, let's use

     * sector_mask to adopt the geometry to have a correct picture.

     * For those devices where the capacity is ok for the given geometry

     * we dont touch the sector value of the geometry, since some devices

     * we don't touch the sector value of the geometry, since some devices

     * (like s390 dasd) need a specific value. Here the capacity is already

     * cyls*heads*secs*blk_size and the sector value is not block size

     * divided by 512 - instead it is the amount of blk_size blocks

hw/intc/armv7m_nvic.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static uint32_t nvic_readl(nvic_state *s, uint32_t offset) 
        return 10000;

    case 0xd00: /* CPUID Base.  */

        return cpu_single_env->cp15.c0_cpuid;

    case 0xd04: /* Interrypt Control State.  */

    case 0xd04: /* Interrupt Control State.  */

        /* VECTACTIVE */

        val = s->gic.running_irq[0];

        if (val == 1023) {

hw/s390x/s390-virtio-ccw.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void ccw_init(QEMUMachineInitArgs *args) 
    }

    my_ram_size = my_ram_size >> (20 + shift) << (20 + shift);



    /* lets propagate the changed ram size into the global variable. */

    /* let's propagate the changed ram size into the global variable. */

    ram_size = my_ram_size;



    /* get a BUS */