openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vmx: Allow missing cdrom image file in virVMXParseFileName 

This will be used later.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2020-12-21 16:51:31 +01:00
parent 152be66eaf
commit eb07c7e563
6 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/esx/esx_driver.c
View File

@ -128,7 +128,8 @@ esxFreePrivate(esxPrivate **priv)
static int
esxParseVMXFileName(const char *fileName,
void *opaque,
char **out)
char **out,
bool allow_missing G_GNUC_UNUSED)
{
esxVMX_Data *data = opaque;
esxVI_String *propertyNameList = NULL;

3
src/vmware/vmware_conf.c
View File

@ -510,7 +510,8 @@ vmwareExtractPid(const char * vmxPath)
int
vmwareParseVMXFileName(const char *datastorePath,
void *opaque G_GNUC_UNUSED,
char **out)
char **out,
bool allow_missing G_GNUC_UNUSED)
{
*out = g_strdup(datastorePath);

3
src/vmware/vmware_conf.h
View File

@ -86,7 +86,8 @@ int vmwareExtractPid(const char * vmxPath);
int
vmwareParseVMXFileName(const char *datastorePath,
void *opaque,
char **out);
char **out,
bool allow_missing);
char *
vmwareFormatVMXFileName(const char *datastorePath,

12
src/vmx/vmx.c
View File

@ -2411,7 +2411,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
}
virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE);
if (ctx->parseFileName(fileName, ctx->opaque, &tmp) < 0)
if (ctx->parseFileName(fileName, ctx->opaque, &tmp, false) < 0)
goto cleanup;
virDomainDiskSetSource(*def, tmp);
VIR_FREE(tmp);
@ -2448,7 +2448,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
}
virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE);
if (ctx->parseFileName(fileName, ctx->opaque, &tmp) < 0)
if (ctx->parseFileName(fileName, ctx->opaque, &tmp, false) < 0)
goto cleanup;
virDomainDiskSetSource(*def, tmp);
VIR_FREE(tmp);
@ -2515,7 +2515,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE);
if (fileName &&
ctx->parseFileName(fileName, ctx->opaque, &tmp) < 0)
ctx->parseFileName(fileName, ctx->opaque, &tmp, false) < 0)
goto cleanup;
virDomainDiskSetSource(*def, tmp);
VIR_FREE(tmp);
@ -2977,7 +2977,8 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port,
(*def)->source->type = VIR_DOMAIN_CHR_TYPE_FILE;
if (ctx->parseFileName(fileName,
ctx->opaque,
&(*def)->source->data.file.path) < 0)
&(*def)->source->data.file.path,
false) < 0)
goto cleanup;
} else if (STRCASEEQ(fileType, "pipe")) {
/*
@ -3142,7 +3143,8 @@ virVMXParseParallel(virVMXContext *ctx, virConfPtr conf, int port,
(*def)->source->type = VIR_DOMAIN_CHR_TYPE_FILE;
if (ctx->parseFileName(fileName,
ctx->opaque,
&(*def)->source->data.file.path) < 0)
&(*def)->source->data.file.path,
false) < 0)
goto cleanup;
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,

5
src/vmx/vmx.h
View File

@ -36,7 +36,10 @@ virDomainXMLOptionPtr virVMXDomainXMLConfInit(virCapsPtr caps);
* Context
*/
typedef int (*virVMXParseFileName)(const char *fileName, void *opaque, char **src);
typedef int (*virVMXParseFileName)(const char *fileName,
void *opaque,
char **src,
bool allow_missing);
typedef char * (*virVMXFormatFileName)(const char *src, void *opaque);
typedef int (*virVMXAutodetectSCSIControllerModel)(virDomainDiskDefPtr def,
int *model, void *opaque);

13
tests/vmx2xmltest.c
View File

@ -139,7 +139,8 @@ testCompareHelper(const void *data)
static int
testParseVMXFileName(const char *fileName,
void *opaque G_GNUC_UNUSED,
char **src)
char **src,
bool allow_missing)
{
g_autofree char *copyOfFileName = NULL;
char *tmp = NULL;
@ -160,6 +161,16 @@ testParseVMXFileName(const char *fileName,
return -1;
}
if (STREQ(datastoreName, "missing") ||
STRPREFIX(directoryAndFileName, "missing")) {
if (allow_missing)
return 0;
virReportError(VIR_ERR_INTERNAL_ERROR,
"Referenced missing file '%s'", fileName);
return -1;
}
*src = g_strdup_printf("[%s] %s", datastoreName, directoryAndFileName);
} else if (STRPREFIX(fileName, "/")) {
/* Found absolute path referencing a file outside a datastore */