From ccf13ec04eb1f04ca35a99cdb9d53e838b3148ed Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 13 Apr 2015 16:04:40 +0530 Subject: [PATCH] kvm: xml escape password (cherry picked from commit 13de2691fddb4b755605ee44ac0e95dedb26987d) Signed-off-by: Rohit Yadav Conflicts: plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java --- .../src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index b5723ed66d5..5c8d3377ecc 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java @@ -16,6 +16,8 @@ // under the License. package com.cloud.hypervisor.kvm.resource; +import org.apache.commons.lang.StringEscapeUtils; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -1168,7 +1170,7 @@ public class LibvirtVMDef { _port = port; _autoPort = autoPort; _listenAddr = listenAddr; - _passwd = passwd; + _passwd = StringEscapeUtils.escapeXml(passwd); _keyMap = keyMap; }