Changeset 54385 in vbox

Timestamp:

Feb 23, 2015 3:21:50 PM (10 years ago)

Author:

vboxsync

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

98482

Message:

PDM/Audio: Ignore old AudioSniffer device when loading older saved states.

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (2 diffs)
• VMMR3/PDM.cpp (modified) (5 diffs)
• VMMR3/PDMDevice.cpp (modified) (1 diff)

trunk/src/VBox/VMM/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -103 +103 @@
 ifdef VBOX_WITH_RAW_MODE
  VBoxVMM_DEFS   += VBOX_WITH_RAW_MODE VBOX_WITH_RAW_MODE_NOT_R0
+endif
+ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+ VBoxVMM_DEFS   += VBOX_WITH_PDM_AUDIO_DRIVER
 endif
 ifdef VBOX_WITH_VMM_R0_SWITCH_STACK

trunk/src/VBox/VMM/VMMR3/PDM.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -278 +278 @@
 *******************************************************************************/
 /** The PDM saved state version. */
-#define PDM_SAVED_STATE_VERSION             4
-#define PDM_SAVED_STATE_VERSION_PRE_NMI_FF  3
+#define PDM_SAVED_STATE_VERSION               5
+/** Before the PDM audio architecture was introduced there was an "AudioSniffer"
+ *  device which took care of multiplexing input/output audio data from/to various places.
+ *  Thus this device is not needed/used anymore. */
+#define PDM_SAVED_STATE_VERSION_PRE_PDM_AUDIO 4
+#define PDM_SAVED_STATE_VERSION_PRE_NMI_FF    3
 
 /** The number of nanoseconds a suspend callback needs to take before
@@ -897 +901 @@
      */
     if (    uVersion != PDM_SAVED_STATE_VERSION
-        &&  uVersion != PDM_SAVED_STATE_VERSION_PRE_NMI_FF)
+        &&  uVersion != PDM_SAVED_STATE_VERSION_PRE_NMI_FF
+        &&  uVersion != PDM_SAVED_STATE_VERSION_PRE_PDM_AUDIO)
     {
         AssertMsgFailed(("Invalid version uVersion=%d!\n", uVersion));
@@ -1018 +1023 @@
         PPDMDEVINS pDevIns;
         for (pDevIns = pVM->pdm.s.pDevInstances; pDevIns; pDevIns = pDevIns->Internal.s.pNextR3)
-            if (   !strcmp(szName, pDevIns->pReg->szName)
+            if (   !RTStrCmp(szName, pDevIns->pReg->szName)
                 && pDevIns->iInstance == iInstance)
             {
@@ -1027 +1032 @@
                 break;
             }
+
         if (!pDevIns)
         {
-            LogRel(("Device '%s'/%d not found in current config\n", szName, iInstance));
-            if (SSMR3HandleGetAfter(pSSM) != SSMAFTER_DEBUG_IT)
-                return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Device '%s'/%d not found in current config"), szName, iInstance);
+            bool fSkip = false;
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            /* Skip the non-existing "AudioSniffer" device stored in the saved state. */
+            if (   uVersion <= PDM_SAVED_STATE_VERSION_PRE_PDM_AUDIO
+                && !RTStrCmp(szName, "AudioSniffer"))
+                fSkip = true;
+#endif
+            if (!fSkip)
+            {
+                LogRel(("Device '%s'/%d not found in current config\n", szName, iInstance));
+                if (SSMR3HandleGetAfter(pSSM) != SSMAFTER_DEBUG_IT)
+                    return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Device '%s'/%d not found in current config"), szName, iInstance);
+            }
         }
     }

trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp

@@ -172 +172 @@
         return VINF_SUCCESS;
     }
-    Log2(("PDM: cDevs=%d!\n", cDevs));
+    Log2(("PDM: cDevs=%u\n", cDevs));
 
     /*