diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-22 15:42:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-22 15:42:23 +0100 |
| commit | 834b9273d5cdab68180dc8c84d641aaa4344b057 (patch) | |
| tree | c6be3eb86a2fa267d85f16122592b6e3c868fd98 /migration/rdma.c | |
| parent | 4dad0a9aa818698e0735c8352bf7925a1660df6f (diff) | |
| parent | 639b090df52a4952262615328a3fdfae81234ea8 (diff) | |
| download | focaccia-qemu-834b9273d5cdab68180dc8c84d641aaa4344b057.tar.gz focaccia-qemu-834b9273d5cdab68180dc8c84d641aaa4344b057.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging
Pull request trivial patches 20200919 # gpg: Signature made Sat 19 Sep 2020 19:43:35 BST # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-for-5.2-pull-request: contrib/: fix some comment spelling errors qapi/: fix some comment spelling errors disas/: fix some comment spelling errors linux-user/: fix some comment spelling errors util/: fix some comment spelling errors scripts/: fix some comment spelling errors docs/: fix some comment spelling errors migration/: fix some comment spelling errors qemu/: fix some comment spelling errors scripts/git.orderfile: Display meson files along with buildsys ones hw/timer/hpet: Fix debug format strings hw/timer/hpet: Remove unused functions hpet_ram_readb, hpet_ram_readw meson: remove empty else and duplicated gio deps manual: escape backslashes in "parsed-literal" blocks ui/spice-input: Remove superfluous forward declaration hw/ppc/ppc4xx_pci: Replace magic value by the PCI_NUM_PINS definition hw/gpio/max7310: Remove impossible check Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/rdma.c')
| -rw-r--r-- | migration/rdma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/migration/rdma.c b/migration/rdma.c index 6546509ebf..3bd30d46ad 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -1509,7 +1509,7 @@ static int qemu_rdma_wait_comp_channel(RDMAContext *rdma) } else { /* This is the source side, we're in a separate thread * or destination prior to migration_fd_process_incoming() - * after postcopy, the destination also in a seprate thread. + * after postcopy, the destination also in a separate thread. * we can't yield; so we have to poll the fd. * But we need to be able to handle 'cancel' or an error * without hanging forever. @@ -2266,7 +2266,7 @@ static inline int qemu_rdma_buffer_mergable(RDMAContext *rdma, * chunk, then start a new chunk and flush() the old chunk. * 3. To keep the hardware busy, we also group chunks into batches * and only require that a batch gets acknowledged in the completion - * qeueue instead of each individual chunk. + * queue instead of each individual chunk. */ static int qemu_rdma_write(QEMUFile *f, RDMAContext *rdma, uint64_t block_offset, uint64_t offset, @@ -3148,7 +3148,7 @@ static size_t qemu_rdma_save_page(QEMUFile *f, void *opaque, if (size > 0) { /* * Add this page to the current 'chunk'. If the chunk - * is full, or the page doen't belong to the current chunk, + * is full, or the page doesn't belong to the current chunk, * an actual RDMA write will occur and a new chunk will be formed. */ ret = qemu_rdma_write(f, rdma, block_offset, offset, size); @@ -4101,7 +4101,7 @@ void rdma_start_outgoing_migration(void *opaque, goto err; } - /* RDMA postcopy need a seprate queue pair for return path */ + /* RDMA postcopy need a separate queue pair for return path */ if (migrate_postcopy()) { rdma_return_path = qemu_rdma_data_init(host_port, errp); |