diff options
| author | Ville Skyttä | 2018-06-12 08:51:50 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-07-13 11:16:04 +0200 |
| commit | 9277d81f5c2c6f4d0b5e47c8476eb7ee7e5c0beb (patch) | |
| tree | 40a083214c61e587010e8dbb9465808ec929b548 /docs/devel | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| download | qemu-9277d81f5c2c6f4d0b5e47c8476eb7ee7e5c0beb.tar.gz qemu-9277d81f5c2c6f4d0b5e47c8476eb7ee7e5c0beb.tar.xz qemu-9277d81f5c2c6f4d0b5e47c8476eb7ee7e5c0beb.zip | |
docs: Grammar and spelling fixes
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20180612065150.21110-1-ville.skytta@iki.fi
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs/devel')
| -rw-r--r-- | docs/devel/migration.rst | 2 | ||||
| -rw-r--r-- | docs/devel/multi-thread-tcg.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst index 40f136f6be..6ed3fce061 100644 --- a/docs/devel/migration.rst +++ b/docs/devel/migration.rst @@ -37,7 +37,7 @@ over any transport. - tcp migration: do the migration using tcp sockets - unix migration: do the migration using unix sockets - exec migration: do the migration using the stdin/stdout through a process. -- fd migration: do the migration using an file descriptor that is +- fd migration: do the migration using a file descriptor that is passed to QEMU. QEMU doesn't care how this file descriptor is opened. In addition, support is included for migration using RDMA, which diff --git a/docs/devel/multi-thread-tcg.txt b/docs/devel/multi-thread-tcg.txt index 06530be1e9..782bebc28b 100644 --- a/docs/devel/multi-thread-tcg.txt +++ b/docs/devel/multi-thread-tcg.txt @@ -316,7 +316,7 @@ other cores sharing access to the memory. The classic example is the x86 cmpxchg instruction. The second type offer a pair of load/store instructions which offer a -guarantee that an region of memory has not been touched between the +guarantee that a region of memory has not been touched between the load and store instructions. An example of this is ARM's ldrex/strex pair where the strex instruction will return a flag indicating a successful store only if no other CPU has accessed the memory region |