diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:23:15 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:23:15 +0000 |
| commit | 62a5715c0af49b62b331c2538025a8ab5ce6c6e5 (patch) | |
| tree | d4ddd30e61ba20eca4a3ba0f63f2e33c8573dfa0 /src/VBox/VMM/VMMR3 | |
| parent | Releasing progress-linux version 7.0.18-dfsg-2~progress7.99u1. (diff) | |
| download | virtualbox-62a5715c0af49b62b331c2538025a8ab5ce6c6e5.tar.xz virtualbox-62a5715c0af49b62b331c2538025a8ab5ce6c6e5.zip | |
Merging upstream version 7.0.20-dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | src/VBox/VMM/VMMR3/PDM.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/VBox/VMM/VMMR3/PDM.cpp b/src/VBox/VMM/VMMR3/PDM.cpp index 1e56b66f..3d3ff8d4 100644 --- a/src/VBox/VMM/VMMR3/PDM.cpp +++ b/src/VBox/VMM/VMMR3/PDM.cpp @@ -1246,7 +1246,13 @@ static DECLCALLBACK(int) pdmR3LoadExec(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersi if (!(pDevIns->Internal.s.fIntFlags & PDMDEVINSINT_FLAGS_FOUND)) { LogRel(("Device '%s'/%d not found in the saved state\n", pDevIns->pReg->szName, pDevIns->iInstance)); - if (SSMR3HandleGetAfter(pSSM) != SSMAFTER_DEBUG_IT) + /** @todo The TPM PPI device was added due to @bugref{10701} and it is not an issue if it isn't there + * in the saved state because there is nothing to load. It might make sense to add a new + * flag to PDMDEVREG::fFlags to indicate that having a new device added for a saved state is okay. + * (For now I just want to get saved states unwedged). + */ + if ( SSMR3HandleGetAfter(pSSM) != SSMAFTER_DEBUG_IT + && RTStrCmp(pDevIns->pReg->szName, "tpm-ppi")) return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Device '%s'/%d not found in the saved state"), pDevIns->pReg->szName, pDevIns->iInstance); } |