>From 961c753702de3e4c2bb564fc97f144d72cfca886 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Thu, 1 Dec 2016 22:50:08 +0200
Subject: [PATCH] Fix minor typos

---
 daemon/stream.c                    | 2 +-
 docs/internals/command.html.in     | 2 +-
 src/qemu/qemu_domain_address.c     | 2 +-
 src/storage/storage_backend_disk.c | 4 ++--
 src/test/test_driver.c             | 2 +-
 src/util/virstring.c               | 2 +-
 src/vbox/vbox_tmpl.c               | 4 ++--
 tools/virsh-nodedev.c              | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/daemon/stream.c b/daemon/stream.c
index 533ecf7..11c0a46 100644
--- a/daemon/stream.c
+++ b/daemon/stream.c
@@ -719,7 +719,7 @@ daemonStreamHandleWrite(virNetServerClientPtr client,
  * worth of data, and then queues that for transmission
  * to the client.
  *
- * Returns 0 if data was queued for TX, or a error RPC
+ * Returns 0 if data was queued for TX, or an error RPC
  * was sent, or -1 on fatal error, indicating client should
  * be killed
  */
diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in
index c6131e3..2d8b093 100644
--- a/docs/internals/command.html.in
+++ b/docs/internals/command.html.in
@@ -122,7 +122,7 @@ virCommandAddArgFormat(cmd, "%d", count);
 </pre>
 
     <p>
-      To add a entire NULL terminated array of arguments in one go,
+      To add an entire NULL terminated array of arguments in one go,
       there are two options.
     </p>
 
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 3a292ba..be4ed23 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -2320,7 +2320,7 @@ qemuAssignMemoryDeviceSlot(virDomainMemoryDefPtr mem,
 
     if ((nextslot = virBitmapNextClearBit(slotmap, -1)) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("failed to find a emtpy memory slot"));
+                       _("failed to find an empty memory slot"));
         return -1;
     }
 
diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index 666ad03..97e5a8f 100644
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -653,7 +653,7 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr pool,
             return -1;
         }
         if (vol->target.format == VIR_STORAGE_VOL_DISK_EXTENDED) {
-            /* make sure we don't have a extended partition already */
+            /* make sure we don't have an extended partition already */
             for (i = 0; i < pool->volumes.count; i++) {
                 if (pool->volumes.objs[i]->source.partType ==
                     VIR_STORAGE_VOL_DISK_TYPE_EXTENDED) {
@@ -675,7 +675,7 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr pool,
                     return -1;
                 break;
             case VIR_STORAGE_VOL_DISK_TYPE_LOGICAL:
-                /* make sure we have a extended partition */
+                /* make sure we have an extended partition */
                 for (i = 0; i < pool->volumes.count; i++) {
                     if (pool->volumes.objs[i]->source.partType ==
                         VIR_STORAGE_VOL_DISK_TYPE_EXTENDED) {
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 9eff82c..5a82f8e 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2057,7 +2057,7 @@ testDomainSaveFlags(virDomainPtr domain, const char *path,
 
     /* Don't report failure in close or unlink, because
      * in either case we're already in a failure scenario
-     * and have reported a earlier error */
+     * and have reported an earlier error */
     if (ret != 0) {
         VIR_FORCE_CLOSE(fd);
         unlink(path);
diff --git a/src/util/virstring.c b/src/util/virstring.c
index 2ab252c..740cf4d 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -60,7 +60,7 @@ VIR_LOG_INIT("util.string");
  *
  * As a special case, the result of splitting the empty string "" is an empty
  * vector, not a vector containing a single string. The reason for this
- * special case is that being able to represent a empty vector is typically
+ * special case is that being able to represent an empty vector is typically
  * more useful than consistent handling of empty elements. If you do need
  * to represent empty elements, you'll need to check for the empty string
  * before calling virStringSplit().
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 38d01f4..67c9bf5 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -1793,7 +1793,7 @@ vboxConnectDomainEventRegister(virConnectPtr conn,
         vboxRet = 0;
     }
 
-    /* Get the vbox file handle and add a event handle to it
+    /* Get the vbox file handle and add an event handle to it
      * so that the events can be passed down to the user
      */
     if (vboxRet == 0) {
@@ -1900,7 +1900,7 @@ static int vboxConnectDomainEventRegisterAny(virConnectPtr conn,
         vboxRet = 0;
     }
 
-    /* Get the vbox file handle and add a event handle to it
+    /* Get the vbox file handle and add an event handle to it
      * so that the events can be passed down to the user
      */
     if (vboxRet == 0) {
diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index f76cade..9ede968 100644
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -818,7 +818,7 @@ vshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNUSED,
         if (virTimeStringNowRaw(timestamp) < 0)
             timestamp[0] = '\0';
 
-        vshPrint(data->ctl, _("%s: event '%s'' for node device %s\n"),
+        vshPrint(data->ctl, _("%s: event '%s' for node device %s\n"),
                  timestamp,
                  data->cb->name,
                  virNodeDeviceGetName(dev));
-- 
2.7.4

