Changeset 37869 in vbox for trunk/src/VBox/Main
- Timestamp:
- Jul 11, 2011 12:42:46 PM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 72766
- Location:
- trunk/src/VBox/Main/xml
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/xml/Settings.cpp
r37824 r37869 838 838 pcszVersion = "1.12"; 839 839 m->sv = SettingsVersion_v1_12; 840 break;840 break; 841 841 842 842 default: … … 844 844 pcszVersion = "1.7"; 845 845 m->sv = SettingsVersion_v1_7; 846 break;846 break; 847 847 } 848 848 … … 3467 3467 switch (hw.firmwareType) 3468 3468 { 3469 case FirmwareType_EFI: pcszFirmware = "EFI"; break;3470 case FirmwareType_EFI32: pcszFirmware = "EFI32"; break;3471 case FirmwareType_EFI64: pcszFirmware = "EFI64"; break;3469 case FirmwareType_EFI: pcszFirmware = "EFI"; break; 3470 case FirmwareType_EFI32: pcszFirmware = "EFI32"; break; 3471 case FirmwareType_EFI64: pcszFirmware = "EFI64"; break; 3472 3472 case FirmwareType_EFIDUAL: pcszFirmware = "EFIDUAL"; break; 3473 default: pcszFirmware = "None"; break;3473 default: pcszFirmware = "None"; break; 3474 3474 } 3475 3475 pelmFirmware->setAttribute("type", pcszFirmware); … … 3791 3791 if (nic.nat.strNetwork.length()) 3792 3792 pelmNAT->setAttribute("network", nic.nat.strNetwork); 3793 break;3793 break; 3794 3794 3795 3795 case NetworkAttachmentType_Bridged: 3796 3796 pelmAdapter->createChild("BridgedInterface")->setAttribute("name", nic.strBridgedName); 3797 break;3797 break; 3798 3798 3799 3799 case NetworkAttachmentType_Internal: 3800 3800 pelmAdapter->createChild("InternalNetwork")->setAttribute("name", nic.strInternalNetworkName); 3801 break;3801 break; 3802 3802 3803 3803 case NetworkAttachmentType_HostOnly: 3804 3804 pelmAdapter->createChild("HostOnlyInterface")->setAttribute("name", nic.strHostOnlyName); 3805 break;3805 break; 3806 3806 3807 3807 default: /*case NetworkAttachmentType_Null:*/ 3808 break;3808 break; 3809 3809 } 3810 3810 } … … 3895 3895 case AudioControllerType_AC97: 3896 3896 default: 3897 pcszController = "AC97"; break; 3897 pcszController = "AC97"; 3898 break; 3898 3899 } 3899 3900 pelmAudio->setAttribute("controller", pcszController); … … 4090 4091 pelmPF->setAttribute("guestport", (*rule).u16GuestPort); 4091 4092 } 4092 break;4093 break; 4093 4094 4094 4095 case NetworkAttachmentType_Bridged: 4095 4096 if (fEnabled || !nic.strBridgedName.isEmpty()) 4096 4097 elmParent.createChild("BridgedInterface")->setAttribute("name", nic.strBridgedName); 4097 break;4098 break; 4098 4099 4099 4100 case NetworkAttachmentType_Internal: 4100 4101 if (fEnabled || !nic.strInternalNetworkName.isEmpty()) 4101 4102 elmParent.createChild("InternalNetwork")->setAttribute("name", nic.strInternalNetworkName); 4102 break;4103 break; 4103 4104 4104 4105 case NetworkAttachmentType_HostOnly: 4105 4106 if (fEnabled || !nic.strHostOnlyName.isEmpty()) 4106 4107 elmParent.createChild("HostOnlyInterface")->setAttribute("name", nic.strHostOnlyName); 4107 break;4108 break; 4108 4109 4109 4110 case NetworkAttachmentType_Generic: … … 4121 4122 } 4122 4123 } 4123 break;4124 break; 4124 4125 4125 4126 default: /*case NetworkAttachmentType_Null:*/ 4126 break;4127 break; 4127 4128 } 4128 4129 } … … 4235 4236 if (att.fNonRotational) 4236 4237 pelmDevice->setAttribute("nonrotational", att.fNonRotational); 4237 break;4238 break; 4238 4239 4239 4240 case DeviceType_DVD: … … 4242 4243 if (att.fTempEject) 4243 4244 pelmDevice->setAttribute("tempeject", att.fTempEject); 4244 break;4245 break; 4245 4246 4246 4247 case DeviceType_Floppy: 4247 4248 pcszType = "Floppy"; 4248 break;4249 break; 4249 4250 } 4250 4251 -
trunk/src/VBox/Main/xml/ovfreader.cpp
r36527 r37869 508 508 UINT16_MAX, 509 509 i.ulLineNumber); 510 break;510 break; 511 511 512 512 case ResourceType_Memory: // 4 … … 521 521 i.strAllocationUnits.c_str(), 522 522 i.ulLineNumber); 523 break;523 break; 524 524 525 525 case ResourceType_IDEController: // 5 … … 570 570 if (!pPrimaryIDEController) 571 571 pPrimaryIDEController = &vsys.mapControllers[i.ulInstanceID]; 572 break; 572 573 } 573 break;574 574 575 575 case ResourceType_ParallelSCSIHBA: // 6 SCSI controller … … 589 589 590 590 vsys.mapControllers[i.ulInstanceID] = hdc; 591 break; 591 592 } 592 break;593 593 594 594 case ResourceType_EthernetAdapter: // 10 … … 615 615 ea.strNetworkName = i.strConnection; 616 616 vsys.llEthernetAdapters.push_back(ea); 617 break; 617 618 } 618 break;619 619 620 620 case ResourceType_FloppyDrive: // 14 621 621 vsys.fHasFloppyDrive = true; // we have no additional information 622 break;622 break; 623 623 624 624 case ResourceType_CDDrive: // 15 … … 635 635 // VMware can't export ISOs, then we don't need to be able to import them right now. 636 636 vsys.fHasCdromDrive = true; // we have no additional information 637 break;637 break; 638 638 639 639 case ResourceType_HardDisk: // 17 640 640 // handled separately in second loop below 641 break;641 break; 642 642 643 643 case ResourceType_OtherStorageDevice: // 20 SATA controller … … 668 668 ResourceType_OtherStorageDevice, 669 669 i.ulLineNumber); 670 break; 670 671 } 671 break;672 672 673 673 case ResourceType_USBController: // 23 … … 681 681 </Item> */ 682 682 vsys.fHasUsbController = true; // we have no additional information 683 break;683 break; 684 684 685 685 case ResourceType_SoundCard: // 35 … … 694 694 </Item> */ 695 695 vsys.strSoundCardType = i.strResourceSubType; 696 break;696 break; 697 697 698 698 default: … … 767 767 768 768 vsys.mapVirtualDisks[vd.strDiskId] = vd; 769 break; 769 770 } 770 break;771 default:break;771 default: 772 break; 772 773 } 773 774 }
Note:
See TracChangeset
for help on using the changeset viewer.