For not too old spice-migration, minor is 1.
For older (ancient) spice-migration, minor is 0.
Affects only VM migration while a spice client is connected.
---
client/red_client.cpp | 2 +-
spice1.proto | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/client/red_client.cpp b/client/red_client.cpp
index c632a21..bf0694a 100644
--- a/client/red_client.cpp
+++ b/client/red_client.cpp
@@ -255,7 +255,7 @@ void Migrate::start(const SpiceMsgMainMigrationBegin*
migrate)
{
DBG(0, "");
abort();
- if ((_client.get_peer_major() == 1) && (_client.get_peer_minor() < 2)) {
+ if ((_client.get_peer_major() == 1) && (_client.get_peer_minor() < 1)) {
LOG_INFO("server minor version incompatible for destination
authentication"
"(missing dest pubkey in SpiceMsgMainMigrationBegin)");
OldRedMigrationBegin* old_migrate = (OldRedMigrationBegin*)migrate;
diff --git a/spice1.proto b/spice1.proto
index ebb2d6f..fa2524b 100644
--- a/spice1.proto
+++ b/spice1.proto
@@ -168,11 +168,11 @@ channel MainChannel : BaseChannel {
uint16 sport;
uint32 host_offset @zero;
uint32 host_size;
- pubkey_type pub_key_type @minor(2);
- uint32 pub_key_offset @minor(2) @zero;
- uint32 pub_key_size @minor(2);
+ pubkey_type pub_key_type @minor(1);
+ uint32 pub_key_offset @minor(1) @zero;
+ uint32 pub_key_size @minor(1);
uint8 host_data[host_size] @as_ptr @zero_terminated;
- uint8 pub_key_data[pub_key_size] @minor(2) @as_ptr @zero_terminated;
+ uint8 pub_key_data[pub_key_size] @minor(1) @as_ptr @zero_terminated;
} @ctype(SpiceMsgMainMigrationBegin) migrate_begin = 101;
Empty migrate_cancel;
--
1.7.3.4
_______________________________________________
Spice-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/spice-devel
