Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 23872) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 23873) @@ -209,6 +209,6 @@ Bstr name; Bstr machineuuid (a->argv[0]); - RTGETOPTUNION pValueUnion; - RTGETOPTSTATE pGetState; + RTGETOPTUNION ValueUnion; + RTGETOPTSTATE GetOptState; ComPtr machine; ComPtr biosSettings; @@ -251,9 +251,9 @@ machine->COMGETTER(BIOSSettings)(biosSettings.asOutParam()); - RTGetOptInit (&pGetState, a->argc, a->argv, g_aModifyVMOptions, + RTGetOptInit (&GetOptState, a->argc, a->argv, g_aModifyVMOptions, RT_ELEMENTS(g_aModifyVMOptions), 1, 0 /* fFlags */); while ( SUCCEEDED (rc) - && (c = RTGetOpt(&pGetState, &pValueUnion))) + && (c = RTGetOpt(&GetOptState, &ValueUnion))) { switch (c) @@ -261,21 +261,21 @@ case MODIFYVM_NAME: { - if (pValueUnion.psz) - CHECK_ERROR (machine, COMSETTER(Name)(Bstr(pValueUnion.psz))); + if (ValueUnion.psz) + CHECK_ERROR (machine, COMSETTER(Name)(Bstr(ValueUnion.psz))); break; } case MODIFYVM_OSTYPE: { - if (pValueUnion.psz) + if (ValueUnion.psz) { ComPtr guestOSType; - CHECK_ERROR (a->virtualBox, GetGuestOSType(Bstr(pValueUnion.psz), guestOSType.asOutParam())); + CHECK_ERROR (a->virtualBox, GetGuestOSType(Bstr(ValueUnion.psz), guestOSType.asOutParam())); if (SUCCEEDED(rc) && guestOSType) { - CHECK_ERROR (machine, COMSETTER(OSTypeId)(Bstr(pValueUnion.psz))); - } - else - { - errorArgument("Invalid guest OS type '%s'", Utf8Str(pValueUnion.psz).raw()); + CHECK_ERROR (machine, COMSETTER(OSTypeId)(Bstr(ValueUnion.psz))); + } + else + { + errorArgument("Invalid guest OS type '%s'", Utf8Str(ValueUnion.psz).raw()); rc = E_FAIL; } @@ -286,6 +286,6 @@ case MODIFYVM_MEMORY: { - if (pValueUnion.u32 > 0) - CHECK_ERROR (machine, COMSETTER(MemorySize)(pValueUnion.u32)); + if (ValueUnion.u32 > 0) + CHECK_ERROR (machine, COMSETTER(MemorySize)(ValueUnion.u32)); break; } @@ -293,6 +293,6 @@ case MODIFYVM_VRAM: { - if (pValueUnion.u32 > 0) - CHECK_ERROR (machine, COMSETTER(VRAMSize)(pValueUnion.u32)); + if (ValueUnion.u32 > 0) + CHECK_ERROR (machine, COMSETTER(VRAMSize)(ValueUnion.u32)); break; } @@ -300,11 +300,11 @@ case MODIFYVM_FIRMWARE: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "efi")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "efi")) { CHECK_ERROR (machine, COMSETTER(FirmwareType)(FirmwareType_EFI)); } - else if (!strcmp(pValueUnion.psz, "bios")) + else if (!strcmp(ValueUnion.psz, "bios")) { CHECK_ERROR (machine, COMSETTER(FirmwareType)(FirmwareType_BIOS)); @@ -312,5 +312,5 @@ else { - errorArgument("Invalid --firmware argument '%s'", pValueUnion.psz); + errorArgument("Invalid --firmware argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -321,11 +321,11 @@ case MODIFYVM_ACPI: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (biosSettings, COMSETTER(ACPIEnabled)(true)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (biosSettings, COMSETTER(ACPIEnabled)(false)); @@ -333,5 +333,5 @@ else { - errorArgument("Invalid --acpi argument '%s'", pValueUnion.psz); + errorArgument("Invalid --acpi argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -342,11 +342,11 @@ case MODIFYVM_IOAPIC: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (biosSettings, COMSETTER(IOAPICEnabled)(true)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (biosSettings, COMSETTER(IOAPICEnabled)(false)); @@ -354,5 +354,5 @@ else { - errorArgument("Invalid --ioapic argument '%s'", pValueUnion.psz); + errorArgument("Invalid --ioapic argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -363,11 +363,11 @@ case MODIFYVM_PAE: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (machine, SetCpuProperty(CpuPropertyType_PAE, true)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (machine, SetCpuProperty(CpuPropertyType_PAE, false)); @@ -375,5 +375,5 @@ else { - errorArgument("Invalid --pae argument '%s'", pValueUnion.psz); + errorArgument("Invalid --pae argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -384,11 +384,11 @@ case MODIFYVM_SYNTHCPU: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (machine, SetCpuProperty(CpuPropertyType_Synthetic, true)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (machine, SetCpuProperty(CpuPropertyType_Synthetic, false)); @@ -396,5 +396,5 @@ else { - errorArgument("Invalid --synthcpu argument '%s'", pValueUnion.psz); + errorArgument("Invalid --synthcpu argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -405,11 +405,11 @@ case MODIFYVM_HWVIRTEX: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_Enabled, TRUE)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_Enabled, FALSE)); @@ -417,5 +417,5 @@ else { - errorArgument("Invalid --hwvirtex argument '%s'", pValueUnion.psz); + errorArgument("Invalid --hwvirtex argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -426,11 +426,11 @@ case MODIFYVM_HWVIRTEXEXCLUSIVE: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_Exclusive, TRUE)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_Exclusive, FALSE)); @@ -438,5 +438,5 @@ else { - errorArgument("Invalid --hwvirtex argument '%s'", pValueUnion.psz); + errorArgument("Invalid --hwvirtex argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -447,11 +447,11 @@ case MODIFYVM_NESTEDPAGING: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_NestedPaging, TRUE)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_NestedPaging, FALSE)); @@ -459,5 +459,5 @@ else { - errorArgument("Invalid --nestedpaging argument '%s'", pValueUnion.psz); + errorArgument("Invalid --nestedpaging argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -468,11 +468,11 @@ case MODIFYVM_VTXVPID: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_VPID, TRUE)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_VPID, FALSE)); @@ -480,5 +480,5 @@ else { - errorArgument("Invalid --vtxvpid argument '%s'", pValueUnion.psz); + errorArgument("Invalid --vtxvpid argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -489,6 +489,6 @@ case MODIFYVM_CPUS: { - if (pValueUnion.u32 > 0) - CHECK_ERROR (machine, COMSETTER(CPUCount)(pValueUnion.u32)); + if (ValueUnion.u32 > 0) + CHECK_ERROR (machine, COMSETTER(CPUCount)(ValueUnion.u32)); break; } @@ -496,6 +496,6 @@ case MODIFYVM_MONITORCOUNT: { - if (pValueUnion.u32 > 0) - CHECK_ERROR (machine, COMSETTER(MonitorCount)(pValueUnion.u32)); + if (ValueUnion.u32 > 0) + CHECK_ERROR (machine, COMSETTER(MonitorCount)(ValueUnion.u32)); break; } @@ -503,11 +503,11 @@ case MODIFYVM_ACCELERATE3D: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (machine, COMSETTER(Accelerate3DEnabled)(true)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (machine, COMSETTER(Accelerate3DEnabled)(false)); @@ -515,5 +515,5 @@ else { - errorArgument("Invalid --accelerate3d argument '%s'", pValueUnion.psz); + errorArgument("Invalid --accelerate3d argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -525,11 +525,11 @@ { #ifdef VBOX_WITH_VIDEOHWACCEL - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (machine, COMSETTER(Accelerate2DVideoEnabled)(true)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (machine, COMSETTER(Accelerate2DVideoEnabled)(false)); @@ -537,5 +537,5 @@ else { - errorArgument("Invalid --accelerate2dvideo argument '%s'", pValueUnion.psz); + errorArgument("Invalid --accelerate2dvideo argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -547,11 +547,11 @@ case MODIFYVM_BIOSLOGOFADEIN: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (biosSettings, COMSETTER(LogoFadeIn)(true)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (biosSettings, COMSETTER(LogoFadeIn)(false)); @@ -559,5 +559,5 @@ else { - errorArgument("Invalid --bioslogofadein argument '%s'", pValueUnion.psz); + errorArgument("Invalid --bioslogofadein argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -568,11 +568,11 @@ case MODIFYVM_BIOSLOGOFADEOUT: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (biosSettings, COMSETTER(LogoFadeOut)(true)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (biosSettings, COMSETTER(LogoFadeOut)(false)); @@ -580,5 +580,5 @@ else { - errorArgument("Invalid --bioslogofadeout argument '%s'", pValueUnion.psz); + errorArgument("Invalid --bioslogofadeout argument '%s'", ValueUnion.psz); rc = E_FAIL; break; @@ -590,6 +590,6 @@ case MODIFYVM_BIOSLOGODISPLAYTIME: { - if (pValueUnion.u64 > 0) - CHECK_ERROR (biosSettings, COMSETTER(LogoDisplayTime)(pValueUnion.u64)); + if (ValueUnion.u64 > 0) + CHECK_ERROR (biosSettings, COMSETTER(LogoDisplayTime)(ValueUnion.u64)); break; } @@ -597,6 +597,6 @@ case MODIFYVM_BIOSLOGOIMAGEPATH: { - if (pValueUnion.psz) - CHECK_ERROR (biosSettings, COMSETTER(LogoImagePath)(Bstr(pValueUnion.psz))); + if (ValueUnion.psz) + CHECK_ERROR (biosSettings, COMSETTER(LogoImagePath)(Bstr(ValueUnion.psz))); break; } @@ -604,15 +604,15 @@ case MODIFYVM_BIOSBOOTMENU: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "disabled")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "disabled")) CHECK_ERROR (biosSettings, COMSETTER(BootMenuMode)(BIOSBootMenuMode_Disabled)); - else if (!strcmp(pValueUnion.psz, "menuonly")) + else if (!strcmp(ValueUnion.psz, "menuonly")) CHECK_ERROR (biosSettings, COMSETTER(BootMenuMode)(BIOSBootMenuMode_MenuOnly)); - else if (!strcmp(pValueUnion.psz, "messageandmenu")) + else if (!strcmp(ValueUnion.psz, "messageandmenu")) CHECK_ERROR (biosSettings, COMSETTER(BootMenuMode)(BIOSBootMenuMode_MessageAndMenu)); else { - errorArgument("Invalid --biosbootmenu argument '%s'", pValueUnion.psz); + errorArgument("Invalid --biosbootmenu argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -623,6 +623,6 @@ case MODIFYVM_BIOSSYSTEMTIMEOFFSET: { - if (pValueUnion.u64 > 0) - CHECK_ERROR (biosSettings, COMSETTER(TimeOffset)(pValueUnion.u64)); + if (ValueUnion.u64 > 0) + CHECK_ERROR (biosSettings, COMSETTER(TimeOffset)(ValueUnion.u64)); break; } @@ -630,11 +630,11 @@ case MODIFYVM_BIOSPXEDEBUG: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (biosSettings, COMSETTER(PXEDebugEnabled)(true)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (biosSettings, COMSETTER(PXEDebugEnabled)(false)); @@ -642,5 +642,5 @@ else { - errorArgument("Invalid --biospxedebug argument '%s'", pValueUnion.psz); + errorArgument("Invalid --biospxedebug argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -651,31 +651,31 @@ case MODIFYVM_BOOT: { - if ((pGetState.uIndex < 1) && (pGetState.uIndex > 4)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > 4)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid boot slot number in '%s'", - pGetState.pDef->pszLong); - - if (!strcmp(pValueUnion.psz, "none")) - { - CHECK_ERROR (machine, SetBootOrder (pGetState.uIndex, DeviceType_Null)); - } - else if (!strcmp(pValueUnion.psz, "floppy")) - { - CHECK_ERROR (machine, SetBootOrder (pGetState.uIndex, DeviceType_Floppy)); - } - else if (!strcmp(pValueUnion.psz, "dvd")) - { - CHECK_ERROR (machine, SetBootOrder (pGetState.uIndex, DeviceType_DVD)); - } - else if (!strcmp(pValueUnion.psz, "disk")) - { - CHECK_ERROR (machine, SetBootOrder (pGetState.uIndex, DeviceType_HardDisk)); - } - else if (!strcmp(pValueUnion.psz, "net")) - { - CHECK_ERROR (machine, SetBootOrder (pGetState.uIndex, DeviceType_Network)); + GetOptState.pDef->pszLong); + + if (!strcmp(ValueUnion.psz, "none")) + { + CHECK_ERROR (machine, SetBootOrder (GetOptState.uIndex, DeviceType_Null)); + } + else if (!strcmp(ValueUnion.psz, "floppy")) + { + CHECK_ERROR (machine, SetBootOrder (GetOptState.uIndex, DeviceType_Floppy)); + } + else if (!strcmp(ValueUnion.psz, "dvd")) + { + CHECK_ERROR (machine, SetBootOrder (GetOptState.uIndex, DeviceType_DVD)); + } + else if (!strcmp(ValueUnion.psz, "disk")) + { + CHECK_ERROR (machine, SetBootOrder (GetOptState.uIndex, DeviceType_HardDisk)); + } + else if (!strcmp(ValueUnion.psz, "net")) + { + CHECK_ERROR (machine, SetBootOrder (GetOptState.uIndex, DeviceType_Network)); } else - return errorArgument("Invalid boot device '%s'", pValueUnion.psz); + return errorArgument("Invalid boot device '%s'", ValueUnion.psz); break; @@ -684,5 +684,5 @@ case MODIFYVM_HDA: // deprecated { - if (!strcmp(pValueUnion.psz, "none")) + if (!strcmp(ValueUnion.psz, "none")) { machine->DetachDevice(Bstr("IDE Controller"), 0, 0); @@ -691,5 +691,5 @@ { /* first guess is that it's a UUID */ - Bstr uuid(pValueUnion.psz); + Bstr uuid(ValueUnion.psz); ComPtr hardDisk; rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam()); @@ -697,10 +697,10 @@ if (!hardDisk) { - rc = a->virtualBox->FindHardDisk(Bstr(pValueUnion.psz), hardDisk.asOutParam()); + rc = a->virtualBox->FindHardDisk(Bstr(ValueUnion.psz), hardDisk.asOutParam()); if (FAILED(rc)) { /* open the new hard disk object */ CHECK_ERROR (a->virtualBox, - OpenHardDisk(Bstr(pValueUnion.psz), + OpenHardDisk(Bstr(ValueUnion.psz), AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), hardDisk.asOutParam())); @@ -720,5 +720,5 @@ case MODIFYVM_HDB: // deprecated { - if (!strcmp(pValueUnion.psz, "none")) + if (!strcmp(ValueUnion.psz, "none")) { machine->DetachDevice(Bstr("IDE Controller"), 0, 1); @@ -727,5 +727,5 @@ { /* first guess is that it's a UUID */ - Bstr uuid(pValueUnion.psz); + Bstr uuid(ValueUnion.psz); ComPtr hardDisk; rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam()); @@ -733,10 +733,10 @@ if (!hardDisk) { - rc = a->virtualBox->FindHardDisk(Bstr(pValueUnion.psz), hardDisk.asOutParam()); + rc = a->virtualBox->FindHardDisk(Bstr(ValueUnion.psz), hardDisk.asOutParam()); if (FAILED(rc)) { /* open the new hard disk object */ CHECK_ERROR (a->virtualBox, - OpenHardDisk(Bstr(pValueUnion.psz), + OpenHardDisk(Bstr(ValueUnion.psz), AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), hardDisk.asOutParam())); @@ -756,5 +756,5 @@ case MODIFYVM_HDD: // deprecated { - if (!strcmp(pValueUnion.psz, "none")) + if (!strcmp(ValueUnion.psz, "none")) { machine->DetachDevice(Bstr("IDE Controller"), 1, 1); @@ -763,5 +763,5 @@ { /* first guess is that it's a UUID */ - Bstr uuid(pValueUnion.psz); + Bstr uuid(ValueUnion.psz); ComPtr hardDisk; rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam()); @@ -769,10 +769,10 @@ if (!hardDisk) { - rc = a->virtualBox->FindHardDisk(Bstr(pValueUnion.psz), hardDisk.asOutParam()); + rc = a->virtualBox->FindHardDisk(Bstr(ValueUnion.psz), hardDisk.asOutParam()); if (FAILED(rc)) { /* open the new hard disk object */ CHECK_ERROR (a->virtualBox, - OpenHardDisk(Bstr(pValueUnion.psz), + OpenHardDisk(Bstr(ValueUnion.psz), AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), hardDisk.asOutParam())); @@ -796,13 +796,13 @@ storageController.asOutParam())); - if (!RTStrICmp(pValueUnion.psz, "PIIX3")) + if (!RTStrICmp(ValueUnion.psz, "PIIX3")) { CHECK_ERROR(storageController, COMSETTER(ControllerType)(StorageControllerType_PIIX3)); } - else if (!RTStrICmp(pValueUnion.psz, "PIIX4")) + else if (!RTStrICmp(ValueUnion.psz, "PIIX4")) { CHECK_ERROR(storageController, COMSETTER(ControllerType)(StorageControllerType_PIIX4)); } - else if (!RTStrICmp(pValueUnion.psz, "ICH6")) + else if (!RTStrICmp(ValueUnion.psz, "ICH6")) { CHECK_ERROR(storageController, COMSETTER(ControllerType)(StorageControllerType_ICH6)); @@ -810,5 +810,5 @@ else { - errorArgument("Invalid --idecontroller argument '%s'", pValueUnion.psz); + errorArgument("Invalid --idecontroller argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -821,16 +821,16 @@ CHECK_ERROR (machine, GetStorageControllerByName(Bstr("SATA"), SataCtl.asOutParam())); - if ((pGetState.uIndex < 1) && (pGetState.uIndex > 4)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > 4)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid SATA boot slot number in '%s'", - pGetState.pDef->pszLong); - - if ((pValueUnion.u32 < 1) && (pValueUnion.u32 > 30)) + GetOptState.pDef->pszLong); + + if ((ValueUnion.u32 < 1) && (ValueUnion.u32 > 30)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid SATA port number in '%s'", - pGetState.pDef->pszLong); + GetOptState.pDef->pszLong); if (SUCCEEDED(rc)) - CHECK_ERROR(SataCtl, SetIDEEmulationPort(pGetState.uIndex, pValueUnion.u32)); + CHECK_ERROR(SataCtl, SetIDEEmulationPort(GetOptState.uIndex, ValueUnion.u32)); break; @@ -842,6 +842,6 @@ CHECK_ERROR (machine, GetStorageControllerByName(Bstr("SATA"), SataCtl.asOutParam())); - if (SUCCEEDED(rc) && pValueUnion.u32 > 0) - CHECK_ERROR(SataCtl, COMSETTER(PortCount)(pValueUnion.u32)); + if (SUCCEEDED(rc) && ValueUnion.u32 > 0) + CHECK_ERROR(SataCtl, COMSETTER(PortCount)(ValueUnion.u32)); break; @@ -850,17 +850,17 @@ case MODIFYVM_SATAPORT: // deprecated { - if ((pGetState.uIndex < 1) && (pGetState.uIndex > 30)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > 30)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid SATA port number in '%s'", - pGetState.pDef->pszLong); - - if (!strcmp(pValueUnion.psz, "none")) - { - machine->DetachDevice(Bstr("SATA"), pGetState.uIndex, 0); + GetOptState.pDef->pszLong); + + if (!strcmp(ValueUnion.psz, "none")) + { + machine->DetachDevice(Bstr("SATA"), GetOptState.uIndex, 0); } else { /* first guess is that it's a UUID */ - Bstr uuid(pValueUnion.psz); + Bstr uuid(ValueUnion.psz); ComPtr hardDisk; rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam()); @@ -868,10 +868,10 @@ if (!hardDisk) { - rc = a->virtualBox->FindHardDisk(Bstr(pValueUnion.psz), hardDisk.asOutParam()); + rc = a->virtualBox->FindHardDisk(Bstr(ValueUnion.psz), hardDisk.asOutParam()); if (FAILED(rc)) { /* open the new hard disk object */ CHECK_ERROR (a->virtualBox, - OpenHardDisk(Bstr(pValueUnion.psz), AccessMode_ReadWrite, + OpenHardDisk(Bstr(ValueUnion.psz), AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), hardDisk.asOutParam())); @@ -882,5 +882,5 @@ hardDisk->COMGETTER(Id)(uuid.asOutParam()); CHECK_ERROR (machine, - AttachDevice(Bstr("SATA"), pGetState.uIndex, + AttachDevice(Bstr("SATA"), GetOptState.uIndex, 0, DeviceType_HardDisk, uuid)); } @@ -893,5 +893,5 @@ case MODIFYVM_SATA: // deprecated { - if (!strcmp(pValueUnion.psz, "on") || !strcmp(pValueUnion.psz, "enable")) + if (!strcmp(ValueUnion.psz, "on") || !strcmp(ValueUnion.psz, "enable")) { ComPtr ctl; @@ -899,8 +899,8 @@ CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_IntelAhci)); } - else if (!strcmp(pValueUnion.psz, "off") || !strcmp(pValueUnion.psz, "disable")) + else if (!strcmp(ValueUnion.psz, "off") || !strcmp(ValueUnion.psz, "disable")) CHECK_ERROR (machine, RemoveStorageController(Bstr("SATA"))); else - return errorArgument("Invalid --usb argument '%s'", pValueUnion.psz); + return errorArgument("Invalid --usb argument '%s'", ValueUnion.psz); break; } @@ -908,19 +908,19 @@ case MODIFYVM_SCSIPORT: // deprecated { - if ((pGetState.uIndex < 1) && (pGetState.uIndex > 16)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > 16)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid SCSI port number in '%s'", - pGetState.pDef->pszLong); - - if (!strcmp(pValueUnion.psz, "none")) - { - rc = machine->DetachDevice(Bstr("LsiLogic"), pGetState.uIndex, 0); + GetOptState.pDef->pszLong); + + if (!strcmp(ValueUnion.psz, "none")) + { + rc = machine->DetachDevice(Bstr("LsiLogic"), GetOptState.uIndex, 0); if (FAILED(rc)) - CHECK_ERROR(machine, DetachDevice(Bstr("BusLogic"), pGetState.uIndex, 0)); + CHECK_ERROR(machine, DetachDevice(Bstr("BusLogic"), GetOptState.uIndex, 0)); } else { /* first guess is that it's a UUID */ - Bstr uuid(pValueUnion.psz); + Bstr uuid(ValueUnion.psz); ComPtr hardDisk; rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam()); @@ -928,10 +928,10 @@ if (!hardDisk) { - rc = a->virtualBox->FindHardDisk(Bstr(pValueUnion.psz), hardDisk.asOutParam()); + rc = a->virtualBox->FindHardDisk(Bstr(ValueUnion.psz), hardDisk.asOutParam()); if (FAILED(rc)) { /* open the new hard disk object */ CHECK_ERROR (a->virtualBox, - OpenHardDisk(Bstr(pValueUnion.psz), + OpenHardDisk(Bstr(ValueUnion.psz), AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), hardDisk.asOutParam())); @@ -941,9 +941,9 @@ { hardDisk->COMGETTER(Id)(uuid.asOutParam()); - rc = machine->AttachDevice(Bstr("LsiLogic"), pGetState.uIndex, 0, DeviceType_HardDisk, uuid); + rc = machine->AttachDevice(Bstr("LsiLogic"), GetOptState.uIndex, 0, DeviceType_HardDisk, uuid); if (FAILED(rc)) CHECK_ERROR (machine, AttachDevice(Bstr("BusLogic"), - pGetState.uIndex, 0, + GetOptState.uIndex, 0, DeviceType_HardDisk, uuid)); } @@ -958,5 +958,5 @@ ComPtr ctl; - if (!RTStrICmp(pValueUnion.psz, "LsiLogic")) + if (!RTStrICmp(ValueUnion.psz, "LsiLogic")) { rc = machine->RemoveStorageController(Bstr("BusLogic")); @@ -972,5 +972,5 @@ CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_LsiLogic)); } - else if (!RTStrICmp(pValueUnion.psz, "BusLogic")) + else if (!RTStrICmp(ValueUnion.psz, "BusLogic")) { rc = machine->RemoveStorageController(Bstr("LsiLogic")); @@ -987,5 +987,5 @@ } else - return errorArgument("Invalid --scsitype argument '%s'", pValueUnion.psz); + return errorArgument("Invalid --scsitype argument '%s'", ValueUnion.psz); break; } @@ -993,5 +993,5 @@ case MODIFYVM_SCSI: // deprecated { - if (!strcmp(pValueUnion.psz, "on") || !strcmp(pValueUnion.psz, "enable")) + if (!strcmp(ValueUnion.psz, "on") || !strcmp(ValueUnion.psz, "enable")) { ComPtr ctl; @@ -1001,5 +1001,5 @@ CHECK_ERROR (ctl, COMSETTER(ControllerType)(StorageControllerType_BusLogic)); } - else if (!strcmp(pValueUnion.psz, "off") || !strcmp(pValueUnion.psz, "disable")) + else if (!strcmp(ValueUnion.psz, "off") || !strcmp(ValueUnion.psz, "disable")) { rc = machine->RemoveStorageController(Bstr("BusLogic")); @@ -1016,5 +1016,5 @@ ASSERT(dvdAttachment); - CHECK_ERROR (dvdAttachment, COMSETTER(Passthrough)(!strcmp(pValueUnion.psz, "on"))); + CHECK_ERROR (dvdAttachment, COMSETTER(Passthrough)(!strcmp(ValueUnion.psz, "on"))); break; } @@ -1023,24 +1023,24 @@ { ComPtr dvdMedium; - Bstr uuid(pValueUnion.psz); + Bstr uuid(ValueUnion.psz); /* unmount? */ - if (!strcmp(pValueUnion.psz, "none")) + if (!strcmp(ValueUnion.psz, "none")) { /* nothing to do, NULL object will cause unmount */ } /* host drive? */ - else if (!strncmp(pValueUnion.psz, "host:", 5)) + else if (!strncmp(ValueUnion.psz, "host:", 5)) { ComPtr host; CHECK_ERROR (a->virtualBox, COMGETTER(Host)(host.asOutParam())); - rc = host->FindHostDVDDrive(Bstr(pValueUnion.psz + 5), dvdMedium.asOutParam()); + rc = host->FindHostDVDDrive(Bstr(ValueUnion.psz + 5), dvdMedium.asOutParam()); if (!dvdMedium) { /* 2nd try: try with the real name, important on Linux+libhal */ char szPathReal[RTPATH_MAX]; - if (RT_FAILURE(RTPathReal(pValueUnion.psz + 5, szPathReal, sizeof(szPathReal)))) + if (RT_FAILURE(RTPathReal(ValueUnion.psz + 5, szPathReal, sizeof(szPathReal)))) { - errorArgument("Invalid host DVD drive name \"%s\"", pValueUnion.psz + 5); + errorArgument("Invalid host DVD drive name \"%s\"", ValueUnion.psz + 5); rc = E_FAIL; break; @@ -1049,5 +1049,5 @@ if (!dvdMedium) { - errorArgument("Invalid host DVD drive name \"%s\"", pValueUnion.psz + 5); + errorArgument("Invalid host DVD drive name \"%s\"", ValueUnion.psz + 5); rc = E_FAIL; break; @@ -1062,10 +1062,10 @@ { /* must be a filename, check if it's in the collection */ - rc = a->virtualBox->FindDVDImage(Bstr(pValueUnion.psz), dvdMedium.asOutParam()); + rc = a->virtualBox->FindDVDImage(Bstr(ValueUnion.psz), dvdMedium.asOutParam()); /* not registered, do that on the fly */ if (!dvdMedium) { Bstr emptyUUID; - CHECK_ERROR (a->virtualBox, OpenDVDImage(Bstr(pValueUnion.psz), + CHECK_ERROR (a->virtualBox, OpenDVDImage(Bstr(ValueUnion.psz), emptyUUID, dvdMedium.asOutParam())); } @@ -1089,5 +1089,5 @@ case MODIFYVM_FLOPPY: // deprecated { - Bstr uuid(pValueUnion.psz); + Bstr uuid(ValueUnion.psz); ComPtr floppyMedium; ComPtr floppyAttachment; @@ -1095,5 +1095,5 @@ /* disable? */ - if (!strcmp(pValueUnion.psz, "disabled")) + if (!strcmp(ValueUnion.psz, "disabled")) { /* disable the controller */ @@ -1108,18 +1108,18 @@ /* unmount? */ - if ( !strcmp(pValueUnion.psz, "none") - || !strcmp(pValueUnion.psz, "empty")) // deprecated + if ( !strcmp(ValueUnion.psz, "none") + || !strcmp(ValueUnion.psz, "empty")) // deprecated { /* nothing to do, NULL object will cause unmount */ } /* host drive? */ - else if (!strncmp(pValueUnion.psz, "host:", 5)) + else if (!strncmp(ValueUnion.psz, "host:", 5)) { ComPtr host; CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam())); - rc = host->FindHostFloppyDrive(Bstr(pValueUnion.psz + 5), floppyMedium.asOutParam()); + rc = host->FindHostFloppyDrive(Bstr(ValueUnion.psz + 5), floppyMedium.asOutParam()); if (!floppyMedium) { - errorArgument("Invalid host floppy drive name \"%s\"", pValueUnion.psz + 5); + errorArgument("Invalid host floppy drive name \"%s\"", ValueUnion.psz + 5); rc = E_FAIL; break; @@ -1133,5 +1133,5 @@ { /* must be a filename, check if it's in the collection */ - rc = a->virtualBox->FindFloppyImage(Bstr(pValueUnion.psz), floppyMedium.asOutParam()); + rc = a->virtualBox->FindFloppyImage(Bstr(ValueUnion.psz), floppyMedium.asOutParam()); /* not registered, do that on the fly */ if (!floppyMedium) @@ -1139,5 +1139,5 @@ Bstr emptyUUID; CHECK_ERROR (a->virtualBox, - OpenFloppyImage(Bstr(pValueUnion.psz), + OpenFloppyImage(Bstr(ValueUnion.psz), emptyUUID, floppyMedium.asOutParam())); @@ -1160,13 +1160,13 @@ ComPtr nic; - if ((pGetState.uIndex < 1) && (pGetState.uIndex > NetworkAdapterCount)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > NetworkAdapterCount)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid NIC slot number in '%s'", - pGetState.pDef->pszLong); - - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (pGetState.uIndex - 1, nic.asOutParam())); + GetOptState.pDef->pszLong); + + CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); - CHECK_ERROR (nic, COMSETTER(TraceFile)(Bstr(pValueUnion.psz))); + CHECK_ERROR (nic, COMSETTER(TraceFile)(Bstr(ValueUnion.psz))); break; } @@ -1176,17 +1176,17 @@ ComPtr nic; - if ((pGetState.uIndex < 1) && (pGetState.uIndex > NetworkAdapterCount)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > NetworkAdapterCount)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid NIC slot number in '%s'", - pGetState.pDef->pszLong); - - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (pGetState.uIndex - 1, nic.asOutParam())); + GetOptState.pDef->pszLong); + + CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); - if (!strcmp(pValueUnion.psz, "on")) + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (nic, COMSETTER(TraceEnabled)(TRUE)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (nic, COMSETTER(TraceEnabled)(FALSE)); @@ -1194,5 +1194,5 @@ else { - errorArgument("Invalid --nictrace%lu argument '%s'", pGetState.uIndex, pValueUnion.psz); + errorArgument("Invalid --nictrace%lu argument '%s'", GetOptState.uIndex, ValueUnion.psz); rc = E_FAIL; } @@ -1204,30 +1204,30 @@ ComPtr nic; - if ((pGetState.uIndex < 1) && (pGetState.uIndex > NetworkAdapterCount)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > NetworkAdapterCount)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid NIC slot number in '%s'", - pGetState.pDef->pszLong); - - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (pGetState.uIndex - 1, nic.asOutParam())); + GetOptState.pDef->pszLong); + + CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); - if (!strcmp(pValueUnion.psz, "Am79C970A")) + if (!strcmp(ValueUnion.psz, "Am79C970A")) { CHECK_ERROR (nic, COMSETTER(AdapterType)(NetworkAdapterType_Am79C970A)); } - else if (!strcmp(pValueUnion.psz, "Am79C973")) + else if (!strcmp(ValueUnion.psz, "Am79C973")) { CHECK_ERROR (nic, COMSETTER(AdapterType)(NetworkAdapterType_Am79C973)); } #ifdef VBOX_WITH_E1000 - else if (!strcmp(pValueUnion.psz, "82540EM")) + else if (!strcmp(ValueUnion.psz, "82540EM")) { CHECK_ERROR (nic, COMSETTER(AdapterType)(NetworkAdapterType_I82540EM)); } - else if (!strcmp(pValueUnion.psz, "82543GC")) + else if (!strcmp(ValueUnion.psz, "82543GC")) { CHECK_ERROR (nic, COMSETTER(AdapterType)(NetworkAdapterType_I82543GC)); } - else if (!strcmp(pValueUnion.psz, "82545EM")) + else if (!strcmp(ValueUnion.psz, "82545EM")) { CHECK_ERROR (nic, COMSETTER(AdapterType)(NetworkAdapterType_I82545EM)); @@ -1235,5 +1235,5 @@ #endif #ifdef VBOX_WITH_VIRTIO - else if (!strcmp(pValueUnion.psz, "virtio")) + else if (!strcmp(ValueUnion.psz, "virtio")) { CHECK_ERROR (nic, COMSETTER(AdapterType)(NetworkAdapterType_Virtio)); @@ -1242,5 +1242,5 @@ else { - errorArgument("Invalid NIC type '%s' specified for NIC %lu", pValueUnion.psz, pGetState.uIndex); + errorArgument("Invalid NIC type '%s' specified for NIC %lu", ValueUnion.psz, GetOptState.uIndex); rc = E_FAIL; } @@ -1252,20 +1252,20 @@ ComPtr nic; - if ((pGetState.uIndex < 1) && (pGetState.uIndex > NetworkAdapterCount)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > NetworkAdapterCount)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid NIC slot number in '%s'", - pGetState.pDef->pszLong); - - if ((pValueUnion.u32 < 1000) && (pValueUnion.u32 > 4000000)) - { - errorArgument("Invalid --nicspeed%lu argument '%u'", pGetState.uIndex, pValueUnion.u32); + GetOptState.pDef->pszLong); + + if ((ValueUnion.u32 < 1000) && (ValueUnion.u32 > 4000000)) + { + errorArgument("Invalid --nicspeed%lu argument '%u'", GetOptState.uIndex, ValueUnion.u32); rc = E_FAIL; break; } - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (pGetState.uIndex - 1, nic.asOutParam())); + CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); - CHECK_ERROR (nic, COMSETTER(LineSpeed)(pValueUnion.u32)); + CHECK_ERROR (nic, COMSETTER(LineSpeed)(ValueUnion.u32)); break; } @@ -1275,33 +1275,33 @@ ComPtr nic; - if ((pGetState.uIndex < 1) && (pGetState.uIndex > NetworkAdapterCount)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > NetworkAdapterCount)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid NIC slot number in '%s'", - pGetState.pDef->pszLong); - - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (pGetState.uIndex - 1, nic.asOutParam())); + GetOptState.pDef->pszLong); + + CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); - if (!strcmp(pValueUnion.psz, "none")) + if (!strcmp(ValueUnion.psz, "none")) { CHECK_ERROR (nic, COMSETTER(Enabled) (FALSE)); } - else if (!strcmp(pValueUnion.psz, "null")) + else if (!strcmp(ValueUnion.psz, "null")) { CHECK_ERROR (nic, COMSETTER(Enabled) (TRUE)); CHECK_ERROR (nic, Detach()); } - else if (!strcmp(pValueUnion.psz, "nat")) + else if (!strcmp(ValueUnion.psz, "nat")) { CHECK_ERROR (nic, COMSETTER(Enabled) (TRUE)); CHECK_ERROR (nic, AttachToNAT()); } - else if ( !strcmp(pValueUnion.psz, "bridged") - || !strcmp(pValueUnion.psz, "hostif")) /* backward compatibility */ + else if ( !strcmp(ValueUnion.psz, "bridged") + || !strcmp(ValueUnion.psz, "hostif")) /* backward compatibility */ { CHECK_ERROR (nic, COMSETTER(Enabled) (TRUE)); CHECK_ERROR (nic, AttachToBridgedInterface()); } - else if (!strcmp(pValueUnion.psz, "intnet")) + else if (!strcmp(ValueUnion.psz, "intnet")) { CHECK_ERROR (nic, COMSETTER(Enabled) (TRUE)); @@ -1309,5 +1309,5 @@ } #if defined(VBOX_WITH_NETFLT) - else if (!strcmp(pValueUnion.psz, "hostonly")) + else if (!strcmp(ValueUnion.psz, "hostonly")) { @@ -1318,5 +1318,5 @@ else { - errorArgument("Invalid type '%s' specfied for NIC %lu", pValueUnion.psz, pGetState.uIndex); + errorArgument("Invalid type '%s' specfied for NIC %lu", ValueUnion.psz, GetOptState.uIndex); rc = E_FAIL; } @@ -1328,17 +1328,17 @@ ComPtr nic; - if ((pGetState.uIndex < 1) && (pGetState.uIndex > NetworkAdapterCount)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > NetworkAdapterCount)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid NIC slot number in '%s'", - pGetState.pDef->pszLong); - - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (pGetState.uIndex - 1, nic.asOutParam())); + GetOptState.pDef->pszLong); + + CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); - if (!strcmp(pValueUnion.psz, "on")) + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (nic, COMSETTER(CableConnected)(TRUE)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (nic, COMSETTER(CableConnected)(FALSE)); @@ -1346,5 +1346,5 @@ else { - errorArgument("Invalid --cableconnected%lu argument '%s'", pGetState.uIndex, pValueUnion.psz); + errorArgument("Invalid --cableconnected%lu argument '%s'", GetOptState.uIndex, ValueUnion.psz); rc = E_FAIL; } @@ -1357,14 +1357,14 @@ ComPtr nic; - if ((pGetState.uIndex < 1) && (pGetState.uIndex > NetworkAdapterCount)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > NetworkAdapterCount)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid NIC slot number in '%s'", - pGetState.pDef->pszLong); - - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (pGetState.uIndex - 1, nic.asOutParam())); + GetOptState.pDef->pszLong); + + CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); /* remove it? */ - if (!strcmp(pValueUnion.psz, "none")) + if (!strcmp(ValueUnion.psz, "none")) { CHECK_ERROR (nic, COMSETTER(HostInterface)(NULL)); @@ -1372,5 +1372,5 @@ else { - CHECK_ERROR (nic, COMSETTER(HostInterface)(Bstr(pValueUnion.psz))); + CHECK_ERROR (nic, COMSETTER(HostInterface)(Bstr(ValueUnion.psz))); } break; @@ -1381,14 +1381,14 @@ ComPtr nic; - if ((pGetState.uIndex < 1) && (pGetState.uIndex > NetworkAdapterCount)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > NetworkAdapterCount)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid NIC slot number in '%s'", - pGetState.pDef->pszLong); - - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (pGetState.uIndex - 1, nic.asOutParam())); + GetOptState.pDef->pszLong); + + CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); /* remove it? */ - if (!strcmp(pValueUnion.psz, "none")) + if (!strcmp(ValueUnion.psz, "none")) { CHECK_ERROR (nic, COMSETTER(InternalNetwork)(NULL)); @@ -1396,5 +1396,5 @@ else { - CHECK_ERROR (nic, COMSETTER(InternalNetwork)(Bstr(pValueUnion.psz))); + CHECK_ERROR (nic, COMSETTER(InternalNetwork)(Bstr(ValueUnion.psz))); } break; @@ -1405,13 +1405,13 @@ ComPtr nic; - if ((pGetState.uIndex < 1) && (pGetState.uIndex > NetworkAdapterCount)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > NetworkAdapterCount)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid NIC slot number in '%s'", - pGetState.pDef->pszLong); - - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (pGetState.uIndex - 1, nic.asOutParam())); + GetOptState.pDef->pszLong); + + CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); - CHECK_ERROR (nic, COMSETTER(NATNetwork)(Bstr(pValueUnion.psz))); + CHECK_ERROR (nic, COMSETTER(NATNetwork)(Bstr(ValueUnion.psz))); break; @@ -1422,14 +1422,14 @@ ComPtr nic; - if ((pGetState.uIndex < 1) && (pGetState.uIndex > NetworkAdapterCount)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > NetworkAdapterCount)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid NIC slot number in '%s'", - pGetState.pDef->pszLong); - - CHECK_ERROR_BREAK (machine, GetNetworkAdapter (pGetState.uIndex - 1, nic.asOutParam())); + GetOptState.pDef->pszLong); + + CHECK_ERROR_BREAK (machine, GetNetworkAdapter (GetOptState.uIndex - 1, nic.asOutParam())); ASSERT(nic); /* generate one? */ - if (!strcmp(pValueUnion.psz, "auto")) + if (!strcmp(ValueUnion.psz, "auto")) { CHECK_ERROR (nic, COMSETTER(MACAddress)(NULL)); @@ -1437,5 +1437,5 @@ else { - CHECK_ERROR (nic, COMSETTER(MACAddress)(Bstr(pValueUnion.psz))); + CHECK_ERROR (nic, COMSETTER(MACAddress)(Bstr(ValueUnion.psz))); } break; @@ -1447,48 +1447,41 @@ char *pszIRQ = NULL; - if ((pGetState.uIndex < 1) && (pGetState.uIndex > SerialPortCount)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > SerialPortCount)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid Serial Port number in '%s'", - pGetState.pDef->pszLong); - - CHECK_ERROR_BREAK (machine, GetSerialPort (pGetState.uIndex - 1, uart.asOutParam())); + GetOptState.pDef->pszLong); + + CHECK_ERROR_BREAK (machine, GetSerialPort (GetOptState.uIndex - 1, uart.asOutParam())); ASSERT(uart); - if (!strcmp(pValueUnion.psz, "disconnected")) + if (!strcmp(ValueUnion.psz, "disconnected")) { CHECK_ERROR (uart, COMSETTER(HostMode) (PortMode_Disconnected)); } - else if ( !strcmp(pValueUnion.psz, "server") - || !strcmp(pValueUnion.psz, "client") - || !strcmp(pValueUnion.psz, "file")) - { - char *pszIRQ = NULL; - - /** - * @todo: not the right way to get the second value for - * the argument, change this when RTGetOpt can return - * multiple values - */ - pszIRQ = pGetState.argv[pGetState.iNext]; - pGetState.iNext++; - - if (!pszIRQ) + else if ( !strcmp(ValueUnion.psz, "server") + || !strcmp(ValueUnion.psz, "client") + || !strcmp(ValueUnion.psz, "file")) + { + const char *pszMode = ValueUnion.psz; + + int vrc = RTGetOptFetchValue(&GetOptState, &ValueUnion, RTGETOPT_REQ_STRING); + if (RT_FAILURE(vrc)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid argument to '%s'", - pGetState.pDef->pszLong); - - CHECK_ERROR (uart, COMSETTER(Path) (Bstr(pszIRQ))); - - if (!strcmp(pValueUnion.psz, "server")) + GetOptState.pDef->pszLong); + + 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)); } - else if (!strcmp(pValueUnion.psz, "client")) + else if (!strcmp(pszMode, "client")) { CHECK_ERROR (uart, COMSETTER(HostMode) (PortMode_HostPipe)); CHECK_ERROR (uart, COMSETTER(Server) (FALSE)); } - else if (!strcmp(pValueUnion.psz, "file")) + else if (!strcmp(pszMode, "file")) { CHECK_ERROR (uart, COMSETTER(HostMode) (PortMode_RawFile)); @@ -1497,5 +1490,5 @@ else { - CHECK_ERROR (uart, COMSETTER(Path) (Bstr(pValueUnion.psz))); + CHECK_ERROR (uart, COMSETTER(Path) (Bstr(ValueUnion.psz))); CHECK_ERROR (uart, COMSETTER(HostMode) (PortMode_HostDevice)); } @@ -1507,42 +1500,30 @@ ComPtr uart; - if ((pGetState.uIndex < 1) && (pGetState.uIndex > SerialPortCount)) + if ((GetOptState.uIndex < 1) && (GetOptState.uIndex > SerialPortCount)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid Serial Port number in '%s'", - pGetState.pDef->pszLong); - - CHECK_ERROR_BREAK (machine, GetSerialPort (pGetState.uIndex - 1, uart.asOutParam())); + GetOptState.pDef->pszLong); + + CHECK_ERROR_BREAK (machine, GetSerialPort (GetOptState.uIndex - 1, uart.asOutParam())); ASSERT(uart); - if (!strcmp(pValueUnion.psz, "off") || !strcmp(pValueUnion.psz, "disable")) + if (!strcmp(ValueUnion.psz, "off") || !strcmp(ValueUnion.psz, "disable")) CHECK_ERROR (uart, COMSETTER(Enabled) (FALSE)); else { - char *pszIRQ = NULL; + const char *pszIOBase = ValueUnion.psz; uint32_t uVal = 0; - int vrc; - - /** - * @todo: not the right way to get the second value for - * the argument, change this when RTGetOpt can return - * multiple values - */ - pszIRQ = pGetState.argv[pGetState.iNext]; - pGetState.iNext++; - - if (!pszIRQ) + + int vrc = RTGetOptFetchValue(&GetOptState, &ValueUnion, RTGETOPT_REQ_UINT32) != MODIFYVM_UART; + if (RT_FAILURE(vrc)) return errorSyntax(USAGE_MODIFYVM, "Missing or Invalid argument to '%s'", - pGetState.pDef->pszLong); - - vrc = RTStrToUInt32Ex(pszIRQ, NULL, 0, &uVal); + GetOptState.pDef->pszLong); + + 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'", pszIRQ); - - CHECK_ERROR (uart, COMSETTER(IRQ) (uVal)); - - vrc = RTStrToUInt32Ex(pValueUnion.psz, NULL, 0, &uVal); - if (vrc != VINF_SUCCESS || uVal == 0) - return errorArgument("Error parsing UART I/O base '%s'", pszIRQ); + return errorArgument("Error parsing UART I/O base '%s'", pszIOBase); CHECK_ERROR (uart, COMSETTER(IOBase) (uVal)); @@ -1554,6 +1535,6 @@ case MODIFYVM_GUESTSTATISTICSINTERVAL: { - if (pValueUnion.u32 > 0) - CHECK_ERROR (machine, COMSETTER(StatisticsUpdateInterval)(pValueUnion.u32)); + if (ValueUnion.u32 > 0) + CHECK_ERROR (machine, COMSETTER(StatisticsUpdateInterval)(ValueUnion.u32)); break; } @@ -1562,6 +1543,6 @@ case MODIFYVM_GUESTMEMORYBALLOON: { - if (pValueUnion.u32 > 0) - CHECK_ERROR (machine, COMSETTER(MemoryBalloonSize)(pValueUnion.u32)); + if (ValueUnion.u32 > 0) + CHECK_ERROR (machine, COMSETTER(MemoryBalloonSize)(ValueUnion.u32)); break; } @@ -1570,5 +1551,5 @@ case MODIFYVM_AUDIOCONTROLLER: { - if (pValueUnion.psz) + if (ValueUnion.psz) { ComPtr audioAdapter; @@ -1576,11 +1557,11 @@ ASSERT(audioAdapter); - if (!strcmp(pValueUnion.psz, "sb16")) + if (!strcmp(ValueUnion.psz, "sb16")) CHECK_ERROR (audioAdapter, COMSETTER(AudioController)(AudioControllerType_SB16)); - else if (!strcmp(pValueUnion.psz, "ac97")) + else if (!strcmp(ValueUnion.psz, "ac97")) CHECK_ERROR (audioAdapter, COMSETTER(AudioController)(AudioControllerType_AC97)); else { - errorArgument("Invalid --audiocontroller argument '%s'", pValueUnion.psz); + errorArgument("Invalid --audiocontroller argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -1591,5 +1572,5 @@ case MODIFYVM_AUDIO: { - if (pValueUnion.psz) + if (ValueUnion.psz) { ComPtr audioAdapter; @@ -1598,9 +1579,9 @@ /* disable? */ - if (!strcmp(pValueUnion.psz, "none")) + if (!strcmp(ValueUnion.psz, "none")) { CHECK_ERROR (audioAdapter, COMSETTER(Enabled)(false)); } - else if (!strcmp(pValueUnion.psz, "null")) + else if (!strcmp(ValueUnion.psz, "null")) { CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Null)); @@ -1609,5 +1590,5 @@ #ifdef RT_OS_WINDOWS #ifdef VBOX_WITH_WINMM - else if (!strcmp(pValueUnion.psz, "winmm")) + else if (!strcmp(ValueUnion.psz, "winmm")) { CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_WinMM)); @@ -1615,5 +1596,5 @@ } #endif - else if (!strcmp(pValueUnion.psz, "dsound")) + else if (!strcmp(ValueUnion.psz, "dsound")) { CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_DirectSound)); @@ -1622,5 +1603,5 @@ #endif /* RT_OS_WINDOWS */ #ifdef RT_OS_LINUX - else if (!strcmp(pValueUnion.psz, "oss")) + else if (!strcmp(ValueUnion.psz, "oss")) { CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS)); @@ -1628,5 +1609,5 @@ } # ifdef VBOX_WITH_ALSA - else if (!strcmp(pValueUnion.psz, "alsa")) + else if (!strcmp(ValueUnion.psz, "alsa")) { CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_ALSA)); @@ -1635,5 +1616,5 @@ # endif # ifdef VBOX_WITH_PULSE - else if (!strcmp(pValueUnion.psz, "pulse")) + else if (!strcmp(ValueUnion.psz, "pulse")) { CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Pulse)); @@ -1643,5 +1624,5 @@ #endif /* !RT_OS_LINUX */ #ifdef RT_OS_SOLARIS - else if (!strcmp(pValueUnion.psz, "solaudio")) + else if (!strcmp(ValueUnion.psz, "solaudio")) { CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_SolAudio)); @@ -1650,5 +1631,5 @@ # ifdef VBOX_WITH_SOLARIS_OSS - else if (!strcmp(pValueUnion.psz, "oss")) + else if (!strcmp(ValueUnion.psz, "oss")) { CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS)); @@ -1659,5 +1640,5 @@ #endif /* !RT_OS_SOLARIS */ #ifdef RT_OS_DARWIN - else if (!strcmp(pValueUnion.psz, "coreaudio")) + else if (!strcmp(ValueUnion.psz, "coreaudio")) { CHECK_ERROR (audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_CoreAudio)); @@ -1668,5 +1649,5 @@ else { - errorArgument("Invalid --audio argument '%s'", pValueUnion.psz); + errorArgument("Invalid --audio argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -1677,19 +1658,19 @@ case MODIFYVM_CLIPBOARD: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "disabled")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "disabled")) { CHECK_ERROR (machine, COMSETTER(ClipboardMode)(ClipboardMode_Disabled)); } - else if (!strcmp(pValueUnion.psz, "hosttoguest")) + else if (!strcmp(ValueUnion.psz, "hosttoguest")) { CHECK_ERROR (machine, COMSETTER(ClipboardMode)(ClipboardMode_HostToGuest)); } - else if (!strcmp(pValueUnion.psz, "guesttohost")) + else if (!strcmp(ValueUnion.psz, "guesttohost")) { CHECK_ERROR (machine, COMSETTER(ClipboardMode)(ClipboardMode_GuestToHost)); } - else if (!strcmp(pValueUnion.psz, "bidirectional")) + else if (!strcmp(ValueUnion.psz, "bidirectional")) { CHECK_ERROR (machine, COMSETTER(ClipboardMode)(ClipboardMode_Bidirectional)); @@ -1697,5 +1678,5 @@ else { - errorArgument("Invalid --clipboard argument '%s'", pValueUnion.psz); + errorArgument("Invalid --clipboard argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -1707,5 +1688,5 @@ case MODIFYVM_VRDPPORT: { - if (pValueUnion.psz) + if (ValueUnion.psz) { ComPtr vrdpServer; @@ -1713,8 +1694,8 @@ ASSERT(vrdpServer); - if (!strcmp(pValueUnion.psz, "default")) + if (!strcmp(ValueUnion.psz, "default")) CHECK_ERROR (vrdpServer, COMSETTER(Ports)(Bstr("0"))); else - CHECK_ERROR (vrdpServer, COMSETTER(Ports)(Bstr(pValueUnion.psz))); + CHECK_ERROR (vrdpServer, COMSETTER(Ports)(Bstr(ValueUnion.psz))); } break; @@ -1723,5 +1704,5 @@ case MODIFYVM_VRDPADDRESS: { - if (pValueUnion.psz) + if (ValueUnion.psz) { ComPtr vrdpServer; @@ -1729,5 +1710,5 @@ ASSERT(vrdpServer); - CHECK_ERROR (vrdpServer, COMSETTER(NetAddress)(Bstr(pValueUnion.psz))); + CHECK_ERROR (vrdpServer, COMSETTER(NetAddress)(Bstr(ValueUnion.psz))); } break; @@ -1736,5 +1717,5 @@ case MODIFYVM_VRDPAUTHTYPE: { - if (pValueUnion.psz) + if (ValueUnion.psz) { ComPtr vrdpServer; @@ -1742,13 +1723,13 @@ ASSERT(vrdpServer); - if (!strcmp(pValueUnion.psz, "null")) + if (!strcmp(ValueUnion.psz, "null")) { CHECK_ERROR (vrdpServer, COMSETTER(AuthType)(VRDPAuthType_Null)); } - else if (!strcmp(pValueUnion.psz, "external")) + else if (!strcmp(ValueUnion.psz, "external")) { CHECK_ERROR (vrdpServer, COMSETTER(AuthType)(VRDPAuthType_External)); } - else if (!strcmp(pValueUnion.psz, "guest")) + else if (!strcmp(ValueUnion.psz, "guest")) { CHECK_ERROR (vrdpServer, COMSETTER(AuthType)(VRDPAuthType_Guest)); @@ -1756,5 +1737,5 @@ else { - errorArgument("Invalid --vrdpauthtype argument '%s'", pValueUnion.psz); + errorArgument("Invalid --vrdpauthtype argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -1765,5 +1746,5 @@ case MODIFYVM_VRDPMULTICON: { - if (pValueUnion.psz) + if (ValueUnion.psz) { ComPtr vrdpServer; @@ -1771,9 +1752,9 @@ ASSERT(vrdpServer); - if (!strcmp(pValueUnion.psz, "on")) + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (vrdpServer, COMSETTER(AllowMultiConnection)(true)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (vrdpServer, COMSETTER(AllowMultiConnection)(false)); @@ -1781,5 +1762,5 @@ else { - errorArgument("Invalid --vrdpmulticon argument '%s'", pValueUnion.psz); + errorArgument("Invalid --vrdpmulticon argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -1790,5 +1771,5 @@ case MODIFYVM_VRDPREUSECON: { - if (pValueUnion.psz) + if (ValueUnion.psz) { ComPtr vrdpServer; @@ -1796,9 +1777,9 @@ ASSERT(vrdpServer); - if (!strcmp(pValueUnion.psz, "on")) + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (vrdpServer, COMSETTER(ReuseSingleConnection)(true)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (vrdpServer, COMSETTER(ReuseSingleConnection)(false)); @@ -1806,5 +1787,5 @@ else { - errorArgument("Invalid --vrdpreusecon argument '%s'", pValueUnion.psz); + errorArgument("Invalid --vrdpreusecon argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -1815,5 +1796,5 @@ case MODIFYVM_VRDP: { - if (pValueUnion.psz) + if (ValueUnion.psz) { ComPtr vrdpServer; @@ -1821,9 +1802,9 @@ ASSERT(vrdpServer); - if (!strcmp(pValueUnion.psz, "on")) + if (!strcmp(ValueUnion.psz, "on")) { CHECK_ERROR (vrdpServer, COMSETTER(Enabled)(true)); } - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) { CHECK_ERROR (vrdpServer, COMSETTER(Enabled)(false)); @@ -1831,5 +1812,5 @@ else { - errorArgument("Invalid --vrdp argument '%s'", pValueUnion.psz); + errorArgument("Invalid --vrdp argument '%s'", ValueUnion.psz); rc = E_FAIL; } @@ -1841,5 +1822,5 @@ case MODIFYVM_USBEHCI: { - if (pValueUnion.psz) + if (ValueUnion.psz) { ComPtr UsbCtl; @@ -1847,10 +1828,10 @@ if (SUCCEEDED(rc)) { - if (!strcmp(pValueUnion.psz, "on") || !strcmp(pValueUnion.psz, "enable")) + if (!strcmp(ValueUnion.psz, "on") || !strcmp(ValueUnion.psz, "enable")) CHECK_ERROR (UsbCtl, COMSETTER(EnabledEhci)(true)); - else if (!strcmp(pValueUnion.psz, "off") || !strcmp(pValueUnion.psz, "disable")) + else if (!strcmp(ValueUnion.psz, "off") || !strcmp(ValueUnion.psz, "disable")) CHECK_ERROR (UsbCtl, COMSETTER(EnabledEhci)(false)); else - return errorArgument("Invalid --usbehci argument '%s'", pValueUnion.psz); + return errorArgument("Invalid --usbehci argument '%s'", ValueUnion.psz); } } @@ -1860,5 +1841,5 @@ case MODIFYVM_USB: { - if (pValueUnion.psz) + if (ValueUnion.psz) { ComPtr UsbCtl; @@ -1866,10 +1847,10 @@ if (SUCCEEDED(rc)) { - if (!strcmp(pValueUnion.psz, "on") || !strcmp(pValueUnion.psz, "enable")) + if (!strcmp(ValueUnion.psz, "on") || !strcmp(ValueUnion.psz, "enable")) CHECK_ERROR (UsbCtl, COMSETTER(Enabled)(true)); - else if (!strcmp(pValueUnion.psz, "off") || !strcmp(pValueUnion.psz, "disable")) + else if (!strcmp(ValueUnion.psz, "off") || !strcmp(ValueUnion.psz, "disable")) CHECK_ERROR (UsbCtl, COMSETTER(Enabled)(false)); else - return errorArgument("Invalid --usb argument '%s'", pValueUnion.psz); + return errorArgument("Invalid --usb argument '%s'", ValueUnion.psz); } } @@ -1879,10 +1860,10 @@ case MODIFYVM_SNAPSHOTFOLDER: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "default")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "default")) CHECK_ERROR (machine, COMSETTER(SnapshotFolder)(NULL)); else - CHECK_ERROR (machine, COMSETTER(SnapshotFolder)(Bstr(pValueUnion.psz))); + CHECK_ERROR (machine, COMSETTER(SnapshotFolder)(Bstr(ValueUnion.psz))); } break; @@ -1891,12 +1872,12 @@ case MODIFYVM_TELEPORTER_ENABLED: { - if (pValueUnion.psz) - { - if (!strcmp(pValueUnion.psz, "on")) + if (ValueUnion.psz) + { + if (!strcmp(ValueUnion.psz, "on")) CHECK_ERROR (machine, COMSETTER(TeleporterEnabled)(1)); - else if (!strcmp(pValueUnion.psz, "off")) + else if (!strcmp(ValueUnion.psz, "off")) CHECK_ERROR (machine, COMSETTER(TeleporterEnabled)(0)); else - return errorArgument("Invalid --teleporterenabled value '%s'", pValueUnion.psz); + return errorArgument("Invalid --teleporterenabled value '%s'", ValueUnion.psz); } break; @@ -1905,6 +1886,6 @@ case MODIFYVM_TELEPORTER_PORT: { - if (pValueUnion.u32 > 0) - CHECK_ERROR(machine, COMSETTER(TeleporterPort)(pValueUnion.u32)); + if (ValueUnion.u32 > 0) + CHECK_ERROR(machine, COMSETTER(TeleporterPort)(ValueUnion.u32)); break; } @@ -1912,6 +1893,6 @@ case MODIFYVM_TELEPORTER_ADDRESS: { - if (pValueUnion.psz) - CHECK_ERROR(machine, COMSETTER(TeleporterAddress)(Bstr(pValueUnion.psz))); + if (ValueUnion.psz) + CHECK_ERROR(machine, COMSETTER(TeleporterAddress)(Bstr(ValueUnion.psz))); break; } @@ -1919,6 +1900,6 @@ case MODIFYVM_TELEPORTER_PASSWORD: { - if (pValueUnion.psz) - CHECK_ERROR(machine, COMSETTER(TeleporterPassword)(Bstr(pValueUnion.psz))); + if (ValueUnion.psz) + CHECK_ERROR(machine, COMSETTER(TeleporterPassword)(Bstr(ValueUnion.psz))); break; } @@ -1926,5 +1907,5 @@ default: { - errorGetOpt(USAGE_MODIFYVM, c, &pValueUnion); + errorGetOpt(USAGE_MODIFYVM, c, &ValueUnion); rc = E_FAIL; break;