Index: trunk/src/VBox/Devices/Audio/DevIchAc97.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DevIchAc97.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Audio/DevIchAc97.cpp	(revision 11266)
@@ -1403,5 +1403,5 @@
                                       ichac97IOPortNABMWrite, ichac97IOPortNABMRead,
                                       NULL, NULL, "ICHAC97 NABM");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -1622,15 +1622,15 @@
      */
     rc = PDMDevHlpPCIRegister (pDevIns, &pData->dev);
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         return rc;
 
     rc = PDMDevHlpPCIIORegionRegister (pDevIns, 0, 256, PCI_ADDRESS_SPACE_IO,
                                        ichac97IOPortMap);
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         return rc;
 
     rc = PDMDevHlpPCIIORegionRegister (pDevIns, 1, 64, PCI_ADDRESS_SPACE_IO,
                                        ichac97IOPortMap);
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         return rc;
 
@@ -1639,5 +1639,5 @@
                                NULL, ichac97SaveExec, NULL,
                                NULL, ichac97LoadExec, NULL);
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         return rc;
 
@@ -1649,5 +1649,5 @@
     if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
         Log (("ac97: No attached driver!\n"));
-    else if (VBOX_FAILURE (rc))
+    else if (RT_FAILURE (rc))
     {
         AssertMsgFailed (("Failed to attach AC97 LUN #0! rc=%Vrc\n", rc));
Index: trunk/src/VBox/Devices/Audio/DevSB16.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DevSB16.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Audio/DevSB16.cpp	(revision 11266)
@@ -1747,15 +1747,15 @@
      */
     rc = CFGMR3QuerySIntDef(pCfgHandle, "IRQ", &s->irq, 5);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"IRQ\" value"));
 
     rc = CFGMR3QuerySIntDef(pCfgHandle, "DMA", &s->dma, 1);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"DMA\" value"));
 
     rc = CFGMR3QuerySIntDef(pCfgHandle, "DMA16", &s->hdma, 5);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"DMA16\" value"));
@@ -1763,5 +1763,5 @@
     RTIOPORT Port;
     rc = CFGMR3QueryPortDef(pCfgHandle, "Port", &Port, 0x220);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"Port\" value"));
@@ -1770,5 +1770,5 @@
     uint16_t u16Version;
     rc = CFGMR3QueryU16Def(pCfgHandle, "Version", &u16Version, 0x0405);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"Version\" value"));
@@ -1795,21 +1795,21 @@
      */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, sb16Timer, "SB16 timer", &s->pTimer);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         AssertMsgFailedReturn(("pfnTMTimerCreate -> %Vrc\n", rc), rc);
 
     rc = PDMDevHlpIOPortRegister(pDevIns, s->port + 0x04,  2, s,
                                  mixer_write, mixer_read, NULL, NULL, "SB16");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = PDMDevHlpIOPortRegister(pDevIns, s->port + 0x06, 10, s,
                                  dsp_write, dsp_read, NULL, NULL, "SB16");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
     rc = PDMDevHlpDMARegister(pDevIns, s->hdma, SB_read_DMA, s);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = PDMDevHlpDMARegister(pDevIns, s->dma, SB_read_DMA, s);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -1818,5 +1818,5 @@
     rc = PDMDevHlpSSMRegister(pDevIns, pDevIns->pDevReg->szDeviceName, iInstance, SB16_SSM_VERSION,
                               sizeof(*s), NULL, SaveExec, NULL, NULL, LoadExec, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -1824,5 +1824,5 @@
     if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
         Log(("sb16: No attached driver!\n"));
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         AssertMsgFailedReturn(("Failed to attach SB16 LUN #0! rc=%Vrc\n", rc), rc);
 
Index: trunk/src/VBox/Devices/Audio/audio.c
===================================================================
--- trunk/src/VBox/Devices/Audio/audio.c	(revision 11265)
+++ trunk/src/VBox/Devices/Audio/audio.c	(revision 11266)
@@ -1628,5 +1628,5 @@
     rc = pDrvIns->pDrvHlp->pfnTMTimerCreate (pDrvIns, TMCLOCK_VIRTUAL,
                                              audio_timer_helper, "Audio timer", &s->ts);
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         return rc;
 
@@ -2002,13 +2002,13 @@
 
     rc = CFGMR3QueryStringAlloc (pCfgHandle, "AudioDriver", &drvname);
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         return rc;
 
     rc = CFGMR3QueryStringAlloc (pCfgHandle, "StreamName", &audio_streamname);
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         audio_streamname = NULL;
 
     rc = AUD_init (pDrvIns, drvname);
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         return rc;
 
Index: trunk/src/VBox/Devices/Audio/audiosniffer.c
===================================================================
--- trunk/src/VBox/Devices/Audio/audiosniffer.c	(revision 11265)
+++ trunk/src/VBox/Devices/Audio/audiosniffer.c	(revision 11266)
@@ -196,5 +196,5 @@
     rc = PDMDevHlpDriverAttach(pDevIns, 0, &pData->Base, &pData->pDrvBase, "Audio Sniffer Port");
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         pData->pDrv = (PPDMIAUDIOSNIFFERCONNECTOR)pData->pDrvBase->pfnQueryInterface(pData->pDrvBase, PDMINTERFACE_AUDIO_SNIFFER_CONNECTOR);
@@ -216,5 +216,5 @@
     }
 
-    if (VBOX_SUCCESS (rc))
+    if (RT_SUCCESS (rc))
     {
         /* Save PDM device instance data for future reference. */
Index: trunk/src/VBox/Devices/Builtins.cpp
===================================================================
--- trunk/src/VBox/Devices/Builtins.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Builtins.cpp	(revision 11266)
@@ -59,85 +59,85 @@
 
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePCI);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePcArch);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePcBios);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePS2KeyboardMouse);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePIIX3IDE);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceI8254);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceI8259);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceMC146818);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceVga);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceVMMDev);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePCNet);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #ifdef VBOX_WITH_E1000
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceE1000);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
 #ifdef VBOX_WITH_INIP
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceINIP);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceICHAC97);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceSB16);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceAudioSniffer);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #ifdef VBOX_WITH_USB
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceOHCI);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
 #ifdef VBOX_WITH_EHCI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEHCI);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
 #ifdef VBOX_ACPI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceACPI);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceDMA);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceFloppyController);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceSerialPort);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceParallelPort);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #ifdef VBOX_WITH_AHCI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceAHCI);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
@@ -160,68 +160,68 @@
 
     int rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvMouseQueue);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvKeyboardQueue);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvBlock);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvVBoxHDD);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvVD);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_WINDOWS)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostDVD);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
 #if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostFloppy);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvMediaISO);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvRawImage);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #ifdef VBOX_WITH_ISCSI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvISCSI);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvISCSITransportTcp);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
 #ifndef RT_OS_L4
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNAT);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
 #if defined(RT_OS_L4) || defined(RT_OS_LINUX) || defined(RT_OS_OS2) || (defined(RT_OS_SOLARIS) && !defined(RT_OS_SOLARIS_10)) || defined(RT_OS_WINDOWS)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostInterface);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvIntNet);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNetSniffer);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvAUDIO);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvACPI);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
 #ifdef VBOX_WITH_USB
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvVUSBRootHub);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
@@ -229,8 +229,8 @@
 #if !defined(RT_OS_L4)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNamedPipe);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvChar);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
@@ -238,5 +238,5 @@
 #if defined(RT_OS_LINUX)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostParallel);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
@@ -244,5 +244,5 @@
 #if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostSerial);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
@@ -250,9 +250,9 @@
 #if defined(VBOX_WITH_PDM_ASYNC_COMPLETION)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvRawImageAsync);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvTransportAsync);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
@@ -273,5 +273,5 @@
 {
     int rc = pCallbacks->pfnRegister(pCallbacks, &g_UsbDevProxy);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
Index: trunk/src/VBox/Devices/Builtins2.cpp
===================================================================
--- trunk/src/VBox/Devices/Builtins2.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Builtins2.cpp	(revision 11266)
@@ -63,8 +63,8 @@
 
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceAPIC);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceIOAPIC);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
Index: trunk/src/VBox/Devices/Bus/DevPCI.cpp
===================================================================
--- trunk/src/VBox/Devices/Bus/DevPCI.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Bus/DevPCI.cpp	(revision 11266)
@@ -1018,5 +1018,5 @@
             SSMR3PutMem(pSSMHandle, pDev->config, sizeof(pDev->config));
             rc = SSMR3PutS32(pSSMHandle, pDev->Int.s.iIrq);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return rc;
         }
@@ -1059,5 +1059,5 @@
     /* separator */
     rc = SSMR3GetU32(pSSMHandle, &u32);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     if (u32 != (uint32_t)~0)
@@ -1074,5 +1074,5 @@
         /* index / terminator */
         rc = SSMR3GetU32(pSSMHandle, &u32);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
         if (u32 == (uint32_t)~0)
@@ -1100,5 +1100,5 @@
         SSMR3GetMem(pSSMHandle, DevTmp.config, sizeof(DevTmp.config));
         rc = SSMR3GetS32(pSSMHandle, &DevTmp.Int.s.iIrq);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
 
@@ -1389,5 +1389,5 @@
     {
         AssertMsgFailed(("Writing to PIC failed!\n"));
-        return VBOX_SUCCESS(rc) ? VERR_INTERNAL_ERROR : rc;
+        return RT_SUCCESS(rc) ? VERR_INTERNAL_ERROR : rc;
     }
 
@@ -1445,5 +1445,5 @@
     bool fUseIoApic;
     rc = CFGMR3QueryBoolDef(pCfgHandle, "IOAPIC", &fUseIoApic, false);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to query boolean value \"IOAPIC\""));
@@ -1452,5 +1452,5 @@
     bool fGCEnabled;
     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to query boolean value \"GCEnabled\""));
@@ -1459,5 +1459,5 @@
     bool fR0Enabled;
     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to query boolean value \"R0Enabled\""));
@@ -1492,5 +1492,5 @@
     PciBusReg.pszSetIrqR0             = fR0Enabled ? "pciSetIrq" : NULL;
     rc = pDevIns->pDevHlp->pfnPCIBusRegister(pDevIns, &PciBusReg, &pBus->pPciHlpR3);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Failed to register ourselves as a PCI Bus"));
@@ -1536,12 +1536,12 @@
      */
     rc = PDMDevHlpIOPortRegister(pDevIns, 0x0cf8, 1, NULL, pciIOPortAddressWrite, pciIOPortAddressRead, NULL, NULL, "i440FX (PCI)");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = PDMDevHlpIOPortRegister(pDevIns, 0x0cfc, 4, NULL, pciIOPortDataWrite, pciIOPortDataRead, NULL, NULL, "i440FX (PCI)");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = PDMDevHlpSSMRegister(pDevIns, "pci", iInstance, 2, sizeof(*pBus),
                               NULL, pciSaveExec, NULL, NULL, pciLoadExec, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
Index: trunk/src/VBox/Devices/Input/DevPS2.cpp
===================================================================
--- trunk/src/VBox/Devices/Input/DevPS2.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Input/DevPS2.cpp	(revision 11266)
@@ -1186,5 +1186,5 @@
      */
     rc = SSMR3GetU32(f, &u32);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     if (u32 > ELEMENTS(s->queue.data))
@@ -1196,5 +1196,5 @@
     {
         rc = SSMR3GetU8(f, &s->queue.data[i]);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -1204,5 +1204,5 @@
 
     rc = SSMR3GetU32(f, &u32);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     if (u32 > ELEMENTS(s->mouse_command_queue.data))
@@ -1214,5 +1214,5 @@
     {
         rc = SSMR3GetU8(f, &s->mouse_command_queue.data[i]);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -1222,5 +1222,5 @@
 
     rc = SSMR3GetU32(f, &u32);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     if (u32 > ELEMENTS(s->mouse_event_queue.data))
@@ -1232,5 +1232,5 @@
     {
         rc = SSMR3GetU8(f, &s->mouse_event_queue.data[i]);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -1241,5 +1241,5 @@
     /* terminator */
     rc = SSMR3GetU32(f, &u32);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     if (u32 != ~0U)
Index: trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp
===================================================================
--- trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp	(revision 11266)
@@ -167,5 +167,5 @@
     PDRVKBDQUEUEITEM    pItem = (PDRVKBDQUEUEITEM)pItemCore;
     int rc = pData->pUpPort->pfnPutEvent(pData->pUpPort, pItem->u8KeyCode);
-    return VBOX_SUCCESS(rc);
+    return RT_SUCCESS(rc);
 }
 
@@ -284,5 +284,5 @@
     PPDMIBASE pDownBase;
     int rc = pDrvIns->pDrvHlp->pfnAttach(pDrvIns, &pDownBase);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Failed to attach driver below us! rc=%Vra\n", rc));
@@ -303,5 +303,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         cMilliesInterval = 0;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: 32-bit \"Interval\" -> rc=%Vrc\n", rc));
@@ -313,5 +313,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         cItems = 128;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: 32-bit \"QueueSize\" -> rc=%Vrc\n", rc));
@@ -320,5 +320,5 @@
 
     rc = pDrvIns->pDrvHlp->pfnPDMQueueCreate(pDrvIns, sizeof(DRVKBDQUEUEITEM), cItems, cMilliesInterval, drvKbdQueueConsumer, &pDrv->pQueue);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Failed to create driver: cItems=%d cMilliesInterval=%d rc=%Vrc\n", cItems, cMilliesInterval, rc));
Index: trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp
===================================================================
--- trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp	(revision 11266)
@@ -155,5 +155,5 @@
     PDRVMOUSEQUEUEITEM    pItem = (PDRVMOUSEQUEUEITEM)pItemCore;
     int rc = pData->pUpPort->pfnPutEvent(pData->pUpPort, pItem->i32DeltaX, pItem->i32DeltaY, pItem->i32DeltaZ, pItem->fButtonStates);
-    return VBOX_SUCCESS(rc);
+    return RT_SUCCESS(rc);
 }
 
@@ -270,5 +270,5 @@
     PPDMIBASE pDownBase;
     int rc = pDrvIns->pDrvHlp->pfnAttach(pDrvIns, &pDownBase);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Failed to attach driver below us! rc=%Vra\n", rc));
@@ -289,5 +289,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         cMilliesInterval = 0;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: 32-bit \"Interval\" -> rc=%Vrc\n", rc));
@@ -299,5 +299,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         cItems = 128;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: 32-bit \"QueueSize\" -> rc=%Vrc\n", rc));
@@ -306,5 +306,5 @@
 
     rc = pDrvIns->pDrvHlp->pfnPDMQueueCreate(pDrvIns, sizeof(DRVMOUSEQUEUEITEM), cItems, cMilliesInterval, drvMouseQueueConsumer, &pDrv->pQueue);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Failed to create driver: cItems=%d cMilliesInterval=%d rc=%Vrc\n", cItems, cMilliesInterval, rc));
Index: trunk/src/VBox/Devices/Network/DrvIntNet.cpp
===================================================================
--- trunk/src/VBox/Devices/Network/DrvIntNet.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Network/DrvIntNet.cpp	(revision 11266)
@@ -461,5 +461,5 @@
                      */
                     rc = drvIntNetAsyncIoWaitForSpace(pThis);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                     {
                         STAM_PROFILE_ADV_STOP(&pThis->StatReceive, a);
@@ -497,5 +497,5 @@
         STAM_PROFILE_ADV_STOP(&pThis->StatReceive, a);
         int rc = pDrvIns->pDrvHlp->pfnSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_IF_WAIT, &WaitReq, sizeof(WaitReq));
-        if (    VBOX_FAILURE(rc)
+        if (    RT_FAILURE(rc)
             &&  rc != VERR_TIMEOUT
             &&  rc != VERR_INTERRUPTED)
@@ -533,5 +533,5 @@
             {
                 int rc = RTSemEventWait(pThis->EventSuspended, 30000);
-                if (    VBOX_FAILURE(rc)
+                if (    RT_FAILURE(rc)
                     &&  rc != VERR_TIMEOUT)
                 {
@@ -546,5 +546,5 @@
                 int rc = drvIntNetAsyncIoRun(pThis);
                 if (    rc != VERR_STATE_CHANGED
-                    &&  VBOX_FAILURE(rc))
+                    &&  RT_FAILURE(rc))
                 {
                     LogFlow(("drvIntNetAsyncIoThread: returns %Vrc\n", rc));
@@ -795,5 +795,5 @@
      */
     rc = CFGMR3QueryString(pCfgHandle, "Network", OpenReq.szNetwork, sizeof(OpenReq.szNetwork));
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: Failed to get the \"Network\" value"));
@@ -807,5 +807,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         u32TrunkType = kIntNetTrunkType_None;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: Failed to get the \"TrunkType\" value"));
@@ -818,5 +818,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         OpenReq.szTrunk[0] = '\0';
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: Failed to get the \"Trunk\" value"));
@@ -830,5 +830,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         fRestrictAccess = true;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: Failed to get the \"RestrictAccess\" value"));
@@ -841,5 +841,5 @@
     bool fSharedMacOnWire;
     rc = CFGMR3QueryBoolDef(pCfgHandle, "SharedMacOnWire", &fSharedMacOnWire, false);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: Failed to get the \"SharedMacOnWire\" value"));
@@ -853,5 +853,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         OpenReq.cbRecv = 218 * _1K ;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: Failed to get the \"ReceiveBufferSize\" value"));
@@ -868,5 +868,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         OpenReq.cbSend = 36*_1K;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: Failed to get the \"SendBufferSize\" value"));
@@ -884,5 +884,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pThis->fActivateEarlyDeactivateLate = false;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: Failed to get the \"IsService\" value"));
@@ -920,5 +920,5 @@
      */
     rc = RTSemEventCreate(&pThis->EventSuspended);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -928,5 +928,5 @@
     OpenReq.hIf = INTNET_HANDLE_INVALID;
     rc = pDrvIns->pDrvHlp->pfnSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_OPEN, &OpenReq, sizeof(OpenReq));
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
                                    N_("Failed to open/create the internal network '%s'"), pThis->szNetwork);
@@ -945,5 +945,5 @@
     GetRing3BufferReq.pRing3Buf = NULL;
     rc = pDrvIns->pDrvHlp->pfnSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_IF_GET_RING3_BUFFER, &GetRing3BufferReq, sizeof(GetRing3BufferReq));
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
                                    N_("Failed to get ring-3 buffer for the newly created interface to '%s'"), pThis->szNetwork);
@@ -956,5 +956,5 @@
      */
     rc = RTThreadCreate(&pThis->Thread, drvIntNetAsyncIoThread, pThis, _128K, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "INTNET");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertRC(rc);
Index: trunk/src/VBox/Devices/Network/DrvNAT.cpp
===================================================================
--- trunk/src/VBox/Devices/Network/DrvNAT.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Network/DrvNAT.cpp	(revision 11266)
@@ -378,8 +378,8 @@
             if (rc == VERR_CFGM_VALUE_NOT_FOUND)
                 fUDP = false;
-            else if (VBOX_FAILURE(rc))
+            else if (RT_FAILURE(rc))
                 return PDMDrvHlpVMSetError(pData->pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"UDP\" boolean failed"), iInstance);
         }
-        else if (VBOX_SUCCESS(rc))
+        else if (RT_SUCCESS(rc))
         {
             if (!RTStrICmp(szProtocol, "TCP"))
@@ -396,5 +396,5 @@
         int32_t iHostPort;
         rc = CFGMR3QueryS32(pNode, "HostPort", &iHostPort);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return PDMDrvHlpVMSetError(pData->pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"HostPort\" integer failed"), iInstance);
 
@@ -402,5 +402,5 @@
         int32_t iGuestPort;
         rc = CFGMR3QueryS32(pNode, "GuestPort", &iGuestPort);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return PDMDrvHlpVMSetError(pData->pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"GuestPort\" integer failed"), iInstance);
 
@@ -411,5 +411,5 @@
             RTStrPrintf(szGuestIP, sizeof(szGuestIP), "%d.%d.%d.%d",
                         (Network & 0xFF000000) >> 24, (Network & 0xFF0000) >> 16, (Network & 0xFF00) >> 8, (Network & 0xE0) | 15);
-        else if (VBOX_FAILURE(rc))
+        else if (RT_FAILURE(rc))
             return PDMDrvHlpVMSetError(pData->pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"GuestIP\" string failed"), iInstance);
         struct in_addr GuestIP;
@@ -514,12 +514,12 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         fPassDomain = true;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"PassDomain\" boolean failed"), pDrvIns->iInstance);
 
     rc = CFGMR3QueryStringAlloc(pCfgHandle, "TFTPPrefix", &pData->pszTFTPPrefix);
-    if (VBOX_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
+    if (RT_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"TFTPPrefix\" string failed"), pDrvIns->iInstance);
     rc = CFGMR3QueryStringAlloc(pCfgHandle, "BootFile", &pData->pszBootFile);
-    if (VBOX_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
+    if (RT_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"BootFile\" string failed"), pDrvIns->iInstance);
 
@@ -540,5 +540,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         RTStrPrintf(szNetwork, sizeof(szNetwork), "10.0.%d.0/24", pDrvIns->iInstance + 2);
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"Network\" string failed"), pDrvIns->iInstance);
 
@@ -556,9 +556,9 @@
      */
     rc = RTCritSectInit(&pData->CritSect);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #if 0
     rc = RTSemEventCreate(&g_EventSem);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /*
@@ -567,5 +567,5 @@
         g_fThreadTerm = false;
         rc = RTThreadCreate(&g_ThreadSelect, drvNATSelectThread, 0, NULL, "NATSEL");
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
 #endif
@@ -575,8 +575,8 @@
              */
             rc = slirp_init(&pData->pNATState, &szNetAddr[0], Netmask, fPassDomain, pData->pszTFTPPrefix, pData->pszBootFile, pData);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 int rc2 = drvNATConstructRedir(pDrvIns->iInstance, pData, pCfgHandle, Network);
-                if (VBOX_SUCCESS(rc2))
+                if (RT_SUCCESS(rc2))
                 {
                     /*
Index: trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp
===================================================================
--- trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp	(revision 11266)
@@ -346,5 +346,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         RTStrPrintf(pThis->szFilename, sizeof(pThis->szFilename), "./VBox-%x.pcap", RTProcSelf());
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Failed to query \"File\", rc=%Vrc.\n", rc));
@@ -379,5 +379,5 @@
     if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
         pThis->pConnector = NULL;
-    else if (VBOX_SUCCESS(rc))
+    else if (RT_SUCCESS(rc))
     {
         pThis->pConnector = (PPDMINETWORKCONNECTOR)pBaseDown->pfnQueryInterface(pBaseDown, PDMINTERFACE_NETWORK_CONNECTOR);
@@ -398,5 +398,5 @@
      */
     rc = RTCritSectInit(&pThis->Lock);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -406,5 +406,5 @@
     rc = RTFileOpen(&pThis->File, pThis->szFilename,
                     RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_WRITE);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Failed to create file '%s' for writing. rc=%Vrc\n", pThis->szFilename, rc));
Index: trunk/src/VBox/Devices/Network/DrvTAP.cpp
===================================================================
--- trunk/src/VBox/Devices/Network/DrvTAP.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Network/DrvTAP.cpp	(revision 11266)
@@ -284,5 +284,5 @@
             rc = RTFileRead(pData->FileDevice, achBuf, sizeof(achBuf), &cbRead);
 #endif
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 /*
@@ -932,5 +932,5 @@
 #if defined(RT_OS_SOLARIS)   /** @todo Other platforms' TAP code should be moved here from ConsoleImpl & VBoxBFE. */
     rc = CFGMR3QueryStringAlloc(pCfgHandle, "TAPSetupApplication", &pData->pszSetupApplication);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         if (!RTPathExists(pData->pszSetupApplication))
@@ -942,5 +942,5 @@
 
     rc = CFGMR3QueryStringAlloc(pCfgHandle, "TAPTerminateApplication", &pData->pszTerminateApplication);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         if (!RTPathExists(pData->pszTerminateApplication))
@@ -953,10 +953,10 @@
 # ifdef VBOX_WITH_CROSSBOW
     rc = CFGMR3QueryBytes(pCfgHandle, "MAC", &pData->MacAddress, sizeof(pData->MacAddress));
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Configuration error: Failed to query \"MAC\""));
 # endif
 
     rc = CFGMR3QueryStringAlloc(pCfgHandle, "Device", &pData->pszDeviceName);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         pData->fStatic = false;
 
