Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20170301-1' into staging

[qemu.git] / migration / postcopy-ram.c

diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 102fb61485e9a46e7de93bec9c51c95e33aa1dd7..effbeb64fb4e658585db984ebe9e2975eaf8349c 100644 (file)
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -378,6 +378,10 @@ static int ram_block_enable_notify(const char *block_name, void *host_addr,
         error_report("%s userfault register: %s", __func__, strerror(errno));
         return -1;
     }
+    if (!(reg_struct.ioctls & ((__u64)1 << _UFFDIO_COPY))) {
+        error_report("%s userfault: Region doesn't support COPY", __func__);
+        return -1;
+    }
 
     return 0;
 }