Changeset 25062 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 27, 2009 7:24:14 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

55413

Message:

HGSMI,DevVGA: Use the offset based heap for the hostHeap (resides in VRAM). New staved state version for DevVGA for indicating this change.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (1 diff)
• DevVGA.h (modified) (1 diff)
• DevVGASavedState.h (added)
• HGSMI/HGSMIHost.cpp (modified) (7 diffs)
• HGSMI/HGSMIHost.h (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -5453 +5453 @@
 
     if (    uVersion != VGA_SAVEDSTATE_VERSION
+        &&  uVersion != VGA_SAVEDSTATE_VERSION_HOST_HEAP
         &&  uVersion != VGA_SAVEDSTATE_VERSION_WITH_CONFIG
         &&  uVersion != VGA_SAVEDSTATE_VERSION_HGSMI

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -46 +46 @@
 
 #ifdef VBOX_WITH_HGSMI
-#include "HGSMI/HGSMIHost.h"
+# include "HGSMI/HGSMIHost.h"
 #endif /* VBOX_WITH_HGSMI */
-
-#define VGA_SAVEDSTATE_VERSION              5
-#define VGA_SAVEDSTATE_VERSION_WITH_CONFIG  4
-#define VGA_SAVEDSTATE_VERSION_HGSMI        3
-#define VGA_SAVEDSTATE_VERSION_PRE_HGSMI    2
-#define VGA_SAVEDSTATE_VERSION_ANCIENT      1
+#include "DevVGASavedState.h"
 
 #define MSR_COLOR_EMULATION 0x01

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -74 +74 @@
 
 #include "HGSMIHost.h"
-#include "VBox/HGSMI/HGSMIChannels.h"
-#include "VBox/HGSMI/HGSMIChSetup.h"
+#include <VBox/HGSMI/HGSMIChannels.h>
+#include <VBox/HGSMI/HGSMIChSetup.h>
 
 #include "HGSMIHostHlp.h"
+#include "../DevVGASavedState.h"
 
 #ifdef DEBUG_sunlover
@@ -371 +372 @@
             /* guest usually completes commands in the order it receives it
              * if we're here this would typically means there is some cmd loss */
-            Assert(0);
+            AssertFailed();
 #endif
 
@@ -1063 +1064 @@
             if (pIns->hostHeap.cRefs)
             {
-                Assert(0);
+                AssertFailed();
                 /* It is possible to change the heap only if there is no pending allocations. */
                 rc = VERR_ACCESS_DENIED;
@@ -1070 +1071 @@
             {
                 rc = HGSMIHeapSetup (&pIns->hostHeap,
-                                        pIns->area.pu8Base+offHeap,
-                                        cbHeap,
-                                        offHeap);
+                                     pIns->area.pu8Base+offHeap,
+                                     cbHeap,
+                                     offHeap,
+                                     true /*fOffsetBased*/);
             }
 
@@ -1189 +1191 @@
 int HGSMIHostLoadStateExec (PHGSMIINSTANCE pIns, PSSMHANDLE pSSM, uint32_t u32Version)
 {
-    if(u32Version < 3)
+    if(u32Version < VGA_SAVEDSTATE_VERSION_HGSMI)
         return VINF_SUCCESS;
 
@@ -1218 +1220 @@
             Assert(!pIns->hostHeap.cRefs);
             pIns->hostHeap.cRefs = 0;
+
             rc = HGSMIHeapRelocate(&pIns->hostHeap,
-                                    pIns->area.pu8Base+offHeap,
-                                    off,
-                                    uintptr_t(pIns->area.pu8Base) - uintptr_t(oldMem),
-                                    cbHeap,
-                                    offHeap);
+                                   pIns->area.pu8Base+offHeap,
+                                   off,
+                                   uintptr_t(pIns->area.pu8Base) - uintptr_t(oldMem),
+                                   cbHeap,
+                                   offHeap,
+                                   u32Version > VGA_SAVEDSTATE_VERSION_HOST_HEAP);
 
             hgsmiHostHeapUnlock (pIns);
@@ -1526 +1530 @@
 
     rc = HGSMIHostChannelRegister (pIns,
-                                                                   HGSMI_CH_HGSMI,
-                                                                   hgsmiChannelHandler,
-                                                                   pIns,
-                                                                   &sOldChannelHandler);
+                                   HGSMI_CH_HGSMI,
+                                   hgsmiChannelHandler,
+                                   pIns,
+                                   &sOldChannelHandler);
 
     if (RT_SUCCESS (rc))

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h

@@ -22 +22 @@
 
 
-#ifndef __HGSMIHost_h__
-#define __HGSMIHost_h__
+#ifndef ___HGSMIHost_h
+#define ___HGSMIHost_h
 
 #include <VBox/vm.h>
@@ -143 +143 @@
 #endif
 
-#endif /* __HGSMIHost_h__*/
+#endif /* !___HGSMIHost_h*/
+