spice-client migration: fix minor for old migration support.

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.
This commit is contained in:
Uri Lublin 2011-01-09 10:17:49 +02:00 committed by Alon Levy
parent 42f83d18b5
commit ed9b8ae69f
2 changed files with 5 additions and 5 deletions

View File

@ -259,7 +259,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;

View File

@ -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;