Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (revision 23933) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (revision 23934) @@ -575,11 +575,11 @@ if (!Guid(uuid).isEmpty()) { - CHECK_ERROR (a->virtualBox, GetMachine (uuid, machine.asOutParam())); + CHECK_ERROR(a->virtualBox, GetMachine(uuid, machine.asOutParam())); } else { - CHECK_ERROR (a->virtualBox, FindMachine (uuid, machine.asOutParam())); + CHECK_ERROR(a->virtualBox, FindMachine(uuid, machine.asOutParam())); if (SUCCEEDED (rc)) - machine->COMGETTER(Id) (uuid.asOutParam()); + machine->COMGETTER(Id)(uuid.asOutParam()); } if (FAILED (rc)) @@ -587,5 +587,5 @@ /* open a session for the VM */ - CHECK_ERROR_RET (a->virtualBox, OpenExistingSession (a->session, uuid), 1); + CHECK_ERROR_RET(a->virtualBox, OpenExistingSession(a->session, uuid), 1); do @@ -593,26 +593,26 @@ /* get the associated console */ ComPtr console; - CHECK_ERROR_BREAK (a->session, COMGETTER(Console)(console.asOutParam())); + CHECK_ERROR_BREAK(a->session, COMGETTER(Console)(console.asOutParam())); /* ... and session machine */ ComPtr sessionMachine; - CHECK_ERROR_BREAK (a->session, COMGETTER(Machine)(sessionMachine.asOutParam())); + CHECK_ERROR_BREAK(a->session, COMGETTER(Machine)(sessionMachine.asOutParam())); /* which command? */ if (!strcmp(a->argv[1], "pause")) { - CHECK_ERROR_BREAK (console, Pause()); + CHECK_ERROR_BREAK(console, Pause()); } else if (!strcmp(a->argv[1], "resume")) { - CHECK_ERROR_BREAK (console, Resume()); + CHECK_ERROR_BREAK(console, Resume()); } else if (!strcmp(a->argv[1], "reset")) { - CHECK_ERROR_BREAK (console, Reset()); + CHECK_ERROR_BREAK(console, Reset()); } else if (!strcmp(a->argv[1], "poweroff")) { ComPtr progress; - CHECK_ERROR_BREAK (console, PowerDown(progress.asOutParam())); + CHECK_ERROR_BREAK(console, PowerDown(progress.asOutParam())); showProgress(progress); @@ -636,5 +636,5 @@ { ComPtr progress; - CHECK_ERROR_BREAK (console, SaveState(progress.asOutParam())); + CHECK_ERROR_BREAK(console, SaveState(progress.asOutParam())); showProgress(progress); @@ -657,9 +657,9 @@ else if (!strcmp(a->argv[1], "acpipowerbutton")) { - CHECK_ERROR_BREAK (console, PowerButton()); + CHECK_ERROR_BREAK(console, PowerButton()); } else if (!strcmp(a->argv[1], "acpisleepbutton")) { - CHECK_ERROR_BREAK (console, SleepButton()); + CHECK_ERROR_BREAK(console, SleepButton()); } else if (!strcmp(a->argv[1], "injectnmi")) @@ -738,6 +738,6 @@ ULONG NetworkAdapterCount = 0; ComPtr info; - CHECK_ERROR_BREAK (a->virtualBox, COMGETTER(SystemProperties) (info.asOutParam())); - CHECK_ERROR_BREAK (info, COMGETTER(NetworkAdapterCount) (&NetworkAdapterCount)); + CHECK_ERROR_BREAK(a->virtualBox, COMGETTER(SystemProperties)(info.asOutParam())); + CHECK_ERROR_BREAK(info, COMGETTER(NetworkAdapterCount)(&NetworkAdapterCount)); unsigned n = parseNum(&a->argv[1][12], NetworkAdapterCount, "NIC"); @@ -755,14 +755,14 @@ /* get the corresponding network adapter */ ComPtr adapter; - CHECK_ERROR_BREAK (sessionMachine, GetNetworkAdapter(n - 1, adapter.asOutParam())); + CHECK_ERROR_BREAK(sessionMachine, GetNetworkAdapter(n - 1, adapter.asOutParam())); if (adapter) { if (!strcmp(a->argv[2], "on")) { - CHECK_ERROR_BREAK (adapter, COMSETTER(CableConnected)(TRUE)); + CHECK_ERROR_BREAK(adapter, COMSETTER(CableConnected)(TRUE)); } else if (!strcmp(a->argv[2], "off")) { - CHECK_ERROR_BREAK (adapter, COMSETTER(CableConnected)(FALSE)); + CHECK_ERROR_BREAK(adapter, COMSETTER(CableConnected)(FALSE)); } else @@ -785,6 +785,6 @@ ULONG NetworkAdapterCount = 0; ComPtr info; - CHECK_ERROR_BREAK (a->virtualBox, COMGETTER(SystemProperties) (info.asOutParam())); - CHECK_ERROR_BREAK (info, COMGETTER(NetworkAdapterCount) (&NetworkAdapterCount)); + CHECK_ERROR_BREAK(a->virtualBox, COMGETTER(SystemProperties)(info.asOutParam())); + CHECK_ERROR_BREAK(info, COMGETTER(NetworkAdapterCount)(&NetworkAdapterCount)); unsigned n = parseNum(&a->argv[1][12], NetworkAdapterCount, "NIC"); @@ -803,5 +803,5 @@ /* get the corresponding network adapter */ ComPtr adapter; - CHECK_ERROR_BREAK (sessionMachine, GetNetworkAdapter(n - 1, adapter.asOutParam())); + CHECK_ERROR_BREAK(sessionMachine, GetNetworkAdapter(n - 1, adapter.asOutParam())); if (adapter) { @@ -812,5 +812,5 @@ if (a->argv[2]) { - CHECK_ERROR_RET(adapter, COMSETTER(TraceFile) (Bstr(a->argv[2])), 1); + CHECK_ERROR_RET(adapter, COMSETTER(TraceFile)(Bstr(a->argv[2])), 1); } else @@ -832,6 +832,6 @@ ULONG NetworkAdapterCount = 0; ComPtr info; - CHECK_ERROR_BREAK (a->virtualBox, COMGETTER(SystemProperties) (info.asOutParam())); - CHECK_ERROR_BREAK (info, COMGETTER(NetworkAdapterCount) (&NetworkAdapterCount)); + CHECK_ERROR_BREAK(a->virtualBox, COMGETTER(SystemProperties)(info.asOutParam())); + CHECK_ERROR_BREAK(info, COMGETTER(NetworkAdapterCount)(&NetworkAdapterCount)); unsigned n = parseNum(&a->argv[1][8], NetworkAdapterCount, "NIC"); @@ -850,5 +850,5 @@ /* get the corresponding network adapter */ ComPtr adapter; - CHECK_ERROR_BREAK (sessionMachine, GetNetworkAdapter(n - 1, adapter.asOutParam())); + CHECK_ERROR_BREAK(sessionMachine, GetNetworkAdapter(n - 1, adapter.asOutParam())); if (adapter) { @@ -883,6 +883,6 @@ ULONG NetworkAdapterCount = 0; ComPtr info; - CHECK_ERROR_BREAK (a->virtualBox, COMGETTER(SystemProperties) (info.asOutParam())); - CHECK_ERROR_BREAK (info, COMGETTER(NetworkAdapterCount) (&NetworkAdapterCount)); + CHECK_ERROR_BREAK(a->virtualBox, COMGETTER(SystemProperties)(info.asOutParam())); + CHECK_ERROR_BREAK(info, COMGETTER(NetworkAdapterCount)(&NetworkAdapterCount)); unsigned n = parseNum(&a->argv[1][3], NetworkAdapterCount, "NIC"); @@ -901,5 +901,5 @@ /* get the corresponding network adapter */ ComPtr adapter; - CHECK_ERROR_BREAK (sessionMachine, GetNetworkAdapter(n - 1, adapter.asOutParam())); + CHECK_ERROR_BREAK(sessionMachine, GetNetworkAdapter(n - 1, adapter.asOutParam())); if (adapter) { @@ -910,10 +910,10 @@ if (!strcmp(a->argv[2], "null")) { - CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1); + CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1); CHECK_ERROR_RET(adapter, Detach(), 1); } else if (!strcmp(a->argv[2], "nat")) { - CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1); + CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1); if (a->argc == 4) CHECK_ERROR_RET(adapter, COMSETTER(NATNetwork)(Bstr(a->argv[3])), 1); @@ -929,5 +929,5 @@ break; } - CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1); + CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1); CHECK_ERROR_RET(adapter, COMSETTER(HostInterface)(Bstr(a->argv[3])), 1); CHECK_ERROR_RET(adapter, AttachToBridgedInterface(), 1); @@ -941,5 +941,5 @@ break; } - CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1); + CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1); CHECK_ERROR_RET(adapter, COMSETTER(InternalNetwork)(Bstr(a->argv[3])), 1); CHECK_ERROR_RET(adapter, AttachToInternalNetwork(), 1); @@ -954,5 +954,5 @@ break; } - CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1); + CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1); CHECK_ERROR_RET(adapter, COMSETTER(HostInterface)(Bstr(a->argv[3])), 1); CHECK_ERROR_RET(adapter, AttachToHostOnlyInterface(), 1); @@ -990,9 +990,9 @@ if (!strcmp(a->argv[2], "on")) { - CHECK_ERROR_BREAK (vrdpServer, COMSETTER(Enabled)(TRUE)); + CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Enabled)(TRUE)); } else if (!strcmp(a->argv[2], "off")) { - CHECK_ERROR_BREAK (vrdpServer, COMSETTER(Enabled)(FALSE)); + CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Enabled)(FALSE)); } else @@ -1029,6 +1029,6 @@ } #endif /* VBOX_WITH_VRDP */ - else if ( !strcmp (a->argv[1], "usbattach") - || !strcmp (a->argv[1], "usbdetach")) + else if ( !strcmp(a->argv[1], "usbattach") + || !strcmp(a->argv[1], "usbdetach")) { if (a->argc < 3) @@ -1048,28 +1048,28 @@ { ComPtr host; - CHECK_ERROR_BREAK (a->virtualBox, COMGETTER(Host) (host.asOutParam())); + CHECK_ERROR_BREAK(a->virtualBox, COMGETTER(Host)(host.asOutParam())); SafeIfaceArray coll; - CHECK_ERROR_BREAK (host, COMGETTER(USBDevices) (ComSafeArrayAsOutParam(coll))); + CHECK_ERROR_BREAK(host, COMGETTER(USBDevices)(ComSafeArrayAsOutParam(coll))); ComPtr dev; - CHECK_ERROR_BREAK (host, FindUSBDeviceByAddress (Bstr (a->argv [2]), dev.asOutParam())); - CHECK_ERROR_BREAK (dev, COMGETTER(Id) (usbId.asOutParam())); + CHECK_ERROR_BREAK(host, FindUSBDeviceByAddress(Bstr(a->argv [2]), dev.asOutParam())); + CHECK_ERROR_BREAK(dev, COMGETTER(Id)(usbId.asOutParam())); } else { SafeIfaceArray coll; - CHECK_ERROR_BREAK (console, COMGETTER(USBDevices)(ComSafeArrayAsOutParam(coll))); + CHECK_ERROR_BREAK(console, COMGETTER(USBDevices)(ComSafeArrayAsOutParam(coll))); ComPtr dev; - CHECK_ERROR_BREAK (console, FindUSBDeviceByAddress (Bstr (a->argv [2]), + CHECK_ERROR_BREAK(console, FindUSBDeviceByAddress(Bstr(a->argv [2]), dev.asOutParam())); - CHECK_ERROR_BREAK (dev, COMGETTER(Id) (usbId.asOutParam())); + CHECK_ERROR_BREAK(dev, COMGETTER(Id)(usbId.asOutParam())); } } if (attach) - CHECK_ERROR_BREAK (console, AttachUSBDevice (usbId)); + CHECK_ERROR_BREAK(console, AttachUSBDevice(usbId)); else { ComPtr dev; - CHECK_ERROR_BREAK (console, DetachUSBDevice (usbId, dev.asOutParam())); + CHECK_ERROR_BREAK(console, DetachUSBDevice(usbId, dev.asOutParam())); } } @@ -1343,10 +1343,9 @@ rc = E_FAIL; } - } - while (0); + } while (0); a->session->Close(); - return SUCCEEDED (rc) ? 0 : 1; + return SUCCEEDED(rc) ? 0 : 1; } @@ -1379,9 +1378,7 @@ CHECK_ERROR_BREAK(a->session, COMGETTER(Console)(console.asOutParam())); CHECK_ERROR_BREAK(console, ForgetSavedState(true)); - } - while (0); + } while (0); CHECK_ERROR_BREAK(a->session, Close()); - } - while (0); + } while (0); } @@ -1416,10 +1413,8 @@ ComPtr console; CHECK_ERROR_BREAK(a->session, COMGETTER(Console)(console.asOutParam())); - CHECK_ERROR_BREAK(console, AdoptSavedState (Bstr (a->argv[1]))); - } - while (0); + CHECK_ERROR_BREAK(console, AdoptSavedState(Bstr(a->argv[1]))); + } while (0); CHECK_ERROR_BREAK(a->session, Close()); - } - while (0); + } while (0); } @@ -1605,5 +1600,5 @@ } -static int handleSharedFolder (HandlerArg *a) +static int handleSharedFolder(HandlerArg *a) { HRESULT rc; @@ -1683,5 +1678,5 @@ /* open an existing session for the VM */ - CHECK_ERROR_RET(a->virtualBox, OpenExistingSession (a->session, uuid), 1); + CHECK_ERROR_RET(a->virtualBox, OpenExistingSession(a->session, uuid), 1); /* get the session machine */ CHECK_ERROR_RET(a->session, COMGETTER(Machine)(machine.asOutParam()), 1); @@ -1697,5 +1692,5 @@ { /* open a session for the VM */ - CHECK_ERROR_RET (a->virtualBox, OpenSession(a->session, uuid), 1); + CHECK_ERROR_RET(a->virtualBox, OpenSession(a->session, uuid), 1); /* get the mutable session machine */ @@ -1747,5 +1742,5 @@ /* open an existing session for the VM */ - CHECK_ERROR_RET(a->virtualBox, OpenExistingSession (a->session, uuid), 1); + CHECK_ERROR_RET(a->virtualBox, OpenExistingSession(a->session, uuid), 1); /* get the session machine */ CHECK_ERROR_RET(a->session, COMGETTER(Machine)(machine.asOutParam()), 1); @@ -1761,5 +1756,5 @@ { /* open a session for the VM */ - CHECK_ERROR_RET (a->virtualBox, OpenSession(a->session, uuid), 1); + CHECK_ERROR_RET(a->virtualBox, OpenSession(a->session, uuid), 1); /* get the mutable session machine */ @@ -2081,6 +2076,5 @@ // end "all-stuff" scope //////////////////////////////////////////////////////////////////////////// - } - while (0); + } while (0); com::Shutdown(); Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 23933) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 23934) @@ -223,12 +223,12 @@ { ComPtr info; - CHECK_ERROR_RET (a->virtualBox, COMGETTER(SystemProperties) (info.asOutParam()), 1); - CHECK_ERROR_RET (info, COMGETTER(NetworkAdapterCount) (&NetworkAdapterCount), 1); + CHECK_ERROR_RET(a->virtualBox, COMGETTER(SystemProperties)(info.asOutParam()), 1); + CHECK_ERROR_RET(info, COMGETTER(NetworkAdapterCount)(&NetworkAdapterCount), 1); } ULONG SerialPortCount = 0; { ComPtr info; - CHECK_ERROR_RET (a->virtualBox, COMGETTER(SystemProperties) (info.asOutParam()), 1); - CHECK_ERROR_RET (info, COMGETTER(SerialPortCount) (&SerialPortCount), 1); + CHECK_ERROR_RET(a->virtualBox, COMGETTER(SystemProperties)(info.asOutParam()), 1); + CHECK_ERROR_RET(info, COMGETTER(SerialPortCount)(&SerialPortCount), 1); } @@ -236,14 +236,14 @@ if (!Guid(machineuuid).isEmpty()) { - CHECK_ERROR_RET (a->virtualBox, GetMachine (machineuuid, machine.asOutParam()), 1); + CHECK_ERROR_RET(a->virtualBox, GetMachine(machineuuid, machine.asOutParam()), 1); } else { - CHECK_ERROR_RET (a->virtualBox, FindMachine(Bstr(a->argv[0]), machine.asOutParam()), 1); + CHECK_ERROR_RET(a->virtualBox, FindMachine(Bstr(a->argv[0]), machine.asOutParam()), 1); machine->COMGETTER(Id)(machineuuid.asOutParam()); } /* open a session for the VM */ - CHECK_ERROR_RET (a->virtualBox, OpenSession(a->session, machineuuid), 1); + CHECK_ERROR_RET(a->virtualBox, OpenSession(a->session, machineuuid), 1); /* get the mutable session machine */ @@ -251,6 +251,6 @@ machine->COMGETTER(BIOSSettings)(biosSettings.asOutParam()); - RTGetOptInit (&GetOptState, a->argc, a->argv, g_aModifyVMOptions, - RT_ELEMENTS(g_aModifyVMOptions), 1, 0 /* fFlags */); + RTGetOptInit(&GetOptState, a->argc, a->argv, g_aModifyVMOptions, + RT_ELEMENTS(g_aModifyVMOptions), 1, 0 /* fFlags */); while ( SUCCEEDED (rc) @@ -262,5 +262,5 @@ { if (ValueUnion.psz) - CHECK_ERROR (machine, COMSETTER(Name)(Bstr(ValueUnion.psz))); + CHECK_ERROR(machine, COMSETTER(Name)(Bstr(ValueUnion.psz))); break; } @@ -270,8 +270,8 @@ { ComPtr guestOSType; - CHECK_ERROR (a->virtualBox, GetGuestOSType(Bstr(ValueUnion.psz), guestOSType.asOutParam())); + CHECK_ERROR(a->virtualBox, GetGuestOSType(Bstr(ValueUnion.psz), guestOSType.asOutParam())); if (SUCCEEDED(rc) && guestOSType) { - CHECK_ERROR (machine, COMSETTER(OSTypeId)(Bstr(ValueUnion.psz))); + CHECK_ERROR(machine, COMSETTER(OSTypeId)(Bstr(ValueUnion.psz))); } else @@ -287,5 +287,5 @@ { if (ValueUnion.u32 > 0) - CHECK_ERROR (machine, COMSETTER(MemorySize)(ValueUnion.u32)); + CHECK_ERROR(machine, COMSETTER(MemorySize)(ValueUnion.u32)); break; } @@ -294,5 +294,5 @@ { if (ValueUnion.u32 > 0) - CHECK_ERROR (machine, COMSETTER(VRAMSize)(ValueUnion.u32)); + CHECK_ERROR(machine, COMSETTER(VRAMSize)(ValueUnion.u32)); break; } @@ -304,9 +304,9 @@ if (!strcmp(ValueUnion.psz, "efi")) { - CHECK_ERROR (machine, COMSETTER(FirmwareType)(FirmwareType_EFI)); + CHECK_ERROR(machine, COMSETTER(FirmwareType)(FirmwareType_EFI)); } else if (!strcmp(ValueUnion.psz, "bios")) { - CHECK_ERROR (machine, COMSETTER(FirmwareType)(FirmwareType_BIOS)); + CHECK_ERROR(machine, COMSETTER(FirmwareType)(FirmwareType_BIOS)); } else @@ -325,9 +325,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (biosSettings, COMSETTER(ACPIEnabled)(true)); + CHECK_ERROR(biosSettings, COMSETTER(ACPIEnabled)(true)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (biosSettings, COMSETTER(ACPIEnabled)(false)); + CHECK_ERROR(biosSettings, COMSETTER(ACPIEnabled)(false)); } else @@ -346,9 +346,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (biosSettings, COMSETTER(IOAPICEnabled)(true)); + CHECK_ERROR(biosSettings, COMSETTER(IOAPICEnabled)(true)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (biosSettings, COMSETTER(IOAPICEnabled)(false)); + CHECK_ERROR(biosSettings, COMSETTER(IOAPICEnabled)(false)); } else @@ -367,9 +367,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (machine, SetCpuProperty(CpuPropertyType_PAE, true)); + CHECK_ERROR(machine, SetCpuProperty(CpuPropertyType_PAE, true)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (machine, SetCpuProperty(CpuPropertyType_PAE, false)); + CHECK_ERROR(machine, SetCpuProperty(CpuPropertyType_PAE, false)); } else @@ -388,9 +388,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (machine, SetCpuProperty(CpuPropertyType_Synthetic, true)); + CHECK_ERROR(machine, SetCpuProperty(CpuPropertyType_Synthetic, true)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (machine, SetCpuProperty(CpuPropertyType_Synthetic, false)); + CHECK_ERROR(machine, SetCpuProperty(CpuPropertyType_Synthetic, false)); } else @@ -409,9 +409,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_Enabled, TRUE)); + CHECK_ERROR(machine, SetHWVirtExProperty(HWVirtExPropertyType_Enabled, TRUE)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_Enabled, FALSE)); + CHECK_ERROR(machine, SetHWVirtExProperty(HWVirtExPropertyType_Enabled, FALSE)); } else @@ -430,9 +430,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_Exclusive, TRUE)); + CHECK_ERROR(machine, SetHWVirtExProperty(HWVirtExPropertyType_Exclusive, TRUE)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_Exclusive, FALSE)); + CHECK_ERROR(machine, SetHWVirtExProperty(HWVirtExPropertyType_Exclusive, FALSE)); } else @@ -451,9 +451,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_NestedPaging, TRUE)); + CHECK_ERROR(machine, SetHWVirtExProperty(HWVirtExPropertyType_NestedPaging, TRUE)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_NestedPaging, FALSE)); + CHECK_ERROR(machine, SetHWVirtExProperty(HWVirtExPropertyType_NestedPaging, FALSE)); } else @@ -472,9 +472,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_VPID, TRUE)); + CHECK_ERROR(machine, SetHWVirtExProperty(HWVirtExPropertyType_VPID, TRUE)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_VPID, FALSE)); + CHECK_ERROR(machine, SetHWVirtExProperty(HWVirtExPropertyType_VPID, FALSE)); } else @@ -490,5 +490,5 @@ { if (ValueUnion.u32 > 0) - CHECK_ERROR (machine, COMSETTER(CPUCount)(ValueUnion.u32)); + CHECK_ERROR(machine, COMSETTER(CPUCount)(ValueUnion.u32)); break; } @@ -497,5 +497,5 @@ { if (ValueUnion.u32 > 0) - CHECK_ERROR (machine, COMSETTER(MonitorCount)(ValueUnion.u32)); + CHECK_ERROR(machine, COMSETTER(MonitorCount)(ValueUnion.u32)); break; } @@ -507,9 +507,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (machine, COMSETTER(Accelerate3DEnabled)(true)); + CHECK_ERROR(machine, COMSETTER(Accelerate3DEnabled)(true)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (machine, COMSETTER(Accelerate3DEnabled)(false)); + CHECK_ERROR(machine, COMSETTER(Accelerate3DEnabled)(false)); } else @@ -529,9 +529,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (machine, COMSETTER(Accelerate2DVideoEnabled)(true)); + CHECK_ERROR(machine, COMSETTER(Accelerate2DVideoEnabled)(true)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (machine, COMSETTER(Accelerate2DVideoEnabled)(false)); + CHECK_ERROR(machine, COMSETTER(Accelerate2DVideoEnabled)(false)); } else @@ -551,9 +551,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (biosSettings, COMSETTER(LogoFadeIn)(true)); + CHECK_ERROR(biosSettings, COMSETTER(LogoFadeIn)(true)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (biosSettings, COMSETTER(LogoFadeIn)(false)); + CHECK_ERROR(biosSettings, COMSETTER(LogoFadeIn)(false)); } else @@ -572,9 +572,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (biosSettings, COMSETTER(LogoFadeOut)(true)); + CHECK_ERROR(biosSettings, COMSETTER(LogoFadeOut)(true)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (biosSettings, COMSETTER(LogoFadeOut)(false)); + CHECK_ERROR(biosSettings, COMSETTER(LogoFadeOut)(false)); } else @@ -591,5 +591,5 @@ { if (ValueUnion.u64 > 0) - CHECK_ERROR (biosSettings, COMSETTER(LogoDisplayTime)(ValueUnion.u64)); + CHECK_ERROR(biosSettings, COMSETTER(LogoDisplayTime)(ValueUnion.u64)); break; } @@ -598,5 +598,5 @@ { if (ValueUnion.psz) - CHECK_ERROR (biosSettings, COMSETTER(LogoImagePath)(Bstr(ValueUnion.psz))); + CHECK_ERROR(biosSettings, COMSETTER(LogoImagePath)(Bstr(ValueUnion.psz))); break; } @@ -607,9 +607,9 @@ { if (!strcmp(ValueUnion.psz, "disabled")) - CHECK_ERROR (biosSettings, COMSETTER(BootMenuMode)(BIOSBootMenuMode_Disabled)); + CHECK_ERROR(biosSettings, COMSETTER(BootMenuMode)(BIOSBootMenuMode_Disabled)); else if (!strcmp(ValueUnion.psz, "menuonly")) - CHECK_ERROR (biosSettings, COMSETTER(BootMenuMode)(BIOSBootMenuMode_MenuOnly)); + CHECK_ERROR(biosSettings, COMSETTER(BootMenuMode)(BIOSBootMenuMode_MenuOnly)); else if (!strcmp(ValueUnion.psz, "messageandmenu")) - CHECK_ERROR (biosSettings, COMSETTER(BootMenuMode)(BIOSBootMenuMode_MessageAndMenu)); + CHECK_ERROR(biosSettings, COMSETTER(BootMenuMode)(BIOSBootMenuMode_MessageAndMenu)); else { @@ -624,5 +624,5 @@ { if (ValueUnion.u64 > 0) - CHECK_ERROR (biosSettings, COMSETTER(TimeOffset)(ValueUnion.u64)); + CHECK_ERROR(biosSettings, COMSETTER(TimeOffset)(ValueUnion.u64)); break; } @@ -634,9 +634,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (biosSettings, COMSETTER(PXEDebugEnabled)(true)); + CHECK_ERROR(biosSettings, COMSETTER(PXEDebugEnabled)(true)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (biosSettings, COMSETTER(PXEDebugEnabled)(false)); + CHECK_ERROR(biosSettings, COMSETTER(PXEDebugEnabled)(false)); } else @@ -658,21 +658,21 @@ if (!strcmp(ValueUnion.psz, "none")) { - CHECK_ERROR (machine, SetBootOrder (GetOptState.uIndex, DeviceType_Null)); + CHECK_ERROR(machine, SetBootOrder(GetOptState.uIndex, DeviceType_Null)); } else if (!strcmp(ValueUnion.psz, "floppy")) { - CHECK_ERROR (machine, SetBootOrder (GetOptState.uIndex, DeviceType_Floppy)); + CHECK_ERROR(machine, SetBootOrder(GetOptState.uIndex, DeviceType_Floppy)); } else if (!strcmp(ValueUnion.psz, "dvd")) { - CHECK_ERROR (machine, SetBootOrder (GetOptState.uIndex, DeviceType_DVD)); + CHECK_ERROR(machine, SetBootOrder(GetOptState.uIndex, DeviceType_DVD)); } else if (!strcmp(ValueUnion.psz, "disk")) { - CHECK_ERROR (machine, SetBootOrder (GetOptState.uIndex, DeviceType_HardDisk)); + CHECK_ERROR(machine, SetBootOrder(GetOptState.uIndex, DeviceType_HardDisk)); } else if (!strcmp(ValueUnion.psz, "net")) { - CHECK_ERROR (machine, SetBootOrder (GetOptState.uIndex, DeviceType_Network)); + CHECK_ERROR(machine, SetBootOrder(GetOptState.uIndex, DeviceType_Network)); } else @@ -701,5 +701,5 @@ { /* open the new hard disk object */ - CHECK_ERROR (a->virtualBox, + CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(ValueUnion.psz), AccessMode_ReadWrite, false, Bstr(""), @@ -710,5 +710,5 @@ { hardDisk->COMGETTER(Id)(uuid.asOutParam()); - CHECK_ERROR (machine, AttachDevice(Bstr("IDE Controller"), 0, 0, DeviceType_HardDisk, uuid)); + CHECK_ERROR(machine, AttachDevice(Bstr("IDE Controller"), 0, 0, DeviceType_HardDisk, uuid)); } else @@ -737,5 +737,5 @@ { /* open the new hard disk object */ - CHECK_ERROR (a->virtualBox, + CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(ValueUnion.psz), AccessMode_ReadWrite, false, Bstr(""), @@ -746,5 +746,5 @@ { hardDisk->COMGETTER(Id)(uuid.asOutParam()); - CHECK_ERROR (machine, AttachDevice(Bstr("IDE Controller"), 0, 1, DeviceType_HardDisk, uuid)); + CHECK_ERROR(machine, AttachDevice(Bstr("IDE Controller"), 0, 1, DeviceType_HardDisk, uuid)); } else @@ -773,5 +773,5 @@ { /* open the new hard disk object */ - CHECK_ERROR (a->virtualBox, + CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(ValueUnion.psz), AccessMode_ReadWrite, false, Bstr(""), @@ -782,5 +782,5 @@ { hardDisk->COMGETTER(Id)(uuid.asOutParam()); - CHECK_ERROR (machine, AttachDevice(Bstr("IDE Controller"), 1, 1, DeviceType_HardDisk, uuid)); + CHECK_ERROR(machine, AttachDevice(Bstr("IDE Controller"), 1, 1, DeviceType_HardDisk, uuid)); } else @@ -793,5 +793,5 @@ { ComPtr storageController; - CHECK_ERROR (machine, GetStorageControllerByName(Bstr("IDE Controller"), + CHECK_ERROR(machine, GetStorageControllerByName(Bstr("IDE Controller"), storageController.asOutParam())); @@ -819,5 +819,5 @@ { ComPtr SataCtl; - CHECK_ERROR (machine, GetStorageControllerByName(Bstr("SATA"), SataCtl.asOutParam())); + CHECK_ERROR(machine, GetStorageControllerByName(Bstr("SATA"), SataCtl.asOutParam())); if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > 4)) @@ -840,5 +840,5 @@ { ComPtr SataCtl; - CHECK_ERROR (machine, GetStorageControllerByName(Bstr("SATA"), SataCtl.asOutParam())); + CHECK_ERROR(machine, GetStorageControllerByName(Bstr("SATA"), SataCtl.asOutParam())); if (SUCCEEDED(rc) && ValueUnion.u32 > 0) @@ -872,5 +872,5 @@ { /* open the new hard disk object */ - CHECK_ERROR (a->virtualBox, + CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(ValueUnion.psz), AccessMode_ReadWrite, false, Bstr(""), false, @@ -881,5 +881,5 @@ { hardDisk->COMGETTER(Id)(uuid.asOutParam()); - CHECK_ERROR (machine, + CHECK_ERROR(machine, AttachDevice(Bstr("SATA"), GetOptState.uIndex, 0, DeviceType_HardDisk, uuid)); @@ -896,9 +896,9 @@ { ComPtr ctl; - CHECK_ERROR (machine, AddStorageController(Bstr("SATA"), StorageBus_SATA, ctl.asOutParam())); - CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_IntelAhci)); + CHECK_ERROR(machine, AddStorageController(Bstr("SATA"), StorageBus_SATA, ctl.asOutParam())); + CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_IntelAhci)); } else if (!strcmp(ValueUnion.psz, "off") || !strcmp(ValueUnion.psz, "disable")) - CHECK_ERROR (machine, RemoveStorageController(Bstr("SATA"))); + CHECK_ERROR(machine, RemoveStorageController(Bstr("SATA"))); else return errorArgument("Invalid --usb argument '%s'", ValueUnion.psz); @@ -932,5 +932,5 @@ { /* open the new hard disk object */ - CHECK_ERROR (a->virtualBox, + CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(ValueUnion.psz), AccessMode_ReadWrite, false, Bstr(""), @@ -943,5 +943,5 @@ rc = machine->AttachDevice(Bstr("LsiLogic"), GetOptState.uIndex, 0, DeviceType_HardDisk, uuid); if (FAILED(rc)) - CHECK_ERROR (machine, + CHECK_ERROR(machine, AttachDevice(Bstr("BusLogic"), GetOptState.uIndex, 0, @@ -962,7 +962,7 @@ rc = machine->RemoveStorageController(Bstr("BusLogic")); if (FAILED(rc)) - CHECK_ERROR (machine, RemoveStorageController(Bstr("LsiLogic"))); - - CHECK_ERROR (machine, + CHECK_ERROR(machine, RemoveStorageController(Bstr("LsiLogic"))); + + CHECK_ERROR(machine, AddStorageController(Bstr("LsiLogic"), StorageBus_SCSI, @@ -970,5 +970,5 @@ if (SUCCEEDED(rc)) - CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_LsiLogic)); + CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_LsiLogic)); } else if (!RTStrICmp(ValueUnion.psz, "BusLogic")) @@ -976,7 +976,7 @@ rc = machine->RemoveStorageController(Bstr("LsiLogic")); if (FAILED(rc)) - CHECK_ERROR (machine, RemoveStorageController(Bstr("BusLogic"))); - - CHECK_ERROR (machine, + CHECK_ERROR(machine, RemoveStorageController(Bstr("BusLogic"))); + + CHECK_ERROR(machine, AddStorageController(Bstr("BusLogic"), StorageBus_SCSI, @@ -984,5 +984,5 @@ if (SUCCEEDED(rc)) - CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_BusLogic)); + CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_BusLogic)); } else @@ -997,7 +997,7 @@ ComPtr ctl; - CHECK_ERROR (machine, AddStorageController(Bstr("BusLogic"), StorageBus_SCSI, ctl.asOutParam())); + CHECK_ERROR(machine, AddStorageController(Bstr("BusLogic"), StorageBus_SCSI, ctl.asOutParam())); if (SUCCEEDED(rc)) - CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_BusLogic)); + CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_BusLogic)); } else if (!strcmp(ValueUnion.psz, "off") || !strcmp(ValueUnion.psz, "disable")) @@ -1005,5 +1005,5 @@ rc = machine->RemoveStorageController(Bstr("BusLogic")); if (FAILED(rc)) - CHECK_ERROR (machine, RemoveStorageController(Bstr("LsiLogic"))); + CHECK_ERROR(machine, RemoveStorageController(Bstr("LsiLogic"))); } break; @@ -1012,5 +1012,5 @@ case MODIFYVM_DVDPASSTHROUGH: // deprecated { - CHECK_ERROR (machine, PassthroughDevice(Bstr("IDE Controller"), 1, 0, !strcmp(ValueUnion.psz, "on"))); + CHECK_ERROR(machine, PassthroughDevice(Bstr("IDE Controller"), 1, 0, !strcmp(ValueUnion.psz, "on"))); break; } @@ -1030,5 +1030,5 @@ { ComPtr host; - CHECK_ERROR (a->virtualBox, COMGETTER(Host)(host.asOutParam())); + CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam())); rc = host->FindHostDVDDrive(Bstr(ValueUnion.psz + 5), dvdMedium.asOutParam()); if (!dvdMedium) @@ -1063,5 +1063,5 @@ { Bstr emptyUUID; - CHECK_ERROR (a->virtualBox, OpenDVDImage(Bstr(ValueUnion.psz), + CHECK_ERROR(a->virtualBox, OpenDVDImage(Bstr(ValueUnion.psz), emptyUUID, dvdMedium.asOutParam())); } @@ -1079,5 +1079,5 @@ if (dvdMedium) dvdMedium->COMGETTER(Id)(uuid.asOutParam()); - CHECK_ERROR (machine, MountMedium(Bstr("IDE Controller"), 1, 0, uuid)); + CHECK_ERROR(machine, MountMedium(Bstr("IDE Controller"), 1, 0, uuid)); break; } @@ -1134,5 +1134,5 @@ { Bstr emptyUUID; - CHECK_ERROR (a->virtualBox, + CHECK_ERROR(a->virtualBox, OpenFloppyImage(Bstr(ValueUnion.psz), emptyUUID, @@ -1147,5 +1147,5 @@ } floppyMedium->COMGETTER(Id)(uuid.asOutParam()); - CHECK_ERROR (machine, MountMedium(Bstr("Floppy Controller"), 0, 0, uuid)); + CHECK_ERROR(machine, MountMedium(Bstr("Floppy Controller"), 0, 0, uuid)); } break; @@ -1161,8 +1161,8 @@ GetOptState.pDef->pszLong); - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); + CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); - CHECK_ERROR (nic, COMSETTER(TraceFile)(Bstr(ValueUnion.psz))); + CHECK_ERROR(nic, COMSETTER(TraceFile)(Bstr(ValueUnion.psz))); break; } @@ -1177,14 +1177,14 @@ GetOptState.pDef->pszLong); - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); + CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (nic, COMSETTER(TraceEnabled)(TRUE)); + CHECK_ERROR(nic, COMSETTER(TraceEnabled)(TRUE)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (nic, COMSETTER(TraceEnabled)(FALSE)); + CHECK_ERROR(nic, COMSETTER(TraceEnabled)(FALSE)); } else @@ -1205,27 +1205,27 @@ GetOptState.pDef->pszLong); - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); + CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); if (!strcmp(ValueUnion.psz, "Am79C970A")) { - CHECK_ERROR (nic, COMSETTER(AdapterType)(NetworkAdapterType_Am79C970A)); + CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_Am79C970A)); } else if (!strcmp(ValueUnion.psz, "Am79C973")) { - CHECK_ERROR (nic, COMSETTER(AdapterType)(NetworkAdapterType_Am79C973)); + CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_Am79C973)); } #ifdef VBOX_WITH_E1000 else if (!strcmp(ValueUnion.psz, "82540EM")) { - CHECK_ERROR (nic, COMSETTER(AdapterType)(NetworkAdapterType_I82540EM)); + CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_I82540EM)); } else if (!strcmp(ValueUnion.psz, "82543GC")) { - CHECK_ERROR (nic, COMSETTER(AdapterType)(NetworkAdapterType_I82543GC)); + CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_I82543GC)); } else if (!strcmp(ValueUnion.psz, "82545EM")) { - CHECK_ERROR (nic, COMSETTER(AdapterType)(NetworkAdapterType_I82545EM)); + CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_I82545EM)); } #endif @@ -1233,5 +1233,5 @@ else if (!strcmp(ValueUnion.psz, "virtio")) { - CHECK_ERROR (nic, COMSETTER(AdapterType)(NetworkAdapterType_Virtio)); + CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_Virtio)); } #endif /* VBOX_WITH_VIRTIO */ @@ -1260,8 +1260,8 @@ } - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); + CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); - CHECK_ERROR (nic, COMSETTER(LineSpeed)(ValueUnion.u32)); + CHECK_ERROR(nic, COMSETTER(LineSpeed)(ValueUnion.u32)); break; } @@ -1276,31 +1276,31 @@ GetOptState.pDef->pszLong); - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); + CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); if (!strcmp(ValueUnion.psz, "none")) { - CHECK_ERROR (nic, COMSETTER(Enabled) (FALSE)); + CHECK_ERROR(nic, COMSETTER(Enabled)(FALSE)); } else if (!strcmp(ValueUnion.psz, "null")) { - CHECK_ERROR (nic, COMSETTER(Enabled) (TRUE)); - CHECK_ERROR (nic, Detach()); + CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE)); + CHECK_ERROR(nic, Detach()); } else if (!strcmp(ValueUnion.psz, "nat")) { - CHECK_ERROR (nic, COMSETTER(Enabled) (TRUE)); - CHECK_ERROR (nic, AttachToNAT()); + CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE)); + CHECK_ERROR(nic, AttachToNAT()); } else if ( !strcmp(ValueUnion.psz, "bridged") || !strcmp(ValueUnion.psz, "hostif")) /* backward compatibility */ { - CHECK_ERROR (nic, COMSETTER(Enabled) (TRUE)); - CHECK_ERROR (nic, AttachToBridgedInterface()); + CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE)); + CHECK_ERROR(nic, AttachToBridgedInterface()); } else if (!strcmp(ValueUnion.psz, "intnet")) { - CHECK_ERROR (nic, COMSETTER(Enabled) (TRUE)); - CHECK_ERROR (nic, AttachToInternalNetwork()); + CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE)); + CHECK_ERROR(nic, AttachToInternalNetwork()); } #if defined(VBOX_WITH_NETFLT) @@ -1308,6 +1308,6 @@ { - CHECK_ERROR (nic, COMSETTER(Enabled) (TRUE)); - CHECK_ERROR (nic, AttachToHostOnlyInterface()); + CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE)); + CHECK_ERROR(nic, AttachToHostOnlyInterface()); } #endif @@ -1329,14 +1329,14 @@ GetOptState.pDef->pszLong); - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); + CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (nic, COMSETTER(CableConnected)(TRUE)); + CHECK_ERROR(nic, COMSETTER(CableConnected)(TRUE)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (nic, COMSETTER(CableConnected)(FALSE)); + CHECK_ERROR(nic, COMSETTER(CableConnected)(FALSE)); } else @@ -1358,5 +1358,5 @@ GetOptState.pDef->pszLong); - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); + CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); @@ -1364,9 +1364,9 @@ if (!strcmp(ValueUnion.psz, "none")) { - CHECK_ERROR (nic, COMSETTER(HostInterface)(NULL)); + CHECK_ERROR(nic, COMSETTER(HostInterface)(NULL)); } else { - CHECK_ERROR (nic, COMSETTER(HostInterface)(Bstr(ValueUnion.psz))); + CHECK_ERROR(nic, COMSETTER(HostInterface)(Bstr(ValueUnion.psz))); } break; @@ -1382,5 +1382,5 @@ GetOptState.pDef->pszLong); - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); + CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); @@ -1388,9 +1388,9 @@ if (!strcmp(ValueUnion.psz, "none")) { - CHECK_ERROR (nic, COMSETTER(InternalNetwork)(NULL)); + CHECK_ERROR(nic, COMSETTER(InternalNetwork)(NULL)); } else { - CHECK_ERROR (nic, COMSETTER(InternalNetwork)(Bstr(ValueUnion.psz))); + CHECK_ERROR(nic, COMSETTER(InternalNetwork)(Bstr(ValueUnion.psz))); } break; @@ -1406,8 +1406,8 @@ GetOptState.pDef->pszLong); - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); + CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); - CHECK_ERROR (nic, COMSETTER(NATNetwork)(Bstr(ValueUnion.psz))); + CHECK_ERROR(nic, COMSETTER(NATNetwork)(Bstr(ValueUnion.psz))); break; @@ -1423,5 +1423,5 @@ GetOptState.pDef->pszLong); - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); + CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); @@ -1429,9 +1429,9 @@ if (!strcmp(ValueUnion.psz, "auto")) { - CHECK_ERROR (nic, COMSETTER(MACAddress)(NULL)); + CHECK_ERROR(nic, COMSETTER(MACAddress)(NULL)); } else { - CHECK_ERROR (nic, COMSETTER(MACAddress)(Bstr(ValueUnion.psz))); + CHECK_ERROR(nic, COMSETTER(MACAddress)(Bstr(ValueUnion.psz))); } break; @@ -1448,10 +1448,10 @@ GetOptState.pDef->pszLong); - CHECK_ERROR_BREAK (machine, GetSerialPort (GetOptState.uIndex - 1, uart.asOutParam())); + CHECK_ERROR_BREAK(machine, GetSerialPort(GetOptState.uIndex - 1, uart.asOutParam())); ASSERT(uart); if (!strcmp(ValueUnion.psz, "disconnected")) { - CHECK_ERROR (uart, COMSETTER(HostMode) (PortMode_Disconnected)); + CHECK_ERROR(uart, COMSETTER(HostMode)(PortMode_Disconnected)); } else if ( !strcmp(ValueUnion.psz, "server") @@ -1467,25 +1467,25 @@ GetOptState.pDef->pszLong); - CHECK_ERROR (uart, COMSETTER(Path) (Bstr(ValueUnion.psz))); + CHECK_ERROR(uart, COMSETTER(Path)(Bstr(ValueUnion.psz))); if (!strcmp(pszMode, "server")) { - CHECK_ERROR (uart, COMSETTER(HostMode) (PortMode_HostPipe)); - CHECK_ERROR (uart, COMSETTER(Server) (TRUE)); + CHECK_ERROR(uart, COMSETTER(HostMode)(PortMode_HostPipe)); + CHECK_ERROR(uart, COMSETTER(Server)(TRUE)); } else if (!strcmp(pszMode, "client")) { - CHECK_ERROR (uart, COMSETTER(HostMode) (PortMode_HostPipe)); - CHECK_ERROR (uart, COMSETTER(Server) (FALSE)); + CHECK_ERROR(uart, COMSETTER(HostMode)(PortMode_HostPipe)); + CHECK_ERROR(uart, COMSETTER(Server)(FALSE)); } else if (!strcmp(pszMode, "file")) { - CHECK_ERROR (uart, COMSETTER(HostMode) (PortMode_RawFile)); + CHECK_ERROR(uart, COMSETTER(HostMode)(PortMode_RawFile)); } } else { - CHECK_ERROR (uart, COMSETTER(Path) (Bstr(ValueUnion.psz))); - CHECK_ERROR (uart, COMSETTER(HostMode) (PortMode_HostDevice)); + CHECK_ERROR(uart, COMSETTER(Path)(Bstr(ValueUnion.psz))); + CHECK_ERROR(uart, COMSETTER(HostMode)(PortMode_HostDevice)); } break; @@ -1501,9 +1501,9 @@ GetOptState.pDef->pszLong); - CHECK_ERROR_BREAK (machine, GetSerialPort (GetOptState.uIndex - 1, uart.asOutParam())); + CHECK_ERROR_BREAK(machine, GetSerialPort(GetOptState.uIndex - 1, uart.asOutParam())); ASSERT(uart); if (!strcmp(ValueUnion.psz, "off") || !strcmp(ValueUnion.psz, "disable")) - CHECK_ERROR (uart, COMSETTER(Enabled) (FALSE)); + CHECK_ERROR(uart, COMSETTER(Enabled)(FALSE)); else { @@ -1517,12 +1517,12 @@ GetOptState.pDef->pszLong); - CHECK_ERROR (uart, COMSETTER(IRQ) (ValueUnion.u32)); + CHECK_ERROR(uart, COMSETTER(IRQ)(ValueUnion.u32)); vrc = RTStrToUInt32Ex(pszIOBase, NULL, 0, &uVal); if (vrc != VINF_SUCCESS || uVal == 0) return errorArgument("Error parsing UART I/O base '%s'", pszIOBase); - CHECK_ERROR (uart, COMSETTER(IOBase) (uVal)); - - CHECK_ERROR (uart, COMSETTER(Enabled) (TRUE)); + CHECK_ERROR(uart, COMSETTER(IOBase)(uVal)); + + CHECK_ERROR(uart, COMSETTER(Enabled)(TRUE)); } break; @@ -1532,5 +1532,5 @@ { if (ValueUnion.u32 > 0) - CHECK_ERROR (machine, COMSETTER(StatisticsUpdateInterval)(ValueUnion.u32)); + CHECK_ERROR(machine, COMSETTER(StatisticsUpdateInterval)(ValueUnion.u32)); break; } @@ -1540,5 +1540,5 @@ { if (ValueUnion.u32 > 0) - CHECK_ERROR (machine, COMSETTER(MemoryBalloonSize)(ValueUnion.u32)); + CHECK_ERROR(machine, COMSETTER(MemoryBalloonSize)(ValueUnion.u32)); break; } @@ -1554,7 +1554,7 @@ if (!strcmp(ValueUnion.psz, "sb16")) - CHECK_ERROR (audioAdapter, COMSETTER(AudioController)(AudioControllerType_SB16)); + CHECK_ERROR(audioAdapter, COMSETTER(AudioController)(AudioControllerType_SB16)); else if (!strcmp(ValueUnion.psz, "ac97")) - CHECK_ERROR (audioAdapter, COMSETTER(AudioController)(AudioControllerType_AC97)); + CHECK_ERROR(audioAdapter, COMSETTER(AudioController)(AudioControllerType_AC97)); else { @@ -1577,10 +1577,10 @@ if (!strcmp(ValueUnion.psz, "none")) { - CHECK_ERROR (audioAdapter, COMSETTER(Enabled)(false)); + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(false)); } else if (!strcmp(ValueUnion.psz, "null")) { - CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Null)); - CHECK_ERROR (audioAdapter, COMSETTER(Enabled)(true)); + CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Null)); + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); } #ifdef RT_OS_WINDOWS @@ -1588,12 +1588,12 @@ else if (!strcmp(ValueUnion.psz, "winmm")) { - CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_WinMM)); - CHECK_ERROR (audioAdapter, COMSETTER(Enabled)(true)); + CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_WinMM)); + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); } #endif else if (!strcmp(ValueUnion.psz, "dsound")) { - CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_DirectSound)); - CHECK_ERROR (audioAdapter, COMSETTER(Enabled)(true)); + CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_DirectSound)); + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); } #endif /* RT_OS_WINDOWS */ @@ -1601,12 +1601,12 @@ else if (!strcmp(ValueUnion.psz, "oss")) { - CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS)); - CHECK_ERROR (audioAdapter, COMSETTER(Enabled)(true)); + CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS)); + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); } # ifdef VBOX_WITH_ALSA else if (!strcmp(ValueUnion.psz, "alsa")) { - CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_ALSA)); - CHECK_ERROR (audioAdapter, COMSETTER(Enabled)(true)); + CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_ALSA)); + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); } # endif @@ -1614,6 +1614,6 @@ else if (!strcmp(ValueUnion.psz, "pulse")) { - CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Pulse)); - CHECK_ERROR (audioAdapter, COMSETTER(Enabled)(true)); + CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Pulse)); + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); } # endif @@ -1622,6 +1622,6 @@ else if (!strcmp(ValueUnion.psz, "solaudio")) { - CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_SolAudio)); - CHECK_ERROR (audioAdapter, COMSETTER(Enabled)(true)); + CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_SolAudio)); + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); } @@ -1629,6 +1629,6 @@ else if (!strcmp(ValueUnion.psz, "oss")) { - CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS)); - CHECK_ERROR (audioAdapter, COMSETTER(Enabled)(true)); + CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS)); + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); } # endif @@ -1638,6 +1638,6 @@ else if (!strcmp(ValueUnion.psz, "coreaudio")) { - CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_CoreAudio)); - CHECK_ERROR (audioAdapter, COMSETTER(Enabled)(true)); + CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_CoreAudio)); + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); } @@ -1658,17 +1658,17 @@ if (!strcmp(ValueUnion.psz, "disabled")) { - CHECK_ERROR (machine, COMSETTER(ClipboardMode)(ClipboardMode_Disabled)); + CHECK_ERROR(machine, COMSETTER(ClipboardMode)(ClipboardMode_Disabled)); } else if (!strcmp(ValueUnion.psz, "hosttoguest")) { - CHECK_ERROR (machine, COMSETTER(ClipboardMode)(ClipboardMode_HostToGuest)); + CHECK_ERROR(machine, COMSETTER(ClipboardMode)(ClipboardMode_HostToGuest)); } else if (!strcmp(ValueUnion.psz, "guesttohost")) { - CHECK_ERROR (machine, COMSETTER(ClipboardMode)(ClipboardMode_GuestToHost)); + CHECK_ERROR(machine, COMSETTER(ClipboardMode)(ClipboardMode_GuestToHost)); } else if (!strcmp(ValueUnion.psz, "bidirectional")) { - CHECK_ERROR (machine, COMSETTER(ClipboardMode)(ClipboardMode_Bidirectional)); + CHECK_ERROR(machine, COMSETTER(ClipboardMode)(ClipboardMode_Bidirectional)); } else @@ -1691,7 +1691,7 @@ if (!strcmp(ValueUnion.psz, "default")) - CHECK_ERROR (vrdpServer, COMSETTER(Ports)(Bstr("0"))); - else - CHECK_ERROR (vrdpServer, COMSETTER(Ports)(Bstr(ValueUnion.psz))); + CHECK_ERROR(vrdpServer, COMSETTER(Ports)(Bstr("0"))); + else + CHECK_ERROR(vrdpServer, COMSETTER(Ports)(Bstr(ValueUnion.psz))); } break; @@ -1706,5 +1706,5 @@ ASSERT(vrdpServer); - CHECK_ERROR (vrdpServer, COMSETTER(NetAddress)(Bstr(ValueUnion.psz))); + CHECK_ERROR(vrdpServer, COMSETTER(NetAddress)(Bstr(ValueUnion.psz))); } break; @@ -1721,13 +1721,13 @@ if (!strcmp(ValueUnion.psz, "null")) { - CHECK_ERROR (vrdpServer, COMSETTER(AuthType)(VRDPAuthType_Null)); + CHECK_ERROR(vrdpServer, COMSETTER(AuthType)(VRDPAuthType_Null)); } else if (!strcmp(ValueUnion.psz, "external")) { - CHECK_ERROR (vrdpServer, COMSETTER(AuthType)(VRDPAuthType_External)); + CHECK_ERROR(vrdpServer, COMSETTER(AuthType)(VRDPAuthType_External)); } else if (!strcmp(ValueUnion.psz, "guest")) { - CHECK_ERROR (vrdpServer, COMSETTER(AuthType)(VRDPAuthType_Guest)); + CHECK_ERROR(vrdpServer, COMSETTER(AuthType)(VRDPAuthType_Guest)); } else @@ -1750,9 +1750,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (vrdpServer, COMSETTER(AllowMultiConnection)(true)); + CHECK_ERROR(vrdpServer, COMSETTER(AllowMultiConnection)(true)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (vrdpServer, COMSETTER(AllowMultiConnection)(false)); + CHECK_ERROR(vrdpServer, COMSETTER(AllowMultiConnection)(false)); } else @@ -1775,9 +1775,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (vrdpServer, COMSETTER(ReuseSingleConnection)(true)); + CHECK_ERROR(vrdpServer, COMSETTER(ReuseSingleConnection)(true)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (vrdpServer, COMSETTER(ReuseSingleConnection)(false)); + CHECK_ERROR(vrdpServer, COMSETTER(ReuseSingleConnection)(false)); } else @@ -1800,9 +1800,9 @@ if (!strcmp(ValueUnion.psz, "on")) { - CHECK_ERROR (vrdpServer, COMSETTER(Enabled)(true)); + CHECK_ERROR(vrdpServer, COMSETTER(Enabled)(true)); } else if (!strcmp(ValueUnion.psz, "off")) { - CHECK_ERROR (vrdpServer, COMSETTER(Enabled)(false)); + CHECK_ERROR(vrdpServer, COMSETTER(Enabled)(false)); } else @@ -1821,11 +1821,11 @@ { ComPtr UsbCtl; - CHECK_ERROR (machine, COMGETTER(USBController)(UsbCtl.asOutParam())); + CHECK_ERROR(machine, COMGETTER(USBController)(UsbCtl.asOutParam())); if (SUCCEEDED(rc)) { if (!strcmp(ValueUnion.psz, "on") || !strcmp(ValueUnion.psz, "enable")) - CHECK_ERROR (UsbCtl, COMSETTER(EnabledEhci)(true)); + CHECK_ERROR(UsbCtl, COMSETTER(EnabledEhci)(true)); else if (!strcmp(ValueUnion.psz, "off") || !strcmp(ValueUnion.psz, "disable")) - CHECK_ERROR (UsbCtl, COMSETTER(EnabledEhci)(false)); + CHECK_ERROR(UsbCtl, COMSETTER(EnabledEhci)(false)); else return errorArgument("Invalid --usbehci argument '%s'", ValueUnion.psz); @@ -1840,11 +1840,11 @@ { ComPtr UsbCtl; - CHECK_ERROR (machine, COMGETTER(USBController)(UsbCtl.asOutParam())); + CHECK_ERROR(machine, COMGETTER(USBController)(UsbCtl.asOutParam())); if (SUCCEEDED(rc)) { if (!strcmp(ValueUnion.psz, "on") || !strcmp(ValueUnion.psz, "enable")) - CHECK_ERROR (UsbCtl, COMSETTER(Enabled)(true)); + CHECK_ERROR(UsbCtl, COMSETTER(Enabled)(true)); else if (!strcmp(ValueUnion.psz, "off") || !strcmp(ValueUnion.psz, "disable")) - CHECK_ERROR (UsbCtl, COMSETTER(Enabled)(false)); + CHECK_ERROR(UsbCtl, COMSETTER(Enabled)(false)); else return errorArgument("Invalid --usb argument '%s'", ValueUnion.psz); @@ -1859,7 +1859,7 @@ { if (!strcmp(ValueUnion.psz, "default")) - CHECK_ERROR (machine, COMSETTER(SnapshotFolder)(NULL)); - else - CHECK_ERROR (machine, COMSETTER(SnapshotFolder)(Bstr(ValueUnion.psz))); + CHECK_ERROR(machine, COMSETTER(SnapshotFolder)(NULL)); + else + CHECK_ERROR(machine, COMSETTER(SnapshotFolder)(Bstr(ValueUnion.psz))); } break; @@ -1871,7 +1871,7 @@ { if (!strcmp(ValueUnion.psz, "on")) - CHECK_ERROR (machine, COMSETTER(TeleporterEnabled)(1)); + CHECK_ERROR(machine, COMSETTER(TeleporterEnabled)(1)); else if (!strcmp(ValueUnion.psz, "off")) - CHECK_ERROR (machine, COMSETTER(TeleporterEnabled)(0)); + CHECK_ERROR(machine, COMSETTER(TeleporterEnabled)(0)); else return errorArgument("Invalid --teleporterenabled value '%s'", ValueUnion.psz); @@ -1912,5 +1912,5 @@ /* commit changes */ if (SUCCEEDED(rc)) - CHECK_ERROR (machine, SaveSettings()); + CHECK_ERROR(machine, SaveSettings()); /* it's important to always close sessions */ Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp (revision 23933) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp (revision 23934) @@ -79,6 +79,6 @@ return errorSyntax(USAGE_STORAGEATTACH, "Too many parameters"); - RTGetOptInit (&GetState, a->argc, a->argv, g_aStorageAttachOptions, - RT_ELEMENTS(g_aStorageAttachOptions), 1, 0 /* fFlags */); + RTGetOptInit(&GetState, a->argc, a->argv, g_aStorageAttachOptions, + RT_ELEMENTS(g_aStorageAttachOptions), 1, 0 /* fFlags */); while ( SUCCEEDED(rc) @@ -156,9 +156,9 @@ if (!Guid(machineuuid).isEmpty()) { - CHECK_ERROR_RET (a->virtualBox, GetMachine (machineuuid, machine.asOutParam()), 1); + CHECK_ERROR_RET(a->virtualBox, GetMachine(machineuuid, machine.asOutParam()), 1); } else { - CHECK_ERROR_RET (a->virtualBox, FindMachine(Bstr(a->argv[0]), machine.asOutParam()), 1); + CHECK_ERROR_RET(a->virtualBox, FindMachine(Bstr(a->argv[0]), machine.asOutParam()), 1); machine->COMGETTER(Id)(machineuuid.asOutParam()); } @@ -169,5 +169,5 @@ { /* try to open an existing session for the VM */ - CHECK_ERROR_RET (a->virtualBox, OpenExistingSession (a->session, machineuuid), 1); + CHECK_ERROR_RET(a->virtualBox, OpenExistingSession(a->session, machineuuid), 1); fRunTime = true; } @@ -201,5 +201,5 @@ if (!RTStrICmp(pszMedium, "none")) { - CHECK_ERROR (machine, DetachDevice(Bstr(pszCtl), port, device)); + CHECK_ERROR(machine, DetachDevice(Bstr(pszCtl), port, device)); } else if (!RTStrICmp(pszMedium, "emptydrive")) @@ -212,5 +212,5 @@ { DeviceType_T deviceType; - mediumAttachment->COMGETTER(Type) (&deviceType); + mediumAttachment->COMGETTER(Type)(&deviceType); if ( (deviceType == DeviceType_DVD) @@ -218,5 +218,5 @@ { /* just unmount the floppy/dvd */ - CHECK_ERROR (machine, MountMedium(Bstr(pszCtl), port, device, Bstr(""))); + CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, Bstr(""))); } else @@ -240,5 +240,5 @@ DeviceType_T deviceType = DeviceType_Null; - CHECK_ERROR (storageCtl, COMGETTER(Bus)(&storageBus)); + CHECK_ERROR(storageCtl, COMGETTER(Bus)(&storageBus)); if (storageBus == StorageBus_Floppy) @@ -249,5 +249,5 @@ /* attach a empty floppy/dvd drive after removing previous attachment */ machine->DetachDevice(Bstr(pszCtl), port, device); - CHECK_ERROR (machine, AttachDevice(Bstr(pszCtl), port, device, deviceType, Bstr(""))); + CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl), port, device, deviceType, Bstr(""))); } } @@ -274,5 +274,5 @@ { DeviceType_T deviceType; - mediumAttachement->COMGETTER(Type) (&deviceType); + mediumAttachement->COMGETTER(Type)(&deviceType); if (deviceType != DeviceType_DVD) @@ -295,5 +295,5 @@ { ComPtr host; - CHECK_ERROR (a->virtualBox, COMGETTER(Host)(host.asOutParam())); + CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam())); rc = host->FindHostDVDDrive(Bstr(pszMedium + 5), dvdMedium.asOutParam()); if (!dvdMedium) @@ -329,5 +329,5 @@ { Bstr emptyUUID; - CHECK_ERROR (a->virtualBox, OpenDVDImage(Bstr(pszMedium), + CHECK_ERROR(a->virtualBox, OpenDVDImage(Bstr(pszMedium), emptyUUID, dvdMedium.asOutParam())); } @@ -345,5 +345,5 @@ { dvdMedium->COMGETTER(Id)(uuid.asOutParam()); - CHECK_ERROR (machine, MountMedium(Bstr(pszCtl), port, device, uuid)); + CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, uuid)); } } @@ -358,5 +358,5 @@ { DeviceType_T deviceType; - mediumAttachement->COMGETTER(Type) (&deviceType); + mediumAttachement->COMGETTER(Type)(&deviceType); if (deviceType != DeviceType_HardDisk) @@ -376,5 +376,5 @@ { /* open the new hard disk object */ - CHECK_ERROR (a->virtualBox, + CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(pszMedium), AccessMode_ReadWrite, false, Bstr(""), @@ -386,5 +386,5 @@ { hardDisk->COMGETTER(Id)(uuid.asOutParam()); - CHECK_ERROR (machine, AttachDevice(Bstr(pszCtl), port, device, DeviceType_HardDisk, uuid)); + CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl), port, device, DeviceType_HardDisk, uuid)); } else @@ -403,5 +403,5 @@ if ( !fRunTime && !floppyAttachment) - CHECK_ERROR (machine, AttachDevice(Bstr(pszCtl), port, device, DeviceType_Floppy, Bstr(""))); + CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl), port, device, DeviceType_Floppy, Bstr(""))); /* host drive? */ @@ -410,5 +410,5 @@ ComPtr host; - CHECK_ERROR (a->virtualBox, COMGETTER(Host)(host.asOutParam())); + CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam())); rc = host->FindHostFloppyDrive(Bstr(pszMedium + 5), floppyMedium.asOutParam()); if (!floppyMedium) @@ -431,5 +431,5 @@ { Bstr emptyUUID; - CHECK_ERROR (a->virtualBox, + CHECK_ERROR(a->virtualBox, OpenFloppyImage(Bstr(pszMedium), emptyUUID, @@ -448,5 +448,5 @@ { floppyMedium->COMGETTER(Id)(uuid.asOutParam()); - CHECK_ERROR (machine, MountMedium(Bstr(pszCtl), port, device, uuid)); + CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, uuid)); } } @@ -463,5 +463,5 @@ ComPtr mattach; - CHECK_ERROR (machine, GetMediumAttachment(Bstr(pszCtl), port, device, mattach.asOutParam())); + CHECK_ERROR(machine, GetMediumAttachment(Bstr(pszCtl), port, device, mattach.asOutParam())); if (SUCCEEDED(rc)) @@ -469,9 +469,9 @@ if (!RTStrICmp(pszPassThrough, "on")) { - CHECK_ERROR (machine, PassthroughDevice(Bstr(pszCtl), port, device, TRUE)); + CHECK_ERROR(machine, PassthroughDevice(Bstr(pszCtl), port, device, TRUE)); } else if (!RTStrICmp(pszPassThrough, "off")) { - CHECK_ERROR (machine, PassthroughDevice(Bstr(pszCtl), port, device, FALSE)); + CHECK_ERROR(machine, PassthroughDevice(Bstr(pszCtl), port, device, FALSE)); } else @@ -490,5 +490,5 @@ /* commit changes */ if (SUCCEEDED(rc)) - CHECK_ERROR (machine, SaveSettings()); + CHECK_ERROR(machine, SaveSettings()); leave: @@ -608,14 +608,14 @@ if (!Guid(machineuuid).isEmpty()) { - CHECK_ERROR_RET (a->virtualBox, GetMachine (machineuuid, machine.asOutParam()), 1); + CHECK_ERROR_RET(a->virtualBox, GetMachine (machineuuid, machine.asOutParam()), 1); } else { - CHECK_ERROR_RET (a->virtualBox, FindMachine(Bstr(a->argv[0]), machine.asOutParam()), 1); + CHECK_ERROR_RET(a->virtualBox, FindMachine(Bstr(a->argv[0]), machine.asOutParam()), 1); machine->COMGETTER(Id)(machineuuid.asOutParam()); } /* open a session for the VM */ - CHECK_ERROR_RET (a->virtualBox, OpenSession (a->session, machineuuid), 1); + CHECK_ERROR_RET(a->virtualBox, OpenSession (a->session, machineuuid), 1); /* get the mutable session machine */ @@ -634,5 +634,5 @@ com::SafeIfaceArray mediumAttachments; - CHECK_ERROR (machine, + CHECK_ERROR(machine, GetMediumAttachmentsOfController(Bstr(pszCtl), ComSafeArrayAsOutParam(mediumAttachments))); @@ -643,11 +643,11 @@ LONG device = 0; - CHECK_ERROR (mediumAttach, COMGETTER(Port)(&port)); - CHECK_ERROR (mediumAttach, COMGETTER(Device)(&device)); - CHECK_ERROR (machine, DetachDevice(Bstr(pszCtl), port, device)); + CHECK_ERROR(mediumAttach, COMGETTER(Port)(&port)); + CHECK_ERROR(mediumAttach, COMGETTER(Device)(&device)); + CHECK_ERROR(machine, DetachDevice(Bstr(pszCtl), port, device)); } if (SUCCEEDED(rc)) - CHECK_ERROR (machine, RemoveStorageController(Bstr(pszCtl))); + CHECK_ERROR(machine, RemoveStorageController(Bstr(pszCtl))); else errorArgument("Can't detach the devices connected to '%s' Controller\n" @@ -662,17 +662,17 @@ if (!RTStrICmp(pszBusType, "ide")) { - CHECK_ERROR (machine, AddStorageController(Bstr(pszCtl), StorageBus_IDE, ctl.asOutParam())); + CHECK_ERROR(machine, AddStorageController(Bstr(pszCtl), StorageBus_IDE, ctl.asOutParam())); } else if (!RTStrICmp(pszBusType, "sata")) { - CHECK_ERROR (machine, AddStorageController(Bstr(pszCtl), StorageBus_SATA, ctl.asOutParam())); + CHECK_ERROR(machine, AddStorageController(Bstr(pszCtl), StorageBus_SATA, ctl.asOutParam())); } else if (!RTStrICmp(pszBusType, "scsi")) { - CHECK_ERROR (machine, AddStorageController(Bstr(pszCtl), StorageBus_SCSI, ctl.asOutParam())); + CHECK_ERROR(machine, AddStorageController(Bstr(pszCtl), StorageBus_SCSI, ctl.asOutParam())); } else if (!RTStrICmp(pszBusType, "floppy")) { - CHECK_ERROR (machine, AddStorageController(Bstr(pszCtl), StorageBus_Floppy, ctl.asOutParam())); + CHECK_ERROR(machine, AddStorageController(Bstr(pszCtl), StorageBus_Floppy, ctl.asOutParam())); } else @@ -688,5 +688,5 @@ ComPtr ctl; - CHECK_ERROR (machine, GetStorageControllerByName(Bstr(pszCtl), ctl.asOutParam())); + CHECK_ERROR(machine, GetStorageControllerByName(Bstr(pszCtl), ctl.asOutParam())); if (SUCCEEDED(rc)) @@ -694,29 +694,29 @@ if (!RTStrICmp(pszCtlType, "lsilogic")) { - CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_LsiLogic)); + CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_LsiLogic)); } else if (!RTStrICmp(pszCtlType, "buslogic")) { - CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_BusLogic)); + CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_BusLogic)); } else if (!RTStrICmp(pszCtlType, "intelahci")) { - CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_IntelAhci)); + CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_IntelAhci)); } else if (!RTStrICmp(pszCtlType, "piix3")) { - CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_PIIX3)); + CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_PIIX3)); } else if (!RTStrICmp(pszCtlType, "piix4")) { - CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_PIIX4)); + CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_PIIX4)); } else if (!RTStrICmp(pszCtlType, "ich6")) { - CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_ICH6)); + CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_ICH6)); } else if (!RTStrICmp(pszCtlType, "i82078")) { - CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_I82078)); + CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_I82078)); } else @@ -738,9 +738,9 @@ ComPtr ctl; - CHECK_ERROR (machine, GetStorageControllerByName(Bstr(pszCtl), ctl.asOutParam())); + CHECK_ERROR(machine, GetStorageControllerByName(Bstr(pszCtl), ctl.asOutParam())); if (SUCCEEDED(rc)) { - CHECK_ERROR (ctl, COMSETTER(PortCount)(sataportcount)); + CHECK_ERROR(ctl, COMSETTER(PortCount)(sataportcount)); } else @@ -757,9 +757,9 @@ ComPtr ctl; - CHECK_ERROR (machine, GetStorageControllerByName(Bstr(pszCtl), ctl.asOutParam())); + CHECK_ERROR(machine, GetStorageControllerByName(Bstr(pszCtl), ctl.asOutParam())); if (SUCCEEDED(rc)) { - CHECK_ERROR (ctl, SetIDEEmulationPort(satabootdev, sataidedev)); + CHECK_ERROR(ctl, SetIDEEmulationPort(satabootdev, sataidedev)); } else @@ -773,5 +773,5 @@ /* commit changes */ if (SUCCEEDED(rc)) - CHECK_ERROR (machine, SaveSettings()); + CHECK_ERROR(machine, SaveSettings()); /* it's important to always close sessions */