Updated Branches: refs/heads/master 643b3b506 -> bf73d755b
Add protection for VNC port with password on KVM. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bf73d755 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bf73d755 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bf73d755 Branch: refs/heads/master Commit: bf73d755b04e6550b517345de59a8ccd95b86bce Parents: 643b3b5 Author: Fang Wang <[email protected]> Authored: Fri May 10 13:01:47 2013 -0700 Committer: Edison Su <[email protected]> Committed: Thu Jun 13 14:41:09 2013 -0700 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf73d755/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index bab53bc..f90edd8 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -3300,7 +3300,9 @@ ServerResource { ConsoleDef console = new ConsoleDef("pty", null, null, (short) 0); devices.addDevice(console); - GraphicDef grap = new GraphicDef("vnc", (short) 0, true, null, null, + //add the VNC port passwd here, get the passwd from the vmInstance. + String passwd = vmTO.getVncPassword(); + GraphicDef grap = new GraphicDef("vnc", (short) 0, true, null, passwd, null); devices.addDevice(grap);
