diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-15 15:45:33 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-15 15:45:33 +0000 |
| commit | f003d07337a6d4d02c43429b26a4270459afb51a (patch) | |
| tree | 6caf67e3cd097fabea32e1a66c635d9df2040e11 /util | |
| parent | 8c5e7bddc22dac9d4dc3526996babce4c7242d9d (diff) | |
| parent | d2f668b74907cbd96d9df0774971768ed06de2f0 (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
v2:
* Dropped Fam's git-publish series because there is still ongoing discussion
# gpg: Signature made Thu 15 Feb 2018 09:42:03 GMT
# gpg: using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
misc: fix spelling
ratelimit: don't align wait time with slices
vl: pause vcpus before stopping iothreads
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/qemu-coroutine-lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c index 78fb79acf8..5a80c10690 100644 --- a/util/qemu-coroutine-lock.c +++ b/util/qemu-coroutine-lock.c @@ -89,7 +89,7 @@ void qemu_co_queue_run_restart(Coroutine *co) * invalid memory. Therefore, use a temporary queue and do not touch * the "co" coroutine as soon as you enter another one. * - * In its turn resumed "co" can pupulate "co_queue_wakeup" queue with + * In its turn resumed "co" can populate "co_queue_wakeup" queue with * new coroutines to be woken up. The caller, who has resumed "co", * will be responsible for traversing the same queue, which may cause * a different wakeup order but not any missing wakeups. |