[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] savevm: Generate a name when run without one
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 10/10] savevm: Generate a name when run without one |
Date: |
Mon, 30 Aug 2010 18:32:33 +0200 |
From: Miguel Di Ciurcio Filho <address@hidden>
When savevm is run without a name, the name stays blank and the snapshot is
saved anyway.
The new behavior is when savevm is run without parameters a name will be
created automaticaly, so the snapshot is accessible to the user without needing
the id when loadvm is run.
(qemu) savevm
(qemu) info snapshots
ID TAG VM SIZE DATE VM CLOCK
1 vm-20100728134640 978K 2010-07-28 13:46:40 00:00:08.603
We use a name with the format 'vm-YYYYMMDDHHMMSS'.
This is a first step to hide the internal id, because I don't see a reason to
expose this kind of internals to the user.
Signed-off-by: Miguel Di Ciurcio Filho <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
savevm.c | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/savevm.c b/savevm.c
index d286592..4d9f822 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1837,8 +1837,10 @@ void do_savevm(Monitor *mon, const QDict *qdict)
uint32_t vm_state_size;
#ifdef _WIN32
struct _timeb tb;
+ struct tm *ptm;
#else
struct timeval tv;
+ struct tm tm;
#endif
const char *name = qdict_get_try_str(qdict, "name");
@@ -1869,15 +1871,6 @@ void do_savevm(Monitor *mon, const QDict *qdict)
vm_stop(0);
memset(sn, 0, sizeof(*sn));
- if (name) {
- ret = bdrv_snapshot_find(bs, old_sn, name);
- if (ret >= 0) {
- pstrcpy(sn->name, sizeof(sn->name), old_sn->name);
- pstrcpy(sn->id_str, sizeof(sn->id_str), old_sn->id_str);
- } else {
- pstrcpy(sn->name, sizeof(sn->name), name);
- }
- }
/* fill auxiliary fields */
#ifdef _WIN32
@@ -1891,6 +1884,24 @@ void do_savevm(Monitor *mon, const QDict *qdict)
#endif
sn->vm_clock_nsec = qemu_get_clock(vm_clock);
+ if (name) {
+ ret = bdrv_snapshot_find(bs, old_sn, name);
+ if (ret >= 0) {
+ pstrcpy(sn->name, sizeof(sn->name), old_sn->name);
+ pstrcpy(sn->id_str, sizeof(sn->id_str), old_sn->id_str);
+ } else {
+ pstrcpy(sn->name, sizeof(sn->name), name);
+ }
+ } else {
+#ifdef _WIN32
+ ptm = localtime(&tb.time);
+ strftime(sn->name, sizeof(sn->name), "vm-%Y%m%d%H%M%S", ptm);
+#else
+ localtime_r(&tv.tv_sec, &tm);
+ strftime(sn->name, sizeof(sn->name), "vm-%Y%m%d%H%M%S", &tm);
+#endif
+ }
+
/* Delete old snapshots of the same name */
if (name && del_existing_snapshots(mon, name) < 0) {
goto the_end;
--
1.7.2.2
- [Qemu-devel] [PULL 00/10] Block patches, Kevin Wolf, 2010/08/30
- [Qemu-devel] [PATCH 08/10] posix-aio-compat: Fix async_conmtext for ioctl, Kevin Wolf, 2010/08/30
- [Qemu-devel] [PATCH 03/10] block: Fix image re-open in bdrv_commit, Kevin Wolf, 2010/08/30
- [Qemu-devel] [PATCH 10/10] savevm: Generate a name when run without one,
Kevin Wolf <=
- [Qemu-devel] [PATCH 07/10] nbd: Introduce NBD named exports., Kevin Wolf, 2010/08/30
- [Qemu-devel] [PATCH 01/10] virtio: Factor virtqueue_map_sg out, Kevin Wolf, 2010/08/30
- [Qemu-devel] [PATCH 05/10] qemu-img rebase: Open new backing file read-only, Kevin Wolf, 2010/08/30
- [Qemu-devel] [PATCH 04/10] sheepdog: remove unnecessary includes, Kevin Wolf, 2010/08/30
- [Qemu-devel] [PATCH 09/10] monitor: make 'info snapshots' show only fully available snapshots, Kevin Wolf, 2010/08/30
- [Qemu-devel] [PATCH 02/10] virtio-blk: Fix migration of queued requests, Kevin Wolf, 2010/08/30
- [Qemu-devel] [PATCH 06/10] vvfat: fat_chksum(): fix access above array bounds, Kevin Wolf, 2010/08/30