提交 16e48334 编写于 作者: C Cole Robinson

storage: cleanup: do away with 'createFile'

Have storage building functions be definitions of
virStorageBackendBuildVolFrom: we will need to do this in the future anyways
if we ever support the flags attribute.
上级 6d7d465a
...@@ -106,7 +106,8 @@ enum { ...@@ -106,7 +106,8 @@ enum {
int int
virStorageBackendCreateRaw(virConnectPtr conn, virStorageBackendCreateRaw(virConnectPtr conn,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol) virStorageVolDefPtr inputvol,
unsigned int flags ATTRIBUTE_UNUSED)
{ {
int fd = -1; int fd = -1;
int inputfd = -1; int inputfd = -1;
...@@ -257,7 +258,8 @@ cleanup: ...@@ -257,7 +258,8 @@ cleanup:
static int static int
virStorageBackendCreateQemuImg(virConnectPtr conn, virStorageBackendCreateQemuImg(virConnectPtr conn,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol) virStorageVolDefPtr inputvol,
unsigned int flags ATTRIBUTE_UNUSED)
{ {
char size[100]; char size[100];
char *create_tool; char *create_tool;
...@@ -395,7 +397,8 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, ...@@ -395,7 +397,8 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
static int static int
virStorageBackendCreateQcowCreate(virConnectPtr conn, virStorageBackendCreateQcowCreate(virConnectPtr conn,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol) virStorageVolDefPtr inputvol,
unsigned int flags ATTRIBUTE_UNUSED)
{ {
char size[100]; char size[100];
const char *imgargv[4]; const char *imgargv[4];
...@@ -438,7 +441,7 @@ virStorageBackendCreateQcowCreate(virConnectPtr conn, ...@@ -438,7 +441,7 @@ virStorageBackendCreateQcowCreate(virConnectPtr conn,
return 0; return 0;
} }
createFile virStorageBackendBuildVolFrom
virStorageBackendFSImageToolTypeToFunc(virConnectPtr conn, int tool_type) virStorageBackendFSImageToolTypeToFunc(virConnectPtr conn, int tool_type)
{ {
switch (tool_type) { switch (tool_type) {
...@@ -478,7 +481,7 @@ virStorageBackendFindFSImageTool(char **tool) ...@@ -478,7 +481,7 @@ virStorageBackendFindFSImageTool(char **tool)
return tool_type; return tool_type;
} }
createFile virStorageBackendBuildVolFrom
virStorageBackendGetBuildVolFromFunction(virConnectPtr conn, virStorageBackendGetBuildVolFromFunction(virConnectPtr conn,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol) virStorageVolDefPtr inputvol)
......
...@@ -40,20 +40,18 @@ typedef int (*virStorageBackendRefreshVol)(virConnectPtr conn, virStoragePoolObj ...@@ -40,20 +40,18 @@ typedef int (*virStorageBackendRefreshVol)(virConnectPtr conn, virStoragePoolObj
typedef int (*virStorageBackendDeleteVol)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags); typedef int (*virStorageBackendDeleteVol)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags);
typedef int (*virStorageBackendBuildVolFrom)(virConnectPtr conn, virStorageVolDefPtr origvol, virStorageVolDefPtr newvol, unsigned int flags); typedef int (*virStorageBackendBuildVolFrom)(virConnectPtr conn, virStorageVolDefPtr origvol, virStorageVolDefPtr newvol, unsigned int flags);
typedef int (*createFile)(virConnectPtr conn,
virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol);
/* File creation/cloning functions used for cloning between backends */ /* File creation/cloning functions used for cloning between backends */
int virStorageBackendCreateRaw(virConnectPtr conn, int virStorageBackendCreateRaw(virConnectPtr conn,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol); virStorageVolDefPtr inputvol,
createFile unsigned int flags);
virStorageBackendBuildVolFrom
virStorageBackendGetBuildVolFromFunction(virConnectPtr conn, virStorageBackendGetBuildVolFromFunction(virConnectPtr conn,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol); virStorageVolDefPtr inputvol);
int virStorageBackendFindFSImageTool(char **tool); int virStorageBackendFindFSImageTool(char **tool);
createFile virStorageBackendFSImageToolTypeToFunc(virConnectPtr conn, virStorageBackendBuildVolFrom
virStorageBackendFSImageToolTypeToFunc(virConnectPtr conn,
int tool_type); int tool_type);
......
...@@ -1008,7 +1008,8 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn, ...@@ -1008,7 +1008,8 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn,
static int createFileDir(virConnectPtr conn, static int createFileDir(virConnectPtr conn,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol) { virStorageVolDefPtr inputvol,
unsigned int flags ATTRIBUTE_UNUSED) {
if (inputvol) { if (inputvol) {
virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR,
"%s", "%s",
...@@ -1032,7 +1033,7 @@ _virStorageBackendFileSystemVolBuild(virConnectPtr conn, ...@@ -1032,7 +1033,7 @@ _virStorageBackendFileSystemVolBuild(virConnectPtr conn,
virStorageVolDefPtr inputvol) virStorageVolDefPtr inputvol)
{ {
int fd; int fd;
createFile create_func; virStorageBackendBuildVolFrom create_func;
int tool_type; int tool_type;
if (inputvol) { if (inputvol) {
...@@ -1056,7 +1057,7 @@ _virStorageBackendFileSystemVolBuild(virConnectPtr conn, ...@@ -1056,7 +1057,7 @@ _virStorageBackendFileSystemVolBuild(virConnectPtr conn,
return -1; return -1;
} }
if (create_func(conn, vol, inputvol) < 0) if (create_func(conn, vol, inputvol, 0) < 0)
return -1; return -1;
if ((fd = open(vol->target.path, O_RDONLY)) < 0) { if ((fd = open(vol->target.path, O_RDONLY)) < 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册