[Qemu-devel] [PATCH] Fix two typos

[Qemu-devel] [PATCH] Fix two typos

[Aurelien Jarno]

Hi,

The patch below, taken from the Debian package, fixes two typos:
- substract -> subtract
- formating -> formatting

Bye,
Aurelien

Index: monitor.c
===================================================================
RCS file: /sources/qemu/qemu/monitor.c,v
retrieving revision 1.73
diff -u -d -p -r1.73 monitor.c
--- monitor.c	24 May 2007 18:53:22 -0000	1.73
+++ monitor.c	22 Jun 2007 22:16:44 -0000
@@ -784,7 +784,7 @@ static const KeyDef key_defs[] = {
 
     { 0xb5, "kp_divide" },
     { 0x37, "kp_multiply" },
-    { 0x4a, "kp_substract" },
+    { 0x4a, "kp_subtract" },
     { 0x4e, "kp_add" },
     { 0x9c, "kp_enter" },
     { 0x53, "kp_decimal" },
Index: qemu-img.c
===================================================================
RCS file: /sources/qemu/qemu/qemu-img.c,v
retrieving revision 1.17
diff -u -d -p -r1.17 qemu-img.c
--- qemu-img.c	10 Feb 2007 22:59:40 -0000	1.17
+++ qemu-img.c	22 Jun 2007 22:16:44 -0000
@@ -297,7 +297,7 @@ static int img_create(int argc, char **a
     drv = bdrv_find_format(fmt);
     if (!drv)
         error("Unknown file format '%s'", fmt);
-    printf("Formating '%s', fmt=%s",
+    printf("Formatting '%s', fmt=%s",
            filename, fmt);
     if (encrypted)
         printf(", encrypted");
Index: target-ppc/cpu.h
===================================================================
RCS file: /sources/qemu/qemu/target-ppc/cpu.h,v
retrieving revision 1.47
diff -u -d -p -r1.47 cpu.h
--- target-ppc/cpu.h	3 Jun 2007 21:02:38 -0000	1.47
+++ target-ppc/cpu.h	22 Jun 2007 22:16:45 -0000
@@ -1326,7 +1326,7 @@ enum {
     EXCP_FP_ZX         = 0x03,  /* FP divide by zero                */
     EXCP_FP_XX         = 0x04,  /* FP inexact                       */
     EXCP_FP_VXNAN      = 0x05,  /* FP invalid SNaN op               */
-    EXCP_FP_VXISI      = 0x06,  /* FP invalid infinite substraction */
+    EXCP_FP_VXISI      = 0x06,  /* FP invalid infinite subtraction */
     EXCP_FP_VXIDI      = 0x07,  /* FP invalid infinite divide       */
     EXCP_FP_VXZDZ      = 0x08,  /* FP invalid zero divide           */
     EXCP_FP_VXIMZ      = 0x09,  /* FP invalid infinite * zero       */
Index: target-ppc/op.c
===================================================================
RCS file: /sources/qemu/qemu/target-ppc/op.c,v
retrieving revision 1.36
diff -u -d -p -r1.36 op.c
--- target-ppc/op.c	24 Apr 2007 06:50:21 -0000	1.36
+++ target-ppc/op.c	22 Jun 2007 22:16:45 -0000
@@ -1025,7 +1025,7 @@ void OPPROTO op_nego_64 (void)
 }
 #endif
 
-/* substract from */
+/* subtract from */
 PPC_OP(subf)
 {
     T0 = T1 - T0;
@@ -1058,7 +1058,7 @@ void OPPROTO op_check_subfo_64 (void)
 }
 #endif
 
-/* substract from carrying */
+/* subtract from carrying */
 void OPPROTO op_check_subfc (void)
 {
     if (likely((uint32_t)T0 > (uint32_t)T1)) {
@@ -1081,7 +1081,7 @@ void OPPROTO op_check_subfc_64 (void)
 }
 #endif
 
-/* substract from extended */
+/* subtract from extended */
 void OPPROTO op_subfe (void)
 {
     do_subfe();
@@ -1096,7 +1096,7 @@ void OPPROTO op_subfe_64 (void)
 }
 #endif
 
-/* substract from immediate carrying */
+/* subtract from immediate carrying */
 void OPPROTO op_subfic (void)
 {
     T0 = (int32_t)PARAM1 + ~T0 + 1;
@@ -1121,7 +1121,7 @@ void OPPROTO op_subfic_64 (void)
 }
 #endif
 
-/* substract from minus one extended */
+/* subtract from minus one extended */
 void OPPROTO op_subfme (void)
 {
     T0 = ~T0 + xer_ca - 1;
@@ -1154,7 +1154,7 @@ void OPPROTO op_subfmeo_64 (void)
 }
 #endif
 
-/* substract from zero extended */
+/* subtract from zero extended */
 void OPPROTO op_subfze (void)
 {
     T1 = ~T0;

-- 
  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   aurel32@debian.org         | aurelien@aurel32.net
   `-    people.debian.org/~aurel32 | www.aurel32.net

Re: [Qemu-devel] [PATCH] Fix two typos

[Stefan Weil]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

Aurelien Jarno schrieb:
> Hi,
>
> The patch below, taken from the Debian package, fixes two typos:
> ...
> - formating -> formatting
>
> Bye,
> Aurelien
Here is one more "formating" patch.

Regards,
Stefan



[-- Attachment #2: fdc.patch --]
[-- Type: text/x-diff, Size: 690 bytes --]

Index: hw/fdc.c
===================================================================
RCS file: /sources/qemu/qemu/hw/fdc.c,v
retrieving revision 1.24
diff -u -b -B -r1.24 fdc.c
--- hw/fdc.c	19 May 2007 12:58:29 -0000	1.24
+++ hw/fdc.c	23 Jun 2007 20:37:54 -0000
@@ -1268,7 +1268,7 @@
     memset(fdctrl->fifo, 0, FD_SECTOR_LEN);
     if (cur_drv->bs == NULL ||
         bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) {
-        FLOPPY_ERROR("formating sector %d\n", fd_sector(cur_drv));
+        FLOPPY_ERROR("formatting sector %d\n", fd_sector(cur_drv));
         fdctrl_stop_transfer(fdctrl, 0x60, 0x00, 0x00);
     } else {
 	if (cur_drv->sect == cur_drv->last_sect) {

Re: [Qemu-devel] [PATCH] Fix two typos

[Stefan Weil]

[-- Attachment #1: Type: text/plain, Size: 1146 bytes --]

Hi,

here is another patch which changes additionnal -> additional.
Please apply this new patch and my last one to CVS HEAD.

Thank you,
Stefan

Stefan Weil schrieb:
> Aurelien Jarno schrieb:
>> Hi,
>>
>> The patch below, taken from the Debian package, fixes two typos:
>> ...
>> - formating -> formatting
>>
>> Bye,
>> Aurelien
> Here is one more "formating" patch.
>
> Regards,
> Stefan
>
>
>
> ------------------------------------------------------------------------
>
> Index: hw/fdc.c
> ===================================================================
> RCS file: /sources/qemu/qemu/hw/fdc.c,v
> retrieving revision 1.24
> diff -u -b -B -r1.24 fdc.c
> --- hw/fdc.c 19 May 2007 12:58:29 -0000 1.24
> +++ hw/fdc.c 23 Jun 2007 20:37:54 -0000
> @@ -1268,7 +1268,7 @@
> memset(fdctrl->fifo, 0, FD_SECTOR_LEN);
> if (cur_drv->bs == NULL ||
> bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) {
> - FLOPPY_ERROR("formating sector %d\n", fd_sector(cur_drv));
> + FLOPPY_ERROR("formatting sector %d\n", fd_sector(cur_drv));
> fdctrl_stop_transfer(fdctrl, 0x60, 0x00, 0x00);
> } else {
> if (cur_drv->sect == cur_drv->last_sect) {


[-- Attachment #2: spelling.patch --]
[-- Type: text/x-diff, Size: 3091 bytes --]

Index: block-raw.c
===================================================================
RCS file: /sources/qemu/qemu/block-raw.c,v
retrieving revision 1.17
diff -u -b -B -r1.17 block-raw.c
--- block-raw.c	18 Jan 2007 00:22:11 -0000	1.17
+++ block-raw.c	26 Jun 2007 17:09:12 -0000
@@ -1295,7 +1295,7 @@
 
 #if 0
 /***********************************************/
-/* removable device additionnal commands */
+/* removable device additional commands */
 
 static int raw_is_inserted(BlockDriverState *bs)
 {
Index: hw/ide.c
===================================================================
RCS file: /sources/qemu/qemu/hw/ide.c,v
retrieving revision 1.62
diff -u -b -B -r1.62 ide.c
--- hw/ide.c	6 Jun 2007 16:26:13 -0000	1.62
+++ hw/ide.c	26 Jun 2007 17:09:14 -0000
@@ -1567,7 +1567,7 @@
         buf[1] = 0x80; /* removable */
         buf[2] = 0x00; /* ISO */
         buf[3] = 0x21; /* ATAPI-2 (XXX: put ATAPI-4 ?) */
-        buf[4] = 31; /* additionnal length */
+        buf[4] = 31; /* additional length */
         buf[5] = 0; /* reserved */
         buf[6] = 0; /* reserved */
         buf[7] = 0; /* reserved */
Index: hw/usb.c
===================================================================
RCS file: /sources/qemu/qemu/hw/usb.c,v
retrieving revision 1.9
diff -u -b -B -r1.9 usb.c
--- hw/usb.c	12 Aug 2006 01:04:27 -0000	1.9
+++ hw/usb.c	26 Jun 2007 17:09:14 -0000
@@ -140,7 +140,7 @@
                     s->setup_state = SETUP_STATE_IDLE;
                     /* transfer OK */
                 } else {
-                    /* ignore additionnal output */
+                    /* ignore additional output */
                 }
                 break;
             case SETUP_STATE_DATA:
Index: linux-user/signal.c
===================================================================
RCS file: /sources/qemu/qemu/linux-user/signal.c,v
retrieving revision 1.37
diff -u -b -B -r1.37 signal.c
--- linux-user/signal.c	13 May 2007 13:58:00 -0000	1.37
+++ linux-user/signal.c	26 Jun 2007 17:09:15 -0000
@@ -244,7 +244,7 @@
 }
 
 /* XXX: we support only POSIX RT signals are used. */
-/* XXX: find a solution for 64 bit (additionnal malloced data is needed) */
+/* XXX: find a solution for 64 bit (additional malloced data is needed) */
 void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo)
 {
     info->si_signo = tswap32(tinfo->si_signo);
Index: target-i386/cpu.h
===================================================================
RCS file: /sources/qemu/qemu/target-i386/cpu.h,v
retrieving revision 1.44
diff -u -b -B -r1.44 cpu.h
--- target-i386/cpu.h	3 Jun 2007 21:02:37 -0000	1.44
+++ target-i386/cpu.h	26 Jun 2007 17:09:16 -0000
@@ -121,7 +121,7 @@
 #define VIP_MASK                0x00100000
 #define ID_MASK                 0x00200000
 
-/* hidden flags - used internally by qemu to represent additionnal cpu
+/* hidden flags - used internally by qemu to represent additional cpu
    states. Only the CPL, INHIBIT_IRQ and HALTED are not redundant. We avoid
    using the IOPL_MASK, TF_MASK and VM_MASK bit position to ease oring
    with eflags. */

Re: [Qemu-devel] [PATCH] Fix two typos

[Bernhard Fischer]

On Tue, Jun 26, 2007 at 07:19:53PM +0200, Stefan Weil wrote:
>Hi,
>
>here is another patch which changes additionnal -> additional.
>Please apply this new patch and my last one to CVS HEAD.

A few others, fwiw:
s/recieve/receive/g
s/seperat/separat/g
/[[:space:]]teh[[:space:]]/ the /g

cheers,

Re: [Qemu-devel] [PATCH] Fix two typos

[Stefan Weil]

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

The appended patch fixes recieve -> receive, seperat -> separat and
teh -> the. Maybe this makes addition to CVS HEAD easier...

Stefan

Bernhard Fischer schrieb:
> On Tue, Jun 26, 2007 at 07:19:53PM +0200, Stefan Weil wrote:
>> Hi,
>>
>> here is another patch which changes additionnal -> additional.
>> Please apply this new patch and my last one to CVS HEAD.
>
> A few others, fwiw:
> s/recieve/receive/g
> s/seperat/separat/g
> /[[:space:]]teh[[:space:]]/ the /g
>
> cheers,

[-- Attachment #2: spelling2.patch --]
[-- Type: text/x-diff, Size: 4354 bytes --]

Index: m68k-dis.c
===================================================================
--- m68k-dis.c	(Revision 727)
+++ m68k-dis.c	(Arbeitskopie)
@@ -560,7 +560,7 @@
 };
 
 /* Name of register halves for MAC/EMAC.
-   Seperate from reg_names since 'spu', 'fpl' look weird.  */
+   Separate from reg_names since 'spu', 'fpl' look weird.  */
 static char *const reg_half_names[] =
 {
   "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",
Index: dis-asm.h
===================================================================
--- dis-asm.h	(Revision 727)
+++ dis-asm.h	(Arbeitskopie)
@@ -421,7 +421,7 @@
 /* Call this macro to initialize only the internal variables for the
    disassembler.  Architecture dependent things such as byte order, or machine
    variant are not touched by this macro.  This makes things much easier for
-   GDB which must initialize these things seperatly.  */
+   GDB which must initialize these things separatly.  */
 
 #define INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) \
   (INFO).fprintf_func = (FPRINTF_FUNC), \
Index: hw/pl181.c
===================================================================
--- hw/pl181.c	(Revision 727)
+++ hw/pl181.c	(Arbeitskopie)
@@ -160,7 +160,7 @@
             s->response[2] = RWORD(8);
             s->response[3] = RWORD(12) & ~1;
         }
-        DPRINTF("Response recieved\n");
+        DPRINTF("Response received\n");
         s->status |= PL181_STATUS_CMDRESPEND;
 #undef RWORD
     } else {
@@ -174,7 +174,7 @@
     s->status |= PL181_STATUS_CMDTIMEOUT;
 }
 
-/* Transfer data between teh card and the FIFO.  This is complicated by
+/* Transfer data between the card and the FIFO.  This is complicated by
    the FIFO holding 32-bit words and the card taking data in single byte
    chunks.  FIFO bytes are transferred in little-endian order.  */
    
Index: hw/i2c.h
===================================================================
--- hw/i2c.h	(Revision 727)
+++ hw/i2c.h	(Arbeitskopie)
@@ -10,7 +10,7 @@
     I2C_START_RECV,
     I2C_START_SEND,
     I2C_FINISH,
-    I2C_NACK /* Masker NACKed a recieve byte.  */
+    I2C_NACK /* Masker NACKed a receive byte.  */
 };
 
 typedef struct i2c_slave i2c_slave;
Index: hw/rtl8139.c
===================================================================
--- hw/rtl8139.c	(Revision 727)
+++ hw/rtl8139.c	(Arbeitskopie)
@@ -790,7 +790,7 @@
     RTL8139State *s = opaque;
     int avail;
 
-    /* Recieve (drop) packets if card is disabled.  */
+    /* Receive (drop) packets if card is disabled.  */
     if (!s->clock_enabled)
       return 1;
     if (!rtl8139_receiver_enabled(s))
Index: hw/pl011.c
===================================================================
--- hw/pl011.c	(Revision 727)
+++ hw/pl011.c	(Arbeitskopie)
@@ -176,7 +176,7 @@
     }
 }
 
-static int pl011_can_recieve(void *opaque)
+static int pl011_can_receive(void *opaque)
 {
     pl011_state *s = (pl011_state *)opaque;
 
@@ -186,7 +186,7 @@
         return s->read_count < 1;
 }
 
-static void pl011_recieve(void *opaque, const uint8_t *buf, int size)
+static void pl011_receive(void *opaque, const uint8_t *buf, int size)
 {
     pl011_state *s = (pl011_state *)opaque;
     int slot;
@@ -241,7 +241,7 @@
     s->cr = 0x300;
     s->flags = 0x90;
     if (chr){ 
-        qemu_chr_add_handlers(chr, pl011_can_recieve, pl011_recieve,
+        qemu_chr_add_handlers(chr, pl011_can_receive, pl011_receive,
                               pl011_event, s);
     }
     /* ??? Save/restore.  */
Index: gdbstub.c
===================================================================
--- gdbstub.c	(Revision 727)
+++ gdbstub.c	(Arbeitskopie)
@@ -1238,12 +1238,12 @@
     return 0;
 }
 #else
-static int gdb_chr_can_recieve(void *opaque)
+static int gdb_chr_can_receive(void *opaque)
 {
   return 1;
 }
 
-static void gdb_chr_recieve(void *opaque, const uint8_t *buf, int size)
+static void gdb_chr_receive(void *opaque, const uint8_t *buf, int size)
 {
     GDBState *s = opaque;
     int i;
@@ -1294,7 +1294,7 @@
     }
     s->env = first_cpu; /* XXX: allow to change CPU */
     s->chr = chr;
-    qemu_chr_add_handlers(chr, gdb_chr_can_recieve, gdb_chr_recieve,
+    qemu_chr_add_handlers(chr, gdb_chr_can_receive, gdb_chr_receive,
                           gdb_chr_event, s);
     qemu_add_vm_stop_handler(gdb_vm_stopped, s);
     return 0;

Re: [Qemu-devel] [PATCH] Fix two typos

[Jonathan Kalbfeld]

[-- Attachment #1: Type: text/plain, Size: 664 bytes --]

Since when is teh a typo??? It's  teh r0x0r!@#

On 6/26/07, Stefan Weil <weil@mail.berlios.de> wrote:
>
> The appended patch fixes recieve -> receive, seperat -> separat and
> teh -> the. Maybe this makes addition to CVS HEAD easier...
>
> Stefan
>
> Bernhard Fischer schrieb:
> > On Tue, Jun 26, 2007 at 07:19:53PM +0200, Stefan Weil wrote:
> >> Hi,
> >>
> >> here is another patch which changes additionnal -> additional.
> >> Please apply this new patch and my last one to CVS HEAD.
> >
> > A few others, fwiw:
> > s/recieve/receive/g
> > s/seperat/separat/g
> > /[[:space:]]teh[[:space:]]/ the /g
> >
> > cheers,
>
>


-- 
--
Jonathan Kalbfeld
+1 323 620 6682

[-- Attachment #2: Type: text/html, Size: 1057 bytes --]

Re: [Qemu-devel] [PATCH] Fix two typos

[andrzej zaborowski]

On 26/06/07, Jonathan Kalbfeld <jonathan.kalbfeld@gmail.com> wrote:
> Since when is teh a typo??? It's  teh r0x0r!@#

It even has a wikipedia page, http://en.wikipedia.org/wiki/Teh

>
> On 6/26/07, Stefan Weil <weil@mail.berlios.de> wrote:
> > The appended patch fixes recieve -> receive, seperat -> separat and
> > teh -> the. Maybe this makes addition to CVS HEAD easier...
> >
> > Stefan
> >
> > Bernhard Fischer schrieb:
> > > On Tue, Jun 26, 2007 at 07:19:53PM +0200, Stefan Weil wrote:
> > >> Hi,
> > >>
> > >> here is another patch which changes additionnal -> additional.
> > >> Please apply this new patch and my last one to CVS HEAD.
> > >
> > > A few others, fwiw:
> > > s/recieve/receive/g
> > > s/seperat/separat/g
> > > /[[:space:]]teh[[:space:]]/ the /g
> > >
> > > cheers,
> >
> >
>
>
>
> --
> --
> Jonathan Kalbfeld
> +1 323 620 6682

Regards,

Re: [Qemu-devel] [PATCH] Fix two typos

[Stuart Brady]

On Sat, Jun 23, 2007 at 11:01:00PM +0200, Stefan Weil wrote:
> Here is one more "formating" patch.

I've found a whole load of misspellings that I could submit patches for,
but I've been waiting until Stefan's fixes are committed.  Could they be 
applied, please?

Cheers,
-- 
Stuart Brady

Re: [Qemu-devel] [PATCH] Fix two typos

[Chris Wilson]

Hi Stefan,

On Tue, 26 Jun 2007, Stefan Weil wrote:

> The appended patch fixes recieve -> receive, seperat -> separat and
> teh -> the. Maybe this makes addition to CVS HEAD easier...

Shouldn't that be "separate" not "separat"? (assuming this is an English 
language typo).

> Bernhard Fischer schrieb:
>> A few others, fwiw:
>> s/recieve/receive/g
>> s/seperat/separat/g

Cheers, Chris.
-- 
_____ __     _
\  __/ / ,__(_)_  | Chris Wilson <0000 at qwirx.com> - Cambs UK |
/ (_/ ,\/ _/ /_ \ | Security/C/C++/Java/Perl/SQL/HTML Developer |
\ _/_/_/_//_/___/ | We are GNU-free your mind-and your software |

Re: [Qemu-devel] [PATCH] Fix two typos

[Jason Gress]

On Tuesday 03 July 2007 02:28:54 pm Chris Wilson wrote:
> Hi Stefan,
>
> On Tue, 26 Jun 2007, Stefan Weil wrote:
> > The appended patch fixes recieve -> receive, seperat -> separat and
> > teh -> the. Maybe this makes addition to CVS HEAD easier...
>
> Shouldn't that be "separate" not "separat"? (assuming this is an English
> language typo).
>

Not if you want to cover 'separation' and similar things.

> > Bernhard Fischer schrieb:
> >> A few others, fwiw:
> >> s/recieve/receive/g
> >> s/seperat/separat/g
>
> Cheers, Chris.

Jason

Re: [Qemu-devel] [PATCH] Fix two typos

[Stefan Weil]

[-- Attachment #1: Type: text/plain, Size: 792 bytes --]

Chris Wilson schrieb:
> Shouldn't that be "separate" not "separat"? (assuming this is an
> English language typo).

Hi Chris,

yes, the correct word is separate, not separat.

But my patch tried to change other forms of this
word as well, so seperat -> separat is just a lazy
form of saying seperate -> separate,
seperately -> separately and so on.

Nevertheless, my patch missed a word with two
spelling bugs (seperatly), so here is a new version
which fixes this, too. It is a combination of my last
two patches which are still not integrated in CVS.

Please add this new patch to CVS.

Thank you,
Stefan


PS. Maybe I'm too old to understand the difference
between 'the' and 'teh', so the new patch eliminates
all 'teh', too. Lovers of 'teh' can find it at Wikipedia,
see Andrzej's mail.


[-- Attachment #2: spelling3.patch --]
[-- Type: text/x-diff, Size: 8293 bytes --]

Index: block-raw.c
===================================================================
RCS file: /sources/qemu/qemu/block-raw.c,v
retrieving revision 1.17
diff -u -b -B -r1.17 block-raw.c
--- block-raw.c	18 Jan 2007 00:22:11 -0000	1.17
+++ block-raw.c	3 Jul 2007 20:24:58 -0000
@@ -1295,7 +1295,7 @@
 
 #if 0
 /***********************************************/
-/* removable device additionnal commands */
+/* removable device additional commands */
 
 static int raw_is_inserted(BlockDriverState *bs)
 {
Index: dis-asm.h
===================================================================
RCS file: /sources/qemu/qemu/dis-asm.h,v
retrieving revision 1.12
diff -u -b -B -r1.12 dis-asm.h
--- dis-asm.h	5 Apr 2007 07:22:49 -0000	1.12
+++ dis-asm.h	3 Jul 2007 20:24:58 -0000
@@ -421,7 +421,7 @@
 /* Call this macro to initialize only the internal variables for the
    disassembler.  Architecture dependent things such as byte order, or machine
    variant are not touched by this macro.  This makes things much easier for
-   GDB which must initialize these things seperatly.  */
+   GDB which must initialize these things separately.  */
 
 #define INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) \
   (INFO).fprintf_func = (FPRINTF_FUNC), \
Index: gdbstub.c
===================================================================
RCS file: /sources/qemu/qemu/gdbstub.c,v
retrieving revision 1.58
diff -u -b -B -r1.58 gdbstub.c
--- gdbstub.c	3 Jun 2007 17:08:32 -0000	1.58
+++ gdbstub.c	3 Jul 2007 20:25:00 -0000
@@ -1238,12 +1238,12 @@
     return 0;
 }
 #else
-static int gdb_chr_can_recieve(void *opaque)
+static int gdb_chr_can_receive(void *opaque)
 {
   return 1;
 }
 
-static void gdb_chr_recieve(void *opaque, const uint8_t *buf, int size)
+static void gdb_chr_receive(void *opaque, const uint8_t *buf, int size)
 {
     GDBState *s = opaque;
     int i;
@@ -1294,7 +1294,7 @@
     }
     s->env = first_cpu; /* XXX: allow to change CPU */
     s->chr = chr;
-    qemu_chr_add_handlers(chr, gdb_chr_can_recieve, gdb_chr_recieve,
+    qemu_chr_add_handlers(chr, gdb_chr_can_receive, gdb_chr_receive,
                           gdb_chr_event, s);
     qemu_add_vm_stop_handler(gdb_vm_stopped, s);
     return 0;
Index: m68k-dis.c
===================================================================
RCS file: /sources/qemu/qemu/m68k-dis.c,v
retrieving revision 1.1
diff -u -b -B -r1.1 m68k-dis.c
--- m68k-dis.c	6 Nov 2005 16:52:11 -0000	1.1
+++ m68k-dis.c	3 Jul 2007 20:25:01 -0000
@@ -560,7 +560,7 @@
 };
 
 /* Name of register halves for MAC/EMAC.
-   Seperate from reg_names since 'spu', 'fpl' look weird.  */
+   Separate from reg_names since 'spu', 'fpl' look weird.  */
 static char *const reg_half_names[] =
 {
   "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",
Index: hw/i2c.h
===================================================================
RCS file: /sources/qemu/qemu/hw/i2c.h,v
retrieving revision 1.3
diff -u -b -B -r1.3 i2c.h
--- hw/i2c.h	24 May 2007 18:50:08 -0000	1.3
+++ hw/i2c.h	3 Jul 2007 20:25:01 -0000
@@ -10,7 +10,7 @@
     I2C_START_RECV,
     I2C_START_SEND,
     I2C_FINISH,
-    I2C_NACK /* Masker NACKed a recieve byte.  */
+    I2C_NACK /* Masker NACKed a receive byte.  */
 };
 
 typedef struct i2c_slave i2c_slave;
Index: hw/ide.c
===================================================================
RCS file: /sources/qemu/qemu/hw/ide.c,v
retrieving revision 1.62
diff -u -b -B -r1.62 ide.c
--- hw/ide.c	6 Jun 2007 16:26:13 -0000	1.62
+++ hw/ide.c	3 Jul 2007 20:25:03 -0000
@@ -1567,7 +1567,7 @@
         buf[1] = 0x80; /* removable */
         buf[2] = 0x00; /* ISO */
         buf[3] = 0x21; /* ATAPI-2 (XXX: put ATAPI-4 ?) */
-        buf[4] = 31; /* additionnal length */
+        buf[4] = 31; /* additional length */
         buf[5] = 0; /* reserved */
         buf[6] = 0; /* reserved */
         buf[7] = 0; /* reserved */
Index: hw/pl011.c
===================================================================
RCS file: /sources/qemu/qemu/hw/pl011.c,v
retrieving revision 1.4
diff -u -b -B -r1.4 pl011.c
--- hw/pl011.c	3 Jun 2007 15:19:32 -0000	1.4
+++ hw/pl011.c	3 Jul 2007 20:25:03 -0000
@@ -176,7 +176,7 @@
     }
 }
 
-static int pl011_can_recieve(void *opaque)
+static int pl011_can_receive(void *opaque)
 {
     pl011_state *s = (pl011_state *)opaque;
 
@@ -186,7 +186,7 @@
         return s->read_count < 1;
 }
 
-static void pl011_recieve(void *opaque, const uint8_t *buf, int size)
+static void pl011_receive(void *opaque, const uint8_t *buf, int size)
 {
     pl011_state *s = (pl011_state *)opaque;
     int slot;
@@ -241,7 +241,7 @@
     s->cr = 0x300;
     s->flags = 0x90;
     if (chr){ 
-        qemu_chr_add_handlers(chr, pl011_can_recieve, pl011_recieve,
+        qemu_chr_add_handlers(chr, pl011_can_receive, pl011_receive,
                               pl011_event, s);
     }
     /* ??? Save/restore.  */
Index: hw/pl181.c
===================================================================
RCS file: /sources/qemu/qemu/hw/pl181.c,v
retrieving revision 1.5
diff -u -b -B -r1.5 pl181.c
--- hw/pl181.c	9 Jun 2007 14:07:54 -0000	1.5
+++ hw/pl181.c	3 Jul 2007 20:25:03 -0000
@@ -160,7 +160,7 @@
             s->response[2] = RWORD(8);
             s->response[3] = RWORD(12) & ~1;
         }
-        DPRINTF("Response recieved\n");
+        DPRINTF("Response received\n");
         s->status |= PL181_STATUS_CMDRESPEND;
 #undef RWORD
     } else {
@@ -174,7 +174,7 @@
     s->status |= PL181_STATUS_CMDTIMEOUT;
 }
 
-/* Transfer data between teh card and the FIFO.  This is complicated by
+/* Transfer data between the card and the FIFO.  This is complicated by
    the FIFO holding 32-bit words and the card taking data in single byte
    chunks.  FIFO bytes are transferred in little-endian order.  */
    
Index: hw/rtl8139.c
===================================================================
RCS file: /sources/qemu/qemu/hw/rtl8139.c,v
retrieving revision 1.9
diff -u -b -B -r1.9 rtl8139.c
--- hw/rtl8139.c	7 Apr 2007 18:14:41 -0000	1.9
+++ hw/rtl8139.c	3 Jul 2007 20:25:04 -0000
@@ -790,7 +790,7 @@
     RTL8139State *s = opaque;
     int avail;
 
-    /* Recieve (drop) packets if card is disabled.  */
+    /* Receive (drop) packets if card is disabled.  */
     if (!s->clock_enabled)
       return 1;
     if (!rtl8139_receiver_enabled(s))
Index: hw/usb.c
===================================================================
RCS file: /sources/qemu/qemu/hw/usb.c,v
retrieving revision 1.9
diff -u -b -B -r1.9 usb.c
--- hw/usb.c	12 Aug 2006 01:04:27 -0000	1.9
+++ hw/usb.c	3 Jul 2007 20:25:04 -0000
@@ -140,7 +140,7 @@
                     s->setup_state = SETUP_STATE_IDLE;
                     /* transfer OK */
                 } else {
-                    /* ignore additionnal output */
+                    /* ignore additional output */
                 }
                 break;
             case SETUP_STATE_DATA:
Index: linux-user/signal.c
===================================================================
RCS file: /sources/qemu/qemu/linux-user/signal.c,v
retrieving revision 1.37
diff -u -b -B -r1.37 signal.c
--- linux-user/signal.c	13 May 2007 13:58:00 -0000	1.37
+++ linux-user/signal.c	3 Jul 2007 20:25:05 -0000
@@ -244,7 +244,7 @@
 }
 
 /* XXX: we support only POSIX RT signals are used. */
-/* XXX: find a solution for 64 bit (additionnal malloced data is needed) */
+/* XXX: find a solution for 64 bit (additional malloced data is needed) */
 void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo)
 {
     info->si_signo = tswap32(tinfo->si_signo);
Index: target-i386/cpu.h
===================================================================
RCS file: /sources/qemu/qemu/target-i386/cpu.h,v
retrieving revision 1.44
diff -u -b -B -r1.44 cpu.h
--- target-i386/cpu.h	3 Jun 2007 21:02:37 -0000	1.44
+++ target-i386/cpu.h	3 Jul 2007 20:25:06 -0000
@@ -121,7 +121,7 @@
 #define VIP_MASK                0x00100000
 #define ID_MASK                 0x00200000
 
-/* hidden flags - used internally by qemu to represent additionnal cpu
+/* hidden flags - used internally by qemu to represent additional cpu
    states. Only the CPL, INHIBIT_IRQ and HALTED are not redundant. We avoid
    using the IOPL_MASK, TF_MASK and VM_MASK bit position to ease oring
    with eflags. */