diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2013-07-29 09:03:23 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2013-07-29 09:03:23 +0200 |
| commit | 461bdb3414c40d6806194bf68c91521496b1042d (patch) | |
| tree | 8351478144c07306f24923791b1e4cd988770513 /migration-rdma.c | |
| parent | b6a9f4682e62c686995cc1a1fe2ef4a57a92020b (diff) | |
| parent | 6c86f405efd6532b58ad1b607cc9f11e856ef5ca (diff) | |
| download | focaccia-qemu-461bdb3414c40d6806194bf68c91521496b1042d.tar.gz focaccia-qemu-461bdb3414c40d6806194bf68c91521496b1042d.zip | |
Merge branch 'trivial-patches' of git://git.corpit.ru/qemu
* 'trivial-patches' of git://git.corpit.ru/qemu: target-mips: Remove assignment to a variable which is never used misc: Use g_assert_not_reached for code which is expected to be unreachable qemu-options: mention C-a h in the -nographic doc misc: Fix new typos in comments and strings linux-user: correct argument number for sys_mremap and sys_splice PPC: dbdma: macio: Fix format specifiers (build regression) watchdog: Remove break after exit exec: Remove env from list of poisoned names hw/9pfs: Fix potential memory leak and avoid reuse of freed memory timer: make timers_state static aes: Remove unused code (NDEBUG, u16)
Diffstat (limited to 'migration-rdma.c')
| -rw-r--r-- | migration-rdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/migration-rdma.c b/migration-rdma.c index d044830ed8..4828738560 100644 --- a/migration-rdma.c +++ b/migration-rdma.c @@ -2494,7 +2494,7 @@ static int qemu_rdma_close(void *opaque) * @size == 0 : * A 'hint' or 'advice' that means that we wish to speculatively * and asynchronously unregister this memory. In this case, there is no - * gaurantee that the unregister will actually happen, for example, + * guarantee that the unregister will actually happen, for example, * if the memory is being actively transmitted. Additionally, the memory * may be re-registered at any future time if a write within the same * chunk was requested again, even if you attempted to unregister it @@ -2570,7 +2570,7 @@ static size_t qemu_rdma_save_page(QEMUFile *f, void *opaque, qemu_rdma_signal_unregister(rdma, index, chunk, 0); /* - * TODO: Synchronous, gauranteed unregistration (should not occur during + * TODO: Synchronous, guaranteed unregistration (should not occur during * fast-path). Otherwise, unregisters will process on the next call to * qemu_rdma_drain_cq() if (size < 0) { |