Commit 18269069 authored by Yury Kotov's avatar Yury Kotov Committed by Dr. David Alan Gilbert
Browse files

migration: Introduce ignore-shared capability 



We want to use local migration to update QEMU for running guests.
In this case we don't need to migrate shared (file backed) RAM.
So, add a capability to ignore such blocks during live migration.

Signed-off-by: default avatarYury Kotov <yury-kotov@yandex-team.ru>
Message-Id: <20190215174548.2630-3-yury-kotov@yandex-team.ru>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 754cb9c0

migration/migration.c

+14 −0
Original line number Diff line number Diff line
@@ -995,6 +995,11 @@ static bool migrate_caps_check(bool *cap_list, 
            error_setg(errp, "Postcopy is not supported");

            return false;

        }



        if (cap_list[MIGRATION_CAPABILITY_X_IGNORE_SHARED]) {

            error_setg(errp, "Postcopy is not compatible with ignore-shared");

            return false;

        }

    }



    return true;
@@ -2074,6 +2079,15 @@ bool migrate_dirty_bitmaps(void) 
    return s->enabled_capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS];

}



bool migrate_ignore_shared(void)

{

    MigrationState *s;



    s = migrate_get_current();



    return s->enabled_capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED];

}



bool migrate_use_events(void)

{

    MigrationState *s;

migration/migration.h

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ bool migrate_release_ram(void); 
bool migrate_postcopy_ram(void);

bool migrate_zero_blocks(void);

bool migrate_dirty_bitmaps(void);

bool migrate_ignore_shared(void);



bool migrate_auto_converge(void);

bool migrate_use_multifd(void);

qapi/migration.json

+4 −1
Original line number Diff line number Diff line
@@ -409,13 +409,16 @@ 
#           devices (and thus take locks) immediately at the end of migration.

#           (since 3.0)

#

# @x-ignore-shared: If enabled, QEMU will not migrate shared memory (since 4.0)

#

# Since: 1.2

##

{ 'enum': 'MigrationCapability',

  'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks',

           'compress', 'events', 'postcopy-ram', 'x-colo', 'release-ram',

           'block', 'return-path', 'pause-before-switchover', 'x-multifd',

           'dirty-bitmaps', 'postcopy-blocktime', 'late-block-activate' ] }

           'dirty-bitmaps', 'postcopy-blocktime', 'late-block-activate',

           'x-ignore-shared' ] }



##

# @MigrationCapabilityStatus: