Index: /trunk/src/VBox/Main/ConsoleImpl2.cpp =================================================================== --- /trunk/src/VBox/Main/ConsoleImpl2.cpp (revision 29323) +++ /trunk/src/VBox/Main/ConsoleImpl2.cpp (revision 29324) @@ -303,6 +303,6 @@ Bstr bstr; -#define RC_CHECK() do { if (RT_FAILURE(rc)) { AssertMsgFailed(("rc=%Rrc\n", rc)); return rc; } } while (0) -#define H() do { if (FAILED(hrc)) { AssertMsgFailed(("hrc=%Rhrc\n", hrc)); return VERR_GENERAL_FAILURE; } } while (0) +#define RC_CHECK() AssertMsgReturn(RT_SUCCESS(rc), ("rc=%Rrc\n", rc), rc) +#define H() AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_GENERAL_FAILURE) /* @@ -310,21 +310,21 @@ */ ComPtr virtualBox; - hrc = pMachine->COMGETTER(Parent)(virtualBox.asOutParam()); H(); + hrc = pMachine->COMGETTER(Parent)(virtualBox.asOutParam()); H(); ComPtr host; - hrc = virtualBox->COMGETTER(Host)(host.asOutParam()); H(); + hrc = virtualBox->COMGETTER(Host)(host.asOutParam()); H(); ComPtr systemProperties; - hrc = virtualBox->COMGETTER(SystemProperties)(systemProperties.asOutParam()); H(); + hrc = virtualBox->COMGETTER(SystemProperties)(systemProperties.asOutParam()); H(); ComPtr biosSettings; - hrc = pMachine->COMGETTER(BIOSSettings)(biosSettings.asOutParam()); H(); - - hrc = pMachine->COMGETTER(HardwareUUID)(bstr.asOutParam()); H(); + hrc = pMachine->COMGETTER(BIOSSettings)(biosSettings.asOutParam()); H(); + + hrc = pMachine->COMGETTER(HardwareUUID)(bstr.asOutParam()); H(); RTUUID HardwareUuid; - rc = RTUuidFromUtf16(&HardwareUuid, bstr.raw()); RC_CHECK(); + rc = RTUuidFromUtf16(&HardwareUuid, bstr.raw()); RC_CHECK(); ULONG cRamMBs; - hrc = pMachine->COMGETTER(MemorySize)(&cRamMBs); H(); + hrc = pMachine->COMGETTER(MemorySize)(&cRamMBs); H(); #if 0 /* enable to play with lots of memory. */ if (RTEnvExist("VBOX_RAM_SIZE")) @@ -335,17 +335,17 @@ ULONG cCpus = 1; - hrc = pMachine->COMGETTER(CPUCount)(&cCpus); H(); + hrc = pMachine->COMGETTER(CPUCount)(&cCpus); H(); Bstr osTypeId; - hrc = pMachine->COMGETTER(OSTypeId)(osTypeId.asOutParam()); H(); + hrc = pMachine->COMGETTER(OSTypeId)(osTypeId.asOutParam()); H(); BOOL fIOAPIC; - hrc = biosSettings->COMGETTER(IOAPICEnabled)(&fIOAPIC); H(); + hrc = biosSettings->COMGETTER(IOAPICEnabled)(&fIOAPIC); H(); ComPtr guestOSType; - hrc = virtualBox->GetGuestOSType(osTypeId, guestOSType.asOutParam()); H(); + hrc = virtualBox->GetGuestOSType(osTypeId, guestOSType.asOutParam()); H(); Bstr guestTypeFamilyId; - hrc = guestOSType->COMGETTER(FamilyId)(guestTypeFamilyId.asOutParam()); H(); + hrc = guestOSType->COMGETTER(FamilyId)(guestTypeFamilyId.asOutParam()); H(); BOOL fOsXGuest = guestTypeFamilyId == Bstr("MacOS"); @@ -360,17 +360,17 @@ * Set the root (and VMM) level values. */ - hrc = pMachine->COMGETTER(Name)(bstr.asOutParam()); H(); - rc = CFGMR3InsertStringW(pRoot, "Name", bstr.raw()); RC_CHECK(); - rc = CFGMR3InsertBytes(pRoot, "UUID", &HardwareUuid, sizeof(HardwareUuid)); RC_CHECK(); - rc = CFGMR3InsertInteger(pRoot, "RamSize", cbRam); RC_CHECK(); - rc = CFGMR3InsertInteger(pRoot, "RamHoleSize", cbRamHole); RC_CHECK(); - rc = CFGMR3InsertInteger(pRoot, "NumCPUs", cCpus); RC_CHECK(); - rc = CFGMR3InsertInteger(pRoot, "TimerMillies", 10); RC_CHECK(); + hrc = pMachine->COMGETTER(Name)(bstr.asOutParam()); H(); + rc = CFGMR3InsertStringW(pRoot, "Name", bstr.raw()); RC_CHECK(); + rc = CFGMR3InsertBytes(pRoot, "UUID", &HardwareUuid, sizeof(HardwareUuid)); RC_CHECK(); + rc = CFGMR3InsertInteger(pRoot, "RamSize", cbRam); RC_CHECK(); + rc = CFGMR3InsertInteger(pRoot, "RamHoleSize", cbRamHole); RC_CHECK(); + rc = CFGMR3InsertInteger(pRoot, "NumCPUs", cCpus); RC_CHECK(); + rc = CFGMR3InsertInteger(pRoot, "TimerMillies", 10); RC_CHECK(); #ifdef VBOX_WITH_RAW_MODE - rc = CFGMR3InsertInteger(pRoot, "RawR3Enabled", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertInteger(pRoot, "RawR0Enabled", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertInteger(pRoot, "RawR3Enabled", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertInteger(pRoot, "RawR0Enabled", 1); /* boolean */ RC_CHECK(); /** @todo Config: RawR0, PATMEnabled and CSAMEnabled needs attention later. */ - rc = CFGMR3InsertInteger(pRoot, "PATMEnabled", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertInteger(pRoot, "CSAMEnabled", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertInteger(pRoot, "PATMEnabled", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertInteger(pRoot, "CSAMEnabled", 1); /* boolean */ RC_CHECK(); #endif @@ -407,6 +407,6 @@ LogRel(("Limiting CPUID leaf count for NT4 guests\n")); PCFGMNODE pCPUM; - rc = CFGMR3InsertNode(pRoot, "CPUM", &pCPUM); RC_CHECK(); - rc = CFGMR3InsertInteger(pCPUM, "NT4LeafLimit", true); RC_CHECK(); + rc = CFGMR3InsertNode(pRoot, "CPUM", &pCPUM); RC_CHECK(); + rc = CFGMR3InsertInteger(pCPUM, "NT4LeafLimit", true); RC_CHECK(); } @@ -418,6 +418,6 @@ LogRel(("Using MWAIT extensions\n")); PCFGMNODE pCPUM; - rc = CFGMR3InsertNode(pRoot, "CPUM", &pCPUM); RC_CHECK(); - rc = CFGMR3InsertInteger(pCPUM, "MWaitExtensions", true); RC_CHECK(); + rc = CFGMR3InsertNode(pRoot, "CPUM", &pCPUM); RC_CHECK(); + rc = CFGMR3InsertInteger(pCPUM, "MWaitExtensions", true); RC_CHECK(); } @@ -442,11 +442,11 @@ fHWVirtExEnabled = fHwVirtExtForced = TRUE; #endif /* !VBOX_WITH_RAW_MODE */ - rc = CFGMR3InsertInteger(pRoot, "HwVirtExtForced", fHwVirtExtForced); RC_CHECK(); + rc = CFGMR3InsertInteger(pRoot, "HwVirtExtForced", fHwVirtExtForced); RC_CHECK(); PCFGMNODE pHWVirtExt; - rc = CFGMR3InsertNode(pRoot, "HWVirtExt", &pHWVirtExt); RC_CHECK(); + rc = CFGMR3InsertNode(pRoot, "HWVirtExt", &pHWVirtExt); RC_CHECK(); if (fHWVirtExEnabled) { - rc = CFGMR3InsertInteger(pHWVirtExt, "Enabled", 1); RC_CHECK(); + rc = CFGMR3InsertInteger(pHWVirtExt, "Enabled", 1); RC_CHECK(); /* Indicate whether 64-bit guests are supported or not. */ @@ -456,14 +456,14 @@ BOOL fSupportsLongMode = false; hrc = host->GetProcessorFeature(ProcessorFeature_LongMode, - &fSupportsLongMode); H(); - hrc = guestOSType->COMGETTER(Is64Bit)(&fIs64BitGuest); H(); + &fSupportsLongMode); H(); + hrc = guestOSType->COMGETTER(Is64Bit)(&fIs64BitGuest); H(); if (fSupportsLongMode && fIs64BitGuest) { - rc = CFGMR3InsertInteger(pHWVirtExt, "64bitEnabled", 1); RC_CHECK(); + rc = CFGMR3InsertInteger(pHWVirtExt, "64bitEnabled", 1); RC_CHECK(); #if ARCH_BITS == 32 /* The recompiler must use VBoxREM64 (32-bit host only). */ PCFGMNODE pREM; - rc = CFGMR3InsertNode(pRoot, "REM", &pREM); RC_CHECK(); - rc = CFGMR3InsertInteger(pREM, "64bitEnabled", 1); RC_CHECK(); + rc = CFGMR3InsertNode(pRoot, "REM", &pREM); RC_CHECK(); + rc = CFGMR3InsertInteger(pREM, "64bitEnabled", 1); RC_CHECK(); #endif } @@ -471,5 +471,5 @@ else { - rc = CFGMR3InsertInteger(pHWVirtExt, "64bitEnabled", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pHWVirtExt, "64bitEnabled", 0); RC_CHECK(); } #endif @@ -486,5 +486,5 @@ * We may want to consider adding more guest OSes (Solaris) later on. */ - rc = CFGMR3InsertInteger(pHWVirtExt, "TPRPatchingEnabled", 1); RC_CHECK(); + rc = CFGMR3InsertInteger(pHWVirtExt, "TPRPatchingEnabled", 1); RC_CHECK(); } } @@ -493,33 +493,33 @@ BOOL fHWVirtExExclusive = true; hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_Exclusive, &fHWVirtExExclusive); H(); - rc = CFGMR3InsertInteger(pHWVirtExt, "Exclusive", fHWVirtExExclusive); RC_CHECK(); + rc = CFGMR3InsertInteger(pHWVirtExt, "Exclusive", fHWVirtExExclusive); RC_CHECK(); /* Nested paging (VT-x/AMD-V) */ BOOL fEnableNestedPaging = false; hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_NestedPaging, &fEnableNestedPaging); H(); - rc = CFGMR3InsertInteger(pHWVirtExt, "EnableNestedPaging", fEnableNestedPaging); RC_CHECK(); + rc = CFGMR3InsertInteger(pHWVirtExt, "EnableNestedPaging", fEnableNestedPaging); RC_CHECK(); /* Large pages; requires nested paging */ BOOL fEnableLargePages = false; hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_LargePages, &fEnableLargePages); H(); - rc = CFGMR3InsertInteger(pHWVirtExt, "EnableLargePages", fEnableLargePages); RC_CHECK(); + rc = CFGMR3InsertInteger(pHWVirtExt, "EnableLargePages", fEnableLargePages); RC_CHECK(); /* VPID (VT-x) */ BOOL fEnableVPID = false; - hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_VPID, &fEnableVPID); H(); - rc = CFGMR3InsertInteger(pHWVirtExt, "EnableVPID", fEnableVPID); RC_CHECK(); + hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_VPID, &fEnableVPID); H(); + rc = CFGMR3InsertInteger(pHWVirtExt, "EnableVPID", fEnableVPID); RC_CHECK(); /* Physical Address Extension (PAE) */ BOOL fEnablePAE = false; - hrc = pMachine->GetCPUProperty(CPUPropertyType_PAE, &fEnablePAE); H(); - rc = CFGMR3InsertInteger(pRoot, "EnablePAE", fEnablePAE); RC_CHECK(); + hrc = pMachine->GetCPUProperty(CPUPropertyType_PAE, &fEnablePAE); H(); + rc = CFGMR3InsertInteger(pRoot, "EnablePAE", fEnablePAE); RC_CHECK(); /* Synthetic CPU */ BOOL fSyntheticCpu = false; - hrc = pMachine->GetCPUProperty(CPUPropertyType_Synthetic, &fSyntheticCpu); H(); - rc = CFGMR3InsertInteger(pRoot, "SyntheticCpu", fSyntheticCpu); RC_CHECK(); + hrc = pMachine->GetCPUProperty(CPUPropertyType_Synthetic, &fSyntheticCpu); H(); + rc = CFGMR3InsertInteger(pRoot, "SyntheticCpu", fSyntheticCpu); RC_CHECK(); BOOL fPXEDebug; - hrc = biosSettings->COMGETTER(PXEDebugEnabled)(&fPXEDebug); H(); + hrc = biosSettings->COMGETTER(PXEDebugEnabled)(&fPXEDebug); H(); /* @@ -530,15 +530,15 @@ PCFGMNODE pDrivers; PCFGMNODE pMod; - rc = CFGMR3InsertNode(pRoot, "PDM", &pPDM); RC_CHECK(); - rc = CFGMR3InsertNode(pPDM, "Drivers", &pDrivers); RC_CHECK(); - rc = CFGMR3InsertNode(pDrivers, "VBoxC", &pMod); RC_CHECK(); + rc = CFGMR3InsertNode(pRoot, "PDM", &pPDM); RC_CHECK(); + rc = CFGMR3InsertNode(pPDM, "Drivers", &pDrivers); RC_CHECK(); + rc = CFGMR3InsertNode(pDrivers, "VBoxC", &pMod); RC_CHECK(); #ifdef VBOX_WITH_XPCOM // VBoxC is located in the components subdirectory char szPathVBoxC[RTPATH_MAX]; - rc = RTPathAppPrivateArch(szPathVBoxC, RTPATH_MAX - sizeof("/components/VBoxC")); AssertRC(rc); + rc = RTPathAppPrivateArch(szPathVBoxC, RTPATH_MAX - sizeof("/components/VBoxC")); AssertRC(rc); strcat(szPathVBoxC, "/components/VBoxC"); - rc = CFGMR3InsertString(pMod, "Path", szPathVBoxC); RC_CHECK(); + rc = CFGMR3InsertString(pMod, "Path", szPathVBoxC); RC_CHECK(); #else - rc = CFGMR3InsertString(pMod, "Path", "VBoxC"); RC_CHECK(); + rc = CFGMR3InsertString(pMod, "Path", "VBoxC"); RC_CHECK(); #endif @@ -548,20 +548,20 @@ PCFGMNODE pPDMAc; PCFGMNODE pPDMAcFile; - rc = CFGMR3InsertNode(pPDM, "AsyncCompletion", &pPDMAc); RC_CHECK(); - rc = CFGMR3InsertNode(pPDMAc, "File", &pPDMAcFile); RC_CHECK(); + rc = CFGMR3InsertNode(pPDM, "AsyncCompletion", &pPDMAc); RC_CHECK(); + rc = CFGMR3InsertNode(pPDMAc, "File", &pPDMAcFile); RC_CHECK(); /* Builtin I/O cache */ BOOL fIoCache = true; - hrc = pMachine->COMGETTER(IoCacheEnabled)(&fIoCache); H(); - rc = CFGMR3InsertInteger(pPDMAcFile, "CacheEnabled", fIoCache); RC_CHECK(); + hrc = pMachine->COMGETTER(IoCacheEnabled)(&fIoCache); H(); + rc = CFGMR3InsertInteger(pPDMAcFile, "CacheEnabled", fIoCache); RC_CHECK(); /* I/O cache size */ ULONG ioCacheSize = 5; - hrc = pMachine->COMGETTER(IoCacheSize)(&ioCacheSize); H(); - rc = CFGMR3InsertInteger(pPDMAcFile, "CacheSize", ioCacheSize * _1M); RC_CHECK(); + hrc = pMachine->COMGETTER(IoCacheSize)(&ioCacheSize); H(); + rc = CFGMR3InsertInteger(pPDMAcFile, "CacheSize", ioCacheSize * _1M); RC_CHECK(); /* Maximum I/O bandwidth */ ULONG ioBandwidthMax = 0; - hrc = pMachine->COMGETTER(IoBandwidthMax)(&ioBandwidthMax); H(); + hrc = pMachine->COMGETTER(IoBandwidthMax)(&ioBandwidthMax); H(); if (ioBandwidthMax != 0) { @@ -582,13 +582,13 @@ PCFGMNODE pNetBootCfg = NULL; /* /Devices/pcbios/0/Config/NetBoot/ */ - rc = CFGMR3InsertNode(pRoot, "Devices", &pDevices); RC_CHECK(); + rc = CFGMR3InsertNode(pRoot, "Devices", &pDevices); RC_CHECK(); /* * PC Arch. */ - rc = CFGMR3InsertNode(pDevices, "pcarch", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "pcarch", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); /* @@ -596,47 +596,47 @@ */ LONG64 timeOffset; - hrc = biosSettings->COMGETTER(TimeOffset)(&timeOffset); H(); + hrc = biosSettings->COMGETTER(TimeOffset)(&timeOffset); H(); PCFGMNODE pTMNode; - rc = CFGMR3InsertNode(pRoot, "TM", &pTMNode); RC_CHECK(); - rc = CFGMR3InsertInteger(pTMNode, "UTCOffset", timeOffset * 1000000); RC_CHECK(); + rc = CFGMR3InsertNode(pRoot, "TM", &pTMNode); RC_CHECK(); + rc = CFGMR3InsertInteger(pTMNode, "UTCOffset", timeOffset * 1000000); RC_CHECK(); /* * DMA */ - rc = CFGMR3InsertNode(pDevices, "8237A", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "8237A", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); /* * PCI buses. */ - rc = CFGMR3InsertNode(pDevices, "pci", &pDev); /* piix3 */ RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "IOAPIC", fIOAPIC); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "pci", &pDev); /* piix3 */ RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "IOAPIC", fIOAPIC); RC_CHECK(); #if 0 /* enable this to test PCI bridging */ - rc = CFGMR3InsertNode(pDevices, "pcibridge", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 14); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIBusNo", 0);/* -> pci[0] */ RC_CHECK(); - - rc = CFGMR3InsertNode(pDev, "1", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 1); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIBusNo", 1);/* ->pcibridge[0] */ RC_CHECK(); - - rc = CFGMR3InsertNode(pDev, "2", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 3); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIBusNo", 1);/* ->pcibridge[0] */ RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "pcibridge", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 14); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIBusNo", 0);/* -> pci[0] */ RC_CHECK(); + + rc = CFGMR3InsertNode(pDev, "1", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 1); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIBusNo", 1);/* ->pcibridge[0] */ RC_CHECK(); + + rc = CFGMR3InsertNode(pDev, "2", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 3); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIBusNo", 1);/* ->pcibridge[0] */ RC_CHECK(); #endif @@ -650,5 +650,5 @@ #ifdef VBOX_WITH_HPET /* Other guests may wish to use HPET too, but MacOS X not functional without it */ - hrc = pMachine->COMGETTER(HpetEnabled)(&fHpetEnabled); H(); + hrc = pMachine->COMGETTER(HpetEnabled)(&fHpetEnabled); H(); /* so always enable HPET in extended profile */ fHpetEnabled |= fOsXGuest; @@ -658,7 +658,7 @@ if (fHpetEnabled) { - rc = CFGMR3InsertNode(pDevices, "hpet", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "hpet", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); } @@ -675,10 +675,10 @@ { Bstr tmpStr2; - rc = CFGMR3InsertNode(pDevices, "smc", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); - rc = getSmcDeviceKey(pMachine, tmpStr2.asOutParam()); RC_CHECK(); - rc = CFGMR3InsertString(pCfg, "DeviceKey", Utf8Str(tmpStr2).raw()); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "smc", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = getSmcDeviceKey(pMachine, tmpStr2.asOutParam()); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "DeviceKey", Utf8Str(tmpStr2).raw()); RC_CHECK(); } @@ -695,7 +695,7 @@ if (fLpcEnabled) { - rc = CFGMR3InsertNode(pDevices, "lpc", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "lpc", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); } @@ -703,39 +703,39 @@ * PS/2 keyboard & mouse. */ - rc = CFGMR3InsertNode(pDevices, "pckbd", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); - - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "KeyboardQueue"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "QueueSize", 64); RC_CHECK(); - - rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL1); RC_CHECK(); - rc = CFGMR3InsertString(pLunL1, "Driver", "MainKeyboard"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL1, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "pckbd", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "KeyboardQueue"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "QueueSize", 64); RC_CHECK(); + + rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL1); RC_CHECK(); + rc = CFGMR3InsertString(pLunL1, "Driver", "MainKeyboard"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL1, "Config", &pCfg); RC_CHECK(); Keyboard *pKeyboard = pConsole->mKeyboard; - rc = CFGMR3InsertInteger(pCfg, "Object", (uintptr_t)pKeyboard); RC_CHECK(); - - rc = CFGMR3InsertNode(pInst, "LUN#1", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "MouseQueue"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "QueueSize", 128); RC_CHECK(); - - rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL1); RC_CHECK(); - rc = CFGMR3InsertString(pLunL1, "Driver", "MainMouse"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL1, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Object", (uintptr_t)pKeyboard); RC_CHECK(); + + rc = CFGMR3InsertNode(pInst, "LUN#1", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "MouseQueue"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "QueueSize", 128); RC_CHECK(); + + rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL1); RC_CHECK(); + rc = CFGMR3InsertString(pLunL1, "Driver", "MainMouse"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL1, "Config", &pCfg); RC_CHECK(); Mouse *pMouse = pConsole->mMouse; - rc = CFGMR3InsertInteger(pCfg, "Object", (uintptr_t)pMouse); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Object", (uintptr_t)pMouse); RC_CHECK(); /* * i8254 Programmable Interval Timer And Dummy Speaker */ - rc = CFGMR3InsertNode(pDevices, "i8254", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "i8254", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); #ifdef DEBUG - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); #endif @@ -743,8 +743,8 @@ * i8259 Programmable Interrupt Controller. */ - rc = CFGMR3InsertNode(pDevices, "i8259", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "i8259", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); /* @@ -753,10 +753,10 @@ * thus only single insert */ - rc = CFGMR3InsertNode(pDevices, "apic", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "IOAPIC", fIOAPIC); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "NumCPUs", cCpus); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "apic", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "IOAPIC", fIOAPIC); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "NumCPUs", cCpus); RC_CHECK(); if (fIOAPIC) @@ -765,8 +765,8 @@ * I/O Advanced Programmable Interrupt Controller. */ - rc = CFGMR3InsertNode(pDevices, "ioapic", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "ioapic", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); } @@ -774,30 +774,30 @@ * RTC MC146818. */ - rc = CFGMR3InsertNode(pDevices, "mc146818", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "mc146818", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); BOOL fRTCUseUTC; - hrc = pMachine->COMGETTER(RTCUseUTC)(&fRTCUseUTC); H(); - rc = CFGMR3InsertInteger(pCfg, "UseUTC", fRTCUseUTC ? 1 : 0); RC_CHECK(); + hrc = pMachine->COMGETTER(RTCUseUTC)(&fRTCUseUTC); H(); + rc = CFGMR3InsertInteger(pCfg, "UseUTC", fRTCUseUTC ? 1 : 0); RC_CHECK(); /* * VGA. */ - rc = CFGMR3InsertNode(pDevices, "vga", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 2); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "vga", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 2); RC_CHECK(); Assert(!afPciDeviceNo[2]); afPciDeviceNo[2] = true; - rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); ULONG cVRamMBs; - hrc = pMachine->COMGETTER(VRAMSize)(&cVRamMBs); H(); - rc = CFGMR3InsertInteger(pCfg, "VRamSize", cVRamMBs * _1M); RC_CHECK(); + hrc = pMachine->COMGETTER(VRAMSize)(&cVRamMBs); H(); + rc = CFGMR3InsertInteger(pCfg, "VRamSize", cVRamMBs * _1M); RC_CHECK(); ULONG cMonitorCount; - hrc = pMachine->COMGETTER(MonitorCount)(&cMonitorCount); H(); - rc = CFGMR3InsertInteger(pCfg, "MonitorCount", cMonitorCount); RC_CHECK(); -#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE /* not safe here yet. */ /** @todo this needs fixing !!! No wonder VGA is slooooooooow on 32-bit darwin! */ - rc = CFGMR3InsertInteger(pCfg, "R0Enabled", fHWVirtExEnabled); RC_CHECK(); + hrc = pMachine->COMGETTER(MonitorCount)(&cMonitorCount); H(); + rc = CFGMR3InsertInteger(pCfg, "MonitorCount", cMonitorCount); RC_CHECK(); +#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE + rc = CFGMR3InsertInteger(pCfg, "R0Enabled", fHWVirtExEnabled); RC_CHECK(); #endif @@ -806,14 +806,14 @@ */ BOOL fFadeIn; - hrc = biosSettings->COMGETTER(LogoFadeIn)(&fFadeIn); H(); - rc = CFGMR3InsertInteger(pCfg, "FadeIn", fFadeIn ? 1 : 0); RC_CHECK(); + hrc = biosSettings->COMGETTER(LogoFadeIn)(&fFadeIn); H(); + rc = CFGMR3InsertInteger(pCfg, "FadeIn", fFadeIn ? 1 : 0); RC_CHECK(); BOOL fFadeOut; - hrc = biosSettings->COMGETTER(LogoFadeOut)(&fFadeOut); H(); - rc = CFGMR3InsertInteger(pCfg, "FadeOut", fFadeOut ? 1: 0); RC_CHECK(); + hrc = biosSettings->COMGETTER(LogoFadeOut)(&fFadeOut); H(); + rc = CFGMR3InsertInteger(pCfg, "FadeOut", fFadeOut ? 1: 0); RC_CHECK(); ULONG logoDisplayTime; - hrc = biosSettings->COMGETTER(LogoDisplayTime)(&logoDisplayTime); H(); - rc = CFGMR3InsertInteger(pCfg, "LogoTime", logoDisplayTime); RC_CHECK(); + hrc = biosSettings->COMGETTER(LogoDisplayTime)(&logoDisplayTime); H(); + rc = CFGMR3InsertInteger(pCfg, "LogoTime", logoDisplayTime); RC_CHECK(); Bstr logoImagePath; - hrc = biosSettings->COMGETTER(LogoImagePath)(logoImagePath.asOutParam()); H(); + hrc = biosSettings->COMGETTER(LogoImagePath)(logoImagePath.asOutParam()); H(); rc = CFGMR3InsertString(pCfg, "LogoFile", logoImagePath ? Utf8Str(logoImagePath).c_str() : ""); RC_CHECK(); @@ -830,5 +830,5 @@ default: iShowBootMenu = 2; break; } - rc = CFGMR3InsertInteger(pCfg, "ShowBootMenu", iShowBootMenu); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "ShowBootMenu", iShowBootMenu); RC_CHECK(); /* Custom VESA mode list */ @@ -838,11 +838,11 @@ char szExtraDataKey[sizeof("CustomVideoModeXX")]; RTStrPrintf(szExtraDataKey, sizeof(szExtraDataKey), "CustomVideoMode%u", iMode); - hrc = pMachine->GetExtraData(Bstr(szExtraDataKey), bstr.asOutParam()); H(); + hrc = pMachine->GetExtraData(Bstr(szExtraDataKey), bstr.asOutParam()); H(); if (bstr.isEmpty()) break; - rc = CFGMR3InsertStringW(pCfg, szExtraDataKey, bstr.raw()); RC_CHECK(); + rc = CFGMR3InsertStringW(pCfg, szExtraDataKey, bstr.raw()); RC_CHECK(); ++cModes; } - rc = CFGMR3InsertInteger(pCfg, "CustomVideoModes", cModes); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "CustomVideoModes", cModes); RC_CHECK(); /* VESA height reduction */ @@ -851,5 +851,5 @@ if (pFramebuffer) { - hrc = pFramebuffer->COMGETTER(HeightReduction)(&ulHeightReduction); H(); + hrc = pFramebuffer->COMGETTER(HeightReduction)(&ulHeightReduction); H(); } else @@ -858,12 +858,12 @@ ulHeightReduction = 0; } - rc = CFGMR3InsertInteger(pCfg, "HeightReduction", ulHeightReduction); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "HeightReduction", ulHeightReduction); RC_CHECK(); /* Attach the display. */ - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "MainDisplay"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "MainDisplay"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); Display *pDisplay = pConsole->mDisplay; - rc = CFGMR3InsertInteger(pCfg, "Object", (uintptr_t)pDisplay); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Object", (uintptr_t)pDisplay); RC_CHECK(); @@ -872,5 +872,5 @@ */ FirmwareType_T eFwType = FirmwareType_BIOS; - hrc = pMachine->COMGETTER(FirmwareType)(&eFwType); H(); + hrc = pMachine->COMGETTER(FirmwareType)(&eFwType); H(); #ifdef VBOX_WITH_EFI @@ -983,26 +983,26 @@ * EFI subtree. */ - rc = CFGMR3InsertNode(pDevices, "efi", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "RamSize", cbRam); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "RamHoleSize", cbRamHole); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "NumCPUs", cCpus); RC_CHECK(); - rc = CFGMR3InsertString(pCfg, "EfiRom", efiRomFile.raw()); RC_CHECK(); - rc = CFGMR3InsertString(pCfg, "BootArgs", Utf8Str(bootArgs).raw()); RC_CHECK(); - rc = CFGMR3InsertString(pCfg, "DeviceProps", Utf8Str(deviceProps).raw()); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "IOAPIC", fIOAPIC); RC_CHECK(); - rc = CFGMR3InsertBytes(pCfg, "UUID", &HardwareUuid,sizeof(HardwareUuid)); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "64BitEntry", f64BitEntry); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "GopMode", u32GopMode); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "UgaHorizontalResolution", u32UgaHorisontal); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "UgaVerticalResolution", u32UgaVertical); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "efi", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "RamSize", cbRam); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "RamHoleSize", cbRamHole); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "NumCPUs", cCpus); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "EfiRom", efiRomFile.raw()); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "BootArgs", Utf8Str(bootArgs).raw()); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "DeviceProps", Utf8Str(deviceProps).raw());RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "IOAPIC", fIOAPIC); RC_CHECK(); + rc = CFGMR3InsertBytes(pCfg, "UUID", &HardwareUuid,sizeof(HardwareUuid)); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "64BitEntry", f64BitEntry); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "GopMode", u32GopMode); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "UgaHorizontalResolution", u32UgaHorisontal); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "UgaVerticalResolution", u32UgaVertical); RC_CHECK(); /* For OS X guests we'll force passing host's DMI info to the guest */ if (fOsXGuest) { - rc = CFGMR3InsertInteger(pCfg, "DmiUseHostInfo", 1); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "DmiExposeMemoryTable", 1); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "DmiUseHostInfo", 1); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "DmiExposeMemoryTable", 1); RC_CHECK(); } } @@ -1013,5 +1013,5 @@ com::SafeIfaceArray ctrls; PCFGMNODE aCtrlNodes[StorageControllerType_LsiLogicSas + 1] = {}; - hrc = pMachine->COMGETTER(StorageControllers)(ComSafeArrayAsOutParam(ctrls)); H(); + hrc = pMachine->COMGETTER(StorageControllers)(ComSafeArrayAsOutParam(ctrls)); H(); for (size_t i = 0; i < ctrls.size(); ++i) @@ -1020,18 +1020,18 @@ StorageControllerType_T enmCtrlType; - rc = ctrls[i]->COMGETTER(ControllerType)(&enmCtrlType); H(); + rc = ctrls[i]->COMGETTER(ControllerType)(&enmCtrlType); H(); AssertRelease((unsigned)enmCtrlType < RT_ELEMENTS(aCtrlNodes)); StorageBus_T enmBus; - rc = ctrls[i]->COMGETTER(Bus)(&enmBus); H(); + rc = ctrls[i]->COMGETTER(Bus)(&enmBus); H(); Bstr controllerName; - rc = ctrls[i]->COMGETTER(Name)(controllerName.asOutParam()); H(); + rc = ctrls[i]->COMGETTER(Name)(controllerName.asOutParam()); H(); ULONG ulInstance = 999; - rc = ctrls[i]->COMGETTER(Instance)(&ulInstance); H(); + rc = ctrls[i]->COMGETTER(Instance)(&ulInstance); H(); IoBackendType_T enmIoBackend; - rc = ctrls[i]->COMGETTER(IoBackend)(&enmIoBackend); H(); + rc = ctrls[i]->COMGETTER(IoBackend)(&enmIoBackend); H(); /* /Devices// */ @@ -1040,5 +1040,5 @@ if (!pDev) { - rc = CFGMR3InsertNode(pDevices, pszCtrlDev, &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, pszCtrlDev, &pDev); RC_CHECK(); aCtrlNodes[enmCtrlType] = pDev; /* IDE variants are handled in the switch */ } @@ -1046,9 +1046,9 @@ /* /Devices/// */ PCFGMNODE pCtlInst = NULL; - rc = CFGMR3InsertNodeF(pDev, &pCtlInst, "%u", ulInstance); RC_CHECK(); + rc = CFGMR3InsertNodeF(pDev, &pCtlInst, "%u", ulInstance); RC_CHECK(); /* Device config: /Devices/// & /ditto/Config/ */ - rc = CFGMR3InsertInteger(pCtlInst, "Trusted", 1); RC_CHECK(); - rc = CFGMR3InsertNode(pCtlInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pCtlInst, "Trusted", 1); RC_CHECK(); + rc = CFGMR3InsertNode(pCtlInst, "Config", &pCfg); RC_CHECK(); switch (enmCtrlType) @@ -1056,17 +1056,17 @@ case StorageControllerType_LsiLogic: { - rc = CFGMR3InsertInteger(pCtlInst, "PCIDeviceNo", 20); RC_CHECK(); + rc = CFGMR3InsertInteger(pCtlInst, "PCIDeviceNo", 20); RC_CHECK(); Assert(!afPciDeviceNo[20]); afPciDeviceNo[20] = true; - rc = CFGMR3InsertInteger(pCtlInst, "PCIFunctionNo", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCtlInst, "PCIFunctionNo", 0); RC_CHECK(); /* Attach the status driver */ - rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); rc = CFGMR3InsertInteger(pCfg, "papLeds", (uintptr_t)&pConsole->mapStorageLeds[iLedScsi]); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); Assert(cLedScsi >= 16); - rc = CFGMR3InsertInteger(pCfg, "Last", 15); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Last", 15); RC_CHECK(); paLedDevType = &pConsole->maStorageDevType[iLedScsi]; break; @@ -1075,17 +1075,17 @@ case StorageControllerType_BusLogic: { - rc = CFGMR3InsertInteger(pCtlInst, "PCIDeviceNo", 21); RC_CHECK(); + rc = CFGMR3InsertInteger(pCtlInst, "PCIDeviceNo", 21); RC_CHECK(); Assert(!afPciDeviceNo[21]); afPciDeviceNo[21] = true; - rc = CFGMR3InsertInteger(pCtlInst, "PCIFunctionNo", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCtlInst, "PCIFunctionNo", 0); RC_CHECK(); /* Attach the status driver */ - rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); rc = CFGMR3InsertInteger(pCfg, "papLeds", (uintptr_t)&pConsole->mapStorageLeds[iLedScsi]); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); Assert(cLedScsi >= 16); - rc = CFGMR3InsertInteger(pCfg, "Last", 15); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Last", 15); RC_CHECK(); paLedDevType = &pConsole->maStorageDevType[iLedScsi]; break; @@ -1094,17 +1094,17 @@ case StorageControllerType_IntelAhci: { - rc = CFGMR3InsertInteger(pCtlInst, "PCIDeviceNo", 13); RC_CHECK(); + rc = CFGMR3InsertInteger(pCtlInst, "PCIDeviceNo", 13); RC_CHECK(); Assert(!afPciDeviceNo[13]); afPciDeviceNo[13] = true; - rc = CFGMR3InsertInteger(pCtlInst, "PCIFunctionNo", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCtlInst, "PCIFunctionNo", 0); RC_CHECK(); ULONG cPorts = 0; - hrc = ctrls[i]->COMGETTER(PortCount)(&cPorts); H(); - rc = CFGMR3InsertInteger(pCfg, "PortCount", cPorts); RC_CHECK(); + hrc = ctrls[i]->COMGETTER(PortCount)(&cPorts); H(); + rc = CFGMR3InsertInteger(pCfg, "PortCount", cPorts); RC_CHECK(); /* Needed configuration values for the bios. */ if (pBiosCfg) { - rc = CFGMR3InsertString(pBiosCfg, "SataHardDiskDevice", "ahci"); RC_CHECK(); + rc = CFGMR3InsertString(pBiosCfg, "SataHardDiskDevice", "ahci"); RC_CHECK(); } @@ -1117,20 +1117,20 @@ LONG lPortNumber = -1; - hrc = ctrls[i]->GetIDEEmulationPort(j, &lPortNumber); H(); - rc = CFGMR3InsertInteger(pCfg, s_apszConfig[j], lPortNumber); RC_CHECK(); + hrc = ctrls[i]->GetIDEEmulationPort(j, &lPortNumber); H(); + rc = CFGMR3InsertInteger(pCfg, s_apszConfig[j], lPortNumber); RC_CHECK(); if (pBiosCfg) { - rc = CFGMR3InsertInteger(pBiosCfg, s_apszBiosConfig[j], lPortNumber); RC_CHECK(); + rc = CFGMR3InsertInteger(pBiosCfg, s_apszBiosConfig[j], lPortNumber); RC_CHECK(); } } /* Attach the status driver */ - rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); AssertRelease(cPorts <= cLedSata); rc = CFGMR3InsertInteger(pCfg, "papLeds", (uintptr_t)&pConsole->mapStorageLeds[iLedSata]); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "Last", cPorts - 1); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Last", cPorts - 1); RC_CHECK(); paLedDevType = &pConsole->maStorageDevType[iLedSata]; break; @@ -1144,18 +1144,18 @@ * IDE (update this when the main interface changes) */ - rc = CFGMR3InsertInteger(pCtlInst, "PCIDeviceNo", 1); RC_CHECK(); + rc = CFGMR3InsertInteger(pCtlInst, "PCIDeviceNo", 1); RC_CHECK(); Assert(!afPciDeviceNo[1]); afPciDeviceNo[1] = true; - rc = CFGMR3InsertInteger(pCtlInst, "PCIFunctionNo", 1); RC_CHECK(); - rc = CFGMR3InsertString(pCfg, "Type", controllerString(enmCtrlType)); RC_CHECK(); + rc = CFGMR3InsertInteger(pCtlInst, "PCIFunctionNo", 1); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "Type", controllerString(enmCtrlType)); RC_CHECK(); /* Attach the status driver */ - rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); rc = CFGMR3InsertInteger(pCfg, "papLeds", (uintptr_t)&pConsole->mapStorageLeds[iLedIde]); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); Assert(cLedIde >= 4); - rc = CFGMR3InsertInteger(pCfg, "Last", 3); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Last", 3); RC_CHECK(); paLedDevType = &pConsole->maStorageDevType[iLedIde]; @@ -1173,17 +1173,17 @@ */ fFdcEnabled = true; - rc = CFGMR3InsertInteger(pCfg, "IRQ", 6); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "DMA", 2); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "MemMapped", 0 ); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "IOBase", 0x3f0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "IRQ", 6); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "DMA", 2); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "MemMapped", 0 ); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "IOBase", 0x3f0); RC_CHECK(); /* Attach the status driver */ - rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); rc = CFGMR3InsertInteger(pCfg, "papLeds", (uintptr_t)&pConsole->mapStorageLeds[iLedFloppy]); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); Assert(cLedFloppy >= 1); - rc = CFGMR3InsertInteger(pCfg, "Last", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Last", 0); RC_CHECK(); paLedDevType = &pConsole->maStorageDevType[iLedFloppy]; break; @@ -1192,19 +1192,19 @@ case StorageControllerType_LsiLogicSas: { - rc = CFGMR3InsertInteger(pCtlInst, "PCIDeviceNo", 22); RC_CHECK(); + rc = CFGMR3InsertInteger(pCtlInst, "PCIDeviceNo", 22); RC_CHECK(); Assert(!afPciDeviceNo[22]); afPciDeviceNo[22] = true; - rc = CFGMR3InsertInteger(pCtlInst, "PCIFunctionNo", 0); RC_CHECK(); - - rc = CFGMR3InsertString(pCfg, "ControllerType", "SAS1068"); RC_CHECK(); + rc = CFGMR3InsertInteger(pCtlInst, "PCIFunctionNo", 0); RC_CHECK(); + + rc = CFGMR3InsertString(pCfg, "ControllerType", "SAS1068"); RC_CHECK(); /* Attach the status driver */ - rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); rc = CFGMR3InsertInteger(pCfg, "papLeds", (uintptr_t)&pConsole->mapStorageLeds[iLedScsi]); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); Assert(cLedScsi >= 16); - rc = CFGMR3InsertInteger(pCfg, "Last", 15) ; RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Last", 15) ; RC_CHECK(); paLedDevType = &pConsole->maStorageDevType[iLedScsi]; break; @@ -1218,5 +1218,5 @@ com::SafeIfaceArray atts; hrc = pMachine->GetMediumAttachmentsOfController(controllerName, - ComSafeArrayAsOutParam(atts)); H(); + ComSafeArrayAsOutParam(atts)); H(); for (size_t j = 0; j < atts.size(); ++j) @@ -1236,5 +1236,5 @@ false /* fForceUnmount */, NULL /* pVM */, - paLedDevType); RC_CHECK(); + paLedDevType); RC_CHECK(); } H(); @@ -1249,12 +1249,12 @@ #endif PCFGMNODE pDevPCNet = NULL; /* PCNet-type devices */ - rc = CFGMR3InsertNode(pDevices, "pcnet", &pDevPCNet); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "pcnet", &pDevPCNet); RC_CHECK(); #ifdef VBOX_WITH_E1000 PCFGMNODE pDevE1000 = NULL; /* E1000-type devices */ - rc = CFGMR3InsertNode(pDevices, "e1000", &pDevE1000); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "e1000", &pDevE1000); RC_CHECK(); #endif #ifdef VBOX_WITH_VIRTIO PCFGMNODE pDevVirtioNet = NULL; /* Virtio network devices */ - rc = CFGMR3InsertNode(pDevices, "virtio-net", &pDevVirtioNet); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "virtio-net", &pDevVirtioNet); RC_CHECK(); #endif /* VBOX_WITH_VIRTIO */ std::list llBootNics; @@ -1262,7 +1262,7 @@ { ComPtr networkAdapter; - hrc = pMachine->GetNetworkAdapter(ulInstance, networkAdapter.asOutParam()); H(); + hrc = pMachine->GetNetworkAdapter(ulInstance, networkAdapter.asOutParam()); H(); BOOL fEnabled = FALSE; - hrc = networkAdapter->COMGETTER(Enabled)(&fEnabled); H(); + hrc = networkAdapter->COMGETTER(Enabled)(&fEnabled); H(); if (!fEnabled) continue; @@ -1273,5 +1273,5 @@ const char *pszAdapterName = "pcnet"; NetworkAdapterType_T adapterType; - hrc = networkAdapter->COMGETTER(AdapterType)(&adapterType); H(); + hrc = networkAdapter->COMGETTER(AdapterType)(&adapterType); H(); switch (adapterType) { @@ -1302,6 +1302,6 @@ } - rc = CFGMR3InsertNodeF(pDev, &pInst, "%u", ulInstance); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNodeF(pDev, &pInst, "%u", ulInstance); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); /* the first network card gets the PCI ID 3, the next 3 gets 8..10, * next 4 get 16..19. */ @@ -1327,13 +1327,13 @@ iPciDeviceNo = 3; #endif - rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", iPciDeviceNo); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", iPciDeviceNo); RC_CHECK(); Assert(!afPciDeviceNo[iPciDeviceNo]); afPciDeviceNo[iPciDeviceNo] = true; - rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE /* not safe here yet. */ if (pDev == pDevPCNet) { - rc = CFGMR3InsertInteger(pCfg, "R0Enabled", false); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "R0Enabled", false); RC_CHECK(); } #endif @@ -1347,5 +1347,5 @@ nic.mPciFn = 0; - hrc = networkAdapter->COMGETTER(BootPriority)(&nic.mBootPrio); H(); + hrc = networkAdapter->COMGETTER(BootPriority)(&nic.mBootPrio); H(); llBootNics.push_back(nic); @@ -1357,17 +1357,17 @@ { case NetworkAdapterType_Am79C970A: - rc = CFGMR3InsertInteger(pCfg, "Am79C973", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Am79C973", 0); RC_CHECK(); break; case NetworkAdapterType_Am79C973: - rc = CFGMR3InsertInteger(pCfg, "Am79C973", 1); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Am79C973", 1); RC_CHECK(); break; case NetworkAdapterType_I82540EM: - rc = CFGMR3InsertInteger(pCfg, "AdapterType", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "AdapterType", 0); RC_CHECK(); break; case NetworkAdapterType_I82543GC: - rc = CFGMR3InsertInteger(pCfg, "AdapterType", 1); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "AdapterType", 1); RC_CHECK(); break; case NetworkAdapterType_I82545EM: - rc = CFGMR3InsertInteger(pCfg, "AdapterType", 2); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "AdapterType", 2); RC_CHECK(); break; } @@ -1377,5 +1377,5 @@ */ Bstr macAddr; - hrc = networkAdapter->COMGETTER(MACAddress)(macAddr.asOutParam()); H(); + hrc = networkAdapter->COMGETTER(MACAddress)(macAddr.asOutParam()); H(); Assert(macAddr); Utf8Str macAddrUtf8 = macAddr; @@ -1395,5 +1395,5 @@ *pMac++ = ((c1 & 0x0f) << 4) | (c2 & 0x0f); } - rc = CFGMR3InsertBytes(pCfg, "MAC", &Mac, sizeof(Mac)); RC_CHECK(); + rc = CFGMR3InsertBytes(pCfg, "MAC", &Mac, sizeof(Mac)); RC_CHECK(); /* @@ -1401,6 +1401,6 @@ */ BOOL fCableConnected; - hrc = networkAdapter->COMGETTER(CableConnected)(&fCableConnected); H(); - rc = CFGMR3InsertInteger(pCfg, "CableConnected", fCableConnected ? 1 : 0); RC_CHECK(); + hrc = networkAdapter->COMGETTER(CableConnected)(&fCableConnected); H(); + rc = CFGMR3InsertInteger(pCfg, "CableConnected", fCableConnected ? 1 : 0); RC_CHECK(); /* @@ -1408,13 +1408,13 @@ */ ULONG ulLineSpeed; - hrc = networkAdapter->COMGETTER(LineSpeed)(&ulLineSpeed); H(); - rc = CFGMR3InsertInteger(pCfg, "LineSpeed", ulLineSpeed); RC_CHECK(); + hrc = networkAdapter->COMGETTER(LineSpeed)(&ulLineSpeed); H(); + rc = CFGMR3InsertInteger(pCfg, "LineSpeed", ulLineSpeed); RC_CHECK(); /* * Attach the status driver. */ - rc = CFGMR3InsertNode(pInst, "LUN#999", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "LUN#999", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); rc = CFGMR3InsertInteger(pCfg, "papLeds", (uintptr_t)&pConsole->mapNetworkLeds[ulInstance]); RC_CHECK(); @@ -1424,5 +1424,5 @@ rc = pConsole->configNetwork(pszAdapterName, ulInstance, 0, networkAdapter, pCfg, pLunL0, pInst, - false /*fAttachDetach*/); RC_CHECK(); + false /*fAttachDetach*/); RC_CHECK(); } @@ -1445,8 +1445,8 @@ PCFGMNODE pNetBtDevCfg; achBootIdx[0] = '0' + uBootIdx++; /* Boot device order. */ - rc = CFGMR3InsertNode(pNetBootCfg, achBootIdx, &pNetBtDevCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pNetBtDevCfg, "NIC", it->mInstance); RC_CHECK(); - rc = CFGMR3InsertInteger(pNetBtDevCfg, "PCIDeviceNo", it->mPciDev); RC_CHECK(); - rc = CFGMR3InsertInteger(pNetBtDevCfg, "PCIFunctionNo", it->mPciFn); RC_CHECK(); + rc = CFGMR3InsertNode(pNetBootCfg, achBootIdx, &pNetBtDevCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pNetBtDevCfg, "NIC", it->mInstance); RC_CHECK(); + rc = CFGMR3InsertInteger(pNetBtDevCfg, "PCIDeviceNo", it->mPciDev); RC_CHECK(); + rc = CFGMR3InsertInteger(pNetBtDevCfg, "PCIFunctionNo", it->mPciFn); RC_CHECK(); } } @@ -1455,54 +1455,54 @@ * Serial (UART) Ports */ - rc = CFGMR3InsertNode(pDevices, "serial", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "serial", &pDev); RC_CHECK(); for (ULONG ulInstance = 0; ulInstance < SchemaDefs::SerialPortCount; ++ulInstance) { ComPtr serialPort; - hrc = pMachine->GetSerialPort(ulInstance, serialPort.asOutParam()); H(); + hrc = pMachine->GetSerialPort(ulInstance, serialPort.asOutParam()); H(); BOOL fEnabled = FALSE; if (serialPort) - hrc = serialPort->COMGETTER(Enabled)(&fEnabled); H(); + hrc = serialPort->COMGETTER(Enabled)(&fEnabled); H(); if (!fEnabled) continue; - rc = CFGMR3InsertNodeF(pDev, &pInst, "%u", ulInstance); RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNodeF(pDev, &pInst, "%u", ulInstance); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); ULONG ulIRQ; - hrc = serialPort->COMGETTER(IRQ)(&ulIRQ); H(); - rc = CFGMR3InsertInteger(pCfg, "IRQ", ulIRQ); RC_CHECK(); + hrc = serialPort->COMGETTER(IRQ)(&ulIRQ); H(); + rc = CFGMR3InsertInteger(pCfg, "IRQ", ulIRQ); RC_CHECK(); ULONG ulIOBase; - hrc = serialPort->COMGETTER(IOBase)(&ulIOBase); H(); - rc = CFGMR3InsertInteger(pCfg, "IOBase", ulIOBase); RC_CHECK(); + hrc = serialPort->COMGETTER(IOBase)(&ulIOBase); H(); + rc = CFGMR3InsertInteger(pCfg, "IOBase", ulIOBase); RC_CHECK(); BOOL fServer; - hrc = serialPort->COMGETTER(Server)(&fServer); H(); - hrc = serialPort->COMGETTER(Path)(bstr.asOutParam()); H(); + hrc = serialPort->COMGETTER(Server)(&fServer); H(); + hrc = serialPort->COMGETTER(Path)(bstr.asOutParam()); H(); PortMode_T eHostMode; - hrc = serialPort->COMGETTER(HostMode)(&eHostMode); H(); + hrc = serialPort->COMGETTER(HostMode)(&eHostMode); H(); if (eHostMode != PortMode_Disconnected) { - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); if (eHostMode == PortMode_HostPipe) { - rc = CFGMR3InsertString(pLunL0, "Driver", "Char"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL1); RC_CHECK(); - rc = CFGMR3InsertString(pLunL1, "Driver", "NamedPipe"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL1, "Config", &pLunL2); RC_CHECK(); - rc = CFGMR3InsertStringW(pLunL2, "Location", bstr.raw()); RC_CHECK(); - rc = CFGMR3InsertInteger(pLunL2, "IsServer", fServer); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "Char"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL1); RC_CHECK(); + rc = CFGMR3InsertString(pLunL1, "Driver", "NamedPipe"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL1, "Config", &pLunL2); RC_CHECK(); + rc = CFGMR3InsertStringW(pLunL2, "Location", bstr.raw()); RC_CHECK(); + rc = CFGMR3InsertInteger(pLunL2, "IsServer", fServer); RC_CHECK(); } else if (eHostMode == PortMode_HostDevice) { - rc = CFGMR3InsertString(pLunL0, "Driver", "Host Serial"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pLunL1); RC_CHECK(); - rc = CFGMR3InsertStringW(pLunL1, "DevicePath", bstr.raw()); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "Host Serial"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pLunL1); RC_CHECK(); + rc = CFGMR3InsertStringW(pLunL1, "DevicePath", bstr.raw()); RC_CHECK(); } else if (eHostMode == PortMode_RawFile) { - rc = CFGMR3InsertString(pLunL0, "Driver", "Char"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL1); RC_CHECK(); - rc = CFGMR3InsertString(pLunL1, "Driver", "RawFile"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL1, "Config", &pLunL2); RC_CHECK(); - rc = CFGMR3InsertStringW(pLunL2, "Location", bstr.raw()); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "Char"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL1); RC_CHECK(); + rc = CFGMR3InsertString(pLunL1, "Driver", "RawFile"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL1, "Config", &pLunL2); RC_CHECK(); + rc = CFGMR3InsertStringW(pLunL2, "Location", bstr.raw()); RC_CHECK(); } } @@ -1512,31 +1512,31 @@ * Parallel (LPT) Ports */ - rc = CFGMR3InsertNode(pDevices, "parallel", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "parallel", &pDev); RC_CHECK(); for (ULONG ulInstance = 0; ulInstance < SchemaDefs::ParallelPortCount; ++ulInstance) { ComPtr parallelPort; - hrc = pMachine->GetParallelPort(ulInstance, parallelPort.asOutParam()); H(); + hrc = pMachine->GetParallelPort(ulInstance, parallelPort.asOutParam()); H(); BOOL fEnabled = FALSE; if (parallelPort) { - hrc = parallelPort->COMGETTER(Enabled)(&fEnabled); H(); + hrc = parallelPort->COMGETTER(Enabled)(&fEnabled); H(); } if (!fEnabled) continue; - rc = CFGMR3InsertNodeF(pDev, &pInst, "%u", ulInstance); RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNodeF(pDev, &pInst, "%u", ulInstance); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); ULONG ulIRQ; - hrc = parallelPort->COMGETTER(IRQ)(&ulIRQ); H(); - rc = CFGMR3InsertInteger(pCfg, "IRQ", ulIRQ); RC_CHECK(); + hrc = parallelPort->COMGETTER(IRQ)(&ulIRQ); H(); + rc = CFGMR3InsertInteger(pCfg, "IRQ", ulIRQ); RC_CHECK(); ULONG ulIOBase; - hrc = parallelPort->COMGETTER(IOBase)(&ulIOBase); H(); - rc = CFGMR3InsertInteger(pCfg, "IOBase", ulIOBase); RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "HostParallel"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL1); RC_CHECK(); - hrc = parallelPort->COMGETTER(Path)(bstr.asOutParam()); H(); - rc = CFGMR3InsertStringW(pLunL1, "DevicePath", bstr.raw()); RC_CHECK(); + hrc = parallelPort->COMGETTER(IOBase)(&ulIOBase); H(); + rc = CFGMR3InsertInteger(pCfg, "IOBase", ulIOBase); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "HostParallel"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL1); RC_CHECK(); + hrc = parallelPort->COMGETTER(Path)(bstr.asOutParam()); H(); + rc = CFGMR3InsertStringW(pLunL1, "DevicePath", bstr.raw()); RC_CHECK(); } @@ -1544,49 +1544,49 @@ * VMM Device */ - rc = CFGMR3InsertNode(pDevices, "VMMDev", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 4); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "VMMDev", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 4); RC_CHECK(); Assert(!afPciDeviceNo[4]); afPciDeviceNo[4] = true; - rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); Bstr hwVersion; - hrc = pMachine->COMGETTER(HardwareVersion)(hwVersion.asOutParam()); H(); + hrc = pMachine->COMGETTER(HardwareVersion)(hwVersion.asOutParam()); H(); if (hwVersion.compare(Bstr("1")) == 0) /* <= 2.0.x */ { - CFGMR3InsertInteger(pCfg, "HeapEnabled", 0); RC_CHECK(); + CFGMR3InsertInteger(pCfg, "HeapEnabled", 0); RC_CHECK(); } /* the VMM device's Main driver */ - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "HGCM"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "HGCM"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); VMMDev *pVMMDev = pConsole->mVMMDev; - rc = CFGMR3InsertInteger(pCfg, "Object", (uintptr_t)pVMMDev); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Object", (uintptr_t)pVMMDev); RC_CHECK(); /* * Attach the status driver. */ - rc = CFGMR3InsertNode(pInst, "LUN#999", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "LUN#999", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "MainStatus"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); rc = CFGMR3InsertInteger(pCfg, "papLeds", (uintptr_t)&pConsole->mapSharedFolderLed); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "Last", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "First", 0); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Last", 0); RC_CHECK(); /* * Audio Sniffer Device */ - rc = CFGMR3InsertNode(pDevices, "AudioSniffer", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "AudioSniffer", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); /* the Audio Sniffer device's Main driver */ - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "MainAudioSniffer"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "MainAudioSniffer"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); AudioSniffer *pAudioSniffer = pConsole->mAudioSniffer; - rc = CFGMR3InsertInteger(pCfg, "Object", (uintptr_t)pAudioSniffer); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Object", (uintptr_t)pAudioSniffer); RC_CHECK(); /* @@ -1595,12 +1595,12 @@ BOOL enabled; ComPtr audioAdapter; - hrc = pMachine->COMGETTER(AudioAdapter)(audioAdapter.asOutParam()); H(); + hrc = pMachine->COMGETTER(AudioAdapter)(audioAdapter.asOutParam()); H(); if (audioAdapter) - hrc = audioAdapter->COMGETTER(Enabled)(&enabled); H(); + hrc = audioAdapter->COMGETTER(Enabled)(&enabled); H(); if (enabled) { AudioControllerType_T audioController; - hrc = audioAdapter->COMGETTER(AudioController)(&audioController); H(); + hrc = audioAdapter->COMGETTER(AudioController)(&audioController); H(); switch (audioController) { @@ -1608,12 +1608,12 @@ { /* default: ICH AC97 */ - rc = CFGMR3InsertNode(pDevices, "ichac97", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "ichac97", &pDev); RC_CHECK(); rc = CFGMR3InsertNode(pDev, "0", &pInst); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* bool */ RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 5); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* bool */ RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 5); RC_CHECK(); Assert(!afPciDeviceNo[5]); afPciDeviceNo[5] = true; - rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); break; } @@ -1621,13 +1621,13 @@ { /* legacy SoundBlaster16 */ - rc = CFGMR3InsertNode(pDevices, "sb16", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* bool */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "IRQ", 5); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "DMA", 1); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "DMA16", 5); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "Port", 0x220); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "Version", 0x0405); RC_CHECK(); + rc = CFGMR3InsertNode(pDevices, "sb16", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* bool */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "IRQ", 5); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "DMA", 1); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "DMA16", 5); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Port", 0x220); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "Version", 0x0405); RC_CHECK(); break; } @@ -1635,15 +1635,15 @@ /* the Audio driver */ - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "AUDIO"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "AUDIO"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); AudioDriverType_T audioDriver; - hrc = audioAdapter->COMGETTER(AudioDriver)(&audioDriver); H(); + hrc = audioAdapter->COMGETTER(AudioDriver)(&audioDriver); H(); switch (audioDriver) { case AudioDriverType_Null: { - rc = CFGMR3InsertString(pCfg, "AudioDriver", "null"); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "AudioDriver", "null"); RC_CHECK(); break; } @@ -1652,5 +1652,5 @@ case AudioDriverType_WinMM: { - rc = CFGMR3InsertString(pCfg, "AudioDriver", "winmm"); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "AudioDriver", "winmm"); RC_CHECK(); break; } @@ -1658,5 +1658,5 @@ case AudioDriverType_DirectSound: { - rc = CFGMR3InsertString(pCfg, "AudioDriver", "dsound"); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "AudioDriver", "dsound"); RC_CHECK(); break; } @@ -1665,5 +1665,5 @@ case AudioDriverType_SolAudio: { - rc = CFGMR3InsertString(pCfg, "AudioDriver", "solaudio"); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "AudioDriver", "solaudio"); RC_CHECK(); break; } @@ -1673,5 +1673,5 @@ case AudioDriverType_ALSA: { - rc = CFGMR3InsertString(pCfg, "AudioDriver", "alsa"); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "AudioDriver", "alsa"); RC_CHECK(); break; } @@ -1680,5 +1680,5 @@ case AudioDriverType_Pulse: { - rc = CFGMR3InsertString(pCfg, "AudioDriver", "pulse"); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "AudioDriver", "pulse"); RC_CHECK(); break; } @@ -1688,5 +1688,5 @@ case AudioDriverType_OSS: { - rc = CFGMR3InsertString(pCfg, "AudioDriver", "oss"); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "AudioDriver", "oss"); RC_CHECK(); break; } @@ -1696,5 +1696,5 @@ case AudioDriverType_Pulse: { - rc = CFGMR3InsertString(pCfg, "AudioDriver", "pulse"); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "AudioDriver", "pulse"); RC_CHECK(); break; } @@ -1704,11 +1704,11 @@ case AudioDriverType_CoreAudio: { - rc = CFGMR3InsertString(pCfg, "AudioDriver", "coreaudio"); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "AudioDriver", "coreaudio"); RC_CHECK(); break; } #endif } - hrc = pMachine->COMGETTER(Name)(bstr.asOutParam()); H(); - rc = CFGMR3InsertStringW(pCfg, "StreamName", bstr.raw()); RC_CHECK(); + hrc = pMachine->COMGETTER(Name)(bstr.asOutParam()); H(); + rc = CFGMR3InsertStringW(pCfg, "StreamName", bstr.raw()); RC_CHECK(); } @@ -2002,5 +2002,5 @@ */ BOOL fACPI; - hrc = biosSettings->COMGETTER(ACPIEnabled)(&fACPI); H(); + hrc = biosSettings->COMGETTER(ACPIEnabled)(&fACPI); H(); if (fACPI) { @@ -2014,35 +2014,35 @@ fShowCpu = true; - hrc = pMachine->COMGETTER(CPUHotPlugEnabled)(&fCpuHotPlug); H(); - - rc = CFGMR3InsertNode(pDevices, "acpi", &pDev); RC_CHECK(); - rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); - rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "RamSize", cbRam); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "RamHoleSize", cbRamHole); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "NumCPUs", cCpus); RC_CHECK(); - - rc = CFGMR3InsertInteger(pCfg, "IOAPIC", fIOAPIC); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "FdcEnabled", fFdcEnabled); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "HpetEnabled", fHpetEnabled); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "SmcEnabled", fSmcEnabled); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "ShowRtc", fOsXGuest); RC_CHECK(); + hrc = pMachine->COMGETTER(CPUHotPlugEnabled)(&fCpuHotPlug); H(); + + rc = CFGMR3InsertNode(pDevices, "acpi", &pDev); RC_CHECK(); + rc = CFGMR3InsertNode(pDev, "0", &pInst); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "Trusted", 1); /* boolean */ RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "RamSize", cbRam); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "RamHoleSize", cbRamHole); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "NumCPUs", cCpus); RC_CHECK(); + + rc = CFGMR3InsertInteger(pCfg, "IOAPIC", fIOAPIC); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "FdcEnabled", fFdcEnabled); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "HpetEnabled", fHpetEnabled); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "SmcEnabled", fSmcEnabled); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "ShowRtc", fOsXGuest); RC_CHECK(); if (fOsXGuest && !llBootNics.empty()) { BootNic aNic = llBootNics.front(); uint32_t u32NicPciAddr = (aNic.mPciDev << 16) | aNic.mPciFn; - rc = CFGMR3InsertInteger(pCfg, "NicPciAddress", u32NicPciAddr); RC_CHECK(); - } - rc = CFGMR3InsertInteger(pCfg, "ShowCpu", fShowCpu); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "CpuHotPlug", fCpuHotPlug); RC_CHECK(); - rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 7); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "NicPciAddress", u32NicPciAddr); RC_CHECK(); + } + rc = CFGMR3InsertInteger(pCfg, "ShowCpu", fShowCpu); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "CpuHotPlug", fCpuHotPlug); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", 7); RC_CHECK(); Assert(!afPciDeviceNo[7]); afPciDeviceNo[7] = true; - rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); - - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "ACPIHost"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo", 0); RC_CHECK(); + + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "ACPIHost"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); /* Attach the dummy CPU drivers */ @@ -2053,5 +2053,5 @@ if (fCpuHotPlug) { - hrc = pMachine->GetCPUStatus(iCpuCurr, &fCpuAttached); H(); + hrc = pMachine->GetCPUStatus(iCpuCurr, &fCpuAttached); H(); } @@ -2252,18 +2252,18 @@ Bstr bstr; -#define RC_CHECK() do { if (RT_FAILURE(rc)) { AssertMsgFailed(("rc=%Rrc\n", rc)); return rc; } } while (0) -#define H() do { if (FAILED(hrc)) { AssertMsgFailed(("hrc=%Rhrc\n", hrc)); return VERR_GENERAL_FAILURE; } } while (0) +#define RC_CHECK() AssertMsgReturn(RT_SUCCESS(rc), ("rc=%Rrc\n", rc), rc) +#define H() AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_GENERAL_FAILURE) LONG lDev; - hrc = pMediumAtt->COMGETTER(Device)(&lDev); H(); + hrc = pMediumAtt->COMGETTER(Device)(&lDev); H(); LONG lPort; - hrc = pMediumAtt->COMGETTER(Port)(&lPort); H(); + hrc = pMediumAtt->COMGETTER(Port)(&lPort); H(); DeviceType_T lType; - hrc = pMediumAtt->COMGETTER(Type)(&lType); H(); + hrc = pMediumAtt->COMGETTER(Type)(&lType); H(); unsigned uLUN; PCFGMNODE pLunL0 = NULL; PCFGMNODE pCfg = NULL; - hrc = Console::convertBusPortDeviceToLun(enmBus, lPort, lDev, uLUN); H(); + hrc = Console::convertBusPortDeviceToLun(enmBus, lPort, lDev, uLUN); H(); /* First check if the LUN already exists. */ @@ -2307,19 +2307,19 @@ } - rc = CFGMR3InsertNodeF(pCtlInst, &pLunL0, "LUN#%u", uLUN); RC_CHECK(); + rc = CFGMR3InsertNodeF(pCtlInst, &pLunL0, "LUN#%u", uLUN); RC_CHECK(); /* SCSI has a another driver between device and block. */ if (enmBus == StorageBus_SCSI || enmBus == StorageBus_SAS) { - rc = CFGMR3InsertString(pLunL0, "Driver", "SCSI"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); - - rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "SCSI"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + + rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL0); RC_CHECK(); } ComPtr pMedium; - hrc = pMediumAtt->COMGETTER(Medium)(pMedium.asOutParam()); H(); + hrc = pMediumAtt->COMGETTER(Medium)(pMedium.asOutParam()); H(); BOOL fPassthrough; - hrc = pMediumAtt->COMGETTER(Passthrough)(&fPassthrough); H(); + hrc = pMediumAtt->COMGETTER(Passthrough)(&fPassthrough); H(); rc = configMedium(pLunL0, !!fPassthrough, @@ -2331,5 +2331,5 @@ pMedium, aMachineState, - phrc); RC_CHECK(); + phrc); RC_CHECK(); if (fAttachDetach) @@ -2337,5 +2337,5 @@ /* Attach the new driver. */ rc = PDMR3DeviceAttach(pVM, pcszDevice, 0, uLUN, - PDM_TACH_FLAGS_NOT_HOT_PLUG, NULL /*ppBase*/); RC_CHECK(); + PDM_TACH_FLAGS_NOT_HOT_PLUG, NULL /*ppBase*/); RC_CHECK(); /* There is no need to handle removable medium mounting, as we @@ -2368,6 +2368,6 @@ Bstr bstr; -#define RC_CHECK() do { if (RT_FAILURE(rc)) { AssertMsgFailed(("rc=%Rrc\n", rc)); return rc; } } while (0) -#define H() do { if (FAILED(hrc)) { AssertMsgFailed(("hrc=%Rhrc\n", hrc)); if (phrc) *phrc = hrc; return VERR_GENERAL_FAILURE; } } while (0) +#define RC_CHECK() AssertMsgReturn(RT_SUCCESS(rc), ("rc=%Rrc\n", rc), rc) +#define H() AssertMsgReturnStmt(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), if (phrc) *phrc = hrc, VERR_GENERAL_FAILURE) PCFGMNODE pLunL1 = NULL; @@ -2643,6 +2643,6 @@ Bstr bstr; -#define RC_CHECK() do { if (RT_FAILURE(rc)) { AssertMsgFailed(("rc=%Rrc\n", rc)); return rc; } } while (0) -#define H() do { if (FAILED(hrc)) { AssertMsgFailed(("hrc=%Rhrc\n", hrc)); return VERR_GENERAL_FAILURE; } } while (0) +#define RC_CHECK() AssertMsgReturn(RT_SUCCESS(rc), ("rc=%Rrc\n", rc), rc) +#define H() AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_GENERAL_FAILURE) /* @@ -2693,11 +2693,11 @@ { CFGMR3RemoveNode(pLunL0); - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "NetSniffer"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); - hrc = aNetworkAdapter->COMGETTER(TraceFile)(bstr.asOutParam()); H(); + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "NetSniffer"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + hrc = aNetworkAdapter->COMGETTER(TraceFile)(bstr.asOutParam()); H(); if (!bstr.isEmpty()) /* check convention for indicating default file. */ { - rc = CFGMR3InsertStringW(pCfg, "File", bstr.raw()); RC_CHECK(); + rc = CFGMR3InsertStringW(pCfg, "File", bstr.raw()); RC_CHECK(); } } @@ -2716,11 +2716,11 @@ { /* insert the sniffer filter driver. */ - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "NetSniffer"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); - hrc = aNetworkAdapter->COMGETTER(TraceFile)(bstr.asOutParam()); H(); + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "NetSniffer"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + hrc = aNetworkAdapter->COMGETTER(TraceFile)(bstr.asOutParam()); H(); if (!bstr.isEmpty()) /* check convention for indicating default file. */ { - rc = CFGMR3InsertStringW(pCfg, "File", bstr.raw()); RC_CHECK(); + rc = CFGMR3InsertStringW(pCfg, "File", bstr.raw()); RC_CHECK(); } } @@ -2728,5 +2728,5 @@ Bstr networkName, trunkName, trunkType; NetworkAttachmentType_T eAttachmentType; - hrc = aNetworkAdapter->COMGETTER(AttachmentType)(&eAttachmentType); H(); + hrc = aNetworkAdapter->COMGETTER(AttachmentType)(&eAttachmentType); H(); switch (eAttachmentType) { @@ -2737,40 +2737,40 @@ { ComPtr natDriver; - hrc = aNetworkAdapter->COMGETTER(NatDriver)(natDriver.asOutParam()); H(); + hrc = aNetworkAdapter->COMGETTER(NatDriver)(natDriver.asOutParam()); H(); if (fSniffer) { - rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL0); RC_CHECK(); } else { - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); - } - rc = CFGMR3InsertString(pLunL0, "Driver", "NAT"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + } + rc = CFGMR3InsertString(pLunL0, "Driver", "NAT"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); /* Configure TFTP prefix and boot filename. */ - hrc = virtualBox->COMGETTER(HomeFolder)(bstr.asOutParam()); H(); + hrc = virtualBox->COMGETTER(HomeFolder)(bstr.asOutParam()); H(); if (!bstr.isEmpty()) { rc = CFGMR3InsertStringF(pCfg, "TFTPPrefix", "%ls%c%s", bstr.raw(), RTPATH_DELIMITER, "TFTP"); RC_CHECK(); } - hrc = pMachine->COMGETTER(Name)(bstr.asOutParam()); H(); - rc = CFGMR3InsertStringF(pCfg, "BootFile", "%ls.pxe", bstr.raw()); RC_CHECK(); - - hrc = natDriver->COMGETTER(Network)(bstr.asOutParam()); H(); + hrc = pMachine->COMGETTER(Name)(bstr.asOutParam()); H(); + rc = CFGMR3InsertStringF(pCfg, "BootFile", "%ls.pxe", bstr.raw()); RC_CHECK(); + + hrc = natDriver->COMGETTER(Network)(bstr.asOutParam()); H(); if (!bstr.isEmpty()) { - rc = CFGMR3InsertStringW(pCfg, "Network", bstr.raw()); RC_CHECK(); + rc = CFGMR3InsertStringW(pCfg, "Network", bstr.raw()); RC_CHECK(); } else { ULONG uSlot; - hrc = aNetworkAdapter->COMGETTER(Slot)(&uSlot); H(); - rc = CFGMR3InsertStringF(pCfg, "Network", "10.0.%d.0/24", uSlot+2); RC_CHECK(); - } - hrc = natDriver->COMGETTER(HostIP)(bstr.asOutParam()); H(); + hrc = aNetworkAdapter->COMGETTER(Slot)(&uSlot); H(); + rc = CFGMR3InsertStringF(pCfg, "Network", "10.0.%d.0/24", uSlot+2); RC_CHECK(); + } + hrc = natDriver->COMGETTER(HostIP)(bstr.asOutParam()); H(); if (!bstr.isEmpty()) { - rc = CFGMR3InsertStringW(pCfg, "BindIP", bstr.raw()); RC_CHECK(); + rc = CFGMR3InsertStringW(pCfg, "BindIP", bstr.raw()); RC_CHECK(); } ULONG mtu = 0; @@ -2782,54 +2782,54 @@ if (mtu) { - rc = CFGMR3InsertInteger(pCfg, "SlirpMTU", mtu); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "SlirpMTU", mtu); RC_CHECK(); } if (sockRcv) { - rc = CFGMR3InsertInteger(pCfg, "SockRcv", sockRcv); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "SockRcv", sockRcv); RC_CHECK(); } if (sockSnd) { - rc = CFGMR3InsertInteger(pCfg, "SockSnd", sockSnd); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "SockSnd", sockSnd); RC_CHECK(); } if (tcpRcv) { - rc = CFGMR3InsertInteger(pCfg, "TcpRcv", tcpRcv); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "TcpRcv", tcpRcv); RC_CHECK(); } if (tcpSnd) { - rc = CFGMR3InsertInteger(pCfg, "TcpSnd", tcpSnd); RC_CHECK(); - } - hrc = natDriver->COMGETTER(TftpPrefix)(bstr.asOutParam()); H(); + rc = CFGMR3InsertInteger(pCfg, "TcpSnd", tcpSnd); RC_CHECK(); + } + hrc = natDriver->COMGETTER(TftpPrefix)(bstr.asOutParam()); H(); if (!bstr.isEmpty()) { - rc = CFGMR3RemoveValue(pCfg, "TFTPPrefix"); RC_CHECK(); - rc = CFGMR3InsertStringW(pCfg, "TFTPPrefix", bstr); RC_CHECK(); - } - hrc = natDriver->COMGETTER(TftpBootFile)(bstr.asOutParam()); H(); + rc = CFGMR3RemoveValue(pCfg, "TFTPPrefix"); RC_CHECK(); + rc = CFGMR3InsertStringW(pCfg, "TFTPPrefix", bstr); RC_CHECK(); + } + hrc = natDriver->COMGETTER(TftpBootFile)(bstr.asOutParam()); H(); if (!bstr.isEmpty()) { - rc = CFGMR3RemoveValue(pCfg, "BootFile"); RC_CHECK(); - rc = CFGMR3InsertStringW(pCfg, "BootFile", bstr); RC_CHECK(); - } - hrc = natDriver->COMGETTER(TftpNextServer)(bstr.asOutParam()); H(); + rc = CFGMR3RemoveValue(pCfg, "BootFile"); RC_CHECK(); + rc = CFGMR3InsertStringW(pCfg, "BootFile", bstr); RC_CHECK(); + } + hrc = natDriver->COMGETTER(TftpNextServer)(bstr.asOutParam()); H(); if (!bstr.isEmpty()) { - rc = CFGMR3InsertStringW(pCfg, "NextServer", bstr); RC_CHECK(); + rc = CFGMR3InsertStringW(pCfg, "NextServer", bstr); RC_CHECK(); } BOOL fDnsFlag; - hrc = natDriver->COMGETTER(DnsPassDomain)(&fDnsFlag); H(); - rc = CFGMR3InsertInteger(pCfg, "PassDomain", fDnsFlag); RC_CHECK(); - hrc = natDriver->COMGETTER(DnsProxy)(&fDnsFlag); H(); - rc = CFGMR3InsertInteger(pCfg, "DNSProxy", fDnsFlag); RC_CHECK(); - hrc = natDriver->COMGETTER(DnsUseHostResolver)(&fDnsFlag); H(); - rc = CFGMR3InsertInteger(pCfg, "UseHostResolver", fDnsFlag); RC_CHECK(); + hrc = natDriver->COMGETTER(DnsPassDomain)(&fDnsFlag); H(); + rc = CFGMR3InsertInteger(pCfg, "PassDomain", fDnsFlag); RC_CHECK(); + hrc = natDriver->COMGETTER(DnsProxy)(&fDnsFlag); H(); + rc = CFGMR3InsertInteger(pCfg, "DNSProxy", fDnsFlag); RC_CHECK(); + hrc = natDriver->COMGETTER(DnsUseHostResolver)(&fDnsFlag); H(); + rc = CFGMR3InsertInteger(pCfg, "UseHostResolver", fDnsFlag); RC_CHECK(); ULONG aliasMode; - hrc = natDriver->COMGETTER(AliasMode)(&aliasMode); H(); - rc = CFGMR3InsertInteger(pCfg, "AliasMode", aliasMode); RC_CHECK(); + hrc = natDriver->COMGETTER(AliasMode)(&aliasMode); H(); + rc = CFGMR3InsertInteger(pCfg, "AliasMode", aliasMode); RC_CHECK(); /* port-forwarding */ SafeArray pfs; - hrc = natDriver->COMGETTER(Redirects)(ComSafeArrayAsOutParam(pfs)); H(); + hrc = natDriver->COMGETTER(Redirects)(ComSafeArrayAsOutParam(pfs)); H(); PCFGMNODE pPF = NULL; /* /Devices/Dev/.../Config/PF#0/ */ for (unsigned int i = 0; i < pfs.size(); ++i) @@ -2846,16 +2846,16 @@ size_t pos, ppos; pos = ppos = 0; - #define ITERATE_TO_NEXT_TERM(res, str, pos, ppos) \ - do { \ - pos = str.find(",", ppos); \ - if (pos == Utf8Str::npos) \ - { \ - Log(( #res " extracting from %s is failed\n", str.raw())); \ - continue; \ - } \ - res = str.substr(ppos, pos - ppos); \ - Log2((#res " %s pos:%d, ppos:%d\n", res.raw(), pos, ppos)); \ - ppos = pos + 1; \ - } while (0) +#define ITERATE_TO_NEXT_TERM(res, str, pos, ppos) \ + do { \ + pos = str.find(",", ppos); \ + if (pos == Utf8Str::npos) \ + { \ + Log(( #res " extracting from %s is failed\n", str.raw())); \ + continue; \ + } \ + res = str.substr(ppos, pos - ppos); \ + Log2((#res " %s pos:%d, ppos:%d\n", res.raw(), pos, ppos)); \ + ppos = pos + 1; \ + } while (0) ITERATE_TO_NEXT_TERM(strName, utf, pos, ppos); ITERATE_TO_NEXT_TERM(strProto, utf, pos, ppos); @@ -2864,5 +2864,5 @@ ITERATE_TO_NEXT_TERM(strGuestIP, utf, pos, ppos); strGuestPort = utf.substr(ppos, utf.length() - ppos); - #undef ITERATE_TO_NEXT_TERM +#undef ITERATE_TO_NEXT_TERM uint32_t proto = strProto.toUInt32(); @@ -2872,8 +2872,8 @@ case NATProtocol_UDP: strProto = "UDP"; - break; + break; case NATProtocol_TCP: strProto = "TCP"; - break; + break; default: fValid = false; @@ -2883,15 +2883,15 @@ continue; - rc = CFGMR3InsertNode(pCfg, strName.raw(), &pPF); RC_CHECK(); - rc = CFGMR3InsertString(pPF, "Protocol", strProto.raw()); RC_CHECK(); + rc = CFGMR3InsertNode(pCfg, strName.raw(), &pPF); RC_CHECK(); + rc = CFGMR3InsertString(pPF, "Protocol", strProto.raw()); RC_CHECK(); if (!strHostIP.isEmpty()) { - rc = CFGMR3InsertString(pPF, "BindIP", strHostIP.raw()); RC_CHECK(); + rc = CFGMR3InsertString(pPF, "BindIP", strHostIP.raw()); RC_CHECK(); } if (!strGuestIP.isEmpty()) { - rc = CFGMR3InsertString(pPF, "GuestIP", strGuestIP.raw()); RC_CHECK(); + rc = CFGMR3InsertString(pPF, "GuestIP", strGuestIP.raw()); RC_CHECK(); } @@ -2899,5 +2899,5 @@ if (port) { - rc = CFGMR3InsertInteger(pPF, "HostPort", port); RC_CHECK(); + rc = CFGMR3InsertInteger(pPF, "HostPort", port); RC_CHECK(); } @@ -2905,5 +2905,5 @@ if (port) { - rc = CFGMR3InsertInteger(pPF, "GuestPort", port); RC_CHECK(); + rc = CFGMR3InsertInteger(pPF, "GuestPort", port); RC_CHECK(); } } @@ -2921,13 +2921,13 @@ case VERR_ACCESS_DENIED: return VMSetError(pVM, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_( - "Failed to open '/dev/net/tun' for read/write access. Please check the " - "permissions of that node. Either run 'chmod 0666 /dev/net/tun' or " - "change the group of that node and make yourself a member of that group. Make " - "sure that these changes are permanent, especially if you are " - "using udev")); + "Failed to open '/dev/net/tun' for read/write access. Please check the " + "permissions of that node. Either run 'chmod 0666 /dev/net/tun' or " + "change the group of that node and make yourself a member of that group. Make " + "sure that these changes are permanent, especially if you are " + "using udev")); default: AssertMsgFailed(("Could not attach to host interface! Bad!\n")); return VMSetError(pVM, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_( - "Failed to initialize Host Interface Networking")); + "Failed to initialize Host Interface Networking")); } } @@ -2938,13 +2938,13 @@ if (fSniffer) { - rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL0); RC_CHECK(); } else { - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); - } - rc = CFGMR3InsertString(pLunL0, "Driver", "HostInterface"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "FileHandle", maTapFD[uInstance]); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + } + rc = CFGMR3InsertString(pLunL0, "Driver", "HostInterface"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "FileHandle", maTapFD[uInstance]); RC_CHECK(); } @@ -2955,9 +2955,9 @@ if (fSniffer) { - rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL0); RC_CHECK(); } else { - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); } @@ -3134,13 +3134,13 @@ case VERR_ACCESS_DENIED: return VMSetError(pVM, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_( - "Failed to open '/dev/%s' for read/write access. Please check the " - "permissions of that node, and that the net.link.tap.user_open " - "sysctl is set. Either run 'chmod 0666 /dev/%s' or " - "change the group of that node to vboxusers and make yourself " - "a member of that group. Make sure that these changes are permanent."), pszHifName, pszHifName); + "Failed to open '/dev/%s' for read/write access. Please check the " + "permissions of that node, and that the net.link.tap.user_open " + "sysctl is set. Either run 'chmod 0666 /dev/%s' or " + "change the group of that node to vboxusers and make yourself " + "a member of that group. Make sure that these changes are permanent."), pszHifName, pszHifName); default: AssertMsgFailed(("Could not attach to tap interface! Bad!\n")); return VMSetError(pVM, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_( - "Failed to initialize Host Interface Networking")); + "Failed to initialize Host Interface Networking")); } } @@ -3149,7 +3149,7 @@ if ((int)maTapFD[uInstance] >= 0) { - rc = CFGMR3InsertString(pLunL0, "Driver", "HostInterface"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "FileHandle", maTapFD[uInstance]); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "HostInterface"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "FileHandle", maTapFD[uInstance]); RC_CHECK(); } break; @@ -3182,12 +3182,12 @@ # endif - rc = CFGMR3InsertString(pLunL0, "Driver", "IntNet"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertString(pCfg, "Trunk", pszTrunk); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "IntNet"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "Trunk", pszTrunk); RC_CHECK(); rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetFlt); RC_CHECK(); char szNetwork[INTNET_MAX_NETWORK_NAME]; RTStrPrintf(szNetwork, sizeof(szNetwork), "HostInterfaceNetworking-%s", pszHifName); - rc = CFGMR3InsertString(pCfg, "Network", szNetwork); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "Network", szNetwork); RC_CHECK(); networkName = Bstr(szNetwork); trunkName = Bstr(pszTrunk); @@ -3199,5 +3199,5 @@ || strstr(pszHifName, "AirPort" )) { - rc = CFGMR3InsertInteger(pCfg, "SharedMacOnWire", true); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "SharedMacOnWire", true); RC_CHECK(); } # elif defined(RT_OS_LINUX) @@ -3305,5 +3305,5 @@ { Log(("this is a wireless adapter")); - rc = CFGMR3InsertInteger(pCfg, "SharedMacOnWire", true); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "SharedMacOnWire", true); RC_CHECK(); Log(("Set SharedMacOnWire\n")); } @@ -3332,5 +3332,5 @@ if (ZoneId != GLOBAL_ZONEID) { - rc = CFGMR3InsertInteger(pCfg, "IgnoreAllPromisc", true); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "IgnoreAllPromisc", true); RC_CHECK(); } # endif @@ -3351,5 +3351,5 @@ case NetworkAttachmentType_Internal: { - hrc = aNetworkAdapter->COMGETTER(InternalNetwork)(bstr.asOutParam()); H(); + hrc = aNetworkAdapter->COMGETTER(InternalNetwork)(bstr.asOutParam()); H(); if (!bstr.isEmpty()) { @@ -3364,7 +3364,7 @@ RC_CHECK(); } - rc = CFGMR3InsertString(pLunL0, "Driver", "IntNet"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); - rc = CFGMR3InsertStringW(pCfg, "Network", bstr); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "IntNet"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertStringW(pCfg, "Network", bstr); RC_CHECK(); rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_WhateverNone); RC_CHECK(); networkName = bstr; @@ -3387,6 +3387,6 @@ } - rc = CFGMR3InsertString(pLunL0, "Driver", "IntNet"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "IntNet"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); Bstr HifName; @@ -3516,7 +3516,7 @@ const char *pszTrunk = szTrunkName; - rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp); RC_CHECK(); - rc = CFGMR3InsertString(pCfg, "Trunk", pszTrunk); RC_CHECK(); - rc = CFGMR3InsertString(pCfg, "Network", szNetwork); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "Trunk", pszTrunk); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "Network", szNetwork); RC_CHECK(); networkName = Bstr(szNetwork); trunkName = Bstr(pszTrunk); @@ -3524,14 +3524,14 @@ # endif /* defined VBOX_WITH_NETFLT*/ #elif defined(RT_OS_DARWIN) - rc = CFGMR3InsertString(pCfg, "Trunk", pszHifName); RC_CHECK(); - rc = CFGMR3InsertString(pCfg, "Network", szNetwork); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "Trunk", pszHifName); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "Network", szNetwork); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp); RC_CHECK(); networkName = Bstr(szNetwork); trunkName = Bstr(pszHifName); trunkType = TRUNKTYPE_NETADP; #else - rc = CFGMR3InsertString(pCfg, "Trunk", pszHifName); RC_CHECK(); - rc = CFGMR3InsertString(pCfg, "Network", szNetwork); RC_CHECK(); - rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetFlt); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "Trunk", pszHifName); RC_CHECK(); + rc = CFGMR3InsertString(pCfg, "Network", szNetwork); RC_CHECK(); + rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetFlt); RC_CHECK(); networkName = Bstr(szNetwork); trunkName = Bstr(pszHifName); @@ -3576,11 +3576,11 @@ case NetworkAttachmentType_VDE: { - hrc = aNetworkAdapter->COMGETTER(VDENetwork)(bstr.asOutParam()); H(); - rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); - rc = CFGMR3InsertString(pLunL0, "Driver", "VDE"); RC_CHECK(); - rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); + hrc = aNetworkAdapter->COMGETTER(VDENetwork)(bstr.asOutParam()); H(); + rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK(); + rc = CFGMR3InsertString(pLunL0, "Driver", "VDE"); RC_CHECK(); + rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg); RC_CHECK(); if (!bstr.isEmpty()) { - rc = CFGMR3InsertStringW(pCfg, "Network", bstr); RC_CHECK(); + rc = CFGMR3InsertStringW(pCfg, "Network", bstr); RC_CHECK(); networkName = bstr; }