fix devcloud router start

Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
This commit is contained in:
Edison Su 2014-03-27 15:32:37 -07:00 committed by Anthony Xu
parent b1bba4b3fb
commit 731ccb8219
2 changed files with 1494 additions and 1 deletions

View File

@ -85,7 +85,7 @@ public class XcpOssResource extends CitrixResourceBase {
}
@Override
protected VBD createPatchVbd(Connection conn, String vmName, VM vm) throws XmlRpcException, XenAPIException {
protected synchronized VBD createPatchVbd(Connection conn, String vmName, VM vm) throws XmlRpcException, XenAPIException {
if (_host.localSRuuid != null) {
//create an iso vdi on it
String result = callHostPlugin(conn, "vmops", "createISOVHD", "uuid", _host.localSRuuid);

File diff suppressed because it is too large Load Diff