summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYonit Halperin <yhalperi@redhat.com>2011-09-13 12:23:20 +0300
committerAlon Levy <alevy@redhat.com>2011-10-02 12:17:47 +0200
commitdbe61d9320c7a4c23b58ff012769b05ad20d0440 (patch)
treebd3532ef2046bf38f05fc33fffb09b99cbe9e12f
parentb1f84f219f52bf2458b99201719d2a88f877d1a6 (diff)
Release 0.9.10.9.1
Cherry-pick of abfdf4d8abf95d003678af5df814f3b1be1fd092 (Release 0.8.2) semi-seamless migration RHBZ 738262 Conflicts: NEWS configure.ac
-rw-r--r--NEWS4
-rw-r--r--configure.ac2
-rw-r--r--spice/enums.h2
-rw-r--r--spice/protocol.h6
4 files changed, 12 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index e1e797c..2378b2c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Major changes in 0.9.1 (same as 0.8.2 in 0.8 branch)
+======================
+* Add support for semi-seamless migration
+
Major changes in 0.9.0
======================
* Add support for generic spicevmc chardev passthrough messages
diff --git a/configure.ac b/configure.ac
index e8ae79b..0388120 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.57])
m4_define([SPICE_MAJOR], 0)
m4_define([SPICE_MINOR], 9)
-m4_define([SPICE_MICRO], 0)
+m4_define([SPICE_MICRO], 1)
AC_INIT(spice-protocol, [SPICE_MAJOR.SPICE_MINOR.SPICE_MICRO], [], spice-protocol)
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 */