From dbe61d9320c7a4c23b58ff012769b05ad20d0440 Mon Sep 17 00:00:00 2001
From: Yonit Halperin <yhalperi@redhat.com>
Date: Tue, 13 Sep 2011 12:23:20 +0300
Subject: Release 0.9.1

Cherry-pick of abfdf4d8abf95d003678af5df814f3b1be1fd092 (Release 0.8.2)

semi-seamless migration RHBZ 738262

Conflicts:

	NEWS
	configure.ac
---
 spice/enums.h    | 2 ++
 spice/protocol.h | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'spice')

diff --git a/spice/enums.h b/spice/enums.h
index 8d68b36..a587b00 100644
--- a/spice/enums.h
+++ b/spice/enums.h
@@ -367,6 +367,7 @@ enum {
     SPICE_MSG_MAIN_AGENT_DATA,
     SPICE_MSG_MAIN_AGENT_TOKEN,
     SPICE_MSG_MAIN_MIGRATE_SWITCH_HOST,
+    SPICE_MSG_MAIN_MIGRATE_END,
 
     SPICE_MSG_END_MAIN
 };
@@ -380,6 +381,7 @@ enum {
     SPICE_MSGC_MAIN_AGENT_START,
     SPICE_MSGC_MAIN_AGENT_DATA,
     SPICE_MSGC_MAIN_AGENT_TOKEN,
+    SPICE_MSGC_MAIN_MIGRATE_END,
 
     SPICE_MSGC_END_MAIN
 };
diff --git a/spice/protocol.h b/spice/protocol.h
index 40027be..ddfe84b 100644
--- a/spice/protocol.h
+++ b/spice/protocol.h
@@ -37,7 +37,7 @@
 
 #define SPICE_MAGIC (*(uint32_t*)"REDQ")
 #define SPICE_VERSION_MAJOR 2
-#define SPICE_VERSION_MINOR 0
+#define SPICE_VERSION_MINOR 1
 
 // Encryption & Ticketing Parameters
 #define SPICE_MAX_PASSWORD_LENGTH 60
@@ -111,6 +111,10 @@ enum {
     SPICE_RECORD_CAP_VOLUME,
 };
 
+enum {
+    SPICE_MAIN_CAP_SEMI_SEAMLESS_MIGRATE,
+};
+
 #include <spice/end-packed.h>
 
 #endif /* _H_SPICE_PROTOCOL */
-- 
cgit