@@ -965,5 +965,5 @@
     {
         rc = drvTAPSetupApplication(pData);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return PDMDrvHlpVMSetError(pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,
                                        N_("Error running TAP setup application. rc=%d"), rc);
@@ -983,5 +983,5 @@
     rc = SolarisTAPAttach(pData);
 # endif
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -990,5 +990,5 @@
     int32_t iFile;
     rc = CFGMR3QueryS32(pCfgHandle, "FileHandle", &iFile);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: Query for \"FileHandle\" 32-bit signed integer failed"));
Index: trunk/src/VBox/Devices/Network/DrvTAPOs2.cpp
===================================================================
--- trunk/src/VBox/Devices/Network/DrvTAPOs2.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Network/DrvTAPOs2.cpp	(revision 11266)
@@ -450,5 +450,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         strcpy(pThis->szDevice, "\\DEV\\TAP$");
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: Query for \"Device\" failed"));
@@ -458,5 +458,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         iConnectTo = -1;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: Query for \"ConnectTo\" failed"));
@@ -467,5 +467,5 @@
      */
     rc = RTFileOpen(&pThis->hDevice, pThis->szDevice, RTFILE_O_DENY_NONE | RTFILE_O_READ);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
                                    N_("Failed to open tap device '%s'"), pThis->szDevice);
@@ -482,5 +482,5 @@
     else if (Parm[0])
         rc = VERR_GENERAL_FAILURE;
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
                                    N_("Failed to query LanNumber! orc=%d Parm={%ld,%ld}"),
@@ -509,5 +509,5 @@
         else if (Parm[0])
             rc = VERR_GENERAL_FAILURE;
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
                                        N_("Failed to connect %d to %d! orc=%d Parm={%ld,%ld}"),
Index: trunk/src/VBox/Devices/Network/DrvTAPWin.cpp
===================================================================
--- trunk/src/VBox/Devices/Network/DrvTAPWin.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Network/DrvTAPWin.cpp	(revision 11266)
@@ -381,5 +381,5 @@
     char *pszHostDriver = NULL;
     rc = CFGMR3QueryStringAlloc(pCfgHandle, "HostInterfaceName", &pszHostDriver);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: query for \"HostInterfaceName\" failed"));
@@ -391,5 +391,5 @@
 
     rc = CFGMR3QueryBytes(pCfgHandle, "GUID", szDriverGUID, sizeof(szDriverGUID));
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("Configuration error: could not query GUID"));
Index: trunk/src/VBox/Devices/PC/DevDMA.cpp
===================================================================
--- trunk/src/VBox/Devices/PC/DevDMA.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/PC/DevDMA.cpp	(revision 11266)
@@ -908,5 +908,5 @@
 #if 0
     rc = CFGMR3QueryBool (pCfgHandle, "HighPageEnable", &high_page_enable);
-    if (VBOX_FAILURE (rc)) {
+    if (RT_FAILURE (rc)) {
         return rc;
     }
@@ -928,5 +928,5 @@
     Assert(pDevIns->pDevHlp->pfnDMARegister);
     rc = pDevIns->pDevHlp->pfnDMACRegister (pDevIns, &reg, &s->pHlp);
-    if (VBOX_FAILURE (rc)) {
+    if (RT_FAILURE (rc)) {
         return rc;
     }
@@ -934,5 +934,5 @@
     rc = PDMDevHlpSSMRegister (pDevIns, pDevIns->pDevReg->szDeviceName, iInstance, 1, sizeof (*s),
                                NULL, SaveExec, NULL, NULL, LoadExec, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
Index: trunk/src/VBox/Devices/Parallel/DevParallel.cpp
===================================================================
--- trunk/src/VBox/Devices/Parallel/DevParallel.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Parallel/DevParallel.cpp	(revision 11266)
@@ -597,5 +597,5 @@
 
     rc = SSMR3GetU32(pSSMHandle, &u32);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -693,5 +693,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pData->fGCEnabled = true;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"GCEnabled\" value"));
@@ -700,5 +700,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pData->fR0Enabled = true;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"R0Enabled\" value"));
@@ -720,5 +720,5 @@
     RTStrPrintf(szName, sizeof(szName), "Parallel#%d", iInstance);
     rc = PDMDevHlpCritSectInit(pDevIns, &pData->CritSect, szName);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -726,5 +726,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         irq_lvl = 7;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"IRQ\" value"));
@@ -733,5 +733,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         io_base = 0x378;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"IOBase\" value"));
@@ -741,5 +741,5 @@
     pData->irq = irq_lvl;
     pData->base = io_base;
-    
+
     /* Init parallel state */
     pData->reg_data = 0;
@@ -751,5 +751,5 @@
                                  parallelIOPortWrite, parallelIOPortRead,
                                  NULL, NULL, "PARALLEL");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -759,5 +759,5 @@
                                  parallelIOPortWriteECP, parallelIOPortReadECP,
                                  NULL, NULL, "PARALLEL ECP");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif
@@ -767,5 +767,5 @@
         rc = PDMDevHlpIOPortRegisterGC(pDevIns, io_base, 8, 0, "parallelIOPortWrite",
                                       "parallelIOPortRead", NULL, NULL, "Parallel");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
 
@@ -773,5 +773,5 @@
         rc = PDMDevHlpIOPortRegisterGC(pDevIns, io_base+0x400, 8, 0, "parallelIOPortWriteECP",
                                       "parallelIOPortReadECP", NULL, NULL, "Parallel Ecp");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
 #endif
@@ -782,5 +782,5 @@
         rc = PDMDevHlpIOPortRegisterR0(pDevIns, io_base, 8, 0, "parallelIOPortWrite",
                                       "parallelIOPortRead", NULL, NULL, "Parallel");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
 
@@ -788,5 +788,5 @@
         rc = PDMDevHlpIOPortRegisterR0(pDevIns, io_base+0x400, 8, 0, "parallelIOPortWriteECP",
                                       "parallelIOPortReadECP", NULL, NULL, "Parallel Ecp");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
 #endif
@@ -796,7 +796,7 @@
      * changes are supported. */
     rc = PDMDevHlpDriverAttach(pDevIns, 0, &pData->IBase, &pData->pDrvBase, "Parallel Host");
-    if (VBOX_SUCCESS(rc))
-    {
-        pData->pDrvHostParallelConnector = (PDMIHOSTPARALLELCONNECTOR *)pData->pDrvBase->pfnQueryInterface(pData->pDrvBase, 
+    if (RT_SUCCESS(rc))
+    {
+        pData->pDrvHostParallelConnector = (PDMIHOSTPARALLELCONNECTOR *)pData->pDrvBase->pfnQueryInterface(pData->pDrvBase,
                                                                                                            PDMINTERFACE_HOST_PARALLEL_CONNECTOR);
         if (!pData->pDrvHostParallelConnector)
@@ -838,5 +838,5 @@
         NULL                            /* pfnLoadDone */
         );
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
Index: trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp
===================================================================
--- trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp	(revision 11266)
@@ -153,5 +153,5 @@
             break;
     }
- 
+
     ioctl(pData->FileDevice, PPSETMODE, &ppdev_mode);
 
@@ -301,5 +301,5 @@
     /* Device */
     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "DevicePath", &pData->pszDevicePath);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: query for \"DevicePath\" string returned %Vra.\n", rc));
@@ -311,6 +311,6 @@
      */
     rc = RTFileOpen(&pData->FileDevice, pData->pszDevicePath, RTFILE_O_OPEN | RTFILE_O_READWRITE);
-    if (VBOX_FAILURE(rc))
-        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("Parallel#%d could not open '%s'"), 
+    if (RT_FAILURE(rc))
+        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("Parallel#%d could not open '%s'"),
                                    pDrvIns->iInstance, pData->pszDevicePath);
 
@@ -318,9 +318,9 @@
      * Try to get exclusive access to parallel port
      */
-    rc = ioctl(pData->FileDevice, PPEXCL);     
+    rc = ioctl(pData->FileDevice, PPEXCL);
     if (rc < 0)
-        return PDMDrvHlpVMSetError(pDrvIns, RTErrConvertFromErrno(errno), RT_SRC_POS, 
+        return PDMDrvHlpVMSetError(pDrvIns, RTErrConvertFromErrno(errno), RT_SRC_POS,
                                    N_("Parallel#%d could not get exclusive access for parallel port '%s'"
-                                      "Be sure that no other process or driver accesses this port"), 
+                                      "Be sure that no other process or driver accesses this port"),
                                    pDrvIns->iInstance, pData->pszDevicePath);
 
@@ -330,7 +330,7 @@
     rc = ioctl(pData->FileDevice, PPCLAIM);
     if (rc < 0)
-        return PDMDrvHlpVMSetError(pDrvIns, RTErrConvertFromErrno(errno), RT_SRC_POS, 
+        return PDMDrvHlpVMSetError(pDrvIns, RTErrConvertFromErrno(errno), RT_SRC_POS,
                                    N_("Parallel#%d could not claim parallel port '%s'"
-                                      "Be sure that no other process or driver accesses this port"), 
+                                      "Be sure that no other process or driver accesses this port"),
                                    pDrvIns->iInstance, pData->pszDevicePath);
 
@@ -340,5 +340,5 @@
     pData->pDrvHostParallelPort = (PPDMIHOSTPARALLELPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_HOST_PARALLEL_PORT);
     if (!pData->pDrvHostParallelPort)
-        return PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_MISSING_INTERFACE_ABOVE, RT_SRC_POS, N_("Parallel#%d has no parallel port interface above"), 
+        return PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_MISSING_INTERFACE_ABOVE, RT_SRC_POS, N_("Parallel#%d has no parallel port interface above"),
                                    pDrvIns->iInstance);
 
@@ -359,7 +359,7 @@
      * Start waiting for interrupts.
      */
-    rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pData->pMonitorThread, pData, drvHostParallelMonitorThread, drvHostParallelWakeupMonitorThread, 0, 
+    rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pData->pMonitorThread, pData, drvHostParallelMonitorThread, drvHostParallelWakeupMonitorThread, 0,
                                   RTTHREADTYPE_IO, "ParMon");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("HostParallel#%d cannot create monitor thread"), pDrvIns->iInstance);
 
Index: trunk/src/VBox/Devices/Serial/DevSerial.cpp
===================================================================
--- trunk/src/VBox/Devices/Serial/DevSerial.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Serial/DevSerial.cpp	(revision 11266)
@@ -411,5 +411,5 @@
         PDMCritSectLeave(&pData->CritSect);
         rc = RTSemEventWait(pData->ReceiveSem, 250);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
 
@@ -605,5 +605,5 @@
 
     rc = SSMR3GetU32(pSSMHandle, &u32);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -738,5 +738,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pData->fGCEnabled = true;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"GCEnabled\" value"));
@@ -745,5 +745,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pData->fR0Enabled = true;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"R0Enabled\" value"));
@@ -766,5 +766,5 @@
     RTStrPrintf(szName, sizeof(szName), "Serial#%d", iInstance);
     rc = PDMDevHlpCritSectInit(pDevIns, &pData->CritSect, szName);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -778,5 +778,5 @@
             irq_lvl = 3;
     }
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"IRQ\" value"));
@@ -790,5 +790,5 @@
             io_base = 0x2f8;
     }
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the \"IOBase\" value"));
@@ -814,5 +814,5 @@
     pData->dev.config[0x3d] = 1;    /* interrupt pin 0 */
     rc = PDMDevHlpPCIRegister(pDevIns, &pData->dev);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     /*
@@ -820,5 +820,5 @@
      */
     rc = PDMDevHlpPCIIORegionRegister(pDevIns, 0, 8, PCI_ADDRESS_SPACE_IO, serialIOPortRegionMap);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #else /* !VBOX_SERIAL_PCI */
@@ -827,5 +827,5 @@
                                  serialIOPortWrite, serialIOPortRead,
                                  NULL, NULL, "SERIAL");
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         return rc;
 
@@ -843,5 +843,5 @@
      * changes are supported. */
     rc = PDMDevHlpDriverAttach(pDevIns, 0, &pData->IBase, &pData->pDrvBase, "Serial Char");
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         pData->pDrvChar = (PDMICHAR *)pData->pDrvBase->pfnQueryInterface(pData->pDrvBase, PDMINTERFACE_CHAR);
@@ -879,5 +879,5 @@
         NULL                    /* pfnLoadDone */
         );
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
Index: trunk/src/VBox/Devices/Serial/DrvChar.cpp
===================================================================
--- trunk/src/VBox/Devices/Serial/DrvChar.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Serial/DrvChar.cpp	(revision 11266)
@@ -157,5 +157,5 @@
     {
         int rc = RTSemEventWait(pData->SendSem, RT_INDEFINITE_WAIT);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
 
@@ -171,5 +171,5 @@
 
                 rc = pData->pDrvStream->pfnWrite(pData->pDrvStream, &pData->aSendQueue[pData->iSendQueueTail], &cbProcessed);
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                 {
                     Assert(cbProcessed);
@@ -226,5 +226,5 @@
                 cbRemaining = sizeof(aBuffer);
                 rc = pData->pDrvStream->pfnRead(pData->pDrvStream, aBuffer, &cbRemaining);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                 {
                     LogFlow(("Read failed with %Vrc\n", rc));
@@ -244,5 +244,5 @@
             cbProcessed = cbRemaining;
             rc = pData->pDrvCharPort->pfnNotifyRead(pData->pDrvCharPort, pBuffer, &cbProcessed);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 Assert(cbProcessed);
@@ -327,5 +327,5 @@
     PPDMIBASE pBase;
     int rc = pDrvIns->pDrvHlp->pfnAttach(pDrvIns, &pBase);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc; /* Don't call PDMDrvHlpVMSetError here as we assume that the driver already set an appropriate error */
     pData->pDrvStream = (PPDMISTREAM)pBase->pfnQueryInterface(pBase, PDMINTERFACE_STREAM);
@@ -334,5 +334,5 @@
 
     rc = RTThreadCreate(&pData->ReceiveThread, drvCharReceiveLoop, (void *)pData, 0, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "CharRecv");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("Char#%d cannot create receive thread"), pDrvIns->iInstance);
 
@@ -341,5 +341,5 @@
 
     rc = RTThreadCreate(&pData->SendThread, drvCharSendLoop, (void *)pData, 0, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "CharSend");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("Char#%d cannot create send thread"), pDrvIns->iInstance);
 
Index: trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp
===================================================================
--- trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp	(revision 11266)
@@ -428,5 +428,5 @@
     {
         int rc = RTSemEventWait(pData->SendSem, RT_INDEFINITE_WAIT);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
 
@@ -467,5 +467,5 @@
 #endif
 
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 Assert(cbProcessed);
@@ -473,5 +473,5 @@
                 pData->iSendQueueTail &= CHAR_MAX_SEND_QUEUE_MASK;
             }
-            else if (VBOX_FAILURE(rc))
+            else if (RT_FAILURE(rc))
             {
                 LogRel(("HostSerial#%d: Serial Write failed with %Vrc; terminating send thread\n", pDrvIns->iInstance, rc));
@@ -573,5 +573,5 @@
             }
             rc = RTFileRead(pData->DeviceFile, abBuffer, sizeof(abBuffer), &cbRead);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 LogRel(("HostSerial#%d: Read failed with %Vrc, terminating the worker thread.\n", pDrvIns->iInstance, rc));
@@ -638,5 +638,5 @@
                         uNewStatusLinesState |= PDM_ICHAR_STATUS_LINES_CTS;
                     rc = pData->pDrvCharPort->pfnNotifyStatusLinesChanged(pData->pDrvCharPort, uNewStatusLinesState);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                     {
                         /* Notifying device failed, continue but log it */
@@ -660,5 +660,5 @@
             size_t cbProcessed = cbRemaining;
             rc = pData->pDrvCharPort->pfnNotifyRead(pData->pDrvCharPort, pbBuffer, &cbProcessed);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 Assert(cbProcessed); Assert(cbProcessed <= cbRemaining);
@@ -802,5 +802,5 @@
         goto ioctl_error;
 
-    /* 
+    /*
      * Change current level on the RTS pin to make the ioctl call return in the
      * monitor thread.
@@ -921,5 +921,5 @@
     /* Device */
     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "DevicePath", &pData->pszDevicePath);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: query for \"DevicePath\" string returned %Vra.\n", rc));
@@ -968,5 +968,5 @@
 #endif
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Could not open host device %s, rc=%Vrc\n", pData->pszDevicePath, rc));
@@ -1029,5 +1029,5 @@
 
     rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pData->pRecvThread, pData, drvHostSerialRecvThread, drvHostSerialWakeupRecvThread, 0, RTTHREADTYPE_IO, "SerRecv");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("HostSerial#%d cannot create receive thread"), pDrvIns->iInstance);
 
@@ -1036,5 +1036,5 @@
 
     rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pData->pSendThread, pData, drvHostSerialSendThread, drvHostSerialWakeupSendThread, 0, RTTHREADTYPE_IO, "SerSend");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("HostSerial#%d cannot create send thread"), pDrvIns->iInstance);
 
@@ -1042,5 +1042,5 @@
     /* Linux needs a separate thread which monitors the status lines. */
     rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pData->pMonitorThread, pData, drvHostSerialMonitorThread, drvHostSerialWakeupMonitorThread, 0, RTTHREADTYPE_IO, "SerMon");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("HostSerial#%d cannot create monitor thread"), pDrvIns->iInstance);
 #endif
Index: trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp
===================================================================
--- trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp	(revision 11266)
@@ -142,5 +142,5 @@
         }
 
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             Log(("drvNamedPipeRead: FileRead returned %Vrc fShutdown=%d\n", rc, pData->fShutdown));
@@ -236,5 +236,5 @@
             cbWritten = *cbWrite;
 
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             if (    rc == VERR_EOF
@@ -442,5 +442,5 @@
 
     rc = CFGMR3QueryStringAlloc(pCfgHandle, "Location", &pszLocation);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: query \"Location\" resulted in %Vrc.\n", rc));
@@ -451,5 +451,5 @@
     bool fIsServer;
     rc = CFGMR3QueryBool(pCfgHandle, "IsServer", &fIsServer);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: query \"IsServer\" resulted in %Vrc.\n", rc));
@@ -474,5 +474,5 @@
 
         rc = RTThreadCreate(&pData->ListenThread, drvNamedPipeListenLoop, (void *)pData, 0, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "SerPipe");
-        if VBOX_FAILURE(rc)
+        if RT_FAILURE(rc)
             return PDMDrvHlpVMSetError(pDrvIns, rc,  RT_SRC_POS, N_("NamedPipe#%d failed to create listening thread"), pDrvIns->iInstance);
 
@@ -514,5 +514,5 @@
         pData->LocalSocketServer = s;
         rc = RTThreadCreate(&pData->ListenThread, drvNamedPipeListenLoop, (void *)pData, 0, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "SerPipe");
-        if VBOX_FAILURE(rc)
+        if RT_FAILURE(rc)
             return PDMDrvHlpVMSetError(pDrvIns, rc,  RT_SRC_POS, N_("NamedPipe#%d failed to create listening thread"), pDrvIns->iInstance);
     }
@@ -527,5 +527,5 @@
 
 out:
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         if (pszLocation)
@@ -582,5 +582,5 @@
     if (pData->NamedPipe != INVALID_HANDLE_VALUE)
     {
-        if (pData->fIsServer) 
+        if (pData->fIsServer)
         {
             FlushFileBuffers(pData->NamedPipe);
Index: trunk/src/VBox/Devices/Storage/DevATA.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/DevATA.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/DevATA.cpp	(revision 11266)
@@ -299,5 +299,5 @@
     LogBird(("ata: %x: signalling\n", pCtl->IOPortBase1));
     rc = PDMR3CritSectScheduleExitEvent(&pCtl->lock, pCtl->AsyncIOSem);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         LogBird(("ata: %x: schedule failed, rc=%Vrc\n", pCtl->IOPortBase1, rc));
@@ -743,5 +743,5 @@
     Assert(s->cbElementaryTransfer == 512);
     rc = s->pDrvBlock ? s->pDrvBlock->pfnGetUuid(s->pDrvBlock, &Uuid) : RTUuidClear(&Uuid);
-    if (VBOX_FAILURE(rc) || RTUuidIsNull(&Uuid))
+    if (RT_FAILURE(rc) || RTUuidIsNull(&Uuid))
     {
         PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
@@ -867,5 +867,5 @@
     Assert(s->cbElementaryTransfer == 512);
     rc = s->pDrvBlock ? s->pDrvBlock->pfnGetUuid(s->pDrvBlock, &Uuid) : RTUuidClear(&Uuid);
-    if (VBOX_FAILURE(rc) || RTUuidIsNull(&Uuid))
+    if (RT_FAILURE(rc) || RTUuidIsNull(&Uuid))
     {
         PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
@@ -1122,5 +1122,5 @@
     Log(("%s: %d sectors at LBA %d\n", __FUNCTION__, cSectors, iLBA));
     rc = ataReadSectors(s, iLBA, s->CTX_SUFF(pbIOBuffer), cSectors);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         ataSetSector(s, iLBA + cSectors);
@@ -1169,5 +1169,5 @@
     Log(("%s: %d sectors at LBA %d\n", __FUNCTION__, cSectors, iLBA));
     rc = ataWriteSectors(s, iLBA, s->CTX_SUFF(pbIOBuffer), cSectors);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         ataSetSector(s, iLBA + cSectors);
@@ -1276,5 +1276,5 @@
             aModeSenseCmd[9] = 0; /* control */
             rc = s->pDrvBlock->pfnSendCmd(s->pDrvBlock, aModeSenseCmd, PDMBLOCKTXDIR_FROM_DEVICE, aModeSenseResult, &cbTransfer, &uDummySense, 500);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 atapiCmdError(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_NONE);
@@ -1361,5 +1361,5 @@
                     /* data */
                     rc = s->pDrvBlock->pfnRead(s->pDrvBlock, (uint64_t)i * 2048, pbBuf, 2048);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         break;
                     pbBuf += 2048;
@@ -1379,5 +1379,5 @@
     STAM_PROFILE_STOP(&pCtl->StatLockWait, a);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         s->Led.Actual.s.fReading = 0;
@@ -1539,5 +1539,5 @@
     }
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         if (s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE)
@@ -2268,5 +2268,5 @@
                         break;
                 }
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                     atapiCmdOK(s);
                 else
@@ -3808,5 +3808,5 @@
         {
             rc = RTSemEventWait(pCtl->SuspendIOSem, RT_INDEFINITE_WAIT);
-            if (VBOX_FAILURE(rc) || pCtl->fShutdown)
+            if (RT_FAILURE(rc) || pCtl->fShutdown)
                 break;
 
@@ -3820,5 +3820,5 @@
             rc = RTSemEventWait(pCtl->AsyncIOSem, RT_INDEFINITE_WAIT);
             LogBird(("ata: %x: waking up\n", pCtl->IOPortBase1));
-            if (VBOX_FAILURE(rc) || pCtl->fShutdown)
+            if (RT_FAILURE(rc) || pCtl->fShutdown)
                 break;
 
@@ -4970,5 +4970,5 @@
         {
             rc = RTThreadWait(pData->aCts[i].AsyncIOThread, 30000 /* 30 s*/, NULL);
-            AssertMsg(VBOX_SUCCESS(rc) || rc == VERR_INVALID_HANDLE, ("rc=%Rrc i=%d\n", rc, i));
+            AssertMsg(RT_SUCCESS(rc) || rc == VERR_INVALID_HANDLE, ("rc=%Rrc i=%d\n", rc, i));
         }
     }
@@ -5103,5 +5103,5 @@
         Assert(!pIf->pbIOBufferR3);
         rc = MMHyperAlloc(pVM, pIf->cbIOBuffer, 1, MM_TAG_PDM_DEVICE_USER, (void **)&pIf->pbIOBufferR3);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return VERR_NO_MEMORY;
         pIf->pbIOBufferR0 = MMHyperR3ToR0(pVM, pIf->pbIOBufferR3);
@@ -5196,10 +5196,10 @@
      */
     rc = PDMDevHlpDriverAttach(pDevIns, pIf->iLUN, &pIf->IBase, &pIf->pDrvBase, NULL);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         rc = ataConfigLun(pDevIns, pIf);
     else
         AssertMsgFailed(("Failed to attach LUN#%d. rc=%Vrc\n", pIf->iLUN, rc));
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         pIf->pDrvBase = NULL;
@@ -5488,5 +5488,5 @@
 
     rc = SSMR3GetU32(pSSMHandle, &u32);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     if (u32 != ~0U)
@@ -5543,5 +5543,5 @@
 
     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 configuration error: failed to read GCEnabled as boolean"));
@@ -5549,5 +5549,5 @@
 
     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 configuration error: failed to read R0Enabled as boolean"));
@@ -5555,5 +5555,5 @@
 
     rc = CFGMR3QueryU32Def(pCfgHandle, "IRQDelay", &DelayIRQMillies, 0);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 configuration error: failed to read IRQDelay as integer"));
@@ -5562,5 +5562,5 @@
 
     rc = CFGMR3QueryBoolDef(pCfgHandle, "PIIX4", &pData->fPIIX4, false);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 configuration error: failed to read PIIX4 as boolean"));
@@ -5631,10 +5631,10 @@
      */
     rc = PDMDevHlpPCIRegister(pDevIns, &pData->dev);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 cannot register PCI device"));
     AssertMsg(pData->dev.devfn == 9 || iInstance != 0, ("pData->dev.devfn=%d\n", pData->dev.devfn));
     rc = PDMDevHlpPCIIORegionRegister(pDevIns, 4, 0x10, PCI_ADDRESS_SPACE_IO, ataBMDMAIORangeMap);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 cannot register PCI I/O region for BMDMA"));
@@ -5648,5 +5648,5 @@
         rc = PDMDevHlpIOPortRegister(pDevIns, pData->aCts[i].IOPortBase1, 8, (RTHCPTR)i,
                                      ataIOPortWrite1, ataIOPortRead1, ataIOPortWriteStr1, ataIOPortReadStr1, "ATA I/O Base 1");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register I/O handlers"));
 
@@ -5655,5 +5655,5 @@
             rc = PDMDevHlpIOPortRegisterGC(pDevIns, pData->aCts[i].IOPortBase1, 8, (RTGCPTR)i,
                                            "ataIOPortWrite1", "ataIOPortRead1", "ataIOPortWriteStr1", "ataIOPortReadStr1", "ATA I/O Base 1");
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register I/O handlers (GC)"));
         }
@@ -5668,5 +5668,5 @@
                                            "ataIOPortWrite1", "ataIOPortRead1", "ataIOPortWriteStr1", "ataIOPortReadStr1", "ATA I/O Base 1");
 #endif
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return PDMDEV_SET_ERROR(pDevIns, rc, "PIIX3 cannot register I/O handlers (R0).");
         }
