* [Qemu-devel] [PATCH] Fix typos and misspellings in comments
@ 2014-09-09 3:23 zhanghailiang
2014-09-09 8:09 ` Peter Maydell
0 siblings, 1 reply; 5+ messages in thread
From: zhanghailiang @ 2014-09-09 3:23 UTC (permalink / raw)
To: qemu-trivial; +Cc: qemu-devel, zhanghailiang
Found by codespell:
occured -> occurred
formated -> formatted
Comander -> Commander
gaurantee -> guarantee
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
---
hw/ppc/spapr.c | 2 +-
hw/usb/quirks.h | 2 +-
libcacard/vcard_emul_nss.c | 2 +-
| 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 2ab4460..bedef2f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -541,7 +541,7 @@ static void *spapr_create_fdt_skel(hwaddr initrd_base,
_FDT((fdt_property_cell(fdt, "rtas-error-log-max", RTAS_ERROR_LOG_MAX)));
/*
- * According to PAPR, rtas ibm,os-term, does not gaurantee a return
+ * According to PAPR, rtas ibm,os-term, does not guarantee a return
* back to the guest cpu.
*
* While an additional ibm,extended-os-term property indicates that
diff --git a/hw/usb/quirks.h b/hw/usb/quirks.h
index 8dc6065..2d5d98d 100644
--- a/hw/usb/quirks.h
+++ b/hw/usb/quirks.h
@@ -90,7 +90,7 @@ static const struct usb_device_id usbredir_raw_serial_ids[] = {
{ USB_DEVICE(0x10C4, 0x81E8) }, /* Zephyr Bioharness */
{ USB_DEVICE(0x10C4, 0x81F2) }, /* C1007 HF band RFID controller */
{ USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
- { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Comander 2 */
+ { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Commander 2 */
{ USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demonstration module */
{ USB_DEVICE(0x10C4, 0x8293) }, /* Telegesis ETRX2USB */
{ USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */
diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c
index f1bba57..ad9530c 100644
--- a/libcacard/vcard_emul_nss.c
+++ b/libcacard/vcard_emul_nss.c
@@ -286,7 +286,7 @@ vcard_emul_rsa_op(VCard *card, VCardKey *key,
}
}
if ((i < buffer_size) && (buffer[i] == 0)) {
- /* yes, we have a properly formated PKCS #1 signature */
+ /* yes, we have a properly formatted PKCS #1 signature */
/*
* NOTE: even if we accidentally got an encrypt buffer, which
* through shear luck started with 00, 01, ff, 00, it won't matter
--git a/linux-headers/asm-powerpc/epapr_hcalls.h b/linux-headers/asm-powerpc/epapr_hcalls.h
index 06f7247..33b3f89 100644
--- a/linux-headers/asm-powerpc/epapr_hcalls.h
+++ b/linux-headers/asm-powerpc/epapr_hcalls.h
@@ -78,7 +78,7 @@
#define EV_SUCCESS 0
#define EV_EPERM 1 /* Operation not permitted */
#define EV_ENOENT 2 /* Entry Not Found */
-#define EV_EIO 3 /* I/O error occured */
+#define EV_EIO 3 /* I/O error occurred */
#define EV_EAGAIN 4 /* The operation had insufficient
* resources to complete and should be
* retried
@@ -89,7 +89,7 @@
#define EV_ENODEV 7 /* No such device */
#define EV_EINVAL 8 /* An argument supplied to the hcall
was out of range or invalid */
-#define EV_INTERNAL 9 /* An internal error occured */
+#define EV_INTERNAL 9 /* An internal error occurred */
#define EV_CONFIG 10 /* A configuration error was detected */
#define EV_INVALID_STATE 11 /* The object is in an invalid state */
#define EV_UNIMPLEMENTED 12 /* Unimplemented hypercall */
--
1.7.12.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] Fix typos and misspellings in comments
2014-09-09 3:23 [Qemu-devel] [PATCH] Fix typos and misspellings in comments zhanghailiang
@ 2014-09-09 8:09 ` Peter Maydell
2014-09-09 12:23 ` zhanghailiang
2014-09-09 13:43 ` Andreas Färber
0 siblings, 2 replies; 5+ messages in thread
From: Peter Maydell @ 2014-09-09 8:09 UTC (permalink / raw)
To: zhanghailiang; +Cc: QEMU Trivial, QEMU Developers
On 9 September 2014 04:23, zhanghailiang <zhang.zhanghailiang@huawei.com> wrote:
> Found by codespell:
>
> occured -> occurred
> formated -> formatted
> Comander -> Commander
> gaurantee -> guarantee
>
> Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
> ---
> hw/ppc/spapr.c | 2 +-
> hw/usb/quirks.h | 2 +-
> libcacard/vcard_emul_nss.c | 2 +-
> linux-headers/asm-powerpc/epapr_hcalls.h | 4 ++--
You can't change linux-headers files except by importing them from
the kernel, I'm afraid. You'd need to submit that change as a patch
to the kernel and then wait for it to be committed there and then
we can re-sync our copies of the kernel's headers.
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 2ab4460..bedef2f 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -541,7 +541,7 @@ static void *spapr_create_fdt_skel(hwaddr initrd_base,
> _FDT((fdt_property_cell(fdt, "rtas-error-log-max", RTAS_ERROR_LOG_MAX)));
>
> /*
> - * According to PAPR, rtas ibm,os-term, does not gaurantee a return
> + * According to PAPR, rtas ibm,os-term, does not guarantee a return
> * back to the guest cpu.
> *
> * While an additional ibm,extended-os-term property indicates that
OK
> diff --git a/hw/usb/quirks.h b/hw/usb/quirks.h
> index 8dc6065..2d5d98d 100644
> --- a/hw/usb/quirks.h
> +++ b/hw/usb/quirks.h
> @@ -90,7 +90,7 @@ static const struct usb_device_id usbredir_raw_serial_ids[] = {
> { USB_DEVICE(0x10C4, 0x81E8) }, /* Zephyr Bioharness */
> { USB_DEVICE(0x10C4, 0x81F2) }, /* C1007 HF band RFID controller */
> { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
> - { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Comander 2 */
> + { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Commander 2 */
Google suggests this spelling for this device name is correct:
http://www.agito.pl/iplus-usb-comander-2-edge-plus-1-37295.html
(Polish product?)
> { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demonstration module */
> { USB_DEVICE(0x10C4, 0x8293) }, /* Telegesis ETRX2USB */
> { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */
> diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c
> index f1bba57..ad9530c 100644
> --- a/libcacard/vcard_emul_nss.c
> +++ b/libcacard/vcard_emul_nss.c
> @@ -286,7 +286,7 @@ vcard_emul_rsa_op(VCard *card, VCardKey *key,
> }
> }
> if ((i < buffer_size) && (buffer[i] == 0)) {
> - /* yes, we have a properly formated PKCS #1 signature */
> + /* yes, we have a properly formatted PKCS #1 signature */
OK
> /*
> * NOTE: even if we accidentally got an encrypt buffer, which
> * through shear luck started with 00, 01, ff, 00, it won't matter
Another typo here: s/shear/sheer/.
> diff --git a/linux-headers/asm-powerpc/epapr_hcalls.h b/linux-headers/asm-powerpc/epapr_hcalls.h
> index 06f7247..33b3f89 100644
> --- a/linux-headers/asm-powerpc/epapr_hcalls.h
> +++ b/linux-headers/asm-powerpc/epapr_hcalls.h
> @@ -78,7 +78,7 @@
> #define EV_SUCCESS 0
> #define EV_EPERM 1 /* Operation not permitted */
> #define EV_ENOENT 2 /* Entry Not Found */
> -#define EV_EIO 3 /* I/O error occured */
> +#define EV_EIO 3 /* I/O error occurred */
> #define EV_EAGAIN 4 /* The operation had insufficient
> * resources to complete and should be
> * retried
> @@ -89,7 +89,7 @@
> #define EV_ENODEV 7 /* No such device */
> #define EV_EINVAL 8 /* An argument supplied to the hcall
> was out of range or invalid */
> -#define EV_INTERNAL 9 /* An internal error occured */
> +#define EV_INTERNAL 9 /* An internal error occurred */
> #define EV_CONFIG 10 /* A configuration error was detected */
> #define EV_INVALID_STATE 11 /* The object is in an invalid state */
> #define EV_UNIMPLEMENTED 12 /* Unimplemented hypercall */
These fixes should go via the kernel.
thanks
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] Fix typos and misspellings in comments
2014-09-09 8:09 ` Peter Maydell
@ 2014-09-09 12:23 ` zhanghailiang
2014-09-09 13:43 ` Andreas Färber
1 sibling, 0 replies; 5+ messages in thread
From: zhanghailiang @ 2014-09-09 12:23 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Trivial, QEMU Developers
On 2014/9/9 16:09, Peter Maydell wrote:
> On 9 September 2014 04:23, zhanghailiang<zhang.zhanghailiang@huawei.com> wrote:
>> Found by codespell:
>>
>> occured -> occurred
>> formated -> formatted
>> Comander -> Commander
>> gaurantee -> guarantee
>>
>> Signed-off-by: zhanghailiang<zhang.zhanghailiang@huawei.com>
>> ---
>> hw/ppc/spapr.c | 2 +-
>> hw/usb/quirks.h | 2 +-
>> libcacard/vcard_emul_nss.c | 2 +-
>> linux-headers/asm-powerpc/epapr_hcalls.h | 4 ++--
>
> You can't change linux-headers files except by importing them from
> the kernel, I'm afraid. You'd need to submit that change as a patch
> to the kernel and then wait for it to be committed there and then
> we can re-sync our copies of the kernel's headers.
>
OK, i will remove this change from this patch, and send a patch to kernel:)
>> 4 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
>> index 2ab4460..bedef2f 100644
>> --- a/hw/ppc/spapr.c
>> +++ b/hw/ppc/spapr.c
>> @@ -541,7 +541,7 @@ static void *spapr_create_fdt_skel(hwaddr initrd_base,
>> _FDT((fdt_property_cell(fdt, "rtas-error-log-max", RTAS_ERROR_LOG_MAX)));
>>
>> /*
>> - * According to PAPR, rtas ibm,os-term, does not gaurantee a return
>> + * According to PAPR, rtas ibm,os-term, does not guarantee a return
>> * back to the guest cpu.
>> *
>> * While an additional ibm,extended-os-term property indicates that
>
> OK
>
>> diff --git a/hw/usb/quirks.h b/hw/usb/quirks.h
>> index 8dc6065..2d5d98d 100644
>> --- a/hw/usb/quirks.h
>> +++ b/hw/usb/quirks.h
>> @@ -90,7 +90,7 @@ static const struct usb_device_id usbredir_raw_serial_ids[] = {
>> { USB_DEVICE(0x10C4, 0x81E8) }, /* Zephyr Bioharness */
>> { USB_DEVICE(0x10C4, 0x81F2) }, /* C1007 HF band RFID controller */
>> { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
>> - { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Comander 2 */
>> + { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Commander 2 */
>
> Google suggests this spelling for this device name is correct:
> http://www.agito.pl/iplus-usb-comander-2-edge-plus-1-37295.html
> (Polish product?)
>
Interesting;), i will drop this change also.
>> { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demonstration module */
>> { USB_DEVICE(0x10C4, 0x8293) }, /* Telegesis ETRX2USB */
>> { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */
>> diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c
>> index f1bba57..ad9530c 100644
>> --- a/libcacard/vcard_emul_nss.c
>> +++ b/libcacard/vcard_emul_nss.c
>> @@ -286,7 +286,7 @@ vcard_emul_rsa_op(VCard *card, VCardKey *key,
>> }
>> }
>> if ((i< buffer_size)&& (buffer[i] == 0)) {
>> - /* yes, we have a properly formated PKCS #1 signature */
>> + /* yes, we have a properly formatted PKCS #1 signature */
>
> OK
>
>> /*
>> * NOTE: even if we accidentally got an encrypt buffer, which
>> * through shear luck started with 00, 01, ff, 00, it won't matter
>
> Another typo here: s/shear/sheer/.
>
OK!
>> diff --git a/linux-headers/asm-powerpc/epapr_hcalls.h b/linux-headers/asm-powerpc/epapr_hcalls.h
>> index 06f7247..33b3f89 100644
>> --- a/linux-headers/asm-powerpc/epapr_hcalls.h
>> +++ b/linux-headers/asm-powerpc/epapr_hcalls.h
>> @@ -78,7 +78,7 @@
>> #define EV_SUCCESS 0
>> #define EV_EPERM 1 /* Operation not permitted */
>> #define EV_ENOENT 2 /* Entry Not Found */
>> -#define EV_EIO 3 /* I/O error occured */
>> +#define EV_EIO 3 /* I/O error occurred */
>> #define EV_EAGAIN 4 /* The operation had insufficient
>> * resources to complete and should be
>> * retried
>> @@ -89,7 +89,7 @@
>> #define EV_ENODEV 7 /* No such device */
>> #define EV_EINVAL 8 /* An argument supplied to the hcall
>> was out of range or invalid */
>> -#define EV_INTERNAL 9 /* An internal error occured */
>> +#define EV_INTERNAL 9 /* An internal error occurred */
>> #define EV_CONFIG 10 /* A configuration error was detected */
>> #define EV_INVALID_STATE 11 /* The object is in an invalid state */
>> #define EV_UNIMPLEMENTED 12 /* Unimplemented hypercall */
>
> These fixes should go via the kernel.
OK, Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] Fix typos and misspellings in comments
2014-09-09 8:09 ` Peter Maydell
2014-09-09 12:23 ` zhanghailiang
@ 2014-09-09 13:43 ` Andreas Färber
2014-09-10 9:02 ` zhanghailiang
1 sibling, 1 reply; 5+ messages in thread
From: Andreas Färber @ 2014-09-09 13:43 UTC (permalink / raw)
To: Peter Maydell, zhanghailiang; +Cc: QEMU Trivial, QEMU Developers
Am 09.09.2014 10:09, schrieb Peter Maydell:
> On 9 September 2014 04:23, zhanghailiang <zhang.zhanghailiang@huawei.com> wrote:
>> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
>> index 2ab4460..bedef2f 100644
>> --- a/hw/ppc/spapr.c
>> +++ b/hw/ppc/spapr.c
>> @@ -541,7 +541,7 @@ static void *spapr_create_fdt_skel(hwaddr initrd_base,
>> _FDT((fdt_property_cell(fdt, "rtas-error-log-max", RTAS_ERROR_LOG_MAX)));
>>
>> /*
>> - * According to PAPR, rtas ibm,os-term, does not gaurantee a return
>> + * According to PAPR, rtas ibm,os-term, does not guarantee a return
"..., rtas,os-term does not ..."? (i.e., drop the comma while at it)
>> * back to the guest cpu.
>> *
>> * While an additional ibm,extended-os-term property indicates that
>
> OK
Regards,
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] Fix typos and misspellings in comments
2014-09-09 13:43 ` Andreas Färber
@ 2014-09-10 9:02 ` zhanghailiang
0 siblings, 0 replies; 5+ messages in thread
From: zhanghailiang @ 2014-09-10 9:02 UTC (permalink / raw)
To: Andreas Färber; +Cc: QEMU Trivial, Peter Maydell, QEMU Developers
On 2014/9/9 21:43, Andreas Färber wrote:
> Am 09.09.2014 10:09, schrieb Peter Maydell:
>> On 9 September 2014 04:23, zhanghailiang<zhang.zhanghailiang@huawei.com> wrote:
>>> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
>>> index 2ab4460..bedef2f 100644
>>> --- a/hw/ppc/spapr.c
>>> +++ b/hw/ppc/spapr.c
>>> @@ -541,7 +541,7 @@ static void *spapr_create_fdt_skel(hwaddr initrd_base,
>>> _FDT((fdt_property_cell(fdt, "rtas-error-log-max", RTAS_ERROR_LOG_MAX)));
>>>
>>> /*
>>> - * According to PAPR, rtas ibm,os-term, does not gaurantee a return
>>> + * According to PAPR, rtas ibm,os-term, does not guarantee a return
>
> "..., rtas,os-term does not ..."? (i.e., drop the comma while at it)
>
OK, Thanks.
>>> * back to the guest cpu.
>>> *
>>> * While an additional ibm,extended-os-term property indicates that
>>
>> OK
>
> Regards,
> Andreas
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-10 9:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-09 3:23 [Qemu-devel] [PATCH] Fix typos and misspellings in comments zhanghailiang
2014-09-09 8:09 ` Peter Maydell
2014-09-09 12:23 ` zhanghailiang
2014-09-09 13:43 ` Andreas Färber
2014-09-10 9:02 ` zhanghailiang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).