From bf987c57d9c3b14c189e52a1e2f284d008a37d33 Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 7 Dec 2010 14:59:04 -0800 Subject: [PATCH] bug 6838: during vm creation, the volume's device id wasn't set leading to npe during attaching a new vol to the vm (it checks for device ids) status 6838: resolved fixed --- server/src/com/cloud/storage/StorageManagerImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index f76d206bca2..a991c0eab1c 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -2658,6 +2658,11 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag vol.setInstanceId(vm.getId()); } + if(type.equals(VolumeType.ROOT)) + vol.setDeviceId(0l); + else + vol.setDeviceId(1l); + vol = _volsDao.persist(vol); return toDiskProfile(vol, offering); @@ -2684,6 +2689,11 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag } vol.setTemplateId(template.getId()); + if(type.equals(VolumeType.ROOT)) + vol.setDeviceId(0l); + else + vol.setDeviceId(1l); + vol = _volsDao.persist(vol); return toDiskProfile(vol, offering);