diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2013-04-09 12:48:19 +0100 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-04-12 14:33:20 +0200 |
commit | e03ba136377ff0038276ba493473127338c68ebc (patch) | |
tree | 0867b99c98e6c420cd79ee8216569c5e15332e48 /hw | |
parent | 5947c697ce71898015ae1c6ac5d23d1ecc388552 (diff) | |
download | qemu-e03ba136377ff0038276ba493473127338c68ebc.zip |
Typo, spelling and grammatical fixes
Minor fixes to documentation and code comments.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/block/virtio-blk.c | 4 | ||||
-rw-r--r-- | hw/intc/armv7m_nvic.c | 2 | ||||
-rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 2 | ||||
-rw-r--r-- | hw/s390x/s390-virtio.c | 2 | ||||
-rw-r--r-- | hw/sd/sd.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 6efb2f063d..9fdf009da5 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -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 diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 566b4bfa41..67dbe68cdc 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -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) { diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 76b63e2ca6..a49e4401cd 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -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 */ diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index f82c0e1964..46aec999a6 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -240,7 +240,7 @@ static void s390_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 */ diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 66c4014fbe..2e0ef3e5aa 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -308,7 +308,7 @@ static void sd_set_csd(SDState *sd, uint64_t size) sd->csd[13] = 0x40; sd->csd[14] = 0x00; sd->csd[15] = 0x00; - sd->ocr |= 1 << 30; /* High Capacity SD Memort Card */ + sd->ocr |= 1 << 30; /* High Capacity SD Memory Card */ } } @@ -1541,7 +1541,7 @@ void sd_write_data(SDState *sd, uint8_t value) case 25: /* CMD25: WRITE_MULTIPLE_BLOCK */ if (sd->data_offset == 0) { - /* Start of the block - lets check the address is valid */ + /* Start of the block - let's check the address is valid */ if (sd->data_start + sd->blk_len > sd->size) { sd->card_status |= ADDRESS_ERROR; break; |