Commit 4aee86c6 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'quintela/tags/migration/20170504' into staging 



migration/next for 20170504

# gpg: Signature made Thu 04 May 2017 10:35:41 AM BST
# gpg:                using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg:                 aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* quintela/tags/migration/20170504:
  migration: Extra tracing
  migration: Move postcopy-ram.h to migration/
  monitor: Move hmp_info_snapshots from savevm.c to hmp.c
  monitor: Move hmp_delvm from savevm.c to hmp.c
  monitor: Move hmp_savevm from savevm.c to hmp.c
  monitor: Move hmp_loadvm from monitor.c to hmp.c
  monitor: Remove monitor parameter from save_vmstate
  migration: to_dst_file at that point is NULL
  migration: setup bi-directional I/O channel for exec: protocol
  ram: Split dirty bitmap by RAMBlock

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents bc56fd3a 1db9d8e5

hmp.c

+174 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "net/eth.h"

#include "sysemu/char.h"

#include "sysemu/block-backend.h"

#include "sysemu/sysemu.h"

#include "qemu/config-file.h"

#include "qemu/option.h"

#include "qemu/timer.h"
@@ -1268,6 +1269,179 @@ void hmp_snapshot_delete_blkdev_internal(Monitor *mon, const QDict *qdict) 
    hmp_handle_error(mon, &err);

}



void hmp_loadvm(Monitor *mon, const QDict *qdict)

{

    int saved_vm_running  = runstate_is_running();

    const char *name = qdict_get_str(qdict, "name");



    vm_stop(RUN_STATE_RESTORE_VM);



    if (load_vmstate(name) == 0 && saved_vm_running) {

        vm_start();

    }

}



void hmp_savevm(Monitor *mon, const QDict *qdict)

{

    save_vmstate(qdict_get_try_str(qdict, "name"));

}



void hmp_delvm(Monitor *mon, const QDict *qdict)

{

    BlockDriverState *bs;

    Error *err;

    const char *name = qdict_get_str(qdict, "name");



    if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) {

        error_reportf_err(err,

                          "Error while deleting snapshot on device '%s': ",

                          bdrv_get_device_name(bs));

    }

}



void hmp_info_snapshots(Monitor *mon, const QDict *qdict)

{

    BlockDriverState *bs, *bs1;

    BdrvNextIterator it1;

    QEMUSnapshotInfo *sn_tab, *sn;

    bool no_snapshot = true;

    int nb_sns, i;

    int total;

    int *global_snapshots;

    AioContext *aio_context;



    typedef struct SnapshotEntry {

        QEMUSnapshotInfo sn;

        QTAILQ_ENTRY(SnapshotEntry) next;

    } SnapshotEntry;



    typedef struct ImageEntry {

        const char *imagename;

        QTAILQ_ENTRY(ImageEntry) next;

        QTAILQ_HEAD(, SnapshotEntry) snapshots;

    } ImageEntry;



    QTAILQ_HEAD(, ImageEntry) image_list =

        QTAILQ_HEAD_INITIALIZER(image_list);



    ImageEntry *image_entry, *next_ie;

    SnapshotEntry *snapshot_entry;



    bs = bdrv_all_find_vmstate_bs();

    if (!bs) {

        monitor_printf(mon, "No available block device supports snapshots\n");

        return;

    }

    aio_context = bdrv_get_aio_context(bs);



    aio_context_acquire(aio_context);

    nb_sns = bdrv_snapshot_list(bs, &sn_tab);

    aio_context_release(aio_context);



    if (nb_sns < 0) {

        monitor_printf(mon, "bdrv_snapshot_list: error %d\n", nb_sns);

        return;

    }



    for (bs1 = bdrv_first(&it1); bs1; bs1 = bdrv_next(&it1)) {

        int bs1_nb_sns = 0;

        ImageEntry *ie;

        SnapshotEntry *se;

        AioContext *ctx = bdrv_get_aio_context(bs1);



        aio_context_acquire(ctx);

        if (bdrv_can_snapshot(bs1)) {

            sn = NULL;

            bs1_nb_sns = bdrv_snapshot_list(bs1, &sn);

            if (bs1_nb_sns > 0) {

                no_snapshot = false;

                ie = g_new0(ImageEntry, 1);

                ie->imagename = bdrv_get_device_name(bs1);

                QTAILQ_INIT(&ie->snapshots);

                QTAILQ_INSERT_TAIL(&image_list, ie, next);

                for (i = 0; i < bs1_nb_sns; i++) {

                    se = g_new0(SnapshotEntry, 1);

                    se->sn = sn[i];

                    QTAILQ_INSERT_TAIL(&ie->snapshots, se, next);

                }

            }

            g_free(sn);

        }

        aio_context_release(ctx);

    }



    if (no_snapshot) {

        monitor_printf(mon, "There is no snapshot available.\n");

        return;

    }



    global_snapshots = g_new0(int, nb_sns);

    total = 0;

    for (i = 0; i < nb_sns; i++) {

        SnapshotEntry *next_sn;

        if (bdrv_all_find_snapshot(sn_tab[i].name, &bs1) == 0) {

            global_snapshots[total] = i;

            total++;

            QTAILQ_FOREACH(image_entry, &image_list, next) {

                QTAILQ_FOREACH_SAFE(snapshot_entry, &image_entry->snapshots,

                                    next, next_sn) {

                    if (!strcmp(sn_tab[i].name, snapshot_entry->sn.name)) {

                        QTAILQ_REMOVE(&image_entry->snapshots, snapshot_entry,

                                      next);

                        g_free(snapshot_entry);

                    }

                }

            }

        }

    }



    monitor_printf(mon, "List of snapshots present on all disks:\n");



    if (total > 0) {

        bdrv_snapshot_dump((fprintf_function)monitor_printf, mon, NULL);

        monitor_printf(mon, "\n");

        for (i = 0; i < total; i++) {

            sn = &sn_tab[global_snapshots[i]];

            /* The ID is not guaranteed to be the same on all images, so

             * overwrite it.

             */

            pstrcpy(sn->id_str, sizeof(sn->id_str), "--");

            bdrv_snapshot_dump((fprintf_function)monitor_printf, mon, sn);

            monitor_printf(mon, "\n");

        }

    } else {

        monitor_printf(mon, "None\n");

    }



    QTAILQ_FOREACH(image_entry, &image_list, next) {

        if (QTAILQ_EMPTY(&image_entry->snapshots)) {

            continue;

        }

        monitor_printf(mon,

                       "\nList of partial (non-loadable) snapshots on '%s':\n",

                       image_entry->imagename);

        bdrv_snapshot_dump((fprintf_function)monitor_printf, mon, NULL);

        monitor_printf(mon, "\n");

        QTAILQ_FOREACH(snapshot_entry, &image_entry->snapshots, next) {

            bdrv_snapshot_dump((fprintf_function)monitor_printf, mon,

                               &snapshot_entry->sn);

            monitor_printf(mon, "\n");

        }

    }



    QTAILQ_FOREACH_SAFE(image_entry, &image_list, next, next_ie) {

        SnapshotEntry *next_sn;

        QTAILQ_FOREACH_SAFE(snapshot_entry, &image_entry->snapshots, next,

                            next_sn) {

            g_free(snapshot_entry);

        }

        g_free(image_entry);

    }

    g_free(sn_tab);

    g_free(global_snapshots);



}



