Changeset 99604 in vbox for trunk/src/VBox/Main/xml

Timestamp:

May 4, 2023 1:53:06 PM (21 months ago)

Author:

vboxsync

Message:

bugref:10314. bugref:10278. Reverted VSD RAM unit to bytes and fixed other places where MB unit was used.

File:

• trunk/src/VBox/Main/xml/ovfreader.cpp (modified) (1 diff)

trunk/src/VBox/Main/xml/ovfreader.cpp

@@ -521 +521 @@
 
                     case ResourceType_Memory:        // 4
+                        /* It's alway stored in bytes in VSD according to the old internal agreement within the team */
                         if (    i.strAllocationUnits == "MegaBytes"           // found in OVF created by OVF toolkit
                              || i.strAllocationUnits == "MB"                  // found in MS docs
                              || i.strAllocationUnits == "byte * 2^20"         // suggested by OVF spec DSP0243 page 21
                            )
-                            vsys.ullMemorySize = i.ullVirtualQuantity;
+                            vsys.ullMemorySize = i.ullVirtualQuantity * _1M;
                         else if ( i.strAllocationUnits == "GigaBytes"
                                   || i.strAllocationUnits == "GB"
                                   || i.strAllocationUnits == "byte * 2^30"
                            )
-                            vsys.ullMemorySize = i.ullVirtualQuantity/_1K;//back to MB
+                            vsys.ullMemorySize = i.ullVirtualQuantity * _1G;
                         else
                             throw OVFLogicError(N_("Error reading \"%s\": Invalid allocation unit \"%s\" specified with memory size item, line %d"),