Index: /trunk/src/VBox/Devices/Graphics/DevVGA.cpp
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA.cpp	(revision 50496)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA.cpp	(revision 50497)
@@ -5379,9 +5379,12 @@
 {
     PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
+
 #ifdef VBOX_WITH_VDMA
     vboxVDMASaveStateExecPrep(pThis->pVdma, pSSM);
 #endif
+
     vgaR3SaveConfig(pThis, pSSM);
     vga_save(pSSM, PDMINS_2_DATA(pDevIns, PVGASTATE));
+
 #ifdef VBOX_WITH_HGSMI
     SSMR3PutBool(pSSM, true);
@@ -5390,8 +5393,8 @@
     vboxVDMASaveStateExecDone(pThis->pVdma, pSSM);
 # endif
-    return rc;
 #else
-    SSMR3PutBool(pSSM, false);
+    int rc = SSMR3PutBool(pSSM, false);
 #endif
+
 #ifdef VBOX_WITH_VMSVGA
     if (    rc == VINF_SUCCESS
@@ -5399,4 +5402,5 @@
         rc = vmsvgaSaveExec(pDevIns, pSSM);
 #endif
+
     return rc;
 }
Index: /trunk/src/VBox/Devices/Graphics/DevVGASavedState.h
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGASavedState.h	(revision 50496)
+++ /trunk/src/VBox/Devices/Graphics/DevVGASavedState.h	(revision 50497)
@@ -8,5 +8,5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23,11 +23,7 @@
 #define Graphics_DevVGASavedState_h
 
-#ifdef VBOX_WITH_VMSVGA
+#define VGA_SAVEDSTATE_VERSION              11
+#define VGA_SAVEDSTATE_VERSION_VMSVGA       11
 #define VGA_SAVEDSTATE_VERSION_VMSVGA_2D    10 /* <- internal build with 2d state only */
-#define VGA_SAVEDSTATE_VERSION_VMSVGA       11
-#define VGA_SAVEDSTATE_VERSION              11
-#else
-#define VGA_SAVEDSTATE_VERSION              10
-#endif
 #define VGA_SAVEDSTATE_VERSION_WITH_PENDVHWA 10
 #define VGA_SAVEDSTATE_VERSION_INV_GCMDFIFO 8 /* <- states upto and including this version may contain invalid completed Guest Commands fifo entries */
@@ -42,3 +38,2 @@
 
 #endif
-