Index: /trunk/src/VBox/Devices/Audio/DevSB16.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DevSB16.cpp	(revision 71762)
+++ /trunk/src/VBox/Devices/Audio/DevSB16.cpp	(revision 71763)
@@ -1865,5 +1865,25 @@
 #endif /* !VBOX_WITH_AUDIO_SB16_CALLBACKS */
 
-static void sb16Save(PSSMHANDLE pSSM, PSB16STATE pThis)
+
+/**
+ * @callback_method_impl{FNSSMDEVLIVEEXEC}
+ */
+static DECLCALLBACK(int) sb16LiveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass)
+{
+    RT_NOREF(uPass);
+    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
+
+    SSMR3PutS32(pSSM, pThis->irqCfg);
+    SSMR3PutS32(pSSM, pThis->dmaCfg);
+    SSMR3PutS32(pSSM, pThis->hdmaCfg);
+    SSMR3PutS32(pSSM, pThis->portCfg);
+    SSMR3PutS32(pSSM, pThis->verCfg);
+    return VINF_SSM_DONT_CALL_AGAIN;
+}
+
+/**
+ * Worker for sb16SaveExec.
+ */
+static int sb16Save(PSSMHANDLE pSSM, PSB16STATE pThis)
 {
     SSMR3PutS32(pSSM, pThis->irq);
@@ -1903,6 +1923,6 @@
     SSMR3PutS32(pSSM, pThis->csp_reg83w);
 
-    SSMR3PutMem(pSSM, pThis->in2_data, sizeof (pThis->in2_data));
-    SSMR3PutMem(pSSM, pThis->out_data, sizeof (pThis->out_data));
+    SSMR3PutMem(pSSM, pThis->in2_data, sizeof(pThis->in2_data));
+    SSMR3PutMem(pSSM, pThis->out_data, sizeof(pThis->out_data));
     SSMR3PutU8 (pSSM, pThis->test_reg);
     SSMR3PutU8 (pSSM, pThis->last_read_byte);
@@ -1915,8 +1935,21 @@
 
     SSMR3PutS32(pSSM, pThis->mixer_nreg);
-    SSMR3PutMem(pSSM, pThis->mixer_regs, 256);
-
-}
-
+    return SSMR3PutMem(pSSM, pThis->mixer_regs, 256);
+}
+
+/**
+ * @callback_method_impl{FNSSMDEVSAVEEXEC}
+ */
+static DECLCALLBACK(int) sb16SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+{
+    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
+
+    sb16LiveExec(pDevIns, pSSM, 0);
+    return sb16Save(pSSM, pThis);
+}
+
+/**
+ * Worker for sb16LoadExec.
+ */
 static int sb16Load(PSSMHANDLE pSSM, PSB16STATE pThis)
 {
@@ -2022,26 +2055,7 @@
 }
 
-static DECLCALLBACK(int) sb16LiveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass)
-{
-    RT_NOREF(uPass);
-    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
-
-    SSMR3PutS32(pSSM, pThis->irqCfg);
-    SSMR3PutS32(pSSM, pThis->dmaCfg);
-    SSMR3PutS32(pSSM, pThis->hdmaCfg);
-    SSMR3PutS32(pSSM, pThis->portCfg);
-    SSMR3PutS32(pSSM, pThis->verCfg);
-    return VINF_SSM_DONT_CALL_AGAIN;
-}
-
-static DECLCALLBACK(int) sb16SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
-{
-    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
-
-    sb16LiveExec(pDevIns, pSSM, 0);
-    sb16Save(pSSM, pThis);
-    return VINF_SUCCESS;
-}
-
+/**
+ * @callback_method_impl{FNSSMDEVLOADEXEC}
+ */
 static DECLCALLBACK(int) sb16LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
@@ -2085,6 +2099,5 @@
         return VINF_SUCCESS;
 
-    sb16Load(pSSM, pThis);
-    return VINF_SUCCESS;
+    return sb16Load(pSSM, pThis);
 }