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

[Stefan Weil]

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) {

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. */