Bug #4042: Use disk size in vm saveas

(cherry picked from commit f42a8d8693)
This commit is contained in:
Carlos Martín committed 2015-10-16 17:57:12 +02:00
1 parent 41b929d4b3
commit 23fefa0256
3 files changed
+16 -9

No files matched your search

+8 -3
View File
@@ -3375,9 +3375,10 @@ const VectorAttribute* VirtualMachine::get_disk(int disk_id) const
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int VirtualMachine::set_saveas_disk(int disk_id, int snap_id, string& err_str)
int VirtualMachine::set_saveas_disk(int disk_id, int snap_id, int &iid,
long long &size, string& err_str)
{
int iid = -1;
iid = -1;
VectorAttribute * disk = get_disk(disk_id);
@@ -3389,6 +3390,7 @@ int VirtualMachine::set_saveas_disk(int disk_id, int snap_id, string& err_str)
if (disk->vector_value("IMAGE_ID", iid) != 0)
{
iid = -1;
err_str = "DISK does not have a valid IMAGE_ID.";
return -1;
}
@@ -3407,7 +3409,10 @@ int VirtualMachine::set_saveas_disk(int disk_id, int snap_id, string& err_str)
disk->replace("HOTPLUG_SAVE_AS_ACTIVE", "YES");
disk->replace("HOTPLUG_SAVE_AS_SNAPSHOT_ID", snap_id);
return iid;
size = 0;
disk->vector_value("SIZE", size);
return 0;
}
/* -------------------------------------------------------------------------- */