[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6908] block: support known backing format for image create
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6908] block: support known backing format for image create and open ( Uri Lublin) |
Date: |
Sat, 28 Mar 2009 17:55:11 +0000 |
Revision: 6908
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6908
Author: aliguori
Date: 2009-03-28 17:55:10 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
block: support known backing format for image create and open (Uri Lublin)
Added a backing_format field to BlockDriverState.
Added bdrv_create2 and drv->bdrv_create2 to create an image with
a known backing file format.
Upon bdrv_open2 if backing format is known use it, instead of
probing the (backing) image.
Signed-off-by: Uri Lublin <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/block.c
trunk/block.h
trunk/block_int.h
Modified: trunk/block.c
===================================================================
--- trunk/block.c 2009-03-28 17:55:06 UTC (rev 6907)
+++ trunk/block.c 2009-03-28 17:55:10 UTC (rev 6908)
@@ -181,6 +181,20 @@
return NULL;
}
+int bdrv_create2(BlockDriver *drv,
+ const char *filename, int64_t size_in_sectors,
+ const char *backing_file, const char *backing_format,
+ int flags)
+{
+ if (drv->bdrv_create2)
+ return drv->bdrv_create2(filename, size_in_sectors, backing_file,
+ backing_format, flags);
+ if (drv->bdrv_create)
+ return drv->bdrv_create(filename, size_in_sectors, backing_file,
+ flags);
+ return -ENOTSUP;
+}
+
int bdrv_create(BlockDriver *drv,
const char *filename, int64_t size_in_sectors,
const char *backing_file, int flags)
@@ -357,7 +371,7 @@
/* if there is a backing file, use it */
bs1 = bdrv_new("");
- ret = bdrv_open(bs1, filename, 0);
+ ret = bdrv_open2(bs1, filename, 0, drv);
if (ret < 0) {
bdrv_delete(bs1);
return ret;
@@ -378,12 +392,14 @@
else
realpath(filename, backing_filename);
- ret = bdrv_create(&bdrv_qcow2, tmp_filename,
- total_size, backing_filename, 0);
+ ret = bdrv_create2(&bdrv_qcow2, tmp_filename,
+ total_size, backing_filename,
+ (drv ? drv->format_name : NULL), 0);
if (ret < 0) {
return ret;
}
filename = tmp_filename;
+ drv = &bdrv_qcow2;
bs->is_temporary = 1;
}
@@ -429,10 +445,14 @@
#endif
if (bs->backing_file[0] != '\0') {
/* if there is a backing file, use it */
+ BlockDriver *back_drv = NULL;
bs->backing_hd = bdrv_new("");
path_combine(backing_filename, sizeof(backing_filename),
filename, bs->backing_file);
- ret = bdrv_open(bs->backing_hd, backing_filename, open_flags);
+ if (bs->backing_format[0] != '\0')
+ back_drv = bdrv_find_format(bs->backing_format);
+ ret = bdrv_open2(bs->backing_hd, backing_filename, open_flags,
+ back_drv);
if (ret < 0) {
bdrv_close(bs);
return ret;
Modified: trunk/block.h
===================================================================
--- trunk/block.h 2009-03-28 17:55:06 UTC (rev 6907)
+++ trunk/block.h 2009-03-28 17:55:10 UTC (rev 6908)
@@ -62,6 +62,10 @@
int bdrv_create(BlockDriver *drv,
const char *filename, int64_t size_in_sectors,
const char *backing_file, int flags);
+int bdrv_create2(BlockDriver *drv,
+ const char *filename, int64_t size_in_sectors,
+ const char *backing_file, const char *backing_format,
+ int flags);
BlockDriverState *bdrv_new(const char *device_name);
void bdrv_delete(BlockDriverState *bs);
int bdrv_file_open(BlockDriverState **pbs, const char *filename, int flags);
Modified: trunk/block_int.h
===================================================================
--- trunk/block_int.h 2009-03-28 17:55:06 UTC (rev 6907)
+++ trunk/block_int.h 2009-03-28 17:55:10 UTC (rev 6908)
@@ -91,6 +91,12 @@
BlockDriverCompletionFunc *cb, void *opaque);
AIOPool aio_pool;
+
+ /* new create with backing file format */
+ int (*bdrv_create2)(const char *filename, int64_t total_sectors,
+ const char *backing_file, const char *backing_format,
+ int flags);
+
struct BlockDriver *next;
};
@@ -113,6 +119,7 @@
char filename[1024];
char backing_file[1024]; /* if non zero, the image is a diff of
this file image */
+ char backing_format[16]; /* if non-zero and backing_file exists */
int is_temporary;
int media_changed;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6908] block: support known backing format for image create and open ( Uri Lublin),
Anthony Liguori <=