Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

1 files changed, 6 insertions, 16 deletions

diff --git a/src/VBox/Debugger/VBoxDbgBase.h b/src/VBox/Debugger/VBoxDbgBase.h
index 660d44e6..1b8e30d7 100644
--- a/src/VBox/Debugger/VBoxDbgBase.h
+++ b/src/VBox/Debugger/VBoxDbgBase.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -59,7 +59,7 @@ public:
      */
     bool isVMOk() const
     {
-        return m_pVM != NULL;
+        return m_pUVM != NULL;
     }
 
     /**
@@ -103,24 +103,14 @@ protected:
 
 
 private:
-    /**
-     * VM state callback function.
-     *
-     * You are not allowed to call any function which changes the VM state from a
-     * state callback, except VMR3Destroy().
-     *
-     * @param   pVM         The VM handle.
-     * @param   enmState    The new state.
-     * @param   enmOldState The old state.
-     * @param   pvUser      The user argument.
-     */
-    static DECLCALLBACK(void) atStateChange(PVM pVM, VMSTATE enmState, VMSTATE enmOldState, void *pvUser);
+    /** @callback_method_impl{FNVMATSTATE}  */
+    static DECLCALLBACK(void) atStateChange(PUVM pUVM, VMSTATE enmState, VMSTATE enmOldState, void *pvUser);
 
 private:
     /** Pointer to the debugger GUI object. */
     VBoxDbgGui *m_pDbgGui;
-    /** The VM handle. */
-    PVM volatile m_pVM;
+    /** The user mode VM handle. */
+    PUVM volatile m_pUVM;
     /** The handle of the GUI thread. */
     RTNATIVETHREAD m_hGUIThread;
 };