VirtualBox

Changeset 66248 in vbox


Ignore:
Timestamp:
Mar 26, 2017 9:38:33 PM (8 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
114169
Message:

Storage/VD: Get rid of VBOXHDD prefixes, the library was renamed from VBoxHDD to VD long ago

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Storage/VD.cpp

    r66209 r66248  
    5353#endif
    5454
    55 #define VBOXHDDDISK_SIGNATURE 0x6f0e2a7d
     55/** Magic number contained in the VDISK instance data, used for checking that the passed
     56 * pointer contains a valid instance in debug builds. */
     57#define VDISK_SIGNATURE 0x6f0e2a7d
    5658
    5759/** Buffer size used for merging images. */
    … …  
    222224struct VBOXHDD
    223225{
    224     /** Structure signature (VBOXHDDDISK_SIGNATURE). */
     226    /** Structure signature (VDISK_SIGNATURE). */
    225227    uint32_t               u32Signature;
    226228
    … …  
    61566158        if (pDisk)
    61576159        {
    6158             pDisk->u32Signature            = VBOXHDDDISK_SIGNATURE;
     6160            pDisk->u32Signature            = VDISK_SIGNATURE;
    61596161            pDisk->enmType                 = enmType;
    61606162            pDisk->cImages                 = 0;
    … …  
    62316233        /* sanity check */
    62326234        AssertPtrBreak(pDisk);
    6233         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     6235        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    62346236        Assert(!pDisk->fLocked);
    62356237
    … …  
    64256427        /* sanity check */
    64266428        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    6427         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     6429        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    64286430
    64296431        /* Check arguments. */
    … …  
    67526754        /* sanity check */
    67536755        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    6754         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     6756        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    67556757
    67566758        /* Check arguments. */
    … …  
    69236925        /* sanity check */
    69246926        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    6925         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     6927        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    69266928
    69276929        /* Check arguments. */
    … …  
    70477049        /* sanity check */
    70487050        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    7049         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     7051        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    70507052
    70517053        /* Check arguments. */
    … …  
    73387340        /* sanity check */
    73397341        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    7340         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     7342        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    73417343
    73427344        /* Check arguments. */
    … …  
    76127614        /* sanity check */
    76137615        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    7614         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     7616        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    76157617
    76167618        /* Check arguments. */
    … …  
    78237825        /* sanity check */
    78247826        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    7825         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     7827        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    78267828
    78277829        /* For simplicity reasons lock for writing as the image reopen below
    … …  
    82808282        AssertMsgBreakStmt(VALID_PTR(pDiskFrom), ("pDiskFrom=%#p\n", pDiskFrom),
    82818283                           rc = VERR_INVALID_PARAMETER);
    8282         AssertMsg(pDiskFrom->u32Signature == VBOXHDDDISK_SIGNATURE,
     8284        AssertMsg(pDiskFrom->u32Signature == VDISK_SIGNATURE,
    82838285                  ("u32Signature=%08x\n", pDiskFrom->u32Signature));
    82848286
    … …  
    82908292        AssertMsgBreakStmt(VALID_PTR(pDiskTo), ("pDiskTo=%#p\n", pDiskTo),
    82918293                           rc = VERR_INVALID_PARAMETER);
    8292         AssertMsg(pDiskTo->u32Signature == VBOXHDDDISK_SIGNATURE,
     8294        AssertMsg(pDiskTo->u32Signature == VDISK_SIGNATURE,
    82938295                  ("u32Signature=%08x\n", pDiskTo->u32Signature));
    82948296        AssertMsgBreakStmt(   (nImageFromSame < nImage || nImageFromSame == VD_IMAGE_CONTENT_UNKNOWN)
    … …  
    86358637        AssertMsgBreakStmt(VALID_PTR(pDisk), ("pDisk=%#p\n", pDisk),
    86368638                           rc = VERR_INVALID_PARAMETER);
    8637         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE,
     8639        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE,
    86388640                  ("u32Signature=%08x\n", pDisk->u32Signature));
    86398641
    … …  
    87448746        AssertMsgBreakStmt(VALID_PTR(pDisk), ("pDisk=%#p\n", pDisk),
    87458747                           rc = VERR_INVALID_PARAMETER);
    8746         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE,
     8748        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE,
    87478749                  ("u32Signature=%08x\n", pDisk->u32Signature));
    87488750
    … …  
    88588860        AssertMsgBreakStmt(VALID_PTR(pDisk), ("pDisk=%#p\n", pDisk),
    88598861                           rc = VERR_INVALID_PARAMETER);
    8860         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE,
     8862        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE,
    88618863                  ("u32Signature=%08x\n", pDisk->u32Signature));
    88628864
    … …  
    90579059        /* sanity check */
    90589060        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    9059         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9061        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    90609062
    90619063        /* Not worth splitting this up into a read lock phase and write
    … …  
    91699171        /* sanity check */
    91709172        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    9171         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9173        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    91729174
    91739175        rc2 = vdThreadStartWrite(pDisk);
    … …  
    92099211        /* sanity check */
    92109212        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    9211         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9213        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    92129214
    92139215        AssertMsgBreakStmt(!(fFlags & ~VD_FILTER_FLAGS_MASK),
    … …  
    92659267        /* sanity check */
    92669268        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    9267         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9269        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    92689270
    92699271        /* Lock the entire operation. */
    … …  
    93299331        /* sanity check */
    93309332        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    9331         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9333        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    93329334
    93339335        /* Lock the entire operation. */
    … …  
    93859387        /* sanity check */
    93869388        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    9387         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9389        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    93889390
    93899391        /* Check arguments. */
    … …  
    94549456        /* sanity check */
    94559457        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    9456         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9458        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    94579459
    94589460        /* Check arguments. */
    … …  
    95239525        /* sanity check */
    95249526        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    9525         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9527        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    95269528
    95279529        rc2 = vdThreadStartWrite(pDisk);
    … …  
    95779579        /* sanity check */
    95789580        AssertPtrBreakStmt(pDisk, cImages = 0);
    9579         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9581        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    95809582
    95819583        rc2 = vdThreadStartRead(pDisk);
    … …  
    96149616        /* sanity check */
    96159617        AssertPtrBreakStmt(pDisk, fReadOnly = false);
    9616         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9618        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    96179619
    96189620        rc2 = vdThreadStartRead(pDisk);
    … …  
    96579659        /* sanity check */
    96589660        AssertPtrBreakStmt(pDisk, cbSector = 0);
    9659         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9661        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    96609662
    96619663        rc2 = vdThreadStartRead(pDisk);
    … …  
    96979699        /* sanity check */
    96989700        AssertPtrBreakStmt(pDisk, cbSize = 0);
    9699         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9701        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    97009702
    97019703        rc2 = vdThreadStartRead(pDisk);
    … …  
    97379739        /* sanity check */
    97389740        AssertPtrBreakStmt(pDisk, cbSize = 0);
    9739         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9741        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    97409742
    97419743        rc2 = vdThreadStartRead(pDisk);
    … …  
    97819783        /* sanity check */
    97829784        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    9783         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9785        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    97849786
    97859787        /* Check arguments. */
    … …  
    98469848        /* sanity check */
    98479849        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    9848         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9850        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    98499851
    98509852        /* Check arguments. */
    … …  
    99499951        /* sanity check */
    99509952        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    9951         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     9953        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    99529954
    99539955        /* Check arguments. */
    … …  
    1001410016        /* sanity check */
    1001510017        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10016         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10018        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1001710019
    1001810020        /* Check arguments. */
    … …  
    1011910121        /* sanity check */
    1012010122        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10121         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10123        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1012210124
    1012310125        /* Check arguments. */
    … …  
    1023010232        /* sanity check */
    1023110233        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10232         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10234        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1023310235
    1023410236        /* Check arguments. */
    … …  
    1027910281        /* sanity check */
    1028010282        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10281         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10283        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1028210284
    1028310285        /* Check arguments. */
    … …  
    1033110333        /* sanity check */
    1033210334        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10333         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10335        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1033410336
    1033510337        /* Check arguments. */
    … …  
    1038010382        /* sanity check */
    1038110383        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10382         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10384        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1038310385
    1038410386        /* Check arguments. */
    … …  
    1043010432        /* sanity check */
    1043110433        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10432         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10434        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1043310435
    1043410436        /* Check arguments. */
    … …  
    1049110493        /* sanity check */
    1049210494        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10493         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10495        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1049410496
    1049510497        /* Check arguments. */
    … …  
    1055610558        /* sanity check */
    1055710559        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10558         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10560        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1055910561
    1056010562        /* Check arguments. */
    … …  
    1060910611        /* sanity check */
    1061010612        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10611         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10613        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1061210614
    1061310615        /* Check arguments. */
    … …  
    1065710659        /* sanity check */
    1065810660        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10659         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10661        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1066010662
    1066110663        /* Check arguments. */
    … …  
    1070510707        /* sanity check */
    1070610708        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10707         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10709        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1070810710
    1070910711        AssertMsgBreakStmt(VALID_PTR(pUuid) || pUuid == NULL,
    … …  
    1075710759        /* sanity check */
    1075810760        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10759         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10761        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1076010762
    1076110763        /* Check arguments. */
    … …  
    1080610808        /* sanity check */
    1080710809        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10808         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10810        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1080910811
    1081010812        /* Check arguments. */
    … …  
    1086110863        /* sanity check */
    1086210864        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10863         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10865        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1086410866
    1086510867        /* Check arguments. */
    … …  
    1090910911        /* sanity check */
    1091010912        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10911         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10913        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1091210914
    1091310915        /* Check arguments. */
    … …  
    1095710959        /* sanity check */
    1095810960        AssertPtrBreak(pDisk);
    10959         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10961        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1096010962
    1096110963        if (!pDisk->pInterfaceError || !VALID_PTR(pDisk->pInterfaceError->pfnMessage))
    … …  
    1099510997        /* sanity check */
    1099610998        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10997         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     10999        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1099811000
    1099911001        /* Check arguments. */
    … …  
    1105811060        /* sanity check */
    1105911061        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    11060         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     11062        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1106111063
    1106211064        /* Check arguments. */
    … …  
    1112911131        /* sanity check */
    1113011132        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    11131         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     11133        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1113211134
    1113311135        /* Check arguments. */
    … …  
    1119711199        /* sanity check */
    1119811200        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    11199         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     11201        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1120011202
    1120111203        rc2 = vdThreadStartWrite(pDisk);
    … …  
    1125311255        /* sanity check */
    1125411256        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    11255         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
     11257        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    1125611258
    1125711259        rc2 = vdThreadStartWrite(pDisk);
Note: See TracChangeset for help on using the changeset viewer.

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