Re: [libvirt] [PATCH] xenFormatXLDisk: Fix commas for arguments

2016-10-21 Thread Ján Tomko

On Thu, Oct 20, 2016 at 11:05:36PM +0800, Michal Privoznik wrote:

On 20.10.2016 22:27, Ján Tomko wrote:

On Thu, Oct 20, 2016 at 10:16:05PM +0800, Michal Privoznik wrote:

instead of:

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

lets have:

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



Why?


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

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

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



ACK with the explanation included in the commit message.

Please substitute the 'Fix' in the summary for something
that does not imply a functional change.

Jan


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] xenFormatXLDisk: Fix commas for arguments

2016-10-20 Thread Michal Privoznik
On 20.10.2016 22:27, Ján Tomko wrote:
> On Thu, Oct 20, 2016 at 10:16:05PM +0800, Michal Privoznik wrote:
>> instead of:
>>
>> virBufferAdd(buf, "arg1,");
>> virBufferAdd(buf, "arg2");
>>
>> lets have:
>>
>> virBufferAdd(buf, "arg1");
>> virBufferAdd(buf, ",arg2");
>>
> 
> Why?

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

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

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

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list


[libvirt] [PATCH] xenFormatXLDisk: Fix commas for arguments

2016-10-20 Thread Michal Privoznik
instead of:

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

lets have:

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

Signed-off-by: Michal Privoznik 
---
 src/xenconfig/xen_xl.c | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list


Re: [libvirt] [PATCH] xenFormatXLDisk: Fix commas for arguments

2016-10-20 Thread Ján Tomko

On Thu, Oct 20, 2016 at 10:16:05PM +0800, Michal Privoznik wrote:

instead of:

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

lets have:

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



Why?

Jan


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list