[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 02/15] misc: Fix some typos in names and comments
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 02/15] misc: Fix some typos in names and comments |
Date: |
Mon, 2 Sep 2013 15:01:22 +0400 |
From: Stefan Weil <address@hidden>
Most typos were found using a modified version of codespell:
accross -> across
issueing -> issuing
TICNT_THRESHHOLD -> TICNT_THRESHOLD
bandwith -> bandwidth
VCARD_7816_PROPIETARY -> VCARD_7816_PROPRIETARY
occured -> occurred
gaurantee -> guarantee
sofware -> software
Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
block/backup.c | 2 +-
hw/s390x/css.c | 2 +-
hw/timer/exynos4210_rtc.c | 4 ++--
include/hw/bt.h | 8 ++++----
libcacard/card_7816.c | 2 +-
libcacard/card_7816t.h | 2 +-
linux-headers/asm-powerpc/epapr_hcalls.h | 4 ++--
migration-rdma.c | 6 +++---
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index e12b3b1..23c7264 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -290,7 +290,7 @@ static void coroutine_fn backup_run(void *opaque)
for (i = 0; i < BACKUP_SECTORS_PER_CLUSTER;) {
/* bdrv_co_is_allocated() only returns true/false based
- * on the first set of sectors it comes accross that
+ * on the first set of sectors it comes across that
* are are all in the same state.
* For that reason we must verify each sector in the
* backup cluster length. We end up copying more than
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 93b0b97..101da63 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -124,7 +124,7 @@ static void sch_handle_clear_func(SubchDev *sch)
/* Path management: In our simple css, we always choose the only path. */
path = 0x80;
- /* Reset values prior to 'issueing the clear signal'. */
+ /* Reset values prior to 'issuing the clear signal'. */
p->lpum = 0;
p->pom = 0xff;
s->flags &= ~SCSW_FLAGS_MASK_PNO;
diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c
index 3f2c8c5..026f81a 100644
--- a/hw/timer/exynos4210_rtc.c
+++ b/hw/timer/exynos4210_rtc.c
@@ -67,7 +67,7 @@
#define CURTICNT 0x0090
#define TICK_TIMER_ENABLE 0x0100
-#define TICNT_THRESHHOLD 2
+#define TICNT_THRESHOLD 2
#define RTC_ENABLE 0x0001
@@ -429,7 +429,7 @@ static void exynos4210_rtc_write(void *opaque, hwaddr
offset,
s->reg_rtccon = value;
break;
case TICCNT:
- if (value > TICNT_THRESHHOLD) {
+ if (value > TICNT_THRESHOLD) {
s->reg_ticcnt = value;
} else {
fprintf(stderr,
diff --git a/include/hw/bt.h b/include/hw/bt.h
index 830af94..3f365bc 100644
--- a/include/hw/bt.h
+++ b/include/hw/bt.h
@@ -640,8 +640,8 @@ typedef struct {
#define OCF_SETUP_SYNC_CONN 0x0028
typedef struct {
uint16_t handle;
- uint32_t tx_bandwith;
- uint32_t rx_bandwith;
+ uint32_t tx_bandwidth;
+ uint32_t rx_bandwidth;
uint16_t max_latency;
uint16_t voice_setting;
uint8_t retrans_effort;
@@ -652,8 +652,8 @@ typedef struct {
#define OCF_ACCEPT_SYNC_CONN_REQ 0x0029
typedef struct {
bdaddr_t bdaddr;
- uint32_t tx_bandwith;
- uint32_t rx_bandwith;
+ uint32_t tx_bandwidth;
+ uint32_t rx_bandwidth;
uint16_t max_latency;
uint16_t voice_setting;
uint8_t retrans_effort;
diff --git a/libcacard/card_7816.c b/libcacard/card_7816.c
index 8d06326..c28bb60 100644
--- a/libcacard/card_7816.c
+++ b/libcacard/card_7816.c
@@ -232,7 +232,7 @@ vcard_apdu_set_class(VCardAPDU *apdu) {
case 0xf0:
default:
apdu->a_gen_type =
- (apdu->a_cla == 0xff) ? VCARD_7816_PTS : VCARD_7816_PROPIETARY;
+ (apdu->a_cla == 0xff) ? VCARD_7816_PTS : VCARD_7816_PROPRIETARY;
break;
}
return VCARD7816_STATUS_SUCCESS;
diff --git a/libcacard/card_7816t.h b/libcacard/card_7816t.h
index 9333285..8eef0ce 100644
--- a/libcacard/card_7816t.h
+++ b/libcacard/card_7816t.h
@@ -43,7 +43,7 @@ typedef enum {
VCARD_7816_ISO,
VCARD_7816_RFU,
VCARD_7816_PTS,
- VCARD_7816_PROPIETARY
+ VCARD_7816_PROPRIETARY
} VCardAPDUType;
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 */
diff --git a/migration-rdma.c b/migration-rdma.c
index 3d1266f..f540366 100644
--- a/migration-rdma.c
+++ b/migration-rdma.c
@@ -756,7 +756,7 @@ static void qemu_rdma_dump_gid(const char *who, struct
rdma_cm_id *id)
* connections (both IPv4 and IPv6) if the destination machine does not have
* a regular infiniband network available for use.
*
- * The only way to gaurantee that an error is thrown for broken kernels is
+ * The only way to guarantee that an error is thrown for broken kernels is
* for the management software to choose a *specific* interface at bind time
* and validate what time of hardware it is.
*
@@ -778,7 +778,7 @@ static void qemu_rdma_dump_gid(const char *who, struct
rdma_cm_id *id)
* Infiniband.
*
* If we detect that we have a *pure* RoCE environment, then we can safely
- * thrown an error even if the management sofware has specified '[::]' as the
+ * thrown an error even if the management software has specified '[::]' as the
* bind address.
*
* However, if there is are multiple hetergeneous devices, then we cannot make
@@ -801,7 +801,7 @@ static int qemu_rdma_broken_ipv6_kernel(Error **errp,
struct ibv_context *verbs)
* devices (non-ethernet).
*
* If not, then we can safely proceed with the migration.
- * Otherwise, there are no gaurantees until the bug is fixed in linux.
+ * Otherwise, there are no guarantees until the bug is fixed in linux.
*/
if (!verbs) {
int num_devices, x;
--
1.7.10.4
- [Qemu-trivial] [PULL 00/15] Trivial patches for 2013-09-02, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 01/15] slirp: Port redirection option behave differently on Linux and Windows, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 02/15] misc: Fix some typos in names and comments,
Michael Tokarev <=
- [Qemu-trivial] [PULL 04/15] configure: disable clang -Wstring-plus-int warning, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 03/15] rdma: silly ipv6 bugfix, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 08/15] configure: Remove unneeded redirections of stderr (pkg-config --cflags, --libs), Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 11/15] target-arm: Report unimplemented opcodes (LOG_UNIMP), Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 12/15] tci: Remove function tcg_out64 (fix broken build), Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 05/15] slirp/arp_table.c: Avoid shifting into sign bit of signed integers, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 13/15] qmp: fix integer usage in examples, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 07/15] configure: Don't write .pyc files by default (python -B), Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 10/15] pflash_cfi02.c: fix debug macro, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 14/15] adlib: sort offsets in portio registration, Michael Tokarev, 2013/09/02