summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-09-01 13:57:19 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-09-01 13:57:19 -0500
commit625f9e1f54cd78ee98ac22030da527c9a1cc9d2b (patch)
tree0813abba86df9090828f7367e9b03b6d230a459f
parenta952c570c865d5eae6c148716f2cb585a0d3a2ee (diff)
parent2542bfd51c42eead37e0025a9055f74b8c3a1aed (diff)
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
-rw-r--r--docs/qapi-code-gen.txt2
-rw-r--r--hw/pci-stub.c2
-rw-r--r--libcacard/vscclient.c2
-rw-r--r--qemu-ga.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt
index b7befb5e4..f345866f5 100644
--- a/docs/qapi-code-gen.txt
+++ b/docs/qapi-code-gen.txt
@@ -229,7 +229,7 @@ in the schema. The following files are generated:
$(prefix)qmp-marshal.c: command marshal/dispatch functions for each
QMP command defined in the schema. Functions
generated by qapi-visit.py are used to
- convert QObjects recieved from the wire into
+ convert QObjects received from the wire into
function parameters, and uses the same
visitor functions to convert native C return
values to QObjects from transmission back
diff --git a/hw/pci-stub.c b/hw/pci-stub.c
index c5a0aa897..1fb105d51 100644
--- a/hw/pci-stub.c
+++ b/hw/pci-stub.c
@@ -1,5 +1,5 @@
/*
- * PCI stubs for plathome that doesn't support pci bus.
+ * PCI stubs for platforms that don't support pci bus.
*
* Copyright (c) 2010 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K.
diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
index a7b38340d..2191f6038 100644
--- a/libcacard/vscclient.c
+++ b/libcacard/vscclient.c
@@ -585,7 +585,7 @@ main(
printf(" recv APDU: ");
print_byte_array(pbSendBuffer, mhHeader.length);
}
- /* Transmit recieved APDU */
+ /* Transmit received APDU */
dwSendLength = mhHeader.length;
dwRecvLength = sizeof(pbRecvBuffer);
reader = vreader_get_reader_by_id(mhHeader.reader_id);
diff --git a/qemu-ga.c b/qemu-ga.c
index 858d75a36..49320133c 100644
--- a/qemu-ga.c
+++ b/qemu-ga.c
@@ -51,7 +51,7 @@ static struct GAState *ga_state;
static void quit_handler(int sig)
{
- g_debug("recieved signal num %d, quitting", sig);
+ g_debug("received signal num %d, quitting", sig);
if (g_main_loop_is_running(ga_state->main_loop)) {
g_main_loop_quit(ga_state->main_loop);