@@ -5674,5 +5674,5 @@
         rc = PDMDevHlpIOPortRegister(pDevIns, pData->aCts[i].IOPortBase2, 1, (RTHCPTR)i,
                                      ataIOPortWrite2, ataIOPortRead2, NULL, NULL, "ATA I/O Base 2");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register base2 I/O handlers"));
 
@@ -5681,5 +5681,5 @@
             rc = PDMDevHlpIOPortRegisterGC(pDevIns, pData->aCts[i].IOPortBase2, 1, (RTGCPTR)i,
                                            "ataIOPortWrite2", "ataIOPortRead2", NULL, NULL, "ATA I/O Base 2");
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register base2 I/O handlers (GC)"));
         }
@@ -5688,5 +5688,5 @@
             rc = PDMDevHlpIOPortRegisterR0(pDevIns, pData->aCts[i].IOPortBase2, 1, (RTR0PTR)i,
                                            "ataIOPortWrite2", "ataIOPortRead2", NULL, NULL, "ATA I/O Base 2");
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register base2 I/O handlers (R0)"));
         }
@@ -5728,5 +5728,5 @@
         RTStrPrintf(szName, sizeof(szName), "ATA%d", i);
         rc = PDMDevHlpCritSectInit(pDevIns, &pData->aCts[i].lock, szName);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot initialize critical section"));
     }
@@ -5736,5 +5736,5 @@
      */
     rc = PDMDevHlpDriverAttach(pDevIns, PDM_STATUS_LUN, &pData->IBase, &pBase, "Status Port");
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         pData->pLedsConnector = (PDMILEDCONNECTORS *)pBase->pfnQueryInterface(pBase, PDMINTERFACE_LED_CONNECTORS);
     else if (rc != VERR_PDM_NO_ATTACHED_DRIVER)
@@ -5783,5 +5783,5 @@
 
             rc = PDMDevHlpDriverAttach(pDevIns, pIf->iLUN, &pIf->IBase, &pIf->pDrvBase, s_apszDescs[i][j]);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
                 rc = ataConfigLun(pDevIns, pIf);
             else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
@@ -5817,5 +5817,5 @@
                               ataSaveLoadPrep, ataSaveExec, NULL,
                               ataSaveLoadPrep, ataLoadExec, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register save state handlers"));
 
Index: trunk/src/VBox/Devices/Storage/DrvBlock.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/DrvBlock.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/DrvBlock.cpp	(revision 11266)
@@ -343,5 +343,5 @@
     int rc = pData->pDrvMedia->pfnBiosGetPCHSGeometry(pData->pDrvMedia, &pData->PCHSGeometry);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         *pPCHSGeometry = pData->PCHSGeometry;
@@ -377,5 +377,5 @@
     int rc = pData->pDrvMedia->pfnBiosSetPCHSGeometry(pData->pDrvMedia, pPCHSGeometry);
 
-    if (    VBOX_SUCCESS(rc)
+    if (    RT_SUCCESS(rc)
         ||  rc == VERR_NOT_IMPLEMENTED)
     {
@@ -415,5 +415,5 @@
     int rc = pData->pDrvMedia->pfnBiosGetLCHSGeometry(pData->pDrvMedia, &pData->LCHSGeometry);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         *pLCHSGeometry = pData->LCHSGeometry;
@@ -449,5 +449,5 @@
     int rc = pData->pDrvMedia->pfnBiosSetLCHSGeometry(pData->pDrvMedia, pLCHSGeometry);
 
-    if (    VBOX_SUCCESS(rc)
+    if (    RT_SUCCESS(rc)
         ||  rc == VERR_NOT_IMPLEMENTED)
     {
@@ -505,5 +505,5 @@
     {
         int rc = pData->pDrvIns->pDrvHlp->pfnMountPrepare(pData->pDrvIns, pszFilename, pszCoreDriver);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             Log(("drvblockMount: Prepare failed for \"%s\" rc=%Vrc\n", pszFilename, rc));
@@ -517,5 +517,5 @@
     PPDMIBASE pBase;
     int rc = pData->pDrvIns->pDrvHlp->pfnAttach(pData->pDrvIns, &pBase);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("drvblockMount: Attach failed rc=%Vrc\n", rc));
@@ -588,5 +588,5 @@
      */
     int rc = pData->pDrvIns->pDrvHlp->pfnDetach(pData->pDrvIns);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("drvblockUnmount: Detach failed rc=%Vrc\n", rc));
@@ -772,5 +772,5 @@
     char *psz;
     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "Type", &psz);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_BLOCK_NO_TYPE, N_("Failed to obtain the type"));
     if (!strcmp(psz, "HardDisk"))
@@ -802,15 +802,15 @@
     /* Mountable */
     rc = CFGMR3QueryBoolDef(pCfgHandle, "Mountable", &pData->fMountable, false);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"Mountable\" from the config"));
 
     /* Locked */
     rc = CFGMR3QueryBoolDef(pCfgHandle, "Locked", &pData->fLocked, false);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"Locked\" from the config"));
 
     /* BIOS visible */
     rc = CFGMR3QueryBoolDef(pCfgHandle, "BIOSVisible", &pData->fBiosVisible, true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"BIOSVisible\" from the config"));
 
@@ -819,15 +819,15 @@
     /* Cylinders */
     rc = CFGMR3QueryU32Def(pCfgHandle, "Cylinders", &pData->LCHSGeometry.cCylinders, 0);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"Cylinders\" from the config"));
 
     /* Heads */
     rc = CFGMR3QueryU32Def(pCfgHandle, "Heads", &pData->LCHSGeometry.cHeads, 0);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"Heads\" from the config"));
 
     /* Sectors */
     rc = CFGMR3QueryU32Def(pCfgHandle, "Sectors", &pData->LCHSGeometry.cSectors, 0);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"Sectors\" from the config"));
 
@@ -836,8 +836,8 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         RTUuidClear(&pData->Uuid);
-    else if (VBOX_SUCCESS(rc))
+    else if (RT_SUCCESS(rc))
     {
         rc = RTUuidFromStr(&pData->Uuid, psz);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, "%s",
@@ -853,5 +853,5 @@
 #ifdef VBOX_PERIODIC_FLUSH
     rc = CFGMR3QueryU32Def(pCfgHandle, "FlushInterval", &pData->cbFlushInterval, 0);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"FlushInterval\" from the config"));
 #endif /* VBOX_PERIODIC_FLUSH */
@@ -859,5 +859,5 @@
 #ifdef VBOX_IGNORE_FLUSH
     rc = CFGMR3QueryBoolDef(pCfgHandle, "IgnoreFlush", &pData->fIgnoreFlush, true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"IgnoreFlush\" from the config"));
 #endif /* VBOX_IGNORE_FLUSH */
@@ -871,5 +871,5 @@
         &&  pData->enmType != PDMBLOCKTYPE_HARD_DISK)
         return VINF_SUCCESS;
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertLogRelMsgFailed(("Failed to attach driver below us! rc=%Vra\n", rc));
Index: trunk/src/VBox/Devices/Storage/DrvHostBase.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/DrvHostBase.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/DrvHostBase.cpp	(revision 11266)
@@ -166,8 +166,8 @@
          */
         rc = RTFileSeek(pThis->FileDevice, off, RTFILE_SEEK_BEGIN, NULL);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             rc = RTFileRead(pThis->FileDevice, pvBuf, cbRead, NULL);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 Log2(("%s-%d: drvHostBaseRead: off=%#llx cbRead=%#x\n"
@@ -222,8 +222,8 @@
              */
             rc = RTFileSeek(pThis->FileDevice, off, RTFILE_SEEK_BEGIN, NULL);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 rc = RTFileWrite(pThis->FileDevice, pvBuf, cbWrite, NULL);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     Log(("%s-%d: drvHostBaseWrite: RTFileWrite(%d, %p, %#x) -> %Vrc (off=%#llx '%s')\n",
                          pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->FileDevice,
@@ -489,5 +489,5 @@
         if (pThis->pfnDoLock)
             rc = pThis->pfnDoLock(pThis, true);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
             pThis->fLocked = true;
     }
@@ -512,5 +512,5 @@
         if (pThis->pfnDoLock)
             rc = pThis->pfnDoLock(pThis, false);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
             pThis->fLocked = false;
     }
@@ -675,5 +675,5 @@
         char szName[128];
         int rc = drvHostBaseGetBSDName(DVDService, &szName[0], 0);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             pThis->pDASession = DASessionCreate(kCFAllocatorDefault);
@@ -891,9 +891,9 @@
 
                     /* Obtain exclusive access to the device so we can send SCSI commands. */
-                    if (VBOX_SUCCESS(rc))
+                    if (RT_SUCCESS(rc))
                         rc = drvHostBaseObtainExclusiveAccess(pThis, DVDService);
 
                     /* Cleanup on failure. */
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                     {
                         if (pThis->ppScsiTaskDI)
@@ -991,5 +991,5 @@
     int rc = drvHostBaseOpen(pThis, &FileDevice, pThis->fReadOnlyConfig);
 #endif
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         if (!pThis->fReadOnlyConfig)
@@ -1002,5 +1002,5 @@
 #endif
         }
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             LogFlow(("%s-%d: failed to open device '%s', rc=%Vrc\n",
@@ -1052,5 +1052,5 @@
     };
     int rc = DRVHostBaseScsiCmd(pThis, abCmd, 6, PDMBLOCKTXDIR_FROM_DEVICE, &Buf, &cbBuf, NULL, 0, 0);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         Assert(cbBuf == sizeof(Buf));
@@ -1244,5 +1244,5 @@
      */
     int rc = drvHostBaseReopen(pThis);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -1252,5 +1252,5 @@
     uint64_t cb;
     rc = pThis->pfnGetMediaSize(pThis, &cb);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         LogFlow(("%s-%d: failed to figure media size of %s, rc=%Vrc\n",
@@ -1332,5 +1332,5 @@
                         int cRetries = 10;
                         int rc = DRVHostBaseMediaPresent(pThis);
-                        while (VBOX_FAILURE(rc) && cRetries-- > 0)
+                        while (RT_FAILURE(rc) && cRetries-- > 0)
                         {
                             RTThreadSleep(50);
@@ -1429,5 +1429,5 @@
 
             int rc = pThis->pfnPoll(pThis);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 RTSemEventWait(pThis->EventPoller, 50);
@@ -1449,5 +1449,5 @@
          */
         int rc = RTSemEventWait(pThis->EventPoller, pThis->cMilliesPoller);
-        if (    VBOX_FAILURE(rc)
+        if (    RT_FAILURE(rc)
             &&  rc != VERR_TIMEOUT)
         {
@@ -1542,5 +1542,5 @@
     {
         int rc = pThis->pfnDoLock(pThis, false);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
             pThis->fLocked = false;
     }
@@ -1739,5 +1739,5 @@
     /* Device */
     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "Path", &pThis->pszDevice);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: query for \"Path\" string returned %Vra.\n", rc));
@@ -1748,9 +1748,9 @@
     uint32_t u32;
     rc = CFGMR3QueryU32(pCfgHandle, "Interval", &u32);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         pThis->cMilliesPoller = u32;
     else if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pThis->cMilliesPoller = 1000;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: Query \"Mountable\" resulted in %Vrc.\n", rc));
@@ -1762,5 +1762,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pThis->fReadOnlyConfig = enmType == PDMBLOCKTYPE_DVD || enmType == PDMBLOCKTYPE_CDROM ? true : false;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: Query \"ReadOnly\" resulted in %Vrc.\n", rc));
@@ -1772,5 +1772,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pThis->fLocked = false;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: Query \"Locked\" resulted in %Vrc.\n", rc));
@@ -1782,5 +1782,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pThis->fBiosVisible = true;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: Query \"BIOSVisible\" resulted in %Vrc.\n", rc));
@@ -1793,8 +1793,8 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         RTUuidClear(&pThis->Uuid);
-    else if (VBOX_SUCCESS(rc))
+    else if (RT_SUCCESS(rc))
     {
         rc = RTUuidFromStr(&pThis->Uuid, psz);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             AssertMsgFailed(("Configuration error: Uuid from string failed on \"%s\", rc=%Vrc.\n", psz, rc));
@@ -1813,5 +1813,5 @@
     bool fAttachFailError;
     rc = CFGMR3QueryBool(pCfgHandle, "AttachFailError", &fAttachFailError);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         fAttachFailError = true;
     pThis->fAttachFailError = fAttachFailError;
@@ -1884,5 +1884,5 @@
                                           NULL, NULL, NULL,
                                           NULL, NULL, drvHostBaseLoadDone);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -1930,5 +1930,5 @@
     rc = drvHostBaseReopen(pThis);
 #endif
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         char *pszDevice = pThis->pszDevice;
@@ -1981,5 +1981,5 @@
     }
 #ifdef RT_OS_WINDOWS
-    if (VBOX_SUCCESS(src))
+    if (RT_SUCCESS(src))
         DRVHostBaseMediaPresent(pThis);
 #endif
@@ -1992,5 +1992,5 @@
         if (pThis->pfnDoLock)
             rc = pThis->pfnDoLock(pThis, true);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             AssertMsgFailed(("Failed to lock the dvd drive. rc=%Vrc\n", rc));
@@ -2000,5 +2000,5 @@
 
 #ifndef RT_OS_WINDOWS
