Commit c2355ad4 authored by Juan Quintela's avatar Juan Quintela
Browse files

migration: loadvm handlers are not used 



So we remove all traces of them.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 0f42f657

include/migration/migration.h

+0 −5
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ enum mig_rp_message_type { 
    MIG_RP_MSG_MAX

};



typedef QLIST_HEAD(, LoadStateEntry) LoadStateEntry_Head;



/* State for the incoming migration */

struct MigrationIncomingState {

    QEMUFile *from_src_file;
@@ -89,9 +87,6 @@ struct MigrationIncomingState { 
    /* The coroutine we should enter (back) after failover */

    Coroutine *migration_incoming_co;

    QemuSemaphore colo_incoming_sem;



    /* See savevm.c */

    LoadStateEntry_Head loadvm_handlers;

};



MigrationIncomingState *migration_incoming_get_current(void);

include/migration/vmstate.h

+0 −2
Original line number Diff line number Diff line
@@ -1020,8 +1020,6 @@ extern const VMStateInfo vmstate_info_qtailq; 


#define SELF_ANNOUNCE_ROUNDS 5



void loadvm_free_handlers(MigrationIncomingState *mis);



int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,

                       void *opaque, int version_id);

void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,

include/qemu/typedefs.h

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ typedef struct I2SCodec I2SCodec; 
typedef struct ISABus ISABus;

typedef struct ISADevice ISADevice;

typedef struct IsaDma IsaDma;

typedef struct LoadStateEntry LoadStateEntry;

typedef struct MACAddr MACAddr;

typedef struct MachineClass MachineClass;

typedef struct MachineState MachineState;

migration/migration.c

+0 −2
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ MigrationIncomingState *migration_incoming_get_current(void) 
    if (!once) {

        mis_current.state = MIGRATION_STATUS_NONE;

        memset(&mis_current, 0, sizeof(MigrationIncomingState));

        QLIST_INIT(&mis_current.loadvm_handlers);

        qemu_mutex_init(&mis_current.rp_mutex);

        qemu_event_init(&mis_current.main_thread_load_event, false);

        once = true;
@@ -135,7 +134,6 @@ void migration_incoming_state_destroy(void) 
    struct MigrationIncomingState *mis = migration_incoming_get_current();



    qemu_event_destroy(&mis->main_thread_load_event);

    loadvm_free_handlers(mis);

}

migration/savevm.c

+0 −26
Original line number Diff line number Diff line
@@ -1804,13 +1804,6 @@ static int loadvm_process_command(QEMUFile *f) 
    return 0;

}



struct LoadStateEntry {

    QLIST_ENTRY(LoadStateEntry) entry;

    SaveStateEntry *se;

    int section_id;

    int version_id;

};



/*

 * Read a footer off the wire and check that it matches the expected section

 *
@@ -1846,22 +1839,11 @@ static bool check_section_footer(QEMUFile *f, SaveStateEntry *se) 
    return true;

}



void loadvm_free_handlers(MigrationIncomingState *mis)

{

    LoadStateEntry *le, *new_le;



    QLIST_FOREACH_SAFE(le, &mis->loadvm_handlers, entry, new_le) {

        QLIST_REMOVE(le, entry);

        g_free(le);

    }

}



static int

qemu_loadvm_section_start_full(QEMUFile *f, MigrationIncomingState *mis)

{

    uint32_t instance_id, version_id, section_id;

    SaveStateEntry *se;

    LoadStateEntry *le;

    char idstr[256];

    int ret;
@@ -1900,14 +1882,6 @@ qemu_loadvm_section_start_full(QEMUFile *f, MigrationIncomingState *mis) 
        return -EINVAL;

    }



    /* Add entry */

    le = g_malloc0(sizeof(*le));



    le->se = se;

    le->section_id = section_id;

    le->version_id = version_id;

    QLIST_INSERT_HEAD(&mis->loadvm_handlers, le, entry);



    ret = vmstate_load(f, se, se->load_version_id);

    if (ret < 0) {

        error_report("error while loading state for instance 0x%x of"