Changeset 22468 in vbox for trunk/src

Timestamp:

Aug 26, 2009 12:49:54 PM (16 years ago)

Author:

vboxsync

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

51482

Message:

HGSMI/VBVA VGA saved state updates.

Location:

trunk/src/VBox/Devices/Graphics

Files:

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

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

@@ -55 +55 @@
 /** The minimum amount of VRAM. */
 #define VGA_VRAM_MIN        (_1M)
-
-#ifdef VBOX_WITH_HGSMI
-# define VGA_SAVEDSTATE_VERSION  3
-#else
-# define VGA_SAVEDSTATE_VERSION  2
-#endif
 
 /** The size of the VGA GC mapping.
@@ -5442 +5436 @@
  * @param   u32Version  The data unit version number.
  */
-static DECLCALLBACK(int) vgaR3xec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t u32Version)
+static DECLCALLBACK(int) vgaR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t u32Version)
 {
     if (vga_load(pSSMHandle, PDMINS_2_DATA(pDevIns, PVGASTATE), u32Version))
@@ -6125 +6119 @@
                               NULL, vgaR3SaveExec, NULL,
 #endif
-                              NULL, vgaR3xec, NULL);
+                              NULL, vgaR3LoadExec, NULL);
     if (RT_FAILURE(rc))
         return rc;

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

@@ -51 +51 @@
 #define VGA_PORT_OFF_HGSMI_GUEST 4
 #endif /* VBOX_WITH_HGSMI */
+
+#ifdef VBOX_WITH_HGSMI
+# define VGA_SAVEDSTATE_VERSION  3
+#else
+# define VGA_SAVEDSTATE_VERSION  2
+#endif
 
 #define MSR_COLOR_EMULATION 0x01