-    if (VBOX_SUCCESS(src))
+    if (RT_SUCCESS(src))
     {
         /*
@@ -2006,5 +2006,5 @@
          */
         rc = RTSemEventCreate(&pThis->EventPoller);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -2015,8 +2015,8 @@
      */
     rc = RTCritSectInit(&pThis->CritSect);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
-    if (VBOX_SUCCESS(src))
+    if (RT_SUCCESS(src))
     {
         /*
@@ -2025,5 +2025,5 @@
         rc = RTThreadCreate(&pThis->ThreadPoller, drvHostBaseMediaThread, pThis, 0,
                             RTTHREADTYPE_INFREQUENT_POLLER, RTTHREADFLAGS_WAITABLE, "DVDMEDIA");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             AssertMsgFailed(("Failed to create poller thread. rc=%Vrc\n", rc));
@@ -2042,5 +2042,5 @@
     }
 
-    if (VBOX_FAILURE(src))
+    if (RT_FAILURE(src))
         return src;
     return rc;
Index: trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp	(revision 11266)
@@ -162,5 +162,5 @@
          if (FileDevice == NIL_RTFILE) /* obsolete crap */
              rc = RTFileOpen(&FileDevice, pThis->pszDeviceOpen, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-         if (VBOX_SUCCESS(rc))
+         if (RT_SUCCESS(rc))
          {
              /* do ioctl */
@@ -312,5 +312,5 @@
     uint8_t abSense[32];
     int rc2 = DRVHostBaseScsiCmd(pThis, abCmd, 6, PDMBLOCKTXDIR_NONE, NULL, NULL, abSense, sizeof(abSense), 0);
-    if (VBOX_SUCCESS(rc2))
+    if (RT_SUCCESS(rc2))
         fMediaPresent = true;
     else if (   rc2 == VERR_UNRESOLVED_ERROR
@@ -710,5 +710,5 @@
      */
     int rc = DRVHostBaseInitData(pDrvIns, pCfgHandle, PDMBLOCKTYPE_DVD);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /*
@@ -719,5 +719,5 @@
         bool fPassthrough;
         rc = CFGMR3QueryBool(pCfgHandle, "Passthrough", &fPassthrough);
-        if (VBOX_SUCCESS(rc) && fPassthrough)
+        if (RT_SUCCESS(rc) && fPassthrough)
         {
             pThis->IBlock.pfnSendCmd = drvHostDvdSendCmd;
@@ -726,5 +726,5 @@
 # ifdef VBOX_WITH_SUID_WRAPPER  /* Solaris setuid for Passthrough mode. */
             rc = solarisCheckUserAuth();
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 Log(("DVD: solarisCheckUserAuth failed. Permission denied!\n"));
@@ -752,5 +752,5 @@
         rc = DRVHostBaseInitFinish(pThis);
     }
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         if (!pThis->fAttachFailError)
Index: trunk/src/VBox/Devices/Storage/DrvHostFloppy.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/DrvHostFloppy.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/DrvHostFloppy.cpp	(revision 11266)
@@ -124,5 +124,5 @@
             DRVHostBaseMediaNotPresent(pThis);
         rc = DRVHostBaseMediaPresent(pThis);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             pThisFloppy->fPrevDiskIn = fDiskIn;
@@ -162,5 +162,5 @@
      */
     int rc = DRVHostBaseInitData(pDrvIns, pCfgHandle, PDMBLOCKTYPE_FLOPPY_1_44);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /*
@@ -177,5 +177,5 @@
         rc = DRVHostBaseInitFinish(&pThis->Base);
     }
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         if (!pThis->Base.fAttachFailError)
Index: trunk/src/VBox/Devices/Storage/DrvMediaISO.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/DrvMediaISO.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/DrvMediaISO.cpp	(revision 11266)
@@ -128,5 +128,5 @@
     char *pszName;
     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "Path", &pszName);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"Path\" from the config"));
 
@@ -136,5 +136,5 @@
     rc = RTFileOpen(&pData->File, pszName,
                     RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         LogFlow(("drvMediaISOConstruct: ISO image '%s' opened successfully.\n", pszName));
@@ -182,5 +182,5 @@
     uint64_t cbFile;
     int rc = RTFileGetSize(pData->File, &cbFile);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         LogFlow(("drvMediaISOGetSize: returns %lld (%s)\n", cbFile, pData->pszFilename));
@@ -238,8 +238,8 @@
      */
     int rc = RTFileSeek(pData->File, off, RTFILE_SEEK_BEGIN, NULL);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         rc = RTFileRead(pData->File, pvBuf, cbRead, NULL);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             Log2(("drvMediaISORead: off=%#llx pvBuf=%p cbRead=%#x (%s)\n"
Index: trunk/src/VBox/Devices/Storage/DrvRawImage.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/DrvRawImage.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/DrvRawImage.cpp	(revision 11266)
@@ -131,5 +131,5 @@
     char *pszName;
     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "Path", &pszName);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: query for \"Path\" string return %Vrc.\n", rc));
@@ -142,5 +142,5 @@
     rc = RTFileOpen(&pData->File, pszName,
                     RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         LogFlow(("drvRawImageConstruct: Raw image '%s' opened successfully.\n", pszName));
@@ -152,5 +152,5 @@
         rc = RTFileOpen(&pData->File, pszName,
                         RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             LogFlow(("drvRawImageConstruct: Raw image '%s' opened successfully.\n", pszName));
@@ -200,5 +200,5 @@
     uint64_t cbFile;
     int rc = RTFileGetSize(pData->File, &cbFile);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         LogFlow(("drvRawImageGetSize: returns %lld (%s)\n", cbFile, pData->pszFilename));
@@ -256,8 +256,8 @@
      */
     int rc = RTFileSeek(pData->File, off, RTFILE_SEEK_BEGIN, NULL);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         rc = RTFileRead(pData->File, pvBuf, cbRead, NULL);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             Log2(("drvRawImageRead: off=%#llx pvBuf=%p cbRead=%#x (%s)\n"
@@ -290,8 +290,8 @@
      */
     int rc = RTFileSeek(pData->File, off, RTFILE_SEEK_BEGIN, NULL);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         rc = RTFileWrite(pData->File, pvBuf, cbWrite, NULL);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             Log2(("drvRawImageWrite: off=%#llx pvBuf=%p cbWrite=%#x (%s)\n"
Index: trunk/src/VBox/Devices/Storage/DrvVD.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/DrvVD.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/DrvVD.cpp	(revision 11266)
@@ -146,5 +146,5 @@
 }
 
-static DECLCALLBACK(int) drvvdAsyncIORead(void *pvUser, void *pStorage, uint64_t uOffset, 
+static DECLCALLBACK(int) drvvdAsyncIORead(void *pvUser, void *pStorage, uint64_t uOffset,
                                           size_t cbRead, void *pvBuf, size_t *pcbRead)
 {
@@ -158,5 +158,5 @@
 }
 
-static DECLCALLBACK(int) drvvdAsyncIOWrite(void *pvUser, void *pStorage, uint64_t uOffset, 
+static DECLCALLBACK(int) drvvdAsyncIOWrite(void *pvUser, void *pStorage, uint64_t uOffset,
                                            size_t cbWrite, const void *pvBuf, size_t *pcbWritten)
 {
@@ -278,5 +278,5 @@
     PVBOXDISK pData = PDMIMEDIA_2_VBOXDISK(pInterface);
     int rc = VDRead(pData->pDisk, off, pvBuf, cbRead);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         Log2(("%s: off=%#llx pvBuf=%p cbRead=%d %.*Vhxd\n", __FUNCTION__,
               off, pvBuf, cbRead, cbRead, pvBuf));
@@ -337,5 +337,5 @@
     PVBOXDISK pData = PDMIMEDIA_2_VBOXDISK(pInterface);
     int rc = VDGetPCHSGeometry(pData->pDisk, VD_LAST_IMAGE, pPCHSGeometry);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("%s: geometry not available.\n", __FUNCTION__));
@@ -366,5 +366,5 @@
     PVBOXDISK pData = PDMIMEDIA_2_VBOXDISK(pInterface);
     int rc = VDGetLCHSGeometry(pData->pDisk, VD_LAST_IMAGE, pLCHSGeometry);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("%s: geometry not available.\n", __FUNCTION__));
@@ -402,5 +402,5 @@
 *******************************************************************************/
 
-static DECLCALLBACK(int) drvvdStartRead(PPDMIMEDIAASYNC pInterface, uint64_t uOffset, 
+static DECLCALLBACK(int) drvvdStartRead(PPDMIMEDIAASYNC pInterface, uint64_t uOffset,
                                         PPDMDATASEG paSeg, unsigned cSeg,
                                         size_t cbRead, void *pvUser)
@@ -435,5 +435,5 @@
     PDRVVDASYNCTASK pDrvVDAsyncTask = (PDRVVDASYNCTASK)pvUser;
     int rc = VINF_VDI_ASYNC_IO_FINISHED;
-   
+
     /* Having a completion callback for a task is not mandatory. */
     if (pDrvVDAsyncTask->pfnCompleted)
@@ -580,5 +580,5 @@
     pData->pDrvMediaAsyncPort = (PPDMIMEDIAASYNCPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_MEDIA_ASYNC_PORT);
 
-    /* 
+    /*
      * Attach the async transport driver below of the device above us implements the
      * async interface.
@@ -592,5 +592,5 @@
         if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
         {
-            /* 
+            /*
              * Though the device supports async I/O the backend seems to not support it.
              * Revert to non async I/O.
@@ -598,5 +598,5 @@
             pData->pDrvMediaAsyncPort = NULL;
         }
-        else if (VBOX_FAILURE(rc))
+        else if (RT_FAILURE(rc))
         {
             AssertMsgFailed(("Failed to attach async transport driver below rc=%Vrc\n", rc));
@@ -656,5 +656,5 @@
      * Open the images.
      */
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /** @todo TEMP! later the iSCSI config callbacks won't be included here */
@@ -664,5 +664,5 @@
 
     unsigned cImages = iLevel;
-    while (pCurNode && VBOX_SUCCESS(rc))
+    while (pCurNode && RT_SUCCESS(rc))
     {
         /*
@@ -670,5 +670,5 @@
          */
         rc = CFGMR3QueryStringAlloc(pCurNode, "Path", &pszName);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             rc = PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -678,5 +678,5 @@
 
         rc = CFGMR3QueryStringAlloc(pCfgHandle, "Format", &pszFormat);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             rc = PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -690,5 +690,5 @@
             if (rc == VERR_CFGM_VALUE_NOT_FOUND)
                 fReadOnly = false;
-            else if (VBOX_FAILURE(rc))
+            else if (RT_FAILURE(rc))
             {
                 rc = PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -700,5 +700,5 @@
             if (rc == VERR_CFGM_VALUE_NOT_FOUND)
                 fHonorZeroWrites = false;
-            else if (VBOX_FAILURE(rc))
+            else if (RT_FAILURE(rc))
             {
                 rc = PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -742,5 +742,5 @@
         }
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
             Log(("%s: %d - Opened '%s' in %s mode\n", __FUNCTION__,
                  iLevel, pszName,
@@ -763,5 +763,5 @@
     }
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         if (VALID_PTR(pData->pDisk))
@@ -776,5 +776,5 @@
     }
 
-    /* 
+    /*
      * Check for async I/O support. Every opened image has to support
      * it.
@@ -790,5 +790,5 @@
         if (vdBackendInfo.uBackendCaps & VD_CAP_ASYNC)
         {
-            /* 
+            /*
              * Backend indicates support for at least some files.
              * Check if current file is supported with async I/O)
@@ -797,5 +797,5 @@
             AssertRC(rc);
 
-            /* 
+            /*
              * Check if current image is supported.
              * If not we can stop checking because
@@ -895,5 +895,5 @@
     PVBOXDISK pData = PDMINS2DATA(pDrvIns, PVBOXDISK);
 
-    /* 
+    /*
      * We must close the disk here to ensure that
      * the backend closes all files before the
Index: trunk/src/VBox/Devices/Storage/RawHDDCore.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/RawHDDCore.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/RawHDDCore.cpp	(revision 11266)
@@ -111,5 +111,5 @@
                      ? RTFILE_O_READ      | RTFILE_O_OPEN | RTFILE_O_DENY_NONE
                      : RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         /* Do NOT signal an appropriate error here, as the VD layer has the
@@ -120,5 +120,5 @@
 
     rc = RTFileGetSize(pImage->File, &pImage->cbSize);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     if (pImage->cbSize % 512)
@@ -130,5 +130,5 @@
 
 out:
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         rawFreeImage(pImage, false);
     return rc;
@@ -167,5 +167,5 @@
     rc = RTFileOpen(&File, pImage->pszFilename,
                     RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_ALL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = rawError(pImage, rc, RT_SRC_POS, N_("Raw: cannot create image '%s'"), pImage->pszFilename);
@@ -177,5 +177,5 @@
      * sufficient space available. */
     rc = RTFsQuerySizes(pImage->pszFilename, NULL, &cbFree, NULL, NULL);
-    if (VBOX_SUCCESS(rc) /* ignore errors */ && ((uint64_t)cbFree < cbSize))
+    if (RT_SUCCESS(rc) /* ignore errors */ && ((uint64_t)cbFree < cbSize))
     {
         rc = rawError(pImage, VERR_DISK_FULL, RT_SRC_POS, N_("Raw: disk would overflow creating image '%s'"), pImage->pszFilename);
@@ -186,5 +186,5 @@
      * effective than expanding file by write operations. */
     rc = RTFileSetSize(File, cbSize);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = rawError(pImage, rc, RT_SRC_POS, N_("Raw: setting image size failed for '%s'"), pImage->pszFilename);
@@ -210,5 +210,5 @@
 
         rc = RTFileWriteAt(File, uOff, pvBuf, cbChunk, NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             rc = rawError(pImage, rc, RT_SRC_POS, N_("Raw: writing block failed for '%s'"), pImage->pszFilename);
@@ -223,5 +223,5 @@
                              uPercentStart + uOff * uPercentSpan * 98 / (cbSize * 100),
                              pvUser);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 goto out;
         }
@@ -229,5 +229,5 @@
     RTMemTmpFree(pvBuf);
 
-    if (VBOX_SUCCESS(rc) && pfnProgress)
+    if (RT_SUCCESS(rc) && pfnProgress)
         pfnProgress(NULL /* WARNING! pVM=NULL  */,
                     uPercentStart + uPercentSpan * 98 / 100, pvUser);
@@ -239,9 +239,9 @@
 
 out:
-    if (VBOX_SUCCESS(rc) && pfnProgress)
+    if (RT_SUCCESS(rc) && pfnProgress)
         pfnProgress(NULL /* WARNING! pVM=NULL  */,
                     uPercentStart + uPercentSpan, pvUser);
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         rawFreeImage(pImage, rc != VERR_ALREADY_EXISTS);
     return rc;
@@ -346,5 +346,5 @@
 
     rc = rawOpenImage(pImage, uOpenFlags);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         *ppBackendData = pImage;
 
@@ -404,5 +404,5 @@
                         pPCHSGeometry, pLCHSGeometry,
                         pfnProgress, pvUser, uPercentStart, uPercentSpan);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* So far the image is opened in read/write mode. Make sure the
@@ -412,5 +412,5 @@
             rawFreeImage(pImage, false);
             rc = rawOpenImage(pImage, uOpenFlags);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 goto out;
         }
@@ -585,5 +585,5 @@
         {
             int rc = RTFileGetSize(pImage->File, &cbFile);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
                 cb += cbFile;
         }
Index: trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp	(revision 11266)
@@ -192,5 +192,5 @@
         /* Try to load the plugin (RTldrLoad takes care of the suffix). */
         rc = RTLdrLoad(pszPluginName, &hPlugin);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             PFNVBOXHDDFORMATLOAD pfnHDDFormatLoad;
@@ -198,8 +198,8 @@
             rc = RTLdrGetSymbol(hPlugin, VBOX_HDDFORMAT_LOAD_NAME,
                                 (void**)&pfnHDDFormatLoad);
-            if (VBOX_FAILURE(rc) || !pfnHDDFormatLoad)
+            if (RT_FAILURE(rc) || !pfnHDDFormatLoad)
             {
                 LogFunc(("error resolving the entry point %s in plugin %s, rc=%Vrc, pfnHDDFormat=%#p\n", VBOX_HDDFORMAT_LOAD_NAME, pszPluginName, rc, pfnHDDFormatLoad));
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                     rc = VERR_SYMBOL_NOT_FOUND;
                 goto out;
@@ -209,5 +209,5 @@
             PVBOXHDDBACKEND pBE;
             rc = pfnHDDFormatLoad(&pBE);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 goto out;
             /* Check if the sizes match. If not this plugin is too old. */
@@ -230,5 +230,5 @@
 
 out:
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         if (hPlugin != NIL_RTLDRMOD)
@@ -344,5 +344,5 @@
         uOffset += cbThisRead;
         pvBuf = (char *)pvBuf + cbThisRead;
-    } while (cbRead != 0 && VBOX_SUCCESS(rc));
+    } while (cbRead != 0 && RT_SUCCESS(rc));
 
     return rc;
@@ -407,5 +407,5 @@
         rc = vdReadHelper(pDisk, pImage->pPrev, uOffset - cbPreRead, pvTmp,
                           cbPreRead);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -444,5 +444,5 @@
                               (char *)pvTmp + cbPreRead + cbThisWrite + cbWriteCopy,
                               cbReadImage);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
         /* Zero out the remainder of this block. Will never be visible, as this
@@ -503,5 +503,5 @@
     rc = vdReadHelper(pDisk, pImage->pPrev, uOffset - cbPreRead, pvTmp,
                       cbPreRead + cbThisWrite + cbPostRead - cbFill);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -595,5 +595,5 @@
             }
             RTMemTmpFree(pvTmp);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 break;
         }
@@ -602,5 +602,5 @@
         uOffset += cbThisWrite;
         pvBuf = (char *)pvBuf + cbThisWrite;
-    } while (cbWrite != 0 && VBOX_SUCCESS(rc));
+    } while (cbWrite != 0 && RT_SUCCESS(rc));
 
     return rc;
@@ -656,5 +656,5 @@
             }
         }
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
 
@@ -662,5 +662,5 @@
         char szPath[RTPATH_MAX];
         rc = RTPathSharedLibs(szPath, sizeof(szPath));
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
 
@@ -669,5 +669,5 @@
         rc = RTStrAPrintf(&pszPluginFilter, "%s/%s*", szPath,
                           VBOX_HDDFORMAT_PLUGIN_PREFIX);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             rc = VERR_NO_MEMORY;
@@ -677,5 +677,5 @@
         /* The plugins are in the same directory as the other shared libs. */
         rc = RTDirOpenFiltered(&pPluginDir, pszPluginFilter, RTDIRFILTER_WINNT);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
 
@@ -702,8 +702,8 @@
                 /* Retry. */
                 rc = RTDirRead(pPluginDir, pPluginDirEntry, &cbPluginDirEntry);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     break;
             }
-            else if (VBOX_FAILURE(rc))
+            else if (RT_FAILURE(rc))
                 break;
 
@@ -713,19 +713,19 @@
 
             rc = RTLdrLoad(pPluginDirEntry->szName, &hPlugin);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 rc = RTLdrGetSymbol(hPlugin, VBOX_HDDFORMAT_LOAD_NAME, (void**)&pfnHDDFormatLoad);
-                if (VBOX_FAILURE(rc) || !pfnHDDFormatLoad)
+                if (RT_FAILURE(rc) || !pfnHDDFormatLoad)
                 {
                     LogFunc(("error resolving the entry point %s in plugin %s, rc=%Vrc, pfnHDDFormat=%#p\n", VBOX_HDDFORMAT_LOAD_NAME, pPluginDirEntry->szName, rc, pfnHDDFormatLoad));
-                    if (VBOX_SUCCESS(rc))
+                    if (RT_SUCCESS(rc))
                         rc = VERR_SYMBOL_NOT_FOUND;
                 }
 
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                 {
                     /* Get the function table. */
                     rc = pfnHDDFormatLoad(&pBackend);
-                    if (VBOX_SUCCESS(rc) && pBackend->cbSize == sizeof(VBOXHDDBACKEND))
+                    if (RT_SUCCESS(rc) && pBackend->cbSize == sizeof(VBOXHDDBACKEND))
                     {
                         char *pszName = RTStrDup(pBackend->pszBackendName);
@@ -885,5 +885,5 @@
             {
                 rc = aBackends[i]->pfnCheckIfValid(pszFilename);
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                 {
                     fPluginFound = true;
@@ -906,5 +906,5 @@
         char szPath[RTPATH_MAX];
         rc = RTPathSharedLibs(szPath, sizeof(szPath));
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
 
@@ -913,5 +913,5 @@
         rc = RTStrAPrintf(&pszPluginFilter, "%s/%s*", szPath,
                           VBOX_HDDFORMAT_PLUGIN_PREFIX);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             rc = VERR_NO_MEMORY;
@@ -921,5 +921,5 @@
         /* The plugins are in the same directory as the other shared libs. */
         rc = RTDirOpenFiltered(&pPluginDir, pszPluginFilter, RTDIRFILTER_WINNT);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
 
@@ -946,8 +946,8 @@
                 /* Retry. */
                 rc = RTDirRead(pPluginDir, pPluginDirEntry, &cbPluginDirEntry);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     break;
             }
-            else if (VBOX_FAILURE(rc))
+            else if (RT_FAILURE(rc))
                 break;
 
@@ -957,24 +957,24 @@
 
             rc = RTLdrLoad(pPluginDirEntry->szName, &hPlugin);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 rc = RTLdrGetSymbol(hPlugin, VBOX_HDDFORMAT_LOAD_NAME, (void**)&pfnHDDFormatLoad);
-                if (VBOX_FAILURE(rc) || !pfnHDDFormatLoad)
+                if (RT_FAILURE(rc) || !pfnHDDFormatLoad)
                 {
                     LogFunc(("error resolving the entry point %s in plugin %s, rc=%Vrc, pfnHDDFormat=%#p\n", VBOX_HDDFORMAT_LOAD_NAME, pPluginDirEntry->szName, rc, pfnHDDFormatLoad));
-                    if (VBOX_SUCCESS(rc))
+                    if (RT_SUCCESS(rc))
                         rc = VERR_SYMBOL_NOT_FOUND;
                 }
 
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                 {
                     /* Get the function table. */
                     rc = pfnHDDFormatLoad(&pBackend);
-                    if (VBOX_SUCCESS(rc) && pBackend->cbSize == sizeof(VBOXHDDBACKEND))
+                    if (RT_SUCCESS(rc) && pBackend->cbSize == sizeof(VBOXHDDBACKEND))
                     {
 
                         /* Check if the plugin can handle this file. */
                         rc = pBackend->pfnCheckIfValid(pszFilename);
-                        if (VBOX_SUCCESS(rc))
+                        if (RT_SUCCESS(rc))
                         {
                             fPluginFound = true;
@@ -1080,5 +1080,5 @@
 
         rc = vdFindBackend(pszBackend, &pImage->Backend, &pImage->hPlugin);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
         if (!pImage->Backend)
@@ -1095,5 +1095,5 @@
                                       &pImage->pvBackendData);
         /* If the open in read-write mode failed, retry in read-only mode. */
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             if (!(uOpenFlags & VD_OPEN_FLAGS_READONLY)
@@ -1108,5 +1108,5 @@
                                                pDisk->pInterfaces,
                                                &pImage->pvBackendData);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 rc = vdError(pDisk, rc, RT_SRC_POS,
@@ -1124,7 +1124,7 @@
          * diff images. Some image formats don't distinguish between normal
          * and diff images, so this must be corrected here. */
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             enmImageType = VD_IMAGE_TYPE_INVALID;
-        if (    VBOX_SUCCESS(rc)
+        if (    RT_SUCCESS(rc)
             &&  !(uOpenFlags & VD_OPEN_FLAGS_INFO))
         {
@@ -1165,5 +1165,5 @@
         rc2 = pImage->Backend->pfnGetPCHSGeometry(pImage->pvBackendData,
                                                   &pDisk->PCHSGeometry);
-        if (VBOX_FAILURE(rc2))
+        if (RT_FAILURE(rc2))
         {
             pDisk->PCHSGeometry.cCylinders = 0;
@@ -1182,5 +1182,5 @@
         rc2 = pImage->Backend->pfnGetLCHSGeometry(pImage->pvBackendData,
                                                   &pDisk->LCHSGeometry);
-        if (VBOX_FAILURE(rc2))
+        if (RT_FAILURE(rc2))
         {
             pDisk->LCHSGeometry.cCylinders = 0;
@@ -1208,5 +1208,5 @@
         }
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             /* Image successfully opened, make it the last image. */
@@ -1225,5 +1225,5 @@
     } while (0);
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         if (pImage)
@@ -1341,5 +1341,5 @@
 
         rc = vdFindBackend(pszBackend, &pImage->Backend, &pImage->hPlugin);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
         if (!pImage->Backend)
@@ -1359,5 +1359,5 @@
                                         &pImage->pvBackendData);
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             pImage->enmImageType = enmType;
@@ -1378,5 +1378,5 @@
             rc2 = pImage->Backend->pfnGetPCHSGeometry(pImage->pvBackendData,
                                                       &pDisk->PCHSGeometry);
-            if (VBOX_FAILURE(rc2))
+            if (RT_FAILURE(rc2))
             {
                 pDisk->PCHSGeometry.cCylinders = 0;
@@ -1395,5 +1395,5 @@
             rc2 = pImage->Backend->pfnGetLCHSGeometry(pImage->pvBackendData,
                                                       &pDisk->LCHSGeometry);
-            if (VBOX_FAILURE(rc2))
+            if (RT_FAILURE(rc2))
             {
                 pDisk->LCHSGeometry.cCylinders = 0;
@@ -1410,5 +1410,5 @@
         }
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             /* Image successfully opened, make it the last image. */
@@ -1427,5 +1427,5 @@
     } while (0);
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         if (pImage)
@@ -1440,5 +1440,5 @@
     }
 
-    if (VBOX_SUCCESS(rc) && pfnProgress)
+    if (RT_SUCCESS(rc) && pfnProgress)
         pfnProgress(NULL /* WARNING! pVM=NULL  */, 100, pvUser);
 
@@ -1512,5 +1512,5 @@
 
         rc = vdFindBackend(pszBackend, &pImage->Backend, &pImage->hPlugin);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
         if (!pImage->Backend)
@@ -1532,5 +1532,5 @@
                                         &pImage->pvBackendData);
 
-        if (VBOX_SUCCESS(rc) && pDisk->cImages != 0)
+        if (RT_SUCCESS(rc) && pDisk->cImages != 0)
         {
             pImage->enmImageType = VD_IMAGE_TYPE_DIFF;
@@ -1546,5 +1546,5 @@
         }
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             RTUUID Uuid;
@@ -1554,14 +1554,14 @@
             rc2 = pDisk->pLast->Backend->pfnGetUuid(pDisk->pLast->pvBackendData,
                                                     &Uuid);
-            if (VBOX_SUCCESS(rc2))
+            if (RT_SUCCESS(rc2))
                 pImage->Backend->pfnSetParentUuid(pImage->pvBackendData, &Uuid);
             rc2 = pDisk->pLast->Backend->pfnGetModificationUuid(pDisk->pLast->pvBackendData,
                                                                 &Uuid);
-            if (VBOX_SUCCESS(rc2))
+            if (RT_SUCCESS(rc2))
                 pImage->Backend->pfnSetParentModificationUuid(pImage->pvBackendData,
                                                               &Uuid);
             rc2 = pDisk->pLast->Backend->pfnGetTimeStamp(pDisk->pLast->pvBackendData,
                                                              &ts);
-            if (VBOX_SUCCESS(rc2))
+            if (RT_SUCCESS(rc2))
                 pImage->Backend->pfnSetParentTimeStamp(pImage->pvBackendData, &ts);
 
@@ -1569,10 +1569,10 @@
         }
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             /** @todo optionally check UUIDs */
         }
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             /* Image successfully opened, make it the last image. */
@@ -1591,5 +1591,5 @@
     } while (0);
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         if (pImage->hPlugin != NIL_RTLDRMOD)
@@ -1604,5 +1604,5 @@
     }
 
-    if (VBOX_SUCCESS(rc) && pfnProgress)
+    if (RT_SUCCESS(rc) && pfnProgress)
         pfnProgress(NULL /* WARNING! pVM=NULL  */, 100, pvUser);
 
@@ -1656,5 +1656,5 @@
             rc = pImageTo->Backend->pfnSetOpenFlags(pImageTo->pvBackendData,
                                                     uOpenFlags);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 break;
         }
@@ -1708,9 +1708,9 @@
                     if (rc != VERR_VDI_BLOCK_FREE)
                     {
-                        if (VBOX_FAILURE(rc))
+                        if (RT_FAILURE(rc))
                             break;
                         rc = vdWriteHelper(pDisk, pImageTo, uOffset, pvBuf,
                                            cbThisRead);
-                        if (VBOX_FAILURE(rc))
+                        if (RT_FAILURE(rc))
                             break;
                     }
@@ -1718,5 +1718,5 @@
                         rc = VINF_SUCCESS;
                 }
-                else if (VBOX_FAILURE(rc))
+                else if (RT_FAILURE(rc))
                     break;
 
@@ -1751,9 +1751,9 @@
                 if (rc != VERR_VDI_BLOCK_FREE)
                 {
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         break;
                     rc = vdWriteHelper(pDisk, pImageTo, uOffset, pvBuf,
                                        cbThisRead);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         break;
                 }
@@ -1802,5 +1802,5 @@
             rc = pImageTo->Backend->pfnSetOpenFlags(pImageTo->pvBackendData,
                                                     uOpenFlags);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 break;
         }
@@ -1823,5 +1823,5 @@
         RTMemTmpFree(pvBuf);
 
-    if (VBOX_SUCCESS(rc) && pfnProgress)
+    if (RT_SUCCESS(rc) && pfnProgress)
         pfnProgress(NULL /* WARNING! pVM=NULL */, 100, pvUser);
 
@@ -1893,10 +1893,10 @@
             /* Close the source image. */
             rc = pImageFrom->Backend->pfnClose(pImageFrom->pvBackendData, false);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 break;
 
             /* Open the source image in the destination container. */
             rc = VDOpen(pDiskTo, pImageFrom->Backend->pszBackendName, pImageFrom->pszFilename, pImageFrom->uOpenFlags);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 goto movefail;
 
@@ -1905,5 +1905,5 @@
             /* Rename the image. */
             rc = pImageTo->Backend->pfnRename(pImageTo->pvBackendData, pszFilename ? pszFilename : pImageTo->pszFilename);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 goto movefail;
 
@@ -1924,5 +1924,5 @@
             /* In case of failure, re-open the source image in the source container. */
             rc2 = VDOpen(pDiskFrom, pImageFrom->Backend->pszBackendName, pImageFrom->pszFilename, pImageFrom->uOpenFlags);
-            if (VBOX_FAILURE(rc2))
+            if (RT_FAILURE(rc2))
                 /** @todo Uncertain what to do on error. If this happens pImageFrom and pImageTo are both closed. */
                 rc = rc2;
@@ -1974,5 +1974,5 @@
                               uOpenFlagsFrom, NULL, NULL);
         }
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
 
@@ -1998,10 +1998,10 @@
             rc = vdReadHelper(pDiskFrom, pImageFrom, uOffset, pvBuf,
                               cbThisRead);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 break;
 
             rc = vdWriteHelper(pDiskTo, pImageTo, uOffset, pvBuf,
                                cbThisRead);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 break;
 
@@ -2013,5 +2013,5 @@
                                  ((cbSize - cbRemaining) * 100) / cbSize,
                                  pvUser);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     break;
             }
@@ -2040,5 +2040,5 @@
     } while (0);
 
