- Timestamp:
- Oct 20, 2022 11:02:43 PM (2 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
-
doc/manual/en_US/man_VBoxManage-createmedium.xml (modified) (2 diffs)
-
src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (3 diffs)
-
src/VBox/Storage/VMDK.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/doc/manual/en_US/man_VBoxManage-createmedium.xml
r96407 r97260 154 154 <listitem><para> 155 155 <literal>Split2G</literal> indicates that the disk image 156 is split into 2GB segments. This value is for VMDK only. 156 is split into 2GB segments. This value is valid for VMDK 157 disk images only. 157 158 </para></listitem> 158 159 <listitem><para> 159 160 <literal>Stream</literal> optimizes the disk image for 160 downloading. This value is for VMDK only. 161 downloading. This value is valid for VMDK disk images 162 only. 161 163 </para></listitem> 162 164 <listitem><para> 163 165 <literal>ESX</literal> is used for some VMWare products. 164 This value is for VMDKonly.166 This value is valid for VMDK disk images only. 165 167 </para></listitem> 166 168 <listitem><para> … … 171 173 </para></listitem> 172 174 <listitem><para> 173 <literal>RawDisk</literal> used for creating raw disks. 174 This value is for VMDK only. For detailed information 175 about raw disks, see <xref linkend="adv-storage-config"/> 176 </para><para> 175 <literal>RawDisk</literal> is used for creating a VMDK 176 image which provides direct access to the hard disk on 177 the host using its raw interface. This value is valid for 178 VMDK disk images only. For detailed information about raw 179 disk access, see <xref linkend="adv-storage-config"/>. 177 180 </para></listitem> 178 181 </itemizedlist><para> -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp
r96407 r97260 486 486 } 487 487 } 488 if ((enmMediumVariant & MediumVariant_VmdkRawDisk) && strcmp(format, "VMDK")) 489 return errorSyntax(Disk::tr("Variant 'Rawdisk' requires '--format=VMDK'")); 488 490 } 489 491 else … … 491 493 if ( !filename 492 494 || !*filename) 493 return errorSyntax(Disk::tr("Parameter s--filename is required"));495 return errorSyntax(Disk::tr("Parameter --filename is required")); 494 496 size = 0; 495 497 if (cmd != CMD_DISK) … … 596 598 if (!fPropertyFound) 597 599 return RTMsgErrorExit(RTEXITCODE_FAILURE, 598 Disk::tr(" The %s is not found in the property list of the requested medium format."),599 pszKey );600 Disk::tr("Property '%s' was not found in the list of medium properties for the requested medium format (%s)."), 601 pszKey, format); 600 602 if (!fBinary) 601 603 CHECK_ERROR2I_RET(pMedium, SetProperty(Bstr(pszKey).raw(), Bstr(it->m_pszValue).raw()), -
trunk/src/VBox/Storage/VMDK.cpp
r97255 r97260 5046 5046 if (RT_SUCCESS(rc)) 5047 5047 { 5048 pImage->cbSize = cbSize; 5048 5049 /* 5049 5050 * Create the raw-drive descriptor … … 5746 5747 rc = vmdkMakeRawDescriptor(pImage, &pRaw); 5747 5748 if (RT_FAILURE(rc)) 5748 return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could get raw descriptor for '%s'"), pImage->pszFilename); 5749 return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create raw descriptor for '%s'"), 5750 pImage->pszFilename); 5751 if (!cbSize) 5752 cbSize = pImage->cbSize; 5749 5753 5750 5754 rc = vmdkCreateRawImage(pImage, pRaw, cbSize); … … 5787 5791 vmdkDescExtRemoveDummy(pImage, &pImage->Descriptor); 5788 5792 5789 if ( RT_SUCCESS(rc) 5790 && pPCHSGeometry->cCylinders != 0 5791 && pPCHSGeometry->cHeads != 0 5792 && pPCHSGeometry->cSectors != 0) 5793 rc = vmdkDescSetPCHSGeometry(pImage, pPCHSGeometry); 5793 pImage->LCHSGeometry = *pLCHSGeometry; 5794 pImage->PCHSGeometry = *pPCHSGeometry; 5795 5796 if (RT_SUCCESS(rc)) 5797 { 5798 if ( pPCHSGeometry->cCylinders != 0 5799 && pPCHSGeometry->cHeads != 0 5800 && pPCHSGeometry->cSectors != 0) 5801 rc = vmdkDescSetPCHSGeometry(pImage, pPCHSGeometry); 5802 else if (uImageFlags & VD_VMDK_IMAGE_FLAGS_RAWDISK) 5803 { 5804 VDGEOMETRY RawDiskPCHSGeometry; 5805 RawDiskPCHSGeometry.cCylinders = (uint32_t)RT_MIN(pImage->cbSize / 512 / 16 / 63, 16383); 5806 RawDiskPCHSGeometry.cHeads = 16; 5807 RawDiskPCHSGeometry.cSectors = 63; 5808 rc = vmdkDescSetPCHSGeometry(pImage, &RawDiskPCHSGeometry); 5809 } 5810 } 5794 5811 5795 5812 if ( RT_SUCCESS(rc) … … 5798 5815 && pLCHSGeometry->cSectors != 0) 5799 5816 rc = vmdkDescSetLCHSGeometry(pImage, pLCHSGeometry); 5800 5801 pImage->LCHSGeometry = *pLCHSGeometry;5802 pImage->PCHSGeometry = *pPCHSGeometry;5803 5817 5804 5818 pImage->ImageUuid = *pUuid;
Note:
See TracChangeset
for help on using the changeset viewer.

