Commit 18b1d3c9 authored by David Hildenbrand's avatar David Hildenbrand Committed by Michael S. Tsirkin
Browse files

migration/colo: Use ram_block_discard_disable() 



COLO will copy all memory in a RAM block, disable discarding of RAM.

Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Tested-by: default avatarLukas Straub <lukasstraub2@web.de>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Hailiang Zhang <zhang.zhanghailiang@huawei.com>
Cc: Juan Quintela <quintela@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20200626072248.78761-10-david@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 5f1f1902

include/migration/colo.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ void migrate_start_colo_process(MigrationState *s); 
bool migration_in_colo_state(void);



/* loadvm */

void migration_incoming_enable_colo(void);

int migration_incoming_enable_colo(void);

void migration_incoming_disable_colo(void);

bool migration_incoming_colo_enabled(void);

void *colo_process_incoming_thread(void *opaque);

migration/migration.c

+7 −1
Original line number Diff line number Diff line
@@ -338,12 +338,18 @@ bool migration_incoming_colo_enabled(void) 


void migration_incoming_disable_colo(void)

{

    ram_block_discard_disable(false);

    migration_colo_enabled = false;

}



void migration_incoming_enable_colo(void)

int migration_incoming_enable_colo(void)

{

    if (ram_block_discard_disable(true)) {

        error_report("COLO: cannot disable RAM discard");

        return -EBUSY;

    }

    migration_colo_enabled = true;

    return 0;

}



void migrate_add_address(SocketAddress *address)

migration/savevm.c

+9 −2
Original line number Diff line number Diff line
@@ -2111,8 +2111,15 @@ static int loadvm_handle_recv_bitmap(MigrationIncomingState *mis, 


static int loadvm_process_enable_colo(MigrationIncomingState *mis)

{

    migration_incoming_enable_colo();

    return colo_init_ram_cache();

    int ret = migration_incoming_enable_colo();



    if (!ret) {

        ret = colo_init_ram_cache();

        if (ret) {

            migration_incoming_disable_colo();

        }

    }

    return ret;

}



/*