Introduce do_snapshot_blkdev() and monitor command to handle it.
The monitor command is: snapshot_blkdev <device> [snapshot-file] [format] Default format is qcow2. For now snapshots without a snapshot-file, eg internal snapshots, are not supported. Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
f88e1a4201
commit
f88825680a
62
blockdev.c
62
blockdev.c
|
@ -516,6 +516,68 @@ void do_commit(Monitor *mon, const QDict *qdict)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int do_snapshot_blkdev(Monitor *mon, const QDict *qdict, QObject **ret_data)
|
||||||
|
{
|
||||||
|
const char *device = qdict_get_str(qdict, "device");
|
||||||
|
const char *filename = qdict_get_try_str(qdict, "snapshot_file");
|
||||||
|
const char *format = qdict_get_try_str(qdict, "format");
|
||||||
|
BlockDriverState *bs;
|
||||||
|
BlockDriver *drv, *proto_drv;
|
||||||
|
int ret = 0;
|
||||||
|
int flags;
|
||||||
|
|
||||||
|
bs = bdrv_find(device);
|
||||||
|
if (!bs) {
|
||||||
|
qerror_report(QERR_DEVICE_NOT_FOUND, device);
|
||||||
|
ret = -1;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!format) {
|
||||||
|
format = "qcow2";
|
||||||
|
}
|
||||||
|
|
||||||
|
drv = bdrv_find_format(format);
|
||||||
|
if (!drv) {
|
||||||
|
qerror_report(QERR_INVALID_BLOCK_FORMAT, format);
|
||||||
|
ret = -1;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
proto_drv = bdrv_find_protocol(filename);
|
||||||
|
if (!proto_drv) {
|
||||||
|
qerror_report(QERR_INVALID_BLOCK_FORMAT, format);
|
||||||
|
ret = -1;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = bdrv_img_create(filename, format, bs->filename,
|
||||||
|
bs->drv->format_name, NULL, -1, bs->open_flags);
|
||||||
|
if (ret) {
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
qemu_aio_flush();
|
||||||
|
bdrv_flush(bs);
|
||||||
|
|
||||||
|
flags = bs->open_flags;
|
||||||
|
bdrv_close(bs);
|
||||||
|
ret = bdrv_open(bs, filename, flags, drv);
|
||||||
|
/*
|
||||||
|
* If reopening the image file we just created fails, we really
|
||||||
|
* are in trouble :(
|
||||||
|
*/
|
||||||
|
if (ret != 0) {
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
out:
|
||||||
|
if (ret) {
|
||||||
|
ret = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static int eject_device(Monitor *mon, BlockDriverState *bs, int force)
|
static int eject_device(Monitor *mon, BlockDriverState *bs, int force)
|
||||||
{
|
{
|
||||||
if (!force) {
|
if (!force) {
|
||||||
|
|
|
@ -52,5 +52,6 @@ int do_block_set_passwd(Monitor *mon, const QDict *qdict, QObject **ret_data);
|
||||||
int do_change_block(Monitor *mon, const char *device,
|
int do_change_block(Monitor *mon, const char *device,
|
||||||
const char *filename, const char *fmt);
|
const char *filename, const char *fmt);
|
||||||
int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
|
int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
|
||||||
|
int do_snapshot_blkdev(Monitor *mon, const QDict *qdict, QObject **ret_data);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -799,6 +799,25 @@ STEXI
|
||||||
@item migrate_set_downtime @var{second}
|
@item migrate_set_downtime @var{second}
|
||||||
@findex migrate_set_downtime
|
@findex migrate_set_downtime
|
||||||
Set maximum tolerated downtime (in seconds) for migration.
|
Set maximum tolerated downtime (in seconds) for migration.
|
||||||
|
ETEXI
|
||||||
|
|
||||||
|
{
|
||||||
|
.name = "snapshot_blkdev",
|
||||||
|
.args_type = "device:s,snapshot_file:s?,format:s?",
|
||||||
|
.params = "device [new-image-file] [format]",
|
||||||
|
.help = "initiates a live snapshot\n\t\t\t"
|
||||||
|
"of device. If a new image file is specified, the\n\t\t\t"
|
||||||
|
"new image file will become the new root image.\n\t\t\t"
|
||||||
|
"If format is specified, the snapshot file will\n\t\t\t"
|
||||||
|
"be created in that format. Otherwise the\n\t\t\t"
|
||||||
|
"snapshot will be internal! (currently unsupported)",
|
||||||
|
.mhandler.cmd_new = do_snapshot_blkdev,
|
||||||
|
},
|
||||||
|
|
||||||
|
STEXI
|
||||||
|
@item snapshot_blkdev
|
||||||
|
@findex snapshot_blkdev
|
||||||
|
Snapshot device, using snapshot file as target if provided
|
||||||
ETEXI
|
ETEXI
|
||||||
|
|
||||||
#if defined(TARGET_I386)
|
#if defined(TARGET_I386)
|
||||||
|
|
Reference in New Issue