diff options
author | Yonit Halperin <yhalperi@redhat.com> | 2011-09-13 12:23:20 +0300 |
---|---|---|
committer | Alon Levy <alevy@redhat.com> | 2011-10-02 12:17:47 +0200 |
commit | dbe61d9320c7a4c23b58ff012769b05ad20d0440 (patch) | |
tree | bd3532ef2046bf38f05fc33fffb09b99cbe9e12f /spice | |
parent | b1f84f219f52bf2458b99201719d2a88f877d1a6 (diff) | |
download | spice-protocol-dbe61d9320c7a4c23b58ff012769b05ad20d0440.tar.gz spice-protocol-dbe61d9320c7a4c23b58ff012769b05ad20d0440.tar.xz spice-protocol-dbe61d9320c7a4c23b58ff012769b05ad20d0440.zip |
Release 0.9.10.9.1
Cherry-pick of abfdf4d8abf95d003678af5df814f3b1be1fd092 (Release 0.8.2)
semi-seamless migration RHBZ 738262
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'spice')
-rw-r--r-- | spice/enums.h | 2 | ||||
-rw-r--r-- | spice/protocol.h | 6 |
2 files changed, 7 insertions, 1 deletions
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 */ |