mirror of https://gitee.com/openkylin/qemu.git
Let snapshot work with protocols
realpath will horribly mangle a protocol so avoid calling it if the backing file is a protocol. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5200 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
a145ea5120
commit
7c96d46ec2
14
block.c
14
block.c
|
@ -338,6 +338,7 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,
|
|||
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 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,
|
|||
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;
|
||||
|
|
Loading…
Reference in New Issue