* [Qemu-devel] [PATCH 01/24] Fix typo in code and comments
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
@ 2011-05-08 16:04 ` Stefan Hajnoczi
2011-05-08 16:04 ` [Qemu-devel] [PATCH 02/24] Fix typos in comments (dependancy -> dependency) Stefan Hajnoczi
` (24 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:04 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Replace writeable -> writable
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
block.c | 2 +-
block/sheepdog.c | 4 +-
hw/eepro100.c | 2 +-
hw/eeprom93xx.c | 10 ++++----
hw/msi.c | 2 +-
hw/msix.c | 2 +-
hw/pci.c | 6 ++--
hw/pci.h | 2 +-
hw/rtl8139.c | 44 ++++++++++++++++++++++-------------------
hw/sun4m_iommu.c | 2 +-
target-mips/translate_init.c | 2 +-
11 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/block.c b/block.c
index f731c7a..8767d31 100644
--- a/block.c
+++ b/block.c
@@ -455,7 +455,7 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename,
open_flags = flags & ~(BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING);
/*
- * Snapshots should be writeable.
+ * Snapshots should be writable.
*/
if (bs->is_temporary) {
open_flags |= BDRV_O_RDWR;
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 98946d7..0392ca8 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -196,7 +196,7 @@ static inline uint64_t fnv_64a_buf(void *buf, size_t len, uint64_t hval)
return hval;
}
-static inline int is_data_obj_writeable(SheepdogInode *inode, unsigned int idx)
+static inline int is_data_obj_writable(SheepdogInode *inode, unsigned int idx)
{
return inode->vdi_id == inode->data_vdi_id[idx];
}
@@ -1577,7 +1577,7 @@ static void sd_readv_writev_bh_cb(void *p)
create = 1;
} else if (acb->aiocb_type == AIOCB_WRITE_UDATA
- && !is_data_obj_writeable(inode, idx)) {
+ && !is_data_obj_writable(inode, idx)) {
/* Copy-On-Write */
create = 1;
old_oid = oid;
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 05450e8..9f16efd 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -1126,7 +1126,7 @@ static void eepro100_write_eeprom(eeprom_t * eeprom, uint8_t val)
{
TRACE(EEPROM, logout("val=0x%02x\n", val));
- /* mask unwriteable bits */
+ /* mask unwritable bits */
#if 0
val = SET_MASKED(val, 0x31, eeprom->value);
#endif
diff --git a/hw/eeprom93xx.c b/hw/eeprom93xx.c
index 660b28f..7b21f98 100644
--- a/hw/eeprom93xx.c
+++ b/hw/eeprom93xx.c
@@ -75,7 +75,7 @@ struct _eeprom_t {
uint8_t tick;
uint8_t address;
uint8_t command;
- uint8_t writeable;
+ uint8_t writable;
uint8_t eecs;
uint8_t eesk;
@@ -130,7 +130,7 @@ static const VMStateDescription vmstate_eeprom = {
VMSTATE_UINT8(tick, eeprom_t),
VMSTATE_UINT8(address, eeprom_t),
VMSTATE_UINT8(command, eeprom_t),
- VMSTATE_UINT8(writeable, eeprom_t),
+ VMSTATE_UINT8(writable, eeprom_t),
VMSTATE_UINT8(eecs, eeprom_t),
VMSTATE_UINT8(eesk, eeprom_t),
@@ -165,7 +165,7 @@ void eeprom93xx_write(eeprom_t *eeprom, int eecs, int eesk, int eedi)
address = 0x0;
} else if (eeprom->eecs && ! eecs) {
/* End chip select cycle. This triggers write / erase. */
- if (eeprom->writeable) {
+ if (eeprom->writable) {
uint8_t subcommand = address >> (eeprom->addrbits - 2);
if (command == 0 && subcommand == 2) {
/* Erase all. */
@@ -232,7 +232,7 @@ void eeprom93xx_write(eeprom_t *eeprom, int eecs, int eesk, int eedi)
switch (address >> (eeprom->addrbits - 2)) {
case 0:
logout("write disable command\n");
- eeprom->writeable = 0;
+ eeprom->writable = 0;
break;
case 1:
logout("write all command\n");
@@ -242,7 +242,7 @@ void eeprom93xx_write(eeprom_t *eeprom, int eecs, int eesk, int eedi)
break;
case 3:
logout("write enable command\n");
- eeprom->writeable = 1;
+ eeprom->writable = 1;
break;
}
} else {
diff --git a/hw/msi.c b/hw/msi.c
index b0795bd..b087fe5 100644
--- a/hw/msi.c
+++ b/hw/msi.c
@@ -155,7 +155,7 @@ int msi_init(struct PCIDevice *dev, uint8_t offset,
pci_set_word(dev->wmask + msi_data_off(dev, msi64bit), 0xffff);
if (msi_per_vector_mask) {
- /* Make mask bits 0 to nr_vectors - 1 writeable. */
+ /* Make mask bits 0 to nr_vectors - 1 writable. */
pci_set_long(dev->wmask + msi_mask_off(dev, msi64bit),
0xffffffff >> (PCI_MSI_VECTORS_MAX - nr_vectors));
}
diff --git a/hw/msix.c b/hw/msix.c
index daaf9b7..af40e26 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -87,7 +87,7 @@ static int msix_add_config(struct PCIDevice *pdev, unsigned short nentries,
pci_set_long(config + MSIX_PBA_OFFSET, (bar_size + MSIX_PAGE_PENDING) |
bar_nr);
pdev->msix_cap = config_offset;
- /* Make flags bit writeable. */
+ /* Make flags bit writable. */
pdev->wmask[config_offset + MSIX_CONTROL_OFFSET] |= MSIX_ENABLE_MASK |
MSIX_MASKALL_MASK;
return 0;
diff --git a/hw/pci.c b/hw/pci.c
index 0875654..20dfa72 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -168,7 +168,7 @@ void pci_device_reset(PCIDevice *dev)
dev->irq_state = 0;
pci_update_irq_status(dev);
pci_device_deassert_intx(dev);
- /* Clear all writeable bits */
+ /* Clear all writable bits */
pci_word_test_and_clear_mask(dev->config + PCI_COMMAND,
pci_get_word(dev->wmask + PCI_COMMAND) |
pci_get_word(dev->w1cmask + PCI_COMMAND));
@@ -871,7 +871,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
wmask = ~(size - 1);
addr = pci_bar(pci_dev, region_num);
if (region_num == PCI_ROM_SLOT) {
- /* ROM enable bit is writeable */
+ /* ROM enable bit is writable */
wmask |= PCI_ROM_ADDRESS_ENABLE;
}
pci_set_long(pci_dev->config + addr, type);
@@ -1975,7 +1975,7 @@ void pci_del_capability(PCIDevice *pdev, uint8_t cap_id, uint8_t size)
if (!offset)
return;
pdev->config[prev] = pdev->config[offset + PCI_CAP_LIST_NEXT];
- /* Make capability writeable again */
+ /* Make capability writable again */
memset(pdev->wmask + offset, 0xff, size);
memset(pdev->w1cmask + offset, 0, size);
/* Clear cmask as device-specific registers can't be checked */
diff --git a/hw/pci.h b/hw/pci.h
index c6a6eb6..0d288ce 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -132,7 +132,7 @@ struct PCIDevice {
/* PCI config space */
uint8_t *config;
- /* Used to enable config checks on load. Note that writeable bits are
+ /* Used to enable config checks on load. Note that writable bits are
* never checked even if set in cmask. */
uint8_t *cmask;
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index c7c7a3c..2f8db58 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -1399,7 +1399,7 @@ static void rtl8139_ChipCmd_write(RTL8139State *s, uint32_t val)
s->currCPlusTxDesc = 0;
}
- /* mask unwriteable bits */
+ /* mask unwritable bits */
val = SET_MASKED(val, 0xe3, s->bChipCmdState);
/* Deassert reset pin before next read */
@@ -1443,7 +1443,7 @@ static void rtl8139_CpCmd_write(RTL8139State *s, uint32_t val)
s->cplus_enabled = 1;
- /* mask unwriteable bits */
+ /* mask unwritable bits */
val = SET_MASKED(val, 0xff84, s->CpCmd);
s->CpCmd = val;
@@ -1472,7 +1472,7 @@ static uint32_t rtl8139_IntrMitigate_read(RTL8139State *s)
return ret;
}
-static int rtl8139_config_writeable(RTL8139State *s)
+static int rtl8139_config_writable(RTL8139State *s)
{
if (s->Cfg9346 & Cfg9346_Unlock)
{
@@ -1490,10 +1490,10 @@ static void rtl8139_BasicModeCtrl_write(RTL8139State *s, uint32_t val)
DPRINTF("BasicModeCtrl register write(w) val=0x%04x\n", val);
- /* mask unwriteable bits */
+ /* mask unwritable bits */
uint32_t mask = 0x4cff;
- if (1 || !rtl8139_config_writeable(s))
+ if (1 || !rtl8139_config_writable(s))
{
/* Speed setting and autonegotiation enable bits are read-only */
mask |= 0x3000;
@@ -1521,7 +1521,7 @@ static void rtl8139_BasicModeStatus_write(RTL8139State *s, uint32_t val)
DPRINTF("BasicModeStatus register write(w) val=0x%04x\n", val);
- /* mask unwriteable bits */
+ /* mask unwritable bits */
val = SET_MASKED(val, 0xff3f, s->BasicModeStatus);
s->BasicModeStatus = val;
@@ -1542,7 +1542,7 @@ static void rtl8139_Cfg9346_write(RTL8139State *s, uint32_t val)
DPRINTF("Cfg9346 write val=0x%02x\n", val);
- /* mask unwriteable bits */
+ /* mask unwritable bits */
val = SET_MASKED(val, 0x31, s->Cfg9346);
uint32_t opmode = val & 0xc0;
@@ -1594,10 +1594,11 @@ static void rtl8139_Config0_write(RTL8139State *s, uint32_t val)
DPRINTF("Config0 write val=0x%02x\n", val);
- if (!rtl8139_config_writeable(s))
+ if (!rtl8139_config_writable(s)) {
return;
+ }
- /* mask unwriteable bits */
+ /* mask unwritable bits */
val = SET_MASKED(val, 0xf8, s->Config0);
s->Config0 = val;
@@ -1618,10 +1619,11 @@ static void rtl8139_Config1_write(RTL8139State *s, uint32_t val)
DPRINTF("Config1 write val=0x%02x\n", val);
- if (!rtl8139_config_writeable(s))
+ if (!rtl8139_config_writable(s)) {
return;
+ }
- /* mask unwriteable bits */
+ /* mask unwritable bits */
val = SET_MASKED(val, 0xC, s->Config1);
s->Config1 = val;
@@ -1642,10 +1644,11 @@ static void rtl8139_Config3_write(RTL8139State *s, uint32_t val)
DPRINTF("Config3 write val=0x%02x\n", val);
- if (!rtl8139_config_writeable(s))
+ if (!rtl8139_config_writable(s)) {
return;
+ }
- /* mask unwriteable bits */
+ /* mask unwritable bits */
val = SET_MASKED(val, 0x8F, s->Config3);
s->Config3 = val;
@@ -1666,10 +1669,11 @@ static void rtl8139_Config4_write(RTL8139State *s, uint32_t val)
DPRINTF("Config4 write val=0x%02x\n", val);
- if (!rtl8139_config_writeable(s))
+ if (!rtl8139_config_writable(s)) {
return;
+ }
- /* mask unwriteable bits */
+ /* mask unwritable bits */
val = SET_MASKED(val, 0x0a, s->Config4);
s->Config4 = val;
@@ -1690,7 +1694,7 @@ static void rtl8139_Config5_write(RTL8139State *s, uint32_t val)
DPRINTF("Config5 write val=0x%02x\n", val);
- /* mask unwriteable bits */
+ /* mask unwritable bits */
val = SET_MASKED(val, 0x80, s->Config5);
s->Config5 = val;
@@ -1743,7 +1747,7 @@ static void rtl8139_RxConfig_write(RTL8139State *s, uint32_t val)
{
DPRINTF("RxConfig write val=0x%08x\n", val);
- /* mask unwriteable bits */
+ /* mask unwritable bits */
val = SET_MASKED(val, 0xf0fc0040, s->RxConfig);
s->RxConfig = val;
@@ -2610,7 +2614,7 @@ static void rtl8139_IntrMask_write(RTL8139State *s, uint32_t val)
{
DPRINTF("IntrMask write(w) val=0x%04x\n", val);
- /* mask unwriteable bits */
+ /* mask unwritable bits */
val = SET_MASKED(val, 0x1e00, s->IntrMask);
s->IntrMask = val;
@@ -2642,7 +2646,7 @@ static void rtl8139_IntrStatus_write(RTL8139State *s, uint32_t val)
#else
uint16_t newStatus = s->IntrStatus & ~val;
- /* mask unwriteable bits */
+ /* mask unwritable bits */
newStatus = SET_MASKED(newStatus, 0x1e00, s->IntrStatus);
/* writing 1 to interrupt status register bit clears it */
@@ -2686,7 +2690,7 @@ static void rtl8139_MultiIntr_write(RTL8139State *s, uint32_t val)
{
DPRINTF("MultiIntr write(w) val=0x%04x\n", val);
- /* mask unwriteable bits */
+ /* mask unwritable bits */
val = SET_MASKED(val, 0xf000, s->MultiIntr);
s->MultiIntr = val;
diff --git a/hw/sun4m_iommu.c b/hw/sun4m_iommu.c
index bba69ee..7f5dad5 100644
--- a/hw/sun4m_iommu.c
+++ b/hw/sun4m_iommu.c
@@ -118,7 +118,7 @@
#define IOPTE_PAGE 0xffffff00 /* Physical page number (PA[35:12]) */
#define IOPTE_CACHE 0x00000080 /* Cached (in vme IOCACHE or
Viking/MXCC) */
-#define IOPTE_WRITE 0x00000004 /* Writeable */
+#define IOPTE_WRITE 0x00000004 /* Writable */
#define IOPTE_VALID 0x00000002 /* IOPTE is valid */
#define IOPTE_WAZ 0x00000001 /* Write as zeros */
diff --git a/target-mips/translate_init.c b/target-mips/translate_init.c
index 590e092..8d9b5b9 100644
--- a/target-mips/translate_init.c
+++ b/target-mips/translate_init.c
@@ -477,7 +477,7 @@ static const mips_def_t mips_defs[] =
.CP0_Config1 = (1 << CP0C1_FP) | (47 << CP0C1_MMU),
.SYNCI_Step = 16,
.CCRes = 2,
- .CP0_Status_rw_bitmask = 0xF5D0FF1F, /*bit5:7 not writeable*/
+ .CP0_Status_rw_bitmask = 0xF5D0FF1F, /*bit5:7 not writable*/
.CP1_fcr0 = (0x5 << FCR0_PRID) | (0x1 << FCR0_REV),
.SEGBITS = 40,
.PABITS = 40,
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 02/24] Fix typos in comments (dependancy -> dependency)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
2011-05-08 16:04 ` [Qemu-devel] [PATCH 01/24] Fix typo in code and comments Stefan Hajnoczi
@ 2011-05-08 16:04 ` Stefan Hajnoczi
2011-05-08 16:04 ` [Qemu-devel] [PATCH 03/24] Fix typos in comments (accross -> across) Stefan Hajnoczi
` (23 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:04 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
Changelog | 2 +-
Makefile.objs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Changelog b/Changelog
index 152feaa..1c41e14 100644
--- a/Changelog
+++ b/Changelog
@@ -525,7 +525,7 @@ version 0.1.5:
- ppc64 support + personality() patch (Rusty Russell)
- first Alpha CPU patches (Falk Hueffner)
- - removed bfd.h dependancy
+ - removed bfd.h dependency
- fixed shrd, shld, idivl and divl on PowerPC.
- fixed buggy glibc PowerPC rint() function (test-i386 passes now on PowerPC).
diff --git a/Makefile.objs b/Makefile.objs
index 9d8851e..d82c60d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -335,7 +335,7 @@ trace-dtrace.h: trace-dtrace.dtrace
$(call quiet-command,dtrace -o $@ -h -s $<, " GEN trace-dtrace.h")
# Normal practice is to name DTrace probe file with a '.d' extension
-# but that gets picked up by QEMU's Makefile as an external dependancy
+# but that gets picked up by QEMU's Makefile as an external dependency
# rule file. So we use '.dtrace' instead
trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp
trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events config-host.mak
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 03/24] Fix typos in comments (accross -> across)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
2011-05-08 16:04 ` [Qemu-devel] [PATCH 01/24] Fix typo in code and comments Stefan Hajnoczi
2011-05-08 16:04 ` [Qemu-devel] [PATCH 02/24] Fix typos in comments (dependancy -> dependency) Stefan Hajnoczi
@ 2011-05-08 16:04 ` Stefan Hajnoczi
2011-05-08 16:04 ` [Qemu-devel] [PATCH 04/24] Fix typos in comments (accessable -> accessible, priveleged -> privileged) Stefan Hajnoczi
` (22 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:04 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
darwin-user/syscall.c | 2 +-
target-microblaze/helper.c | 2 +-
tcg/tcg.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/darwin-user/syscall.c b/darwin-user/syscall.c
index 060acc8..f3cc1f83 100644
--- a/darwin-user/syscall.c
+++ b/darwin-user/syscall.c
@@ -977,7 +977,7 @@ long do_unix_syscall_indirect(void *cpu_env, int num)
#elif TARGET_PPC
{
int i;
- /* XXX: not really needed those regs are volatile accross calls */
+ /* XXX: not really needed those regs are volatile across calls */
uint32_t **regs = ((CPUPPCState*)cpu_env)->gpr;
for(i = 11; i > 3; i--)
*regs[i] = *regs[i-1];
diff --git a/target-microblaze/helper.c b/target-microblaze/helper.c
index 5230b52..a623c7b 100644
--- a/target-microblaze/helper.c
+++ b/target-microblaze/helper.c
@@ -117,7 +117,7 @@ void do_interrupt(CPUState *env)
{
uint32_t t;
- /* IMM flag cannot propagate accross a branch and into the dslot. */
+ /* IMM flag cannot propagate across a branch and into the dslot. */
assert(!((env->iflags & D_FLAG) && (env->iflags & IMM_FLAG)));
assert(!(env->iflags & (DRTI_FLAG | DRTE_FLAG | DRTB_FLAG)));
/* assert(env->sregs[SR_MSR] & (MSR_EE)); Only for HW exceptions. */
diff --git a/tcg/tcg.h b/tcg/tcg.h
index 3fab8d6..cecef63 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -252,9 +252,9 @@ typedef struct TCGTemp {
unsigned int fixed_reg:1;
unsigned int mem_coherent:1;
unsigned int mem_allocated:1;
- unsigned int temp_local:1; /* If true, the temp is saved accross
+ unsigned int temp_local:1; /* If true, the temp is saved across
basic blocks. Otherwise, it is not
- preserved accross basic blocks. */
+ preserved across basic blocks. */
unsigned int temp_allocated:1; /* never used for code gen */
/* index of next free temp of same base type, -1 if end */
int next_free_temp;
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 04/24] Fix typos in comments (accessable -> accessible, priveleged -> privileged)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (2 preceding siblings ...)
2011-05-08 16:04 ` [Qemu-devel] [PATCH 03/24] Fix typos in comments (accross -> across) Stefan Hajnoczi
@ 2011-05-08 16:04 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 05/24] Fix typo in comment (colum -> column) Stefan Hajnoczi
` (21 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:04 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hw/sh7750_regs.h | 6 +++---
target-cris/cpu.h | 2 +-
tests/test-mmap.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/sh7750_regs.h b/hw/sh7750_regs.h
index 5a23a2c..6ec13ab 100644
--- a/hw/sh7750_regs.h
+++ b/hw/sh7750_regs.h
@@ -23,9 +23,9 @@
* All register has 2 addresses: in 0xff000000 - 0xffffffff (P4 address) and
* in 0x1f000000 - 0x1fffffff (area 7 address)
*/
-#define SH7750_P4_BASE 0xff000000 /* Accessable only in
- priveleged mode */
-#define SH7750_A7_BASE 0x1f000000 /* Accessable only using TLB */
+#define SH7750_P4_BASE 0xff000000 /* Accessible only in
+ privileged mode */
+#define SH7750_A7_BASE 0x1f000000 /* Accessible only using TLB */
#define SH7750_P4_REG32(ofs) (SH7750_P4_BASE + (ofs))
#define SH7750_A7_REG32(ofs) (SH7750_A7_BASE + (ofs))
diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index d908775..4a9032b 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -101,7 +101,7 @@ typedef struct CPUCRISState {
/* P0 - P15 are referred to as special registers in the docs. */
uint32_t pregs[16];
- /* Pseudo register for the PC. Not directly accessable on CRIS. */
+ /* Pseudo register for the PC. Not directly accessible on CRIS. */
uint32_t pc;
/* Pseudo register for the kernel stack. */
diff --git a/tests/test-mmap.c b/tests/test-mmap.c
index c578e25..c67174a 100644
--- a/tests/test-mmap.c
+++ b/tests/test-mmap.c
@@ -322,7 +322,7 @@ void check_file_unfixed_eof_mmaps(void)
fail_unless (p1[(test_fsize & pagemask) / sizeof *p1 - 1]
== ((test_fsize - sizeof *p1) / sizeof *p1));
- /* Verify that the end of page is accessable and zeroed. */
+ /* Verify that the end of page is accessible and zeroed. */
cp = (void *) p1;
fail_unless (cp[pagesize - 4] == 0);
munmap (p1, pagesize);
@@ -365,7 +365,7 @@ void check_file_fixed_eof_mmaps(void)
fail_unless (p1[(test_fsize & pagemask) / sizeof *p1 - 1]
== ((test_fsize - sizeof *p1) / sizeof *p1));
- /* Verify that the end of page is accessable and zeroed. */
+ /* Verify that the end of page is accessible and zeroed. */
cp = (void *)p1;
fail_unless (cp[pagesize - 4] == 0);
munmap (p1, pagesize);
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 05/24] Fix typo in comment (colum -> column)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (3 preceding siblings ...)
2011-05-08 16:04 ` [Qemu-devel] [PATCH 04/24] Fix typos in comments (accessable -> accessible, priveleged -> privileged) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 06/24] Fix typo in comment (auxilliary -> auxiliary) Stefan Hajnoczi
` (20 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hw/ssd0303.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hw/ssd0303.c b/hw/ssd0303.c
index 108c068..b39e259 100644
--- a/hw/ssd0303.c
+++ b/hw/ssd0303.c
@@ -93,7 +93,7 @@ static int ssd0303_send(i2c_slave *i2c, uint8_t data)
DPRINTF("cmd 0x%02x\n", data);
s->mode = SSD0303_IDLE;
switch (data) {
- case 0x00 ... 0x0f: /* Set lower colum address. */
+ case 0x00 ... 0x0f: /* Set lower column address. */
s->col = (s->col & 0xf0) | (data & 0xf);
break;
case 0x10 ... 0x20: /* Set higher column address. */
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 06/24] Fix typo in comment (auxilliary -> auxiliary)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (4 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 05/24] Fix typo in comment (colum -> column) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 07/24] Fix typo in comment (embeded -> embedded) Stefan Hajnoczi
` (19 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hw/pci_regs.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hw/pci_regs.h b/hw/pci_regs.h
index dd0bed4..5a5ab89 100644
--- a/hw/pci_regs.h
+++ b/hw/pci_regs.h
@@ -223,7 +223,7 @@
#define PCI_PM_CAP_PME_CLOCK 0x0008 /* PME clock required */
#define PCI_PM_CAP_RESERVED 0x0010 /* Reserved field */
#define PCI_PM_CAP_DSI 0x0020 /* Device specific initialization */
-#define PCI_PM_CAP_AUX_POWER 0x01C0 /* Auxilliary power support mask */
+#define PCI_PM_CAP_AUX_POWER 0x01C0 /* Auxiliary power support mask */
#define PCI_PM_CAP_D1 0x0200 /* D1 power state support */
#define PCI_PM_CAP_D2 0x0400 /* D2 power state support */
#define PCI_PM_CAP_PME 0x0800 /* PME pin supported */
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 07/24] Fix typo in comment (embeded -> embedded)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (5 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 06/24] Fix typo in comment (auxilliary -> auxiliary) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 08/24] Fix typo in comment (consistant -> consistent) Stefan Hajnoczi
` (18 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
target-ppc/cpu.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 04b1259..e438b17 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -225,7 +225,7 @@ enum {
/* 970FX specific exceptions */
POWERPC_EXCP_SOFTP = 88, /* Soft patch exception */
POWERPC_EXCP_MAINT = 89, /* Maintenance exception */
- /* Freescale embeded cores specific exceptions */
+ /* Freescale embedded cores specific exceptions */
POWERPC_EXCP_MEXTBR = 90, /* Maskable external breakpoint */
POWERPC_EXCP_NMEXTBR = 91, /* Non maskable external breakpoint */
POWERPC_EXCP_ITLBE = 92, /* Instruction TLB error */
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 08/24] Fix typo in comment (consistant -> consistent)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (6 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 07/24] Fix typo in comment (embeded -> embedded) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 09/24] Fix typo in comment (dieing -> dying) Stefan Hajnoczi
` (17 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
libcacard/vcard_emul_nss.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c
index baada52..f3db657 100644
--- a/libcacard/vcard_emul_nss.c
+++ b/libcacard/vcard_emul_nss.c
@@ -971,7 +971,7 @@ find_blank(const char *str)
/*
* We really want to use some existing argument parsing library here. That
- * would give us a consistant look */
+ * would give us a consistent look */
static VCardEmulOptions options;
#define READER_STEP 4
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 09/24] Fix typo in comment (dieing -> dying)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (7 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 08/24] Fix typo in comment (consistant -> consistent) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 10/24] Fix typos in comments (imediately -> immediately) Stefan Hajnoczi
` (16 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
linux-user/signal.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/linux-user/signal.c b/linux-user/signal.c
index ce033e9..6fe086b 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -391,7 +391,7 @@ static void QEMU_NORETURN force_sig(int target_sig)
target_sig, strsignal(host_sig), "core dumped" );
}
- /* The proper exit code for dieing from an uncaught signal is
+ /* The proper exit code for dying from an uncaught signal is
* -<signal>. The kernel doesn't allow exit() or _exit() to pass
* a negative value. To get the proper exit code we need to
* actually die from an uncaught signal. Here the default signal
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 10/24] Fix typos in comments (imediately -> immediately)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (8 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 09/24] Fix typo in comment (dieing -> dying) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 11/24] Fix typos in comments (existance -> existence) Stefan Hajnoczi
` (15 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hw/lan9118.c | 2 +-
hw/syborg_serial.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/lan9118.c b/hw/lan9118.c
index 2dc8d18..4c42fe9 100644
--- a/hw/lan9118.c
+++ b/hw/lan9118.c
@@ -721,7 +721,7 @@ static void do_phy_write(lan9118_state *s, int reg, uint32_t val)
break;
}
s->phy_control = val & 0x7980;
- /* Complete autonegotiation imediately. */
+ /* Complete autonegotiation immediately. */
if (val & 0x1000) {
s->phy_status |= 0x0020;
}
diff --git a/hw/syborg_serial.c b/hw/syborg_serial.c
index df2950f..2ef7175 100644
--- a/hw/syborg_serial.c
+++ b/hw/syborg_serial.c
@@ -126,7 +126,7 @@ static void do_dma_tx(SyborgSerialState *s, uint32_t count)
s->dma_tx_ptr += count;
}
/* QEMU char backends do not have a nonblocking mode, so we transmit all
- the data imediately and the interrupt status will be unchanged. */
+ the data immediately and the interrupt status will be unchanged. */
}
/* Initiate RX DMA, and transfer data from the FIFO. */
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 11/24] Fix typos in comments (existance -> existence)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (9 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 10/24] Fix typos in comments (imediately -> immediately) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 12/24] Fix typos in comments (interupt -> interrupt) Stefan Hajnoczi
` (14 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
libcacard/vscard_common.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libcacard/vscard_common.h b/libcacard/vscard_common.h
index bebd52d..609ae98 100644
--- a/libcacard/vscard_common.h
+++ b/libcacard/vscard_common.h
@@ -153,7 +153,7 @@ typedef struct VSCMsgCardRemove {
/*
* VSCMsgAPDU Client <-> Host
- * Main reason of existance. Transfer a single APDU in either direction.
+ * Main reason of existence. Transfer a single APDU in either direction.
*/
typedef struct VSCMsgAPDU {
uint8_t data[0];
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 12/24] Fix typos in comments (interupt -> interrupt)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (10 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 11/24] Fix typos in comments (existance -> existence) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 13/24] Fix typos in comments (instanciation -> instantiation) Stefan Hajnoczi
` (13 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
cpu-exec.c | 2 +-
hw/mst_fpga.c | 2 +-
hw/pl031.c | 2 +-
hw/pl061.c | 4 ++--
target-mips/translate_init.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cpu-exec.c b/cpu-exec.c
index 395cd8c..2cdcdc5 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -569,7 +569,7 @@ int cpu_exec(CPUState *env1)
next_tb = 0;
}
#endif
- /* Don't use the cached interupt_request value,
+ /* Don't use the cached interrupt_request value,
do_interrupt may have updated the EXITTB flag. */
if (env->interrupt_request & CPU_INTERRUPT_EXITTB) {
env->interrupt_request &= ~CPU_INTERRUPT_EXITTB;
diff --git a/hw/mst_fpga.c b/hw/mst_fpga.c
index a04355c..4e47574 100644
--- a/hw/mst_fpga.c
+++ b/hw/mst_fpga.c
@@ -154,7 +154,7 @@ mst_fpga_writeb(void *opaque, target_phys_addr_t addr, uint32_t value)
case MST_MSCRD:
s->mscrd = value;
break;
- case MST_INTMSKENA: /* Mask interupt */
+ case MST_INTMSKENA: /* Mask interrupt */
s->intmskena = (value & 0xFEEFF);
qemu_set_irq(s->parent, s->intsetclr & s->intmskena);
break;
diff --git a/hw/pl031.c b/hw/pl031.c
index 8c2f9d0..017a313 100644
--- a/hw/pl031.c
+++ b/hw/pl031.c
@@ -161,7 +161,7 @@ static void pl031_write(void * opaque, target_phys_addr_t offset,
pl031_update(s);
break;
case RTC_ICR:
- /* The PL031 documentation (DDI0224B) states that the interupt is
+ /* The PL031 documentation (DDI0224B) states that the interrupt is
cleared when bit 0 of the written value is set. However the
arm926e documentation (DDI0287B) states that the interrupt is
cleared when any value is written. */
diff --git a/hw/pl061.c b/hw/pl061.c
index 2e181f8..372dfc2 100644
--- a/hw/pl061.c
+++ b/hw/pl061.c
@@ -98,7 +98,7 @@ static uint32_t pl061_read(void *opaque, target_phys_addr_t offset)
return s->isense;
case 0x408: /* Interrupt both edges */
return s->ibe;
- case 0x40c: /* Interupt event */
+ case 0x40c: /* Interrupt event */
return s->iev;
case 0x410: /* Interrupt mask */
return s->im;
@@ -156,7 +156,7 @@ static void pl061_write(void *opaque, target_phys_addr_t offset,
case 0x408: /* Interrupt both edges */
s->ibe = value;
break;
- case 0x40c: /* Interupt event */
+ case 0x40c: /* Interrupt event */
s->iev = value;
break;
case 0x410: /* Interrupt mask */
diff --git a/target-mips/translate_init.c b/target-mips/translate_init.c
index 8d9b5b9..d55c522 100644
--- a/target-mips/translate_init.c
+++ b/target-mips/translate_init.c
@@ -38,7 +38,7 @@
((1 << CP0C2_M))
/* No config4, no DSP ASE, no large physaddr (PABITS),
- no external interrupt controller, no vectored interupts,
+ no external interrupt controller, no vectored interrupts,
no 1kb pages, no SmartMIPS ASE, no trace logic */
#define MIPS_CONFIG3 \
((0 << CP0C3_M) | (0 << CP0C3_DSPP) | (0 << CP0C3_LPA) | \
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 13/24] Fix typos in comments (instanciation -> instantiation)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (11 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 12/24] Fix typos in comments (interupt -> interrupt) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 14/24] Fix typos in comments (neccessary -> necessary) Stefan Hajnoczi
` (12 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hw/ppc4xx_devs.c | 2 +-
target-ppc/translate_init.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index 7f9ed17..68bdfaa 100644
--- a/hw/ppc4xx_devs.c
+++ b/hw/ppc4xx_devs.c
@@ -38,7 +38,7 @@
#endif
/*****************************************************************************/
-/* Generic PowerPC 4xx processor instanciation */
+/* Generic PowerPC 4xx processor instantiation */
CPUState *ppc4xx_init (const char *cpu_model,
clk_setup_t *cpu_clk, clk_setup_t *tb_clk,
uint32_t sysclk)
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index e2a83c5..ed291c3 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -9049,7 +9049,7 @@ static const ppc_def_t ppc_defs[] = {
};
/*****************************************************************************/
-/* Generic CPU instanciation routine */
+/* Generic CPU instantiation routine */
static void init_ppc_proc (CPUPPCState *env, const ppc_def_t *def)
{
#if !defined(CONFIG_USER_ONLY)
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 14/24] Fix typos in comments (neccessary -> necessary)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (12 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 13/24] Fix typos in comments (instanciation -> instantiation) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 15/24] Fix typos in comments and code (occured -> occurred and related) Stefan Hajnoczi
` (11 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
bsd-user/qemu.h | 2 +-
linux-user/qemu.h | 2 +-
target-arm/translate.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index e343894..1ba2d08 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -323,7 +323,7 @@ abi_long copy_from_user(void *hptr, abi_ulong gaddr, size_t len);
abi_long copy_to_user(abi_ulong gaddr, void *hptr, size_t len);
/* Functions for accessing guest memory. The tget and tput functions
- read/write single values, byteswapping as neccessary. The lock_user
+ read/write single values, byteswapping as necessary. The lock_user
gets a pointer to a contiguous area of guest memory, but does not perform
and byteswapping. lock_user may return either a pointer to the guest
memory, or a temporary buffer. */
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index f522f5e..237386c 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -379,7 +379,7 @@ abi_long copy_from_user(void *hptr, abi_ulong gaddr, size_t len);
abi_long copy_to_user(abi_ulong gaddr, void *hptr, size_t len);
/* Functions for accessing guest memory. The tget and tput functions
- read/write single values, byteswapping as neccessary. The lock_user
+ read/write single values, byteswapping as necessary. The lock_user
gets a pointer to a contiguous area of guest memory, but does not perform
and byteswapping. lock_user may return either a pointer to the guest
memory, or a temporary buffer. */
diff --git a/target-arm/translate.c b/target-arm/translate.c
index a1af436..3119137 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -7348,7 +7348,7 @@ static void disas_arm_insn(CPUState * env, DisasContext *s)
} else if ((insn & 0x000003e0) == 0x00000060) {
tmp = load_reg(s, rm);
shift = (insn >> 10) & 3;
- /* ??? In many cases it's not neccessary to do a
+ /* ??? In many cases it's not necessary to do a
rotate, a shift is sufficient. */
if (shift != 0)
tcg_gen_rotri_i32(tmp, tmp, shift * 8);
@@ -8139,7 +8139,7 @@ static int disas_thumb2_insn(CPUState *env, DisasContext *s, uint16_t insn_hw1)
case 1: /* Sign/zero extend. */
tmp = load_reg(s, rm);
shift = (insn >> 4) & 3;
- /* ??? In many cases it's not neccessary to do a
+ /* ??? In many cases it's not necessary to do a
rotate, a shift is sufficient. */
if (shift != 0)
tcg_gen_rotri_i32(tmp, tmp, shift * 8);
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 15/24] Fix typos in comments and code (occured -> occurred and related)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (13 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 14/24] Fix typos in comments (neccessary -> necessary) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 16/24] Fix typo in comment (relevent -> relevant) Stefan Hajnoczi
` (10 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
The code changed here is an unused data type name (evt_flush_occurred).
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
block.c | 2 +-
block/qcow2-refcount.c | 2 +-
cpu-all.h | 2 +-
cpu-exec.c | 2 +-
hw/bt.h | 2 +-
hw/pcie.c | 2 +-
hw/pcie.h | 2 +-
hw/pflash_cfi02.c | 2 +-
target-arm/translate.c | 6 +++---
target-m68k/helper.c | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/block.c b/block.c
index 8767d31..f403718 100644
--- a/block.c
+++ b/block.c
@@ -747,7 +747,7 @@ DeviceState *bdrv_get_attached(BlockDriverState *bs)
* Run consistency checks on an image
*
* Returns 0 if the check could be completed (it doesn't mean that the image is
- * free of errors) or -errno when an internal error occured. The results of the
+ * free of errors) or -errno when an internal error occurred. The results of the
* check are stored in res.
*/
int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 915d85a..d62dc1c 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1063,7 +1063,7 @@ fail:
* Checks an image for refcount consistency.
*
* Returns 0 if no errors are found, the number of errors in case the image is
- * detected as corrupted, and -errno when an internal error occured.
+ * detected as corrupted, and -errno when an internal error occurred.
*/
int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res)
{
diff --git a/cpu-all.h b/cpu-all.h
index 88126ea..78e3fc8 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -792,7 +792,7 @@ extern CPUState *cpu_single_env;
#define CPU_INTERRUPT_FIQ 0x10 /* Fast interrupt pending. */
#define CPU_INTERRUPT_HALT 0x20 /* CPU halt wanted */
#define CPU_INTERRUPT_SMI 0x40 /* (x86 only) SMI interrupt pending */
-#define CPU_INTERRUPT_DEBUG 0x80 /* Debug event occured. */
+#define CPU_INTERRUPT_DEBUG 0x80 /* Debug event occurred. */
#define CPU_INTERRUPT_VIRQ 0x100 /* virtual interrupt pending. */
#define CPU_INTERRUPT_NMI 0x200 /* NMI pending. */
#define CPU_INTERRUPT_INIT 0x400 /* INIT pending. */
diff --git a/cpu-exec.c b/cpu-exec.c
index 2cdcdc5..1b20f7b 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -509,7 +509,7 @@ int cpu_exec(CPUState *env1)
jump normally, then does the exception return when the
CPU tries to execute code at the magic address.
This will cause the magic PC value to be pushed to
- the stack if an interrupt occured at the wrong time.
+ the stack if an interrupt occurred at the wrong time.
We avoid this by disabling interrupts when
pc contains a magic address. */
if (interrupt_request & CPU_INTERRUPT_HARD
diff --git a/hw/bt.h b/hw/bt.h
index 4a702ad..3797254 100644
--- a/hw/bt.h
+++ b/hw/bt.h
@@ -1441,7 +1441,7 @@ typedef struct {
#define EVT_FLUSH_OCCURRED 0x11
typedef struct {
uint16_t handle;
-} __attribute__ ((packed)) evt_flush_occured;
+} __attribute__ ((packed)) evt_flush_occurred;
#define EVT_FLUSH_OCCURRED_SIZE 2
#define EVT_ROLE_CHANGE 0x12
diff --git a/hw/pcie.c b/hw/pcie.c
index 9de6149..39607bf 100644
--- a/hw/pcie.c
+++ b/hw/pcie.c
@@ -176,7 +176,7 @@ static void hotplug_event_notify(PCIDevice *dev)
}
/*
- * A PCI Express Hot-Plug Event has occured, so update slot status register
+ * A PCI Express Hot-Plug Event has occurred, so update slot status register
* and notify OS of the event if necessary.
*
* 6.7.3 PCI Express Hot-Plug Events
diff --git a/hw/pcie.h b/hw/pcie.h
index bc909e2..a213fba 100644
--- a/hw/pcie.h
+++ b/hw/pcie.h
@@ -40,7 +40,7 @@ typedef enum {
*
* Not all the bits of slot control register match with the ones of
* slot status. Not some bits of slot status register is used to
- * show status, not to report event occurence.
+ * show status, not to report event occurrence.
* So such bits must be masked out when checking the software
* notification condition.
*/
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index 14bbc34..8fdafe6 100644
--- a/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@ -367,7 +367,7 @@ static void pflash_write (pflash_t *pfl, target_phys_addr_t offset,
case 4:
switch (pfl->cmd) {
case 0xA0:
- /* Ignore writes while flash data write is occuring */
+ /* Ignore writes while flash data write is occurring */
/* As we suppose write is immediate, this should never happen */
return;
case 0x80:
diff --git a/target-arm/translate.c b/target-arm/translate.c
index 3119137..59190f6 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -1331,7 +1331,7 @@ static inline int gen_iwmmxt_shift(uint32_t insn, uint32_t mask, TCGv dest)
return 0;
}
-/* Disassemble an iwMMXt instruction. Returns nonzero if an error occured
+/* Disassemble an iwMMXt instruction. Returns nonzero if an error occurred
(ie. an undefined instruction). */
static int disas_iwmmxt_insn(CPUState *env, DisasContext *s, uint32_t insn)
{
@@ -2335,7 +2335,7 @@ static int disas_iwmmxt_insn(CPUState *env, DisasContext *s, uint32_t insn)
return 0;
}
-/* Disassemble an XScale DSP instruction. Returns nonzero if an error occured
+/* Disassemble an XScale DSP instruction. Returns nonzero if an error occurred
(ie. an undefined instruction). */
static int disas_dsp_insn(CPUState *env, DisasContext *s, uint32_t insn)
{
@@ -2681,7 +2681,7 @@ static TCGv gen_load_and_replicate(DisasContext *s, TCGv addr, int size)
return tmp;
}
-/* Disassemble a VFP instruction. Returns nonzero if an error occured
+/* Disassemble a VFP instruction. Returns nonzero if an error occurred
(ie. an undefined instruction). */
static int disas_vfp_insn(CPUState * env, DisasContext *s, uint32_t insn)
{
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index 514b039..faa8c42 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -714,7 +714,7 @@ void HELPER(macsats)(CPUState *env, uint32_t acc)
if (env->macsr & MACSR_V) {
env->macsr |= MACSR_PAV0 << acc;
if (env->macsr & MACSR_OMC) {
- /* The result is saturated to 32 bits, despite overflow occuring
+ /* The result is saturated to 32 bits, despite overflow occurring
at 48 bits. Seems weird, but that's what the hardware docs
say. */
result = (result >> 63) ^ 0x7fffffff;
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 16/24] Fix typo in comment (relevent -> relevant)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (14 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 15/24] Fix typos in comments and code (occured -> occurred and related) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 17/24] Fix typo in comment (responsiblity -> responsibility) Stefan Hajnoczi
` (9 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hppa-dis.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hppa-dis.c b/hppa-dis.c
index 49f99c8..a5760a95 100644
--- a/hppa-dis.c
+++ b/hppa-dis.c
@@ -1645,7 +1645,7 @@ static const char *const fp_reg_names[] =
typedef unsigned int CORE_ADDR;
-/* Get at various relevent fields of an instruction word. */
+/* Get at various relevant fields of an instruction word. */
#define MASK_5 0x1f
#define MASK_10 0x3ff
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 17/24] Fix typo in comment (responsiblity -> responsibility)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (15 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 16/24] Fix typo in comment (relevent -> relevant) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 18/24] Fix typo in comment (truely -> truly) Stefan Hajnoczi
` (8 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hw/pcie_aer.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c
index 0c4e8a5..f08d3c7 100644
--- a/hw/pcie_aer.c
+++ b/hw/pcie_aer.c
@@ -612,7 +612,7 @@ static bool pcie_aer_inject_uncor_error(PCIEAERInject *inj, bool is_fatal)
/*
* non-Function specific error must be recorded in all functions.
* It is the responsibility of the caller of this function.
- * It is also caller's responsiblity to determine which function should
+ * It is also caller's responsibility to determine which function should
* report the rerror.
*
* 6.2.4 Error Logging
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 18/24] Fix typo in comment (truely -> truly)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (16 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 17/24] Fix typo in comment (responsiblity -> responsibility) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 19/24] Fix typos in comment (threshhold -> threshold, mapp -> map) Stefan Hajnoczi
` (7 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
linux-user/mmap.c | 2 +-
target-cris/translate_v10.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 0cf22f8..994c02b 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -354,7 +354,7 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size)
}
wrapped = 1;
/* Don't actually use 0 when wrapping, instead indicate
- that we'd truely like an allocation in low memory. */
+ that we'd truly like an allocation in low memory. */
addr = (mmap_min_addr > TARGET_PAGE_SIZE
? TARGET_PAGE_ALIGN(mmap_min_addr)
: TARGET_PAGE_SIZE);
diff --git a/target-cris/translate_v10.c b/target-cris/translate_v10.c
index 41db158..5b14157 100644
--- a/target-cris/translate_v10.c
+++ b/target-cris/translate_v10.c
@@ -956,7 +956,7 @@ static int dec10_bdap_m(DisasContext *dc, int size)
return insn_len;
}
#endif
- /* Now the rest of the modes are truely indirect. */
+ /* Now the rest of the modes are truly indirect. */
insn_len += dec10_prep_move_m(dc, 1, size, cpu_PR[PR_PREFIX]);
tcg_gen_add_tl(cpu_PR[PR_PREFIX], cpu_PR[PR_PREFIX], cpu_R[rd]);
cris_set_prefix(dc);
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 19/24] Fix typos in comment (threshhold -> threshold, mapp -> map)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (17 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 18/24] Fix typo in comment (truely -> truly) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 20/24] ac97: Remove unused local variables Stefan Hajnoczi
` (6 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hw/xilinx_axidma.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
index e32534f..571a5b0 100644
--- a/hw/xilinx_axidma.c
+++ b/hw/xilinx_axidma.c
@@ -134,10 +134,10 @@ static inline int stream_idle(struct AXIStream *s)
static void stream_reset(struct AXIStream *s)
{
s->regs[R_DMASR] = DMASR_HALTED; /* starts up halted. */
- s->regs[R_DMACR] = 1 << 16; /* Starts with one in compl threshhold. */
+ s->regs[R_DMACR] = 1 << 16; /* Starts with one in compl threshold. */
}
-/* Mapp an offset addr into a channel index. */
+/* Map an offset addr into a channel index. */
static inline int streamid_from_addr(target_phys_addr_t addr)
{
int sid;
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 20/24] ac97: Remove unused local variables
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (18 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 19/24] Fix typos in comment (threshhold -> threshold, mapp -> map) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 21/24] Fix spelling in comments (intruction -> instruction) Stefan Hajnoczi
` (5 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
cppcheck report:
hw/ac97.c:1004: style:
Variable 'written' is assigned a value that is never used
hw/ac97.c:1072: style:
Variable 'written' is assigned a value that is never used
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hw/ac97.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/hw/ac97.c b/hw/ac97.c
index d71072d..a946c1a 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -1001,8 +1001,6 @@ static int write_audio (AC97LinkState *s, AC97BusMasterRegs *r,
static void write_bup (AC97LinkState *s, int elapsed)
{
- int written = 0;
-
dolog ("write_bup\n");
if (!(s->bup_flag & BUP_SET)) {
if (s->bup_flag & BUP_LAST) {
@@ -1026,7 +1024,6 @@ static void write_bup (AC97LinkState *s, int elapsed)
return;
temp -= copied;
elapsed -= copied;
- written += copied;
}
}
}
@@ -1069,7 +1066,7 @@ static int read_audio (AC97LinkState *s, AC97BusMasterRegs *r,
static void transfer_audio (AC97LinkState *s, int index, int elapsed)
{
AC97BusMasterRegs *r = &s->bm_regs[index];
- int written = 0, stop = 0;
+ int stop = 0;
if (s->invalid_freq[index]) {
AUD_log ("ac97", "attempt to use voice %d with invalid frequency %d\n",
@@ -1114,7 +1111,6 @@ static void transfer_audio (AC97LinkState *s, int index, int elapsed)
switch (index) {
case PO_INDEX:
temp = write_audio (s, r, elapsed, &stop);
- written += temp;
elapsed -= temp;
r->picb -= (temp >> 1);
break;
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 21/24] Fix spelling in comments (intruction -> instruction)
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (19 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 20/24] ac97: Remove unused local variables Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 22/24] linux-user: Replace deprecated function Stefan Hajnoczi
` (4 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
bsd-user/main.c | 2 +-
linux-user/main.c | 2 +-
tests/test-i386.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 6b12f8b..0c3fca1 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -237,7 +237,7 @@ void cpu_loop(CPUX86State *env)
break;
#ifndef TARGET_ABI32
case EXCP_SYSCALL:
- /* syscall from syscall intruction */
+ /* syscall from syscall instruction */
if (bsd_type == target_freebsd)
env->regs[R_EAX] = do_freebsd_syscall(env,
env->regs[R_EAX],
diff --git a/linux-user/main.c b/linux-user/main.c
index a1e37e4..a4996e7 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -323,7 +323,7 @@ void cpu_loop(CPUX86State *env)
break;
#ifndef TARGET_ABI32
case EXCP_SYSCALL:
- /* linux syscall from syscall intruction */
+ /* linux syscall from syscall instruction */
env->regs[R_EAX] = do_syscall(env,
env->regs[R_EAX],
env->regs[R_EDI],
diff --git a/tests/test-i386.c b/tests/test-i386.c
index 8f481c7..56ff110 100644
--- a/tests/test-i386.c
+++ b/tests/test-i386.c
@@ -2281,7 +2281,7 @@ void test_sse_comi(double a1, double b1)
}
/* Force %xmm0 usage to avoid the case where both register index are 0
- to test intruction decoding more extensively */
+ to test instruction decoding more extensively */
#define CVT_OP_XMM2MMX(op)\
{\
asm volatile (#op " %1, %0" : "=y" (r.q[0]) : "x" (a.dq) \
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 22/24] linux-user: Replace deprecated function
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (20 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 21/24] Fix spelling in comments (intruction -> instruction) Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 23/24] libcacard: add correct subdirectory dependencies Stefan Hajnoczi
` (3 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi
From: Stefan Weil <weil@mail.berlios.de>
Function bzero is deprecated, so replace it by function memset.
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
linux-user/syscall.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 279cef3..6e7d88e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -287,7 +287,7 @@ static int sys_uname(struct new_utsname *buf)
* struct linux kernel uses).
*/
- bzero(buf, sizeof (*buf));
+ memset(buf, 0, sizeof(*buf));
COPY_UTSNAME_FIELD(buf->sysname, uts_buf.sysname);
COPY_UTSNAME_FIELD(buf->nodename, uts_buf.nodename);
COPY_UTSNAME_FIELD(buf->release, uts_buf.release);
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 23/24] libcacard: add correct subdirectory dependencies
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (21 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 22/24] linux-user: Replace deprecated function Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-08 16:05 ` [Qemu-devel] [PATCH 24/24] lsi53c895a: Rename 'sense' to 'status' Stefan Hajnoczi
` (2 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-trivial, Paolo Bonzini, qemu-devel, Stefan Hajnoczi
From: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-trivial@nongnu.org
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
Makefile | 2 ++
Makefile.objs | 7 +++----
libcacard/Makefile | 9 +--------
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 67c0268..2b0438c 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,8 @@ include $(SRC_PATH)/Makefile.objs
endif
$(common-obj-y): $(GENERATED_HEADERS)
+subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-malloc.o qemu-timer-common.o
+
$(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y) subdir-libdis
$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) $(trace-obj-y) subdir-libdis-user subdir-libuser
diff --git a/Makefile.objs b/Makefile.objs
index d82c60d..4478c61 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -7,8 +7,8 @@ qobject-obj-y += qerror.o
#######################################################################
# oslib-obj-y is code depending on the OS (win32 vs posix)
oslib-obj-y = osdep.o
-oslib-obj-$(CONFIG_WIN32) += oslib-win32.o
-oslib-obj-$(CONFIG_POSIX) += oslib-posix.o
+oslib-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o
+oslib-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o
#######################################################################
# block-obj-y is code used by both qemu system emulation and qemu-img
@@ -143,8 +143,7 @@ common-obj-y += $(addprefix ui/, $(ui-obj-y))
common-obj-$(CONFIG_VNC) += $(addprefix ui/, $(vnc-obj-y))
common-obj-y += iov.o acl.o
-common-obj-$(CONFIG_POSIX) += qemu-thread-posix.o compatfd.o
-common-obj-$(CONFIG_WIN32) += qemu-thread-win32.o
+common-obj-$(CONFIG_POSIX) += compatfd.o
common-obj-y += notify.o event_notifier.o
common-obj-y += qemu-timer.o qemu-timer-common.o
diff --git a/libcacard/Makefile b/libcacard/Makefile
index 4010029..1d34df0 100644
--- a/libcacard/Makefile
+++ b/libcacard/Makefile
@@ -4,14 +4,7 @@
$(call set-vpath, $(SRC_PATH):$(SRC_PATH)/libcacard)
-ifeq ($(CONFIG_WIN32),y)
-QEMU_THREAD=qemu-thread-win32.o
-else
-QEMU_THREAD=qemu-thread-posix.o
-endif
-
-
-QEMU_OBJS=$(addprefix ../, $(QEMU_THREAD) $(oslib-obj-y) $(trace-obj-y) qemu-malloc.o qemu-timer-common.o)
+QEMU_OBJS=$(addprefix ../, $(oslib-obj-y) $(trace-obj-y) qemu-malloc.o qemu-timer-common.o)
QEMU_CFLAGS+=-I../
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Qemu-devel] [PATCH 24/24] lsi53c895a: Rename 'sense' to 'status'
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (22 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 23/24] libcacard: add correct subdirectory dependencies Stefan Hajnoczi
@ 2011-05-08 16:05 ` Stefan Hajnoczi
2011-05-12 12:57 ` [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Paolo Bonzini
2011-05-12 13:34 ` Anthony Liguori
25 siblings, 0 replies; 27+ messages in thread
From: Stefan Hajnoczi @ 2011-05-08 16:05 UTC (permalink / raw)
To: Anthony Liguori
Cc: qemu-trivial, Paolo Bonzini, qemu-devel, Stefan Hajnoczi,
Hannes Reinecke
From: Hannes Reinecke <hare@suse.de>
The 'sense' field in the HBA status structure is misnamed, as it
actually carries the SCSI status. Rename it.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-trivial@nongnu.org
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
hw/lsi53c895a.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index be4df58..2ce38a9 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -189,7 +189,7 @@ typedef struct {
uint32_t script_ram_base;
int carry; /* ??? Should this be an a visible register somewhere? */
- int sense;
+ int status;
/* Action to take at the end of a MSG IN phase.
0 = COMMAND, 1 = disconnect, 2 = DATA OUT, 3 = DATA IN. */
int msg_action;
@@ -695,8 +695,8 @@ static void lsi_command_complete(SCSIBus *bus, int reason, uint32_t tag,
out = (s->sstat1 & PHASE_MASK) == PHASE_DO;
if (reason == SCSI_REASON_DONE) {
- DPRINTF("Command complete sense=%d\n", (int)arg);
- s->sense = arg;
+ DPRINTF("Command complete status=%d\n", (int)arg);
+ s->status = arg;
s->command_complete = 2;
if (s->waiting && s->dbc != 0) {
/* Raise phase mismatch for short transfers. */
@@ -783,14 +783,14 @@ static void lsi_do_command(LSIState *s)
static void lsi_do_status(LSIState *s)
{
- uint8_t sense;
- DPRINTF("Get status len=%d sense=%d\n", s->dbc, s->sense);
+ uint8_t status;
+ DPRINTF("Get status len=%d status=%d\n", s->dbc, s->status);
if (s->dbc != 1)
BADF("Bad Status move\n");
s->dbc = 1;
- sense = s->sense;
- s->sfbr = sense;
- cpu_physical_memory_write(s->dnad, &sense, 1);
+ status = s->status;
+ s->sfbr = status;
+ cpu_physical_memory_write(s->dnad, &status, 1);
lsi_set_phase(s, PHASE_MI);
s->msg_action = 1;
lsi_add_msg_byte(s, 0); /* COMMAND COMPLETE */
@@ -2122,7 +2122,7 @@ static const VMStateDescription vmstate_lsi_scsi = {
VMSTATE_PCI_DEVICE(dev, LSIState),
VMSTATE_INT32(carry, LSIState),
- VMSTATE_INT32(sense, LSIState),
+ VMSTATE_INT32(status, LSIState),
VMSTATE_INT32(msg_action, LSIState),
VMSTATE_INT32(msg_len, LSIState),
VMSTATE_BUFFER(msg, LSIState),
--
1.7.4.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (23 preceding siblings ...)
2011-05-08 16:05 ` [Qemu-devel] [PATCH 24/24] lsi53c895a: Rename 'sense' to 'status' Stefan Hajnoczi
@ 2011-05-12 12:57 ` Paolo Bonzini
2011-05-12 13:34 ` Anthony Liguori
25 siblings, 0 replies; 27+ messages in thread
From: Paolo Bonzini @ 2011-05-12 12:57 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: Blue Swirl, Anthony Liguori, qemu-devel, Aurelien Jarno
On 05/08/2011 06:04 PM, Stefan Hajnoczi wrote:
> The following changes since commit 3964f535c35c08470ac69bd553282af500bc8bb0:
>
> Merge remote-tracking branch 'mst/for_anthony' into staging (2011-05-05 13:05:32 -0500)
>
> are available in the git repository at:
>
> git://repo.or.cz/qemu/stefanha.git trivial-patches
Ping, can other committers pull this? Thanks!
Paolo
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011
2011-05-08 16:04 [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Stefan Hajnoczi
` (24 preceding siblings ...)
2011-05-12 12:57 ` [Qemu-devel] [PULL] Trivial patches for April 26 to May 8 2011 Paolo Bonzini
@ 2011-05-12 13:34 ` Anthony Liguori
25 siblings, 0 replies; 27+ messages in thread
From: Anthony Liguori @ 2011-05-12 13:34 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel
On 05/08/2011 11:04 AM, Stefan Hajnoczi wrote:
> The following changes since commit 3964f535c35c08470ac69bd553282af500bc8bb0:
>
> Merge remote-tracking branch 'mst/for_anthony' into staging (2011-05-05 13:05:32 -0500)
>
> are available in the git repository at:
>
> git://repo.or.cz/qemu/stefanha.git trivial-patches
Pulled. Thanks.
Sorry for the delay, I think I overlooked this pull request.
Regards,
Anthony Liguori
> Hannes Reinecke (1):
> lsi53c895a: Rename 'sense' to 'status'
>
> Paolo Bonzini (1):
> libcacard: add correct subdirectory dependencies
>
> Stefan Weil (22):
> Fix typo in code and comments
> Fix typos in comments (dependancy -> dependency)
> Fix typos in comments (accross -> across)
> Fix typos in comments (accessable -> accessible, priveleged -> privileged)
> Fix typo in comment (colum -> column)
> Fix typo in comment (auxilliary -> auxiliary)
> Fix typo in comment (embeded -> embedded)
> Fix typo in comment (consistant -> consistent)
> Fix typo in comment (dieing -> dying)
> Fix typos in comments (imediately -> immediately)
> Fix typos in comments (existance -> existence)
> Fix typos in comments (interupt -> interrupt)
> Fix typos in comments (instanciation -> instantiation)
> Fix typos in comments (neccessary -> necessary)
> Fix typos in comments and code (occured -> occurred and related)
> Fix typo in comment (relevent -> relevant)
> Fix typo in comment (responsiblity -> responsibility)
> Fix typo in comment (truely -> truly)
> Fix typos in comment (threshhold -> threshold, mapp -> map)
> ac97: Remove unused local variables
> Fix spelling in comments (intruction -> instruction)
> linux-user: Replace deprecated function
>
> Changelog | 2 +-
> Makefile | 2 +
> Makefile.objs | 9 +++----
> block.c | 4 +-
> block/qcow2-refcount.c | 2 +-
> block/sheepdog.c | 4 +-
> bsd-user/main.c | 2 +-
> bsd-user/qemu.h | 2 +-
> cpu-all.h | 2 +-
> cpu-exec.c | 4 +-
> darwin-user/syscall.c | 2 +-
> hppa-dis.c | 2 +-
> hw/ac97.c | 6 +----
> hw/bt.h | 2 +-
> hw/eepro100.c | 2 +-
> hw/eeprom93xx.c | 10 ++++----
> hw/lan9118.c | 2 +-
> hw/lsi53c895a.c | 18 ++++++++--------
> hw/msi.c | 2 +-
> hw/msix.c | 2 +-
> hw/mst_fpga.c | 2 +-
> hw/pci.c | 6 ++--
> hw/pci.h | 2 +-
> hw/pci_regs.h | 2 +-
> hw/pcie.c | 2 +-
> hw/pcie.h | 2 +-
> hw/pcie_aer.c | 2 +-
> hw/pflash_cfi02.c | 2 +-
> hw/pl031.c | 2 +-
> hw/pl061.c | 4 +-
> hw/ppc4xx_devs.c | 2 +-
> hw/rtl8139.c | 44 ++++++++++++++++++++++-------------------
> hw/sh7750_regs.h | 6 ++--
> hw/ssd0303.c | 2 +-
> hw/sun4m_iommu.c | 2 +-
> hw/syborg_serial.c | 2 +-
> hw/xilinx_axidma.c | 4 +-
> libcacard/Makefile | 9 +-------
> libcacard/vcard_emul_nss.c | 2 +-
> libcacard/vscard_common.h | 2 +-
> linux-user/main.c | 2 +-
> linux-user/mmap.c | 2 +-
> linux-user/qemu.h | 2 +-
> linux-user/signal.c | 2 +-
> linux-user/syscall.c | 2 +-
> target-arm/translate.c | 10 ++++----
> target-cris/cpu.h | 2 +-
> target-cris/translate_v10.c | 2 +-
> target-m68k/helper.c | 2 +-
> target-microblaze/helper.c | 2 +-
> target-mips/translate_init.c | 4 +-
> target-ppc/cpu.h | 2 +-
> target-ppc/translate_init.c | 2 +-
> tcg/tcg.h | 4 +-
> tests/test-i386.c | 2 +-
> tests/test-mmap.c | 4 +-
> 56 files changed, 111 insertions(+), 117 deletions(-)
>
>
>
^ permalink raw reply [flat|nested] 27+ messages in thread