[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/10] monitor: Move hmp_delvm from savevm.c to hmp.c
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 07/10] monitor: Move hmp_delvm from savevm.c to hmp.c |
Date: |
Thu, 4 May 2017 11:40:50 +0200 |
It really uses block/* stuff, not migration one.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
hmp.c | 13 +++++++++++++
hmp.h | 1 +
include/sysemu/sysemu.h | 1 -
migration/savevm.c | 13 -------------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/hmp.c b/hmp.c
index a82a952..bb739ce 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1286,6 +1286,19 @@ 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_migrate_cancel(Monitor *mon, const QDict *qdict)
{
qmp_migrate_cancel(NULL);
diff --git a/hmp.h b/hmp.h
index b302c8d..6a402b1 100644
--- a/hmp.h
+++ b/hmp.h
@@ -65,6 +65,7 @@ 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_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);
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 914c36c..e4f355ceb 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -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_delvm(Monitor *mon, const QDict *qdict);
void hmp_info_snapshots(Monitor *mon, const QDict *qdict);
void qemu_announce_self(void);
diff --git a/migration/savevm.c b/migration/savevm.c
index 8345255..9e0bd9d 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2304,19 +2304,6 @@ int load_vmstate(const char *name)
return 0;
}
-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;
--
2.9.3
- [Qemu-devel] [PULL 00/10] Migration PULL requset, Juan Quintela, 2017/05/04
- [Qemu-devel] [PULL 02/10] migration: setup bi-directional I/O channel for exec: protocol, Juan Quintela, 2017/05/04
- [Qemu-devel] [PULL 03/10] migration: to_dst_file at that point is NULL, Juan Quintela, 2017/05/04
- [Qemu-devel] [PULL 01/10] ram: Split dirty bitmap by RAMBlock, Juan Quintela, 2017/05/04
- [Qemu-devel] [PULL 04/10] monitor: Remove monitor parameter from save_vmstate, Juan Quintela, 2017/05/04
- [Qemu-devel] [PULL 05/10] monitor: Move hmp_loadvm from monitor.c to hmp.c, Juan Quintela, 2017/05/04
- [Qemu-devel] [PULL 07/10] monitor: Move hmp_delvm from savevm.c to hmp.c,
Juan Quintela <=
- [Qemu-devel] [PULL 06/10] monitor: Move hmp_savevm from savevm.c to hmp.c, Juan Quintela, 2017/05/04
- [Qemu-devel] [PULL 08/10] monitor: Move hmp_info_snapshots from savevm.c to hmp.c, Juan Quintela, 2017/05/04
- [Qemu-devel] [PULL 10/10] migration: Extra tracing, Juan Quintela, 2017/05/04
- [Qemu-devel] [PULL 09/10] migration: Move postcopy-ram.h to migration/, Juan Quintela, 2017/05/04
- Re: [Qemu-devel] [PULL 00/10] Migration PULL requset, Stefan Hajnoczi, 2017/05/05