From 45bc74375b60db2e82849a186f89af8d1dd05e53 Mon Sep 17 00:00:00 2001
From: klemens <address@hidden>
Date: Sun, 25 Dec 2016 21:52:46 +0100
Subject: [PATCH 2/2] spelling fixes, might have an side-effect ( print() .. )

---
 scripts/tracetool/__init__.py     | 2 +-
 target/ppc/translate_init.c       | 2 +-
 tests/docker/docker.py            | 4 ++--
 tests/guest-debug/test-gdbstub.py | 2 +-
 tests/vhost-user-bridge.c         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 365446f..f7d139f 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -35,7 +35,7 @@ def error(*lines):
 def out(*lines, **kwargs):
     """Write a set of output lines.
 
-    You can use kwargs as a shorthand for mapping variables when formating all
+    You can use kwargs as a shorthand for mapping variables when formatting all
     the strings in lines.
     """
     lines = [ l % kwargs for l in lines ]
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
index 626e031..cd3ba19 100644
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@ -9861,7 +9861,7 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp)
 #if !defined(CONFIG_USER_ONLY)
         if (env->tlb.tlb6) {
             printf("                       %d %s TLB in %d ways\n",
-                   env->nb_tlb, env->id_tlbs ? "splitted" : "merged",
+                   env->nb_tlb, env->id_tlbs ? "split" : "merged",
                    env->nb_ways);
         }
 #endif
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 37d8319..61b9504 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -83,7 +83,7 @@ def _get_so_libs(executable):
     return libs
 
 def _copy_binary_with_libs(src, dest_dir):
-    """Copy a binary executable and all its dependant libraries.
+    """Copy a binary executable and all its dependent libraries.
 
     This does rely on the host file-system being fairly multi-arch
     aware so the file don't clash with the guests layout."""
@@ -196,7 +196,7 @@ class SubCommand(object):
     name = None # Subcommand name
     def shared_args(self, parser):
         parser.add_argument("--quiet", action="store_true",
-                            help="Run quietly unless an error occured")
+                            help="Run quietly unless an error occurred")
 
     def args(self, parser):
         """Setup argument parser"""
diff --git a/tests/guest-debug/test-gdbstub.py b/tests/guest-debug/test-gdbstub.py
index 31ba6c9..88463f7 100644
--- a/tests/guest-debug/test-gdbstub.py
+++ b/tests/guest-debug/test-gdbstub.py
@@ -121,7 +121,7 @@ class CatchBreakpoint(gdb.Breakpoint):
 
 
 def run_test():
-    "Run throught the tests one by one"
+    "Run through the tests one by one"
 
     print ("Checking we can step the first few instructions")
     step_ok = 0
diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c
index 775e031..ebc4384 100644
--- a/tests/vhost-user-bridge.c
+++ b/tests/vhost-user-bridge.c
@@ -1426,7 +1426,7 @@ main(int argc, char *argv[])
 out:
     fprintf(stderr, "Usage: %s ", argv[0]);
     fprintf(stderr, "[-c] [-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]\n");
-    fprintf(stderr, "\t-u path to unix doman socket. default: %s\n",
+    fprintf(stderr, "\t-u path to unix domain socket. default: %s\n",
             DEFAULT_UD_SOCKET);
     fprintf(stderr, "\t-l local host and port. default: %s:%s\n",
             DEFAULT_LHOST, DEFAULT_LPORT);
-- 
2.1.4