Changeset 6042 in vbox for trunk

Timestamp:

Dec 10, 2007 8:53:21 PM (17 years ago)

Author:

vboxsync

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

26677

Message:

Linux additions: print VBox version and module interface version during module initialization; print information with DEBUG level not INFO level (thus prevent output to text console)

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (1 diff)
• src/VBox/Additions/linux/module/vboxmod.c (modified) (3 diffs)
• src/VBox/Additions/linux/sharedfolders/vfsmod.c (modified) (2 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -117 +117 @@
  * @remark  These defines also live in the 16-bit and assembly versions of this header.
  */
-#define VMMDEV_VERSION_MAJOR (0x1)
-#define VMMDEV_VERSION_MINOR (0x4)
-#define VMMDEV_VERSION ((VMMDEV_VERSION_MAJOR << 16) | VMMDEV_VERSION_MINOR)
+#define VMMDEV_VERSION       0x00010004
+#define VMMDEV_VERSION_MAJOR (VMMDEV_VERSION >> 16)
+#define VMMDEV_VERSION_MINOR (VMMDEV_VERSION & 0xffff)
 
 /* Maximum request packet size */

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -28 +28 @@
 #include <iprt/assert.h>
 
+#define xstr(s) str(s)
+#define str(s) #s
+
 MODULE_DESCRIPTION("VirtualBox Guest Additions for Linux Module");
 MODULE_AUTHOR("innotek GmbH");
 MODULE_LICENSE("GPL");
 #ifdef MODULE_VERSION
-MODULE_VERSION(VBOX_VERSION_STRING);
+MODULE_VERSION(VBOX_VERSION_STRING " (interface " xstr(VMMDEV_VERSION) ")");
 #endif
 
@@ -739 +742 @@
     VMMDevReportGuestInfo *infoReq = NULL;
 
-    printk(KERN_INFO "vboxadd: initializing version %s\n", VBOX_VERSION_STRING);
-
     if (vboxadd_cmc_init ())
     {
@@ -910 +911 @@
     init_waitqueue_head (&vboxDev->eventq);
 
-    /* some useful information for the user */
-    printk(KERN_INFO
-           "vboxadd: major code: %d, using irq %d, "
-           "io port 0x%x, memory at 0x%x (size %d bytes), "
-           "hypervisor window at 0x%p (size 0x%x bytes)\n",
+    /* some useful information for the user but don't show this on the console */
+    printk(KERN_DEBUG
+           "vboxadd: major %d, IRQ %d, "
+           "I/O port 0x%x, memory at 0x%x (size 0x%x), "
+           "hypervisor window at 0x%p (size 0x%x)\n",
            vbox_major, vboxDev->irq, vboxDev->io_port,
            vboxDev->vmmdevmem, vboxDev->vmmdevmem_size,
            vboxDev->hypervisorStart, vboxDev->hypervisorSize);
-    LogRelFunc(("major code: %d, using irq %d, "
-                "io port 0x%x, memory at 0x%x (size %d bytes), "
-                "hypervisor window at 0x%p (size 0x%x bytes)\n",
+    LogRelFunc(("major %d, IRQ %d, "
+                "I/O port 0x%x, MMIO at 0x%x (size 0x%x), "
+                "hypervisor window at 0x%p (size 0x%x)\n",
                 vbox_major, vboxDev->irq, vboxDev->io_port,
                 vboxDev->vmmdevmem, vboxDev->vmmdevmem_size,
                 vboxDev->hypervisorStart, vboxDev->hypervisorSize));
+    printk(KERN_DEBUG
+           "vboxadd: Successfully loaded version "
+           VBOX_VERSION_STRING " (interface " xstr(VMMDEV_VERSION) ")\n");
 
     /* successful return */

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

@@ -43 +43 @@
 // #define wchar_t linux_wchar_t
 
+#define xstr(s) str(s)
+#define str(s) #s
+
 MODULE_DESCRIPTION ("Host file system access VFS for VirtualBox");
 MODULE_AUTHOR ("innotek GmbH");
 MODULE_LICENSE ("GPL");
 #ifdef MODULE_VERSION
-MODULE_VERSION(VBOX_VERSION_STRING);
+MODULE_VERSION(VBOX_VERSION_STRING " (interface " xstr(VMMDEV_VERSION) ")");
 #endif
 
@@ -431 +434 @@
         }
 
+        printk(KERN_DEBUG
+               "vboxvfs: Successfully loaded version " VBOX_VERSION_STRING
+               " (interface " xstr(VMMDEV_VERSION) ")\n");
+
         return 0;