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

Timestamp:

Aug 15, 2009 8:44:22 PM (16 years ago)

Author:

vboxsync

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

51116

Message:

HGSMI saved state impl (not debugged yet)

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (5 diffs)
• DevVGA.h (modified) (1 diff)

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

@@ -56 +56 @@
 #define VGA_VRAM_MIN        (_1M)
 
-#define VGA_SAVEDSTATE_VERSION  2
+#ifdef VBOX_WITH_HGSMI
+# define VGA_SAVEDSTATE_VERSION  3
+#else
+# define VGA_SAVEDSTATE_VERSION  2
+#endif
 
 /** The size of the VGA GC mapping.
@@ -5291 +5295 @@
 {
     vga_save(pSSMHandle, PDMINS_2_DATA(pDevIns, PVGASTATE));
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    return vbvaVHWASaveStateExec(pDevIns, pSSMHandle);
+#ifdef VBOX_WITH_HGSMI
+    return vboxVBVASaveStateExec(pDevIns, pSSMHandle);
 #else
     return VINF_SUCCESS;
@@ -5301 +5305 @@
 static DECLCALLBACK(int) vgaR3SavePrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    return vbvaVHWASaveStatePrep(pDevIns, pSSM);
+    return vboxVBVASaveStatePrep(pDevIns, pSSM);
 }
 #endif
@@ -5317 +5321 @@
     if (vga_load(pSSMHandle, PDMINS_2_DATA(pDevIns, PVGASTATE), u32Version))
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    return vbvaVHWALoadStateExec(pDevIns, pSSMHandle);
+#ifdef VBOX_WITH_HGSMI
+    return vboxVBVALoadStateExec(pDevIns, pSSMHandle, u32Version);
 #else
     return VINF_SUCCESS;
@@ -5945 +5949 @@
                               sizeof(*pThis),
 #ifdef VBOX_WITH_VIDEOHWACCEL
-                              NULL, vgaR3SaveExec, NULL,
+                              vgaR3SavePrep, vgaR3SaveExec, NULL,
 #else
                               NULL, vgaR3SaveExec, NULL,

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

@@ -453 +453 @@
 # ifdef VBOX_WITH_VIDEOHWACCEL
 int vbvaVHWACommandCompleteAsynch(PPDMDDISPLAYVBVACALLBACKS pInterface, PVBOXVHWACMD pCmd);
-
 int vbvaVHWAConstruct (PVGASTATE pVGAState);
 int vbvaVHWADisable (PVGASTATE pVGAState);
-int vbvaVHWASaveStatePrep (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
-int vbvaVHWASaveStateExec (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
-int vbvaVHWALoadStateExec (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
+
+int vboxVBVASaveStatePrep (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
 # endif
+
+int vboxVBVASaveStateExec (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
+int vboxVBVALoadStateExec (PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t u32Version);
+
 #endif /* VBOX_WITH_HGSMI */