summary refs log tree commit diff stats
path: root/qga/commands.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-05-19 09:27:28 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-05-19 09:27:28 +0100
commit8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3 (patch)
tree93a1691d7a5d90ddbb77a3210299089fcede4947 /qga/commands.c
parenta257c741491ff1c3c192d13a89c136dd6401c54d (diff)
parentcb8d4c8f54b8271f642f02382eec29d468bb1c77 (diff)
downloadfocaccia-qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.tar.gz
focaccia-qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.zip
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into staging
trivial patches for 2016-05-18

# gpg: Signature made Wed 18 May 2016 13:04:43 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"

* remotes/mjt/tags/pull-trivial-patches-2016-05-18:
  Fix some typos found by codespell
  9p: drop unused declaration from coth.h
  smbios: fix typo
  accel: make configure_accelerator return void
  configure: Use uniform description for devel packages
  ipack: Update e-mail address
  util: fix comment typos
  qdict: fix unbounded stack warning for qdict_array_entries
  Fix typo in variable name (found and fixed by codespell)
  vl: fix comment about when parsing cpu definitions
  loader: fix potential memory leak
  remove comment for nonexistent structure member
  s390: remove misleading comment

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to '')
-rw-r--r--qga/commands.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/qga/commands.c b/qga/commands.c
index b653a460b9..31444643e2 100644
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -182,8 +182,8 @@ GuestExecStatus *qmp_guest_exec_status(int64_t pid, Error **err)
          */
 #ifdef G_OS_WIN32
         /* Additionally WIN32 does not provide any additional information
-         * on whetherthe child exited or terminated via signal.
-         * We use this simple range check to distingish application exit code
+         * on whether the child exited or terminated via signal.
+         * We use this simple range check to distinguish application exit code
          * (usually value less then 256) and unhandled exception code with
          * ntstatus (always value greater then 0xC0000005). */
         if ((uint32_t)gei->status < 0xC0000000U) {