[Qemu-devel] [PATCH] Spelling fixes in comments and documentation

[Qemu-devel] [PATCH] Spelling fixes in comments and documentation

[Stefan Weil]

These wrong spellings were detected by codespell:

* successully -> successfully

* alot -> a lot

* wanna -> want to

* infomation -> information

* occured -> occurred

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 docs/specs/ppc-spapr-hcalls.txt |    2 +-
 docs/usb2.txt                   |    4 ++--
 hw/xen_pt.h                     |    4 ++--
 hw/xen_pt_config_init.c         |   14 +++++++-------
 qemu-img.c                      |    2 +-
 qemu-img.texi                   |    2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/specs/ppc-spapr-hcalls.txt b/docs/specs/ppc-spapr-hcalls.txt
index 52ba8d4..667b3fa 100644
--- a/docs/specs/ppc-spapr-hcalls.txt
+++ b/docs/specs/ppc-spapr-hcalls.txt
@@ -31,7 +31,7 @@ Arguments:
 
 Returns:
 
-  H_SUCCESS   : Successully called the RTAS function (RTAS result
+  H_SUCCESS   : Successfully called the RTAS function (RTAS result
                 will have been stored in the parameter block)
   H_PARAMETER : Unknown token
 
diff --git a/docs/usb2.txt b/docs/usb2.txt
index d17e3c0..21f6d14 100644
--- a/docs/usb2.txt
+++ b/docs/usb2.txt
@@ -58,11 +58,11 @@ try ...
 xhci controller support
 -----------------------
 
-There also is xhci host controller support available.  It got alot
+There also is xhci host controller support available.  It got a lot
 less testing than ehci and there are a bunch of known limitations, so
 ehci may work better for you.  On the other hand the xhci hardware
 design is much more virtualization-friendly, thus xhci emulation uses
-less ressources (especially cpu).  If you wanna give xhci a try
+less ressources (especially cpu).  If you want to give xhci a try
 use this to add the host controller ...
 
     qemu -device nec-usb-xhci,id=xhci
diff --git a/hw/xen_pt.h b/hw/xen_pt.h
index 41904ec..112477a 100644
--- a/hw/xen_pt.h
+++ b/hw/xen_pt.h
@@ -96,7 +96,7 @@ typedef struct XenPTRegion {
  * - do NOT use ALL F for init_val, otherwise the tbl will not be registered.
  */
 
-/* emulated register infomation */
+/* emulated register information */
 struct XenPTRegInfo {
     uint32_t offset;
     uint32_t size;
@@ -140,7 +140,7 @@ typedef int (*xen_pt_reg_size_init_fn)
     (XenPCIPassthroughState *, const XenPTRegGroupInfo *,
      uint32_t base_offset, uint8_t *size);
 
-/* emulated register group infomation */
+/* emulated register group information */
 struct XenPTRegGroupInfo {
     uint8_t grp_id;
     XenPTRegisterGroupType grp_type;
diff --git a/hw/xen_pt_config_init.c b/hw/xen_pt_config_init.c
index 00eb3d9..e524a40 100644
--- a/hw/xen_pt_config_init.c
+++ b/hw/xen_pt_config_init.c
@@ -562,7 +562,7 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s,
     return 0;
 }
 
-/* Header Type0 reg static infomation table */
+/* Header Type0 reg static information table */
 static XenPTRegInfo xen_pt_emu_reg_header0[] = {
     /* Vendor ID reg */
     {
@@ -753,7 +753,7 @@ static XenPTRegInfo xen_pt_emu_reg_header0[] = {
  * Vital Product Data Capability
  */
 
-/* Vital Product Data Capability Structure reg static infomation table */
+/* Vital Product Data Capability Structure reg static information table */
 static XenPTRegInfo xen_pt_emu_reg_vpd[] = {
     {
         .offset     = PCI_CAP_LIST_NEXT,
@@ -775,7 +775,7 @@ static XenPTRegInfo xen_pt_emu_reg_vpd[] = {
  * Vendor Specific Capability
  */
 
-/* Vendor Specific Capability Structure reg static infomation table */
+/* Vendor Specific Capability Structure reg static information table */
 static XenPTRegInfo xen_pt_emu_reg_vendor[] = {
     {
         .offset     = PCI_CAP_LIST_NEXT,
@@ -866,7 +866,7 @@ static int xen_pt_linkctrl2_reg_init(XenPCIPassthroughState *s,
     return 0;
 }
 
-/* PCI Express Capability Structure reg static infomation table */
+/* PCI Express Capability Structure reg static information table */
 static XenPTRegInfo xen_pt_emu_reg_pcie[] = {
     /* Next Pointer reg */
     {
@@ -981,7 +981,7 @@ static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s,
     return 0;
 }
 
-/* Power Management Capability reg static infomation table */
+/* Power Management Capability reg static information table */
 static XenPTRegInfo xen_pt_emu_reg_pm[] = {
     /* Next Pointer reg */
     {
@@ -1259,7 +1259,7 @@ static int xen_pt_msgdata_reg_write(XenPCIPassthroughState *s,
     return 0;
 }
 
-/* MSI Capability Structure reg static infomation table */
+/* MSI Capability Structure reg static information table */
 static XenPTRegInfo xen_pt_emu_reg_msi[] = {
     /* Next Pointer reg */
     {
@@ -1396,7 +1396,7 @@ static int xen_pt_msixctrl_reg_write(XenPCIPassthroughState *s,
     return 0;
 }
 
-/* MSI-X Capability Structure reg static infomation table */
+/* MSI-X Capability Structure reg static information table */
 static XenPTRegInfo xen_pt_emu_reg_msix[] = {
     /* Next Pointer reg */
     {
diff --git a/qemu-img.c b/qemu-img.c
index f20116a..3a21cc1 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -89,7 +89,7 @@ static void help(void)
            "  '-r' tries to repair any inconsistencies that are found during the check.\n"
            "       '-r leaks' repairs only cluster leaks, whereas '-r all' fixes all\n"
            "       kinds of errors, with a higher risk of choosing the wrong fix or\n"
-           "       hiding corruption that has already occured.\n"
+           "       hiding corruption that has already occurred.\n"
            "\n"
            "Parameters to snapshot subcommand:\n"
            "  'snapshot' is the name of the snapshot to create, apply or delete\n"
diff --git a/qemu-img.texi b/qemu-img.texi
index 77c6d0b..9f3ac3f 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -77,7 +77,7 @@ Perform a consistency check on the disk image @var{filename}.
 If @code{-r} is specified, qemu-img tries to repair any inconsistencies found
 during the check. @code{-r leaks} repairs only cluster leaks, whereas
 @code{-r all} fixes all kinds of errors, with a higher risk of choosing the
-wrong fix or hiding corruption that has already occured.
+wrong fix or hiding corruption that has already occurred.
 
 Only the formats @code{qcow2}, @code{qed} and @code{vdi} support
 consistency checks.
-- 
1.7.0.4

[Qemu-devel] [PATCH] Fix spelling (licenced -> licensed) in GPL

[Stefan Weil]

The patch also fixes the case of "written".

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 hw/imx_avic.c  |    4 ++--
 hw/imx_timer.c |    4 ++--
 hw/kzm.c       |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hw/imx_avic.c b/hw/imx_avic.c
index 4f010e8..b1a8fe6 100644
--- a/hw/imx_avic.c
+++ b/hw/imx_avic.c
@@ -6,9 +6,9 @@
  *
  * Copyright (c) 2008 OKL
  * Copyright (c) 2011 NICTA Pty Ltd
- * Originally Written by Hans Jiang
+ * Originally written by Hans Jiang
  *
- * This code is licenced under the GPL version 2 or later.  See
+ * This code is licensed under the GPL version 2 or later.  See
  * the COPYING file in the top-level directory.
  *
  * TODO: implement vectors.
diff --git a/hw/imx_timer.c b/hw/imx_timer.c
index 16215cc..c28c537 100644
--- a/hw/imx_timer.c
+++ b/hw/imx_timer.c
@@ -3,10 +3,10 @@
  *
  * Copyright (c) 2008 OK Labs
  * Copyright (c) 2011 NICTA Pty Ltd
- * Originally Written by Hans Jiang
+ * Originally written by Hans Jiang
  * Updated by Peter Chubb
  *
- * This code is licenced under GPL version 2 or later.  See
+ * This code is licensed under GPL version 2 or later.  See
  * the COPYING file in the top-level directory.
  *
  */
diff --git a/hw/kzm.c b/hw/kzm.c
index 6a5e9df..68cd1b4 100644
--- a/hw/kzm.c
+++ b/hw/kzm.c
@@ -5,7 +5,7 @@
  * Written by Hans at OK-Labs
  * Updated by Peter Chubb.
  *
- * This code is licenced under the GPL, version 2 or later.
+ * This code is licensed under the GPL, version 2 or later.
  * See the file `COPYING' in the top level directory.
  *
  * It (partially) emulates a Kyoto Microcomputer
-- 
1.7.0.4

Re: [Qemu-devel] [PATCH] Fix spelling (licenced -> licensed) in GPL

[Stefan Weil]

Ping?

Am 10.08.2012 22:03, schrieb Stefan Weil:
> The patch also fixes the case of "written".
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>   hw/imx_avic.c  |    4 ++--
>   hw/imx_timer.c |    4 ++--
>   hw/kzm.c       |    2 +-
>   3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/hw/imx_avic.c b/hw/imx_avic.c
> index 4f010e8..b1a8fe6 100644
> --- a/hw/imx_avic.c
> +++ b/hw/imx_avic.c
> @@ -6,9 +6,9 @@
>    *
>    * Copyright (c) 2008 OKL
>    * Copyright (c) 2011 NICTA Pty Ltd
> - * Originally Written by Hans Jiang
> + * Originally written by Hans Jiang
>    *
> - * This code is licenced under the GPL version 2 or later.  See
> + * This code is licensed under the GPL version 2 or later.  See
>    * the COPYING file in the top-level directory.
>    *
>    * TODO: implement vectors.
> diff --git a/hw/imx_timer.c b/hw/imx_timer.c
> index 16215cc..c28c537 100644
> --- a/hw/imx_timer.c
> +++ b/hw/imx_timer.c
> @@ -3,10 +3,10 @@
>    *
>    * Copyright (c) 2008 OK Labs
>    * Copyright (c) 2011 NICTA Pty Ltd
> - * Originally Written by Hans Jiang
> + * Originally written by Hans Jiang
>    * Updated by Peter Chubb
>    *
> - * This code is licenced under GPL version 2 or later.  See
> + * This code is licensed under GPL version 2 or later.  See
>    * the COPYING file in the top-level directory.
>    *
>    */
> diff --git a/hw/kzm.c b/hw/kzm.c
> index 6a5e9df..68cd1b4 100644
> --- a/hw/kzm.c
> +++ b/hw/kzm.c
> @@ -5,7 +5,7 @@
>    * Written by Hans at OK-Labs
>    * Updated by Peter Chubb.
>    *
> - * This code is licenced under the GPL, version 2 or later.
> + * This code is licensed under the GPL, version 2 or later.
>    * See the file `COPYING' in the top level directory.
>    *
>    * It (partially) emulates a Kyoto Microcomputer

Re: [Qemu-devel] [PATCH] Fix spelling (licenced -> licensed) in GPL

[Stefan Hajnoczi]

On Fri, Aug 10, 2012 at 10:03:26PM +0200, Stefan Weil wrote:
> The patch also fixes the case of "written".
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  hw/imx_avic.c  |    4 ++--
>  hw/imx_timer.c |    4 ++--
>  hw/kzm.c       |    2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan

[Qemu-devel] [PATCH] srp: Don't use QEMU_PACKED for single elements of a structured type

[Stefan Weil]

QEMU_PACKED results in a MinGW compiler warning when it is
used for single structure elements:

warning: 'gcc_struct' attribute ignored

Using QEMU_PACKED for the whole structure avoids the compiler warning
without changing the memory layout.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 hw/srp.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/srp.h b/hw/srp.h
index 3009bd5..5e0cad5 100644
--- a/hw/srp.h
+++ b/hw/srp.h
@@ -177,13 +177,13 @@ struct srp_tsk_mgmt {
     uint8_t    reserved1[6];
     uint64_t   tag;
     uint8_t    reserved2[4];
-    uint64_t   lun QEMU_PACKED;
+    uint64_t   lun;
     uint8_t    reserved3[2];
     uint8_t    tsk_mgmt_func;
     uint8_t    reserved4;
     uint64_t   task_tag;
     uint8_t    reserved5[8];
-};
+} QEMU_PACKED;
 
 /*
  * We need the packed attribute because the SRP spec only aligns the
@@ -198,14 +198,14 @@ struct srp_cmd {
     uint8_t    data_in_desc_cnt;
     uint64_t   tag;
     uint8_t    reserved2[4];
-    uint64_t   lun QEMU_PACKED;
+    uint64_t   lun;
     uint8_t    reserved3;
     uint8_t    task_attr;
     uint8_t    reserved4;
     uint8_t    add_cdb_len;
     uint8_t    cdb[16];
     uint8_t    add_data[0];
-};
+} QEMU_PACKED;
 
 enum {
     SRP_RSP_FLAG_RSPVALID = 1 << 0,
-- 
1.7.0.4

Re: [Qemu-devel] [Qemu-trivial] [PATCH] srp: Don't use QEMU_PACKED for single elements of a structured type

[Stefan Hajnoczi]

On Fri, Aug 10, 2012 at 10:03:27PM +0200, Stefan Weil wrote:
> QEMU_PACKED results in a MinGW compiler warning when it is
> used for single structure elements:
> 
> warning: 'gcc_struct' attribute ignored
> 
> Using QEMU_PACKED for the whole structure avoids the compiler warning
> without changing the memory layout.

Quick link for other reviewers:
http://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/Type-Attributes.html#Type-Attributes

> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  hw/srp.h |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/srp.h b/hw/srp.h
> index 3009bd5..5e0cad5 100644
> --- a/hw/srp.h
> +++ b/hw/srp.h
> @@ -177,13 +177,13 @@ struct srp_tsk_mgmt {
>      uint8_t    reserved1[6];
>      uint64_t   tag;
>      uint8_t    reserved2[4];
> -    uint64_t   lun QEMU_PACKED;
> +    uint64_t   lun;
>      uint8_t    reserved3[2];
>      uint8_t    tsk_mgmt_func;
>      uint8_t    reserved4;
>      uint64_t   task_tag;
>      uint8_t    reserved5[8];
> -};
> +} QEMU_PACKED;

Here I actually see a difference for the uint64_t task_tag field.
Previously it was not packed, now it is packed and because it has 4 *
uint8_t before it there will be a difference in layout.

Looking at how QEMU accesses srp_tsk_mgmt, I think we're safe because we
never actually access task_tag?

Ben: Any thoughts on this patch?

Stefan

Re: [Qemu-devel] [Qemu-trivial] [PATCH] srp: Don't use QEMU_PACKED for single elements of a structured type

[Stefan Weil]

Am 15.08.2012 16:16, schrieb Stefan Hajnoczi:
> On Fri, Aug 10, 2012 at 10:03:27PM +0200, Stefan Weil wrote:
>> QEMU_PACKED results in a MinGW compiler warning when it is
>> used for single structure elements:
>>
>> warning: 'gcc_struct' attribute ignored
>>
>> Using QEMU_PACKED for the whole structure avoids the compiler warning
>> without changing the memory layout.
> Quick link for other reviewers:
> http://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/Type-Attributes.html#Type-Attributes
>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>> ---
>>   hw/srp.h |    8 ++++----
>>   1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/hw/srp.h b/hw/srp.h
>> index 3009bd5..5e0cad5 100644
>> --- a/hw/srp.h
>> +++ b/hw/srp.h
>> @@ -177,13 +177,13 @@ struct srp_tsk_mgmt {
>>       uint8_t    reserved1[6];
>>       uint64_t   tag;
>>       uint8_t    reserved2[4];
>> -    uint64_t   lun QEMU_PACKED;
>> +    uint64_t   lun;
>>       uint8_t    reserved3[2];
>>       uint8_t    tsk_mgmt_func;
>>       uint8_t    reserved4;
>>       uint64_t   task_tag;
>>       uint8_t    reserved5[8];
>> -};
>> +} QEMU_PACKED;
> Here I actually see a difference for the uint64_t task_tag field.
> Previously it was not packed, now it is packed and because it has 4 *
> uint8_t before it there will be a difference in layout.
>
> Looking at how QEMU accesses srp_tsk_mgmt, I think we're safe because we
> never actually access task_tag?
>
> Ben: Any thoughts on this patch?
>
> Stefan

4 * uint8_t + 4 bytes from the packed lun, so there is no change
for task_tag, it's always on a 8 byte boundary!

Regards,
Stefan

Re: [Qemu-devel] [Qemu-trivial] [PATCH] srp: Don't use QEMU_PACKED for single elements of a structured type

[Stefan Hajnoczi]

On Wed, Aug 15, 2012 at 05:59:26PM +0200, Stefan Weil wrote:
> Am 15.08.2012 16:16, schrieb Stefan Hajnoczi:
> >On Fri, Aug 10, 2012 at 10:03:27PM +0200, Stefan Weil wrote:
> >>QEMU_PACKED results in a MinGW compiler warning when it is
> >>used for single structure elements:
> >>
> >>warning: 'gcc_struct' attribute ignored
> >>
> >>Using QEMU_PACKED for the whole structure avoids the compiler warning
> >>without changing the memory layout.
> >Quick link for other reviewers:
> >http://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/Type-Attributes.html#Type-Attributes
> >
> >>Signed-off-by: Stefan Weil <sw@weilnetz.de>
> >>---
> >>  hw/srp.h |    8 ++++----
> >>  1 files changed, 4 insertions(+), 4 deletions(-)
> >>
> >>diff --git a/hw/srp.h b/hw/srp.h
> >>index 3009bd5..5e0cad5 100644
> >>--- a/hw/srp.h
> >>+++ b/hw/srp.h
> >>@@ -177,13 +177,13 @@ struct srp_tsk_mgmt {
> >>      uint8_t    reserved1[6];
> >>      uint64_t   tag;
> >>      uint8_t    reserved2[4];
> >>-    uint64_t   lun QEMU_PACKED;
> >>+    uint64_t   lun;
> >>      uint8_t    reserved3[2];
> >>      uint8_t    tsk_mgmt_func;
> >>      uint8_t    reserved4;
> >>      uint64_t   task_tag;
> >>      uint8_t    reserved5[8];
> >>-};
> >>+} QEMU_PACKED;
> >Here I actually see a difference for the uint64_t task_tag field.
> >Previously it was not packed, now it is packed and because it has 4 *
> >uint8_t before it there will be a difference in layout.
> >
> >Looking at how QEMU accesses srp_tsk_mgmt, I think we're safe because we
> >never actually access task_tag?
> >
> >Ben: Any thoughts on this patch?
> >
> >Stefan
> 
> 4 * uint8_t + 4 bytes from the packed lun, so there is no change
> for task_tag, it's always on a 8 byte boundary!

Ah, yes, I see it now!  Glad we're switching to struct-level packing :).

Stefan

Re: [Qemu-devel] [PATCH] Spelling fixes in comments and documentation

[Stefan Weil]

Ping?


Am 10.08.2012 22:03, schrieb Stefan Weil:
> These wrong spellings were detected by codespell:
>
> * successully -> successfully
>
> * alot -> a lot
>
> * wanna -> want to
>
> * infomation -> information
>
> * occured -> occurred
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>   docs/specs/ppc-spapr-hcalls.txt |    2 +-
>   docs/usb2.txt                   |    4 ++--
>   hw/xen_pt.h                     |    4 ++--
>   hw/xen_pt_config_init.c         |   14 +++++++-------
>   qemu-img.c                      |    2 +-
>   qemu-img.texi                   |    2 +-
>   6 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/docs/specs/ppc-spapr-hcalls.txt b/docs/specs/ppc-spapr-hcalls.txt
> index 52ba8d4..667b3fa 100644
> --- a/docs/specs/ppc-spapr-hcalls.txt
> +++ b/docs/specs/ppc-spapr-hcalls.txt
> @@ -31,7 +31,7 @@ Arguments:
>   
>   Returns:
>   
> -  H_SUCCESS   : Successully called the RTAS function (RTAS result
> +  H_SUCCESS   : Successfully called the RTAS function (RTAS result
>                   will have been stored in the parameter block)
>     H_PARAMETER : Unknown token
>   
> diff --git a/docs/usb2.txt b/docs/usb2.txt
> index d17e3c0..21f6d14 100644
> --- a/docs/usb2.txt
> +++ b/docs/usb2.txt
> @@ -58,11 +58,11 @@ try ...
>   xhci controller support
>   -----------------------
>   
> -There also is xhci host controller support available.  It got alot
> +There also is xhci host controller support available.  It got a lot
>   less testing than ehci and there are a bunch of known limitations, so
>   ehci may work better for you.  On the other hand the xhci hardware
>   design is much more virtualization-friendly, thus xhci emulation uses
> -less ressources (especially cpu).  If you wanna give xhci a try
> +less ressources (especially cpu).  If you want to give xhci a try
>   use this to add the host controller ...
>   
>       qemu -device nec-usb-xhci,id=xhci
> diff --git a/hw/xen_pt.h b/hw/xen_pt.h
> index 41904ec..112477a 100644
> --- a/hw/xen_pt.h
> +++ b/hw/xen_pt.h
> @@ -96,7 +96,7 @@ typedef struct XenPTRegion {
>    * - do NOT use ALL F for init_val, otherwise the tbl will not be registered.
>    */
>   
> -/* emulated register infomation */
> +/* emulated register information */
>   struct XenPTRegInfo {
>       uint32_t offset;
>       uint32_t size;
> @@ -140,7 +140,7 @@ typedef int (*xen_pt_reg_size_init_fn)
>       (XenPCIPassthroughState *, const XenPTRegGroupInfo *,
>        uint32_t base_offset, uint8_t *size);
>   
> -/* emulated register group infomation */
> +/* emulated register group information */
>   struct XenPTRegGroupInfo {
>       uint8_t grp_id;
>       XenPTRegisterGroupType grp_type;
> diff --git a/hw/xen_pt_config_init.c b/hw/xen_pt_config_init.c
> index 00eb3d9..e524a40 100644
> --- a/hw/xen_pt_config_init.c
> +++ b/hw/xen_pt_config_init.c
> @@ -562,7 +562,7 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s,
>       return 0;
>   }
>   
> -/* Header Type0 reg static infomation table */
> +/* Header Type0 reg static information table */
>   static XenPTRegInfo xen_pt_emu_reg_header0[] = {
>       /* Vendor ID reg */
>       {
> @@ -753,7 +753,7 @@ static XenPTRegInfo xen_pt_emu_reg_header0[] = {
>    * Vital Product Data Capability
>    */
>   
> -/* Vital Product Data Capability Structure reg static infomation table */
> +/* Vital Product Data Capability Structure reg static information table */
>   static XenPTRegInfo xen_pt_emu_reg_vpd[] = {
>       {
>           .offset     = PCI_CAP_LIST_NEXT,
> @@ -775,7 +775,7 @@ static XenPTRegInfo xen_pt_emu_reg_vpd[] = {
>    * Vendor Specific Capability
>    */
>   
> -/* Vendor Specific Capability Structure reg static infomation table */
> +/* Vendor Specific Capability Structure reg static information table */
>   static XenPTRegInfo xen_pt_emu_reg_vendor[] = {
>       {
>           .offset     = PCI_CAP_LIST_NEXT,
> @@ -866,7 +866,7 @@ static int xen_pt_linkctrl2_reg_init(XenPCIPassthroughState *s,
>       return 0;
>   }
>   
> -/* PCI Express Capability Structure reg static infomation table */
> +/* PCI Express Capability Structure reg static information table */
>   static XenPTRegInfo xen_pt_emu_reg_pcie[] = {
>       /* Next Pointer reg */
>       {
> @@ -981,7 +981,7 @@ static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s,
>       return 0;
>   }
>   
> -/* Power Management Capability reg static infomation table */
> +/* Power Management Capability reg static information table */
>   static XenPTRegInfo xen_pt_emu_reg_pm[] = {
>       /* Next Pointer reg */
>       {
> @@ -1259,7 +1259,7 @@ static int xen_pt_msgdata_reg_write(XenPCIPassthroughState *s,
>       return 0;
>   }
>   
> -/* MSI Capability Structure reg static infomation table */
> +/* MSI Capability Structure reg static information table */
>   static XenPTRegInfo xen_pt_emu_reg_msi[] = {
>       /* Next Pointer reg */
>       {
> @@ -1396,7 +1396,7 @@ static int xen_pt_msixctrl_reg_write(XenPCIPassthroughState *s,
>       return 0;
>   }
>   
> -/* MSI-X Capability Structure reg static infomation table */
> +/* MSI-X Capability Structure reg static information table */
>   static XenPTRegInfo xen_pt_emu_reg_msix[] = {
>       /* Next Pointer reg */
>       {
> diff --git a/qemu-img.c b/qemu-img.c
> index f20116a..3a21cc1 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -89,7 +89,7 @@ static void help(void)
>              "  '-r' tries to repair any inconsistencies that are found during the check.\n"
>              "       '-r leaks' repairs only cluster leaks, whereas '-r all' fixes all\n"
>              "       kinds of errors, with a higher risk of choosing the wrong fix or\n"
> -           "       hiding corruption that has already occured.\n"
> +           "       hiding corruption that has already occurred.\n"
>              "\n"
>              "Parameters to snapshot subcommand:\n"
>              "  'snapshot' is the name of the snapshot to create, apply or delete\n"
> diff --git a/qemu-img.texi b/qemu-img.texi
> index 77c6d0b..9f3ac3f 100644
> --- a/qemu-img.texi
> +++ b/qemu-img.texi
> @@ -77,7 +77,7 @@ Perform a consistency check on the disk image @var{filename}.
>   If @code{-r} is specified, qemu-img tries to repair any inconsistencies found
>   during the check. @code{-r leaks} repairs only cluster leaks, whereas
>   @code{-r all} fixes all kinds of errors, with a higher risk of choosing the
> -wrong fix or hiding corruption that has already occured.
> +wrong fix or hiding corruption that has already occurred.
>   
>   Only the formats @code{qcow2}, @code{qed} and @code{vdi} support
>   consistency checks.

Re: [Qemu-devel] [PATCH] Spelling fixes in comments and documentation

[Peter Maydell]

On 10 August 2012 21:03, Stefan Weil <sw@weilnetz.de> wrote:
> diff --git a/docs/usb2.txt b/docs/usb2.txt
> index d17e3c0..21f6d14 100644
> --- a/docs/usb2.txt
> +++ b/docs/usb2.txt
> @@ -58,11 +58,11 @@ try ...
>  xhci controller support
>  -----------------------
>
> -There also is xhci host controller support available.  It got alot
> +There also is xhci host controller support available.  It got a lot

"is also"

>  less testing than ehci and there are a bunch of known limitations, so
>  ehci may work better for you.  On the other hand the xhci hardware
>  design is much more virtualization-friendly, thus xhci emulation uses
> -less ressources (especially cpu).  If you wanna give xhci a try
> +less ressources (especially cpu).  If you want to give xhci a try

"resources"

-- PMM

Re: [Qemu-devel] [Qemu-trivial] [PATCH] Spelling fixes in comments and documentation

[Stefan Hajnoczi]

On Fri, Aug 10, 2012 at 10:03:25PM +0200, Stefan Weil wrote:
> These wrong spellings were detected by codespell:
> 
> * successully -> successfully
> 
> * alot -> a lot
> 
> * wanna -> want to
> 
> * infomation -> information
> 
> * occured -> occurred
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  docs/specs/ppc-spapr-hcalls.txt |    2 +-
>  docs/usb2.txt                   |    4 ++--
>  hw/xen_pt.h                     |    4 ++--
>  hw/xen_pt_config_init.c         |   14 +++++++-------
>  qemu-img.c                      |    2 +-
>  qemu-img.texi                   |    2 +-
>  6 files changed, 14 insertions(+), 14 deletions(-)

Added Peter's suggestions.

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan

[Qemu-devel] [PATCH] Spelling fixes in comments and documentation

[Stefan Weil]

Codespell detected these new spelling issues.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 docs/writing-qmp-commands.txt |    2 +-
 memory.h                      |    4 ++--
 qemu-ga.c                     |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/writing-qmp-commands.txt b/docs/writing-qmp-commands.txt
index 0472fc3..0ad51aa 100644
--- a/docs/writing-qmp-commands.txt
+++ b/docs/writing-qmp-commands.txt
@@ -435,7 +435,7 @@ There are a number of things to be noticed:
    for all QMP functions)
 3. The "clock" variable (which will point to our QAPI type instance) is
    allocated by the regular g_malloc0() function. Note that we chose to
-   initialize the memory to zero. This is recomended for all QAPI types, as
+   initialize the memory to zero. This is recommended for all QAPI types, as
    it helps avoiding bad surprises (specially with booleans)
 4. Remember that "next_deadline" is optional? All optional members have a
    'has_TYPE_NAME' member that should be properly set by the implementation,
diff --git a/memory.h b/memory.h
index 70f57fb..d48b08b 100644
--- a/memory.h
+++ b/memory.h
@@ -561,7 +561,7 @@ void memory_region_add_subregion_overlap(MemoryRegion *mr,
  * memory_region_get_ram_addr: Get the ram address associated with a memory
  *                             region
  *
- * DO NOT USE THIS FUCNTION.  This is a temporary workaround while the Xen
+ * DO NOT USE THIS FUNCTION.  This is a temporary workaround while the Xen
  * code is being reworked.
  */
 ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr);
@@ -650,7 +650,7 @@ void memory_global_sync_dirty_bitmap(MemoryRegion *address_space);
  * memory_region_transaction_begin: Start a transaction.
  *
  * During a transaction, changes will be accumulated and made visible
- * only when the transaction ends (is commited).
+ * only when the transaction ends (is committed).
  */
 void memory_region_transaction_begin(void);
 
diff --git a/qemu-ga.c b/qemu-ga.c
index 200bb15..29e4f64 100644
--- a/qemu-ga.c
+++ b/qemu-ga.c
@@ -92,7 +92,7 @@ static void usage(const char *cmd)
 "  -v, --verbose     log extra debugging information\n"
 "  -V, --version     print version information and exit\n"
 "  -d, --daemonize   become a daemon\n"
-"  -b, --blacklist   comma-seperated list of RPCs to disable (no spaces, \"?\""
+"  -b, --blacklist   comma-separated list of RPCs to disable (no spaces, \"?\""
 "                    to list available RPCs)\n"
 "  -h, --help        display this help and exit\n"
 "\n"
-- 
1.7.2.5