diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-26 22:31:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-26 22:31:10 +0000 |
| commit | 6f6831f61a44fde832ee6fab0cc5632de34cf6b7 (patch) | |
| tree | 47e59106156748bef6ef87537ad230ae7bec6044 /migration-rdma.c | |
| parent | bc3fbad816961a5b4a7f51a37472c4ac01effb92 (diff) | |
| parent | 41310c68781d742fa9bbfd5fcb1df9b7f23f5759 (diff) | |
| download | hqemu-6f6831f61a44fde832ee6fab0cc5632de34cf6b7.zip hqemu-6f6831f61a44fde832ee6fab0cc5632de34cf6b7.tar.gz | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140225' into staging
migration/next for 20140225
# gpg: Signature made Tue 25 Feb 2014 14:04:31 GMT using RSA key ID 5872D723
# gpg: Can't check signature: public key not found
* remotes/juanquintela/tags/migration/20140225:
rdma: rename 'x-rdma' => 'rdma'
Fix two XBZRLE corruption issues
Fix vmstate_info_int32_le comparison/assign
qemu_file: use fwrite() correctly
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration-rdma.c')
| -rw-r--r-- | migration-rdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/migration-rdma.c b/migration-rdma.c index f94f3b4..eeb4302 100644 --- a/migration-rdma.c +++ b/migration-rdma.c @@ -3412,7 +3412,7 @@ void rdma_start_outgoing_migration(void *opaque, } ret = qemu_rdma_source_init(rdma, &local_err, - s->enabled_capabilities[MIGRATION_CAPABILITY_X_RDMA_PIN_ALL]); + s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL]); if (ret) { goto err; |
