[Qemu-devel] [5200] Let snapshot work with protocols

[Anthony Liguori]

Revision: 5200
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5200
Author:   aliguori
Date:     2008-09-12 17:54:13 +0000 (Fri, 12 Sep 2008)

Log Message:
-----------
Let snapshot work with protocols

realpath will horribly mangle a protocol so avoid calling it if the backing
file is a protocol.

Modified Paths:
--------------
    trunk/block.c

Modified: trunk/block.c
===================================================================
--- trunk/block.c       2008-09-11 19:42:00 UTC (rev 5199)
+++ trunk/block.c       2008-09-12 17:54:13 UTC (rev 5200)
@@ -338,6 +338,7 @@
     if (flags & BDRV_O_SNAPSHOT) {
         BlockDriverState *bs1;
         int64_t total_size;
+        int is_protocol = 0;
 
         /* if snapshot, we create a temporary backing file and open it
            instead of opening 'filename' directly */
@@ -352,10 +353,21 @@
             return -1;
         }
         total_size = bdrv_getlength(bs1) >> SECTOR_BITS;
+
+        if (bs1->drv && bs1->drv->protocol_name)
+            is_protocol = 1;
+
         bdrv_delete(bs1);
 
         get_tmp_filename(tmp_filename, sizeof(tmp_filename));
-        realpath(filename, backing_filename);
+
+        /* Real path is meaningless for protocols */
+        if (is_protocol)
+            snprintf(backing_filename, sizeof(backing_filename),
+                     "%s", filename);
+        else
+            realpath(filename, backing_filename);
+
         if (bdrv_create(&bdrv_qcow2, tmp_filename,
                         total_size, backing_filename, 0) < 0) {
             return -1;