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

monitor: Move hmp_info_snapshots from savevm.c to hmp.c 



It only uses block/* functions, nothing from migration.

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

hmp.c

+143 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,149 @@ void hmp_delvm(Monitor *mon, const QDict *qdict) 
    }

}



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

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 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/sysemu/sysemu.h

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ void qemu_remove_machine_init_done_notifier(Notifier *notify); 


int save_vmstate(const char *name);

int load_vmstate(const char *name);

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



void qemu_announce_self(void);

migration/savevm.c

+0 −147
Original line number Diff line number Diff line
@@ -33,15 +33,12 @@ 
#include "hw/qdev.h"

#include "hw/xen/xen.h"

#include "net/net.h"

#include "monitor/monitor.h"

#include "sysemu/sysemu.h"

#include "qemu/timer.h"

#include "audio/audio.h"

#include "migration/migration.h"

#include "migration/postcopy-ram.h"

#include "qapi/qmp/qerror.h"

#include "qemu/error-report.h"

#include "qemu/sockets.h"

#include "qemu/queue.h"

#include "sysemu/cpus.h"

#include "exec/memory.h"
@@ -50,7 +47,6 @@ 
#include "qemu/bitops.h"

#include "qemu/iov.h"

#include "block/snapshot.h"

#include "block/qapi.h"

#include "qemu/cutils.h"

#include "io/channel-buffer.h"

#include "io/channel-file.h"
@@ -2304,149 +2300,6 @@ int load_vmstate(const char *name) 
    return 0;

}



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 vmstate_register_ram(MemoryRegion *mr, DeviceState *dev)

{

    qemu_ram_set_idstr(mr->ram_block,