Changeset 26165 in vbox for trunk/src/VBox
- Timestamp:
- Feb 2, 2010 7:50:31 PM (15 years ago)
- svn:sync-xref-src-repo-rev:
- 57179
- Location:
- trunk/src/VBox
- Files:
-
- 32 edited
-
Devices/Audio/DevIchAc97.cpp (modified) (1 diff)
-
Devices/Audio/DevSB16.cpp (modified) (1 diff)
-
Devices/Audio/audiosniffer.c (modified) (2 diffs)
-
Devices/Bus/DevPCI.cpp (modified) (2 diffs)
-
Devices/EFI/DevEFI.cpp (modified) (1 diff)
-
Devices/Graphics/DevVGA.cpp (modified) (2 diffs)
-
Devices/Input/DevPS2.cpp (modified) (3 diffs)
-
Devices/Network/DevINIP.cpp (modified) (1 diff)
-
Devices/Network/DevPCNet.cpp (modified) (1 diff)
-
Devices/PC/DevACPI.cpp (modified) (2 diffs)
-
Devices/PC/DevAPIC.cpp (modified) (2 diffs)
-
Devices/PC/DevDMA.cpp (modified) (1 diff)
-
Devices/PC/DevPIC.cpp (modified) (1 diff)
-
Devices/PC/DevPcArch.c (modified) (1 diff)
-
Devices/PC/DevPcBios.cpp (modified) (1 diff)
-
Devices/PC/DevPit-i8254.cpp (modified) (1 diff)
-
Devices/PC/DevRTC.cpp (modified) (1 diff)
-
Devices/Parallel/DevParallel.cpp (modified) (1 diff)
-
Devices/Samples/VBoxSampleDevice.cpp (modified) (1 diff)
-
Devices/Serial/DevSerial.cpp (modified) (1 diff)
-
Devices/Storage/DevAHCI.cpp (modified) (1 diff)
-
Devices/Storage/DevATA.cpp (modified) (1 diff)
-
Devices/Storage/DevBusLogic.cpp (modified) (1 diff)
-
Devices/Storage/DevLsiLogicSCSI.cpp (modified) (1 diff)
-
Devices/Storage/fdc.c (modified) (1 diff)
-
Devices/VMMDev/VMMDev.cpp (modified) (2 diffs)
-
VMM/PDM.cpp (modified) (29 diffs)
-
VMM/PDMDevHlp.cpp (modified) (192 diffs)
-
VMM/PDMDevMiscHlp.cpp (modified) (28 diffs)
-
VMM/PDMDevice.cpp (modified) (10 diffs)
-
VMM/PDMDriver.cpp (modified) (1 diff)
-
VMM/PGMSavedState.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/DevIchAc97.cpp
r26160 r26165 1686 1686 /* u32Version */ 1687 1687 PDM_DEVREG_VERSION, 1688 /* sz DeviceName */1688 /* szName */ 1689 1689 "ichac97", 1690 1690 /* szRCMod */ -
trunk/src/VBox/Devices/Audio/DevSB16.cpp
r26001 r26165 1912 1912 /* u32Version */ 1913 1913 PDM_DEVREG_VERSION, 1914 /* sz DeviceName */1914 /* szName */ 1915 1915 "sb16", 1916 1916 /* szRCMod */ -
trunk/src/VBox/Devices/Audio/audiosniffer.c
r26160 r26165 197 197 else if (rc == VERR_PDM_NO_ATTACHED_DRIVER) 198 198 { 199 Log(("%s/%d: warning: no driver attached to LUN #0.\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));199 Log(("%s/%d: warning: no driver attached to LUN #0.\n", pDevIns->pReg->szName, pDevIns->iInstance)); 200 200 rc = VINF_SUCCESS; 201 201 } … … 226 226 /* u32Version */ 227 227 PDM_DEVREG_VERSION, 228 /* sz DeviceName */228 /* szName */ 229 229 "AudioSniffer", 230 230 /* szRCMod */ -
trunk/src/VBox/Devices/Bus/DevPCI.cpp
r26160 r26165 2130 2130 /* u32Version */ 2131 2131 PDM_DEVREG_VERSION, 2132 /* sz DeviceName */2132 /* szName */ 2133 2133 "pci", 2134 2134 /* szRCMod */ … … 2492 2492 /* u32Version */ 2493 2493 PDM_DEVREG_VERSION, 2494 /* sz DeviceName */2494 /* szName */ 2495 2495 "pcibridge", 2496 2496 /* szRCMod */ -
trunk/src/VBox/Devices/EFI/DevEFI.cpp
r26160 r26165 1035 1035 /* u32Version */ 1036 1036 PDM_DEVREG_VERSION, 1037 /* sz DeviceName */1037 /* szName */ 1038 1038 "efi", 1039 1039 /* szRCMod */ -
trunk/src/VBox/Devices/Graphics/DevVGA.cpp
r26160 r26165 5759 5759 else if (rc == VERR_PDM_NO_ATTACHED_DRIVER) 5760 5760 { 5761 Log(("%s/%d: warning: no driver attached to LUN #0!\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));5761 Log(("%s/%d: warning: no driver attached to LUN #0!\n", pDevIns->pReg->szName, pDevIns->iInstance)); 5762 5762 rc = VINF_SUCCESS; 5763 5763 } … … 6593 6593 /* u32Version */ 6594 6594 PDM_DEVREG_VERSION, 6595 /* sz DeviceName */6595 /* szName */ 6596 6596 "vga", 6597 6597 /* szRCMod */ -
trunk/src/VBox/Devices/Input/DevPS2.cpp
r26160 r26165 1472 1472 else if (rc == VERR_PDM_NO_ATTACHED_DRIVER) 1473 1473 { 1474 Log(("%s/%d: warning: no driver attached to LUN #0!\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1474 Log(("%s/%d: warning: no driver attached to LUN #0!\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1475 1475 rc = VINF_SUCCESS; 1476 1476 } … … 1493 1493 else if (rc == VERR_PDM_NO_ATTACHED_DRIVER) 1494 1494 { 1495 Log(("%s/%d: warning: no driver attached to LUN #1!\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1495 Log(("%s/%d: warning: no driver attached to LUN #1!\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1496 1496 rc = VINF_SUCCESS; 1497 1497 } … … 1683 1683 /* u32Version */ 1684 1684 PDM_DEVREG_VERSION, 1685 /* sz DeviceName */1685 /* szName */ 1686 1686 "pckbd", 1687 1687 /* szRCMod */ -
trunk/src/VBox/Devices/Network/DevINIP.cpp
r26160 r26165 678 678 /* u32Version */ 679 679 PDM_DEVREG_VERSION, 680 /* sz DeviceName */680 /* szName */ 681 681 "IntNetIP", 682 682 /* szRCMod/szR0Mod */ -
trunk/src/VBox/Devices/Network/DevPCNet.cpp
r26160 r26165 5300 5300 /* u32Version */ 5301 5301 PDM_DEVREG_VERSION, 5302 /* sz DeviceName */5302 /* szName */ 5303 5303 "pcnet", 5304 5304 /* szRCMod */ -
trunk/src/VBox/Devices/PC/DevACPI.cpp
r26160 r26165 2484 2484 { 2485 2485 Log(("acpi: %s/%d: warning: no driver attached to LUN #0!\n", 2486 pDevIns->pReg->sz DeviceName, pDevIns->iInstance));2486 pDevIns->pReg->szName, pDevIns->iInstance)); 2487 2487 rc = VINF_SUCCESS; 2488 2488 } … … 2500 2500 /* u32Version */ 2501 2501 PDM_DEVREG_VERSION, 2502 /* sz DeviceName */2502 /* szName */ 2503 2503 "acpi", 2504 2504 /* szRCMod */ -
trunk/src/VBox/Devices/PC/DevAPIC.cpp
r26157 r26165 2994 2994 /* u32Version */ 2995 2995 PDM_DEVREG_VERSION, 2996 /* sz DeviceName */2996 /* szName */ 2997 2997 "apic", 2998 2998 /* szRCMod */ … … 3315 3315 /* u32Version */ 3316 3316 PDM_DEVREG_VERSION, 3317 /* sz DeviceName */3317 /* szName */ 3318 3318 "ioapic", 3319 3319 /* szRCMod */ -
trunk/src/VBox/Devices/PC/DevDMA.cpp
r26160 r26165 934 934 /* u32Version */ 935 935 PDM_DEVREG_VERSION, 936 /* sz DeviceName */936 /* szName */ 937 937 "8237A", 938 938 /* szRCMod */ -
trunk/src/VBox/Devices/PC/DevPIC.cpp
r26157 r26165 1079 1079 /* u32Version */ 1080 1080 PDM_DEVREG_VERSION, 1081 /* sz DeviceName */1081 /* szName */ 1082 1082 "i8259", 1083 1083 /* szRCMod */ -
trunk/src/VBox/Devices/PC/DevPcArch.c
r26164 r26165 255 255 /* u32Version */ 256 256 PDM_DEVREG_VERSION, 257 /* sz DeviceName */257 /* szName */ 258 258 "pcarch", 259 259 /* szRCMod */ -
trunk/src/VBox/Devices/PC/DevPcBios.cpp
r26160 r26165 1309 1309 /* u32Version */ 1310 1310 PDM_DEVREG_VERSION, 1311 /* sz DeviceName */1311 /* szName */ 1312 1312 "pcbios", 1313 1313 /* szRCMod */ -
trunk/src/VBox/Devices/PC/DevPit-i8254.cpp
r26160 r26165 1094 1094 /* u32Version */ 1095 1095 PDM_DEVREG_VERSION, 1096 /* sz DeviceName */1096 /* szName */ 1097 1097 "i8254", 1098 1098 /* szRCMod */ -
trunk/src/VBox/Devices/PC/DevRTC.cpp
r26160 r26165 987 987 /* u32Version */ 988 988 PDM_DEVREG_VERSION, 989 /* sz DeviceName */989 /* szName */ 990 990 "mc146818", 991 991 /* szRCMod */ -
trunk/src/VBox/Devices/Parallel/DevParallel.cpp
r26160 r26165 856 856 /* u32Version */ 857 857 PDM_DEVREG_VERSION, 858 /* sz DeviceName */858 /* szName */ 859 859 "parallel", 860 860 /* szRCMod */ -
trunk/src/VBox/Devices/Samples/VBoxSampleDevice.cpp
r26157 r26165 98 98 /* u32Version */ 99 99 PDM_DEVREG_VERSION, 100 /* sz DeviceName */100 /* szName */ 101 101 "sample", 102 102 /* szRCMod */ -
trunk/src/VBox/Devices/Serial/DevSerial.cpp
r26160 r26165 975 975 /* u32Version */ 976 976 PDM_DEVREG_VERSION, 977 /* sz DeviceName */977 /* szName */ 978 978 "serial", 979 979 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/DevAHCI.cpp
r26160 r26165 6966 6966 /* u32Version */ 6967 6967 PDM_DEVREG_VERSION, 6968 /* sz DeviceName */6968 /* szName */ 6969 6969 "ahci", 6970 6970 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/DevATA.cpp
r26160 r26165 6983 6983 /* u32Version */ 6984 6984 PDM_DEVREG_VERSION, 6985 /* sz DeviceName */6985 /* szName */ 6986 6986 "piix3ide", 6987 6987 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/DevBusLogic.cpp
r26160 r26165 2678 2678 /* u32Version */ 2679 2679 PDM_DEVREG_VERSION, 2680 /* sz DeviceName */2680 /* szName */ 2681 2681 "buslogic", 2682 2682 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
r26157 r26165 4655 4655 /* u32Version */ 4656 4656 PDM_DEVREG_VERSION, 4657 /* sz DeviceName */4657 /* szName */ 4658 4658 "lsilogicscsi", 4659 4659 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/fdc.c
r26160 r26165 2913 2913 /* u32Version */ 2914 2914 PDM_DEVREG_VERSION, 2915 /* sz DeviceName */2915 /* szName */ 2916 2916 "i82078", 2917 2917 /* szRCMod */ -
trunk/src/VBox/Devices/VMMDev/VMMDev.cpp
r26164 r26165 2687 2687 else if (rc == VERR_PDM_NO_ATTACHED_DRIVER) 2688 2688 { 2689 Log(("%s/%d: warning: no driver attached to LUN #0!\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));2689 Log(("%s/%d: warning: no driver attached to LUN #0!\n", pDevIns->pReg->szName, pDevIns->iInstance)); 2690 2690 rc = VINF_SUCCESS; 2691 2691 } … … 2734 2734 /* u32Version */ 2735 2735 PDM_DEVREG_VERSION, 2736 /* sz DeviceName */2736 /* szName */ 2737 2737 "VMMDev", 2738 2738 /* szRCMod */ -
trunk/src/VBox/VMM/PDM.cpp
r26163 r26165 471 471 { 472 472 LogFlow(("PDMR3Relocate: Relocating device '%s'/%d\n", 473 pDevIns->pReg->sz DeviceName, pDevIns->iInstance));473 pDevIns->pReg->szName, pDevIns->iInstance)); 474 474 pDevIns->pReg->pfnRelocate(pDevIns, offDelta); 475 475 } … … 544 544 for (PPDMUSBINS pUsbIns = pVM->pdm.s.pUsbInstances; pUsbIns; pUsbIns = pUsbIns->Internal.s.pNext) 545 545 { 546 pdmR3TermLuns(pVM, pUsbIns->Internal.s.pLuns, pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance);546 pdmR3TermLuns(pVM, pUsbIns->Internal.s.pLuns, pUsbIns->pReg->szName, pUsbIns->iInstance); 547 547 548 548 if (pUsbIns->pReg->pfnDestruct) 549 549 { 550 550 LogFlow(("pdmR3DevTerm: Destroying - device '%s'/%d\n", 551 pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance));551 pUsbIns->pReg->szName, pUsbIns->iInstance)); 552 552 pUsbIns->pReg->pfnDestruct(pUsbIns); 553 553 } … … 561 561 for (PPDMDEVINS pDevIns = pVM->pdm.s.pDevInstances; pDevIns; pDevIns = pDevIns->Internal.s.pNextR3) 562 562 { 563 pdmR3TermLuns(pVM, pDevIns->Internal.s.pLunsR3, pDevIns->pReg->sz DeviceName, pDevIns->iInstance);563 pdmR3TermLuns(pVM, pDevIns->Internal.s.pLunsR3, pDevIns->pReg->szName, pDevIns->iInstance); 564 564 565 565 if (pDevIns->pReg->pfnDestruct) 566 566 { 567 567 LogFlow(("pdmR3DevTerm: Destroying - device '%s'/%d\n", 568 pDevIns->pReg->sz DeviceName, pDevIns->iInstance));568 pDevIns->pReg->szName, pDevIns->iInstance)); 569 569 pDevIns->pReg->pfnDestruct(pDevIns); 570 570 } … … 640 640 { 641 641 SSMR3PutU32(pSSM, i); 642 SSMR3PutStrZ(pSSM, pDevIns->pReg->sz DeviceName);642 SSMR3PutStrZ(pSSM, pDevIns->pReg->szName); 643 643 SSMR3PutU32(pSSM, pDevIns->iInstance); 644 644 } … … 867 867 868 868 /* Get the name and instance number. */ 869 char sz DeviceName[RT_SIZEOFMEMB(PDMDEVREG, szDeviceName)];870 rc = SSMR3GetStrZ(pSSM, sz DeviceName, sizeof(szDeviceName));869 char szName[RT_SIZEOFMEMB(PDMDEVREG, szName)]; 870 rc = SSMR3GetStrZ(pSSM, szName, sizeof(szName)); 871 871 if (RT_FAILURE(rc)) 872 872 return rc; … … 879 879 PPDMDEVINS pDevIns; 880 880 for (pDevIns = pVM->pdm.s.pDevInstances; pDevIns; pDevIns = pDevIns->Internal.s.pNextR3) 881 if ( !strcmp(sz DeviceName, pDevIns->pReg->szDeviceName)881 if ( !strcmp(szName, pDevIns->pReg->szName) 882 882 && pDevIns->iInstance == iInstance) 883 883 { 884 884 AssertLogRelMsgReturn(!(pDevIns->Internal.s.fIntFlags & PDMDEVINSINT_FLAGS_FOUND), 885 ("%s/#%u\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance),885 ("%s/#%u\n", pDevIns->pReg->szName, pDevIns->iInstance), 886 886 VERR_SSM_DATA_UNIT_FORMAT_CHANGED); 887 887 pDevIns->Internal.s.fIntFlags |= PDMDEVINSINT_FLAGS_FOUND; … … 890 890 if (!pDevIns) 891 891 { 892 LogRel(("Device '%s'/%d not found in current config\n", sz DeviceName, iInstance));892 LogRel(("Device '%s'/%d not found in current config\n", szName, iInstance)); 893 893 if (SSMR3HandleGetAfter(pSSM) != SSMAFTER_DEBUG_IT) 894 return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Device '%s'/%d not found in current config"), sz DeviceName, iInstance);894 return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Device '%s'/%d not found in current config"), szName, iInstance); 895 895 } 896 896 } … … 902 902 if (!(pDevIns->Internal.s.fIntFlags & PDMDEVINSINT_FLAGS_FOUND)) 903 903 { 904 LogRel(("Device '%s'/%d not found in the saved state\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));904 LogRel(("Device '%s'/%d not found in the saved state\n", pDevIns->pReg->szName, pDevIns->iInstance)); 905 905 if (SSMR3HandleGetAfter(pSSM) != SSMAFTER_DEBUG_IT) 906 906 return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Device '%s'/%d not found in the saved state"), 907 pDevIns->pReg->sz DeviceName, pDevIns->iInstance);907 pDevIns->pReg->szName, pDevIns->iInstance); 908 908 } 909 909 … … 951 951 if (pUsbIns->pReg->pfnVMPowerOn) 952 952 { 953 LogFlow(("PDMR3PowerOn: Notifying - device '%s'/%d\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance));953 LogFlow(("PDMR3PowerOn: Notifying - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance)); 954 954 int rc = VINF_SUCCESS; pUsbIns->pReg->pfnVMPowerOn(pUsbIns); 955 955 if (RT_FAILURE(rc)) 956 956 { 957 LogRel(("PDMR3PowerOn: device '%s'/%d -> %Rrc\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance, rc));957 LogRel(("PDMR3PowerOn: device '%s'/%d -> %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc)); 958 958 return rc; 959 959 } … … 975 975 if (pDevIns->pReg->pfnPowerOn) 976 976 { 977 LogFlow(("PDMR3PowerOn: Notifying - device '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));977 LogFlow(("PDMR3PowerOn: Notifying - device '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 978 978 int rc = VINF_SUCCESS; pDevIns->pReg->pfnPowerOn(pDevIns); 979 979 if (RT_FAILURE(rc)) 980 980 { 981 LogRel(("PDMR3PowerOn: device '%s'/%d -> %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));981 LogRel(("PDMR3PowerOn: device '%s'/%d -> %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 982 982 return rc; 983 983 } … … 1007 1007 for (PPDMLUN pLun = pDevIns->Internal.s.pLunsR3; pLun && RT_SUCCESS(rc); pLun = pLun->pNext) 1008 1008 for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns && RT_SUCCESS(rc); pDrvIns = pDrvIns->Internal.s.pDown) 1009 rc = pdmR3PowerOnDrv(pDrvIns, pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pLun->iLun);1009 rc = pdmR3PowerOnDrv(pDrvIns, pDevIns->pReg->szName, pDevIns->iInstance, pLun->iLun); 1010 1010 if (RT_SUCCESS(rc)) 1011 1011 rc = pdmR3PowerOnDev(pDevIns); … … 1017 1017 for (PPDMLUN pLun = pUsbIns->Internal.s.pLuns; pLun && RT_SUCCESS(rc); pLun = pLun->pNext) 1018 1018 for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns && RT_SUCCESS(rc); pDrvIns = pDrvIns->Internal.s.pDown) 1019 rc = pdmR3PowerOnDrv(pDrvIns, pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance, pLun->iLun);1019 rc = pdmR3PowerOnDrv(pDrvIns, pUsbIns->pReg->szName, pUsbIns->iInstance, pLun->iLun); 1020 1020 if (RT_SUCCESS(rc)) 1021 1021 rc = pdmR3PowerOnUsb(pUsbIns); … … 1099 1099 if (!pUsbIns->Internal.s.pfnAsyncNotify) 1100 1100 { 1101 LogFlow(("PDMR3Reset: Notifying - device '%s'/%d\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance));1101 LogFlow(("PDMR3Reset: Notifying - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance)); 1102 1102 pUsbIns->pReg->pfnVMReset(pUsbIns); 1103 1103 if (pUsbIns->Internal.s.pfnAsyncNotify) 1104 LogFlow(("PDMR3Reset: Async notification started - device '%s'/%d\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance));1104 LogFlow(("PDMR3Reset: Async notification started - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance)); 1105 1105 } 1106 1106 else if (pUsbIns->Internal.s.pfnAsyncNotify(pUsbIns)) 1107 1107 { 1108 LogFlow(("PDMR3Reset: Async notification completed - device '%s'/%d\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance));1108 LogFlow(("PDMR3Reset: Async notification completed - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance)); 1109 1109 pUsbIns->Internal.s.pfnAsyncNotify = NULL; 1110 1110 } … … 1134 1134 if (!pDevIns->Internal.s.pfnAsyncNotify) 1135 1135 { 1136 LogFlow(("PDMR3Reset: Notifying - device '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1136 LogFlow(("PDMR3Reset: Notifying - device '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1137 1137 pDevIns->pReg->pfnReset(pDevIns); 1138 1138 if (pDevIns->Internal.s.pfnAsyncNotify) 1139 LogFlow(("PDMR3Reset: Async notification started - device '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1139 LogFlow(("PDMR3Reset: Async notification started - device '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1140 1140 } 1141 1141 else if (pDevIns->Internal.s.pfnAsyncNotify(pDevIns)) 1142 1142 { 1143 LogFlow(("PDMR3Reset: Async notification completed - device '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1143 LogFlow(("PDMR3Reset: Async notification completed - device '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1144 1144 pDevIns->Internal.s.pfnAsyncNotify = NULL; 1145 1145 } … … 1218 1218 for (PPDMLUN pLun = pDevIns->Internal.s.pLunsR3; pLun; pLun = pLun->pNext) 1219 1219 for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown) 1220 if (!pdmR3ResetDrv(pDrvIns, &cAsync, pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pLun->iLun))1220 if (!pdmR3ResetDrv(pDrvIns, &cAsync, pDevIns->pReg->szName, pDevIns->iInstance, pLun->iLun)) 1221 1221 break; 1222 1222 … … 1232 1232 for (PPDMLUN pLun = pUsbIns->Internal.s.pLuns; pLun; pLun = pLun->pNext) 1233 1233 for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown) 1234 if (!pdmR3ResetDrv(pDrvIns, &cAsync, pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance, pLun->iLun))1234 if (!pdmR3ResetDrv(pDrvIns, &cAsync, pUsbIns->pReg->szName, pUsbIns->iInstance, pLun->iLun)) 1235 1235 break; 1236 1236 … … 1325 1325 if (!pUsbIns->Internal.s.pfnAsyncNotify) 1326 1326 { 1327 LogFlow(("PDMR3Suspend: Notifying - device '%s'/%d\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance));1327 LogFlow(("PDMR3Suspend: Notifying - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance)); 1328 1328 pUsbIns->pReg->pfnVMSuspend(pUsbIns); 1329 1329 if (pUsbIns->Internal.s.pfnAsyncNotify) 1330 LogFlow(("PDMR3Suspend: Async notification started - device '%s'/%d\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance));1330 LogFlow(("PDMR3Suspend: Async notification started - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance)); 1331 1331 } 1332 1332 else if (pUsbIns->Internal.s.pfnAsyncNotify(pUsbIns)) 1333 1333 { 1334 LogFlow(("PDMR3Suspend: Async notification completed - device '%s'/%d\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance));1334 LogFlow(("PDMR3Suspend: Async notification completed - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance)); 1335 1335 pUsbIns->Internal.s.pfnAsyncNotify = NULL; 1336 1336 } … … 1360 1360 if (!pDevIns->Internal.s.pfnAsyncNotify) 1361 1361 { 1362 LogFlow(("PDMR3Suspend: Notifying - device '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1362 LogFlow(("PDMR3Suspend: Notifying - device '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1363 1363 pDevIns->pReg->pfnSuspend(pDevIns); 1364 1364 if (pDevIns->Internal.s.pfnAsyncNotify) 1365 LogFlow(("PDMR3Suspend: Async notification started - device '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1365 LogFlow(("PDMR3Suspend: Async notification started - device '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1366 1366 } 1367 1367 else if (pDevIns->Internal.s.pfnAsyncNotify(pDevIns)) 1368 1368 { 1369 LogFlow(("PDMR3Suspend: Async notification completed - device '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1369 LogFlow(("PDMR3Suspend: Async notification completed - device '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1370 1370 pDevIns->Internal.s.pfnAsyncNotify = NULL; 1371 1371 } … … 1423 1423 for (PPDMLUN pLun = pDevIns->Internal.s.pLunsR3; pLun; pLun = pLun->pNext) 1424 1424 for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown) 1425 if (!pdmR3SuspendDrv(pDrvIns, &cAsync, pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pLun->iLun))1425 if (!pdmR3SuspendDrv(pDrvIns, &cAsync, pDevIns->pReg->szName, pDevIns->iInstance, pLun->iLun)) 1426 1426 break; 1427 1427 … … 1438 1438 for (PPDMLUN pLun = pUsbIns->Internal.s.pLuns; pLun; pLun = pLun->pNext) 1439 1439 for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown) 1440 if (!pdmR3SuspendDrv(pDrvIns, &cAsync, pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance, pLun->iLun))1440 if (!pdmR3SuspendDrv(pDrvIns, &cAsync, pUsbIns->pReg->szName, pUsbIns->iInstance, pLun->iLun)) 1441 1441 break; 1442 1442 … … 1509 1509 if (pUsbIns->pReg->pfnVMResume) 1510 1510 { 1511 LogFlow(("PDMR3Resume: Notifying - device '%s'/%d\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance));1511 LogFlow(("PDMR3Resume: Notifying - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance)); 1512 1512 int rc = VINF_SUCCESS; pUsbIns->pReg->pfnVMResume(pUsbIns); 1513 1513 if (RT_FAILURE(rc)) 1514 1514 { 1515 LogRel(("PDMR3Resume: device '%s'/%d -> %Rrc\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance, rc));1515 LogRel(("PDMR3Resume: device '%s'/%d -> %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc)); 1516 1516 return rc; 1517 1517 } … … 1533 1533 if (pDevIns->pReg->pfnResume) 1534 1534 { 1535 LogFlow(("PDMR3Resume: Notifying - device '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1535 LogFlow(("PDMR3Resume: Notifying - device '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1536 1536 int rc = VINF_SUCCESS; pDevIns->pReg->pfnResume(pDevIns); 1537 1537 if (RT_FAILURE(rc)) 1538 1538 { 1539 LogRel(("PDMR3Resume: device '%s'/%d -> %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1539 LogRel(("PDMR3Resume: device '%s'/%d -> %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1540 1540 return rc; 1541 1541 } … … 1565 1565 for (PPDMLUN pLun = pDevIns->Internal.s.pLunsR3; pLun && RT_SUCCESS(rc); pLun = pLun->pNext) 1566 1566 for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns && RT_SUCCESS(rc); pDrvIns = pDrvIns->Internal.s.pDown) 1567 rc = pdmR3ResumeDrv(pDrvIns, pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pLun->iLun);1567 rc = pdmR3ResumeDrv(pDrvIns, pDevIns->pReg->szName, pDevIns->iInstance, pLun->iLun); 1568 1568 if (RT_SUCCESS(rc)) 1569 1569 rc = pdmR3ResumeDev(pDevIns); … … 1575 1575 for (PPDMLUN pLun = pUsbIns->Internal.s.pLuns; pLun && RT_SUCCESS(rc); pLun = pLun->pNext) 1576 1576 for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns && RT_SUCCESS(rc); pDrvIns = pDrvIns->Internal.s.pDown) 1577 rc = pdmR3ResumeDrv(pDrvIns, pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance, pLun->iLun);1577 rc = pdmR3ResumeDrv(pDrvIns, pUsbIns->pReg->szName, pUsbIns->iInstance, pLun->iLun); 1578 1578 if (RT_SUCCESS(rc)) 1579 1579 rc = pdmR3ResumeUsb(pUsbIns); … … 1657 1657 if (!pUsbIns->Internal.s.pfnAsyncNotify) 1658 1658 { 1659 LogFlow(("PDMR3PowerOff: Notifying - device '%s'/%d\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance));1659 LogFlow(("PDMR3PowerOff: Notifying - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance)); 1660 1660 pUsbIns->pReg->pfnVMPowerOff(pUsbIns); 1661 1661 if (pUsbIns->Internal.s.pfnAsyncNotify) 1662 LogFlow(("PDMR3PowerOff: Async notification started - device '%s'/%d\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance));1662 LogFlow(("PDMR3PowerOff: Async notification started - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance)); 1663 1663 } 1664 1664 else if (pUsbIns->Internal.s.pfnAsyncNotify(pUsbIns)) 1665 1665 { 1666 LogFlow(("PDMR3PowerOff: Async notification completed - device '%s'/%d\n", pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance));1666 LogFlow(("PDMR3PowerOff: Async notification completed - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance)); 1667 1667 pUsbIns->Internal.s.pfnAsyncNotify = NULL; 1668 1668 } … … 1692 1692 if (!pDevIns->Internal.s.pfnAsyncNotify) 1693 1693 { 1694 LogFlow(("PDMR3PowerOff: Notifying - device '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1694 LogFlow(("PDMR3PowerOff: Notifying - device '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1695 1695 pDevIns->pReg->pfnPowerOff(pDevIns); 1696 1696 if (pDevIns->Internal.s.pfnAsyncNotify) 1697 LogFlow(("PDMR3PowerOff: Async notification started - device '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1697 LogFlow(("PDMR3PowerOff: Async notification started - device '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1698 1698 } 1699 1699 else if (pDevIns->Internal.s.pfnAsyncNotify(pDevIns)) 1700 1700 { 1701 LogFlow(("PDMR3PowerOff: Async notification completed - device '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1701 LogFlow(("PDMR3PowerOff: Async notification completed - device '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1702 1702 pDevIns->Internal.s.pfnAsyncNotify = NULL; 1703 1703 } … … 1748 1748 for (PPDMLUN pLun = pDevIns->Internal.s.pLunsR3; pLun; pLun = pLun->pNext) 1749 1749 for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown) 1750 if (!pdmR3PowerOffDrv(pDrvIns, &cAsync, pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pLun->iLun))1750 if (!pdmR3PowerOffDrv(pDrvIns, &cAsync, pDevIns->pReg->szName, pDevIns->iInstance, pLun->iLun)) 1751 1751 break; 1752 1752 … … 1763 1763 for (PPDMLUN pLun = pUsbIns->Internal.s.pLuns; pLun; pLun = pLun->pNext) 1764 1764 for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown) 1765 if (!pdmR3PowerOffDrv(pDrvIns, &cAsync, pUsbIns->pReg->sz DeviceName, pUsbIns->iInstance, pLun->iLun))1765 if (!pdmR3PowerOffDrv(pDrvIns, &cAsync, pUsbIns->pReg->szName, pUsbIns->iInstance, pLun->iLun)) 1766 1766 break; 1767 1767 … … 1820 1820 { 1821 1821 if ( pDev->cchName == cchDevice 1822 && !memcmp(pDev->pReg->sz DeviceName, pszDevice, cchDevice))1822 && !memcmp(pDev->pReg->szName, pszDevice, cchDevice)) 1823 1823 { 1824 1824 /* -
trunk/src/VBox/VMM/PDMDevHlp.cpp
r26160 r26165 68 68 { 69 69 PDMDEV_ASSERT_DEVINS(pDevIns); 70 LogFlow(("pdmR3DevHlp_IOPortRegister: caller='%s'/%d: Port=%#x cPorts=%#x pvUser=%p pfnOut=%p pfnIn=%p pfnOutStr=%p pfnInStr=%p p32_tszDesc=%p:{%s}\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance,70 LogFlow(("pdmR3DevHlp_IOPortRegister: caller='%s'/%d: Port=%#x cPorts=%#x pvUser=%p pfnOut=%p pfnIn=%p pfnOutStr=%p pfnInStr=%p p32_tszDesc=%p:{%s}\n", pDevIns->pReg->szName, pDevIns->iInstance, 71 71 Port, cPorts, pvUser, pfnOut, pfnIn, pfnOutStr, pfnInStr, pszDesc, pszDesc)); 72 72 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); … … 83 83 int rc = IOMR3IOPortRegisterR3(pDevIns->Internal.s.pVMR3, pDevIns, Port, cPorts, pvUser, pfnOut, pfnIn, pfnOutStr, pfnInStr, pszDesc); 84 84 85 LogFlow(("pdmR3DevHlp_IOPortRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));85 LogFlow(("pdmR3DevHlp_IOPortRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 86 86 return rc; 87 87 } … … 95 95 PDMDEV_ASSERT_DEVINS(pDevIns); 96 96 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 97 LogFlow(("pdmR3DevHlp_IOPortRegisterRC: caller='%s'/%d: Port=%#x cPorts=%#x pvUser=%p pszOut=%p:{%s} pszIn=%p:{%s} pszOutStr=%p:{%s} pszInStr=%p:{%s} pszDesc=%p:{%s}\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance,97 LogFlow(("pdmR3DevHlp_IOPortRegisterRC: caller='%s'/%d: Port=%#x cPorts=%#x pvUser=%p pszOut=%p:{%s} pszIn=%p:{%s} pszOutStr=%p:{%s} pszInStr=%p:{%s} pszDesc=%p:{%s}\n", pDevIns->pReg->szName, pDevIns->iInstance, 98 98 Port, cPorts, pvUser, pszOut, pszOut, pszIn, pszIn, pszOutStr, pszOutStr, pszInStr, pszInStr, pszDesc, pszDesc)); 99 99 … … 150 150 } 151 151 152 LogFlow(("pdmR3DevHlp_IOPortRegisterRC: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));152 LogFlow(("pdmR3DevHlp_IOPortRegisterRC: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 153 153 return rc; 154 154 } … … 162 162 PDMDEV_ASSERT_DEVINS(pDevIns); 163 163 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 164 LogFlow(("pdmR3DevHlp_IOPortRegisterR0: caller='%s'/%d: Port=%#x cPorts=%#x pvUser=%p pszOut=%p:{%s} pszIn=%p:{%s} pszOutStr=%p:{%s} pszInStr=%p:{%s} pszDesc=%p:{%s}\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance,164 LogFlow(("pdmR3DevHlp_IOPortRegisterR0: caller='%s'/%d: Port=%#x cPorts=%#x pvUser=%p pszOut=%p:{%s} pszIn=%p:{%s} pszOutStr=%p:{%s} pszInStr=%p:{%s} pszDesc=%p:{%s}\n", pDevIns->pReg->szName, pDevIns->iInstance, 165 165 Port, cPorts, pvUser, pszOut, pszOut, pszIn, pszIn, pszOutStr, pszOutStr, pszInStr, pszInStr, pszDesc, pszDesc)); 166 166 … … 217 217 } 218 218 219 LogFlow(("pdmR3DevHlp_IOPortRegisterR0: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));219 LogFlow(("pdmR3DevHlp_IOPortRegisterR0: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 220 220 return rc; 221 221 } … … 227 227 PDMDEV_ASSERT_DEVINS(pDevIns); 228 228 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 229 LogFlow(("pdmR3DevHlp_IOPortDeregister: caller='%s'/%d: Port=%#x cPorts=%#x\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance,229 LogFlow(("pdmR3DevHlp_IOPortDeregister: caller='%s'/%d: Port=%#x cPorts=%#x\n", pDevIns->pReg->szName, pDevIns->iInstance, 230 230 Port, cPorts)); 231 231 232 232 int rc = IOMR3IOPortDeregister(pDevIns->Internal.s.pVMR3, pDevIns, Port, cPorts); 233 233 234 LogFlow(("pdmR3DevHlp_IOPortDeregister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));234 LogFlow(("pdmR3DevHlp_IOPortDeregister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 235 235 return rc; 236 236 } … … 245 245 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 246 246 LogFlow(("pdmR3DevHlp_MMIORegister: caller='%s'/%d: GCPhysStart=%RGp cbRange=%#x pvUser=%p pfnWrite=%p pfnRead=%p pfnFill=%p pszDesc=%p:{%s}\n", 247 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, GCPhysStart, cbRange, pvUser, pfnWrite, pfnRead, pfnFill, pszDesc, pszDesc));247 pDevIns->pReg->szName, pDevIns->iInstance, GCPhysStart, cbRange, pvUser, pfnWrite, pfnRead, pfnFill, pszDesc, pszDesc)); 248 248 249 249 /** @todo IOMR3MMIORegisterR3 mangles the description, move it here. */ 250 250 int rc = IOMR3MMIORegisterR3(pDevIns->Internal.s.pVMR3, pDevIns, GCPhysStart, cbRange, pvUser, pfnWrite, pfnRead, pfnFill, pszDesc); 251 251 252 LogFlow(("pdmR3DevHlp_MMIORegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));252 LogFlow(("pdmR3DevHlp_MMIORegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 253 253 return rc; 254 254 } … … 263 263 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 264 264 LogFlow(("pdmR3DevHlp_MMIORegisterRC: caller='%s'/%d: GCPhysStart=%RGp cbRange=%#x pvUser=%p pszWrite=%p:{%s} pszRead=%p:{%s} pszFill=%p:{%s}\n", 265 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, GCPhysStart, cbRange, pvUser, pszWrite, pszWrite, pszRead, pszRead, pszFill, pszFill));265 pDevIns->pReg->szName, pDevIns->iInstance, GCPhysStart, cbRange, pvUser, pszWrite, pszWrite, pszRead, pszRead, pszFill, pszFill)); 266 266 267 267 /** @todo pszDesc is unused here, drop it. */ … … 308 308 } 309 309 310 LogFlow(("pdmR3DevHlp_MMIORegisterRC: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));310 LogFlow(("pdmR3DevHlp_MMIORegisterRC: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 311 311 return rc; 312 312 } … … 320 320 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 321 321 LogFlow(("pdmR3DevHlp_MMIORegisterHC: caller='%s'/%d: GCPhysStart=%RGp cbRange=%#x pvUser=%p pszWrite=%p:{%s} pszRead=%p:{%s} pszFill=%p:{%s}\n", 322 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, GCPhysStart, cbRange, pvUser, pszWrite, pszWrite, pszRead, pszRead, pszFill, pszFill));322 pDevIns->pReg->szName, pDevIns->iInstance, GCPhysStart, cbRange, pvUser, pszWrite, pszWrite, pszRead, pszRead, pszFill, pszFill)); 323 323 324 324 /** @todo pszDesc is unused here, remove it. */ … … 362 362 } 363 363 364 LogFlow(("pdmR3DevHlp_MMIORegisterR0: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));364 LogFlow(("pdmR3DevHlp_MMIORegisterR0: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 365 365 return rc; 366 366 } … … 373 373 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 374 374 LogFlow(("pdmR3DevHlp_MMIODeregister: caller='%s'/%d: GCPhysStart=%RGp cbRange=%#x\n", 375 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, GCPhysStart, cbRange));375 pDevIns->pReg->szName, pDevIns->iInstance, GCPhysStart, cbRange)); 376 376 377 377 int rc = IOMR3MMIODeregister(pDevIns->Internal.s.pVMR3, pDevIns, GCPhysStart, cbRange); 378 378 379 LogFlow(("pdmR3DevHlp_MMIODeregister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));379 LogFlow(("pdmR3DevHlp_MMIODeregister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 380 380 return rc; 381 381 } … … 390 390 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 391 391 LogFlow(("pdmR3DevHlp_MMIO2Register: caller='%s'/%d: iRegion=%#x cb=%#RGp fFlags=%RX32 ppv=%p pszDescp=%p:{%s}\n", 392 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iRegion, cb, fFlags, ppv, pszDesc, pszDesc));392 pDevIns->pReg->szName, pDevIns->iInstance, iRegion, cb, fFlags, ppv, pszDesc, pszDesc)); 393 393 394 394 /** @todo PGMR3PhysMMIO2Register mangles the description, move it here and … … 396 396 int rc = PGMR3PhysMMIO2Register(pDevIns->Internal.s.pVMR3, pDevIns, iRegion, cb, fFlags, ppv, pszDesc); 397 397 398 LogFlow(("pdmR3DevHlp_MMIO2Register: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));398 LogFlow(("pdmR3DevHlp_MMIO2Register: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 399 399 return rc; 400 400 } … … 409 409 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 410 410 LogFlow(("pdmR3DevHlp_MMIO2Deregister: caller='%s'/%d: iRegion=%#x\n", 411 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iRegion));411 pDevIns->pReg->szName, pDevIns->iInstance, iRegion)); 412 412 413 413 AssertReturn(iRegion == UINT32_MAX, VERR_INVALID_PARAMETER); … … 415 415 int rc = PGMR3PhysMMIO2Deregister(pDevIns->Internal.s.pVMR3, pDevIns, iRegion); 416 416 417 LogFlow(("pdmR3DevHlp_MMIO2Deregister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));417 LogFlow(("pdmR3DevHlp_MMIO2Deregister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 418 418 return rc; 419 419 } … … 428 428 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 429 429 LogFlow(("pdmR3DevHlp_MMIO2Map: caller='%s'/%d: iRegion=%#x GCPhys=%#RGp\n", 430 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iRegion, GCPhys));430 pDevIns->pReg->szName, pDevIns->iInstance, iRegion, GCPhys)); 431 431 432 432 int rc = PGMR3PhysMMIO2Map(pDevIns->Internal.s.pVMR3, pDevIns, iRegion, GCPhys); 433 433 434 LogFlow(("pdmR3DevHlp_MMIO2Map: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));434 LogFlow(("pdmR3DevHlp_MMIO2Map: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 435 435 return rc; 436 436 } … … 445 445 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 446 446 LogFlow(("pdmR3DevHlp_MMIO2Unmap: caller='%s'/%d: iRegion=%#x GCPhys=%#RGp\n", 447 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iRegion, GCPhys));447 pDevIns->pReg->szName, pDevIns->iInstance, iRegion, GCPhys)); 448 448 449 449 int rc = PGMR3PhysMMIO2Unmap(pDevIns->Internal.s.pVMR3, pDevIns, iRegion, GCPhys); 450 450 451 LogFlow(("pdmR3DevHlp_MMIO2Unmap: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));451 LogFlow(("pdmR3DevHlp_MMIO2Unmap: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 452 452 return rc; 453 453 } … … 464 464 VM_ASSERT_EMT(pVM); 465 465 LogFlow(("pdmR3DevHlp_MMHyperMapMMIO2: caller='%s'/%d: iRegion=%#x off=%RGp cb=%RGp pszDesc=%p:{%s} pRCPtr=%p\n", 466 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iRegion, off, cb, pszDesc, pszDesc, pRCPtr));466 pDevIns->pReg->szName, pDevIns->iInstance, iRegion, off, cb, pszDesc, pszDesc, pRCPtr)); 467 467 468 468 if (pDevIns->iInstance > 0) … … 475 475 int rc = MMR3HyperMapMMIO2(pVM, pDevIns, iRegion, off, cb, pszDesc, pRCPtr); 476 476 477 LogFlow(("pdmR3DevHlp_MMHyperMapMMIO2: caller='%s'/%d: returns %Rrc *pRCPtr=%RRv\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc, *pRCPtr));477 LogFlow(("pdmR3DevHlp_MMHyperMapMMIO2: caller='%s'/%d: returns %Rrc *pRCPtr=%RRv\n", pDevIns->pReg->szName, pDevIns->iInstance, rc, *pRCPtr)); 478 478 return rc; 479 479 } … … 490 490 VM_ASSERT_EMT(pVM); 491 491 LogFlow(("pdmR3DevHlp_MMIO2MapKernel: caller='%s'/%d: iRegion=%#x off=%RGp cb=%RGp pszDesc=%p:{%s} pR0Ptr=%p\n", 492 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iRegion, off, cb, pszDesc, pszDesc, pR0Ptr));492 pDevIns->pReg->szName, pDevIns->iInstance, iRegion, off, cb, pszDesc, pszDesc, pR0Ptr)); 493 493 494 494 if (pDevIns->iInstance > 0) … … 501 501 int rc = PGMR3PhysMMIO2MapKernel(pVM, pDevIns, iRegion, off, cb, pszDesc, pR0Ptr); 502 502 503 LogFlow(("pdmR3DevHlp_MMIO2MapKernel: caller='%s'/%d: returns %Rrc *pR0Ptr=%RHv\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc, *pR0Ptr));503 LogFlow(("pdmR3DevHlp_MMIO2MapKernel: caller='%s'/%d: returns %Rrc *pR0Ptr=%RHv\n", pDevIns->pReg->szName, pDevIns->iInstance, rc, *pR0Ptr)); 504 504 return rc; 505 505 } … … 512 512 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 513 513 LogFlow(("pdmR3DevHlp_ROMRegister: caller='%s'/%d: GCPhysStart=%RGp cbRange=%#x pvBinary=%p fFlags=%#RX32 pszDesc=%p:{%s}\n", 514 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, GCPhysStart, cbRange, pvBinary, fFlags, pszDesc, pszDesc));514 pDevIns->pReg->szName, pDevIns->iInstance, GCPhysStart, cbRange, pvBinary, fFlags, pszDesc, pszDesc)); 515 515 516 516 /** @todo can we mangle pszDesc? */ 517 517 int rc = PGMR3PhysRomRegister(pDevIns->Internal.s.pVMR3, pDevIns, GCPhysStart, cbRange, pvBinary, fFlags, pszDesc); 518 518 519 LogFlow(("pdmR3DevHlp_ROMRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));519 LogFlow(("pdmR3DevHlp_ROMRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 520 520 return rc; 521 521 } … … 527 527 PDMDEV_ASSERT_DEVINS(pDevIns); 528 528 LogFlow(("pdmR3DevHlp_ROMProtectShadow: caller='%s'/%d: GCPhysStart=%RGp cbRange=%#x enmProt=%d\n", 529 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, GCPhysStart, cbRange, enmProt));529 pDevIns->pReg->szName, pDevIns->iInstance, GCPhysStart, cbRange, enmProt)); 530 530 531 531 int rc = PGMR3PhysRomProtect(pDevIns->Internal.s.pVMR3, GCPhysStart, cbRange, enmProt); 532 532 533 LogFlow(("pdmR3DevHlp_ROMProtectShadow: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));533 LogFlow(("pdmR3DevHlp_ROMProtectShadow: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 534 534 return rc; 535 535 } … … 546 546 LogFlow(("pdmR3DevHlp_SSMRegister: caller='%s'/%d: uVersion=#x cbGuess=%#x pszBefore=%p:{%s}\n" 547 547 " pfnLivePrep=%p pfnLiveExec=%p pfnLiveVote=%p pfnSavePrep=%p pfnSaveExec=%p pfnSaveDone=%p pszLoadPrep=%p pfnLoadExec=%p pfnLoadDone=%p\n", 548 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, uVersion, cbGuess, pszBefore, pszBefore,548 pDevIns->pReg->szName, pDevIns->iInstance, uVersion, cbGuess, pszBefore, pszBefore, 549 549 pfnLivePrep, pfnLiveExec, pfnLiveVote, 550 550 pfnSavePrep, pfnSaveExec, pfnSaveDone, 551 551 pfnLoadPrep, pfnLoadExec, pfnLoadDone)); 552 552 553 int rc = SSMR3RegisterDevice(pDevIns->Internal.s.pVMR3, pDevIns, pDevIns->pReg->sz DeviceName, pDevIns->iInstance,553 int rc = SSMR3RegisterDevice(pDevIns->Internal.s.pVMR3, pDevIns, pDevIns->pReg->szName, pDevIns->iInstance, 554 554 uVersion, cbGuess, pszBefore, 555 555 pfnLivePrep, pfnLiveExec, pfnLiveVote, … … 557 557 pfnLoadPrep, pfnLoadExec, pfnLoadDone); 558 558 559 LogFlow(("pdmR3DevHlp_SSMRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));559 LogFlow(("pdmR3DevHlp_SSMRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 560 560 return rc; 561 561 } … … 569 569 VM_ASSERT_EMT(pVM); 570 570 LogFlow(("pdmR3DevHlp_TMTimerCreate: caller='%s'/%d: enmClock=%d pfnCallback=%p pvUser=%p fFlags=%#x pszDesc=%p:{%s} ppTimer=%p\n", 571 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, enmClock, pfnCallback, pvUser, fFlags, pszDesc, pszDesc, ppTimer));571 pDevIns->pReg->szName, pDevIns->iInstance, enmClock, pfnCallback, pvUser, fFlags, pszDesc, pszDesc, ppTimer)); 572 572 573 573 if (pDevIns->iInstance > 0) /** @todo use a string cache here later. */ … … 580 580 int rc = TMR3TimerCreateDevice(pVM, pDevIns, enmClock, pfnCallback, pvUser, fFlags, pszDesc, ppTimer); 581 581 582 LogFlow(("pdmR3DevHlp_TMTimerCreate: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));582 LogFlow(("pdmR3DevHlp_TMTimerCreate: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 583 583 return rc; 584 584 } … … 590 590 PDMDEV_ASSERT_DEVINS(pDevIns); 591 591 LogFlow(("pdmR3DevHlp_TMUtcNow: caller='%s'/%d: pTime=%p\n", 592 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pTime));592 pDevIns->pReg->szName, pDevIns->iInstance, pTime)); 593 593 594 594 pTime = TMR3UtcNow(pDevIns->Internal.s.pVMR3, pTime); 595 595 596 LogFlow(("pdmR3DevHlp_TMUtcNow: caller='%s'/%d: returns %RU64\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, RTTimeSpecGetNano(pTime)));596 LogFlow(("pdmR3DevHlp_TMUtcNow: caller='%s'/%d: returns %RU64\n", pDevIns->pReg->szName, pDevIns->iInstance, RTTimeSpecGetNano(pTime))); 597 597 return pTime; 598 598 } … … 605 605 PVM pVM = pDevIns->Internal.s.pVMR3; 606 606 LogFlow(("pdmR3DevHlp_PhysRead: caller='%s'/%d: GCPhys=%RGp pvBuf=%p cbRead=%#x\n", 607 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, GCPhys, pvBuf, cbRead));607 pDevIns->pReg->szName, pDevIns->iInstance, GCPhys, pvBuf, cbRead)); 608 608 609 609 #if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION) … … 622 622 rc = PGMR3PhysReadExternal(pVM, GCPhys, pvBuf, cbRead); 623 623 624 Log(("pdmR3DevHlp_PhysRead: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));624 Log(("pdmR3DevHlp_PhysRead: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 625 625 return rc; 626 626 } … … 633 633 PVM pVM = pDevIns->Internal.s.pVMR3; 634 634 LogFlow(("pdmR3DevHlp_PhysWrite: caller='%s'/%d: GCPhys=%RGp pvBuf=%p cbWrite=%#x\n", 635 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, GCPhys, pvBuf, cbWrite));635 pDevIns->pReg->szName, pDevIns->iInstance, GCPhys, pvBuf, cbWrite)); 636 636 637 637 #if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION) … … 648 648 rc = PGMPhysWrite(pVM, GCPhys, pvBuf, cbWrite); 649 649 else 650 rc = PGMR3PhysWriteExternal(pVM, GCPhys, pvBuf, cbWrite, pDevIns->pReg->sz DeviceName);651 652 Log(("pdmR3DevHlp_PhysWrite: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));650 rc = PGMR3PhysWriteExternal(pVM, GCPhys, pvBuf, cbWrite, pDevIns->pReg->szName); 651 652 Log(("pdmR3DevHlp_PhysWrite: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 653 653 return rc; 654 654 } … … 661 661 PVM pVM = pDevIns->Internal.s.pVMR3; 662 662 LogFlow(("pdmR3DevHlp_PhysGCPhys2CCPtr: caller='%s'/%d: GCPhys=%RGp fFlags=%#x ppv=%p pLock=%p\n", 663 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, GCPhys, fFlags, ppv, pLock));663 pDevIns->pReg->szName, pDevIns->iInstance, GCPhys, fFlags, ppv, pLock)); 664 664 AssertReturn(!fFlags, VERR_INVALID_PARAMETER); 665 665 … … 675 675 int rc = PGMR3PhysGCPhys2CCPtrExternal(pVM, GCPhys, ppv, pLock); 676 676 677 Log(("pdmR3DevHlp_PhysGCPhys2CCPtr: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));677 Log(("pdmR3DevHlp_PhysGCPhys2CCPtr: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 678 678 return rc; 679 679 } … … 686 686 PVM pVM = pDevIns->Internal.s.pVMR3; 687 687 LogFlow(("pdmR3DevHlp_PhysGCPhys2CCPtrReadOnly: caller='%s'/%d: GCPhys=%RGp fFlags=%#x ppv=%p pLock=%p\n", 688 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, GCPhys, fFlags, ppv, pLock));688 pDevIns->pReg->szName, pDevIns->iInstance, GCPhys, fFlags, ppv, pLock)); 689 689 AssertReturn(!fFlags, VERR_INVALID_PARAMETER); 690 690 … … 700 700 int rc = PGMR3PhysGCPhys2CCPtrReadOnlyExternal(pVM, GCPhys, ppv, pLock); 701 701 702 Log(("pdmR3DevHlp_PhysGCPhys2CCPtrReadOnly: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));702 Log(("pdmR3DevHlp_PhysGCPhys2CCPtrReadOnly: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 703 703 return rc; 704 704 } … … 711 711 PVM pVM = pDevIns->Internal.s.pVMR3; 712 712 LogFlow(("pdmR3DevHlp_PhysReleasePageMappingLock: caller='%s'/%d: pLock=%p\n", 713 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pLock));713 pDevIns->pReg->szName, pDevIns->iInstance, pLock)); 714 714 715 715 PGMPhysReleasePageMappingLock(pVM, pLock); 716 716 717 Log(("pdmR3DevHlp_PhysReleasePageMappingLock: caller='%s'/%d: returns void\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));717 Log(("pdmR3DevHlp_PhysReleasePageMappingLock: caller='%s'/%d: returns void\n", pDevIns->pReg->szName, pDevIns->iInstance)); 718 718 } 719 719 … … 726 726 VM_ASSERT_EMT(pVM); 727 727 LogFlow(("pdmR3DevHlp_PhysReadGCVirt: caller='%s'/%d: pvDst=%p GCVirt=%RGv cb=%#x\n", 728 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pvDst, GCVirtSrc, cb));728 pDevIns->pReg->szName, pDevIns->iInstance, pvDst, GCVirtSrc, cb)); 729 729 730 730 PVMCPU pVCpu = VMMGetCpu(pVM); … … 737 737 int rc = PGMPhysSimpleReadGCPtr(pVCpu, pvDst, GCVirtSrc, cb); 738 738 739 LogFlow(("pdmR3DevHlp_PhysReadGCVirt: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));739 LogFlow(("pdmR3DevHlp_PhysReadGCVirt: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 740 740 741 741 return rc; … … 750 750 VM_ASSERT_EMT(pVM); 751 751 LogFlow(("pdmR3DevHlp_PhysWriteGCVirt: caller='%s'/%d: GCVirtDst=%RGv pvSrc=%p cb=%#x\n", 752 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, GCVirtDst, pvSrc, cb));752 pDevIns->pReg->szName, pDevIns->iInstance, GCVirtDst, pvSrc, cb)); 753 753 754 754 PVMCPU pVCpu = VMMGetCpu(pVM); … … 761 761 int rc = PGMPhysSimpleWriteGCPtr(pVCpu, GCVirtDst, pvSrc, cb); 762 762 763 LogFlow(("pdmR3DevHlp_PhysWriteGCVirt: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));763 LogFlow(("pdmR3DevHlp_PhysWriteGCVirt: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 764 764 765 765 return rc; … … 774 774 VM_ASSERT_EMT(pVM); 775 775 LogFlow(("pdmR3DevHlp_PhysGCPtr2GCPhys: caller='%s'/%d: GCPtr=%RGv pGCPhys=%p\n", 776 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, GCPtr, pGCPhys));776 pDevIns->pReg->szName, pDevIns->iInstance, GCPtr, pGCPhys)); 777 777 778 778 PVMCPU pVCpu = VMMGetCpu(pVM); … … 785 785 int rc = PGMPhysGCPtr2GCPhys(pVCpu, GCPtr, pGCPhys); 786 786 787 LogFlow(("pdmR3DevHlp_PhysGCPtr2GCPhys: caller='%s'/%d: returns %Rrc *pGCPhys=%RGp\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc, *pGCPhys));787 LogFlow(("pdmR3DevHlp_PhysGCPtr2GCPhys: caller='%s'/%d: returns %Rrc *pGCPhys=%RGp\n", pDevIns->pReg->szName, pDevIns->iInstance, rc, *pGCPhys)); 788 788 789 789 return rc; … … 795 795 { 796 796 PDMDEV_ASSERT_DEVINS(pDevIns); 797 LogFlow(("pdmR3DevHlp_MMHeapAlloc: caller='%s'/%d: cb=%#x\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, cb));797 LogFlow(("pdmR3DevHlp_MMHeapAlloc: caller='%s'/%d: cb=%#x\n", pDevIns->pReg->szName, pDevIns->iInstance, cb)); 798 798 799 799 void *pv = MMR3HeapAlloc(pDevIns->Internal.s.pVMR3, MM_TAG_PDM_DEVICE_USER, cb); 800 800 801 LogFlow(("pdmR3DevHlp_MMHeapAlloc: caller='%s'/%d: returns %p\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pv));801 LogFlow(("pdmR3DevHlp_MMHeapAlloc: caller='%s'/%d: returns %p\n", pDevIns->pReg->szName, pDevIns->iInstance, pv)); 802 802 return pv; 803 803 } … … 808 808 { 809 809 PDMDEV_ASSERT_DEVINS(pDevIns); 810 LogFlow(("pdmR3DevHlp_MMHeapAllocZ: caller='%s'/%d: cb=%#x\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, cb));810 LogFlow(("pdmR3DevHlp_MMHeapAllocZ: caller='%s'/%d: cb=%#x\n", pDevIns->pReg->szName, pDevIns->iInstance, cb)); 811 811 812 812 void *pv = MMR3HeapAllocZ(pDevIns->Internal.s.pVMR3, MM_TAG_PDM_DEVICE_USER, cb); 813 813 814 LogFlow(("pdmR3DevHlp_MMHeapAllocZ: caller='%s'/%d: returns %p\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pv));814 LogFlow(("pdmR3DevHlp_MMHeapAllocZ: caller='%s'/%d: returns %p\n", pDevIns->pReg->szName, pDevIns->iInstance, pv)); 815 815 return pv; 816 816 } … … 821 821 { 822 822 PDMDEV_ASSERT_DEVINS(pDevIns); 823 LogFlow(("pdmR3DevHlp_MMHeapFree: caller='%s'/%d: pv=%p\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pv));823 LogFlow(("pdmR3DevHlp_MMHeapFree: caller='%s'/%d: pv=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, pv)); 824 824 825 825 MMR3HeapFree(pv); 826 826 827 LogFlow(("pdmR3DevHlp_MMHeapAlloc: caller='%s'/%d: returns void\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));827 LogFlow(("pdmR3DevHlp_MMHeapAlloc: caller='%s'/%d: returns void\n", pDevIns->pReg->szName, pDevIns->iInstance)); 828 828 } 829 829 … … 836 836 VMSTATE enmVMState = VMR3GetState(pDevIns->Internal.s.pVMR3); 837 837 838 LogFlow(("pdmR3DevHlp_VMState: caller='%s'/%d: returns %d (%s)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance,838 LogFlow(("pdmR3DevHlp_VMState: caller='%s'/%d: returns %d (%s)\n", pDevIns->pReg->szName, pDevIns->iInstance, 839 839 enmVMState, VMR3GetStateName(enmVMState))); 840 840 return enmVMState; … … 849 849 bool fRc = VMR3TeleportedAndNotFullyResumedYet(pDevIns->Internal.s.pVMR3); 850 850 851 LogFlow(("pdmR3DevHlp_VMState: caller='%s'/%d: returns %RTbool\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance,851 LogFlow(("pdmR3DevHlp_VMState: caller='%s'/%d: returns %RTbool\n", pDevIns->pReg->szName, pDevIns->iInstance, 852 852 fRc)); 853 853 return fRc; … … 905 905 va_copy(va2, args); 906 906 LogFlow(("pdmR3DevHlp_DBGFStopV: caller='%s'/%d: pszFile=%p:{%s} iLine=%d pszFunction=%p:{%s} pszFormat=%p:{%s} (%N)\n", 907 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pszFile, pszFile, iLine, pszFunction, pszFunction, pszFormat, pszFormat, pszFormat, &va2));907 pDevIns->pReg->szName, pDevIns->iInstance, pszFile, pszFile, iLine, pszFunction, pszFunction, pszFormat, pszFormat, pszFormat, &va2)); 908 908 va_end(va2); 909 909 #endif … … 915 915 rc = VINF_SUCCESS; 916 916 917 LogFlow(("pdmR3DevHlp_DBGFStopV: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));917 LogFlow(("pdmR3DevHlp_DBGFStopV: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 918 918 return rc; 919 919 } … … 925 925 PDMDEV_ASSERT_DEVINS(pDevIns); 926 926 LogFlow(("pdmR3DevHlp_DBGFInfoRegister: caller='%s'/%d: pszName=%p:{%s} pszDesc=%p:{%s} pfnHandler=%p\n", 927 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pszName, pszName, pszDesc, pszDesc, pfnHandler));927 pDevIns->pReg->szName, pDevIns->iInstance, pszName, pszName, pszDesc, pszDesc, pfnHandler)); 928 928 929 929 PVM pVM = pDevIns->Internal.s.pVMR3; … … 931 931 int rc = DBGFR3InfoRegisterDevice(pVM, pszName, pszDesc, pfnHandler, pDevIns); 932 932 933 LogFlow(("pdmR3DevHlp_DBGFInfoRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));933 LogFlow(("pdmR3DevHlp_DBGFInfoRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 934 934 return rc; 935 935 } … … 989 989 VM_ASSERT_EMT(pVM); 990 990 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: pPciDev=%p:{.config={%#.256Rhxs}\n", 991 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pPciDev, pPciDev->config));991 pDevIns->pReg->szName, pDevIns->iInstance, pPciDev, pPciDev->config)); 992 992 993 993 /* … … 997 997 { 998 998 Assert(pPciDev); 999 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: returns %Rrc (pPciDev)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));999 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: returns %Rrc (pPciDev)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1000 1000 return VERR_INVALID_PARAMETER; 1001 1001 } … … 1003 1003 { 1004 1004 Assert(pPciDev->config[0] || pPciDev->config[1]); 1005 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: returns %Rrc (vendor)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1005 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: returns %Rrc (vendor)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1006 1006 return VERR_INVALID_PARAMETER; 1007 1007 } … … 1030 1030 rc = CFGMR3QueryU8Def(pDevIns->Internal.s.pCfgHandle, "PCIBusNo", &u8Bus, 0); 1031 1031 AssertLogRelMsgRCReturn(rc, ("Configuration error: PCIBusNo query failed with rc=%Rrc (%s/%d)\n", 1032 rc, pDevIns->pReg->sz DeviceName, pDevIns->iInstance), rc);1032 rc, pDevIns->pReg->szName, pDevIns->iInstance), rc); 1033 1033 AssertLogRelMsgReturn(u8Bus < RT_ELEMENTS(pVM->pdm.s.aPciBuses), 1034 1034 ("Configuration error: PCIBusNo=%d, max is %d. (%s/%d)\n", u8Bus, 1035 RT_ELEMENTS(pVM->pdm.s.aPciBuses), pDevIns->pReg->sz DeviceName, pDevIns->iInstance),1035 RT_ELEMENTS(pVM->pdm.s.aPciBuses), pDevIns->pReg->szName, pDevIns->iInstance), 1036 1036 VERR_PDM_NO_PCI_BUS); 1037 1037 pBus = pDevIns->Internal.s.pPciBusR3 = &pVM->pdm.s.aPciBuses[u8Bus]; … … 1060 1060 { 1061 1061 AssertMsgFailed(("Configuration error: PCIDeviceNo=%d, max is 31. (%s/%d)\n", 1062 u8Device, pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1062 u8Device, pDevIns->pReg->szName, pDevIns->iInstance)); 1063 1063 return VERR_INTERNAL_ERROR; 1064 1064 } … … 1069 1069 { 1070 1070 AssertMsgFailed(("Configuration error: PCIDeviceNo, but PCIFunctionNo query failed with rc=%Rrc (%s/%d)\n", 1071 rc, pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1071 rc, pDevIns->pReg->szName, pDevIns->iInstance)); 1072 1072 return rc; 1073 1073 } … … 1075 1075 { 1076 1076 AssertMsgFailed(("Configuration error: PCIFunctionNo=%d, max is 7. (%s/%d)\n", 1077 u8Function, pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1077 u8Function, pDevIns->pReg->szName, pDevIns->iInstance)); 1078 1078 return VERR_INTERNAL_ERROR; 1079 1079 } … … 1083 1083 { 1084 1084 AssertMsgFailed(("Configuration error: PCIDeviceNo query failed with rc=%Rrc (%s/%d)\n", 1085 rc, pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1085 rc, pDevIns->pReg->szName, pDevIns->iInstance)); 1086 1086 return rc; 1087 1087 } … … 1091 1091 */ 1092 1092 pdmLock(pVM); 1093 rc = pBus->pfnRegisterR3(pBus->pDevInsR3, pPciDev, pDevIns->pReg->sz DeviceName, iDev);1093 rc = pBus->pfnRegisterR3(pBus->pDevInsR3, pPciDev, pDevIns->pReg->szName, iDev); 1094 1094 pdmUnlock(pVM); 1095 1095 if (RT_SUCCESS(rc)) … … 1109 1109 1110 1110 Log(("PDM: Registered device '%s'/%d as PCI device %d on bus %d\n", 1111 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pPciDev->devfn, pDevIns->Internal.s.pPciBusR3->iBus));1111 pDevIns->pReg->szName, pDevIns->iInstance, pPciDev->devfn, pDevIns->Internal.s.pPciBusR3->iBus)); 1112 1112 } 1113 1113 } … … 1118 1118 } 1119 1119 1120 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1120 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1121 1121 return rc; 1122 1122 } … … 1130 1130 VM_ASSERT_EMT(pVM); 1131 1131 LogFlow(("pdmR3DevHlp_PCIIORegionRegister: caller='%s'/%d: iRegion=%d cbRegion=%#x enmType=%d pfnCallback=%p\n", 1132 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iRegion, cbRegion, enmType, pfnCallback));1132 pDevIns->pReg->szName, pDevIns->iInstance, iRegion, cbRegion, enmType, pfnCallback)); 1133 1133 1134 1134 /* … … 1138 1138 { 1139 1139 Assert(iRegion >= 0 && iRegion < PCI_NUM_REGIONS); 1140 LogFlow(("pdmR3DevHlp_PCIIORegionRegister: caller='%s'/%d: returns %Rrc (iRegion)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1140 LogFlow(("pdmR3DevHlp_PCIIORegionRegister: caller='%s'/%d: returns %Rrc (iRegion)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1141 1141 return VERR_INVALID_PARAMETER; 1142 1142 } … … 1148 1148 */ 1149 1149 AssertMsgReturn(cbRegion <= _32K, 1150 ("caller='%s'/%d: %#x\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, cbRegion),1150 ("caller='%s'/%d: %#x\n", pDevIns->pReg->szName, pDevIns->iInstance, cbRegion), 1151 1151 VERR_INVALID_PARAMETER); 1152 1152 break; … … 1159 1159 */ 1160 1160 AssertMsgReturn(cbRegion <= 512 * _1M, 1161 ("caller='%s'/%d: %#x\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, cbRegion),1161 ("caller='%s'/%d: %#x\n", pDevIns->pReg->szName, pDevIns->iInstance, cbRegion), 1162 1162 VERR_INVALID_PARAMETER); 1163 1163 break; 1164 1164 default: 1165 1165 AssertMsgFailed(("enmType=%#x is unknown\n", enmType)); 1166 LogFlow(("pdmR3DevHlp_PCIIORegionRegister: caller='%s'/%d: returns %Rrc (enmType)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1166 LogFlow(("pdmR3DevHlp_PCIIORegionRegister: caller='%s'/%d: returns %Rrc (enmType)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1167 1167 return VERR_INVALID_PARAMETER; 1168 1168 } … … 1170 1170 { 1171 1171 Assert(pfnCallback); 1172 LogFlow(("pdmR3DevHlp_PCIIORegionRegister: caller='%s'/%d: returns %Rrc (callback)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1172 LogFlow(("pdmR3DevHlp_PCIIORegionRegister: caller='%s'/%d: returns %Rrc (callback)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1173 1173 return VERR_INVALID_PARAMETER; 1174 1174 } … … 1189 1189 { 1190 1190 Log(("pdmR3DevHlp_PCIIORegionRegister: caller='%s'/%d: aligning cbRegion %#x -> %#x\n", 1191 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, cbRegion, RT_ALIGN_32(cbRegion, PAGE_SIZE)));1191 pDevIns->pReg->szName, pDevIns->iInstance, cbRegion, RT_ALIGN_32(cbRegion, PAGE_SIZE))); 1192 1192 cbRegion = RT_ALIGN_32(cbRegion, PAGE_SIZE); 1193 1193 } … … 1214 1214 } 1215 1215 1216 LogFlow(("pdmR3DevHlp_PCIIORegionRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1216 LogFlow(("pdmR3DevHlp_PCIIORegionRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1217 1217 return rc; 1218 1218 } … … 1227 1227 VM_ASSERT_EMT(pVM); 1228 1228 LogFlow(("pdmR3DevHlp_PCISetConfigCallbacks: caller='%s'/%d: pPciDev=%p pfnRead=%p ppfnReadOld=%p pfnWrite=%p ppfnWriteOld=%p\n", 1229 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pPciDev, pfnRead, ppfnReadOld, pfnWrite, ppfnWriteOld));1229 pDevIns->pReg->szName, pDevIns->iInstance, pPciDev, pfnRead, ppfnReadOld, pfnWrite, ppfnWriteOld)); 1230 1230 1231 1231 /* … … 1252 1252 pdmUnlock(pVM); 1253 1253 1254 LogFlow(("pdmR3DevHlp_PCISetConfigCallbacks: caller='%s'/%d: returns void\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1254 LogFlow(("pdmR3DevHlp_PCISetConfigCallbacks: caller='%s'/%d: returns void\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1255 1255 } 1256 1256 … … 1260 1260 { 1261 1261 PDMDEV_ASSERT_DEVINS(pDevIns); 1262 LogFlow(("pdmR3DevHlp_PCISetIrq: caller='%s'/%d: iIrq=%d iLevel=%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iIrq, iLevel));1262 LogFlow(("pdmR3DevHlp_PCISetIrq: caller='%s'/%d: iIrq=%d iLevel=%d\n", pDevIns->pReg->szName, pDevIns->iInstance, iIrq, iLevel)); 1263 1263 1264 1264 /* … … 1283 1283 AssertReleaseMsgFailed(("No PCI device registered!\n")); 1284 1284 1285 LogFlow(("pdmR3DevHlp_PCISetIrq: caller='%s'/%d: returns void\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1285 LogFlow(("pdmR3DevHlp_PCISetIrq: caller='%s'/%d: returns void\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1286 1286 } 1287 1287 … … 1298 1298 { 1299 1299 PDMDEV_ASSERT_DEVINS(pDevIns); 1300 LogFlow(("pdmR3DevHlp_ISASetIrq: caller='%s'/%d: iIrq=%d iLevel=%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iIrq, iLevel));1300 LogFlow(("pdmR3DevHlp_ISASetIrq: caller='%s'/%d: iIrq=%d iLevel=%d\n", pDevIns->pReg->szName, pDevIns->iInstance, iIrq, iLevel)); 1301 1301 1302 1302 /* … … 1308 1308 PDMIsaSetIrq(pVM, iIrq, iLevel); /* (The API takes the lock.) */ 1309 1309 1310 LogFlow(("pdmR3DevHlp_ISASetIrq: caller='%s'/%d: returns void\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1310 LogFlow(("pdmR3DevHlp_ISASetIrq: caller='%s'/%d: returns void\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1311 1311 } 1312 1312 … … 1326 1326 VM_ASSERT_EMT(pVM); 1327 1327 LogFlow(("pdmR3DevHlp_DriverAttach: caller='%s'/%d: iLun=%d pBaseInterface=%p ppBaseInterface=%p pszDesc=%p:{%s}\n", 1328 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iLun, pBaseInterface, ppBaseInterface, pszDesc, pszDesc));1328 pDevIns->pReg->szName, pDevIns->iInstance, iLun, pBaseInterface, ppBaseInterface, pszDesc, pszDesc)); 1329 1329 1330 1330 /* … … 1368 1368 pLunPrev->pNext = pLun; 1369 1369 Log(("pdmR3DevHlp_DriverAttach: Registered LUN#%d '%s' with device '%s'/%d.\n", 1370 iLun, pszDesc, pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1370 iLun, pszDesc, pDevIns->pReg->szName, pDevIns->iInstance)); 1371 1371 } 1372 1372 else if (pLun->pTop) 1373 1373 { 1374 1374 AssertMsgFailed(("Already attached! The device should keep track of such things!\n")); 1375 LogFlow(("pdmR3DevHlp_DriverAttach: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_PDM_DRIVER_ALREADY_ATTACHED));1375 LogFlow(("pdmR3DevHlp_DriverAttach: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_PDM_DRIVER_ALREADY_ATTACHED)); 1376 1376 return VERR_PDM_DRIVER_ALREADY_ATTACHED; 1377 1377 } … … 1390 1390 1391 1391 1392 LogFlow(("pdmR3DevHlp_DriverAttach: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1392 LogFlow(("pdmR3DevHlp_DriverAttach: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1393 1393 return rc; 1394 1394 } … … 1401 1401 PDMDEV_ASSERT_DEVINS(pDevIns); 1402 1402 LogFlow(("pdmR3DevHlp_QueueCreate: caller='%s'/%d: cbItem=%#x cItems=%#x cMilliesInterval=%u pfnCallback=%p fGCEnabled=%RTbool pszName=%p:{%s} ppQueue=%p\n", 1403 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, cbItem, cItems, cMilliesInterval, pfnCallback, fGCEnabled, pszName, pszName, ppQueue));1403 pDevIns->pReg->szName, pDevIns->iInstance, cbItem, cItems, cMilliesInterval, pfnCallback, fGCEnabled, pszName, pszName, ppQueue)); 1404 1404 1405 1405 PVM pVM = pDevIns->Internal.s.pVMR3; … … 1414 1414 int rc = PDMR3QueueCreateDevice(pVM, pDevIns, cbItem, cItems, cMilliesInterval, pfnCallback, fGCEnabled, pszName, ppQueue); 1415 1415 1416 LogFlow(("pdmR3DevHlp_QueueCreate: caller='%s'/%d: returns %Rrc *ppQueue=%p\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc, *ppQueue));1416 LogFlow(("pdmR3DevHlp_QueueCreate: caller='%s'/%d: returns %Rrc *ppQueue=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, rc, *ppQueue)); 1417 1417 return rc; 1418 1418 } … … 1425 1425 PDMDEV_ASSERT_DEVINS(pDevIns); 1426 1426 LogFlow(("pdmR3DevHlp_CritSectInit: caller='%s'/%d: pCritSect=%p pszNameFmt=%p:{%s}\n", 1427 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pCritSect, pszNameFmt, pszNameFmt));1427 pDevIns->pReg->szName, pDevIns->iInstance, pCritSect, pszNameFmt, pszNameFmt)); 1428 1428 1429 1429 PVM pVM = pDevIns->Internal.s.pVMR3; … … 1431 1431 int rc = pdmR3CritSectInitDevice(pVM, pDevIns, pCritSect, RT_SRC_POS, pszNameFmt, va); 1432 1432 1433 LogFlow(("pdmR3DevHlp_CritSectInit: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1433 LogFlow(("pdmR3DevHlp_CritSectInit: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1434 1434 return rc; 1435 1435 } … … 1443 1443 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 1444 1444 LogFlow(("pdmR3DevHlp_ThreadCreate: caller='%s'/%d: ppThread=%p pvUser=%p pfnThread=%p pfnWakeup=%p cbStack=%#zx enmType=%d pszName=%p:{%s}\n", 1445 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName, pszName));1445 pDevIns->pReg->szName, pDevIns->iInstance, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName, pszName)); 1446 1446 1447 1447 int rc = pdmR3ThreadCreateDevice(pDevIns->Internal.s.pVMR3, pDevIns, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName); 1448 1448 1449 LogFlow(("pdmR3DevHlp_ThreadCreate: caller='%s'/%d: returns %Rrc *ppThread=%RTthrd\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance,1449 LogFlow(("pdmR3DevHlp_ThreadCreate: caller='%s'/%d: returns %Rrc *ppThread=%RTthrd\n", pDevIns->pReg->szName, pDevIns->iInstance, 1450 1450 rc, *ppThread)); 1451 1451 return rc; … … 1458 1458 PDMDEV_ASSERT_DEVINS(pDevIns); 1459 1459 VM_ASSERT_EMT0(pDevIns->Internal.s.pVMR3); 1460 LogFlow(("pdmR3DevHlp_SetAsyncNotification: caller='%s'/%d: pfnAsyncNotify=%p\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pfnAsyncNotify));1460 LogFlow(("pdmR3DevHlp_SetAsyncNotification: caller='%s'/%d: pfnAsyncNotify=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, pfnAsyncNotify)); 1461 1461 1462 1462 int rc = VINF_SUCCESS; … … 1477 1477 pDevIns->Internal.s.pfnAsyncNotify = pfnAsyncNotify; 1478 1478 1479 LogFlow(("pdmR3DevHlp_SetAsyncNotification: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1479 LogFlow(("pdmR3DevHlp_SetAsyncNotification: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1480 1480 return rc; 1481 1481 } … … 1497 1497 || enmVMState == VMSTATE_POWERING_OFF_LS) 1498 1498 { 1499 LogFlow(("pdmR3DevHlp_AsyncNotificationCompleted: caller='%s'/%d:\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));1499 LogFlow(("pdmR3DevHlp_AsyncNotificationCompleted: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance)); 1500 1500 VMR3AsyncPdmNotificationWakeupU(pVM->pUVM); 1501 1501 } 1502 1502 else 1503 LogFlow(("pdmR3DevHlp_AsyncNotificationCompleted: caller='%s'/%d: enmVMState=%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, enmVMState));1503 LogFlow(("pdmR3DevHlp_AsyncNotificationCompleted: caller='%s'/%d: enmVMState=%d\n", pDevIns->pReg->szName, pDevIns->iInstance, enmVMState)); 1504 1504 } 1505 1505 … … 1511 1511 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 1512 1512 LogFlow(("pdmR3DevHlp_RTCRegister: caller='%s'/%d: pRtcReg=%p:{.u32Version=%#x, .pfnWrite=%p, .pfnRead=%p} ppRtcHlp=%p\n", 1513 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pRtcReg, pRtcReg->u32Version, pRtcReg->pfnWrite,1513 pDevIns->pReg->szName, pDevIns->iInstance, pRtcReg, pRtcReg->u32Version, pRtcReg->pfnWrite, 1514 1514 pRtcReg->pfnWrite, ppRtcHlp)); 1515 1515 … … 1522 1522 PDM_RTCREG_VERSION)); 1523 1523 LogFlow(("pdmR3DevHlp_RTCRegister: caller='%s'/%d: returns %Rrc (version)\n", 1524 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1524 pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1525 1525 return VERR_INVALID_PARAMETER; 1526 1526 } … … 1531 1531 Assert(pRtcReg->pfnRead); 1532 1532 LogFlow(("pdmR3DevHlp_RTCRegister: caller='%s'/%d: returns %Rrc (callbacks)\n", 1533 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1533 pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1534 1534 return VERR_INVALID_PARAMETER; 1535 1535 } … … 1539 1539 Assert(ppRtcHlp); 1540 1540 LogFlow(("pdmR3DevHlp_RTCRegister: caller='%s'/%d: returns %Rrc (ppRtcHlp)\n", 1541 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1541 pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1542 1542 return VERR_INVALID_PARAMETER; 1543 1543 } … … 1551 1551 AssertMsgFailed(("Only one RTC device is supported!\n")); 1552 1552 LogFlow(("pdmR3DevHlp_RTCRegister: caller='%s'/%d: returns %Rrc\n", 1553 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1553 pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1554 1554 return VERR_INVALID_PARAMETER; 1555 1555 } … … 1569 1569 *ppRtcHlp = &g_pdmR3DevRtcHlp; 1570 1570 Log(("PDM: Registered RTC device '%s'/%d pDevIns=%p\n", 1571 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pDevIns));1571 pDevIns->pReg->szName, pDevIns->iInstance, pDevIns)); 1572 1572 } 1573 1573 else … … 1575 1575 1576 1576 LogFlow(("pdmR3DevHlp_RTCRegister: caller='%s'/%d: returns %Rrc\n", 1577 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1577 pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1578 1578 return rc; 1579 1579 } … … 1587 1587 VM_ASSERT_EMT(pVM); 1588 1588 LogFlow(("pdmR3DevHlp_DMARegister: caller='%s'/%d: uChannel=%d pfnTransferHandler=%p pvUser=%p\n", 1589 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, uChannel, pfnTransferHandler, pvUser));1589 pDevIns->pReg->szName, pDevIns->iInstance, uChannel, pfnTransferHandler, pvUser)); 1590 1590 int rc = VINF_SUCCESS; 1591 1591 if (pVM->pdm.s.pDmac) … … 1597 1597 } 1598 1598 LogFlow(("pdmR3DevHlp_DMARegister: caller='%s'/%d: returns %Rrc\n", 1599 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1599 pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1600 1600 return rc; 1601 1601 } … … 1609 1609 VM_ASSERT_EMT(pVM); 1610 1610 LogFlow(("pdmR3DevHlp_DMAReadMemory: caller='%s'/%d: uChannel=%d pvBuffer=%p off=%#x cbBlock=%#x pcbRead=%p\n", 1611 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, uChannel, pvBuffer, off, cbBlock, pcbRead));1611 pDevIns->pReg->szName, pDevIns->iInstance, uChannel, pvBuffer, off, cbBlock, pcbRead)); 1612 1612 int rc = VINF_SUCCESS; 1613 1613 if (pVM->pdm.s.pDmac) … … 1623 1623 } 1624 1624 LogFlow(("pdmR3DevHlp_DMAReadMemory: caller='%s'/%d: returns %Rrc\n", 1625 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1625 pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1626 1626 return rc; 1627 1627 } … … 1635 1635 VM_ASSERT_EMT(pVM); 1636 1636 LogFlow(("pdmR3DevHlp_DMAWriteMemory: caller='%s'/%d: uChannel=%d pvBuffer=%p off=%#x cbBlock=%#x pcbWritten=%p\n", 1637 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, uChannel, pvBuffer, off, cbBlock, pcbWritten));1637 pDevIns->pReg->szName, pDevIns->iInstance, uChannel, pvBuffer, off, cbBlock, pcbWritten)); 1638 1638 int rc = VINF_SUCCESS; 1639 1639 if (pVM->pdm.s.pDmac) … … 1649 1649 } 1650 1650 LogFlow(("pdmR3DevHlp_DMAWriteMemory: caller='%s'/%d: returns %Rrc\n", 1651 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1651 pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1652 1652 return rc; 1653 1653 } … … 1661 1661 VM_ASSERT_EMT(pVM); 1662 1662 LogFlow(("pdmR3DevHlp_DMASetDREQ: caller='%s'/%d: uChannel=%d uLevel=%d\n", 1663 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, uChannel, uLevel));1663 pDevIns->pReg->szName, pDevIns->iInstance, uChannel, uLevel)); 1664 1664 int rc = VINF_SUCCESS; 1665 1665 if (pVM->pdm.s.pDmac) … … 1671 1671 } 1672 1672 LogFlow(("pdmR3DevHlp_DMASetDREQ: caller='%s'/%d: returns %Rrc\n", 1673 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1673 pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1674 1674 return rc; 1675 1675 } … … 1682 1682 VM_ASSERT_EMT(pVM); 1683 1683 LogFlow(("pdmR3DevHlp_DMAGetChannelMode: caller='%s'/%d: uChannel=%d\n", 1684 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, uChannel));1684 pDevIns->pReg->szName, pDevIns->iInstance, uChannel)); 1685 1685 uint8_t u8Mode; 1686 1686 if (pVM->pdm.s.pDmac) … … 1692 1692 } 1693 1693 LogFlow(("pdmR3DevHlp_DMAGetChannelMode: caller='%s'/%d: returns %#04x\n", 1694 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, u8Mode));1694 pDevIns->pReg->szName, pDevIns->iInstance, u8Mode)); 1695 1695 return u8Mode; 1696 1696 } … … 1703 1703 VM_ASSERT_EMT(pVM); 1704 1704 LogFlow(("pdmR3DevHlp_DMASchedule: caller='%s'/%d: VM_FF_PDM_DMA %d -> 1\n", 1705 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VM_FF_ISSET(pVM, VM_FF_PDM_DMA)));1705 pDevIns->pReg->szName, pDevIns->iInstance, VM_FF_ISSET(pVM, VM_FF_PDM_DMA))); 1706 1706 1707 1707 AssertMsg(pVM->pdm.s.pDmac, ("Configuration error: No DMAC controller available. This could be related to init order too!\n")); … … 1720 1720 1721 1721 LogFlow(("pdmR3DevHlp_CMOSWrite: caller='%s'/%d: iReg=%#04x u8Value=%#04x\n", 1722 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iReg, u8Value));1722 pDevIns->pReg->szName, pDevIns->iInstance, iReg, u8Value)); 1723 1723 int rc; 1724 1724 if (pVM->pdm.s.pRtc) … … 1728 1728 1729 1729 LogFlow(("pdmR3DevHlp_CMOSWrite: caller='%s'/%d: return %Rrc\n", 1730 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1730 pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1731 1731 return rc; 1732 1732 } … … 1741 1741 1742 1742 LogFlow(("pdmR3DevHlp_CMOSWrite: caller='%s'/%d: iReg=%#04x pu8Value=%p\n", 1743 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iReg, pu8Value));1743 pDevIns->pReg->szName, pDevIns->iInstance, iReg, pu8Value)); 1744 1744 int rc; 1745 1745 if (pVM->pdm.s.pRtc) … … 1749 1749 1750 1750 LogFlow(("pdmR3DevHlp_CMOSWrite: caller='%s'/%d: return %Rrc\n", 1751 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1751 pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1752 1752 return rc; 1753 1753 } … … 1762 1762 1763 1763 char szMsg[100]; 1764 RTStrPrintf(szMsg, sizeof(szMsg), "AssertEMT '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance);1764 RTStrPrintf(szMsg, sizeof(szMsg), "AssertEMT '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance); 1765 1765 RTAssertMsg1Weak(szMsg, iLine, pszFile, pszFunction); 1766 1766 AssertBreakpoint(); … … 1777 1777 1778 1778 char szMsg[100]; 1779 RTStrPrintf(szMsg, sizeof(szMsg), "AssertOther '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance);1779 RTStrPrintf(szMsg, sizeof(szMsg), "AssertOther '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance); 1780 1780 RTAssertMsg1Weak(szMsg, iLine, pszFile, pszFunction); 1781 1781 AssertBreakpoint(); … … 1791 1791 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 1792 1792 LogFlow(("pdmR3DevHlp_PDMLdrGetRCInterfaceSymbols: caller='%s'/%d: pvInterface=%p cbInterface=%zu pszSymPrefix=%p:{%s} pszSymList=%p:{%s}\n", 1793 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList));1793 pDevIns->pReg->szName, pDevIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList)); 1794 1794 1795 1795 int rc; 1796 1796 if ( strncmp(pszSymPrefix, "dev", 3) == 0 1797 && RTStrIStr(pszSymPrefix + 3, pDevIns->pReg->sz DeviceName) != NULL)1797 && RTStrIStr(pszSymPrefix + 3, pDevIns->pReg->szName) != NULL) 1798 1798 { 1799 1799 if (pDevIns->pReg->fFlags & PDM_DEVREG_FLAGS_RC) 1800 1800 rc = PDMR3LdrGetInterfaceSymbols(pDevIns->Internal.s.pVMR3, pvInterface, cbInterface, 1801 pDevIns->pReg->sz DeviceName, pszSymPrefix, pszSymList,1801 pDevIns->pReg->szName, pszSymPrefix, pszSymList, 1802 1802 false /*fRing0OrRC*/); 1803 1803 else … … 1810 1810 { 1811 1811 AssertMsgFailed(("Invalid prefix '%s' for '%s'; must start with 'dev' and contain the driver name!\n", 1812 pszSymPrefix, pDevIns->pReg->sz DeviceName));1812 pszSymPrefix, pDevIns->pReg->szName)); 1813 1813 rc = VERR_INVALID_NAME; 1814 1814 } 1815 1815 1816 LogFlow(("pdmR3DevHlp_PDMLdrGetRCInterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName,1816 LogFlow(("pdmR3DevHlp_PDMLdrGetRCInterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, 1817 1817 pDevIns->iInstance, rc)); 1818 1818 return rc; … … 1827 1827 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 1828 1828 LogFlow(("pdmR3DevHlp_PDMLdrGetR0InterfaceSymbols: caller='%s'/%d: pvInterface=%p cbInterface=%zu pszSymPrefix=%p:{%s} pszSymList=%p:{%s}\n", 1829 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList));1829 pDevIns->pReg->szName, pDevIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList)); 1830 1830 1831 1831 int rc; 1832 1832 if ( strncmp(pszSymPrefix, "dev", 3) == 0 1833 && RTStrIStr(pszSymPrefix + 3, pDevIns->pReg->sz DeviceName) != NULL)1833 && RTStrIStr(pszSymPrefix + 3, pDevIns->pReg->szName) != NULL) 1834 1834 { 1835 1835 if (pDevIns->pReg->fFlags & PDM_DEVREG_FLAGS_R0) 1836 1836 rc = PDMR3LdrGetInterfaceSymbols(pDevIns->Internal.s.pVMR3, pvInterface, cbInterface, 1837 pDevIns->pReg->sz DeviceName, pszSymPrefix, pszSymList,1837 pDevIns->pReg->szName, pszSymPrefix, pszSymList, 1838 1838 true /*fRing0OrRC*/); 1839 1839 else … … 1846 1846 { 1847 1847 AssertMsgFailed(("Invalid prefix '%s' for '%s'; must start with 'dev' and contain the driver name!\n", 1848 pszSymPrefix, pDevIns->pReg->sz DeviceName));1848 pszSymPrefix, pDevIns->pReg->szName)); 1849 1849 rc = VERR_INVALID_NAME; 1850 1850 } 1851 1851 1852 LogFlow(("pdmR3DevHlp_PDMLdrGetR0InterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName,1852 LogFlow(("pdmR3DevHlp_PDMLdrGetR0InterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, 1853 1853 pDevIns->iInstance, rc)); 1854 1854 return rc; … … 1860 1860 { 1861 1861 PDMDEV_ASSERT_DEVINS(pDevIns); 1862 LogFlow(("pdmR3DevHlp_GetVM: caller='%s'/%d: returns %p\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pDevIns->Internal.s.pVMR3));1862 LogFlow(("pdmR3DevHlp_GetVM: caller='%s'/%d: returns %p\n", pDevIns->pReg->szName, pDevIns->iInstance, pDevIns->Internal.s.pVMR3)); 1863 1863 return pDevIns->Internal.s.pVMR3; 1864 1864 } … … 1870 1870 PDMDEV_ASSERT_DEVINS(pDevIns); 1871 1871 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 1872 LogFlow(("pdmR3DevHlp_GetVMCPU: caller='%s'/%d for CPU %u\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VMMGetCpuId(pDevIns->Internal.s.pVMR3)));1872 LogFlow(("pdmR3DevHlp_GetVMCPU: caller='%s'/%d for CPU %u\n", pDevIns->pReg->szName, pDevIns->iInstance, VMMGetCpuId(pDevIns->Internal.s.pVMR3))); 1873 1873 return VMMGetCpu(pDevIns->Internal.s.pVMR3); 1874 1874 } … … 1883 1883 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: pPciBusReg=%p:{.u32Version=%#x, .pfnRegisterR3=%p, .pfnIORegionRegisterR3=%p, .pfnSetIrqR3=%p, " 1884 1884 ".pfnSaveExecR3=%p, .pfnLoadExecR3=%p, .pfnFakePCIBIOSR3=%p, .pszSetIrqRC=%p:{%s}, .pszSetIrqR0=%p:{%s}} ppPciHlpR3=%p\n", 1885 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pPciBusReg, pPciBusReg->u32Version, pPciBusReg->pfnRegisterR3,1885 pDevIns->pReg->szName, pDevIns->iInstance, pPciBusReg, pPciBusReg->u32Version, pPciBusReg->pfnRegisterR3, 1886 1886 pPciBusReg->pfnIORegionRegisterR3, pPciBusReg->pfnSetIrqR3, pPciBusReg->pfnSaveExecR3, pPciBusReg->pfnLoadExecR3, 1887 1887 pPciBusReg->pfnFakePCIBIOSR3, pPciBusReg->pszSetIrqRC, pPciBusReg->pszSetIrqRC, pPciBusReg->pszSetIrqR0, pPciBusReg->pszSetIrqR0, ppPciHlpR3)); … … 1893 1893 { 1894 1894 AssertMsgFailed(("u32Version=%#x expected %#x\n", pPciBusReg->u32Version, PDM_PCIBUSREG_VERSION)); 1895 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: returns %Rrc (version)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1895 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: returns %Rrc (version)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1896 1896 return VERR_INVALID_PARAMETER; 1897 1897 } … … 1909 1909 Assert(pPciBusReg->pfnLoadExecR3); 1910 1910 Assert(pPciBusReg->pfnFakePCIBIOSR3); 1911 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc (R3 callbacks)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1911 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc (R3 callbacks)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1912 1912 return VERR_INVALID_PARAMETER; 1913 1913 } … … 1916 1916 { 1917 1917 Assert(VALID_PTR(pPciBusReg->pszSetIrqRC)); 1918 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc (GC callbacks)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1918 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc (GC callbacks)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1919 1919 return VERR_INVALID_PARAMETER; 1920 1920 } … … 1923 1923 { 1924 1924 Assert(VALID_PTR(pPciBusReg->pszSetIrqR0)); 1925 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc (GC callbacks)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1925 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc (GC callbacks)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1926 1926 return VERR_INVALID_PARAMETER; 1927 1927 } … … 1929 1929 { 1930 1930 Assert(ppPciHlpR3); 1931 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc (ppPciHlpR3)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1931 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc (ppPciHlpR3)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1932 1932 return VERR_INVALID_PARAMETER; 1933 1933 } … … 1943 1943 { 1944 1944 AssertMsgFailed(("Too many PCI buses. Max=%u\n", RT_ELEMENTS(pVM->pdm.s.aPciBuses))); 1945 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc (pci bus)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));1945 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc (pci bus)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 1946 1946 return VERR_INVALID_PARAMETER; 1947 1947 } … … 1957 1957 if (RT_FAILURE(rc)) 1958 1958 { 1959 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1959 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1960 1960 return rc; 1961 1961 } … … 1977 1977 if (RT_FAILURE(rc)) 1978 1978 { 1979 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));1979 LogFlow(("pdmR3DevHlp_PCIRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 1980 1980 return rc; 1981 1981 } … … 2001 2001 pPciBus->pfnFakePCIBIOSR3 = pPciBusReg->pfnFakePCIBIOSR3; 2002 2002 2003 Log(("PDM: Registered PCI bus device '%s'/%d pDevIns=%p\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pDevIns));2003 Log(("PDM: Registered PCI bus device '%s'/%d pDevIns=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, pDevIns)); 2004 2004 2005 2005 /* set the helper pointer and return. */ 2006 2006 *ppPciHlpR3 = &g_pdmR3DevPciHlp; 2007 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VINF_SUCCESS));2007 LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS)); 2008 2008 return VINF_SUCCESS; 2009 2009 } … … 2016 2016 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 2017 2017 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: pPicReg=%p:{.u32Version=%#x, .pfnSetIrqR3=%p, .pfnGetInterruptR3=%p, .pszGetIrqRC=%p:{%s}, .pszGetInterruptRC=%p:{%s}, .pszGetIrqR0=%p:{%s}, .pszGetInterruptR0=%p:{%s} } ppPicHlpR3=%p\n", 2018 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pPicReg, pPicReg->u32Version, pPicReg->pfnSetIrqR3, pPicReg->pfnGetInterruptR3,2018 pDevIns->pReg->szName, pDevIns->iInstance, pPicReg, pPicReg->u32Version, pPicReg->pfnSetIrqR3, pPicReg->pfnGetInterruptR3, 2019 2019 pPicReg->pszSetIrqRC, pPicReg->pszSetIrqRC, pPicReg->pszGetInterruptRC, pPicReg->pszGetInterruptRC, 2020 2020 pPicReg->pszSetIrqR0, pPicReg->pszSetIrqR0, pPicReg->pszGetInterruptR0, pPicReg->pszGetInterruptR0, … … 2027 2027 { 2028 2028 AssertMsgFailed(("u32Version=%#x expected %#x\n", pPicReg->u32Version, PDM_PICREG_VERSION)); 2029 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc (version)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2029 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc (version)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2030 2030 return VERR_INVALID_PARAMETER; 2031 2031 } … … 2035 2035 Assert(pPicReg->pfnSetIrqR3); 2036 2036 Assert(pPicReg->pfnGetInterruptR3); 2037 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc (R3 callbacks)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2037 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc (R3 callbacks)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2038 2038 return VERR_INVALID_PARAMETER; 2039 2039 } … … 2046 2046 Assert(VALID_PTR(pPicReg->pszSetIrqRC)); 2047 2047 Assert(VALID_PTR(pPicReg->pszGetInterruptRC)); 2048 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc (RC callbacks)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2048 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc (RC callbacks)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2049 2049 return VERR_INVALID_PARAMETER; 2050 2050 } … … 2053 2053 { 2054 2054 Assert(pDevIns->pReg->fFlags & PDM_DEVREG_FLAGS_RC); 2055 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc (RC flag)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2055 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc (RC flag)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2056 2056 return VERR_INVALID_PARAMETER; 2057 2057 } … … 2060 2060 { 2061 2061 Assert(pDevIns->pReg->fFlags & PDM_DEVREG_FLAGS_R0); 2062 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc (R0 flag)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2062 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc (R0 flag)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2063 2063 return VERR_INVALID_PARAMETER; 2064 2064 } … … 2066 2066 { 2067 2067 Assert(ppPicHlpR3); 2068 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc (ppPicHlpR3)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2068 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc (ppPicHlpR3)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2069 2069 return VERR_INVALID_PARAMETER; 2070 2070 } … … 2077 2077 { 2078 2078 AssertMsgFailed(("Only one pic device is supported!\n")); 2079 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2079 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2080 2080 return VERR_INVALID_PARAMETER; 2081 2081 } … … 2095 2095 if (RT_FAILURE(rc)) 2096 2096 { 2097 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));2097 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 2098 2098 return rc; 2099 2099 } … … 2121 2121 if (RT_FAILURE(rc)) 2122 2122 { 2123 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));2123 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 2124 2124 return rc; 2125 2125 } … … 2140 2140 pVM->pdm.s.Pic.pfnSetIrqR3 = pPicReg->pfnSetIrqR3; 2141 2141 pVM->pdm.s.Pic.pfnGetInterruptR3 = pPicReg->pfnGetInterruptR3; 2142 Log(("PDM: Registered PIC device '%s'/%d pDevIns=%p\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pDevIns));2142 Log(("PDM: Registered PIC device '%s'/%d pDevIns=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, pDevIns)); 2143 2143 2144 2144 /* set the helper pointer and return. */ 2145 2145 *ppPicHlpR3 = &g_pdmR3DevPicHlp; 2146 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VINF_SUCCESS));2146 LogFlow(("pdmR3DevHlp_PICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS)); 2147 2147 return VINF_SUCCESS; 2148 2148 } … … 2157 2157 ".pfnSetTPRR3=%p, .pfnGetTPRR3=%p, .pfnWriteMSR3=%p, .pfnReadMSR3=%p, .pfnBusDeliverR3=%p, .pfnLocalInterruptR3=%p, pszGetInterruptRC=%p:{%s}, pszSetBaseRC=%p:{%s}, pszGetBaseRC=%p:{%s}, " 2158 2158 ".pszSetTPRRC=%p:{%s}, .pszGetTPRRC=%p:{%s}, .pszWriteMSRRC=%p:{%s}, .pszReadMSRRC=%p:{%s}, .pszBusDeliverRC=%p:{%s}, .pszLocalInterruptRC=%p:{%s}} ppApicHlpR3=%p\n", 2159 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pApicReg, pApicReg->u32Version, pApicReg->pfnGetInterruptR3, pApicReg->pfnSetBaseR3,2159 pDevIns->pReg->szName, pDevIns->iInstance, pApicReg, pApicReg->u32Version, pApicReg->pfnGetInterruptR3, pApicReg->pfnSetBaseR3, 2160 2160 pApicReg->pfnGetBaseR3, pApicReg->pfnSetTPRR3, pApicReg->pfnGetTPRR3, pApicReg->pfnWriteMSRR3, pApicReg->pfnReadMSRR3, pApicReg->pfnBusDeliverR3, pApicReg->pfnLocalInterruptR3, pApicReg->pszGetInterruptRC, 2161 2161 pApicReg->pszGetInterruptRC, pApicReg->pszSetBaseRC, pApicReg->pszSetBaseRC, pApicReg->pszGetBaseRC, pApicReg->pszGetBaseRC, … … 2169 2169 { 2170 2170 AssertMsgFailed(("u32Version=%#x expected %#x\n", pApicReg->u32Version, PDM_APICREG_VERSION)); 2171 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc (version)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2171 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc (version)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2172 2172 return VERR_INVALID_PARAMETER; 2173 2173 } … … 2193 2193 Assert(pApicReg->pfnBusDeliverR3); 2194 2194 Assert(pApicReg->pfnLocalInterruptR3); 2195 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc (R3 callbacks)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2195 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc (R3 callbacks)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2196 2196 return VERR_INVALID_PARAMETER; 2197 2197 } … … 2228 2228 Assert(VALID_PTR(pApicReg->pszBusDeliverRC)); 2229 2229 Assert(VALID_PTR(pApicReg->pszLocalInterruptRC)); 2230 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc (RC callbacks)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2230 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc (RC callbacks)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2231 2231 return VERR_INVALID_PARAMETER; 2232 2232 } … … 2263 2263 Assert(VALID_PTR(pApicReg->pszBusDeliverR0)); 2264 2264 Assert(VALID_PTR(pApicReg->pszLocalInterruptR0)); 2265 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc (R0 callbacks)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2265 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc (R0 callbacks)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2266 2266 return VERR_INVALID_PARAMETER; 2267 2267 } … … 2269 2269 { 2270 2270 Assert(ppApicHlpR3); 2271 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc (ppApicHlpR3)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2271 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc (ppApicHlpR3)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2272 2272 return VERR_INVALID_PARAMETER; 2273 2273 } … … 2281 2281 { 2282 2282 AssertMsgFailed(("Only one apic device is supported!\n")); 2283 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2283 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2284 2284 return VERR_INVALID_PARAMETER; 2285 2285 } … … 2339 2339 if (RT_FAILURE(rc)) 2340 2340 { 2341 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));2341 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 2342 2342 return rc; 2343 2343 } … … 2413 2413 if (RT_FAILURE(rc)) 2414 2414 { 2415 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));2415 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 2416 2416 return rc; 2417 2417 } … … 2448 2448 pVM->pdm.s.Apic.pfnBusDeliverR3 = pApicReg->pfnBusDeliverR3; 2449 2449 pVM->pdm.s.Apic.pfnLocalInterruptR3 = pApicReg->pfnLocalInterruptR3; 2450 Log(("PDM: Registered APIC device '%s'/%d pDevIns=%p\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pDevIns));2450 Log(("PDM: Registered APIC device '%s'/%d pDevIns=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, pDevIns)); 2451 2451 2452 2452 /* set the helper pointer and return. */ 2453 2453 *ppApicHlpR3 = &g_pdmR3DevApicHlp; 2454 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VINF_SUCCESS));2454 LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS)); 2455 2455 return VINF_SUCCESS; 2456 2456 } … … 2463 2463 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 2464 2464 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: pIoApicReg=%p:{.u32Version=%#x, .pfnSetIrqR3=%p, .pszSetIrqRC=%p:{%s}, .pszSetIrqR0=%p:{%s}} ppIoApicHlpR3=%p\n", 2465 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pIoApicReg, pIoApicReg->u32Version, pIoApicReg->pfnSetIrqR3,2465 pDevIns->pReg->szName, pDevIns->iInstance, pIoApicReg, pIoApicReg->u32Version, pIoApicReg->pfnSetIrqR3, 2466 2466 pIoApicReg->pszSetIrqRC, pIoApicReg->pszSetIrqRC, pIoApicReg->pszSetIrqR0, pIoApicReg->pszSetIrqR0, ppIoApicHlpR3)); 2467 2467 … … 2472 2472 { 2473 2473 AssertMsgFailed(("u32Version=%#x expected %#x\n", pIoApicReg->u32Version, PDM_IOAPICREG_VERSION)); 2474 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (version)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2474 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (version)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2475 2475 return VERR_INVALID_PARAMETER; 2476 2476 } … … 2478 2478 { 2479 2479 Assert(pIoApicReg->pfnSetIrqR3); 2480 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (R3 callbacks)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2480 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (R3 callbacks)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2481 2481 return VERR_INVALID_PARAMETER; 2482 2482 } … … 2485 2485 { 2486 2486 Assert(VALID_PTR(pIoApicReg->pszSetIrqRC)); 2487 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (GC callbacks)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2487 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (GC callbacks)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2488 2488 return VERR_INVALID_PARAMETER; 2489 2489 } … … 2492 2492 { 2493 2493 Assert(VALID_PTR(pIoApicReg->pszSetIrqR0)); 2494 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (GC callbacks)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2494 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (GC callbacks)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2495 2495 return VERR_INVALID_PARAMETER; 2496 2496 } … … 2498 2498 { 2499 2499 Assert(ppIoApicHlpR3); 2500 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (ppApicHlp)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2500 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (ppApicHlp)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2501 2501 return VERR_INVALID_PARAMETER; 2502 2502 } … … 2510 2510 { 2511 2511 AssertMsgFailed(("Configuration error / Init order error! No APIC!\n")); 2512 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (no APIC)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2512 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (no APIC)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2513 2513 return VERR_INVALID_PARAMETER; 2514 2514 } … … 2517 2517 { 2518 2518 AssertMsgFailed(("Configuration error! APIC doesn't do GC, I/O APIC does!\n")); 2519 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (no GC APIC)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2519 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (no GC APIC)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2520 2520 return VERR_INVALID_PARAMETER; 2521 2521 } … … 2527 2527 { 2528 2528 AssertMsgFailed(("Only one ioapic device is supported!\n")); 2529 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (only one)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2529 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc (only one)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2530 2530 return VERR_INVALID_PARAMETER; 2531 2531 } … … 2540 2540 if (RT_FAILURE(rc)) 2541 2541 { 2542 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));2542 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 2543 2543 return rc; 2544 2544 } … … 2560 2560 if (RT_FAILURE(rc)) 2561 2561 { 2562 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));2562 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 2563 2563 return rc; 2564 2564 } … … 2577 2577 pVM->pdm.s.IoApic.pDevInsR3 = pDevIns; 2578 2578 pVM->pdm.s.IoApic.pfnSetIrqR3 = pIoApicReg->pfnSetIrqR3; 2579 Log(("PDM: Registered I/O APIC device '%s'/%d pDevIns=%p\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pDevIns));2579 Log(("PDM: Registered I/O APIC device '%s'/%d pDevIns=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, pDevIns)); 2580 2580 2581 2581 /* set the helper pointer and return. */ 2582 2582 *ppIoApicHlpR3 = &g_pdmR3DevIoApicHlp; 2583 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VINF_SUCCESS));2583 LogFlow(("pdmR3DevHlp_IOAPICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS)); 2584 2584 return VINF_SUCCESS; 2585 2585 } … … 2599 2599 { 2600 2600 AssertMsgFailed(("u32Version=%#x expected %#x\n", pHpetReg->u32Version, PDM_HPETREG_VERSION)); 2601 LogFlow(("pdmR3DevHlp_HPETRegister: caller='%s'/%d: returns %Rrc (version)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2601 LogFlow(("pdmR3DevHlp_HPETRegister: caller='%s'/%d: returns %Rrc (version)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2602 2602 return VERR_INVALID_PARAMETER; 2603 2603 } … … 2606 2606 { 2607 2607 Assert(ppHpetHlpR3); 2608 LogFlow(("pdmR3DevHlp_HPETRegister: caller='%s'/%d: returns %Rrc (ppApicHlpR3)\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2608 LogFlow(("pdmR3DevHlp_HPETRegister: caller='%s'/%d: returns %Rrc (ppApicHlpR3)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2609 2609 return VERR_INVALID_PARAMETER; 2610 2610 } … … 2612 2612 /* set the helper pointer and return. */ 2613 2613 *ppHpetHlpR3 = &g_pdmR3DevHpetHlp; 2614 LogFlow(("pdmR3DevHlp_HPETRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VINF_SUCCESS));2614 LogFlow(("pdmR3DevHlp_HPETRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS)); 2615 2615 return VINF_SUCCESS; 2616 2616 } … … 2623 2623 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 2624 2624 LogFlow(("pdmR3DevHlp_DMACRegister: caller='%s'/%d: pDmacReg=%p:{.u32Version=%#x, .pfnRun=%p, .pfnRegister=%p, .pfnReadMemory=%p, .pfnWriteMemory=%p, .pfnSetDREQ=%p, .pfnGetChannelMode=%p} ppDmacHlp=%p\n", 2625 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pDmacReg, pDmacReg->u32Version, pDmacReg->pfnRun, pDmacReg->pfnRegister,2625 pDevIns->pReg->szName, pDevIns->iInstance, pDmacReg, pDmacReg->u32Version, pDmacReg->pfnRun, pDmacReg->pfnRegister, 2626 2626 pDmacReg->pfnReadMemory, pDmacReg->pfnWriteMemory, pDmacReg->pfnSetDREQ, pDmacReg->pfnGetChannelMode, ppDmacHlp)); 2627 2627 … … 2634 2634 PDM_DMACREG_VERSION)); 2635 2635 LogFlow(("pdmR3DevHlp_DMACRegister: caller='%s'/%d: returns %Rrc (version)\n", 2636 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2636 pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2637 2637 return VERR_INVALID_PARAMETER; 2638 2638 } … … 2651 2651 Assert(pDmacReg->pfnGetChannelMode); 2652 2652 LogFlow(("pdmR3DevHlp_DMACRegister: caller='%s'/%d: returns %Rrc (callbacks)\n", 2653 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2653 pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2654 2654 return VERR_INVALID_PARAMETER; 2655 2655 } … … 2659 2659 Assert(ppDmacHlp); 2660 2660 LogFlow(("pdmR3DevHlp_DMACRegister: caller='%s'/%d: returns %Rrc (ppDmacHlp)\n", 2661 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2661 pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2662 2662 return VERR_INVALID_PARAMETER; 2663 2663 } … … 2671 2671 AssertMsgFailed(("Only one DMA device is supported!\n")); 2672 2672 LogFlow(("pdmR3DevHlp_DMACRegister: caller='%s'/%d: returns %Rrc\n", 2673 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2673 pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER)); 2674 2674 return VERR_INVALID_PARAMETER; 2675 2675 } … … 2689 2689 *ppDmacHlp = &g_pdmR3DevDmacHlp; 2690 2690 Log(("PDM: Registered DMAC device '%s'/%d pDevIns=%p\n", 2691 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pDevIns));2691 pDevIns->pReg->szName, pDevIns->iInstance, pDevIns)); 2692 2692 } 2693 2693 else … … 2695 2695 2696 2696 LogFlow(("pdmR3DevHlp_DMACRegister: caller='%s'/%d: returns %Rrc\n", 2697 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));2697 pDevIns->pReg->szName, pDevIns->iInstance, rc)); 2698 2698 return rc; 2699 2699 } … … 2733 2733 VM_ASSERT_EMT(pVM); 2734 2734 LogFlow(("pdmR3DevHlp_VMReset: caller='%s'/%d: VM_FF_RESET %d -> 1\n", 2735 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VM_FF_ISSET(pVM, VM_FF_RESET)));2735 pDevIns->pReg->szName, pDevIns->iInstance, VM_FF_ISSET(pVM, VM_FF_RESET))); 2736 2736 2737 2737 /* … … 2753 2753 } 2754 2754 2755 LogFlow(("pdmR3DevHlp_VMReset: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));2755 LogFlow(("pdmR3DevHlp_VMReset: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 2756 2756 return rc; 2757 2757 } … … 2766 2766 VM_ASSERT_EMT(pVM); 2767 2767 LogFlow(("pdmR3DevHlp_VMSuspend: caller='%s'/%d:\n", 2768 pDevIns->pReg->sz DeviceName, pDevIns->iInstance));2768 pDevIns->pReg->szName, pDevIns->iInstance)); 2769 2769 2770 2770 if (pVM->cCpus > 1) … … 2778 2778 rc = VMR3Suspend(pVM); 2779 2779 2780 LogFlow(("pdmR3DevHlp_VMSuspend: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));2780 LogFlow(("pdmR3DevHlp_VMSuspend: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 2781 2781 return rc; 2782 2782 } … … 2791 2791 VM_ASSERT_EMT(pVM); 2792 2792 LogFlow(("pdmR3DevHlp_VMPowerOff: caller='%s'/%d:\n", 2793 pDevIns->pReg->sz DeviceName, pDevIns->iInstance));2793 pDevIns->pReg->szName, pDevIns->iInstance)); 2794 2794 2795 2795 if (pVM->cCpus > 1) … … 2807 2807 rc = VMR3PowerOff(pVM); 2808 2808 2809 LogFlow(("pdmR3DevHlp_VMPowerOff: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));2809 LogFlow(("pdmR3DevHlp_VMPowerOff: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 2810 2810 return rc; 2811 2811 } … … 2820 2820 bool fRc = PGMPhysIsA20Enabled(VMMGetCpu(pDevIns->Internal.s.pVMR3)); 2821 2821 2822 LogFlow(("pdmR3DevHlp_A20IsEnabled: caller='%s'/%d: returns %d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, fRc));2822 LogFlow(("pdmR3DevHlp_A20IsEnabled: caller='%s'/%d: returns %d\n", pDevIns->pReg->szName, pDevIns->iInstance, fRc)); 2823 2823 return fRc; 2824 2824 } … … 2830 2830 PDMDEV_ASSERT_DEVINS(pDevIns); 2831 2831 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3); 2832 LogFlow(("pdmR3DevHlp_A20Set: caller='%s'/%d: fEnable=%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, fEnable));2832 LogFlow(("pdmR3DevHlp_A20Set: caller='%s'/%d: fEnable=%d\n", pDevIns->pReg->szName, pDevIns->iInstance, fEnable)); 2833 2833 PGMR3PhysSetA20(VMMGetCpu(pDevIns->Internal.s.pVMR3), fEnable); 2834 2834 } … … 2843 2843 2844 2844 LogFlow(("pdmR3DevHlp_GetCpuId: caller='%s'/%d: iLeaf=%d pEax=%p pEbx=%p pEcx=%p pEdx=%p\n", 2845 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, iLeaf, pEax, pEbx, pEcx, pEdx));2845 pDevIns->pReg->szName, pDevIns->iInstance, iLeaf, pEax, pEbx, pEcx, pEdx)); 2846 2846 AssertPtr(pEax); AssertPtr(pEbx); AssertPtr(pEcx); AssertPtr(pEdx); 2847 2847 … … 2849 2849 2850 2850 LogFlow(("pdmR3DevHlp_GetCpuId: caller='%s'/%d: returns void - *pEax=%#x *pEbx=%#x *pEcx=%#x *pEdx=%#x\n", 2851 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, *pEax, *pEbx, *pEcx, *pEdx));2851 pDevIns->pReg->szName, pDevIns->iInstance, *pEax, *pEbx, *pEcx, *pEdx)); 2852 2852 } 2853 2853 … … 2962 2962 { 2963 2963 PDMDEV_ASSERT_DEVINS(pDevIns); 2964 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));2964 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 2965 2965 return NULL; 2966 2966 } … … 2971 2971 { 2972 2972 PDMDEV_ASSERT_DEVINS(pDevIns); 2973 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));2973 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 2974 2974 return NULL; 2975 2975 } … … 2980 2980 { 2981 2981 PDMDEV_ASSERT_DEVINS(pDevIns); 2982 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));2982 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 2983 2983 return VERR_ACCESS_DENIED; 2984 2984 } … … 2989 2989 { 2990 2990 PDMDEV_ASSERT_DEVINS(pDevIns); 2991 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));2991 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 2992 2992 return VERR_ACCESS_DENIED; 2993 2993 } … … 2998 2998 { 2999 2999 PDMDEV_ASSERT_DEVINS(pDevIns); 3000 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));3000 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 3001 3001 return VERR_ACCESS_DENIED; 3002 3002 } … … 3007 3007 { 3008 3008 PDMDEV_ASSERT_DEVINS(pDevIns); 3009 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));3009 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 3010 3010 return VERR_ACCESS_DENIED; 3011 3011 } … … 3016 3016 { 3017 3017 PDMDEV_ASSERT_DEVINS(pDevIns); 3018 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));3018 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 3019 3019 return VERR_ACCESS_DENIED; 3020 3020 } … … 3025 3025 { 3026 3026 PDMDEV_ASSERT_DEVINS(pDevIns); 3027 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));3027 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 3028 3028 return false; 3029 3029 } … … 3034 3034 { 3035 3035 PDMDEV_ASSERT_DEVINS(pDevIns); 3036 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));3036 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 3037 3037 NOREF(fEnable); 3038 3038 } … … 3044 3044 { 3045 3045 PDMDEV_ASSERT_DEVINS(pDevIns); 3046 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));3046 AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 3047 3047 } 3048 3048 -
trunk/src/VBox/VMM/PDMDevMiscHlp.cpp
r26160 r26165 52 52 { 53 53 LogFlow(("pdmR3PicHlp_SetInterruptFF: caller='%s'/%d: Setting local interrupt on LAPIC\n", 54 pDevIns->pReg->sz DeviceName, pDevIns->iInstance));54 pDevIns->pReg->szName, pDevIns->iInstance)); 55 55 /* Raise the LAPIC's LINT0 line instead of signaling the CPU directly. */ 56 56 pVM->pdm.s.Apic.pfnLocalInterruptR3(pVM->pdm.s.Apic.pDevInsR3, 0, 1); … … 61 61 62 62 LogFlow(("pdmR3PicHlp_SetInterruptFF: caller='%s'/%d: VM_FF_INTERRUPT_PIC %d -> 1\n", 63 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_PIC)));63 pDevIns->pReg->szName, pDevIns->iInstance, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_PIC))); 64 64 65 65 VMCPU_FF_SET(pVCpu, VMCPU_FF_INTERRUPT_PIC); … … 80 80 /* Raise the LAPIC's LINT0 line instead of signaling the CPU directly. */ 81 81 LogFlow(("pdmR3PicHlp_ClearInterruptFF: caller='%s'/%d: Clearing local interrupt on LAPIC\n", 82 pDevIns->pReg->sz DeviceName, pDevIns->iInstance));82 pDevIns->pReg->szName, pDevIns->iInstance)); 83 83 /* Lower the LAPIC's LINT0 line instead of signaling the CPU directly. */ 84 84 pVM->pdm.s.Apic.pfnLocalInterruptR3(pVM->pdm.s.Apic.pDevInsR3, 0, 0); … … 87 87 88 88 LogFlow(("pdmR3PicHlp_ClearInterruptFF: caller='%s'/%d: VM_FF_INTERRUPT_PIC %d -> 0\n", 89 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_PIC)));89 pDevIns->pReg->szName, pDevIns->iInstance, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_PIC))); 90 90 91 91 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_PIC); … … 120 120 AssertRelease(pRCHelpers); 121 121 LogFlow(("pdmR3PicHlp_GetRCHelpers: caller='%s'/%d: returns %RRv\n", 122 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pRCHelpers));122 pDevIns->pReg->szName, pDevIns->iInstance, pRCHelpers)); 123 123 return pRCHelpers; 124 124 } … … 135 135 AssertRelease(pR0Helpers); 136 136 LogFlow(("pdmR3PicHlp_GetR0Helpers: caller='%s'/%d: returns %RHv\n", 137 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pR0Helpers));137 pDevIns->pReg->szName, pDevIns->iInstance, pR0Helpers)); 138 138 return pR0Helpers; 139 139 } … … 174 174 175 175 LogFlow(("pdmR3ApicHlp_SetInterruptFF: caller='%s'/%d: VM_FF_INTERRUPT(%d) %d -> 1\n", 176 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, idCpu, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_APIC)));176 pDevIns->pReg->szName, pDevIns->iInstance, idCpu, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_APIC))); 177 177 178 178 switch (enmType) … … 209 209 210 210 LogFlow(("pdmR3ApicHlp_ClearInterruptFF: caller='%s'/%d: VM_FF_INTERRUPT(%d) %d -> 0\n", 211 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, idCpu, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_APIC)));211 pDevIns->pReg->szName, pDevIns->iInstance, idCpu, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_APIC))); 212 212 213 213 /* Note: NMI/SMI can't be cleared. */ … … 233 233 PDMDEV_ASSERT_DEVINS(pDevIns); 234 234 LogFlow(("pdmR3ApicHlp_ChangeFeature: caller='%s'/%d: version=%d\n", 235 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, (int)enmVersion));235 pDevIns->pReg->szName, pDevIns->iInstance, (int)enmVersion)); 236 236 switch (enmVersion) 237 237 { … … 288 288 AssertRelease(pRCHelpers); 289 289 LogFlow(("pdmR3ApicHlp_GetRCHelpers: caller='%s'/%d: returns %RRv\n", 290 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pRCHelpers));290 pDevIns->pReg->szName, pDevIns->iInstance, pRCHelpers)); 291 291 return pRCHelpers; 292 292 } … … 303 303 AssertRelease(pR0Helpers); 304 304 LogFlow(("pdmR3ApicHlp_GetR0Helpers: caller='%s'/%d: returns %RHv\n", 305 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pR0Helpers));305 pDevIns->pReg->szName, pDevIns->iInstance, pR0Helpers)); 306 306 return pR0Helpers; 307 307 } … … 312 312 { 313 313 PDMDEV_ASSERT_DEVINS(pDevIns); 314 LogFlow(("pdmR3ApicHlp_Lock: caller='%s'/%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));314 LogFlow(("pdmR3ApicHlp_Lock: caller='%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance)); 315 315 return &pDevIns->Internal.s.pVMR3->pdm.s.CritSect; 316 316 } … … 323 323 PVM pVM = pDevIns->Internal.s.pVMR3; 324 324 RTRCPTR RCPtr = MMHyperCCToRC(pVM, &pVM->pdm.s.CritSect); 325 LogFlow(("pdmR3ApicHlp_GetR0CritSect: caller='%s'/%d: return %RRv\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, RCPtr));325 LogFlow(("pdmR3ApicHlp_GetR0CritSect: caller='%s'/%d: return %RRv\n", pDevIns->pReg->szName, pDevIns->iInstance, RCPtr)); 326 326 return RCPtr; 327 327 } … … 334 334 PVM pVM = pDevIns->Internal.s.pVMR3; 335 335 RTR0PTR R0Ptr = MMHyperCCToR0(pVM, &pVM->pdm.s.CritSect); 336 LogFlow(("pdmR3ApicHlp_GetR0CritSect: caller='%s'/%d: return %RHv\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, R0Ptr));336 LogFlow(("pdmR3ApicHlp_GetR0CritSect: caller='%s'/%d: return %RHv\n", pDevIns->pReg->szName, pDevIns->iInstance, R0Ptr)); 337 337 return R0Ptr; 338 338 } … … 376 376 PVM pVM = pDevIns->Internal.s.pVMR3; 377 377 LogFlow(("pdmR3IoApicHlp_ApicBusDeliver: caller='%s'/%d: u8Dest=%RX8 u8DestMode=%RX8 u8DeliveryMode=%RX8 iVector=%RX8 u8Polarity=%RX8 u8TriggerMode=%RX8\n", 378 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, u8Dest, u8DestMode, u8DeliveryMode, iVector, u8Polarity, u8TriggerMode));378 pDevIns->pReg->szName, pDevIns->iInstance, u8Dest, u8DestMode, u8DeliveryMode, iVector, u8Polarity, u8TriggerMode)); 379 379 if (pVM->pdm.s.Apic.pfnBusDeliverR3) 380 380 return pVM->pdm.s.Apic.pfnBusDeliverR3(pVM->pdm.s.Apic.pDevInsR3, u8Dest, u8DestMode, u8DeliveryMode, iVector, u8Polarity, u8TriggerMode); … … 387 387 { 388 388 PDMDEV_ASSERT_DEVINS(pDevIns); 389 LogFlow(("pdmR3IoApicHlp_Lock: caller='%s'/%d: rc=%Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));389 LogFlow(("pdmR3IoApicHlp_Lock: caller='%s'/%d: rc=%Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 390 390 return pdmLockEx(pDevIns->Internal.s.pVMR3, rc); 391 391 } … … 396 396 { 397 397 PDMDEV_ASSERT_DEVINS(pDevIns); 398 LogFlow(("pdmR3IoApicHlp_Unlock: caller='%s'/%d:\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));398 LogFlow(("pdmR3IoApicHlp_Unlock: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance)); 399 399 pdmUnlock(pDevIns->Internal.s.pVMR3); 400 400 } … … 411 411 AssertRelease(pRCHelpers); 412 412 LogFlow(("pdmR3IoApicHlp_GetRCHelpers: caller='%s'/%d: returns %RRv\n", 413 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pRCHelpers));413 pDevIns->pReg->szName, pDevIns->iInstance, pRCHelpers)); 414 414 return pRCHelpers; 415 415 } … … 426 426 AssertRelease(pR0Helpers); 427 427 LogFlow(("pdmR3IoApicHlp_GetR0Helpers: caller='%s'/%d: returns %RHv\n", 428 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pR0Helpers));428 pDevIns->pReg->szName, pDevIns->iInstance, pR0Helpers)); 429 429 return pR0Helpers; 430 430 } … … 487 487 { 488 488 PDMDEV_ASSERT_DEVINS(pDevIns); 489 LogFlow(("pdmR3PciHlp_Lock: caller='%s'/%d: rc=%Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));489 LogFlow(("pdmR3PciHlp_Lock: caller='%s'/%d: rc=%Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 490 490 return pdmLockEx(pDevIns->Internal.s.pVMR3, rc); 491 491 } … … 496 496 { 497 497 PDMDEV_ASSERT_DEVINS(pDevIns); 498 LogFlow(("pdmR3PciHlp_Unlock: caller='%s'/%d:\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));498 LogFlow(("pdmR3PciHlp_Unlock: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance)); 499 499 pdmUnlock(pDevIns->Internal.s.pVMR3); 500 500 } … … 511 511 AssertRelease(pRCHelpers); 512 512 LogFlow(("pdmR3IoApicHlp_GetGCHelpers: caller='%s'/%d: returns %RRv\n", 513 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pRCHelpers));513 pDevIns->pReg->szName, pDevIns->iInstance, pRCHelpers)); 514 514 return pRCHelpers; 515 515 } … … 526 526 AssertRelease(pR0Helpers); 527 527 LogFlow(("pdmR3IoApicHlp_GetR0Helpers: caller='%s'/%d: returns %RHv\n", 528 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pR0Helpers));528 pDevIns->pReg->szName, pDevIns->iInstance, pR0Helpers)); 529 529 return pR0Helpers; 530 530 } … … 560 560 { 561 561 PDMDEV_ASSERT_DEVINS(pDevIns); 562 LogFlow(("pdmR3HpetHlp_SetLegacyMode: caller='%s'/%d: fActivate=%d\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, fActivate));562 LogFlow(("pdmR3HpetHlp_SetLegacyMode: caller='%s'/%d: fActivate=%d\n", pDevIns->pReg->szName, pDevIns->iInstance, fActivate)); 563 563 return 0; 564 564 } … … 569 569 { 570 570 PDMDEV_ASSERT_DEVINS(pDevIns); 571 LogFlow(("pdmR3HpetHlp_Lock: caller='%s'/%d: rc=%Rrc\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));571 LogFlow(("pdmR3HpetHlp_Lock: caller='%s'/%d: rc=%Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 572 572 return pdmLockEx(pDevIns->Internal.s.pVMR3, rc); 573 573 } … … 578 578 { 579 579 PDMDEV_ASSERT_DEVINS(pDevIns); 580 LogFlow(("pdmR3HpetHlp_Unlock: caller='%s'/%d:\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));580 LogFlow(("pdmR3HpetHlp_Unlock: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance)); 581 581 pdmUnlock(pDevIns->Internal.s.pVMR3); 582 582 } … … 593 593 AssertRelease(pRCHelpers); 594 594 LogFlow(("pdmR3HpetHlp_GetGCHelpers: caller='%s'/%d: returns %RRv\n", 595 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pRCHelpers));595 pDevIns->pReg->szName, pDevIns->iInstance, pRCHelpers)); 596 596 return pRCHelpers; 597 597 } … … 608 608 AssertRelease(pR0Helpers); 609 609 LogFlow(("pdmR3HpetHlp_GetR0Helpers: caller='%s'/%d: returns %RHv\n", 610 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, pR0Helpers));610 pDevIns->pReg->szName, pDevIns->iInstance, pR0Helpers)); 611 611 return pR0Helpers; 612 612 } -
trunk/src/VBox/VMM/PDMDevice.cpp
r26164 r26165 187 187 { 188 188 /* Get the device name. */ 189 char szName[sizeof(paDevs[0].pDev->pReg->sz DeviceName)];189 char szName[sizeof(paDevs[0].pDev->pReg->szName)]; 190 190 rc = CFGMR3GetName(pCur, szName, sizeof(szName)); 191 191 AssertMsgRCReturn(rc, ("Configuration error: device name is too long (or something)! rc=%Rrc\n", rc), rc); … … 302 302 { 303 303 AssertMsgFailed(("Failed to allocate %d bytes of instance data for device '%s'. rc=%Rrc\n", 304 cb, paDevs[i].pDev->pReg->sz DeviceName, rc));304 cb, paDevs[i].pDev->pReg->szName, rc)); 305 305 return rc; 306 306 } … … 366 366 */ 367 367 paDevs[i].pDev->cInstances++; 368 Log(("PDM: Constructing device '%s' instance %d...\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance));368 Log(("PDM: Constructing device '%s' instance %d...\n", pDevIns->pReg->szName, pDevIns->iInstance)); 369 369 rc = pDevIns->pReg->pfnConstruct(pDevIns, pDevIns->iInstance, pDevIns->pCfgHandle); 370 370 if (RT_FAILURE(rc)) 371 371 { 372 LogRel(("PDM: Failed to construct '%s'/%d! %Rra\n", pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));372 LogRel(("PDM: Failed to construct '%s'/%d! %Rra\n", pDevIns->pReg->szName, pDevIns->iInstance, rc)); 373 373 paDevs[i].pDev->cInstances--; 374 374 /* because we're damn lazy right now, we'll say that the destructor will be called even if the constructor fails. */ … … 410 410 { 411 411 AssertMsgFailed(("InitComplete on device '%s'/%d failed with rc=%Rrc\n", 412 pDevIns->pReg->sz DeviceName, pDevIns->iInstance, rc));412 pDevIns->pReg->szName, pDevIns->iInstance, rc)); 413 413 return rc; 414 414 } … … 437 437 for (PPDMDEV pDev = pVM->pdm.s.pDevs; pDev; pDev = pDev->pNext) 438 438 if ( pDev->cchName == cchName 439 && !strcmp(pDev->pReg->sz DeviceName, pszName))439 && !strcmp(pDev->pReg->szName, pszName)) 440 440 return pDev; 441 441 return NULL; … … 612 612 VERR_PDM_UNKNOWN_DEVREG_VERSION); 613 613 614 AssertMsgReturn( pReg->sz DeviceName[0]615 && strlen(pReg->sz DeviceName) < sizeof(pReg->szDeviceName),616 ("Invalid name '%s'\n", pReg->sz DeviceName),614 AssertMsgReturn( pReg->szName[0] 615 && strlen(pReg->szName) < sizeof(pReg->szName), 616 ("Invalid name '%s'\n", pReg->szName), 617 617 VERR_PDM_INVALID_DEVICE_REGISTRATION); 618 618 AssertMsgReturn( !(pReg->fFlags & PDM_DEVREG_FLAGS_RC) 619 619 || ( pReg->szRCMod[0] 620 620 && strlen(pReg->szRCMod) < sizeof(pReg->szRCMod)), 621 ("Invalid GC module name '%s' - (Device %s)\n", pReg->szRCMod, pReg->sz DeviceName),621 ("Invalid GC module name '%s' - (Device %s)\n", pReg->szRCMod, pReg->szName), 622 622 VERR_PDM_INVALID_DEVICE_REGISTRATION); 623 623 AssertMsgReturn( !(pReg->fFlags & PDM_DEVREG_FLAGS_R0) 624 624 || ( pReg->szR0Mod[0] 625 625 && strlen(pReg->szR0Mod) < sizeof(pReg->szR0Mod)), 626 ("Invalid R0 module name '%s' - (Device %s)\n", pReg->szR0Mod, pReg->sz DeviceName),626 ("Invalid R0 module name '%s' - (Device %s)\n", pReg->szR0Mod, pReg->szName), 627 627 VERR_PDM_INVALID_DEVICE_REGISTRATION); 628 628 AssertMsgReturn((pReg->fFlags & PDM_DEVREG_FLAGS_HOST_BITS_MASK) == PDM_DEVREG_FLAGS_HOST_BITS_DEFAULT, 629 ("Invalid host bits flags! fFlags=%#x (Device %s)\n", pReg->fFlags, pReg->sz DeviceName),629 ("Invalid host bits flags! fFlags=%#x (Device %s)\n", pReg->fFlags, pReg->szName), 630 630 VERR_PDM_INVALID_DEVICE_HOST_BITS); 631 631 AssertMsgReturn((pReg->fFlags & PDM_DEVREG_FLAGS_GUEST_BITS_MASK), 632 ("Invalid guest bits flags! fFlags=%#x (Device %s)\n", pReg->fFlags, pReg->sz DeviceName),632 ("Invalid guest bits flags! fFlags=%#x (Device %s)\n", pReg->fFlags, pReg->szName), 633 633 VERR_PDM_INVALID_DEVICE_REGISTRATION); 634 634 AssertMsgReturn(pReg->fClass, 635 ("No class! (Device %s)\n", pReg->sz DeviceName),635 ("No class! (Device %s)\n", pReg->szName), 636 636 VERR_PDM_INVALID_DEVICE_REGISTRATION); 637 637 AssertMsgReturn(pReg->cMaxInstances > 0, 638 ("Max instances %u! (Device %s)\n", pReg->cMaxInstances, pReg->sz DeviceName),638 ("Max instances %u! (Device %s)\n", pReg->cMaxInstances, pReg->szName), 639 639 VERR_PDM_INVALID_DEVICE_REGISTRATION); 640 640 AssertMsgReturn(pReg->cbInstance <= (uint32_t)(pReg->fFlags & (PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0) ? 96 * _1K : _1M), 641 ("Instance size %d bytes! (Device %s)\n", pReg->cbInstance, pReg->sz DeviceName),641 ("Instance size %d bytes! (Device %s)\n", pReg->cbInstance, pReg->szName), 642 642 VERR_PDM_INVALID_DEVICE_REGISTRATION); 643 643 AssertMsgReturn(pReg->pfnConstruct, 644 ("No constructore! (Device %s)\n", pReg->sz DeviceName),644 ("No constructore! (Device %s)\n", pReg->szName), 645 645 VERR_PDM_INVALID_DEVICE_REGISTRATION); 646 646 AssertLogRelMsgReturn((pReg->fFlags & PDM_DEVREG_FLAGS_GUEST_BITS_MASK) == PDM_DEVREG_FLAGS_GUEST_BITS_DEFAULT, 647 ("PDM: Rejected device '%s' because it didn't match the guest bits.\n", pReg->sz DeviceName),647 ("PDM: Rejected device '%s' because it didn't match the guest bits.\n", pReg->szName), 648 648 VERR_PDM_INVALID_DEVICE_GUEST_BITS); 649 649 AssertLogRelMsg(pReg->u32VersionEnd == PDM_DEVREG_VERSION, 650 ("u32VersionEnd=%#x, expected %#x. (sz DeviceName=%s)\n",651 pReg->u32VersionEnd, PDM_DEVREG_VERSION, pReg->sz DeviceName));650 ("u32VersionEnd=%#x, expected %#x. (szName=%s)\n", 651 pReg->u32VersionEnd, PDM_DEVREG_VERSION, pReg->szName)); 652 652 653 653 /* … … 658 658 PPDMDEV pDev = pRegCB->pVM->pdm.s.pDevs; 659 659 for (; pDev; pDevPrev = pDev, pDev = pDev->pNext) 660 AssertMsgReturn(strcmp(pDev->pReg->sz DeviceName, pReg->szDeviceName),661 ("Device '%s' already exists\n", pReg->sz DeviceName),660 AssertMsgReturn(strcmp(pDev->pReg->szName, pReg->szName), 661 ("Device '%s' already exists\n", pReg->szName), 662 662 VERR_PDM_DEVICE_NAME_CLASH); 663 663 … … 672 672 pDev->pInstances = NULL; 673 673 pDev->pReg = pReg; 674 pDev->cchName = (uint32_t)strlen(pReg->sz DeviceName);674 pDev->cchName = (uint32_t)strlen(pReg->szName); 675 675 676 676 if (pDevPrev) … … 678 678 else 679 679 pRegCB->pVM->pdm.s.pDevs = pDev; 680 Log(("PDM: Registered device '%s'\n", pReg->sz DeviceName));680 Log(("PDM: Registered device '%s'\n", pReg->szName)); 681 681 return VINF_SUCCESS; 682 682 } … … 705 705 { 706 706 if ( pDev->cchName == cchDevice 707 && !memcmp(pDev->pReg->sz DeviceName, pszDevice, cchDevice))707 && !memcmp(pDev->pReg->szName, pszDevice, cchDevice)) 708 708 { 709 709 /* -
trunk/src/VBox/VMM/PDMDriver.cpp
r26163 r26165 502 502 pNew, pDrv->pReg->szDriverName, pNew->iInstance, 503 503 pLun->iLun, 504 pLun->pDevIns ? pLun->pDevIns->pReg->sz DeviceName : pLun->pUsbIns->pReg->szDeviceName,504 pLun->pDevIns ? pLun->pDevIns->pReg->szName : pLun->pUsbIns->pReg->szName, 505 505 pLun->pDevIns ? pLun->pDevIns->iInstance : pLun->pUsbIns->iInstance, 506 506 pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szDriverName : "", pDrvAbove ? pDrvAbove->iInstance : -1)); -
trunk/src/VBox/VMM/PGMSavedState.cpp
r26160 r26165 290 290 AssertLogRelReturn(id != 0, VERR_SSM_DATA_UNIT_FORMAT_CHANGED); 291 291 292 char szDevName[RT_SIZEOFMEMB(PDMDEVREG, sz DeviceName)];292 char szDevName[RT_SIZEOFMEMB(PDMDEVREG, szName)]; 293 293 rc = SSMR3GetStrZ(pSSM, szDevName, sizeof(szDevName)); 294 294 AssertLogRelRCReturn(rc, rc); … … 627 627 pMmio2->idSavedState = id; 628 628 SSMR3PutU8(pSSM, id); 629 SSMR3PutStrZ(pSSM, pMmio2->pDevInsR3->pReg->sz DeviceName);629 SSMR3PutStrZ(pSSM, pMmio2->pDevInsR3->pReg->szName); 630 630 SSMR3PutU32(pSSM, pMmio2->pDevInsR3->iInstance); 631 631 SSMR3PutU8(pSSM, pMmio2->iRegion); … … 672 672 AssertLogRelReturn(id != 0, VERR_SSM_DATA_UNIT_FORMAT_CHANGED); 673 673 674 char szDevName[RT_SIZEOFMEMB(PDMDEVREG, sz DeviceName)];674 char szDevName[RT_SIZEOFMEMB(PDMDEVREG, szName)]; 675 675 rc = SSMR3GetStrZ(pSSM, szDevName, sizeof(szDevName)); 676 676 AssertLogRelRCReturn(rc, rc); … … 698 698 && pMmio2->iRegion == iRegion 699 699 && pMmio2->pDevInsR3->iInstance == uInstance 700 && !strcmp(pMmio2->pDevInsR3->pReg->sz DeviceName, szDevName))700 && !strcmp(pMmio2->pDevInsR3->pReg->szName, szDevName)) 701 701 { 702 702 pMmio2->idSavedState = id;
Note:
See TracChangeset
for help on using the changeset viewer.
