Changeset 31690 in vbox
- Timestamp:
- Aug 16, 2010 11:58:02 AM (15 years ago)
- svn:sync-xref-src-repo-rev:
- 64833
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/xml/Settings.cpp
r31615 r31690 3108 3108 pelmMachineChild->getAttributeValue("password", machineUserData.strTeleporterPassword); 3109 3109 } 3110 else if (pelmMachineChild->nameEquals("FaultTolerance")) 3111 { 3112 Utf8Str strFaultToleranceSate; 3113 if (pelmMachineChild->getAttributeValue("state", strFaultToleranceSate)) 3114 { 3115 if (strFaultToleranceSate == "source") 3116 machineUserData.enmFaultToleranceState = FaultToleranceState_Source; 3117 else 3118 if (strFaultToleranceSate == "target") 3119 machineUserData.enmFaultToleranceState = FaultToleranceState_Target; 3120 else 3121 machineUserData.enmFaultToleranceState = FaultToleranceState_Inactive; 3122 } 3123 pelmMachineChild->getAttributeValue("port", machineUserData.uFaultTolerancePort); 3124 pelmMachineChild->getAttributeValue("address", machineUserData.strFaultToleranceAddress); 3125 pelmMachineChild->getAttributeValue("interval", machineUserData.uFaultToleranceInterval); 3126 } 3110 3127 else if (pelmMachineChild->nameEquals("MediaRegistry")) 3111 3128 readMediaRegistry(*pelmMachineChild, mediaRegistry); … … 4009 4026 pelmTeleporter->setAttribute("address", machineUserData.strTeleporterAddress); 4010 4027 pelmTeleporter->setAttribute("password", machineUserData.strTeleporterPassword); 4028 } 4029 4030 if ( m->sv >= SettingsVersion_v1_11 4031 && ( machineUserData.enmFaultToleranceState != FaultToleranceState_Inactive 4032 || machineUserData.uFaultTolerancePort 4033 || machineUserData.uFaultToleranceInterval 4034 || !machineUserData.strFaultToleranceAddress.isEmpty() 4035 ) 4036 ) 4037 { 4038 xml::ElementNode *pelmFaultTolerance = elmMachine.createChild("FaultTolerance"); 4039 switch (machineUserData.enmFaultToleranceState) 4040 { 4041 case FaultToleranceState_Inactive: 4042 pelmFaultTolerance->setAttribute("state", "inactive"); 4043 break; 4044 case FaultToleranceState_Source: 4045 pelmFaultTolerance->setAttribute("state", "source"); 4046 break; 4047 case FaultToleranceState_Target: 4048 pelmFaultTolerance->setAttribute("state", "target"); 4049 break; 4050 } 4051 4052 pelmFaultTolerance->setAttribute("port", machineUserData.uFaultTolerancePort); 4053 pelmFaultTolerance->setAttribute("address", machineUserData.strFaultToleranceAddress); 4054 pelmFaultTolerance->setAttribute("interval", machineUserData.uFaultToleranceInterval); 4011 4055 } 4012 4056 … … 4144 4188 if (m->sv < SettingsVersion_v1_11) 4145 4189 { 4146 // VirtualBox 3.3 adds HD audio, CPU priorities and per-machine media registries4190 // VirtualBox 3.3 adds HD audio, CPU priorities, fault tolerance and per-machine media registries 4147 4191 if ( hardwareMachine.audioAdapter.controllerType == AudioControllerType_HDA 4148 4192 || hardwareMachine.ulCpuPriority != 100 4193 || machineUserData.enmFaultToleranceState != FaultToleranceState_Inactive 4194 || machineUserData.uFaultTolerancePort 4195 || machineUserData.uFaultToleranceInterval 4196 || !machineUserData.strFaultToleranceAddress.isEmpty() 4149 4197 || mediaRegistry.llHardDisks.size() 4150 4198 || mediaRegistry.llDvdImages.size()
Note:
See TracChangeset
for help on using the changeset viewer.