From 90ac1aba13d431cdccf51dde2c4727b96388d985 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Fri, 22 May 2015 13:32:56 +0100
Subject: [PATCH] kvm: Strip trailing comma for qemu-img convert options

Fix trailing comma for qemu-img convert options, Qemu 2.0+ not tolerant to it

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 .../kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java
index e8dbf926929..500c2d0d660 100644
--- a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java
+++ b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java
@@ -236,6 +236,7 @@ public class QemuImg {
             for (Map.Entry<String, String> option : options.entrySet()) {
                 optionsStr += option.getKey() + "=" + option.getValue() + ",";
             }
+            optionsStr = optionsStr.replaceAll(",$", "");
             s.add(optionsStr);
         }