[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] HMP: snapshot_blkdev can not consider //root/sn1 an
From: |
lijun |
Subject: |
[Qemu-devel] [PATCH] HMP: snapshot_blkdev can not consider //root/sn1 and /root/sn1 as the same file |
Date: |
Sat, 16 Nov 2013 00:22:18 +0800 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 |
From: Jun Li <address@hidden>
Hi all,
snapshot_blkdev can not consider //root/sn1 and /root/sn1 as the same
file. When file /root/sn1 is the base file, do snapshot using file
//root/sn1, qemu consider it as a new file. So this will rewrite the
base file.
Signed-off-by: Jun Li <address@hidden>
--- a/hmp.c 2013-11-15 23:15:46.733361130 +0800
+++ b/hmp.c 2013-11-16 00:20:23.972248509 +0800
@@ -957,10 +957,12 @@ void hmp_snapshot_blkdev(Monitor *mon, c
{
const char *device = qdict_get_str(qdict, "device");
const char *filename = qdict_get_try_str(qdict, "snapshot-file");
+ const char *p = filename;
const char *format = qdict_get_try_str(qdict, "format");
int reuse = qdict_get_try_bool(qdict, "reuse", 0);
enum NewImageMode mode;
Error *errp = NULL;
+ int count = 1;
if (!filename) {
/* In the future, if 'snapshot-file' is not specified, the
snapshot
@@ -970,6 +972,18 @@ void hmp_snapshot_blkdev(Monitor *mon, c
return;
}
+ /* Delete duplicate '/' in filename. */
+ while (*p != '\0') {
+ if (*p == '/') {
+ while (*(p + count++) == '/') {
+ /* do null. */
+ }
+ strcpy((char *)(p + 1), (char *)(p + count - 1));
+ count = 1;
+ }
+ p++;
+ }
+
mode = reuse ? NEW_IMAGE_MODE_EXISTING :
NEW_IMAGE_MODE_ABSOLUTE_PATHS;
qmp_blockdev_snapshot_sync(device, filename, !!format, format,
true, mode, &errp);
- [Qemu-devel] [PATCH] HMP: snapshot_blkdev can not consider //root/sn1 and /root/sn1 as the same file,
lijun <=