-    if (VBOX_FAILURE(rc) && pImageTo)
+    if (RT_FAILURE(rc) && pImageTo)
     {
         /* Error detected, but new image created. Remove image from list. */
@@ -2063,5 +2063,5 @@
         RTMemTmpFree(pvBuf);
 
-    if (VBOX_SUCCESS(rc) && pfnProgress)
+    if (RT_SUCCESS(rc) && pfnProgress)
         pfnProgress(NULL /* WARNING! pVM=NULL  */, 100, pvUser);
 
@@ -2130,5 +2130,5 @@
         rc2 = pImage->Backend->pfnGetPCHSGeometry(pImage->pvBackendData,
                                                  &pDisk->PCHSGeometry);
-        if (VBOX_FAILURE(rc2))
+        if (RT_FAILURE(rc2))
         {
             pDisk->PCHSGeometry.cCylinders = 0;
@@ -2147,5 +2147,5 @@
         rc2 = pImage->Backend->pfnGetLCHSGeometry(pImage->pvBackendData,
                                                   &pDisk->LCHSGeometry);
-        if (VBOX_FAILURE(rc2))
+        if (RT_FAILURE(rc2))
         {
             pDisk->LCHSGeometry.cCylinders = 0;
@@ -2191,5 +2191,5 @@
             /* Close image. */
             int rc2 = pImage->Backend->pfnClose(pImage->pvBackendData, false);
-            if (VBOX_FAILURE(rc2) && VBOX_SUCCESS(rc))
+            if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
                 rc = rc2;
             /* Free remaining resources related to the image. */
@@ -2261,5 +2261,5 @@
  * @returns VERR_VDI_NOT_OPENED if no image is opened in HDD container.
  * @param   pDisk           Pointer to HDD container.
- * @param   uOffset         Offset of the first byte being 
+ * @param   uOffset         Offset of the first byte being
  *                          written from start of disk.
  * @param   pvBuf           Pointer to buffer for writing data.
@@ -2547,5 +2547,5 @@
                 int rc2 = pImage->Backend->pfnGetPCHSGeometry(pImage->pvBackendData,
                                                               &pDisk->PCHSGeometry);
-                if (VBOX_FAILURE(rc2))
+                if (RT_FAILURE(rc2))
                 {
                     pDisk->PCHSGeometry.cCylinders = 0;
@@ -2567,5 +2567,5 @@
             rc = pImage->Backend->pfnGetPCHSGeometry(pImage->pvBackendData,
                                                      &PCHS);
-            if (    VBOX_FAILURE(rc)
+            if (    RT_FAILURE(rc)
                 ||  pPCHSGeometry->cCylinders != PCHS.cCylinders
                 ||  pPCHSGeometry->cHeads != PCHS.cHeads
@@ -2693,5 +2693,5 @@
                 int rc2 = pImage->Backend->pfnGetLCHSGeometry(pImage->pvBackendData,
                                                               &pDisk->LCHSGeometry);
-                if (VBOX_FAILURE(rc2))
+                if (RT_FAILURE(rc2))
                 {
                     pDisk->LCHSGeometry.cCylinders = 0;
@@ -2713,5 +2713,5 @@
             rc = pImage->Backend->pfnGetLCHSGeometry(pImage->pvBackendData,
                                                      &LCHS);
-            if (    VBOX_FAILURE(rc)
+            if (    RT_FAILURE(rc)
                 ||  pLCHSGeometry->cCylinders != LCHS.cCylinders
                 ||  pLCHSGeometry->cHeads != LCHS.cHeads
@@ -3415,5 +3415,5 @@
  * @param   pvUser          User data which is passed on completion
  */
-VBOXDDU_DECL(int) VDAsyncRead(PVBOXHDD pDisk, uint64_t uOffset, size_t cbRead, 
+VBOXDDU_DECL(int) VDAsyncRead(PVBOXHDD pDisk, uint64_t uOffset, size_t cbRead,
                               PPDMDATASEG paSeg, unsigned cSeg,
                               void *pvUser)
@@ -3522,6 +3522,6 @@
 
         vdSetModifiedFlag(pDisk);
-        rc = pImage->Backend->pfnAsyncWrite(pImage->pvBackendData, 
-                                            uOffset, cbWrite, 
+        rc = pImage->Backend->pfnAsyncWrite(pImage->pvBackendData,
+                                            uOffset, cbWrite,
                                             paSeg, cSeg, pvUser);
     } while (0);
Index: trunk/src/VBox/Devices/Storage/VBoxHDD.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/VBoxHDD.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/VBoxHDD.cpp	(revision 11266)
@@ -96,5 +96,5 @@
     PVDIDISK pData = PDMIMEDIA_2_VDIDISK(pInterface);
     int rc = VDIDiskGetLCHSGeometry(pData, pLCHSGeometry);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         LogFlow(("%s: returns VINF_SUCCESS\n", __FUNCTION__));
@@ -130,5 +130,5 @@
     PVDIDISK pData = PDMIMEDIA_2_VDIDISK(pInterface);
     int rc = VDIDiskRead(pData, off, pvBuf, cbRead);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         Log2(("vdiRead: off=%#llx pvBuf=%p cbRead=%d\n"
               "%.*Vhxd\n",
@@ -335,5 +335,5 @@
      */
     int rc = VINF_SUCCESS;
-    while (pCurNode && VBOX_SUCCESS(rc))
+    while (pCurNode && RT_SUCCESS(rc))
     {
         /*
@@ -341,5 +341,5 @@
          */
         int rc = CFGMR3QueryStringAlloc(pCurNode, "Path", &pszName);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return PDMDRV_SET_ERROR(pDrvIns, rc,
                                     N_("VHDD: Configuration error: Querying \"Path\" as string failed"));
@@ -348,5 +348,5 @@
         if (rc == VERR_CFGM_VALUE_NOT_FOUND)
             fReadOnly = false;
-        else if (VBOX_FAILURE(rc))
+        else if (RT_FAILURE(rc))
         {
             MMR3HeapFree(pszName);
@@ -360,5 +360,5 @@
             if (rc == VERR_CFGM_VALUE_NOT_FOUND)
                 fHonorZeroWrites = false;
-            else if (VBOX_FAILURE(rc))
+            else if (RT_FAILURE(rc))
             {
                 MMR3HeapFree(pszName);
@@ -373,5 +373,5 @@
         rc = VDIDiskOpenImage(pData, pszName, fReadOnly ? VDI_OPEN_FLAGS_READONLY
                                                         : VDI_OPEN_FLAGS_NORMAL);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
             Log(("vdiConstruct: %d - Opened '%s' in %s mode\n",
                  iLevel, pszName, VDIDiskIsReadOnly(pData) ? "read-only" : "read-write"));
@@ -386,5 +386,5 @@
 
     /* If any of the images has the flag set, handle zero writes like normal. */
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         pData->fHonorZeroWrites = fHonorZeroWrites;
 
Index: trunk/src/VBox/Devices/Storage/VDICore.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/VDICore.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/VDICore.cpp	(revision 11266)
@@ -422,5 +422,5 @@
                         pszFilename,
                         RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_ALL | RTFILE_O_NOT_CONTENT_INDEXED);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* Lock image exclusively to close any wrong access by VDI API calls. */
@@ -434,5 +434,5 @@
             RTFOFF cbFree = 0;
             rc = RTFsQuerySizes(pszFilename, NULL, &cbFree, NULL, NULL);
-            if (VBOX_SUCCESS(rc) /* ignore errors */ && ((uint64_t)cbFree < cbLock))
+            if (RT_SUCCESS(rc) /* ignore errors */ && ((uint64_t)cbFree < cbLock))
             {
                 rc = VERR_DISK_FULL;
@@ -444,5 +444,5 @@
         rc = RTFileLock(pImage->File,
                         RTFILE_LOCK_WRITE | RTFILE_LOCK_IMMEDIATELY, 0, cbLock);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             cbLock = 0;    /* Not locked. */
@@ -463,5 +463,5 @@
             rc = RTFileSetSize(pImage->File, pImage->offStartData);
         }
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto l_create_failed;
 
@@ -471,15 +471,15 @@
         /* Write pre-header. */
         rc = RTFileWrite(pImage->File, &pImage->PreHeader, sizeof(pImage->PreHeader), NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto l_create_failed;
 
         /* Write header. */
         rc = RTFileWrite(pImage->File, &pImage->Header.u.v1plus, sizeof(pImage->Header.u.v1plus), NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto l_create_failed;
 
         /* Write blocks array. */
         rc = RTFileSeek(pImage->File, pImage->offStartBlocks, RTFILE_SEEK_BEGIN, NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto l_create_failed;
         rc = RTFileWrite(pImage->File,
@@ -487,5 +487,5 @@
                          getImageBlocks(&pImage->Header) * sizeof(VDIIMAGEBLOCKPOINTER),
                          NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto l_create_failed;
 
@@ -500,5 +500,5 @@
 
             rc = RTFileSeek(pImage->File, pImage->offStartData, RTFILE_SEEK_BEGIN, NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 goto l_create_failed;
 
@@ -517,5 +517,5 @@
 
                     rc = RTFileWrite(pImage->File, pvBuf, to_fill, NULL);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         break;
 
@@ -527,5 +527,5 @@
                                          (unsigned)(((cbDisk - cbFill) * 100) / cbDisk),
                                          pvUser);
-                        if (VBOX_FAILURE(rc))
+                        if (RT_FAILURE(rc))
                             break;
                     }
@@ -549,5 +549,5 @@
 
         /* Delete image file if error occured while creating */
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             RTFileDelete(pszFilename);
     }
@@ -556,5 +556,5 @@
     RTMemFree(pImage);
 
-    if (    VBOX_SUCCESS(rc)
+    if (    RT_SUCCESS(rc)
         &&  pfnProgress)
         pfnProgress(NULL /* WARNING! pVM=NULL  */, 100, pvUser);
@@ -603,5 +603,5 @@
                         ? RTFILE_O_READ      | RTFILE_O_OPEN | RTFILE_O_DENY_NONE
                         : RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         if (!(fOpen & VDI_OPEN_FLAGS_READONLY))
@@ -611,8 +611,8 @@
                             pImage->szFilename,
                             RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
                 pImage->fOpen |= VDI_OPEN_FLAGS_READONLY;
         }
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             RTMemFree(pImage);
@@ -630,5 +630,5 @@
     uint64_t cbLock = _1M;
     rc = RTFileLock(pImage->File, RTFILE_LOCK_READ | RTFILE_LOCK_IMMEDIATELY, 0, cbLock);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         cbLock = 0;
@@ -639,8 +639,8 @@
     /* Read pre-header. */
     rc = RTFileRead(pImage->File, &pImage->PreHeader, sizeof(pImage->PreHeader), NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto l_open_failed;
     rc = vdiValidatePreHeader(&pImage->PreHeader);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto l_open_failed;
 
@@ -661,5 +661,5 @@
                      * supporting VDI 1.1 doesn't touch fields it doesn't know
                      * about. And it accepts bigger headers. */
-                    if (   VBOX_SUCCESS(rc)
+                    if (   RT_SUCCESS(rc)
                         && !pImage->fReadOnly
                         && pImage->Header.u.v1.cbHeader < sizeof(pImage->Header.u.v1plus))
@@ -672,5 +672,5 @@
                         pImage->Header.u.v1plus.LCHSGeometry.cbSector = VDI_GEOMETRY_SECTOR_SIZE;
                     }
-                    else if (   VBOX_SUCCESS(rc)
+                    else if (   RT_SUCCESS(rc)
                              && pImage->Header.u.v1.cbHeader >= sizeof(pImage->Header.u.v1plus))
                     {
@@ -688,9 +688,9 @@
             break;
     }
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto l_open_failed;
 
     rc = vdiValidateHeader(&pImage->Header);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto l_open_failed;
 
@@ -749,5 +749,5 @@
                     0,
                     cbLock);
-    if (    VBOX_FAILURE(rc)
+    if (    RT_FAILURE(rc)
         &&  !pImage->fReadOnly)
     {
@@ -755,8 +755,8 @@
         rc = RTFileLock(pImage->File,
                         RTFILE_LOCK_READ | RTFILE_LOCK_IMMEDIATELY, 0, cbLock);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
             pImage->fReadOnly = true;
     }
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         cbLock = 0;    /* Not locked. */
@@ -775,9 +775,9 @@
     /* Read blocks array. */
     rc = RTFileSeek(pImage->File, pImage->offStartBlocks, RTFILE_SEEK_BEGIN, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto l_open_failed;
     rc = RTFileRead(pImage->File, pImage->paBlocks,
                     getImageBlocks(&pImage->Header) * sizeof(VDIIMAGEBLOCKPOINTER), NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto l_open_failed;
 
@@ -807,5 +807,5 @@
     /* Seek to header start. */
     int rc = RTFileSeek(pImage->File, sizeof(VDIPREHEADER), RTFILE_SEEK_BEGIN, NULL);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         switch (GET_MAJOR_HEADER_VERSION(&pImage->Header))
@@ -844,5 +844,5 @@
     /* Update image header. */
     int rc = vdiUpdateHeader(pImage);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* write only one block pointer. */
@@ -851,5 +851,5 @@
                         RTFILE_SEEK_BEGIN,
                         NULL);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
             rc = RTFileWrite(pImage->File,
                              &pImage->paBlocks[uBlock],
@@ -869,9 +869,9 @@
     /* Update image header. */
     int rc = vdiUpdateHeader(pImage);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* write the block pointers array. */
         rc = RTFileSeek(pImage->File, pImage->offStartBlocks, RTFILE_SEEK_BEGIN, NULL);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
             rc = RTFileWrite(pImage->File,
                              pImage->paBlocks,
@@ -998,7 +998,7 @@
                            + (pImage->offStartData + pImage->offStartBlockData + offRead);
         int rc = RTFileSeek(pImage->File, u64Offset, RTFILE_SEEK_BEGIN, NULL);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
             rc = RTFileRead(pImage->File, pvBuf, cbToRead, NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             Log(("vdiReadInBlock: rc=%Vrc filename=\"%s\" uBlock=%u offRead=%u cbToRead=%u u64Offset=%llu\n",
                  rc, pImage->szFilename, uBlock, offRead, cbToRead, u64Offset));
@@ -1076,5 +1076,5 @@
         cbToRead -= to_read;
         if (    cbToRead == 0
-            ||  VBOX_FAILURE(rc))
+            ||  RT_FAILURE(rc))
             break;
 
@@ -1102,5 +1102,5 @@
                        + (pImage->offStartData + pImage->offStartBlockData);
     rc = RTFileSeek(pImage->File, u64Offset, RTFILE_SEEK_BEGIN, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("vdiFillBlockByZeroes: seek rc=%Vrc filename=\"%s\" uBlock=%u u64Offset=%llu\n",
@@ -1121,5 +1121,5 @@
         unsigned to_fill = RT_MIN(cbFill, pDisk ? pDisk->cbBuf : VDIDISK_DEFAULT_BUFFER_SIZE);
         rc = RTFileWrite(pImage->File, pvBuf, to_fill, NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             Log(("vdiFillBlockByZeroes: write rc=%Vrc filename=\"%s\" uBlock=%u u64Offset=%llu cbFill=%u to_fill=%u\n",
@@ -1178,5 +1178,5 @@
                          + pImage->offStartData;
         rc = RTFileSetSize(pImage->File, u64Size);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             Log(("vdiWriteInBlock: set size rc=%Vrc filename=\"%s\" uBlock=%u u64Size=%llu\n",
@@ -1197,5 +1197,5 @@
             {
                 rc = vdiFillBlockByZeroes(pDisk, pImage, uBlock);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     return rc;
             }
@@ -1203,5 +1203,5 @@
 
         rc = vdiUpdateBlockInfo(pImage, uBlock);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -1211,8 +1211,8 @@
                        + (pImage->offStartData + pImage->offStartBlockData + offWrite);
     rc = RTFileSeek(pImage->File, u64Offset, RTFILE_SEEK_BEGIN, NULL);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         rc = RTFileWrite(pImage->File, pvBuf, cbToWrite, NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             Log(("vdiWriteInBlock: write rc=%Vrc filename=\"%s\" uBlock=%u offWrite=%u u64Offset=%llu cbToWrite=%u\n",
                  rc, pImage->szFilename, uBlock, offWrite, u64Offset, cbToWrite));
@@ -1256,9 +1256,9 @@
         unsigned to_copy = RT_MIN(cbCopy, pDisk->cbBuf);
         rc = vdiReadInBlock(pImage, uBlock, offCopy, to_copy, pvBuf);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
 
         rc = vdiWriteInBlock(pDisk, pDisk->pLast, uBlock, offCopy, to_copy, pvBuf);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             break;
 
@@ -1338,5 +1338,5 @@
                 /* One of parent image has a block data, copy it into last image. */
                 rc = vdiCopyBlock(pDisk, pImage, uBlock);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     break;
                 pImage = pDisk->pLast;
@@ -1349,5 +1349,5 @@
         cbToWrite -= to_write;
         if (    cbToWrite == 0
-            || VBOX_FAILURE(rc))
+            || RT_FAILURE(rc))
             break;
 
@@ -1426,9 +1426,9 @@
 
                         rc = vdiReadInBlock(pImageFrom, uBlock, offCommit, cbToCopy, pvBuf);
-                        if (VBOX_FAILURE(rc))
+                        if (RT_FAILURE(rc))
                             break;
 
                         rc = vdiWriteInBlock(NULL, pImageTo, uBlock, offCommit, cbToCopy, pvBuf);
-                        if (VBOX_FAILURE(rc))
+                        if (RT_FAILURE(rc))
                             break;
 
@@ -1436,5 +1436,5 @@
                         offCommit += cbToCopy;
                     }
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         break;
                 }
@@ -1487,9 +1487,9 @@
 
                         rc = vdiReadInBlock(pImageFrom, uBlock, offCommit, cbToCopy, pvBuf);
-                        if (VBOX_FAILURE(rc))
+                        if (RT_FAILURE(rc))
                             break;
 
                         rc = vdiWriteInBlock(NULL, pImageTo, uBlock, offCommit, cbToCopy, pvBuf);
-                        if (VBOX_FAILURE(rc))
+                        if (RT_FAILURE(rc))
                             break;
 
@@ -1497,5 +1497,5 @@
                         offCommit += cbToCopy;
                     }
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         break;
                 }
@@ -1588,9 +1588,9 @@
 
                     rc = vdiReadInBlock(pImage, uBlock, offCommit, cbToCopy, pvBuf);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         break;
 
                     rc = vdiWriteInBlock(pDisk, pDstImage, uBlock, offCommit, cbToCopy, pvBuf);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         break;
 
@@ -1598,5 +1598,5 @@
                     offCommit += cbToCopy;
                 }
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     break;
             }
@@ -1638,5 +1638,5 @@
         /* Truncate file. */
         int rc2 = RTFileSetSize(pImage->File, pImage->offStartData);
-        if (VBOX_FAILURE(rc2))
+        if (RT_FAILURE(rc2))
         {
             rc = rc2;
@@ -1647,5 +1647,5 @@
         /* Save header and blocks array. */
         rc2 = vdiUpdateBlocks(pImage);
-        if (VBOX_FAILURE(rc2))
+        if (RT_FAILURE(rc2))
         {
             rc = rc2;
@@ -1695,5 +1695,5 @@
     PVDIIMAGEDESC pImage;
     int rc = vdiOpenImage(&pImage, pszFilename, VDI_OPEN_FLAGS_READONLY, NULL);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         Log(("VDICheckImage: filename=\"%s\" version=%08X type=%X cbDisk=%llu uuid={%Vuuid}\n",
@@ -1714,5 +1714,5 @@
                 rc = VERR_BUFFER_OVERFLOW;
         }
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             if (puVersion)
@@ -1767,5 +1767,5 @@
     PVDIIMAGEDESC pImage;
     int rc = vdiOpenImage(&pImage, pszFilename, VDI_OPEN_FLAGS_NORMAL, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("VDISetImageComment: vdiOpenImage rc=%Vrc filename=\"%s\"!\n", rc, pszFilename));
@@ -1866,5 +1866,5 @@
     PVDIIMAGEDESC pParent;
     int rc = vdiOpenImage(&pParent, pszParent, VDI_OPEN_FLAGS_READONLY, NULL);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         rc = vdiCreateImage(pszFilename, VDI_IMAGE_TYPE_DIFF, VDI_IMAGE_FLAGS_DEFAULT,
@@ -1895,5 +1895,5 @@
 
     int rc = VDICheckImage(pszFilename, NULL, NULL, NULL, NULL, NULL, NULL, 0);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         rc = RTFileDelete(pszFilename);
 
@@ -1939,5 +1939,5 @@
     PVDIIMAGEDESC pImage;
     int rc = vdiOpenImage(&pImage, pszSrcFilename, VDI_OPEN_FLAGS_READONLY, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("VDICopyImage: src image \"%s\" open failed rc=%Vrc\n", pszSrcFilename, rc));
@@ -1953,15 +1953,15 @@
                     pszDstFilename,
                     RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_ALL | RTFILE_O_NOT_CONTENT_INDEXED);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
 #ifndef RT_OS_WINDOWS
         /* lock new image exclusively to close any wrong access by VDI API calls. */
         rc = RTFileLock(File, RTFILE_LOCK_WRITE | RTFILE_LOCK_IMMEDIATELY, 0, cbFile);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
 #endif
         {
             /* Set the size of a new file. */
             rc = RTFileSetSize(File, cbFile);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 /* A dirty trick - use original image data to fill the new image. */
@@ -1980,5 +1980,5 @@
                 /* Write the pre-header to new image. */
                 rc = RTFileSeek(pImage->File, 0, RTFILE_SEEK_BEGIN, NULL);
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                     rc = RTFileWrite(pImage->File,
                                      &pImage->PreHeader,
@@ -1987,5 +1987,5 @@
 
                 /* Write the header and the blocks array to new image. */
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                     rc = vdiUpdateBlocks(pImage);
 
@@ -1994,10 +1994,10 @@
 
                 /* Seek to the data start in both images. */
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                     rc = RTFileSeek(pImage->File,
                                     pImage->offStartData,
                                     RTFILE_SEEK_BEGIN,
                                     NULL);
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                     rc = RTFileSeek(File,
                                     pImage->offStartData,
@@ -2005,5 +2005,5 @@
                                     NULL);
 
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                 {
                     /* alloc tmp buffer */
@@ -2022,10 +2022,10 @@
                             /* Read. */
                             rc = RTFileRead(pImage->File, pvBuf, cbToCopy, NULL);
-                            if (VBOX_FAILURE(rc))
+                            if (RT_FAILURE(rc))
                                 break;
 
                             /* Write. */
                             rc = RTFileWrite(File, pvBuf, cbToCopy, NULL);
-                            if (VBOX_FAILURE(rc))
+                            if (RT_FAILURE(rc))
                                 break;
 
@@ -2036,5 +2036,5 @@
                                                  (c * 100) / cBlocks,
                                                  pvUser);
-                                if (VBOX_FAILURE(rc))
+                                if (RT_FAILURE(rc))
                                     break;
                             }
@@ -2056,5 +2056,5 @@
         RTFileClose(File);
 
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             RTFileDelete(pszDstFilename);
 
@@ -2092,5 +2092,5 @@
     PVDIIMAGEDESC pImage;
     int rc = vdiOpenImage(&pImage, pszFilename, VDI_OPEN_FLAGS_NORMAL, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("VDIShrinkImage: vdiOpenImage rc=%Vrc filename=\"%s\"\n", rc, pszFilename));
@@ -2114,5 +2114,5 @@
     uint64_t cbFile;
     rc = RTFileGetSize(pImage->File, &cbFile);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("VDIShrinkImage: RTFileGetSize rc=%Vrc for file=\"%s\"\n", rc, pszFilename));
@@ -2182,5 +2182,5 @@
                                    + (pImage->offStartData + pImage->offStartBlockData);
                 rc = RTFileSeek(pImage->File, u64Offset, RTFILE_SEEK_BEGIN, NULL);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                 {
                     Log(("VDIShrinkImage: seek rc=%Vrc filename=\"%s\" uBlock=%u cBlocks=%u cBlocksAllocated=%u cBlocksAllocated2=%u cbData=%llu\n",
@@ -2189,5 +2189,5 @@
                 }
                 rc = RTFileRead(pImage->File, pvBuf, cbBlock, NULL);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                 {
                     Log(("VDIShrinkImage: read rc=%Vrc filename=\"%s\" cbBlock=%u uBlock=%u cBlocks=%u cBlocksAllocated=%u cBlocksAllocated2=%u cbData=%llu\n",
@@ -2207,5 +2207,5 @@
                                   + (pImage->offStartData + pImage->offStartBlockData);
                         rc = RTFileSeek(pImage->File, u64Offset, RTFILE_SEEK_BEGIN, NULL);
-                        if (VBOX_FAILURE(rc))
+                        if (RT_FAILURE(rc))
                         {
                             Log(("VDIShrinkImage: seek(2) rc=%Vrc filename=\"%s\" uBlockWrite=%u cBlocks=%u cBlocksAllocated=%u cBlocksAllocated2=%u cbData=%llu\n",
@@ -2214,5 +2214,5 @@
                         }
                         rc = RTFileWrite(pImage->File, pvBuf, cbBlock, NULL);
-                        if (VBOX_FAILURE(rc))
+                        if (RT_FAILURE(rc))
                         {
                             Log(("VDIShrinkImage: write rc=%Vrc filename=\"%s\" cbBlock=%u uBlockWrite=%u cBlocks=%u cBlocksAllocated=%u cBlocksAllocated2=%u cbData=%llu\n",
@@ -2247,5 +2247,5 @@
         RTMemTmpFree(pvBuf);
 
-        if (    VBOX_SUCCESS(rc)
+        if (    RT_SUCCESS(rc)
             &&  uBlockWrite < cBlocksAllocated2)
         {
@@ -2256,5 +2256,5 @@
             rc = RTFileSetSize(pImage->File,
                                pImage->offStartData + ((uint64_t)uBlockWrite << pImage->uShiftIndex2Offset));
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 Log(("VDIShrinkImage: RTFileSetSize rc=%Vrc\n", rc));
         }
@@ -2268,5 +2268,5 @@
 
     /* Save header and blocks array. */
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         setImageBlocksAllocated(&pImage->Header, cBlocksAllocated2);
@@ -2310,5 +2310,5 @@
     PVDIIMAGEDESC pImage;
     int rc = vdiOpenImage(&pImage, pszFilename, VDI_OPEN_FLAGS_NORMAL, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("VDIConvertImage: vdiOpenImage rc=%Vrc filename=\"%s\"\n", rc, pszFilename));
@@ -2364,5 +2364,5 @@
 
     rc = RTFileGetSize(pImage->File, &cbFile);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto l_conversion_failed;
 
@@ -2378,5 +2378,5 @@
     /* Expand file. */
     rc = RTFileSetSize(pImage->File, cbFile + off);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto l_conversion_failed;
 
@@ -2404,16 +2404,16 @@
                 /* Read. */
                 rc = RTFileSeek(pImage->File, offFile, RTFILE_SEEK_BEGIN, NULL);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     break;
                 rc = RTFileRead(pImage->File, pvBuf, cbToMove, NULL);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     break;
 
                 /* Write. */
                 rc = RTFileSeek(pImage->File, offFile + off, RTFILE_SEEK_BEGIN, NULL);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     break;
                 rc = RTFileWrite(pImage->File, pvBuf, cbToMove, NULL);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     break;
 
@@ -2438,9 +2438,9 @@
 
             /* Fill the beginning of file with zeroes to wipe out old headers etc. */
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 Assert(offFile + off <= VDIDISK_DEFAULT_BUFFER_SIZE);
                 rc = RTFileSeek(pImage->File, 0, RTFILE_SEEK_BEGIN, NULL);
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                 {
                     memset(pvBuf, 0, (unsigned)offFile + off);
@@ -2454,5 +2454,5 @@
             rc = VERR_NO_MEMORY;
 
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto l_conversion_failed;
     }
@@ -2474,8 +2474,8 @@
     /* Write pre-header. */
     rc = RTFileSeek(pImage->File, 0, RTFILE_SEEK_BEGIN, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto l_conversion_failed;
     rc = RTFileWrite(pImage->File, &pImage->PreHeader, sizeof(pImage->PreHeader), NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto l_conversion_failed;
 
@@ -2519,5 +2519,5 @@
     PVDIIMAGEDESC pImage;
     int rc = vdiOpenImage(&pImage, pszFilename, VDI_OPEN_FLAGS_NORMAL, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("VDIGetImageUUIDs: vdiOpenImage rc=%Vrc filename=\"%s\"\n", rc, pszFilename));
@@ -2595,5 +2595,5 @@
     PVDIIMAGEDESC pImage;
     int rc = vdiOpenImage(&pImage, pszFilename, VDI_OPEN_FLAGS_NORMAL, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("VDISetImageUUIDs: vdiOpenImage rc=%Vrc filename=\"%s\"\n", rc, pszFilename));
@@ -2679,5 +2679,5 @@
     PVDIIMAGEDESC pImageFrom;
     int rc = vdiOpenImage(&pImageFrom, pszFilenameFrom, VDI_OPEN_FLAGS_READONLY, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("VDIMergeImage: vdiOpenImage rc=%Vrc pstFilenameFrom=\"%s\"\n", rc, pszFilenameFrom));
@@ -2687,5 +2687,5 @@
     PVDIIMAGEDESC pImageTo;
     rc = vdiOpenImage(&pImageTo, pszFilenameTo, VDI_OPEN_FLAGS_NORMAL, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("VDIMergeImage: vdiOpenImage rc=%Vrc pszFilenameTo=\"%s\"\n", rc, pszFilenameTo));
@@ -3345,5 +3345,5 @@
                               cbLock);
 #endif
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         pImage->fReadOnly = fReadOnly;
@@ -3388,5 +3388,5 @@
     {
         rc = vdiChangeImageMode(pImage, false);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             VDIFlushImage(pImage);
@@ -3437,5 +3437,5 @@
     PVDIIMAGEDESC pImage;
     int rc = vdiOpenImage(&pImage, pszFilename, fOpen, pDisk->pLast);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         if (pDisk->pLast)
@@ -3460,5 +3460,5 @@
         }
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
             vdiAddImageToList(pDisk, pImage);
         else
@@ -3583,5 +3583,5 @@
         /* Change previous image mode to r/w. */
         rc = vdiChangeImageMode(pImage->pPrev, false);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             Log(("VDIDiskCommitLastDiff: can't switch previous image into r/w mode, rc=%Vrc\n", rc));
@@ -3591,5 +3591,5 @@
 
     rc = vdiCommitToImage(pDisk, pImage->pPrev, pfnProgress, pvUser);
-    if (VBOX_SUCCESS(rc) && fWasReadOnly)
+    if (RT_SUCCESS(rc) && fWasReadOnly)
     {
         /* Change previous image mode back to r/o. */
@@ -3597,5 +3597,5 @@
     }
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         /* Failed! Close all images, can't work with VHDD at all. */
@@ -3645,8 +3645,8 @@
                             pDisk->pLast,
                             pfnProgress, pvUser);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         rc = VDIDiskOpenImage(pDisk, pszFilename, VDI_OPEN_FLAGS_NORMAL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             VDIDeleteImage(pszFilename);
     }
Index: trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp	(revision 11266)
@@ -374,5 +374,5 @@
     rc = RTFileOpen(&File, pImage->pszFilename,
                     RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_ALL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vdiError(pImage, rc, RT_SRC_POS, N_("VDI: cannot create image '%s'"), pImage->pszFilename);
@@ -390,5 +390,5 @@
         RTFOFF cbFree = 0;
         rc = RTFsQuerySizes(pImage->pszFilename, NULL, &cbFree, NULL, NULL);
-        if (VBOX_SUCCESS(rc) /* ignore errors */ && ((uint64_t)cbFree < cbTotal))
+        if (RT_SUCCESS(rc) /* ignore errors */ && ((uint64_t)cbFree < cbTotal))
         {
             rc = vdiError(pImage, VERR_DISK_FULL, RT_SRC_POS, N_("VDI: disk would overflow creating image '%s'"), pImage->pszFilename);
@@ -410,5 +410,5 @@
         rc = RTFileSetSize(pImage->File, pImage->offStartData);
     }
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vdiError(pImage, rc, RT_SRC_POS, N_("VDI: setting image size failed for '%s'"), pImage->pszFilename);
@@ -421,5 +421,5 @@
     /* Write pre-header. */
     rc = RTFileWriteAt(File, 0, &pImage->PreHeader, sizeof(pImage->PreHeader), NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vdiError(pImage, rc, RT_SRC_POS, N_("VDI: writing pre-header failed for '%s'"), pImage->pszFilename);
@@ -429,5 +429,5 @@
     /* Write header. */
     rc = RTFileWriteAt(File, sizeof(pImage->PreHeader), &pImage->Header.u.v1plus, sizeof(pImage->Header.u.v1plus), NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vdiError(pImage, rc, RT_SRC_POS, N_("VDI: writing header failed for '%s'"), pImage->pszFilename);
@@ -439,5 +439,5 @@
                        getImageBlocks(&pImage->Header) * sizeof(VDIIMAGEBLOCKPOINTER),
                        NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vdiError(pImage, rc, RT_SRC_POS, N_("VDI: writing block pointers failed for '%s'"), pImage->pszFilename);
@@ -472,5 +472,5 @@
             rc = RTFileWriteAt(File, pImage->offStartData + uOff,
                                pvBuf, cbChunk, NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 rc = vdiError(pImage, rc, RT_SRC_POS, N_("VDI: writing block failed for '%s'"), pImage->pszFilename);
@@ -485,5 +485,5 @@
                                  uPercentStart + uOff * uPercentSpan / cbFill,
                                  pvUser);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     goto out;
             }
@@ -493,9 +493,9 @@
 
 out:
-    if (VBOX_SUCCESS(rc) && pfnProgress)
+    if (RT_SUCCESS(rc) && pfnProgress)
         pfnProgress(NULL /* WARNING! pVM=NULL  */,
                     uPercentStart + uPercentSpan, pvUser);
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         vdiFreeImage(pImage, rc != VERR_ALREADY_EXISTS);
     return rc;
@@ -522,5 +522,5 @@
                      ? RTFILE_O_READ      | RTFILE_O_OPEN | RTFILE_O_DENY_NONE
                      : RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         /* Do NOT signal an appropriate error here, as the VD layer has the
@@ -533,5 +533,5 @@
     rc = RTFileReadAt(File, 0, &pImage->PreHeader, sizeof(pImage->PreHeader),
                       NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vdiError(pImage, rc, RT_SRC_POS, N_("VDI: error reading pre-header in '%s'"), pImage->pszFilename);
@@ -539,5 +539,5 @@
     }
     rc = vdiValidatePreHeader(&pImage->PreHeader);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vdiError(pImage, rc, RT_SRC_POS, N_("VDI: invalid pre-header in '%s'"), pImage->pszFilename);
@@ -553,5 +553,5 @@
                               &pImage->Header.u.v0, sizeof(pImage->Header.u.v0),
                               NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 rc = vdiError(pImage, rc, RT_SRC_POS, N_("VDI: error reading v0 header in '%s'"), pImage->pszFilename);
@@ -563,5 +563,5 @@
                               &pImage->Header.u.v1, sizeof(pImage->Header.u.v1),
                               NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 rc = vdiError(pImage, rc, RT_SRC_POS, N_("VDI: error reading v1 header in '%s'"), pImage->pszFilename);
@@ -586,5 +586,5 @@
                 /* Read the actual VDI 1.1+ header completely. */
                 rc = RTFileReadAt(File, sizeof(pImage->PreHeader), &pImage->Header.u.v1plus, sizeof(pImage->Header.u.v1plus), NULL);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                 {
                     rc = vdiError(pImage, rc, RT_SRC_POS, N_("VDI: error reading v1.1+ header in '%s'"), pImage->pszFilename);
@@ -599,5 +599,5 @@
 
     rc = vdiValidateHeader(&pImage->Header);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vdiError(pImage, VERR_VDI_UNSUPPORTED_VERSION, RT_SRC_POS, N_("VDI: invalid header in '%s'"), pImage->pszFilename);
@@ -622,5 +622,5 @@
 
 out:
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         vdiFreeImage(pImage, false);
     return rc;
@@ -659,5 +659,5 @@
     /* Update image header. */
     int rc = vdiUpdateHeader(pImage);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* write only one block pointer. */
@@ -787,5 +787,5 @@
 
     rc = vdiOpenImage(pImage, uOpenFlags);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         *ppBackendData = pImage;
 
@@ -845,5 +845,5 @@
                         pPCHSGeometry, pLCHSGeometry,
                         pfnProgress, pvUser, uPercentStart, uPercentSpan);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* So far the image is opened in read/write mode. Make sure the
@@ -853,5 +853,5 @@
             vdiFreeImage(pImage, false);
             rc = vdiOpenImage(pImage, uOpenFlags);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 goto out;
         }
@@ -886,9 +886,9 @@
     /* Rename the file. */
     rc = RTFileMove(pImage->pszFilename, pszFilename, 0);
-    if (VBOX_FAILURE(rc))
-    {   
+    if (RT_FAILURE(rc))
+    {
         /* The move failed, try to reopen the original image. */
         int rc2 = vdiOpenImage(pImage, pImage->uOpenFlags);
-        if (VBOX_FAILURE(rc2))
+        if (RT_FAILURE(rc2))
             rc = rc2;
 
@@ -901,5 +901,5 @@
     /* Open the new image. */
     rc = vdiOpenImage(pImage, pImage->uOpenFlags);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
 
@@ -970,5 +970,5 @@
     }
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         *pcbActuallyRead = cbToRead;
 
@@ -1046,5 +1046,5 @@
                                + (pImage->offStartData + pImage->offStartBlockData);
             rc = RTFileWriteAt(pImage->File, u64Offset, pvBuf, cbToWrite, NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 goto out;
             pImage->paBlocks[uBlock] = cBlocksAllocated;
@@ -1052,5 +1052,5 @@
 
             rc = vdiUpdateBlockInfo(pImage, uBlock);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 goto out;
 
@@ -1168,5 +1168,5 @@
         {
             int rc = RTFileGetSize(pImage->File, &cbFile);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
                 cb += cbFile;
         }
Index: trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp	(revision 11266)
@@ -368,5 +368,5 @@
     /** Async I/O interface callbacks. */
     PVDINTERFACEASYNCIO pInterfaceAsyncIOCallbacks;
-    /** 
+    /**
      * Pointer to an array of task handles for task submission.
      * This is an optimization because the task number to submit is not known
@@ -496,5 +496,5 @@
         pVmdkFile->fAsyncIO = false;
     }
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         pVmdkFile->uReferences = 1;
@@ -554,5 +554,5 @@
             rc = RTFileClose(pVmdkFile->File);
         }
-        if (VBOX_SUCCESS(rc) && pVmdkFile->fDelete)
+        if (RT_SUCCESS(rc) && pVmdkFile->fDelete)
             rc = RTFileDelete(pVmdkFile->pszFilename);
         RTStrFree((char *)(void *)pVmdkFile->pszFilename);
@@ -567,6 +567,6 @@
  * Internal: read from a file distinguishing between async and normal operation
  */
-DECLINLINE(int) vmdkFileReadAt(PVMDKFILE pVmdkFile, 
-                               uint64_t uOffset, void *pvBuf, 
+DECLINLINE(int) vmdkFileReadAt(PVMDKFILE pVmdkFile,
+                               uint64_t uOffset, void *pvBuf,
                                size_t cbToRead, size_t *pcbRead)
 {
@@ -584,6 +584,6 @@
  * Internal: write to a file distinguishing between async and normal operation
  */
-DECLINLINE(int) vmdkFileWriteAt(PVMDKFILE pVmdkFile, 
-                                uint64_t uOffset, const void *pvBuf, 
+DECLINLINE(int) vmdkFileWriteAt(PVMDKFILE pVmdkFile,
+                                uint64_t uOffset, const void *pvBuf,
                                 size_t cbToWrite, size_t *pcbWritten)
 {
@@ -663,9 +663,9 @@
             rc2 = RTFileClose(pVmdkFile->File);
 
-        if (VBOX_SUCCESS(rc) && pVmdkFile->fDelete)
+        if (RT_SUCCESS(rc) && pVmdkFile->fDelete)
             rc2 = RTFileDelete(pVmdkFile->pszFilename);
         RTStrFree((char *)(void *)pVmdkFile->pszFilename);
         RTMemFree(pVmdkFile);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
             rc = rc2;
     }
@@ -781,5 +781,5 @@
                         pGD, cbGD, NULL);
     AssertRC(rc);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: could not read grain directory in '%s'"), pExtent->pszFullname);
@@ -801,5 +801,5 @@
                             pRGD, cbGD, NULL);
         AssertRC(rc);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             rc = vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: could not read redundant grain directory in '%s'"), pExtent->pszFullname);
@@ -845,5 +845,5 @@
             rc = vmdkFileReadAt(pExtent->pFile, VMDK_SECTOR2BYTE(*pGDTmp),
                                 pTmpGT1, cbGT, NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 rc = vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: error reading grain table in '%s'"), pExtent->pszFullname);
@@ -854,5 +854,5 @@
             rc = vmdkFileReadAt(pExtent->pFile, VMDK_SECTOR2BYTE(*pRGDTmp),
                                 pTmpGT2, cbGT, NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 rc = vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: error reading backup grain table in '%s'"), pExtent->pszFullname);
@@ -874,5 +874,5 @@
 
 out:
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         vmdkFreeGrainDirectory(pExtent);
     return rc;
@@ -912,5 +912,5 @@
     cbOverhead = RT_ALIGN_64(VMDK_SECTOR2BYTE(uStartSector) + 2 * (cbGDRounded + cbGTRounded), VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
     rc = vmdkFileSetSize(pExtent->pFile, cbOverhead);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     pExtent->uSectorRGD = uStartSector;
@@ -931,5 +931,5 @@
                                  VMDK_SECTOR2BYTE(pExtent->uSectorRGD) + i * sizeof(uGTSectorLE),
                                  &uGTSectorLE, sizeof(uGTSectorLE), NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write new redundant grain directory entry in '%s'"), pExtent->pszFullname);
             uOffsetSectors += VMDK_BYTE2SECTOR(pExtent->cGTEntries * sizeof(uint32_t));
@@ -945,5 +945,5 @@
                                  VMDK_SECTOR2BYTE(pExtent->uSectorGD) + i * sizeof(uGTSectorLE),
                                  &uGTSectorLE, sizeof(uGTSectorLE), NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write new grain directory entry in '%s'"), pExtent->pszFullname);
             uOffsetSectors += VMDK_BYTE2SECTOR(pExtent->cGTEntries * sizeof(uint32_t));
@@ -953,5 +953,5 @@
 
 out:
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         vmdkFreeGrainDirectory(pExtent);
     return rc;
@@ -1176,5 +1176,5 @@
         return VERR_VDI_VALUE_NOT_FOUND;
     int rc = vmdkStringUnquote(pImage, pszValue, &pszValueUnquoted, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     *ppszValue = pszValueUnquoted;
@@ -1188,5 +1188,5 @@
 
     int rc = RTStrAPrintf(&pszValueQuoted, "\"%s\"", pszValue);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDesc, pszKey,
@@ -1305,5 +1305,5 @@
         return VERR_VDI_VALUE_NOT_FOUND;
     int rc = vmdkStringUnquote(pImage, pszValue, &pszValueUnquoted, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     *ppszValue = pszValueUnquoted;
@@ -1321,5 +1321,5 @@
         return VERR_VDI_VALUE_NOT_FOUND;
     int rc = vmdkStringUnquote(pImage, pszValue, &pszValueUnquoted, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = RTStrToUInt32Ex(pszValueUnquoted, NULL, 10, puValue);
@@ -1338,5 +1338,5 @@
         return VERR_VDI_VALUE_NOT_FOUND;
     int rc = vmdkStringUnquote(pImage, pszValue, &pszValueUnquoted, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = RTUuidFromStr(pUuid, pszValueUnquoted);
@@ -1354,5 +1354,5 @@
     {
         rc = RTStrAPrintf(&pszValQuoted, "\"%s\"", pszVal);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -1372,5 +1372,5 @@
 
     int rc = RTStrAPrintf(&pszUuid, "\"%Vuuid\"", pUuid);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDDB, pszKey,
@@ -1386,5 +1386,5 @@
 
     int rc = RTStrAPrintf(&pszValue, "\"%d\"", uValue);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDDB, pszKey,
@@ -1517,10 +1517,10 @@
                            VMDK_DDB_GEO_PCHS_CYLINDERS,
                            pPCHSGeometry->cCylinders);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = vmdkDescDDBSetU32(pImage, &pImage->Descriptor,
                            VMDK_DDB_GEO_PCHS_HEADS,
                            pPCHSGeometry->cHeads);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = vmdkDescDDBSetU32(pImage, &pImage->Descriptor,
@@ -1536,10 +1536,10 @@
                            VMDK_DDB_GEO_LCHS_CYLINDERS,
                            pLCHSGeometry->cCylinders);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = vmdkDescDDBSetU32(pImage, &pImage->Descriptor,
                            VMDK_DDB_GEO_LCHS_HEADS,
                            pLCHSGeometry->cHeads);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = vmdkDescDDBSetU32(pImage, &pImage->Descriptor,
@@ -1564,35 +1564,35 @@
 
     rc = vmdkDescInitStr(pImage, pDescriptor, "# Disk DescriptorFile");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     rc = vmdkDescInitStr(pImage, pDescriptor, "version=1");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     pDescriptor->uFirstDesc = pDescriptor->cLines - 1;
     rc = vmdkDescInitStr(pImage, pDescriptor, "");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     rc = vmdkDescInitStr(pImage, pDescriptor, "# Extent description");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     rc = vmdkDescInitStr(pImage, pDescriptor, "NOACCESS 0 ZERO ");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     pDescriptor->uFirstExtent = pDescriptor->cLines - 1;
     rc = vmdkDescInitStr(pImage, pDescriptor, "");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     /* The trailing space is created by VMware, too. */
     rc = vmdkDescInitStr(pImage, pDescriptor, "# The disk Data Base ");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     rc = vmdkDescInitStr(pImage, pDescriptor, "#DDB");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     rc = vmdkDescInitStr(pImage, pDescriptor, "");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     rc = vmdkDescInitStr(pImage, pDescriptor, "ddb.virtualHWVersion = \"4\"");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     pDescriptor->uFirstDDB = pDescriptor->cLines - 1;
@@ -1604,13 +1604,13 @@
     rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDesc,
                         "CID", szBuf);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDesc,
                         "parentCID", "ffffffff");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
 
     rc = vmdkDescDDBSetStr(pImage, pDescriptor, "ddb.adapterType", "ide");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
 
@@ -1628,5 +1628,5 @@
     rc = vmdkPreprocessDescriptor(pImage, pDescData, cbDescData,
                                   &pImage->Descriptor);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -1634,5 +1634,5 @@
     uint32_t uVersion;
     rc = vmdkDescBaseGetU32(&pImage->Descriptor, "version", &uVersion);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error finding key 'version' in descriptor in '%s'"), pImage->pszFilename);
     if (uVersion != 1)
@@ -1643,5 +1643,5 @@
     rc = vmdkDescBaseGetStr(pImage, &pImage->Descriptor, "createType",
                             &pszCreateType);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: cannot get image type from descriptor in '%s'"), pImage->pszFilename);
     if (    !strcmp(pszCreateType, "twoGbMaxExtentSparse")
@@ -1671,5 +1671,5 @@
         /* Non-monolithic image, extents need to be allocated. */
         rc = vmdkCreateExtents(pImage, cExtents);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -1704,5 +1704,5 @@
         rc = RTStrToUInt64Ex(pszLine, &pszLine, 10,
                              &pImage->pExtents[i].cNominalSectors);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pImage, VERR_VDI_INVALID_HEADER, RT_SRC_POS, N_("VMDK: parse error in extent description in '%s'"), pImage->pszFilename);
         if (*pszLine++ != ' ')
@@ -1750,5 +1750,5 @@
             char *pszBasename;
             rc = vmdkStringUnquote(pImage, pszLine, &pszBasename, &pszLine);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return rc;
             pImage->pExtents[i].pszBasename = pszBasename;
@@ -1761,5 +1761,5 @@
                     rc = RTStrToUInt64Ex(pszLine, &pszLine, 10,
                                          &pImage->pExtents[i].uSectorOffset);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         return vmdkError(pImage, VERR_VDI_INVALID_HEADER, RT_SRC_POS, N_("VMDK: parse error in extent description in '%s'"), pImage->pszFilename);
                 }
@@ -1777,5 +1777,5 @@
     if (rc == VERR_VDI_VALUE_NOT_FOUND)
         pImage->PCHSGeometry.cCylinders = 0;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error getting PCHS geometry from extent description in '%s'"), pImage->pszFilename);
     rc = vmdkDescDDBGetU32(pImage, &pImage->Descriptor,
@@ -1784,5 +1784,5 @@
     if (rc == VERR_VDI_VALUE_NOT_FOUND)
         pImage->PCHSGeometry.cHeads = 0;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error getting PCHS geometry from extent description in '%s'"), pImage->pszFilename);
     rc = vmdkDescDDBGetU32(pImage, &pImage->Descriptor,
@@ -1791,5 +1791,5 @@
     if (rc == VERR_VDI_VALUE_NOT_FOUND)
         pImage->PCHSGeometry.cSectors = 0;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error getting PCHS geometry from extent description in '%s'"), pImage->pszFilename);
     if (    pImage->PCHSGeometry.cCylinders == 0
@@ -1812,5 +1812,5 @@
     if (rc == VERR_VDI_VALUE_NOT_FOUND)
         pImage->LCHSGeometry.cCylinders = 0;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error getting LCHS geometry from extent description in '%s'"), pImage->pszFilename);
     rc = vmdkDescDDBGetU32(pImage, &pImage->Descriptor,
@@ -1819,5 +1819,5 @@
     if (rc == VERR_VDI_VALUE_NOT_FOUND)
         pImage->LCHSGeometry.cHeads = 0;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error getting LCHS geometry from extent description in '%s'"), pImage->pszFilename);
     rc = vmdkDescDDBGetU32(pImage, &pImage->Descriptor,
@@ -1826,5 +1826,5 @@
     if (rc == VERR_VDI_VALUE_NOT_FOUND)
         pImage->LCHSGeometry.cSectors = 0;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error getting LCHS geometry from extent description in '%s'"), pImage->pszFilename);
     if (    pImage->LCHSGeometry.cCylinders == 0
@@ -1850,13 +1850,13 @@
         {
             rc = RTUuidCreate(&pImage->ImageUuid);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return rc;
             rc = vmdkDescDDBSetUuid(pImage, &pImage->Descriptor,
                                     VMDK_DDB_IMAGE_UUID, &pImage->ImageUuid);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing image UUID in descriptor in '%s'"), pImage->pszFilename);
         }
     }
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return rc;
 
@@ -1875,14 +1875,14 @@
         {
             rc = RTUuidCreate(&pImage->ModificationUuid);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return rc;
             rc = vmdkDescDDBSetUuid(pImage, &pImage->Descriptor,
                                     VMDK_DDB_MODIFICATION_UUID,
                                     &pImage->ModificationUuid);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing image modification UUID in descriptor in '%s'"), pImage->pszFilename);
         }
     }
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return rc;
 
@@ -1900,13 +1900,13 @@
         {
             rc = RTUuidClear(&pImage->ParentUuid);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return rc;
             rc = vmdkDescDDBSetUuid(pImage, &pImage->Descriptor,
                                     VMDK_DDB_PARENT_UUID, &pImage->ParentUuid);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing parent UUID in descriptor in '%s'"), pImage->pszFilename);
         }
     }
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return rc;
 
@@ -1925,14 +1925,14 @@
         {
             rc = RTUuidCreate(&pImage->ParentModificationUuid);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return rc;
             rc = vmdkDescDDBSetUuid(pImage, &pImage->Descriptor,
                                     VMDK_DDB_PARENT_MODIFICATION_UUID,
                                     &pImage->ParentModificationUuid);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing parent modification UUID in descriptor in '%s'"), pImage->pszFilename);
         }
     }
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return rc;
 
@@ -1973,9 +1973,9 @@
             return vmdkError(pImage, VERR_BUFFER_OVERFLOW, RT_SRC_POS, N_("VMDK: descriptor too long in '%s'"), pImage->pszFilename);
         rc = vmdkFileWriteAt(pDescFile, uOffset, psz, cb, NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error writing descriptor in '%s'"), pImage->pszFilename);
         uOffset += cb;
         rc = vmdkFileWriteAt(pDescFile, uOffset, "\n", 1, NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error writing descriptor in '%s'"), pImage->pszFilename);
         uOffset++;
@@ -1987,5 +1987,5 @@
         {
             rc = vmdkFileWriteAt(pDescFile, uOffset, "", 1, NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error writing descriptor in '%s'"), pImage->pszFilename);
             uOffset++;
@@ -1995,5 +1995,5 @@
     {
         rc = vmdkFileSetSize(pDescFile, uOffset);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error truncating descriptor in '%s'"), pImage->pszFilename);
     }
@@ -2012,5 +2012,5 @@
     int rc = vmdkFileReadAt(pExtent->pFile, 0, &Header, sizeof(Header), NULL);
     AssertRC(rc);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: error reading extent header in '%s'"), pExtent->pszFullname);
@@ -2026,5 +2026,5 @@
      * image is at least truncated, or even seriously garbled. */
     rc = vmdkFileGetSize(pExtent->pFile, &cbExtentSize);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: error getting size in '%s'"), pExtent->pszFullname);
@@ -2093,5 +2093,5 @@
 
 out:
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         vmdkFreeExtentData(pImage, pExtent, false);
 
@@ -2136,5 +2136,5 @@
     int rc = vmdkFileWriteAt(pExtent->pFile, 0, &Header, sizeof(Header), NULL);
     AssertRC(rc);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         rc = vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: error writing extent header in '%s'"), pExtent->pszFullname);
     return rc;
@@ -2154,5 +2154,5 @@
     int rc = vmdkFileReadAt(pExtent->pFile, 0, &Header, sizeof(Header), NULL);
     AssertRC(rc);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     if (    RT_LE2H_U32(Header.magicNumber) != VMDK_ESX_SPARSE_MAGICNUMBER
@@ -2202,5 +2202,5 @@
 
 out:
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         vmdkFreeExtentData(pImage, pExtent, false);
 
@@ -2318,5 +2318,5 @@
     /*
      * Open the image.
-     * We don't have to check for asynchronous access because 
+     * We don't have to check for asynchronous access because
      * we only support raw access and the opened file is a description
      * file were no data is stored.
@@ -2326,5 +2326,5 @@
                        ? RTFILE_O_READ      | RTFILE_O_OPEN | RTFILE_O_DENY_NONE
                        : RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE, false);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         /* Do NOT signal an appropriate error here, as the VD layer has the
@@ -2336,5 +2336,5 @@
     /* Read magic (if present). */
     rc = vmdkFileReadAt(pFile, 0, &u32Magic, sizeof(u32Magic), NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error reading the magic number in '%s'"), pImage->pszFilename);
@@ -2347,5 +2347,5 @@
         /* It's a hosted sparse single-extent image. */
         rc = vmdkCreateExtents(pImage, 1);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto out;
         /* The opened file is passed to the extent. No separate descriptor
@@ -2361,5 +2361,5 @@
         }
         rc = vmdkReadMetaSparseExtent(pImage, pExtent);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto out;
         /* As we're dealing with a monolithic sparse image here, there must
@@ -2382,5 +2382,5 @@
                             VMDK_SECTOR2BYTE(pExtent->cDescriptorSectors), NULL);
         AssertRC(rc);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: read error for descriptor in '%s'"), pExtent->pszFullname);
@@ -2390,5 +2390,5 @@
         rc = vmdkParseDescriptor(pImage, pExtent->pDescData,
                                  VMDK_SECTOR2BYTE(pExtent->cDescriptorSectors));
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto out;
 
@@ -2413,5 +2413,5 @@
         rc = vmdkFileReadAt(pImage->pFile, 0, pImage->pDescData,
                             pImage->cbDescAlloc, &cbRead);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: read error for descriptor in '%s'"), pImage->pszFilename);
@@ -2428,8 +2428,8 @@
         rc = vmdkParseDescriptor(pImage, pImage->pDescData,
                                  pImage->cbDescAlloc);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto out;
 
-        /* 
+        /*
          * We have to check for the asynchronous open flag. The
          * extents are parsed and the type of all are known now.
@@ -2445,5 +2445,5 @@
                     && (pExtent->enmType != VMDKETYPE_ZERO))
                 {
-                    /* 
+                    /*
                      * Opened image contains at least one none flat or zero extent.
                      * Return error but don't set error message as the caller
@@ -2490,5 +2490,5 @@
                                       RTPATH_SLASH, pExtent->pszBasename);
                     RTStrFree(pszDirname);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         goto out;
                 }
@@ -2505,5 +2505,5 @@
                                         ? RTFILE_O_READ      | RTFILE_O_OPEN | RTFILE_O_DENY_NONE
                                         : RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE, false);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                     {
                         /* Do NOT signal an appropriate error here, as the VD
@@ -2513,5 +2513,5 @@
                     }
                     rc = vmdkReadMetaSparseExtent(pImage, pExtent);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         goto out;
 
@@ -2528,5 +2528,5 @@
                                         ? RTFILE_O_READ      | RTFILE_O_OPEN | RTFILE_O_DENY_NONE
                                         : RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE, true);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                     {
                         /* Do NOT signal an appropriate error here, as the VD
@@ -2564,5 +2564,5 @@
     /* Update the image metadata now in case has changed. */
     rc = vmdkFlushImage(pImage);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
 
@@ -2599,9 +2599,9 @@
 
     rc = vmdkAllocateGrainTableCache(pImage);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
 
 out:
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         vmdkFreeImage(pImage, false);
     return rc;
@@ -2622,5 +2622,5 @@
          * file and open the (flat) raw disk. */
         rc = vmdkCreateExtents(pImage, 1);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new extent list in '%s'"), pImage->pszFilename);
         pExtent = &pImage->pExtents[0];
@@ -2629,5 +2629,5 @@
                           RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_WRITE | RTFILE_O_NOT_CONTENT_INDEXED,
                           false);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new file '%s'"), pImage->pszFilename);
 
@@ -2652,5 +2652,5 @@
         rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszFullname,
                           RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE, false);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not open raw disk file '%s'"), pExtent->pszFullname);
     }
@@ -2695,5 +2695,5 @@
 
         rc = vmdkCreateExtents(pImage, cExtents);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new extent list in '%s'"), pImage->pszFilename);
 
@@ -2702,5 +2702,5 @@
                           RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_WRITE | RTFILE_O_NOT_CONTENT_INDEXED,
                           false);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new file '%s'"), pImage->pszFilename);
 
@@ -2761,5 +2761,5 @@
                                   RTPATH_SLASH, pExtent->pszBasename);
                 RTStrFree(pszDirname);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     return rc;
                 pExtent->pszFullname = pszFullname;
@@ -2774,5 +2774,5 @@
                                   RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_WRITE | RTFILE_O_NOT_CONTENT_INDEXED,
                                   false);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new partition data file '%s'"), pExtent->pszFullname);
                 rc = vmdkFileWriteAt(pExtent->pFile,
@@ -2780,5 +2780,5 @@
                                      pPart->pvPartitionData,
                                      pPart->cbPartitionData, NULL);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not write partition data to '%s'"), pExtent->pszFullname);
                 uPartOffset += VMDK_BYTE2SECTOR(pPart->cbPartitionData);
@@ -2822,5 +2822,5 @@
                                       RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE,
                                       false);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not open raw partition file '%s'"), pExtent->pszFullname);
                 }
@@ -2854,5 +2854,5 @@
                             pRaw->fRawDisk ?
                             "fullDevice" : "partitionedDevice");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not set the image type in '%s'"), pImage->pszFilename);
     return rc;
@@ -2881,5 +2881,5 @@
     }
     rc = vmdkCreateExtents(pImage, cExtents);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new extent list in '%s'"), pImage->pszFilename);
 
@@ -2895,5 +2895,5 @@
                           RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_WRITE | RTFILE_O_NOT_CONTENT_INDEXED,
                           false);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new sparse descriptor file '%s'"), pImage->pszFilename);
         pImage->pszFilename = RTStrDup(pImage->pszFilename);
@@ -2940,5 +2940,5 @@
                                   pszBasenameExt);
             RTStrFree(pszBasenameBase);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return rc;
             cbTmp = strlen(pszTmp) + 1;
@@ -2958,5 +2958,5 @@
                           RTPATH_SLASH, pExtent->pszBasename);
         RTStrFree(pszBasedirectory);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
         pExtent->pszFullname = pszFullname;
@@ -2966,10 +2966,10 @@
                           RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_WRITE | RTFILE_O_NOT_CONTENT_INDEXED,
                           false);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new file '%s'"), pExtent->pszFullname);
         if (enmType == VD_IMAGE_TYPE_FIXED)
         {
             rc = vmdkFileSetSize(pExtent->pFile, cbExtent);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not set size of new file '%s'"), pExtent->pszFullname);
 
@@ -2994,5 +2994,5 @@
 
                 rc = vmdkFileWriteAt(pExtent->pFile, uOff, pvBuf, cbChunk, NULL);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                 {
                     RTMemFree(pvBuf);
@@ -3007,5 +3007,5 @@
                                      uPercentStart + uOff * uPercentSpan / cbExtent,
                                      pvUser);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                     {
                         RTMemFree(pvBuf);
@@ -3055,9 +3055,9 @@
                                                  1),
                                           true);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new grain directory in '%s'"), pExtent->pszFullname);
         }
 
-        if (VBOX_SUCCESS(rc) && pfnProgress)
+        if (RT_SUCCESS(rc) && pfnProgress)
             pfnProgress(NULL /* WARNING! pVM=NULL  */,
                         uPercentStart + i * uPercentSpan / cExtents,
@@ -3083,5 +3083,5 @@
     rc = vmdkDescBaseSetStr(pImage, &pImage->Descriptor, "createType",
                             pszDescType);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not set the image type in '%s'"), pImage->pszFilename);
     return rc;
@@ -3105,5 +3105,5 @@
     rc = vmdkCreateDescriptor(pImage, pImage->pDescData, pImage->cbDescAlloc,
                               &pImage->Descriptor);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new descriptor in '%s'"), pImage->pszFilename);
@@ -3135,8 +3135,8 @@
     }
 
-    if (VBOX_FAILURE(rc))
-        goto out;
-
-    if (VBOX_SUCCESS(rc) && pfnProgress)
+    if (RT_FAILURE(rc))
+        goto out;
+
+    if (RT_SUCCESS(rc) && pfnProgress)
         pfnProgress(NULL /* WARNING! pVM=NULL  */,
                     uPercentStart + uPercentSpan * 98 / 100, pvUser);
@@ -3152,5 +3152,5 @@
                                pExtent->cNominalSectors, pExtent->enmType,
                                pExtent->pszBasename, pExtent->uSectorOffset);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not insert the extent list into descriptor in '%s'"), pImage->pszFilename);
@@ -3165,5 +3165,5 @@
     {
         rc = vmdkDescSetPCHSGeometry(pImage, pPCHSGeometry);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto out;
     }
@@ -3173,5 +3173,5 @@
     {
         rc = vmdkDescSetLCHSGeometry(pImage, pLCHSGeometry);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto out;
     }
@@ -3181,9 +3181,9 @@
 
     rc = RTUuidCreate(&pImage->ImageUuid);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
     rc = vmdkDescDDBSetUuid(pImage, &pImage->Descriptor,
                             VMDK_DDB_IMAGE_UUID, &pImage->ImageUuid);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing image UUID in new descriptor in '%s'"), pImage->pszFilename);
@@ -3193,5 +3193,5 @@
     rc = vmdkDescDDBSetUuid(pImage, &pImage->Descriptor,
                             VMDK_DDB_PARENT_UUID, &pImage->ParentUuid);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing parent image UUID in new descriptor in '%s'"), pImage->pszFilename);
@@ -3202,5 +3202,5 @@
                             VMDK_DDB_MODIFICATION_UUID,
                             &pImage->ModificationUuid);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing modification UUID in new descriptor in '%s'"), pImage->pszFilename);
@@ -3211,5 +3211,5 @@
                             VMDK_DDB_PARENT_MODIFICATION_UUID,
                             &pImage->ParentModificationUuid);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing parent modification UUID in new descriptor in '%s'"), pImage->pszFilename);
@@ -3218,9 +3218,9 @@
 
     rc = vmdkAllocateGrainTableCache(pImage);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
 
     rc = vmdkSetImageComment(pImage, pszComment);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: cannot set image comment in '%s'"), pImage->pszFilename);
@@ -3228,5 +3228,5 @@
     }
 
-    if (VBOX_SUCCESS(rc) && pfnProgress)
+    if (RT_SUCCESS(rc) && pfnProgress)
         pfnProgress(NULL /* WARNING! pVM=NULL  */,
                     uPercentStart + uPercentSpan * 99 / 100, pvUser);
@@ -3235,9 +3235,9 @@
 
 out:
-    if (VBOX_SUCCESS(rc) && pfnProgress)
+    if (RT_SUCCESS(rc) && pfnProgress)
         pfnProgress(NULL /* WARNING! pVM=NULL  */,
                     uPercentStart + uPercentSpan, pvUser);
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         vmdkFreeImage(pImage, rc != VERR_ALREADY_EXISTS);
     return rc;
@@ -3262,5 +3262,5 @@
     if (pszComment)
         RTStrFree(pszCommentEncoded);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing image comment in descriptor in '%s'"), pImage->pszFilename);
     return VINF_SUCCESS;
@@ -3320,5 +3320,5 @@
     {
         rc = vmdkWriteDescriptor(pImage);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto out;
     }
@@ -3333,5 +3333,5 @@
                 case VMDKETYPE_HOSTED_SPARSE:
                     rc = vmdkWriteMetaSparseExtent(pExtent);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         goto out;
                     break;
@@ -3451,5 +3451,5 @@
                             VMDK_SECTOR2BYTE(uGTSector) + (uGTBlock % (pExtent->cGTEntries / VMDK_GT_CACHELINE_SIZE)) * sizeof(aGTDataTmp),
                             aGTDataTmp, sizeof(aGTDataTmp), NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot read grain table entry in '%s'"), pExtent->pszFullname);
         pGTCacheEntry->uExtent = pExtent->uExtent;
@@ -3498,5 +3498,5 @@
          * a new grain table and put the reference to it in the GDs. */
         rc = vmdkFileGetSize(pExtent->pFile, &cbExtentSize);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: error getting size in '%s'"), pExtent->pszFullname);
         Assert(!(cbExtentSize % 512));
@@ -3519,5 +3519,5 @@
                                  VMDK_SECTOR2BYTE(uGTSector) + i * sizeof(aGTDataTmp),
                                  aGTDataTmp, sizeof(aGTDataTmp), NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write grain table allocation in '%s'"), pExtent->pszFullname);
         }
@@ -3526,5 +3526,5 @@
             AssertReturn(!uRGTSector, VERR_VDI_INVALID_HEADER);
             rc = vmdkFileGetSize(pExtent->pFile, &cbExtentSize);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: error getting size in '%s'"), pExtent->pszFullname);
             Assert(!(cbExtentSize % 512));
@@ -3546,5 +3546,5 @@
                                      VMDK_SECTOR2BYTE(uRGTSector) + i * sizeof(aGTDataTmp),
                                      aGTDataTmp, sizeof(aGTDataTmp), NULL);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write backup grain table allocation in '%s'"), pExtent->pszFullname);
             }
@@ -3559,5 +3559,5 @@
                              VMDK_SECTOR2BYTE(pExtent->uSectorGD) + uGDIndex * sizeof(uGTSectorLE),
                              &uGTSectorLE, sizeof(uGTSectorLE), NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write grain directory entry in '%s'"), pExtent->pszFullname);
         if (pExtent->pRGD)
@@ -3567,5 +3567,5 @@
                                  VMDK_SECTOR2BYTE(pExtent->uSectorRGD) + uGDIndex * sizeof(uRGTSectorLE),
                                  &uRGTSectorLE, sizeof(uRGTSectorLE), NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write backup grain directory entry in '%s'"), pExtent->pszFullname);
         }
@@ -3578,5 +3578,5 @@
 
     rc = vmdkFileGetSize(pExtent->pFile, &cbExtentSize);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: error getting size in '%s'"), pExtent->pszFullname);
     Assert(!(cbExtentSize % 512));
@@ -3584,5 +3584,5 @@
     /* Write the data. */
     rc = vmdkFileWriteAt(pExtent->pFile, cbExtentSize, pvBuf, cbWrite, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write allocated data block in '%s'"), pExtent->pszFullname);
 
@@ -3598,5 +3598,5 @@
                             VMDK_SECTOR2BYTE(uGTSector) + (uGTBlock % (pExtent->cGTEntries / VMDK_GT_CACHELINE_SIZE)) * sizeof(aGTDataTmp),
                             aGTDataTmp, sizeof(aGTDataTmp), NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot read allocated grain table entry in '%s'"), pExtent->pszFullname);
         pGTCacheEntry->uExtent = pExtent->uExtent;
@@ -3619,5 +3619,5 @@
                          VMDK_SECTOR2BYTE(uGTSector) + (uGTBlock % (pExtent->cGTEntries / VMDK_GT_CACHELINE_SIZE)) * sizeof(aGTDataTmp),
                          aGTDataTmp, sizeof(aGTDataTmp), NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write updated grain table in '%s'"), pExtent->pszFullname);
     if (pExtent->pRGD)
@@ -3627,9 +3627,9 @@
                              VMDK_SECTOR2BYTE(uRGTSector) + (uGTBlock % (pExtent->cGTEntries / VMDK_GT_CACHELINE_SIZE)) * sizeof(aGTDataTmp),
                              aGTDataTmp, sizeof(aGTDataTmp), NULL);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write updated backup grain table in '%s'"), pExtent->pszFullname);
     }
 #ifdef VBOX_WITH_VMDK_ESX
-    if (VBOX_SUCCESS(rc) && pExtent->enmType == VMDKETYPE_ESX_SPARSE)
+    if (RT_SUCCESS(rc) && pExtent->enmType == VMDKETYPE_ESX_SPARSE)
     {
         pExtent->uFreeSector = uGTSector + VMDK_BYTE2SECTOR(cbWrite);
@@ -3733,5 +3733,5 @@
 
     rc = vmdkOpenImage(pImage, uOpenFlags);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         *ppBackendData = pImage;
 
@@ -3809,5 +3809,5 @@
                          pPCHSGeometry, pLCHSGeometry,
                          pfnProgress, pvUser, uPercentStart, uPercentSpan);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* So far the image is opened in read/write mode. Make sure the
@@ -3817,5 +3817,5 @@
             vmdkFreeImage(pImage, false);
             rc = vmdkOpenImage(pImage, uOpenFlags);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 goto out;
         }
@@ -3895,7 +3895,7 @@
      * with zeros. We actually save stuff when and if we change it.
      */
-    apszOldName  = (char **)RTMemTmpAllocZ((cExtents + 1) * sizeof(char*)); 
-    apszNewName  = (char **)RTMemTmpAllocZ((cExtents + 1) * sizeof(char*)); 
-    apszNewLines = (char **)RTMemTmpAllocZ((cExtents) * sizeof(char*)); 
+    apszOldName  = (char **)RTMemTmpAllocZ((cExtents + 1) * sizeof(char*));
+    apszNewName  = (char **)RTMemTmpAllocZ((cExtents + 1) * sizeof(char*));
+    apszNewLines = (char **)RTMemTmpAllocZ((cExtents) * sizeof(char*));
     if (!apszOldName || !apszNewName || !apszNewLines)
     {
@@ -3954,5 +3954,5 @@
         pImage->Descriptor.aLines[line] = apszNewLines[i];
         /* Compose new name for the extent. */
-        apszNewName[i] = vmdkStrReplace(pExtent->pszFullname, 
+        apszNewName[i] = vmdkStrReplace(pExtent->pszFullname,
             pszOldBasename, pszNewBasename);
         if (!apszNewName[i])
@@ -3962,5 +3962,5 @@
         /* Rename the extent file. */
         rc = RTFileMove(pExtent->pszFullname, apszNewName[i], 0);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto rollback;
         /* Remember the old name. */
@@ -3979,9 +3979,9 @@
      */
     apszNewName[cExtents] = RTPathFilename(pszFilename);
-    /* Rename the descriptor file if it's separate. */ 
+    /* Rename the descriptor file if it's separate. */
     if (!fEmbeddedDesc)
     {
         rc = RTFileMove(pImage->pszFilename, apszNewName[cExtents], 0);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto rollback;
         /* Save old name only if we may need to change it back. */
@@ -3994,10 +3994,10 @@
     /* Open the new image. */
     rc = vmdkOpenImage(pImage, pImage->uOpenFlags);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         goto out;
 
 rollback:
     /* Roll back all changes in case of failure. */
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         int rrc;
@@ -4005,6 +4005,6 @@
         {
             /*
-             * Some extents may have been closed, close the rest. We will 
-             * re-open the whole thing later. 
+             * Some extents may have been closed, close the rest. We will
+             * re-open the whole thing later.
              */
             vmdkFreeImage(pImage, false);
@@ -4099,5 +4099,5 @@
     rc = vmdkFindExtent(pImage, VMDK_BYTE2SECTOR(uOffset),
                         &pExtent, &uSectorExtentRel);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
 
@@ -4121,5 +4121,5 @@
             rc = vmdkGetSector(pImage->pGTCache, pExtent, uSectorExtentRel,
                                &uSectorExtentAbs);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 goto out;
             /* Clip read range to at most the rest of the grain. */
@@ -4186,5 +4186,5 @@
     rc = vmdkFindExtent(pImage, VMDK_BYTE2SECTOR(uOffset),
                         &pExtent, &uSectorExtentRel);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto out;
 
@@ -4205,5 +4205,5 @@
             rc = vmdkGetSector(pImage->pGTCache, pExtent, uSectorExtentRel,
                                &uSectorExtentAbs);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 goto out;
             /* Clip write range to at most the rest of the grain. */
@@ -4266,5 +4266,5 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     int rc;
-    
+
     Assert(pImage);
 
@@ -4336,10 +4336,10 @@
         {
             int rc = vmdkFileGetSize(pImage->pFile, &cbFile);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
                 cb += cbFile;
             for (unsigned i = 0; i <= pImage->cExtents; i++)
             {
                 rc = vmdkFileGetSize(pImage->pFile, &cbFile);
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                     cb += cbFile;
             }
@@ -4396,5 +4396,5 @@
         }
         rc = vmdkDescSetPCHSGeometry(pImage, pPCHSGeometry);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto out;
 
@@ -4455,5 +4455,5 @@
         }
         rc = vmdkDescSetLCHSGeometry(pImage, pLCHSGeometry);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto out;
 
@@ -4546,5 +4546,5 @@
         if (rc == VERR_VDI_VALUE_NOT_FOUND)
             pszCommentEncoded = NULL;
-        else if (VBOX_FAILURE(rc))
+        else if (RT_FAILURE(rc))
             goto out;
 
@@ -4627,5 +4627,5 @@
             rc = vmdkDescDDBSetUuid(pImage, &pImage->Descriptor,
                                     VMDK_DDB_IMAGE_UUID, pUuid);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing image UUID in descriptor in '%s'"), pImage->pszFilename);
             rc = VINF_SUCCESS;
@@ -4678,5 +4678,5 @@
             rc = vmdkDescDDBSetUuid(pImage, &pImage->Descriptor,
                                     VMDK_DDB_MODIFICATION_UUID, pUuid);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing modification UUID in descriptor in '%s'"), pImage->pszFilename);
             rc = VINF_SUCCESS;
@@ -4729,5 +4729,5 @@
             rc = vmdkDescDDBSetUuid(pImage, &pImage->Descriptor,
                                     VMDK_DDB_PARENT_UUID, pUuid);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing parent image UUID in descriptor in '%s'"), pImage->pszFilename);
             rc = VINF_SUCCESS;
@@ -4780,5 +4780,5 @@
             rc = vmdkDescDDBSetUuid(pImage, &pImage->Descriptor,
                                     VMDK_DDB_PARENT_MODIFICATION_UUID, pUuid);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error storing parent image UUID in descriptor in '%s'"), pImage->pszFilename);
             rc = VINF_SUCCESS;
@@ -4901,5 +4901,5 @@
         rc = vmdkFindExtent(pImage, VMDK_BYTE2SECTOR(uOffset),
                             &pExtent, &uSectorExtentRel);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto out;
 
@@ -4923,8 +4923,8 @@
                 void *pTask;
                 rc = pImage->pInterfaceAsyncIOCallbacks->pfnPrepareRead(pImage->pInterfaceAsyncIO->pvUser, pExtent->pFile->pStorage,
-                                                                       VMDK_SECTOR2BYTE(uSectorExtentRel), 
+                                                                       VMDK_SECTOR2BYTE(uSectorExtentRel),
                                                                        (uint8_t *)paSegCurrent->pvSeg + uOffsetInCurrentSegment,
                                                                        cbToRead, &pTask);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                 {
                     AssertMsgFailed(("Preparing read failed rc=%Vrc\n", rc));
@@ -4966,5 +4966,5 @@
             }
             case VMDKETYPE_ZERO:
-                memset((uint8_t *)paSegCurrent->pvSeg + uOffsetInCurrentSegment, 0, cbToRead); 
+                memset((uint8_t *)paSegCurrent->pvSeg + uOffsetInCurrentSegment, 0, cbToRead);
                 break;
             default:
@@ -5000,5 +5000,5 @@
                                                                 NULL, pvUser,
                                                                 NULL /* Nothing required after read. */);
-        AssertMsg(VBOX_SUCCESS(rc), ("Failed to enqueue tasks rc=%Vrc\n", rc));
+        AssertMsg(RT_SUCCESS(rc), ("Failed to enqueue tasks rc=%Vrc\n", rc));
     }
 
@@ -5037,5 +5037,5 @@
         rc = vmdkFindExtent(pImage, VMDK_BYTE2SECTOR(uOffset),
                             &pExtent, &uSectorExtentRel);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             goto out;
 
@@ -5059,8 +5059,8 @@
                 void *pTask;
                 rc = pImage->pInterfaceAsyncIOCallbacks->pfnPrepareWrite(pImage->pInterfaceAsyncIO->pvUser, pExtent->pFile->pStorage,
-                                                                         VMDK_SECTOR2BYTE(uSectorExtentRel), 
+                                                                         VMDK_SECTOR2BYTE(uSectorExtentRel),
                                                                          (uint8_t *)paSegCurrent->pvSeg + uOffsetInCurrentSegment,
                                                                          cbToWrite, &pTask);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                 {
                     AssertMsgFailed(("Preparing read failed rc=%Vrc\n", rc));
@@ -5134,7 +5134,7 @@
         rc = pImage->pInterfaceAsyncIOCallbacks->pfnTasksSubmit(pImage->pInterfaceAsyncIO->pvUser,
                                                                 pImage->apTask, cTasksToSubmit,
-                                                                NULL, pvUser, 
+                                                                NULL, pvUser,
                                                                 NULL /* Nothing required after read. */);
-        AssertMsg(VBOX_SUCCESS(rc), ("Failed to enqueue tasks rc=%Vrc\n", rc));
+        AssertMsg(RT_SUCCESS(rc), ("Failed to enqueue tasks rc=%Vrc\n", rc));
     }
 
Index: trunk/src/VBox/Devices/Storage/fdc.c
===================================================================
--- trunk/src/VBox/Devices/Storage/fdc.c	(revision 11265)
+++ trunk/src/VBox/Devices/Storage/fdc.c	(revision 11266)
@@ -1313,5 +1313,5 @@
                 rc = PDMDevHlpDMAReadMemory (fdctrl->pDevIns, nchan, tmpbuf,
                                              fdctrl->data_pos, len, &read);
-                AssertMsg (VBOX_SUCCESS (rc), ("DMAReadMemory -> %Vrc\n", rc));
+                AssertMsg (RT_SUCCESS (rc), ("DMAReadMemory -> %Vrc\n", rc));
 #else
                 DMA_read_memory (nchan, tmpbuf, fdctrl->data_pos, len);
@@ -2579,5 +2579,5 @@
      */
     rc = PDMDevHlpDriverAttach (pDevIns, drv->iLUN, &drv->IBase, &drv->pDrvBase, descs[drv->iLUN]);
-    if (VBOX_SUCCESS (rc)) {
+    if (RT_SUCCESS (rc)) {
         drv->pDrvBlock = drv->pDrvBase->pfnQueryInterface (
             drv->pDrvBase,
@@ -2687,5 +2687,5 @@
     AssertMsg (rc != VERR_PDM_NO_ATTACHED_DRIVER,
                ("Configuration error: failed to configure drive %d, rc=%Vrc\n", rc));
-    if (VBOX_SUCCESS(rc)) {
+    if (RT_SUCCESS(rc)) {
         fd_revalidate (drv);
     }
@@ -2899,5 +2899,5 @@
      */
     rc = PDMDevHlpDriverAttach (pDevIns, PDM_STATUS_LUN, &fdctrl->IBaseStatus, &pBase, "Status Port");
-    if (VBOX_SUCCESS (rc)) {
+    if (RT_SUCCESS (rc)) {
         fdctrl->pLedsConnector =
             pBase->pfnQueryInterface (pBase, PDMINTERFACE_LED_CONNECTORS);
Index: trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp
===================================================================
--- trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp	(revision 11266)
@@ -782,5 +782,5 @@
                     uint32_t mappingsSize;
                     pRequestHeader->rc = PGMR3MappingsSize(pVM, &mappingsSize);
-                    if (VBOX_SUCCESS(pRequestHeader->rc) && hypervisorInfo->hypervisorSize == mappingsSize)
+                    if (RT_SUCCESS(pRequestHeader->rc) && hypervisorInfo->hypervisorSize == mappingsSize)
                     {
                         /* new reservation */
@@ -1157,5 +1157,5 @@
 
                     if (   ptr->u32Enable
-                        && VBOX_SUCCESS (pRequestHeader->rc))
+                        && RT_SUCCESS (pRequestHeader->rc))
                     {
                         ptr->fu32Status |= VBVA_F_STATUS_ENABLED;
@@ -2158,5 +2158,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pData->fGetHostTimeDisabled = false;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed querying \"GetHostTimeDisabled\" as a boolean"));
@@ -2165,5 +2165,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pData->fBackdoorLogDisabled = false;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed querying \"BackdoorLogDisabled\" as a boolean"));
@@ -2172,5 +2172,5 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pData->fKeepCredentials = false;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed querying \"KeepCredentials\" as a boolean"));
@@ -2255,13 +2255,13 @@
      */
     rc = PDMDevHlpPCIRegister(pDevIns, &pData->dev);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     if (pData->dev.devfn == 32 || iInstance != 0)
         Log(("!!WARNING!!: pData->dev.devfn=%d (ignore if testcase or no started by Main)\n", pData->dev.devfn));
     rc = PDMDevHlpPCIIORegionRegister(pDevIns, 0, 0x20, PCI_ADDRESS_SPACE_IO, vmmdevIOPortRegionMap);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = PDMDevHlpPCIIORegionRegister(pDevIns, 1, VMMDEV_RAM_SIZE, PCI_ADDRESS_SPACE_MEM, vmmdevIORAMRegionMap);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -2270,5 +2270,5 @@
      */
     rc = PDMDevHlpDriverAttach(pDevIns, 0, &pData->Base, &pData->pDrvBase, "VMM Driver Port");
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         pData->pDrv = (PPDMIVMMDEVCONNECTOR)pData->pDrvBase->pfnQueryInterface(pData->pDrvBase, PDMINTERFACE_VMMDEV_CONNECTOR);
@@ -2297,5 +2297,5 @@
     PPDMIBASE pBase;
     rc = PDMDevHlpDriverAttach(pDevIns, PDM_STATUS_LUN, &pData->Base, &pBase, "Status Port");
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         pData->SharedFolders.pLedsConnector = (PPDMILEDCONNECTORS)
             pBase->pfnQueryInterface(pBase, PDMINTERFACE_LED_CONNECTORS);
Index: trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp
===================================================================
--- trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp	(revision 11265)
+++ trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp	(revision 11266)
@@ -50,17 +50,17 @@
     /* Index of the parameter. */
     int iParm;
-    
+
     /* Offset in the first physical page of the region. */
     size_t cbOffsetFirstPage;
-    
+
     /* How many pages. */
     uint32_t cPages;
-    
-    /* Pointer to array of the GC physical addresses for these pages. 
+
+    /* Pointer to array of the GC physical addresses for these pages.
      * It is assumed that the physical address of the locked resident
      * guest page does not change.
      */
     RTGCPHYS *paPages;
-    
+
 } VBOXHGCMLINPTR;
 
@@ -111,6 +111,6 @@
 
     int rc = vmmdevHGCMCmdListLock (pVMMDevState);
-    
-    if (VBOX_SUCCESS (rc))
+
+    if (RT_SUCCESS (rc))
     {
         LogFlowFunc(("%p type %d\n", pCmd, enmCmdType));
@@ -119,16 +119,16 @@
         pCmd->pNext = pVMMDevState->pHGCMCmdList;
         pCmd->pPrev = NULL;
-        
+
         if (pVMMDevState->pHGCMCmdList)
         {
             pVMMDevState->pHGCMCmdList->pPrev = pCmd;
         }
-        
+
         pVMMDevState->pHGCMCmdList = pCmd;
-        
+
         pCmd->enmCmdType = enmCmdType;
         pCmd->GCPhys = GCPhys;
         pCmd->cbSize = cbSize;
-        
+
         /* Automatically enable HGCM events, if there are HGCM commands. */
         if (   enmCmdType == VBOXHGCMCMDTYPE_CONNECT
@@ -145,5 +145,5 @@
         vmmdevHGCMCmdListUnlock (pVMMDevState);
     }
-    
+
     return rc;
 }
@@ -154,6 +154,6 @@
 
     int rc = vmmdevHGCMCmdListLock (pVMMDevState);
-    
-    if (VBOX_SUCCESS (rc))
+
+    if (RT_SUCCESS (rc))
     {
         LogFlowFunc(("%p\n", pCmd));
@@ -167,5 +167,5 @@
            /* Tail, do nothing. */
         }
-        
+
         if (pCmd->pPrev)
         {
@@ -179,5 +179,5 @@
         vmmdevHGCMCmdListUnlock (pVMMDevState);
     }
-    
+
     return rc;
 }
@@ -189,6 +189,6 @@
 
     int rc = vmmdevHGCMCmdListLock (pVMMDevState);
-    
-    if (VBOX_SUCCESS (rc))
+
+    if (RT_SUCCESS (rc))
     {
         pCmd = pVMMDevState->pHGCMCmdList;
@@ -205,5 +205,5 @@
         vmmdevHGCMCmdListUnlock (pVMMDevState);
     }
-    
+
     LogFlowFunc(("%p\n", pCmd));
     return pCmd;
@@ -220,27 +220,27 @@
 {
     int rc = VINF_SUCCESS;
-    
+
     AssertRelease (u32Size > 0);
-    
+
     VBOXHGCMLINPTR *pLinPtr = &paLinPtrs[iLinPtr];
-    
+
     /* Take the offset into the current page also into account! */
     u32Size += GCPtr & PAGE_OFFSET_MASK;
 
     uint32_t cPages = (u32Size + PAGE_SIZE - 1) / PAGE_SIZE;
-    
+
     Log(("vmmdevHGCMSaveLinPtr: parm %d: %VGv %d = %d pages\n", iParm, GCPtr, u32Size, cPages));
-    
+
     pLinPtr->iParm             = iParm;
     pLinPtr->cbOffsetFirstPage = (RTGCUINTPTR)GCPtr & PAGE_OFFSET_MASK;
     pLinPtr->cPages            = cPages;
     pLinPtr->paPages           = *ppPages;
-    
+
     *ppPages += cPages;
-    
+
     uint32_t iPage = 0;
-    
+
     GCPtr &= PAGE_BASE_GC_MASK;
-    
+
     /* Gonvert the guest linear pointers of pages to HC addresses. */
     while (iPage < cPages)
@@ -248,10 +248,10 @@
         /* convert */
         RTGCPHYS GCPhys;
-        
+
         rc = PDMDevHlpPhysGCPtr2GCPhys(pDevIns, GCPtr, &GCPhys);
-        
+
         Log(("vmmdevHGCMSaveLinPtr: Page %d: %VGv -> %VGp. %Vrc\n", iPage, GCPtr, GCPhys, rc));
-    
-        if (VBOX_FAILURE (rc))
+
+        if (RT_FAILURE (rc))
         {
             break;
@@ -264,7 +264,7 @@
         GCPtr += PAGE_SIZE;
     }
-    
+
     AssertRelease (iPage == cPages);
-    
+
     return rc;
 }
@@ -278,16 +278,16 @@
 {
     int rc = VINF_SUCCESS;
-    
+
     VBOXHGCMLINPTR *pLinPtr = &paLinPtrs[iLinPtr];
-    
+
     AssertRelease (u32Size > 0 && iParm == (uint32_t)pLinPtr->iParm);
-    
+
     RTGCPHYS GCPhysDst = pLinPtr->paPages[0] + pLinPtr->cbOffsetFirstPage;
     uint8_t *pu8Src    = (uint8_t *)pvHost;
-    
+
     Log(("vmmdevHGCMWriteLinPtr: parm %d: size %d, cPages = %d\n", iParm, u32Size, pLinPtr->cPages));
-    
+
     uint32_t iPage = 0;
-    
+
     while (iPage < pLinPtr->cPages)
     {
@@ -296,9 +296,9 @@
                              PAGE_SIZE - pLinPtr->cbOffsetFirstPage:
                              PAGE_SIZE;
-                             
+
         Log(("vmmdevHGCMWriteLinPtr: page %d: dst %VGp, src %p, cbWrite %d\n", iPage, GCPhysDst, pu8Src, cbWrite));
-        
+
         iPage++;
-        
+
         if (cbWrite >= u32Size)
         {
@@ -307,5 +307,5 @@
             break;
         }
-        
+
         PDMDevHlpPhysWrite(pDevIns, GCPhysDst, pu8Src, cbWrite);
 
@@ -313,11 +313,11 @@
         u32Size    -= cbWrite;
         pu8Src     += cbWrite;
-        
+
         GCPhysDst   = pLinPtr->paPages[iPage];
     }
-    
+
     AssertRelease (iPage == pLinPtr->cPages);
     Assert(u32Size == 0);
-    
+
     return rc;
 }
@@ -332,5 +332,5 @@
     {
         VMMDevHGCMConnect *pHGCMConnectCopy = (VMMDevHGCMConnect *)(pCmd+1);
-        
+
         vmmdevHGCMAddCommand (pVMMDevState, pCmd, GCPhys, pHGCMConnect->header.header.size, VBOXHGCMCMDTYPE_CONNECT);
 
@@ -417,5 +417,5 @@
 
         /* Look for pointer parameters, which require a host buffer. */
-        for (i = 0; i < cParms && VBOX_SUCCESS(rc); i++, pGuestParm++)
+        for (i = 0; i < cParms && RT_SUCCESS(rc); i++, pGuestParm++)
         {
             switch (pGuestParm->type)
@@ -426,5 +426,5 @@
                 {
                     cbCmdSize += pGuestParm->u.Pointer.size;
-                
+
                     if (pGuestParm->type != VMMDevHGCMParmType_LinAddr_In)
                     {
@@ -434,5 +434,5 @@
                                           + pGuestParm->u.Pointer.size + PAGE_SIZE - 1) / PAGE_SIZE;
                     }
-                
+
                     Log(("vmmdevHGCMCall: linptr size = %d\n", pGuestParm->u.Pointer.size));
                 } break;
@@ -462,5 +462,5 @@
 
         /* Look for pointer parameters, which require a host buffer. */
-        for (i = 0; i < cParms && VBOX_SUCCESS(rc); i++, pGuestParm++)
+        for (i = 0; i < cParms && RT_SUCCESS(rc); i++, pGuestParm++)
         {
             switch (pGuestParm->type)
@@ -471,5 +471,5 @@
                 {
                     cbCmdSize += pGuestParm->u.Pointer.size;
-                
+
                     if (pGuestParm->type != VMMDevHGCMParmType_LinAddr_In)
                     {
@@ -479,5 +479,5 @@
                                           + pGuestParm->u.Pointer.size + PAGE_SIZE - 1) / PAGE_SIZE;
                     }
-                
+
                     Log(("vmmdevHGCMCall: linptr size = %d\n", pGuestParm->u.Pointer.size));
                 } break;
@@ -499,5 +499,5 @@
     }
 
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
     {
         return rc;
@@ -512,13 +512,13 @@
 
     memset (pCmd, 0, sizeof (*pCmd));
-    
+
     pCmd->paHostParms = NULL;
     pCmd->cLinPtrs    = cLinPtrs;
-    
+
     if (cLinPtrs > 0)
     {
         pCmd->paLinPtrs = (VBOXHGCMLINPTR *)RTMemAlloc (  sizeof (VBOXHGCMLINPTR) * cLinPtrs
                                                           + sizeof (RTGCPHYS) * cLinPtrPages);
-    
+
         if (pCmd->paLinPtrs == NULL)
         {
@@ -541,5 +541,5 @@
         /* Compute addresses of host parms array and first memory buffer. */
         VBOXHGCMSVCPARM *pHostParm = (VBOXHGCMSVCPARM *)((char *)pCmd + sizeof (struct VBOXHGCMCMD));
-        
+
         uint8_t *pcBuf = (uint8_t *)pHostParm + cParms * sizeof (VBOXHGCMSVCPARM);
 
@@ -559,5 +559,5 @@
 
 
-            for (i = 0; i < cParms && VBOX_SUCCESS(rc); i++, pGuestParm++, pHostParm++)
+            for (i = 0; i < cParms && RT_SUCCESS(rc); i++, pGuestParm++, pHostParm++)
             {
                 switch (pGuestParm->type)
@@ -572,5 +572,5 @@
                          Log(("vmmdevHGCMCall: uint32 guest parameter %u\n", u32));
                          break;
-                     } 
+                     }
 
                      case VMMDevHGCMParmType_64bit:
@@ -583,5 +583,5 @@
                          Log(("vmmdevHGCMCall: uint64 guest parameter %llu\n", u64));
                          break;
-                     } 
+                     }
 
                      case VMMDevHGCMParmType_PhysAddr:
@@ -600,5 +600,5 @@
                          Log(("vmmdevHGCMCall: PhysAddr guest parameter %VGp\n", physAddr));
                          break;
-                     } 
+                     }
 
                      case VMMDevHGCMParmType_LinAddr_In:  /* In (read) */
@@ -628,12 +628,12 @@
                                  rc = VINF_SUCCESS;
 
-                             if (VBOX_SUCCESS(rc))
+                             if (RT_SUCCESS(rc))
                              {
                                  pHostParm->u.pointer.addr = pcBuf;
                                  pcBuf += size;
-                             
+
                                  if (pGuestParm->type != VMMDevHGCMParmType_LinAddr_In)
                                  {
-                                     /* Remember the guest physical pages that belong to the virtual address 
+                                     /* Remember the guest physical pages that belong to the virtual address
                                       * region.
                                       */
@@ -661,5 +661,5 @@
 #endif /* VBOX_WITH_64_BITS_GUESTS */
 
-            for (i = 0; i < cParms && VBOX_SUCCESS(rc); i++, pGuestParm++, pHostParm++)
+            for (i = 0; i < cParms && RT_SUCCESS(rc); i++, pGuestParm++, pHostParm++)
             {
                 switch (pGuestParm->type)
@@ -674,5 +674,5 @@
                          Log(("vmmdevHGCMCall: uint32 guest parameter %u\n", u32));
                          break;
-                     } 
+                     }
 
                      case VMMDevHGCMParmType_64bit:
@@ -685,5 +685,5 @@
                          Log(("vmmdevHGCMCall: uint64 guest parameter %llu\n", u64));
                          break;
-                     } 
+                     }
 
                      case VMMDevHGCMParmType_PhysAddr:
@@ -702,5 +702,5 @@
                          Log(("vmmdevHGCMCall: PhysAddr guest parameter %VGp\n", physAddr));
                          break;
-                     } 
+                     }
 
                      case VMMDevHGCMParmType_LinAddr_In:  /* In (read) */
@@ -730,12 +730,12 @@
                                  rc = VINF_SUCCESS;
 
-                             if (VBOX_SUCCESS(rc))
+                             if (RT_SUCCESS(rc))
                              {
                                  pHostParm->u.pointer.addr = pcBuf;
                                  pcBuf += size;
-                             
+
                                  if (pGuestParm->type != VMMDevHGCMParmType_LinAddr_In)
                                  {
-                                     /* Remember the guest physical pages that belong to the virtual address 
+                                     /* Remember the guest physical pages that belong to the virtual address
                                       * region.
                                       */
@@ -757,5 +757,5 @@
     }
 
-    if (VBOX_SUCCESS (rc))
+    if (RT_SUCCESS (rc))
     {
         vmmdevHGCMAddCommand (pVMMDevState, pCmd, GCPhys, pHGCMCall->header.header.size, VBOXHGCMCMDTYPE_CALL);
@@ -770,5 +770,5 @@
             RTMemFree (pCmd->paLinPtrs);
         }
-        
+
         RTMemFree (pCmd);
     }
@@ -901,12 +901,12 @@
         /* Setup return codes. */
         pHeader->result = result;
-        
+
         /* Verify the request type. */
         rc = vmmdevHGCMCmdVerify (pCmd, pHeader);
 
-        if (VBOX_SUCCESS (rc))
+        if (RT_SUCCESS (rc))
         {
             /* Update parameters and data buffers. */
-           
+
             switch (pHeader->header.requestType)
             {
@@ -1128,5 +1128,5 @@
         RTMemFree (pCmd->paLinPtrs);
     }
-        
+
     RTMemFree (pCmd);
 
@@ -1242,5 +1242,5 @@
     int rc = vmmdevHGCMCmdListLock (pVMMDevState);
 
-    if (VBOX_SUCCESS (rc))
+    if (RT_SUCCESS (rc))
     {
         PVBOXHGCMCMD pIter = pVMMDevState->pHGCMCmdList;
@@ -1374,5 +1374,5 @@
         vmmdevHGCMCmdListUnlock (pVMMDevState);
     }
-    
+
     return rc;
 }
Index: trunk/src/VBox/Devices/vl_vbox.h
===================================================================
--- trunk/src/VBox/Devices/vl_vbox.h	(revision 11265)
+++ trunk/src/VBox/Devices/vl_vbox.h	(revision 11266)
@@ -125,5 +125,5 @@
 {
     int rc = SSMR3GetMem(f, buf, size);
-    return VBOX_SUCCESS(rc) ? size : 0;
+    return RT_SUCCESS(rc) ? size : 0;
 }
 
@@ -132,5 +132,5 @@
     uint8_t u8;
     int rc = SSMR3GetU8(f, &u8);
-    return VBOX_SUCCESS(rc) ? (int)u8 : -1;
+    return RT_SUCCESS(rc) ? (int)u8 : -1;
 }
 
@@ -139,5 +139,5 @@
     uint16_t u16;
     int rc = SSMR3GetU16(f, &u16);
-    return VBOX_SUCCESS(rc) ? u16 : ~0;
+    return RT_SUCCESS(rc) ? u16 : ~0;
 }
 
@@ -146,5 +146,5 @@
     uint32_t u32;
     int rc = SSMR3GetU32(f, &u32);
-    return VBOX_SUCCESS(rc) ? u32 : ~0;
+    return RT_SUCCESS(rc) ? u32 : ~0;
 }
 
@@ -153,5 +153,5 @@
     uint64_t u64;
     int rc = SSMR3GetU64(f, &u64);
-    return VBOX_SUCCESS(rc) ? u64 : ~0;
+    return RT_SUCCESS(rc) ? u64 : ~0;
 }
 
