External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 15:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmx: Some whitespace cleanup

Browse Source
This commit is contained in:
Matthias Bolte 2015-09-01 16:52:02 +02:00
parent 62c6778495
commit 1d204cf196
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/vmx/vmx.c
View File

@ -2,7 +2,7 @@
* vmx.c: VMware VMX parsing/formatting functions * vmx.c: VMware VMX parsing/formatting functions
* *
* Copyright (C) 2010-2014 Red Hat, Inc. * Copyright (C) 2010-2014 Red Hat, Inc.
* Copyright (C) 2009-2010 Matthias Bolte <matthias.bolte@googlemail.com> * Copyright (C) 2009-2011, 2014-2015 Matthias Bolte <matthias.bolte@googlemail.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -2191,8 +2191,8 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid or not yet handled value '%s' " _("Invalid or not yet handled value '%s' "
"for VMX entry '%s' for device type '%s'"), "for VMX entry '%s' for device type '%s'"),
fileName, fileName_name, fileName, fileName_name,
deviceType ? deviceType : "unknown"); deviceType ? deviceType : "unknown");
goto cleanup; goto cleanup;
} }
} else if (device == VIR_DOMAIN_DISK_DEVICE_CDROM) { } else if (device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
@ -2248,8 +2248,8 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid or not yet handled value '%s' " _("Invalid or not yet handled value '%s' "
"for VMX entry '%s' for device type '%s'"), "for VMX entry '%s' for device type '%s'"),
fileName, fileName_name, fileName, fileName_name,
deviceType ? deviceType : "unknown"); deviceType ? deviceType : "unknown");
goto cleanup; goto cleanup;
} }
} else if (device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { } else if (device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
@ -2272,8 +2272,8 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid or not yet handled value '%s' " _("Invalid or not yet handled value '%s' "
"for VMX entry '%s' for device type '%s'"), "for VMX entry '%s' for device type '%s'"),
fileName, fileName_name, fileName, fileName_name,
deviceType ? deviceType : "unknown"); deviceType ? deviceType : "unknown");
goto cleanup; goto cleanup;
} }
} else { } else {
@ -2545,8 +2545,8 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
STRCASENEQ(virtualDev, "e1000e")) { STRCASENEQ(virtualDev, "e1000e")) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " _("Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or "
"'vmxnet3' or 'e1000e' or 'e1000e' but found '%s'"), virtualDev_name, "'vmxnet3' or 'e1000e' or 'e1000e' but found '%s'"),
virtualDev); virtualDev_name, virtualDev);
goto cleanup; goto cleanup;
} }
@ -3360,7 +3360,7 @@ virVMXFormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer)
int int
virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDefPtr def, virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDefPtr def,
virBufferPtr buffer) virBufferPtr buffer)
{ {
int controllerOrBus, unit; int controllerOrBus, unit;
const char *vmxDeviceType = NULL; const char *vmxDeviceType = NULL;
@ -3376,7 +3376,7 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDefPtr def,
* an ISO. * an ISO.
*/ */
const char *fileExt = (def->device == VIR_DOMAIN_DISK_DEVICE_DISK) ? const char *fileExt = (def->device == VIR_DOMAIN_DISK_DEVICE_DISK) ?
".vmdk" : ".iso"; ".vmdk" : ".iso";
/* Check that we got a valid device type */ /* Check that we got a valid device type */
if (def->device != VIR_DOMAIN_DISK_DEVICE_DISK && if (def->device != VIR_DOMAIN_DISK_DEVICE_DISK &&
@ -3419,7 +3419,7 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDefPtr def,
if (def->device == VIR_DOMAIN_DISK_DEVICE_DISK && if (def->device == VIR_DOMAIN_DISK_DEVICE_DISK &&
type == VIR_STORAGE_TYPE_FILE) { type == VIR_STORAGE_TYPE_FILE) {
vmxDeviceType = (def->bus == VIR_DOMAIN_DISK_BUS_SCSI) ? vmxDeviceType = (def->bus == VIR_DOMAIN_DISK_BUS_SCSI) ?
"scsi-hardDisk" : "ata-hardDisk"; "scsi-hardDisk" : "ata-hardDisk";
} else if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { } else if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
if (type == VIR_STORAGE_TYPE_FILE) if (type == VIR_STORAGE_TYPE_FILE)
vmxDeviceType = "cdrom-image"; vmxDeviceType = "cdrom-image";
@ -3491,6 +3491,7 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDefPtr def,
virBufferAsprintf(buffer, virBufferAsprintf(buffer,
"%s%d:%d.mode = \"independent-nonpersistent\"\n", "%s%d:%d.mode = \"independent-nonpersistent\"\n",
busType, controllerOrBus, unit); busType, controllerOrBus, unit);
return 0; return 0;
} }