NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

ESX replace esxUtil_EqualSuffix() with virFileHasSuffix()

Browse Source 
* src/esx/esx_util.[ch]: remove esxUtil_EqualSuffix()
* src/esx/esx_driver.c, src/esx/esx_vmx.c: replace esxUtil_EqualSuffix()
  with virFileHasSuffix()
This commit is contained in:
Matthias Bolte 2009-09-23 14:56:05 +02:00 committed by Daniel Veillard
parent 49faa15e4f
commit 8ce9f2b161
4 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/esx/esx_driver.c
View File

@ -2695,7 +2695,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED)
goto failure; goto failure;
} }
if (! esxUtil_EqualSuffix(fileName, ".vmdk")) { if (! virFileHasSuffix(fileName, ".vmdk")) {
ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
"Expecting source of first disk '%s' to be a VMDK image", "Expecting source of first disk '%s' to be a VMDK image",
def->disks[0]->src); def->disks[0]->src);

14
src/esx/esx_util.c
View File

@ -585,17 +585,3 @@ esxUtil_GetConfigBoolean(virConnectPtr conn, virConfPtr conf,
return 0; return 0;
} }
int
esxUtil_EqualSuffix(const char *string, const char *suffix)
{
int difference = (int)strlen(string) - (int)strlen(suffix);
if (difference < 0) {
return -1;
} else {
return STRCASEEQ(string + difference, suffix);
}
}

2
src/esx/esx_util.h
View File

@ -61,6 +61,4 @@ int esxUtil_GetConfigBoolean(virConnectPtr conn, virConfPtr conf,
const char *name, int *boolean_, int default_, const char *name, int *boolean_, int default_,
int optional); int optional);
int esxUtil_EqualSuffix(const char *string, const char *suffix);
#endif /* __ESX_UTIL_H__ */ #endif /* __ESX_UTIL_H__ */

18
src/esx/esx_vmx.c
View File

@ -943,7 +943,7 @@ esxVMX_ParseConfig(virConnectPtr conn, esxVI_Context *ctx, const char *vmx,
goto failure; goto failure;
} }
if (guestOS != NULL && esxUtil_EqualSuffix(guestOS, "-64")) { if (guestOS != NULL && virFileHasSuffix(guestOS, "-64")) {
def->os.arch = strdup("x86_64"); def->os.arch = strdup("x86_64");
} else { } else {
def->os.arch = strdup("i686"); def->os.arch = strdup("i686");
@ -1474,7 +1474,7 @@ esxVMX_ParseDisk(virConnectPtr conn, esxVI_Context *ctx, virConfPtr conf,
/* Setup virDomainDiskDef */ /* Setup virDomainDiskDef */
if (device == VIR_DOMAIN_DISK_DEVICE_DISK) { if (device == VIR_DOMAIN_DISK_DEVICE_DISK) {
if (esxUtil_EqualSuffix(fileName, ".vmdk")) { if (virFileHasSuffix(fileName, ".vmdk")) {
if (deviceType != NULL) { if (deviceType != NULL) {
if (bus == VIR_DOMAIN_DISK_BUS_SCSI && if (bus == VIR_DOMAIN_DISK_BUS_SCSI &&
STRCASENEQ(deviceType, "scsi-hardDisk")) { STRCASENEQ(deviceType, "scsi-hardDisk")) {
@ -1510,7 +1510,7 @@ esxVMX_ParseDisk(virConnectPtr conn, esxVI_Context *ctx, virConfPtr conf,
if ((*def)->src == NULL) { if ((*def)->src == NULL) {
goto failure; goto failure;
} }
} else if (esxUtil_EqualSuffix(fileName, ".iso") || } else if (virFileHasSuffix(fileName, ".iso") ||
STREQ(deviceType, "atapi-cdrom")) { STREQ(deviceType, "atapi-cdrom")) {
/* /*
* This function was called in order to parse a harddisk device, * This function was called in order to parse a harddisk device,
@ -1526,7 +1526,7 @@ esxVMX_ParseDisk(virConnectPtr conn, esxVI_Context *ctx, virConfPtr conf,
goto failure; goto failure;
} }
} else if (device == VIR_DOMAIN_DISK_DEVICE_CDROM) { } else if (device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
if (esxUtil_EqualSuffix(fileName, ".iso")) { if (virFileHasSuffix(fileName, ".iso")) {
if (deviceType != NULL) { if (deviceType != NULL) {
if (STRCASENEQ(deviceType, "cdrom-image")) { if (STRCASENEQ(deviceType, "cdrom-image")) {
ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
@ -1543,7 +1543,7 @@ esxVMX_ParseDisk(virConnectPtr conn, esxVI_Context *ctx, virConfPtr conf,
if ((*def)->src == NULL) { if ((*def)->src == NULL) {
goto failure; goto failure;
} }
} else if (esxUtil_EqualSuffix(fileName, ".vmdk")) { } else if (virFileHasSuffix(fileName, ".vmdk")) {
/* /*
* This function was called in order to parse a CDROM device, but * This function was called in order to parse a CDROM device, but
* .vmdk files are for harddisk devices only. Just ignore it, * .vmdk files are for harddisk devices only. Just ignore it,
@ -1563,7 +1563,7 @@ esxVMX_ParseDisk(virConnectPtr conn, esxVI_Context *ctx, virConfPtr conf,
goto failure; goto failure;
} }
} else if (device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { } else if (device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
if (esxUtil_EqualSuffix(fileName, ".flp")) { if (virFileHasSuffix(fileName, ".flp")) {
if (fileType != NULL) { if (fileType != NULL) {
if (STRCASENEQ(fileType, "file")) { if (STRCASENEQ(fileType, "file")) {
ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
@ -2431,7 +2431,7 @@ esxVMX_FormatHardDisk(virConnectPtr conn, esxVI_Context *ctx,
entryPrefix, controller, id, deviceTypePrefix); entryPrefix, controller, id, deviceTypePrefix);
if (def->src != NULL) { if (def->src != NULL) {
if (! esxUtil_EqualSuffix(def->src, ".vmdk")) { if (! virFileHasSuffix(def->src, ".vmdk")) {
ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
"Image file for %s harddisk '%s' has unsupported suffix, " "Image file for %s harddisk '%s' has unsupported suffix, "
"expecting '.vmdk'", busName, def->dst); "expecting '.vmdk'", busName, def->dst);
@ -2513,7 +2513,7 @@ esxVMX_FormatCDROM(virConnectPtr conn, esxVI_Context *ctx,
entryPrefix, controller, id); entryPrefix, controller, id);
if (def->src != NULL) { if (def->src != NULL) {
if (! esxUtil_EqualSuffix(def->src, ".iso")) { if (! virFileHasSuffix(def->src, ".iso")) {
ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
"Image file for %s cdrom '%s' has unsupported " "Image file for %s cdrom '%s' has unsupported "
"suffix, expecting '.iso'", busName, def->dst); "suffix, expecting '.iso'", busName, def->dst);
@ -2577,7 +2577,7 @@ esxVMX_FormatFloppy(virConnectPtr conn, esxVI_Context *ctx,
controller); controller);
if (def->src != NULL) { if (def->src != NULL) {
if (! esxUtil_EqualSuffix(def->src, ".flp")) { if (! virFileHasSuffix(def->src, ".flp")) {
ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
"Image file for floppy '%s' has unsupported suffix, " "Image file for floppy '%s' has unsupported suffix, "
"expecting '.flp'", def->dst); "expecting '.flp'", def->dst);