summary refs log tree commit diff stats
path: root/include/migration/migration.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-02-23 16:14:17 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-02-23 16:14:17 +0000
commit1b1624092d1f1f746adea6e1237a07f6788c2e3d (patch)
tree3dab4aad5542d376ee78ecfb79c14df12d9a7123 /include/migration/migration.h
parent3174c64bb7140d847bec33b14d52821d0a8df04d (diff)
parentb82fc321bf02aaceea0beb4dfabb4ca86a9a5ff6 (diff)
downloadfocaccia-qemu-1b1624092d1f1f746adea6e1237a07f6788c2e3d.tar.gz
focaccia-qemu-1b1624092d1f1f746adea6e1237a07f6788c2e3d.zip
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20160223-1' into staging
spice: initial opengl/virgl support, postcopy migration fix.

# gpg: Signature made Tue 23 Feb 2016 12:30:40 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/spice/tags/pull-spice-20160223-1:
  Postcopy+spice: Pass spice migration data earlier
  spice/gl: tweak debug messages.
  spice/gl: add unblock timer
  spice: add opengl/virgl/dmabuf support
  spice: reset cursor on resize
  egl-helpers: add functions for render nodes and dma-buf passing
  configure: add dma-buf support detection.
  spice: init dcl before registering qxl interface

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/migration/migration.h')
-rw-r--r--include/migration/migration.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 65d47a9627..85b6026d10 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -158,6 +158,8 @@ struct MigrationState
 
     /* Flag set once the migration has been asked to enter postcopy */
     bool start_postcopy;
+    /* Flag set after postcopy has sent the device state */
+    bool postcopy_after_devices;
 
     /* Flag set once the migration thread is running (and needs joining) */
     bool migration_thread_running;
@@ -211,6 +213,8 @@ bool migration_has_finished(MigrationState *);
 bool migration_has_failed(MigrationState *);
 /* True if outgoing migration has entered postcopy phase */
 bool migration_in_postcopy(MigrationState *);
+/* ...and after the device transmission */
+bool migration_in_postcopy_after_devices(MigrationState *);
 MigrationState *migrate_get_current(void);
 
 void migrate_compress_threads_create(void);