aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDong Xu Wang <wdongxu@linux.vnet.ibm.com>2011-11-22 18:06:26 +0800
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2011-12-02 10:50:57 +0000
commit07f35073c6d6d1b2f42a6b3671b8af2f271986b9 (patch)
tree9d54071355921cab2784203947f6a7734ef135bc
parent9b2260cbd52c93335dd0a3a79a8c7dd4665a1dea (diff)
fix spelling in main directory
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
-rw-r--r--arm-dis.c6
-rw-r--r--cpu-all.h2
-rw-r--r--cpu-common.h2
-rw-r--r--cpus.c2
-rw-r--r--exec-memory.h2
-rw-r--r--hppa-dis.c2
-rw-r--r--m68k-dis.c2
-rw-r--r--main-loop.h2
-rw-r--r--nbd.c4
-rw-r--r--qemu-io.c2
-rw-r--r--qemu-option.c2
-rw-r--r--qerror.c2
-rw-r--r--savevm.c2
-rw-r--r--test-visitor.c10
-rw-r--r--vl.c2
15 files changed, 22 insertions, 22 deletions
diff --git a/arm-dis.c b/arm-dis.c
index 3ece02c1b3..6bc4d71698 100644
--- a/arm-dis.c
+++ b/arm-dis.c
@@ -1624,7 +1624,7 @@ arm_decode_shift (long given, fprintf_function func, void *stream,
}
/* Print one coprocessor instruction on INFO->STREAM.
- Return true if the instuction matched, false if this is not a
+ Return true if the instruction matched, false if this is not a
recognised coprocessor instruction. */
static bfd_boolean
@@ -2214,7 +2214,7 @@ print_arm_address (bfd_vma pc, struct disassemble_info *info, long given)
}
/* Print one neon instruction on INFO->STREAM.
- Return true if the instuction matched, false if this is not a
+ Return true if the instruction matched, false if this is not a
recognised neon instruction. */
static bfd_boolean
@@ -3927,7 +3927,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info)
n = last_mapping_sym - 1;
/* No mapping symbol found at this address. Look backwards
- for a preceeding one. */
+ for a preceding one. */
for (; n >= 0; n--)
{
if (get_sym_code_type (info, n, &type))
diff --git a/cpu-all.h b/cpu-all.h
index 5f47ab8df9..7246a67236 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -368,7 +368,7 @@ DECLARE_TLS(CPUState *,cpu_single_env);
#define CPU_INTERRUPT_TGT_EXT_4 0x1000
/* Several target-specific internal interrupts. These differ from the
- preceeding target-specific interrupts in that they are intended to
+ preceding target-specific interrupts in that they are intended to
originate from within the cpu itself, typically in response to some
instruction being executed. These, therefore, are not masked while
single-stepping within the debugger. */
diff --git a/cpu-common.h b/cpu-common.h
index c9878ba474..7c9cef85b3 100644
--- a/cpu-common.h
+++ b/cpu-common.h
@@ -1,7 +1,7 @@
#ifndef CPU_COMMON_H
#define CPU_COMMON_H 1
-/* CPU interfaces that are target indpendent. */
+/* CPU interfaces that are target independent. */
#ifdef TARGET_PHYS_ADDR_BITS
#include "targphys.h"
diff --git a/cpus.c b/cpus.c
index 82530c4a03..9d2a2cb474 100644
--- a/cpus.c
+++ b/cpus.c
@@ -281,7 +281,7 @@ void qemu_clock_warp(QEMUClock *clock)
* (related to the time left until the next event) has passed. This
* rt_clock timer will do this. This avoids that the warps are too
* visible externally---for example, you will not be sending network
- * packets continously instead of every 100ms.
+ * packets continuously instead of every 100ms.
*/
qemu_mod_timer(icount_warp_timer, vm_clock_warp_start + deadline);
} else {
diff --git a/exec-memory.h b/exec-memory.h
index 334219fe23..1cd92eec71 100644
--- a/exec-memory.h
+++ b/exec-memory.h
@@ -1,5 +1,5 @@
/*
- * Internal memory managment interfaces
+ * Internal memory management interfaces
*
* Copyright 2011 Red Hat, Inc. and/or its affiliates
*
diff --git a/hppa-dis.c b/hppa-dis.c
index 435da73553..420a7d22d0 100644
--- a/hppa-dis.c
+++ b/hppa-dis.c
@@ -564,7 +564,7 @@ If not, see <http://www.gnu.org/licenses/>. */
*/
/* There are two kinds of delay slot nullification: normal which is
- * controled by the nullification bit, and conditional, which depends
+ * controlled by the nullification bit, and conditional, which depends
* on the direction of the branch and its success or failure.
*
* NONE is unfortunately #defined in the hiux system include files.
diff --git a/m68k-dis.c b/m68k-dis.c
index 04f837a31d..2b155de51c 100644
--- a/m68k-dis.c
+++ b/m68k-dis.c
@@ -3518,7 +3518,7 @@ const struct m68k_opcode m68k_opcodes[] =
/* NOTE: The mcf5200 family programmer's reference manual does not
indicate the byte form of the movea instruction is invalid (as it
- is on 68000 family cpus). However, experiments on the 5202 yeild
+ is on 68000 family cpus). However, experiments on the 5202 yield
unexpected results. The value is copied, but it is not sign extended
(as is done with movea.w) and the top three bytes in the address
register are not disturbed. I don't know if this is the intended
diff --git a/main-loop.h b/main-loop.h
index 8a716b133f..876092dd15 100644
--- a/main-loop.h
+++ b/main-loop.h
@@ -111,7 +111,7 @@ typedef int PollingFunc(void *opaque);
* qemu_add_wait_object.
*
* Polling callbacks really have nothing Windows specific in them, but
- * as they are a hack and are currenly not necessary under POSIX systems,
+ * as they are a hack and are currently not necessary under POSIX systems,
* they are only available when QEMU is running under Windows.
*
* @func: The function that does the polling, and returns 1 to force
diff --git a/nbd.c b/nbd.c
index e6c931c5ce..de880fe3c6 100644
--- a/nbd.c
+++ b/nbd.c
@@ -203,7 +203,7 @@ int nbd_negotiate(int csock, off_t size, uint32_t flags)
return -1;
}
- TRACE("Negotation succeeded.");
+ TRACE("Negotiation succeeded.");
return 0;
}
@@ -215,7 +215,7 @@ int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,
uint64_t magic, s;
uint16_t tmp;
- TRACE("Receiving negotation.");
+ TRACE("Receiving negotiation.");
if (read_sync(csock, buf, 8) != 8) {
LOG("read failed");
diff --git a/qemu-io.c b/qemu-io.c
index de26422fcf..f70de0b4a6 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -445,7 +445,7 @@ static int read_f(int argc, char **argv)
}
if ((pattern_count < 0) || (pattern_count + pattern_offset > count)) {
- printf("pattern verfication range exceeds end of read data\n");
+ printf("pattern verification range exceeds end of read data\n");
return 0;
}
diff --git a/qemu-option.c b/qemu-option.c
index f97a758a95..6b23c31235 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -480,7 +480,7 @@ void print_option_parameters(QEMUOptionParameter *list)
printf("%s=%" PRId64 " ", list->name, list->value.n);
break;
default:
- printf("%s=(unkown type) ", list->name);
+ printf("%s=(unknown type) ", list->name);
break;
}
list++;
diff --git a/qerror.c b/qerror.c
index fdf62b9e27..b12c85cc1f 100644
--- a/qerror.c
+++ b/qerror.c
@@ -223,7 +223,7 @@ static const QErrorStringTable qerror_table[] = {
},
{
.error_fmt = QERR_UNDEFINED_ERROR,
- .desc = "An undefined error has ocurred",
+ .desc = "An undefined error has occurred",
},
{
.error_fmt = QERR_UNSUPPORTED,
diff --git a/savevm.c b/savevm.c
index f53cd4c154..a827ca2b3e 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1552,7 +1552,7 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable,
}
/*
- * this funtion has three return values:
+ * this function has three return values:
* negative: there was one error, and we have -errno.
* 0 : We haven't finished, caller have to go again
* 1 : We have finished, we can go to complete phase
diff --git a/test-visitor.c b/test-visitor.c
index 847ce14ea1..f90b711883 100644
--- a/test-visitor.c
+++ b/test-visitor.c
@@ -166,7 +166,7 @@ static void test_nested_structs(void)
QString *str;
ud1.integer = 42;
- ud1.string = strdup("fourty two");
+ ud1.string = strdup("forty two");
/* sanity check */
mo = qmp_output_visitor_new();
@@ -179,13 +179,13 @@ static void test_nested_structs(void)
g_assert(obj);
qobject_decref(obj);
- ud2.string = strdup("fourty three");
- ud2.dict.string = strdup("fourty four");
+ ud2.string = strdup("forty three");
+ ud2.dict.string = strdup("forty four");
ud2.dict.dict.userdef = ud1_p;
- ud2.dict.dict.string = strdup("fourty five");
+ ud2.dict.dict.string = strdup("forty five");
ud2.dict.has_dict2 = true;
ud2.dict.dict2.userdef = ud1_p;
- ud2.dict.dict2.string = strdup("fourty six");
+ ud2.dict.dict2.string = strdup("forty six");
/* c type -> qobject */
mo = qmp_output_visitor_new();
diff --git a/vl.c b/vl.c
index a50842bb76..5372a9622a 100644
--- a/vl.c
+++ b/vl.c
@@ -820,7 +820,7 @@ static void validate_bootdevices(char *devices)
/* Allowed boot devices are:
* a-b: floppy disk drives
* c-f: IDE disk drives
- * g-m: machine implementation dependant drives
+ * g-m: machine implementation dependent drives
* n-p: network devices
* It's up to each machine implementation to check if the given boot
* devices match the actual hardware implementation and firmware