VirtualBox

Changeset 87051 in vbox for trunk/src/VBox/Storage


Ignore:
Timestamp:
Dec 8, 2020 1:08:59 PM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
141808
Message:

Main: bugref:9224: Fixed scm errors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Storage/VMDK.cpp

    r87050 r87051  
    39603960        /* else: We've got nothing to work on, so only do content comparison. */
    39613961    }
    3962    
     3962
    39633963#elif defined(RT_OS_FREEBSD)
    39643964    char szDriveDevName[256];
     
    40224022                           N_("VMDK: Image path: '%s'. geom_gettree failed: %d"), pImage->pszFilename, err);
    40234023    }
    4024    
     4024
    40254025#elif defined(RT_OS_SOLARIS)
    40264026    RT_NOREF(hVol);
    4027    
     4027
    40284028    dk_cinfo dkiDriveInfo;
    40294029    dk_cinfo dkiPartInfo;
     
    40674067        else
    40684068        {
    4069             /* 
    4070              * Manual says the efi_alloc_and_read returns VT_EINVAL if no EFI partition table found. 
    4071              * Actually, the function returns any error, e.g. VT_ERROR. Thus, we are not sure, is it 
     4069            /*
     4070             * Manual says the efi_alloc_and_read returns VT_EINVAL if no EFI partition table found.
     4071             * Actually, the function returns any error, e.g. VT_ERROR. Thus, we are not sure, is it
    40724072             * real error or just no EFI table found. Therefore, let's try to obtain partition info
    40734073             * using another way. If there is an error, it returns errno which will be handled below.
    40744074             */
    4075                
     4075
    40764076            uint32_t numPartition = (uint32_t)dkiPartInfo.dki_partition;
    40774077            if (numPartition > NDKMAP)
     
    41144114                           pImage->pszFilename, idxPartition, pPartDesc->pszRawDevice, pszRawDrive, cbSize, pPartDesc->cbData);
    41154115    }
    4116    
     4116
    41174117#else
    41184118    RT_NOREF(hVol); /* PORTME */
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette