vbox_main.patch diff --git a/src/app/virtualbox/src/VBox/Main/include/ConsoleImpl.h b/src/app/virtualbox/src/VBox/Main/include/ConsoleImpl.h index 030a601..7fce453 100644 --- a/src/app/virtualbox/src/VBox/Main/include/ConsoleImpl.h +++ b/src/app/virtualbox/src/VBox/Main/include/ConsoleImpl.h @@ -50,7 +50,9 @@ class VMMDevMouseInterface; class DisplayMouseInterface; #include +#if 0 #include +#endif /* if 0 */ #include #ifdef VBOX_WITH_GUEST_PROPS # include /* For the property notification callback */ @@ -251,7 +253,9 @@ public: void VRDPInterceptUSB(uint32_t u32ClientId, void **ppvIntercept); void VRDPInterceptClipboard(uint32_t u32ClientId); +#if 0 void processRemoteUSBDevices(uint32_t u32ClientId, VRDEUSBDEVICEDESC *pDevList, uint32_t cbDevList, bool fDescExt); +#endif /* if 0 */ void reportVmStatistics(ULONG aValidStats, ULONG aCpuUser, ULONG aCpuKernel, ULONG aCpuIdle, ULONG aMemTotal, ULONG aMemFree, @@ -261,10 +265,12 @@ public: ULONG aBalloonedVMM, ULONG aSharedVMM, ULONG aVmNetRx, ULONG aVmNetTx) { +#if 0 mControl->ReportVmStatistics(aValidStats, aCpuUser, aCpuKernel, aCpuIdle, aMemTotal, aMemFree, aMemBalloon, aMemShared, aMemCache, aPageTotal, aAllocVMM, aFreeVMM, aBalloonedVMM, aSharedVMM, aVmNetRx, aVmNetTx); +#endif /* if 0 */ } void enableVMMStatistics(BOOL aEnable); @@ -274,12 +280,12 @@ public: // callback callers (partly; for some events console callbacks are notified // directly from IInternalSessionControl event handlers declared above) - void onMousePointerShapeChange(bool fVisible, bool fAlpha, - uint32_t xHot, uint32_t yHot, - uint32_t width, uint32_t height, - ComSafeArrayIn(uint8_t, aShape)); - void onMouseCapabilityChange(BOOL supportsAbsolute, BOOL supportsRelative, - BOOL supportsMT, BOOL needsHostCursor); + virtual void onMousePointerShapeChange(bool fVisible, bool fAlpha, + uint32_t xHot, uint32_t yHot, + uint32_t width, uint32_t height, + ComSafeArrayIn(uint8_t, aShape)) = 0; + virtual void onMouseCapabilityChange(BOOL supportsAbsolute, BOOL supportsRelative, + BOOL supportsMT, BOOL needsHostCursor) = 0; void onStateChange(MachineState_T aMachineState); void onAdditionsStateChange(); void onAdditionsOutdated(); diff --git a/src/app/virtualbox/src/VBox/Main/include/DisplayImpl.h b/src/app/virtualbox/src/VBox/Main/include/DisplayImpl.h index 585f6b2..ecb58b9 100644 --- a/src/app/virtualbox/src/VBox/Main/include/DisplayImpl.h +++ b/src/app/virtualbox/src/VBox/Main/include/DisplayImpl.h @@ -122,7 +122,7 @@ typedef struct _DISPLAYFBINFO class DisplayMouseInterface { public: - virtual int getScreenResolution(uint32_t cScreen, ULONG *pcx, + virtual HRESULT getScreenResolution(uint32_t cScreen, ULONG *pcx, ULONG *pcy, ULONG *pcBPP, LONG *pXOrigin, LONG *pYOrigin) = 0; virtual void getFramebufferDimensions(int32_t *px1, int32_t *py1, int32_t *px2, int32_t *py2) = 0; @@ -192,7 +192,7 @@ public: return maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer; } void getFramebufferDimensions(int32_t *px1, int32_t *py1, int32_t *px2, int32_t *py2); - int getScreenResolution(uint32_t cScreen, ULONG *pcx, ULONG *pcy, + HRESULT getScreenResolution(uint32_t cScreen, ULONG *pcx, ULONG *pcy, ULONG *pcBPP, LONG *pXOrigin, LONG *pYOrigin) { return GetScreenResolution(cScreen, pcx, pcy, pcBPP, pXOrigin, pYOrigin); @@ -232,6 +232,10 @@ public: static const PDMDRVREG DrvReg; +#if 0 + static void fireGuestMonitorChangedEvent(EventSource*, GuestMonitorChangedEventType, int32_t, int32_t, int32_t, int32_t, int32_t); +#endif + private: int updateDisplayData(void); diff --git a/src/app/virtualbox/src/VBox/Main/include/FramebufferImpl.h b/src/app/virtualbox/src/VBox/Main/include/FramebufferImpl.h index feebfcd..4136d6d 100644 --- a/src/app/virtualbox/src/VBox/Main/include/FramebufferImpl.h +++ b/src/app/virtualbox/src/VBox/Main/include/FramebufferImpl.h @@ -70,6 +70,7 @@ public: STDMETHOD(SetVisibleRegion)(BYTE *aRectangles, ULONG aCount) = 0; STDMETHOD(ProcessVHWACommand)(BYTE *pCommand) = 0; + STDMETHOD(NotifyUpdate)(ULONG x, ULONG y, ULONG w, ULONG h) = 0; }; #endif // ____H_H_FRAMEBUFFERIMPL diff --git a/src/app/virtualbox/src/VBox/Main/include/MachineImpl.h b/src/app/virtualbox/src/VBox/Main/include/MachineImpl.h index bb91290..d3c6d85 100644 --- a/src/app/virtualbox/src/VBox/Main/include/MachineImpl.h +++ b/src/app/virtualbox/src/VBox/Main/include/MachineImpl.h @@ -1213,7 +1213,7 @@ private: HRESULT setMachineState(MachineState_T aMachineState); HRESULT updateMachineStateOnClient(); - HRESULT mRemoveSavedState; + bool mRemoveSavedState; ConsoleTaskData mConsoleTaskData; diff --git a/src/app/virtualbox/src/VBox/Main/include/NetworkServiceRunner.h b/src/app/virtualbox/src/VBox/Main/include/NetworkServiceRunner.h index f0ec275..78a390e 100644 --- a/src/app/virtualbox/src/VBox/Main/include/NetworkServiceRunner.h +++ b/src/app/virtualbox/src/VBox/Main/include/NetworkServiceRunner.h @@ -15,6 +15,9 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#ifndef ____H_H_NetworkServiceRunner +#define ____H_H_NetworkServiceRunner + #include #include #include @@ -55,3 +58,5 @@ private: struct Data; Data *m; }; + +#endif /* ____H_H_NetworkServiceRunner */ diff --git a/src/app/virtualbox/src/VBox/Main/include/ProgressProxyImpl.h b/src/app/virtualbox/src/VBox/Main/include/ProgressProxyImpl.h index 66f2b31..0ac7ab8 100644 --- a/src/app/virtualbox/src/VBox/Main/include/ProgressProxyImpl.h +++ b/src/app/virtualbox/src/VBox/Main/include/ProgressProxyImpl.h @@ -52,7 +52,7 @@ public: #if !defined (VBOX_COM_INPROC) VirtualBox *pParent, #endif - IUnknown *pInitiator, + void *pInitiator, CBSTR bstrDescription, BOOL fCancelable, ULONG uTotalOperationsWeight, diff --git a/src/app/virtualbox/src/VBox/Main/include/SessionImpl.h b/src/app/virtualbox/src/VBox/Main/include/SessionImpl.h index b0f600e..bcd6b4c 100644 --- a/src/app/virtualbox/src/VBox/Main/include/SessionImpl.h +++ b/src/app/virtualbox/src/VBox/Main/include/SessionImpl.h @@ -24,6 +24,8 @@ # include "win/resource.h" #endif +class GenodeConsole; + #ifdef RT_OS_WINDOWS [threading(free)] #endif @@ -122,7 +124,7 @@ private: ComPtr mControl; #ifndef VBOX_COM_INPROC_API_CLIENT - ComObjPtr mConsole; + ComObjPtr mConsole; #endif ComPtr mRemoteMachine; diff --git a/src/app/virtualbox/src/VBox/Main/src-all/EventImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-all/EventImpl.cpp index 182f267..90b8716 100644 --- a/src/app/virtualbox/src/VBox/Main/src-all/EventImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-all/EventImpl.cpp @@ -1263,7 +1263,8 @@ STDMETHODIMP EventSource::EventProcessed(IEventListener *aListener, */ class ATL_NO_VTABLE PassiveEventListener : public VirtualBoxBase, - VBOX_SCRIPTABLE_IMPL(IEventListener) + public IEventListener +// VBOX_SCRIPTABLE_IMPL(IEventListener) { public: @@ -1302,7 +1303,8 @@ public: /* Proxy listener class, used to aggregate multiple event sources into one */ class ATL_NO_VTABLE ProxyEventListener : public VirtualBoxBase, - VBOX_SCRIPTABLE_IMPL(IEventListener) + public IEventListener +// VBOX_SCRIPTABLE_IMPL(IEventListener) { ComPtr mSource; public: @@ -1349,8 +1351,9 @@ public: }; class ATL_NO_VTABLE EventSourceAggregator : - public VirtualBoxBase, - VBOX_SCRIPTABLE_IMPL(IEventSource) +// public VirtualBoxBase, + public EventSource +// VBOX_SCRIPTABLE_IMPL(IEventSource) { typedef std::list > EventSourceList; /* key is weak reference */ @@ -1417,6 +1420,7 @@ public: HRESULT removeProxyListener(IEventListener *aListener); }; +#if 0 #ifdef VBOX_WITH_XPCOM NS_DECL_CLASSINFO(ProxyEventListener) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(ProxyEventListener, IEventListener) @@ -1431,6 +1435,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1_CI(EventSource, IEventSource) NS_DECL_CLASSINFO(EventSourceAggregator) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(EventSourceAggregator, IEventSource) #endif +#endif STDMETHODIMP EventSource::CreateListener(IEventListener **aListener) diff --git a/src/app/virtualbox/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp index e984238..b02cb45 100644 --- a/src/app/virtualbox/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp @@ -131,6 +131,6 @@ STDMETHODIMP PCIDeviceAttachment::COMGETTER(GuestAddress)(LONG * aGuestAddress) } #ifdef VBOX_WITH_XPCOM -NS_DECL_CLASSINFO(PCIDeviceAttachment) -NS_IMPL_THREADSAFE_ISUPPORTS1_CI(PCIDeviceAttachment, IPCIDeviceAttachment) +//NS_DECL_CLASSINFO(PCIDeviceAttachment) +//NS_IMPL_THREADSAFE_ISUPPORTS1_CI(PCIDeviceAttachment, IPCIDeviceAttachment) #endif diff --git a/src/app/virtualbox/src/VBox/Main/src-all/ProgressImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-all/ProgressImpl.cpp index fa3ecea..ac1a203 100644 --- a/src/app/virtualbox/src/VBox/Main/src-all/ProgressImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-all/ProgressImpl.cpp @@ -20,9 +20,9 @@ #if defined(VBOX_WITH_XPCOM) -#include -#include -#include +//#include +//#include +//#include #endif /* defined(VBOX_WITH_XPCOM) */ #include "ProgressImpl.h" @@ -98,7 +98,7 @@ STDMETHODIMP Progress::COMGETTER(Initiator)(IUnknown **aInitiator) else { ComObjPtr pVirtualBox(mParent); - pVirtualBox.queryInterfaceTo(aInitiator); +// pVirtualBox.queryInterfaceTo(aInitiator); } #else mInitiator.queryInterfaceTo(aInitiator); @@ -573,8 +573,10 @@ HRESULT Progress::init( #endif unconst(mId).create(); +/* if (aId) mId.cloneTo(aId); +*/ #if !defined(VBOX_COM_INPROC) /* add to the global collection of progress operations (note: after @@ -1057,7 +1059,7 @@ HRESULT Progress::setResultCode(HRESULT aResultCode) } #else /* !defined(VBOX_WITH_XPCOM) */ - +/* nsCOMPtr es; es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &rc); if (NS_SUCCEEDED(rc)) @@ -1076,6 +1078,7 @@ HRESULT Progress::setResultCode(HRESULT aResultCode) } } } +*/ #endif /* !defined(VBOX_WITH_XPCOM) */ AssertMsg(rc == S_OK, ("Couldn't get error info (rc=%08X) while trying to set a failed result (%08X)!\n", diff --git a/src/app/virtualbox/src/VBox/Main/src-all/VirtualBoxBase.cpp b/src/app/virtualbox/src/VBox/Main/src-all/VirtualBoxBase.cpp index b43f5a6..6aef9df 100644 --- a/src/app/virtualbox/src/VBox/Main/src-all/VirtualBoxBase.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-all/VirtualBoxBase.cpp @@ -23,6 +23,7 @@ #include +#if 0 #if !defined (VBOX_WITH_XPCOM) #include #include @@ -31,6 +32,7 @@ #include #include #endif /* !defined (VBOX_WITH_XPCOM) */ +#endif #include "VirtualBoxBase.h" #include "AutoCaller.h" @@ -296,6 +298,7 @@ void VirtualBoxBase::releaseCaller() AssertMsgFailed (("mState = %d!", mState)); } +#if 0 /** * Handles unexpected exceptions by turning them into COM errors in release * builds or by hitting a breakpoint in the release builds. @@ -770,6 +773,7 @@ void VirtualBoxBase::clearError(void) #endif } +#endif /* if 0 */ //////////////////////////////////////////////////////////////////////////////// // --- a/src/app/virtualbox/src/VBox/Main/src-client/BusAssignmentManager.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-client/BusAssignmentManager.cpp @@ -72,6 +72,8 @@ {"usb-ohci", 0, 6, 0, 0}, {"usb-ehci", 0, 11, 0, 0}, + {"nec-xhci", 0, 29, 0, 0}, + /* ACPI controller */ {"acpi", 0, 7, 0, 0}, diff --git a/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl.cpp index 69e3109..141bb98 100644 --- a/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl.cpp @@ -51,23 +51,34 @@ #include "KeyboardImpl.h" #include "MouseImpl.h" #include "DisplayImpl.h" +#if 0 #include "MachineDebuggerImpl.h" +#endif #include "USBDeviceImpl.h" +#if 0 #include "RemoteUSBDeviceImpl.h" +#endif #include "SharedFolderImpl.h" +#if 0 #include "AudioSnifferInterface.h" #include "Nvram.h" #ifdef VBOX_WITH_USB_CARDREADER # include "UsbCardReader.h" #endif +#endif #include "ProgressImpl.h" +#if 0 #include "ConsoleVRDPServer.h" +#endif #include "VMMDev.h" +#if 0 #ifdef VBOX_WITH_EXTPACK # include "ExtPackManagerImpl.h" #endif #include "BusAssignmentManager.h" #include "EmulatedUSBImpl.h" +#endif +#include "VirtualBoxImpl.h" #include "VBoxEvents.h" #include "AutoCaller.h" @@ -75,7 +86,9 @@ #include #include "VBox/com/ErrorInfo.h" +#if 0 #include +#endif #include #include @@ -90,14 +103,17 @@ #include #include +#if 0 #include #include #include #include #include +#endif #ifdef VBOX_WITH_USB # include #endif +#if 0 #ifdef VBOX_WITH_NETSHAPER # include #endif /* VBOX_WITH_NETSHAPER */ @@ -109,14 +125,17 @@ #include #include - +#endif #include +#if 0 #include #ifdef VBOX_WITH_GUEST_PROPS # include # include #endif +#endif /* #if 0 */ + #include #include #include // for auto_ptr @@ -278,6 +297,8 @@ struct VMSaveTask : public VMTask Reason_T mReason; }; +#if 0 + // Handler for global events //////////////////////////////////////////////////////////////////////////////// inline static const char *networkAdapterTypeToName(NetworkAdapterType_T adapterType); @@ -383,6 +404,7 @@ typedef ListenerImpl VmEventListenerImpl; VBOX_LISTENER_DECLARE(VmEventListenerImpl) +#endif /* #if 0 */ // constructor / destructor ///////////////////////////////////////////////////////////////////////////// @@ -530,6 +552,7 @@ HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl, Loc rc = mDisplay->init(this); AssertComRCReturnRC(rc); +#if 0 unconst(mVRDEServerInfo).createObject(); rc = mVRDEServerInfo->init(this); AssertComRCReturnRC(rc); @@ -538,6 +561,7 @@ HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl, Loc rc = mEmulatedUSB->init(this); AssertComRCReturnRC(rc); +#endif /* Grab global and machine shared folder lists */ rc = fetchSharedFolders(true /* aGlobal */); @@ -545,10 +569,12 @@ HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl, Loc rc = fetchSharedFolders(false /* aGlobal */); AssertComRCReturnRC(rc); +#if 0 /* Create other child objects */ unconst(mConsoleVRDPServer) = new ConsoleVRDPServer(this); AssertReturn(mConsoleVRDPServer, E_FAIL); +#endif /* Figure out size of meAttachmentType vector */ ComPtr pVirtualBox; @@ -574,9 +600,11 @@ HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl, Loc // unconst(m_pVMMDev) = new VMMDev(this); // AssertReturn(mVMMDev, E_FAIL); +#if 0 unconst(mAudioSniffer) = new AudioSniffer(this); AssertReturn(mAudioSniffer, E_FAIL); +#endif FirmwareType_T enmFirmwareType; mMachine->COMGETTER(FirmwareType)(&enmFirmwareType); if ( enmFirmwareType == FirmwareType_EFI @@ -584,8 +612,10 @@ HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl, Loc || enmFirmwareType == FirmwareType_EFI64 || enmFirmwareType == FirmwareType_EFIDUAL) { +#if 0 unconst(mNvram) = new Nvram(this); AssertReturn(mNvram, E_FAIL); +#endif } #ifdef VBOX_WITH_USB_CARDREADER @@ -593,6 +623,7 @@ HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl, Loc AssertReturn(mUsbCardReader, E_FAIL); #endif +#if 0 /* VirtualBox events registration. */ { ComPtr pES; @@ -609,6 +640,7 @@ HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl, Loc rc = pES->RegisterListener(aVmListener, ComSafeArrayAsInParam(eventTypes), true); AssertComRC(rc); } +#endif } /* Confirm a successful initialization when it's the case */ @@ -625,6 +657,7 @@ HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl, Loc return S_OK; } +#if 0 /** * Uninitializes the Console object. */ @@ -1035,6 +1068,8 @@ void Console::guestPropertiesVRDPUpdateDisconnect(uint32_t u32ClientId) #endif /* VBOX_WITH_GUEST_PROPS */ +#endif /* #if 0 */ + bool Console::isResetTurnedIntoPowerOff(void) { Bstr value; @@ -1046,6 +1081,8 @@ bool Console::isResetTurnedIntoPowerOff(void) return false; } +#if 0 + #ifdef VBOX_WITH_EXTPACK /** * Used by VRDEServer and others to talke to the extension pack manager. @@ -1505,6 +1542,7 @@ void Console::VRDPInterceptClipboard(uint32_t u32ClientId) return; } +#endif /* if 0 */ //static const char *Console::sSSMConsoleUnit = "ConsoleData"; @@ -1970,6 +2008,8 @@ STDMETHODIMP Console::COMGETTER(Display)(IDisplay **aDisplay) return S_OK; } +#if 0 + STDMETHODIMP Console::COMGETTER(Debugger)(IMachineDebugger **aDebugger) { CheckComArgOutPointerValid(aDebugger); @@ -2069,6 +2109,7 @@ Console::COMGETTER(SharedFolders)(ComSafeArrayOut(ISharedFolder *, aSharedFolder return S_OK; } +#endif /* #if 0 */ STDMETHODIMP Console::COMGETTER(EventSource)(IEventSource ** aEventSource) { @@ -2085,6 +2126,8 @@ STDMETHODIMP Console::COMGETTER(EventSource)(IEventSource ** aEventSource) return hrc; } +#if 0 + STDMETHODIMP Console::COMGETTER(AttachedPCIDevices)(ComSafeArrayOut(IPCIDeviceAttachment *, aAttachments)) { CheckComArgOutSafeArrayPointerValid(aAttachments); @@ -2134,6 +2177,7 @@ STDMETHODIMP Console::COMSETTER(UseHostClipboard)(BOOL aUseHostClipboard) // IConsole methods ///////////////////////////////////////////////////////////////////////////// +#endif /* #if 0 */ STDMETHODIMP Console::PowerUp(IProgress **aProgress) { @@ -2291,6 +2335,8 @@ STDMETHODIMP Console::PowerDown(IProgress **aProgress) return rc; } +#if 0 + STDMETHODIMP Console::Reset() { LogFlowThisFuncEnter(); @@ -3451,6 +3497,8 @@ STDMETHODIMP Console::RestoreSnapshot(ISnapshot *aSnapshot, IProgress **aProgres return S_OK; } +#endif /* #if 0 */ + // Non-interface public methods ///////////////////////////////////////////////////////////////////////////// @@ -3526,6 +3574,8 @@ HRESULT Console::convertBusPortDeviceToLun(StorageBus_T enmBus, LONG port, LONG } } +#if 0 + // private methods ///////////////////////////////////////////////////////////////////////////// @@ -4388,6 +4438,8 @@ HRESULT Console::onNATRedirectRuleChange(ULONG ulInstance, BOOL aNatRuleRemove, return rc; } +#endif /* #if 0 */ + VMMDevMouseInterface *Console::getVMMDevMouseInterface() { return m_pVMMDev; @@ -4398,6 +4450,8 @@ DisplayMouseInterface *Console::getDisplayMouseInterface() return mDisplay; } +#if 0 + /** * Parses one key value pair. * @@ -5333,6 +5387,8 @@ HRESULT Console::onSharedFolderChange(BOOL aGlobal) return rc; } +#endif + /** * Called by IInternalSessionControl::OnUSBDeviceAttach() or locally by * processRemoteUSBDevices() after IInternalMachineControl::RunUSBDeviceFilters() @@ -5499,7 +5555,7 @@ HRESULT Console::onUSBDeviceDetach(IN_BSTR aId, return E_FAIL; #endif /* !VBOX_WITH_USB */ } - +#if 0 /** * Called by IInternalSessionControl::OnBandwidthGroupChange(). * @@ -6490,6 +6546,8 @@ void Console::onMouseCapabilityChange(BOOL supportsAbsolute, BOOL supportsRelati fireMouseCapabilityChangedEvent(mEventSource, supportsAbsolute, supportsRelative, supportsMT, needsHostCursor); } +#endif /* #if 0 */ + void Console::onStateChange(MachineState_T machineState) { AutoCaller autoCaller(this); @@ -6497,6 +6555,8 @@ void Console::onStateChange(MachineState_T machineState) fireStateChangedEvent(mEventSource, machineState); } +#if 0 + void Console::onAdditionsStateChange() { AutoCaller autoCaller(this); @@ -6555,6 +6615,8 @@ void Console::onUSBDeviceStateChange(IUSBDevice *aDevice, bool aAttached, fireUSBDeviceStateChangedEvent(mEventSource, aDevice, aAttached, aError); } +#endif /* #if 0 */ + void Console::onRuntimeError(BOOL aFatal, IN_BSTR aErrorID, IN_BSTR aMessage) { AutoCaller autoCaller(this); @@ -6563,6 +6625,8 @@ void Console::onRuntimeError(BOOL aFatal, IN_BSTR aErrorID, IN_BSTR aMessage) fireRuntimeErrorEvent(mEventSource, aFatal, aErrorID, aMessage); } +#if 0 + HRESULT Console::onShowWindow(BOOL aCheck, BOOL *aCanShow, LONG64 *aWinId) { AssertReturn(aCanShow, E_POINTER); @@ -6626,6 +6690,8 @@ HRESULT Console::onShowWindow(BOOL aCheck, BOOL *aCanShow, LONG64 *aWinId) return S_OK; } +#endif /* #if 0 */ + // private methods //////////////////////////////////////////////////////////////////////////////// @@ -6819,6 +6885,8 @@ HRESULT Console::consoleInitReleaseLog(const ComPtr aMachine) } } +#if 0 + char szError[RTPATH_MAX + 128]; int vrc = com::VBoxLogRelCreate("VM", logFile.c_str(), RTLOGFLAGS_PREFIX_TIME_PROG | RTLOGFLAGS_RESTRICT_GROUPS, @@ -6839,6 +6907,8 @@ HRESULT Console::consoleInitReleaseLog(const ComPtr aMachine) if (SUCCEEDED(hrc) || cHistoryFiles) RTDirFlush(logDir.c_str()); +#endif /* if 0 */ + return hrc; } @@ -7113,6 +7183,10 @@ HRESULT Console::powerUp(IProgress **aProgress, bool aPaused) } #endif + ComPtr pIVirtualBox; + mMachine->COMGETTER(Parent)(pIVirtualBox.asOutParam()); + VirtualBox *pVirtualBox = + dynamic_cast(*pIVirtualBox.asOutParam()); // If there is immutable drive the process that. VMPowerUpTask::ProgressList progresses(task->hardDiskProgresses); @@ -7123,7 +7197,8 @@ HRESULT Console::powerUp(IProgress **aProgress, bool aPaused) ++cOperations; ulTotalOperationsWeight += 1; } - rc = pPowerupProgress->init(static_cast(this), + rc = pPowerupProgress->init(pVirtualBox, + static_cast(this), progressDesc.raw(), TRUE, // Cancelable cOperations, @@ -7136,13 +7211,15 @@ HRESULT Console::powerUp(IProgress **aProgress, bool aPaused) else if ( mMachineState == MachineState_Saved || (!fTeleporterEnabled && !fFaultToleranceSyncEnabled)) { - rc = pPowerupProgress->init(static_cast(this), + rc = pPowerupProgress->init(pVirtualBox, + static_cast(this), progressDesc.raw(), FALSE /* aCancelable */); } else if (fTeleporterEnabled) { - rc = pPowerupProgress->init(static_cast(this), + rc = pPowerupProgress->init(pVirtualBox, + static_cast(this), progressDesc.raw(), TRUE /* aCancelable */, 3 /* cOperations */, @@ -7153,7 +7230,8 @@ HRESULT Console::powerUp(IProgress **aProgress, bool aPaused) } else if (fFaultToleranceSyncEnabled) { - rc = pPowerupProgress->init(static_cast(this), + rc = pPowerupProgress->init(pVirtualBox, + static_cast(this), progressDesc.raw(), TRUE /* aCancelable */, 3 /* cOperations */, @@ -7399,6 +7477,7 @@ HRESULT Console::powerDown(IProgress *aProgress /*= NULL*/) * safe to release the object lock now if needed) * ---------------------------------------------------------------------- */ +#if 0 /* Stop the VRDP server to prevent new clients connection while VM is being * powered off. */ if (mConsoleVRDPServer) @@ -7413,6 +7492,7 @@ HRESULT Console::powerDown(IProgress *aProgress /*= NULL*/) alock.acquire(); } +#endif /* advance percent count */ if (aProgress) @@ -7649,6 +7729,8 @@ HRESULT Console::setMachineState(MachineState_T aMachineState, return rc; } +#if 0 + /** * Searches for a shared folder with the given logical name * in the collection of shared folders. @@ -7684,6 +7766,8 @@ HRESULT Console::findSharedFolder(const Utf8Str &strName, return VBOX_E_FILE_ERROR; } +#endif /* #if 0 */ + /** * Fetches the list of global or machine shared folders from the server. * @@ -8390,6 +8474,8 @@ pVMMDev->hgcmHostCall("VBoxSharedClipboard", VBOX_SHARED_CLIPBOARD_HOST_FN_SET_MODE, 1, &parm); } +#if 0 + /** * Changes the drag'n_drop mode. * @@ -8426,7 +8512,7 @@ void Console::changeDragAndDropMode(DragAndDropMode_T aDragAndDropMode) pVMMDev->hgcmHostCall("VBoxDragAndDropSvc", DragAndDropSvc::HOST_DND_SET_MODE, 1, &parm); } - +#endif /* if 0 */ #ifdef VBOX_WITH_USB /** * Sends a request to VMM to attach the given host device. @@ -8472,6 +8558,7 @@ HRESULT Console::attachUSBDevice(IUSBDevice *aHostDevice, ULONG aMaskedIfs) Address.c_str(), uuid.raw())); void *pvRemoteBackend = NULL; +#if 0 if (fRemote) { RemoteUSBDevice *pRemoteUSBDevice = static_cast(aHostDevice); @@ -8479,7 +8566,7 @@ HRESULT Console::attachUSBDevice(IUSBDevice *aHostDevice, ULONG aMaskedIfs) if (!pvRemoteBackend) return E_INVALIDARG; /* The clientId is invalid then. */ } - +#endif USHORT portVersion = 1; hrc = aHostDevice->COMGETTER(PortVersion)(&portVersion); AssertComRCReturnRC(hrc); @@ -8590,12 +8677,13 @@ HRESULT Console::detachUSBDevice(const ComObjPtr &aHostDevice) setErrorStatic(hrc2, "GetRemote() failed"); PCRTUUID pUuid = aHostDevice->id().raw(); +#if 0 if (fRemote) { Guid guid(*pUuid); consoleVRDPServer()->USBBackendReleasePointer(&guid); } - +#endif alock.release(); int vrc = VMR3ReqCallWaitU(ptrVM.rawUVM(), 0 /* idDstCpu (saved state, see #6232) */, (PFNRT)usbDetachCallback, 5, @@ -8639,7 +8727,7 @@ Console::usbDetachCallback(Console *that, PUVM pUVM, PCRTUUID aUuid) return vrc; } #endif /* VBOX_WITH_USB */ - +#if 0 /* Note: FreeBSD needs this whether netflt is used or not. */ #if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD)) /** @@ -8875,6 +8963,8 @@ HRESULT Console::detachFromTapInterface(INetworkAdapter *networkAdapter) } #endif /* (RT_OS_LINUX || RT_OS_FREEBSD) && !VBOX_WITH_NETFLT */ +#endif /* #if 0 */ + /** * Called at power down to terminate host interface networking. * @@ -9046,9 +9136,10 @@ HRESULT Console::captureUSBDevices(PUVM pUVM) * us back from under its lock (e.g. onUSBDeviceAttach()) which would * produce an inter-process dead-lock otherwise. */ alock.release(); - +#if 0 HRESULT hrc = mControl->AutoCaptureUSBDevices(); ComAssertComRCRetRC(hrc); +#endif } return S_OK; @@ -9077,6 +9168,8 @@ void Console::detachAllUSBDevices(bool aDone) mControl->DetachAllUSBDevices(aDone); } +#if 0 + /** * @note Locks this object for writing. */ @@ -9249,6 +9342,8 @@ void Console::processRemoteUSBDevices(uint32_t u32ClientId, VRDEUSBDEVICEDESC *p LogFlowThisFuncLeave(); } +#endif /* #if 0 */ + /** * Progress cancelation callback for fault tolerance VM poweron */ @@ -9346,6 +9441,7 @@ DECLCALLBACK(int) Console::powerUpThread(RTTHREAD Thread, void *pvUser) /* Create the VRDP server. In case of headless operation, this will * also create the framebuffer, required at VM creation. */ +#if 0 ConsoleVRDPServer *server = pConsole->consoleVRDPServer(); Assert(server); @@ -9392,6 +9488,7 @@ DECLCALLBACK(int) Console::powerUpThread(RTTHREAD Thread, void *pvUser) vrc, errMsg.c_str())); throw setErrorStatic(E_FAIL, errMsg.c_str()); } +#endif ComPtr pMachine = pConsole->machine(); ULONG cCpus = 1; @@ -9416,8 +9513,10 @@ DECLCALLBACK(int) Console::powerUpThread(RTTHREAD Thread, void *pvUser) alock.acquire(); +#if 0 /* Enable client connections to the server. */ pConsole->consoleVRDPServer()->EnableConnections(); +#endif if (RT_SUCCESS(vrc)) { @@ -9441,9 +9540,11 @@ DECLCALLBACK(int) Console::powerUpThread(RTTHREAD Thread, void *pvUser) /* * Synchronize debugger settings */ +#if 0 MachineDebugger *machineDebugger = pConsole->getMachineDebugger(); if (machineDebugger) machineDebugger->flushQueuedSettings(); +#endif /* * Shared Folders @@ -9719,6 +9820,7 @@ DECLCALLBACK(int) Console::powerUpThread(RTTHREAD Thread, void *pvUser) return VINF_SUCCESS; } +#if 0 /** * Reconfigures a medium attachment (part of taking or deleting an online snapshot). @@ -10209,6 +10311,8 @@ DECLCALLBACK(int) Console::saveStateThread(RTTHREAD Thread, void *pvUser) return VINF_SUCCESS; } +#endif /* #if 0 */ + /** * Thread for powering down the Console. * @@ -10367,8 +10471,6 @@ Console::i_pdmIfSecKey_KeyRelease(PPDMISECKEY pInterface, const char *pszId) } - - /** * The Main status driver instance data. */ @@ -10461,9 +10563,11 @@ DECLCALLBACK(int) Console::drvStatus_MediumEjected(PPDMIMEDIANOTIFY pInterface, alock.release(); ComPtr pNewMediumAtt; +#if 0 rc = pThis->pConsole->mControl->EjectMedium(pMediumAtt, pNewMediumAtt.asOutParam()); if (SUCCEEDED(rc)) fireMediumChangedEvent(pThis->pConsole->mEventSource, pNewMediumAtt); +#endif alock.acquire(); if (pNewMediumAtt != pMediumAtt) diff --git a/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp index caed4be..6d02496 100644 --- a/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp @@ -27,6 +27,7 @@ #include "VBox/com/ptr.h" #include "ConsoleImpl.h" +#include "MachineImpl.h" #include "DisplayImpl.h" #ifdef VBOX_WITH_GUEST_CONTROL # include "GuestImpl.h" @@ -129,6 +130,7 @@ *******************************************************************************/ static Utf8Str *GetExtraDataBoth(IVirtualBox *pVirtualBox, IMachine *pMachine, const char *pszName, Utf8Str *pStrValue); +#if 0 #if defined(RT_OS_DARWIN) @@ -202,6 +204,7 @@ static int DarwinSmcKey(char *pabKey, uint32_t cbKey) /* Comment out the following line to remove VMWare compatibility hack. */ #define VMWARE_NET_IN_SLOT_11 +#endif /** * Translate IDE StorageControllerType_T to string representation. */ @@ -522,12 +525,12 @@ static LONG GetNextUsedPort(LONG aPortUsed[30], LONG lBaseVal, uint32_t u32Size) #define MAX_BIOS_LUN_COUNT 4 -static int SetBiosDiskInfo(ComPtr pMachine, PCFGMNODE pCfg, PCFGMNODE pBiosCfg, +static HRESULT SetBiosDiskInfo(ComPtr pMachine, PCFGMNODE pCfg, PCFGMNODE pBiosCfg, Bstr controllerName, const char * const s_apszBiosConfig[4]) { HRESULT hrc; #define MAX_DEVICES 30 -#define H() AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_GENERAL_FAILURE) +#define H() AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), E_FAIL) LONG lPortLUN[MAX_BIOS_LUN_COUNT]; LONG lPortUsed[MAX_DEVICES]; @@ -599,9 +602,11 @@ static int SetBiosDiskInfo(ComPtr pMachine, PCFGMNODE pCfg, PCFGMNODE LogFlowFunc(("Top %d HBA ports = %s, %d\n", j, s_apszBiosConfig[j], lPortLUN[j])); } } - return VINF_SUCCESS; +#undef H + return S_OK; } +#if 0 #ifdef VBOX_WITH_PCI_PASSTHROUGH HRESULT Console::attachRawPCIDevices(PUVM pUVM, BusAssignmentManager *pBusMgr, PCFGMNODE pDevices) { @@ -741,6 +746,7 @@ HRESULT Console::attachRawPCIDevices(PUVM pUVM, BusAssignmentManager *pBusMgr, P } #endif +#endif /* if 0 */ void Console::attachStatusDriver(PCFGMNODE pCtlInst, PPDMLED *papLeds, uint64_t uFirst, uint64_t uLast, @@ -2070,6 +2076,8 @@ int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock) case NetworkAdapterType_I82545EM: InsertConfigInteger(pCfg, "AdapterType", 2); break; + default: + break; } /* @@ -2225,6 +2233,7 @@ int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock) /* * Parallel (LPT) Ports */ +#if 0 InsertConfigNode(pDevices, "parallel", &pDev); for (ULONG ulInstance = 0; ulInstance < SchemaDefs::ParallelPortCount; ++ulInstance) { @@ -2254,6 +2263,7 @@ int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock) InsertConfigString(pLunL1, "DevicePath", bstr); } +#endif /* * VMM Device */ @@ -2286,6 +2296,7 @@ int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock) /* * Audio Sniffer Device */ +#if 0 InsertConfigNode(pDevices, "AudioSniffer", &pDev); InsertConfigNode(pDev, "0", &pInst); InsertConfigNode(pInst, "Config", &pCfg); @@ -2300,9 +2311,10 @@ int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock) /* * AC'97 ICH / SoundBlaster16 audio / Intel HD Audio */ +#endif BOOL fAudioEnabled = FALSE; ComPtr audioAdapter; hrc = pMachine->COMGETTER(AudioAdapter)(audioAdapter.asOutParam()); H(); if (audioAdapter) hrc = audioAdapter->COMGETTER(Enabled)(&fAudioEnabled); H(); @@ -2421,6 +2435,8 @@ int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock) break; } #endif + default: + break; } hrc = pMachine->COMGETTER(Name)(bstr.asOutParam()); H(); InsertConfigString(pCfg, "StreamName", bstr); @@ -2537,6 +2537,14 @@ #endif } /* for every USB controller. */ + /* + * NEC XHCI Device + */ + InsertConfigNode(pDevices, "nec-xhci", &pDev); + InsertConfigNode(pDev, "0", &pInst); + InsertConfigNode(pInst, "Config", &pCfg); + InsertConfigInteger(pInst, "Trusted", 1); + hrc = pBusMgr->assignPCIDevice("nec-xhci", pInst); H(); /* * Virtual USB Devices. @@ -3533,6 +3549,8 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst, ComPtr pMedium; hrc = pMediumAtt->COMGETTER(Medium)(pMedium.asOutParam()); H(); +#if 0 + /* * 1. Only check this for hard disk images. * 2. Only check during VM creation and not later, especially not during @@ -3717,6 +3735,8 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst, } } +#endif /* if 0 */ + if (pMedium) { BOOL fHostDrive; @@ -3810,7 +3830,7 @@ int Console::configMedium(PCFGMNODE pLunL0, // InsertConfig* throws try { - int rc = VINF_SUCCESS; +// int rc = VINF_SUCCESS; HRESULT hrc; Bstr bstr; PCFGMNODE pLunL1 = NULL; @@ -4414,7 +4434,7 @@ int Console::configNetwork(const char *pszDevice, { switch (hrc) { - case VERR_ACCESS_DENIED: + case E_ACCESSDENIED: return VMSetError(VMR3GetVM(mpUVM), VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_( "Failed to open '/dev/net/tun' for read/write access. Please check the " "permissions of that node. Either run 'chmod 0666 /dev/net/tun' or " @@ -4428,12 +4448,12 @@ int Console::configNetwork(const char *pszDevice, } } - Assert((int)maTapFD[uInstance] >= 0); - if ((int)maTapFD[uInstance] >= 0) + Assert((long)maTapFD[uInstance] >= 0); + if ((long)maTapFD[uInstance] >= 0) { InsertConfigString(pLunL0, "Driver", "HostInterface"); InsertConfigNode(pLunL0, "Config", &pCfg); - InsertConfigInteger(pCfg, "FileHandle", maTapFD[uInstance]); + InsertConfigInteger(pCfg, "FileHandle", (long)maTapFD[uInstance]); } #elif defined(VBOX_WITH_NETFLT) diff --git a/src/app/virtualbox/src/VBox/Main/src-client/DisplayImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-client/DisplayImpl.cpp index fed0ac3..bc3c334 100644 --- a/src/app/virtualbox/src/VBox/Main/src-client/DisplayImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-client/DisplayImpl.cpp @@ -16,9 +16,12 @@ */ #include "DisplayImpl.h" +#include "MachineImpl.h" #include "DisplayUtils.h" #include "ConsoleImpl.h" +#if 0 #include "ConsoleVRDPServer.h" +#endif #include "VMMDev.h" #include "AutoCaller.h" @@ -1067,7 +1070,9 @@ void Display::handleResizeCompletedEMT(BOOL fResizeContext) * Must be done before calling NotifyUpdate below. */ LogRelFlowFunc(("Calling VRDP\n")); +#if 0 mParent->consoleVRDPServer()->SendResize(); +#endif /* @todo Merge these two 'if's within one 'if (!pFBInfo->pFramebuffer.isNull())' */ if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN && !pFBInfo->pFramebuffer.isNull()) @@ -1266,8 +1271,10 @@ void Display::handleDisplayUpdate (unsigned uScreenId, int x, int y, int w, int /* When VBVA is enabled, the VRDP server is informed in the VideoAccelFlush. * Inform the server here only if VBVA is disabled. */ +#if 0 if (maFramebuffers[uScreenId].u32ResizeStatus == ResizeStatus_Void) mParent->consoleVRDPServer()->SendUpdateBitmap(uScreenId, x, y, w, h); +#endif } } @@ -2260,7 +2267,9 @@ void Display::videoAccelFlush (void) vbvaRgnDirtyRect (&rgn, uScreenId, phdr); /* Forward the command to VRDP server. */ +#if 0 mParent->consoleVRDPServer()->SendUpdate (uScreenId, phdr, cbCmd); +#endif *phdr = hdrSaved; } @@ -3248,9 +3257,11 @@ int Display::drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address, rc = VERR_INVALID_PARAMETER; } +#if 0 if ( RT_SUCCESS(rc) && pDisplay->maFramebuffers[aScreenId].u32ResizeStatus == ResizeStatus_Void) pDisplay->mParent->consoleVRDPServer()->SendUpdateBitmap(aScreenId, x, y, width, height); +#endif pDisplay->vbvaUnlock(); return rc; @@ -3701,7 +3712,9 @@ DECLCALLBACK(int) Display::changeFramebuffer (Display *that, IFramebuffer *aFB, DISPLAYFBINFO *pDisplayFBInfo = &that->maFramebuffers[uScreenId]; pDisplayFBInfo->pFramebuffer = aFB; +#if 0 that->mParent->consoleVRDPServer()->SendResize (); +#endif /* The driver might not have been constructed yet */ if (that->mpDrv) @@ -3877,8 +3890,10 @@ DECLCALLBACK(void) Display::displayRefreshCallback(PPDMIDISPLAYCONNECTOR pInterf if (!pFBInfo->pFramebuffer.isNull() && pFBInfo->u32ResizeStatus == ResizeStatus_Void) { +#if 0 Assert (pDisplay->mParent && pDisplay->mParent->consoleVRDPServer()); pDisplay->mParent->consoleVRDPServer()->SendUpdate (uScreenId, NULL, 0); +#endif } } } @@ -4758,7 +4773,9 @@ DECLCALLBACK(void) Display::displayVBVAUpdateProcess(PPDMIDISPLAYCONNECTOR pInte pHdrUnconst->y -= (int16_t)pFBInfo->yOrigin; /* @todo new SendUpdate entry which can get a separate cmd header or coords. */ +#if 0 pThis->mParent->consoleVRDPServer()->SendUpdate (uScreenId, pCmd, (uint32_t)cbCmd); +#endif *pHdrUnconst = hdrSaved; } @@ -5004,7 +5021,9 @@ DECLCALLBACK(int) Display::displayVBVAResize(PPDMIDISPLAYCONNECTOR pInterface, c { /* VRDP server still need this notification. */ LogRelFlowFunc(("Calling VRDP\n")); +#if 0 pThis->mParent->consoleVRDPServer()->SendResize(); +#endif } return VINF_SUCCESS; } diff --git a/src/app/virtualbox/src/VBox/Main/src-client/GuestImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-client/GuestImpl.cpp index b438f9d..2b9755e 100644 --- a/src/app/virtualbox/src/VBox/Main/src-client/GuestImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-client/GuestImpl.cpp @@ -16,6 +16,7 @@ */ #include "GuestImpl.h" +#include "MachineImpl.h" #include "GuestSessionImpl.h" #include "Global.h" @@ -104,11 +105,11 @@ HRESULT Guest::init(Console *aParent) mVmValidStats = pm::VMSTATMASK_NONE; mMagic = GUEST_MAGIC; +#ifdef VBOX_WITH_GUEST_CONTROL int vrc = RTTimerLRCreate(&mStatTimer, 1000 /* ms */, &Guest::staticUpdateStats, this); AssertMsgRC(vrc, ("Failed to create guest statistics update timer (%Rrc)\n", vrc)); -#ifdef VBOX_WITH_GUEST_CONTROL hr = unconst(mEventSource).createObject(); if (SUCCEEDED(hr)) hr = mEventSource->init(); @@ -183,6 +184,7 @@ void Guest::uninit() LogFlowFuncLeave(); } +#ifdef VBOX_WITH_GUEST_CONTROL /* static */ DECLCALLBACK(void) Guest::staticUpdateStats(RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick) { @@ -194,6 +196,7 @@ DECLCALLBACK(void) Guest::staticUpdateStats(RTTIMERLR hTimerLR, void *pvUser, ui NOREF(hTimerLR); } +#endif /* static */ int Guest::staticEnumStatsCallback(const char *pszName, STAMTYPE enmType, void *pvSample, STAMUNIT enmUnit, @@ -1177,8 +1180,11 @@ void Guest::onUserStateChange(Bstr aUser, Bstr aDomain, VBoxGuestUserState enmSt Bstr strDetails; /** @todo Implement state details here. */ +#ifdef VBOX_WITH_GUEST_CONTROL fireGuestUserStateChangedEvent(mEventSource, aUser.raw(), aDomain.raw(), (GuestUserState_T)enmState, strDetails.raw()); +#endif + LogFlowFuncLeave(); } diff --git a/src/app/virtualbox/src/VBox/Main/src-client/MouseImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-client/MouseImpl.cpp index 652f2df..877b775 100644 --- a/src/app/virtualbox/src/VBox/Main/src-client/MouseImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-client/MouseImpl.cpp @@ -816,7 +816,11 @@ HRESULT Mouse::putEventMultiTouch(LONG aCount, } } - if (SUCCEEDED(rc)) + /* + * Contrary to the comment of the previous if clause, the usb model + * triggers various assertions if 0 contacts are propagated. + */ + if (SUCCEEDED(rc) && cContacts) { rc = reportMultiTouchEventToDevice(cContacts, cContacts? pau64Contacts: NULL, (uint32_t)aScanTime); diff --git a/src/app/virtualbox/src/VBox/Main/src-client/SessionImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-client/SessionImpl.cpp index 6ea10d3..267be48 100644 --- a/src/app/virtualbox/src/VBox/Main/src-client/SessionImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-client/SessionImpl.cpp @@ -17,8 +17,11 @@ #include "SessionImpl.h" #include "ConsoleImpl.h" +#include "MachineImpl.h" #include "Global.h" +#if 0 #include "ClientTokenHolder.h" +#endif #include "AutoCaller.h" #include "Logging.h" @@ -26,6 +29,8 @@ #include #include +#include "console.h" + /** * Local macro to check whether the session is open and return an error if not. * @note Don't forget to do |Auto[Reader]Lock alock (this);| before using this @@ -329,7 +334,9 @@ STDMETHODIMP Session::AssignMachine(IMachine *aMachine, LockType_T aLockType, /* query IInternalMachineControl interface */ mControl = aMachine; +#if 0 AssertReturn(!!mControl, E_FAIL); +#endif #ifndef VBOX_COM_INPROC_API_CLIENT HRESULT rc = mConsole.createObject(); @@ -349,6 +356,7 @@ STDMETHODIMP Session::AssignMachine(IMachine *aMachine, LockType_T aLockType, AssertPtr(aToken); #endif /* VBOX_WITH_GENERIC_SESSION_WATCHER */ /* create the machine client token */ +#if 0 try { #ifndef VBOX_WITH_GENERIC_SESSION_WATCHER @@ -367,6 +375,7 @@ STDMETHODIMP Session::AssignMachine(IMachine *aMachine, LockType_T aLockType, { rc = E_OUTOFMEMORY; } +#endif /* * Reference the VirtualBox object to ensure the server is up @@ -1217,12 +1226,14 @@ HRESULT Session::unlockMachine(bool aFinalRelease, bool aFromServer, AutoWriteLo if (mType == SessionType_WriteLock) { +#if 0 if (mClientTokenHolder) { delete mClientTokenHolder; mClientTokenHolder = NULL; } +#endif if (!aFinalRelease && !aFromServer) { /* diff --git a/src/app/virtualbox/src/VBox/Main/src-client/VBoxDriversRegister.cpp b/src/app/virtualbox/src/VBox/Main/src-client/VBoxDriversRegister.cpp index 7fa0f99..d85976d 100644 --- a/src/app/virtualbox/src/VBox/Main/src-client/VBoxDriversRegister.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-client/VBoxDriversRegister.cpp @@ -25,7 +25,9 @@ #include "VMMDev.h" #include "AudioSnifferInterface.h" #include "Nvram.h" +#if 0 #include "UsbWebcamInterface.h" +#endif #ifdef VBOX_WITH_USB_CARDREADER # include "UsbCardReader.h" #endif @@ -46,7 +48,7 @@ * @param pCallbacks Pointer to the callback table. * @param u32Version VBox version number. */ -extern "C" DECLEXPORT(int) VBoxDriversRegister(PCPDMDRVREGCB pCallbacks, uint32_t u32Version) +extern "C" DECLEXPORT(int) VBoxDriversRegister_Main(PCPDMDRVREGCB pCallbacks, uint32_t u32Version) { LogFlow(("VBoxDriversRegister: u32Version=%#x\n", u32Version)); AssertReleaseMsg(u32Version == VBOX_VERSION, ("u32Version=%#x VBOX_VERSION=%#x\n", u32Version, VBOX_VERSION)); @@ -67,6 +69,7 @@ extern "C" DECLEXPORT(int) VBoxDriversRegister(PCPDMDRVREGCB pCallbacks, uint32_ if (RT_FAILURE(rc)) return rc; +#if 0 rc = pCallbacks->pfnRegister(pCallbacks, &AudioSniffer::DrvReg); if (RT_FAILURE(rc)) return rc; @@ -78,6 +81,7 @@ extern "C" DECLEXPORT(int) VBoxDriversRegister(PCPDMDRVREGCB pCallbacks, uint32_ rc = pCallbacks->pfnRegister(pCallbacks, &EmWebcam::DrvReg); if (RT_FAILURE(rc)) return rc; +#endif #ifdef VBOX_WITH_USB_CARDREADER rc = pCallbacks->pfnRegister(pCallbacks, &UsbCardReader::DrvReg); diff --git a/src/app/virtualbox/src/VBox/Main/src-client/VMMDevInterface.cpp b/src/app/virtualbox/src/VBox/Main/src-client/VMMDevInterface.cpp index b4f4da4..a341e45 100644 --- a/src/app/virtualbox/src/VBox/Main/src-client/VMMDevInterface.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-client/VMMDevInterface.cpp @@ -553,7 +553,9 @@ DECLCALLBACK(int) vmmdevIsPageFusionEnabled(PPDMIVMMDEVCONNECTOR pInterface, boo { PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface); Console *pConsole = pDrv->pVMMDev->getParent(); +#if 0 BOOL val = 0; +#endif if (!pfPageFusionEnabled) return VERR_INVALID_POINTER; diff --git a/src/app/virtualbox/src/VBox/Main/src-server/ClientToken.cpp b/src/app/virtualbox/src/VBox/Main/src-server/ClientToken.cpp index be0afb8..54d5ba4 100644 --- a/src/app/virtualbox/src/VBox/Main/src-server/ClientToken.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-server/ClientToken.cpp @@ -179,11 +179,7 @@ Machine::ClientToken::ClientToken(const ComObjPtr &pMachine, { mClientToken = pToken; if (mClientToken) - { - rc = mClientToken->AddRef(); - if (FAILED(rc)) - mClientToken = NULL; - } + mClientToken->AddRef(); } } pToken.setNull(); diff --git a/src/app/virtualbox/src/VBox/Main/src-server/DHCPServerImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-server/DHCPServerImpl.cpp index 1cd7ce7..366d693 100644 --- a/src/app/virtualbox/src/VBox/Main/src-server/DHCPServerImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-server/DHCPServerImpl.cpp @@ -20,6 +20,7 @@ #include #include "NetworkServiceRunner.h" #include "DHCPServerImpl.h" +#include "MachineImpl.h" #include "AutoCaller.h" #include "Logging.h" diff --git a/src/app/virtualbox/src/VBox/Main/src-server/MachineImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-server/MachineImpl.cpp index 3889a01..5fcb53c 100644 --- a/src/app/virtualbox/src/VBox/Main/src-server/MachineImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-server/MachineImpl.cpp @@ -3826,8 +3826,10 @@ STDMETHODIMP Machine::LockMachine(ISession *aSession, /* request an IUnknown pointer early from the remote party for later * identity checks (it will be internally cached within mDirectControl * at least on XPCOM) */ +#if 0 ComPtr unk = mData->mSession.mDirectControl; NOREF(unk); +#endif } /* Release the lock since SessionMachine::uninit() locks VirtualBox which @@ -4920,7 +4922,7 @@ STDMETHODIMP Machine::SetHotPluggableForDevice(IN_BSTR aControllerName, LONG aCo STDMETHODIMP Machine::SetNoBandwidthGroupForDevice(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice) { - int rc = S_OK; + HRESULT rc = S_OK; LogFlowThisFunc(("aControllerName=\"%ls\" aControllerPort=%d aDevice=%d\n", aControllerName, aControllerPort, aDevice)); @@ -5014,7 +5016,7 @@ STDMETHODIMP Machine::UnmountMedium(IN_BSTR aControllerName, LONG aDevice, BOOL aForce) { - int rc = S_OK; + HRESULT rc = S_OK; LogFlowThisFunc(("aControllerName=\"%ls\" aControllerPort=%d aDevice=%d", aControllerName, aControllerPort, aForce)); @@ -5029,7 +5031,7 @@ STDMETHODIMP Machine::MountMedium(IN_BSTR aControllerName, IMedium *aMedium, BOOL aForce) { - int rc = S_OK; + HRESULT rc = S_OK; LogFlowThisFunc(("aControllerName=\"%ls\" aControllerPort=%d aDevice=%d aForce=%d\n", aControllerName, aControllerPort, aDevice, aForce)); @@ -8025,7 +8027,9 @@ HRESULT Machine::launchVMProcess(IInternalSessionControl *aControl, size_t cchBufLeft = strlen(szPath); szPath[cchBufLeft++] = RTPATH_DELIMITER; szPath[cchBufLeft] = 0; +#ifdef VBOX_WITH_QTGUI char *pszNamePart = szPath + cchBufLeft; +#endif cchBufLeft = sizeof(szPath) - cchBufLeft; int vrc = VINF_SUCCESS; @@ -8096,10 +8100,14 @@ HRESULT Machine::launchVMProcess(IInternalSessionControl *aControl, } strSupStartLogArg.append(strStartupLogFile); } +#if defined(VBOX_WITH_QTGUI) || defined(VBOX_WITH_VBOXSDL) || defined(VBOX_WITH_HEADLESS) const char *pszSupStartupLogArg = strSupStartLogArg.c_str(); +#endif #else +#if defined(VBOX_WITH_QTGUI) || defined(VBOX_WITH_VBOXSDL) || defined(VBOX_WITH_HEADLESS) const char *pszSupStartupLogArg = NULL; #endif +#endif #ifdef VBOX_WITH_QTGUI @@ -8500,6 +8508,7 @@ HRESULT Machine::prepareRegister() // Ensure the settings are saved. If we are going to be registered and // no config file exists yet, create it by calling saveSettings() too. +#if 0 if ( (mData->flModifications) || (!mData->pMachineConfigFile->fileExists()) ) @@ -8509,6 +8518,7 @@ HRESULT Machine::prepareRegister() // we can't have a machine XML file rename pending if (FAILED(rc)) return rc; } +#endif /* more config checking goes here */ @@ -8740,9 +8750,8 @@ HRESULT Machine::initDataAndChildObjects() { AutoCaller autoCaller(this); AssertComRCReturnRC(autoCaller.rc()); - AssertComRCReturn(autoCaller.state() == InInit || + AssertReturn(autoCaller.state() == InInit || autoCaller.state() == Limited, E_FAIL); - AssertReturn(!mData->mAccessible, E_FAIL); /* allocate data structures */ @@ -9097,7 +9106,7 @@ HRESULT Machine::loadMachineDataFromSettings(const settings::MachineConfigFile & cbOut, DECODE_STR_MAX); com::SafeArray iconByte(cbOut); - HRESULT rc = RTBase64Decode(pszStr, iconByte.raw(), cbOut, NULL, NULL); + HRESULT rc = Global::vboxStatusCodeToCOM(RTBase64Decode(pszStr, iconByte.raw(), cbOut, NULL, NULL)); if (FAILED(rc)) return setError(E_FAIL, tr("Failure to Decode Icon Data. '%s' (%d)"), @@ -12844,7 +12853,9 @@ HRESULT SessionMachine::init(Machine *aMachine) AssertReturn(aMachine, E_INVALIDARG); +#if 0 AssertReturn(aMachine->lockHandle()->isWriteLockOnCurrentThread(), E_FAIL); +#endif /* Enclose the state transition NotReady->InInit->Ready */ AutoInitSpan autoInitSpan(this); @@ -12975,7 +12986,7 @@ void SessionMachine::uninit(Uninit::Reason aReason) * accessing any members (and before AutoUninitSpan that does it as well). * This self reference will be released as the very last step on return. */ - ComObjPtr selfRef = this; +// ComObjPtr selfRef = this; /* Enclose the state transition Ready->InUninit->NotReady */ AutoUninitSpan autoUninitSpan(this); @@ -13464,12 +13475,12 @@ STDMETHODIMP SessionMachine::EndPoweringDown(LONG iResult, IN_BSTR aErrMsg) { Utf8Str strErrMsg(aErrMsg); if (strErrMsg.length()) - mConsoleTaskData.mProgress->notifyComplete(iResult, + mConsoleTaskData.mProgress->notifyComplete(Global::vboxStatusCodeToCOM(iResult), COM_IIDOF(ISession), getComponentName(), strErrMsg.c_str()); else - mConsoleTaskData.mProgress->notifyComplete(iResult); + mConsoleTaskData.mProgress->notifyComplete(Global::vboxStatusCodeToCOM(iResult)); } /* clear out the temporary saved state data */ @@ -13679,8 +13690,8 @@ STDMETHODIMP SessionMachine::OnSessionEnd(ISession *aSession, Assert(mData->mSession.mProgress.isNull()); ComObjPtr progress; progress.createObject(); - ComPtr pPeer(mPeer); - progress->init(mParent, pPeer, +// ComPtr pPeer(mPeer); + progress->init(mParent, nullptr, Bstr(tr("Closing session")).raw(), FALSE /* aCancelable */); progress.queryInterfaceTo(aProgress); @@ -13787,7 +13798,7 @@ STDMETHODIMP SessionMachine::EndSavingState(LONG iResult, IN_BSTR aErrMsg) if (FAILED(iResult)) setMachineState(mConsoleTaskData.mLastState); - return endSavingState(iResult, aErrMsg); + return endSavingState(Global::vboxStatusCodeToCOM(iResult), aErrMsg); } /** diff --git a/src/app/virtualbox/src/VBox/Main/src-server/MachineImplCloneVM.cpp b/src/app/virtualbox/src/VBox/Main/src-server/MachineImplCloneVM.cpp index 3a7507d..ce9a2b3 100644 --- a/src/app/virtualbox/src/VBox/Main/src-server/MachineImplCloneVM.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-server/MachineImplCloneVM.cpp @@ -889,7 +889,7 @@ HRESULT MachineCloneVM::start(IProgress **pProgress) rc = d->pProgress.createObject(); if (FAILED(rc)) throw rc; rc = d->pProgress->init(p->getVirtualBox(), - static_cast(d->pSrcMachine) /* aInitiator */, + nullptr /* aInitiator */, Bstr(p->tr("Cloning Machine")).raw(), true /* fCancellable */, uCount, diff --git a/src/app/virtualbox/src/VBox/Main/src-server/MediumImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-server/MediumImpl.cpp index c61ea6f..ed4bb7a 100644 --- a/src/app/virtualbox/src/VBox/Main/src-server/MediumImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-server/MediumImpl.cpp @@ -20,7 +20,9 @@ #include "ProgressImpl.h" #include "SystemPropertiesImpl.h" #include "VirtualBoxImpl.h" +#include "TokenImpl.h" +#include "Global.h" #include "AutoCaller.h" #include "Logging.h" @@ -679,16 +681,21 @@ DECLCALLBACK(int) Medium::Task::fntMediumTask(RTTHREAD aThread, void *pvUser) HRESULT rc = pTask->handler(); + Progress * p = nullptr; + /* complete the progress if run asynchronously */ if (pTask->isAsync()) { if (!pTask->mProgress.isNull()) - pTask->mProgress->notifyComplete(rc); + p = pTask->mProgress; } /* pTask is no longer needed, delete it. */ delete pTask; + if (p) + p->notifyComplete(rc); + LogFlowFunc(("rc=%Rhrc\n", rc)); LogFlowFuncLeave(); @@ -1231,7 +1238,7 @@ HRESULT Medium::init(VirtualBox *aVirtualBox, else { // Otherwise use the old VirtualBox "make absolute path" logic: - rc = m->pVirtualBox->calculateFullPath(data.strLocation, strFull); + rc = Global::vboxStatusCodeToCOM(m->pVirtualBox->calculateFullPath(data.strLocation, strFull)); if (FAILED(rc)) return rc; } } @@ -2578,7 +2585,7 @@ STDMETHODIMP Medium::CreateBaseStorage(LONG64 aLogicalSize, pProgress.createObject(); rc = pProgress->init(m->pVirtualBox, - static_cast(this), + nullptr, (mediumVariantFlags & MediumVariant_Fixed) ? BstrFmt(tr("Creating fixed medium storage unit '%s'"), m->strLocationFull.c_str()).raw() : BstrFmt(tr("Creating dynamic medium storage unit '%s'"), m->strLocationFull.c_str()).raw(), @@ -2758,7 +2765,7 @@ STDMETHODIMP Medium::CloneToBase(IMedium *aTarget, ComSafeArrayIn(MediumVariant_T, aVariant), IProgress **aProgress) { - int rc = S_OK; + HRESULT rc = S_OK; CheckComArgNotNull(aTarget); CheckComArgOutPointerValid(aProgress); CheckComArgSafeArrayNotNull(aVariant); diff --git a/src/app/virtualbox/src/VBox/Main/src-server/MediumLock.cpp b/src/app/virtualbox/src/VBox/Main/src-server/MediumLock.cpp index 567973d..2cda8b2 100644 --- a/src/app/virtualbox/src/VBox/Main/src-server/MediumLock.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-server/MediumLock.cpp @@ -18,7 +18,7 @@ #include "MediumLock.h" #include "MediumImpl.h" #include "MediumAttachmentImpl.h" - +#include "TokenImpl.h" MediumLock::MediumLock() : mMedium(NULL), mMediumCaller(NULL), mLockWrite(false), diff --git a/src/app/virtualbox/src/VBox/Main/src-server/NetworkAdapterImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-server/NetworkAdapterImpl.cpp index e3908bb..c5cee5c 100644 --- a/src/app/virtualbox/src/VBox/Main/src-server/NetworkAdapterImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-server/NetworkAdapterImpl.cpp @@ -1332,7 +1332,7 @@ HRESULT NetworkAdapter::saveSettings(settings::NetworkAdapter &data) bool NetworkAdapter::isModified() { AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); bool fChanged = m_fModified; - fChanged |= (mData->mAdapterType == NetworkAttachmentType_NAT? mNATEngine->isModified() : false); + fChanged |= (mData->mAttachmentType == NetworkAttachmentType_NAT? mNATEngine->isModified() : false); return fChanged; } diff --git a/src/app/virtualbox/src/VBox/Main/src-server/SnapshotImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-server/SnapshotImpl.cpp index ddce18b..55065d2 100644 --- a/src/app/virtualbox/src/VBox/Main/src-server/SnapshotImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-server/SnapshotImpl.cpp @@ -24,6 +24,7 @@ #include "MediumFormatImpl.h" #include "Global.h" #include "ProgressImpl.h" +#include "TokenImpl.h" // @todo these three includes are required for about one or two lines, try // to remove them and put that code in shared code in MachineImplcpp @@ -2863,7 +2864,7 @@ void SessionMachine::deleteSnapshotHandler(DeleteSnapshotTask &aTask) ComObjPtr pChildSnapshot = aTask.pSnapshot->getFirstChild(); if (pChildSnapshot) { - pMachine = pChildSnapshot->getSnapshotMachine(); + pMachine = &*pChildSnapshot->getSnapshotMachine(); childSnapshotId = pChildSnapshot->getId(); } pAtt = findAttachment(pMachine->mMediaData->mAttachments, it->mpSource); diff --git a/src/app/virtualbox/src/VBox/Main/src-server/VRDEServerImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-server/VRDEServerImpl.cpp index a717aff..3d52b9f 100644 --- a/src/app/virtualbox/src/VBox/Main/src-server/VRDEServerImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-server/VRDEServerImpl.cpp @@ -31,7 +31,7 @@ #include #include -#include +//#include #include "AutoStateDep.h" #include "AutoCaller.h" @@ -486,6 +486,7 @@ STDMETHODIMP VRDEServer::GetVRDEProperty(IN_BSTR aKey, BSTR *aValue) return S_OK; } +#if 0 static int loadVRDELibrary(const char *pszLibraryName, RTLDRMOD *phmod, PFNVRDESUPPORTEDPROPERTIES *ppfn) { int rc = VINF_SUCCESS; @@ -530,6 +531,7 @@ static int loadVRDELibrary(const char *pszLibraryName, RTLDRMOD *phmod, PFNVRDES return rc; } +#endif STDMETHODIMP VRDEServer::COMGETTER(VRDEProperties)(ComSafeArrayOut(BSTR, aProperties)) { @@ -584,13 +586,14 @@ STDMETHODIMP VRDEServer::COMGETTER(VRDEProperties)(ComSafeArrayOut(BSTR, aProper /* * Load the VRDE library and start the server, if it is enabled. */ - PFNVRDESUPPORTEDPROPERTIES pfn = NULL; +// PFNVRDESUPPORTEDPROPERTIES pfn = NULL; RTLDRMOD hmod = NIL_RTLDRMOD; - vrc = loadVRDELibrary(strVrdeLibrary.c_str(), &hmod, &pfn); +// vrc = loadVRDELibrary(strVrdeLibrary.c_str(), &hmod, &pfn); + vrc = !vrc; Log(("VRDEPROP: load library [%s] rc %Rrc\n", strVrdeLibrary.c_str(), vrc)); if (RT_SUCCESS(vrc)) { - const char * const *papszNames = pfn(); + const char * const *papszNames = nullptr; //pfn(); if (papszNames) { diff --git a/src/app/virtualbox/src/VBox/Main/src-server/VirtualBoxImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-server/VirtualBoxImpl.cpp index 9ce039a..2e6ac11 100644 --- a/src/app/virtualbox/src/VBox/Main/src-server/VirtualBoxImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-server/VirtualBoxImpl.cpp @@ -42,7 +42,9 @@ #include #include +#if 0 #include +#endif #include #include @@ -1367,7 +1369,7 @@ VirtualBox::CheckFirmwarePresent(FirmwareType_T aFirmwareType, RTPATH_DELIMITER, firmwareDesc[i].fileName); int rc = calculateFullPath(shortName, fullName); - AssertRCReturn(rc, rc); + AssertRCReturn(rc, Global::vboxStatusCodeToCOM(rc)); if (RTFileExists(fullName.c_str())) { *aResult = TRUE; @@ -1378,7 +1380,7 @@ VirtualBox::CheckFirmwarePresent(FirmwareType_T aFirmwareType, char pszVBoxPath[RTPATH_MAX]; rc = RTPathExecDir(pszVBoxPath, RTPATH_MAX); - AssertRCReturn(rc, rc); + AssertRCReturn(rc, Global::vboxStatusCodeToCOM(rc)); fullName = Utf8StrFmt("%s%c%s", pszVBoxPath, RTPATH_DELIMITER, @@ -4368,8 +4370,10 @@ HRESULT VirtualBox::registerMachine(Machine *aMachine) /* add to the collection of registered machines */ m->allMachines.addChild(aMachine); +#if 0 if (autoCaller.state() != InInit) rc = saveSettings(); +#endif return rc; } diff --git a/src/app/virtualbox/src/VBox/Main/xml/Settings.cpp b/src/app/virtualbox/src/VBox/Main/xml/Settings.cpp index 3520c9c..e3288af 100644 --- a/src/app/virtualbox/src/VBox/Main/xml/Settings.cpp +++ b/src/app/virtualbox/src/VBox/Main/xml/Settings.cpp @@ -4922,6 +4922,8 @@ void MachineConfigFile::buildStorageControllersXML(xml::ElementNode &elmParent, case DeviceType_Floppy: pcszType = "Floppy"; break; + default: + break; } pelmDevice->setAttribute("type", pcszType); @@ -5273,6 +5275,8 @@ bool MachineConfigFile::isAudioDriverAllowedOnThisHost(AudioDriverType_T drv) case AudioDriverType_MMPM: #endif return true; + default: + break; } return false;