Changeset 63886 in vbox for trunk/src/VBox/Devices/Samples

Timestamp:

Sep 19, 2016 1:02:14 PM (9 years ago)

Author:

vboxsync

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

110750

Message:

Devices/Samples: more version paranoia (solves unused parameters and is more safe)

Location:

trunk/src/VBox/Devices/Samples

Files:

• DrvStorageFilter.cpp (modified) (2 diffs)
• VBoxSampleDevice.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Samples/DrvStorageFilter.cpp

@@ -23 +23 @@
 #include <VBox/vmm/pdmdrv.h>
 #include <VBox/vmm/pdmstorageifs.h>
+#include <VBox/version.h>
 #include <VBox/log.h>
 
@@ -414 +415 @@
              u32Version, pCallbacks->u32Version));
 
+    AssertLogRelMsgReturn(u32Version >= VBOX_VERSION,
+                          ("VirtualBox version %#x, expected %#x or higher\n", u32Version, VBOX_VERSION),
+                          VERR_VERSION_MISMATCH);
     AssertLogRelMsgReturn(pCallbacks->u32Version == PDM_DRVREG_CB_VERSION,
-                          ("%#x, expected %#x\n", pCallbacks->u32Version, PDM_DRVREG_CB_VERSION),
+                          ("callback version %#x, expected %#x\n", pCallbacks->u32Version, PDM_DRVREG_CB_VERSION),
                           VERR_VERSION_MISMATCH);
 

trunk/src/VBox/Devices/Samples/VBoxSampleDevice.cpp

@@ -154 +154 @@
     LogFlow(("VBoxSampleDevice::VBoxDevicesRegister: u32Version=%#x pCallbacks->u32Version=%#x\n", u32Version, pCallbacks->u32Version));
 
+    AssertLogRelMsgReturn(u32Version >= VBOX_VERSION,
+                          ("VirtualBox version %#x, expected %#x or higher\n", u32Version, VBOX_VERSION),
+                          VERR_VERSION_MISMATCH);
     AssertLogRelMsgReturn(pCallbacks->u32Version == PDM_DEVREG_CB_VERSION,
-                          ("%#x, expected %#x\n", pCallbacks->u32Version, PDM_DEVREG_CB_VERSION),
+                          ("callback version %#x, expected %#x\n", pCallbacks->u32Version, PDM_DEVREG_CB_VERSION),
                           VERR_VERSION_MISMATCH);