Changeset 32120 in vbox for trunk/src/VBox/Main/xml
- Timestamp:
- Aug 31, 2010 9:58:36 AM (15 years ago)
- svn:sync-xref-src-repo-rev:
- 65395
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/xml/Settings.cpp
r32063 r32120 1549 1549 pointingHidType(PointingHidType_PS2Mouse), 1550 1550 keyboardHidType(KeyboardHidType_PS2Keyboard), 1551 chipsetType(ChipsetType_PIIX3), 1551 1552 clipboardMode(ClipboardMode_Bidirectional), 1552 1553 ulMemoryBalloonSize(0), … … 1596 1597 && (fAccelerate3D == h.fAccelerate3D) 1597 1598 && (fAccelerate2DVideo == h.fAccelerate2DVideo) 1598 && (firmwareType == h.firmwareType) 1599 && (firmwareType == h.firmwareType) 1599 1600 && (pointingHidType == h.pointingHidType) 1600 1601 && (keyboardHidType == h.keyboardHidType) 1602 && (chipsetType == h.chipsetType) 1601 1603 && (vrdpSettings == h.vrdpSettings) 1602 1604 && (biosSettings == h.biosSettings) … … 2351 2353 N_("Invalid value '%s' in HID/Pointing/@type"), 2352 2354 strHidType.c_str()); 2355 } 2356 } 2357 else if (pelmHwChild->nameEquals("Chipset")) 2358 { 2359 Utf8Str strChipsetType; 2360 if (pelmHwChild->getAttributeValue("type", strChipsetType)) 2361 { 2362 if (strChipsetType == "PIIX3") 2363 hw.chipsetType = ChipsetType_PIIX3; 2364 else if (strChipsetType == "ICH9") 2365 hw.chipsetType = ChipsetType_ICH9; 2366 else 2367 throw ConfigFileError(this, 2368 pelmHwChild, 2369 N_("Invalid value '%s' in Chipset/@type"), 2370 strChipsetType.c_str()); 2353 2371 } 2354 2372 } … … 3282 3300 } 3283 3301 3302 if ( (m->sv >= SettingsVersion_v1_11) 3303 ) 3304 { 3305 xml::ElementNode *pelmChipset = pelmHardware->createChild("Chipset"); 3306 const char *pcszChipset; 3307 3308 switch (hw.chipsetType) 3309 { 3310 case ChipsetType_PIIX3: pcszChipset = "PIIX3"; break; 3311 case ChipsetType_ICH9: pcszChipset = "ICH9"; break; 3312 default: Assert(false); pcszChipset = "PIIX3"; break; 3313 } 3314 pelmChipset->setAttribute("Type", pcszChipset); 3315 } 3316 3284 3317 xml::ElementNode *pelmBoot = pelmHardware->createChild("Boot"); 3285 3318 for (BootOrderMap::const_iterator it = hw.mapBootOrder.begin(); … … 4418 4451 } 4419 4452 } 4420
Note:
See TracChangeset
for help on using the changeset viewer.