Changeset 107227 in vbox for trunk/src/VBox/VMM/VMMR3/PDM.cpp
- Timestamp:
- Dec 4, 2024 3:20:14 PM (6 weeks ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMR3/PDM.cpp
r107113 r107227 1031 1031 { 1032 1032 PVMCPU pVCpu = pVM->apCpusR3[idCpu]; 1033 #if defined(VBOX_VMM_TARGET_ARMV8)1033 #ifdef VBOX_VMM_TARGET_ARMV8 1034 1034 SSMR3PutU32(pSSM, VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_IRQ)); 1035 1035 SSMR3PutU32(pSSM, VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_FIQ)); 1036 #el se1036 #elif defined(VBOX_VMM_TARGET_X86) 1037 1037 SSMR3PutU32(pSSM, VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC)); 1038 1038 SSMR3PutU32(pSSM, VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_PIC)); 1039 #else 1040 # error "port me" 1039 1041 #endif 1040 1042 SSMR3PutU32(pSSM, VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_NMI)); … … 1066 1068 { 1067 1069 PVMCPU pVCpu = pVM->apCpusR3[idCpu]; 1068 # if defined(VBOX_VMM_TARGET_ARMV8)1070 # ifdef VBOX_VMM_TARGET_ARMV8 1069 1071 LogFlow(("pdmR3LoadPrep: VCPU %u %s%s\n", idCpu, 1070 1072 VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_IRQ) ? " VMCPU_FF_INTERRUPT_IRQ" : "", 1071 1073 VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_FIQ) ? " VMCPU_FF_INTERRUPT_FIQ" : "")); 1072 # else1074 # elif defined(VBOX_VMM_TARGET_X86) 1073 1075 LogFlow(("pdmR3LoadPrep: VCPU %u %s%s\n", idCpu, 1074 1076 VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC) ? " VMCPU_FF_INTERRUPT_APIC" : "", 1075 1077 VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_PIC) ? " VMCPU_FF_INTERRUPT_PIC" : "")); 1076 #endif 1078 # else 1079 # error "port me" 1080 # endif 1077 1081 } 1078 1082 #endif … … 1090 1094 { 1091 1095 PVMCPU pVCpu = pVM->apCpusR3[idCpu]; 1092 #if defined(VBOX_VMM_TARGET_ARMV8)1096 #ifdef VBOX_VMM_TARGET_ARMV8 1093 1097 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_IRQ); 1094 1098 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_FIQ); 1095 #el se1099 #elif defined(VBOX_VMM_TARGET_X86) 1096 1100 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_APIC); 1097 1101 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_PIC); 1102 #else 1103 # error "port me" 1098 1104 #endif 1099 1105 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI); … … 1157 1163 return VERR_SSM_DATA_UNIT_FORMAT_CHANGED; 1158 1164 } 1159 #if defined(VBOX_VMM_TARGET_ARMV8)1165 #ifdef VBOX_VMM_TARGET_ARMV8 1160 1166 AssertLogRelMsg(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_IRQ), 1161 1167 ("VCPU%03u: VMCPU_FF_INTERRUPT_IRQ set! Devices shouldn't set interrupts during state restore...\n", idCpu)); 1162 1168 if (fInterruptPending) 1163 1169 VMCPU_FF_SET(pVCpu, VMCPU_FF_INTERRUPT_IRQ); 1164 #else 1170 1171 #elif defined(VBOX_VMM_TARGET_X86) 1165 1172 AssertLogRelMsg(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC), 1166 1173 ("VCPU%03u: VMCPU_FF_INTERRUPT_APIC set! Devices shouldn't set interrupts during state restore...\n", idCpu)); 1167 1174 if (fInterruptPending) 1168 1175 VMCPU_FF_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC); 1176 #else 1177 # error "port me" 1169 1178 #endif 1170 1179 … … 1179 1188 return VERR_SSM_DATA_UNIT_FORMAT_CHANGED; 1180 1189 } 1181 #if defined(VBOX_VMM_TARGET_ARMV8)1190 #ifdef VBOX_VMM_TARGET_ARMV8 1182 1191 AssertLogRelMsg(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_FIQ), 1183 1192 ("VCPU%03u: VMCPU_FF_INTERRUPT_FIQ set! Devices shouldn't set interrupts during state restore...\n", idCpu)); 1184 1193 if (fInterruptPending) 1185 1194 VMCPU_FF_SET(pVCpu, VMCPU_FF_INTERRUPT_FIQ); 1186 #else 1195 1196 #elif defined(VBOX_VMM_TARGET_X86) 1187 1197 AssertLogRelMsg(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_PIC), 1188 1198 ("VCPU%03u: VMCPU_FF_INTERRUPT_PIC set! Devices shouldn't set interrupts during state restore...\n", idCpu)); 1189 1199 if (fInterruptPending) 1190 1200 VMCPU_FF_SET(pVCpu, VMCPU_FF_INTERRUPT_PIC); 1201 #else 1202 # error "port me" 1191 1203 #endif 1192 1204 … … 1730 1742 VMMR3_INT_DECL(void) PDMR3ResetCpu(PVMCPU pVCpu) 1731 1743 { 1732 #if defined(VBOX_VMM_TARGET_ARMV8)1744 #ifdef VBOX_VMM_TARGET_ARMV8 1733 1745 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_IRQ); 1734 1746 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_FIQ); 1735 #el se1747 #elif defined(VBOX_VMM_TARGET_X86) 1736 1748 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_APIC); 1737 1749 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_PIC); 1750 #else 1751 # error "port me" 1738 1752 #endif 1739 1753 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI);
Note:
See TracChangeset
for help on using the changeset viewer.