External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 20:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

xenFormatXLDisk: Unify commas pattern for arguments

Browse Source 
instead of:

  virBufferAdd(buf, "arg1,");
  virBufferAdd(buf, "arg2");

lets have:

  virBufferAdd(buf, "arg1");
  virBufferAdd(buf, ",arg2");

Because it's better. Consider we want to add conditionally arg3.
With this change, it's simple:

  if (cond)
    virBufferAdd(buf, ",arg3");

with current code there might be a comma hanging at EOL.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2016-10-20 21:59:01 +08:00
parent dbe481a14a
commit 484f7d0069
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/xenconfig/xen_xl.c
View File

@ -1022,33 +1022,33 @@ xenFormatXLDisk(virConfValuePtr list, virDomainDiskDefPtr disk)
virBufferAddLit(&buf, "format="); virBufferAddLit(&buf, "format=");
switch (format) { switch (format) {
case VIR_STORAGE_FILE_RAW: case VIR_STORAGE_FILE_RAW:
virBufferAddLit(&buf, "raw,"); virBufferAddLit(&buf, "raw");
break; break;
case VIR_STORAGE_FILE_VHD: case VIR_STORAGE_FILE_VHD:
virBufferAddLit(&buf, "xvhd,"); virBufferAddLit(&buf, "xvhd");
break; break;
case VIR_STORAGE_FILE_QCOW: case VIR_STORAGE_FILE_QCOW:
virBufferAddLit(&buf, "qcow,"); virBufferAddLit(&buf, "qcow");
break; break;
case VIR_STORAGE_FILE_QCOW2: case VIR_STORAGE_FILE_QCOW2:
virBufferAddLit(&buf, "qcow2,"); virBufferAddLit(&buf, "qcow2");
break; break;
/* set default */ /* set default */
default: default:
virBufferAddLit(&buf, "raw,"); virBufferAddLit(&buf, "raw");
} }
/* device */ /* device */
virBufferAsprintf(&buf, "vdev=%s,", disk->dst); virBufferAsprintf(&buf, ",vdev=%s", disk->dst);
/* access */ /* access */
virBufferAddLit(&buf, "access="); virBufferAddLit(&buf, ",access=");
if (disk->src->readonly) if (disk->src->readonly)
virBufferAddLit(&buf, "ro,"); virBufferAddLit(&buf, "ro");
else if (disk->src->shared) else if (disk->src->shared)
virBufferAddLit(&buf, "!,"); virBufferAddLit(&buf, "!");
else else
virBufferAddLit(&buf, "rw,"); virBufferAddLit(&buf, "rw");
if (disk->transient) { if (disk->transient) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("transient disks not supported yet")); _("transient disks not supported yet"));
@ -1057,18 +1057,18 @@ xenFormatXLDisk(virConfValuePtr list, virDomainDiskDefPtr disk)
/* backendtype */ /* backendtype */
if (driver) { if (driver) {
virBufferAddLit(&buf, "backendtype="); virBufferAddLit(&buf, ",backendtype=");
if (STREQ(driver, "qemu") || STREQ(driver, "file")) if (STREQ(driver, "qemu") || STREQ(driver, "file"))
virBufferAddLit(&buf, "qdisk,"); virBufferAddLit(&buf, "qdisk");
else if (STREQ(driver, "tap")) else if (STREQ(driver, "tap"))
virBufferAddLit(&buf, "tap,"); virBufferAddLit(&buf, "tap");
else if (STREQ(driver, "phy")) else if (STREQ(driver, "phy"))
virBufferAddLit(&buf, "phy,"); virBufferAddLit(&buf, "phy");
} }
/* devtype */ /* devtype */
if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM)
virBufferAddLit(&buf, "devtype=cdrom,"); virBufferAddLit(&buf, ",devtype=cdrom");
/* /*
* target * target
@ -1082,7 +1082,7 @@ xenFormatXLDisk(virConfValuePtr list, virDomainDiskDefPtr disk)
goto cleanup; goto cleanup;
if (target) if (target)
virBufferAsprintf(&buf, "target=%s", target); virBufferAsprintf(&buf, ",target=%s", target);
if (virBufferCheckError(&buf) < 0) if (virBufferCheckError(&buf) < 0)
goto cleanup; goto cleanup;