void hmp_migrate_cancel(Monitor *mon, const QDict *qdict)

{

    qmp_migrate_cancel(NULL);

hmp.h

+4 −0
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ void hmp_snapshot_blkdev_internal(Monitor *mon, const QDict *qdict); 
void hmp_snapshot_delete_blkdev_internal(Monitor *mon, const QDict *qdict);

void hmp_drive_mirror(Monitor *mon, const QDict *qdict);

void hmp_drive_backup(Monitor *mon, const QDict *qdict);

void hmp_loadvm(Monitor *mon, const QDict *qdict);

void hmp_savevm(Monitor *mon, const QDict *qdict);

void hmp_delvm(Monitor *mon, const QDict *qdict);

void hmp_info_snapshots(Monitor *mon, const QDict *qdict);

void hmp_migrate_cancel(Monitor *mon, const QDict *qdict);

void hmp_migrate_incoming(Monitor *mon, const QDict *qdict);

void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict);

include/exec/ram_addr.h

+10 −3
Original line number Diff line number Diff line
@@ -39,6 +39,14 @@ struct RAMBlock { 
    QLIST_HEAD(, RAMBlockNotifier) ramblock_notifiers;

    int fd;

    size_t page_size;

    /* dirty bitmap used during migration */

    unsigned long *bmap;

    /* bitmap of pages that haven't been sent even once

     * only maintained and used in postcopy at the moment

     * where it's used to send the dirtymap at the start

     * of the postcopy phase

     */

    unsigned long *unsentmap;

};



static inline bool offset_in_ramblock(RAMBlock *b, ram_addr_t offset)
@@ -360,16 +368,15 @@ static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start, 




static inline

uint64_t cpu_physical_memory_sync_dirty_bitmap(unsigned long *dest,

                                               RAMBlock *rb,

uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb,

                                               ram_addr_t start,

                                               ram_addr_t length,

                                               uint64_t *real_dirty_pages)

{

    ram_addr_t addr;

    start = rb->offset + start;

    unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS);

    uint64_t num_dirty = 0;

    unsigned long *dest = rb->bmap;



    /* start address is aligned at the start of a word? */

    if (((page * BITS_PER_LONG) << TARGET_PAGE_BITS) == start) {

include/migration/migration.h

+2 −1
Original line number Diff line number Diff line
@@ -266,7 +266,8 @@ uint64_t xbzrle_mig_pages_cache_miss(void); 
double xbzrle_mig_cache_miss_rate(void);



void ram_handle_compressed(void *host, uint8_t ch, uint64_t size);

void ram_debug_dump_bitmap(unsigned long *todump, bool expected);

void ram_debug_dump_bitmap(unsigned long *todump, bool expected,

                           unsigned long pages);

/* For outgoing discard bitmap */

int ram_postcopy_send_discard_bitmap(MigrationState *ms);

/* For incoming postcopy discard */

include/sysemu/sysemu.h

+1 −4
Original line number Diff line number Diff line
@@ -75,11 +75,8 @@ void qemu_remove_exit_notifier(Notifier *notify); 
void qemu_add_machine_init_done_notifier(Notifier *notify);

void qemu_remove_machine_init_done_notifier(Notifier *notify);



void hmp_savevm(Monitor *mon, const QDict *qdict);

int save_vmstate(Monitor *mon, const char *name);

int save_vmstate(const char *name);

int load_vmstate(const char *name);

void hmp_delvm(Monitor *mon, const QDict *qdict);

void hmp_info_snapshots(Monitor *mon, const QDict *qdict);



void qemu_announce_self(void);