HMP: snapshot_blkdev can not consider //root/sn1 and /root/sn1 as the same file
PATCH 1/1 HMP: snapshot_blkdev can not consider //root/sn1 and /root/sn1 as the same file
From: Jun Li <[email protected]>
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.
hmp.c 2013-11-16 00:20:23.972248509 +0800 renamed from hmp.c 2013-11-15 23:15:46.733361130 +0800 +2 -0
@@ -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);
Quoted 8 lines · lijun
From: Jun Li <[email protected]>
Hi all,
snapshot_blkdevcan not consider //root/sn1 and/root/sn1as the same file. When file/root/sn1is the base file, do snapshot using file //root/sn1, qemu consider it as a new file. So this will rewrite the base file.
Careful. On cygwin, /root and //root are two different files (and POSIX allows this). While qemu hasn't yet been ported to cygwin, we should not make the task harder by using incorrect ad-hoc normalization.
Review
Quoted 2 lines
(quoted diff) +2
-0+ /* Delete duplicate '/' in filename. */ + while (*p != '\0') {
Rather than hand-rolling a loop, you should use realpath() (guaranteed by POSIX, but not always portable) or its appropriate glib wrapper, where we can assume that glib will properly account for // being distinct on platforms where it matters.
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org