Changeset 6277 in vbox

Timestamp:

Jan 8, 2008 2:02:57 PM (17 years ago)

Author:

vboxsync

Message:

Guest Additions (Linux): move printk logging to backdoor logging

File:

• trunk/src/VBox/Additions/linux/module/vboxmod.c (modified) (18 diffs)

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

@@ -550 +550 @@
 
 #ifdef IRQ_DEBUG
-    printk ("%s: vboxDev->pVMMDevMemory=%p vboxDev->pVMMDevMemory->fHaveEvents=%d\n",
-            __func__, vboxDev->pVMMDevMemory, vboxDev->pVMMDevMemory->fHaveEvents);
+    Log(("vboxadd IRQ_DEBUG: vboxDev->pVMMDevMemory=%p vboxDev->pVMMDevMemory->fHaveEvents=%d\n",
+          vboxDev->pVMMDevMemory, vboxDev->pVMMDevMemory->V.V1_04.fHaveEvents));
 #endif
 
@@ -558 +558 @@
     {
 #ifdef IRQ_DEBUG
-        printk(KERN_INFO "vboxadd: got IRQ with event mask 0x%x\n",
-               vboxDev->pVMMDevMemory->u32HostEvents);
+        Log(("vboxadd IRQ_DEBUG: got IRQ with event mask 0x%x\n",
+               vboxDev->irqAckRequest->events));
 #endif
 
@@ -586 +586 @@
     else
     {
-        printk ("vboxadd: stale IRQ mem=%p events=%d devevents=%#x\n",
-                vboxDev->pVMMDevMemory,
-                vboxDev->pVMMDevMemory->fHaveEvents,
-                vboxDev->u32Events);
+        Log(("vboxadd IRQ_DEBUG: stale IRQ mem=%p events=%d devevents=%#x\n",
+             vboxDev->pVMMDevMemory,
+             vboxDev->pVMMDevMemory->V.V1_04.fHaveEvents,
+             vboxDev->u32Events));
     }
 #endif
@@ -784 +784 @@
     if (err)
     {
-        printk (KERN_ERR "vboxadd: could not enable device: %d\n", err);
+        Log(("vboxadd: could not enable device: %d\n", err));
         PCI_DEV_PUT(pcidev);
         return -ENODEV;
@@ -795 +795 @@
     if (err < 0 || ((vbox_major & err) || (!vbox_major && !err)))
     {
-        printk(KERN_ERR "vboxadd: register_chrdev failed: vbox_major: %d, err = %d\n",
-               vbox_major, err);
         LogRelFunc(("register_chrdev failed: vbox_major: %d, err = %d\n",
                      vbox_major, err));
@@ -810 +808 @@
     if (!vboxDev)
     {
-        printk(KERN_ERR "vboxadd: cannot allocate device!\n");
         LogRelFunc(("cannot allocate device!\n"));
         err = -ENOMEM;
@@ -828 +825 @@
     if (!vboxDev->io_port || !vboxDev->vmmdevmem || !vboxDev->vmmdevmem_size)
     {
-        printk(KERN_ERR "vboxadd: did not find expected hardware resources!\n");
         LogRelFunc(("did not find expected hardware resources!\n"));
         goto fail;
@@ -836 +832 @@
     if (request_mem_region(vboxDev->vmmdevmem, vboxDev->vmmdevmem_size, "vboxadd") == 0)
     {
-        printk(KERN_ERR "vboxadd: failed to request adapter memory!\n");
         LogRelFunc(("failed to request adapter memory!\n"));
         goto fail;
@@ -846 +841 @@
     if (!vboxDev->pVMMDevMemory)
     {
-        printk (KERN_ERR "vboxadd: ioremap failed\n");
         LogRelFunc(("ioremap failed\n"));
         goto fail;
@@ -853 +847 @@
     if (vboxDev->pVMMDevMemory->u32Version != VMMDEV_MEMORY_VERSION)
     {
-        printk(KERN_ERR
-               "vboxadd: invalid VMM device memory version! (got 0x%x, expected 0x%x)\n",
-               vboxDev->pVMMDevMemory->u32Version, VMMDEV_MEMORY_VERSION);
         LogRelFunc(("invalid VMM device memory version! (got 0x%x, expected 0x%x)\n",
                     vboxDev->pVMMDevMemory->u32Version, VMMDEV_MEMORY_VERSION));
@@ -865 +856 @@
     if (VBOX_FAILURE(rcVBox))
     {
-        printk(KERN_ERR "vboxadd: could not initialize VBGL subsystem! rc = %d\n", rcVBox);
         LogRelFunc(("could not initialize VBGL subsystem! rc = %Vrc\n", rcVBox));
         goto fail;
@@ -875 +865 @@
     if (VBOX_FAILURE(rcVBox))
     {
-        printk(KERN_ERR "vboxadd: could not allocate request structure! rc = %d\n", rcVBox);
         LogRelFunc(("could not allocate request structure! rc = %Vrc\n", rcVBox));
         goto fail;
@@ -890 +879 @@
     if (VBOX_FAILURE(rcVBox) || VBOX_FAILURE(infoReq->header.rc))
     {
-        printk(KERN_ERR
-               "vboxadd: error reporting guest info to host! rc = %d, header.rc = %d\n",
-               rcVBox, infoReq->header.rc);
         LogRelFunc(("error reporting guest info to host! rc = %Vrc, header.rc = %Vrc\n",
                     rcVBox, infoReq->header.rc));
@@ -911 +897 @@
     if (VBOX_FAILURE(rcVBox))
     {
-        printk(KERN_ERR "vboxadd: could not allocate request structure! rc = %d\n", rcVBox);
         LogRelFunc(("could not allocate request structure! rc = %Vrc\n", rcVBox));
         goto fail;
@@ -926 +911 @@
     if (err)
     {
-        printk(KERN_ERR "vboxadd: Could not request IRQ %d, err: %d\n", pcidev->irq, err);
         LogRelFunc(("could not request IRQ %d, err: %d\n", pcidev->irq, err));
         goto fail;
@@ -935 +919 @@
 
     /* 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 %d, IRQ %d, "
+    LogRel(("VirtualBox device settings: 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",
@@ -948 +925 @@
                 vboxDev->vmmdevmem, vboxDev->vmmdevmem_size,
                 vboxDev->hypervisorStart, vboxDev->hypervisorSize));
-    printk(KERN_DEBUG
-           "vboxadd: Successfully loaded version "
-           VBOX_VERSION_STRING " (interface " xstr(VMMDEV_VERSION) ")\n");
-
+    Log(("Successfully loaded VirtualBox device version "
+           VBOX_VERSION_STRING " (interface " xstr(VMMDEV_VERSION) ")\n"));
     /* successful return */
     PCI_DEV_PUT(pcidev);
@@ -969 +944 @@
 static __exit void fini(void)
 {
-    printk(KERN_DEBUG "vboxadd: unloading...\n");
-    LogRelFunc(("unloading...\n"));
-
     unregister_chrdev(vbox_major, "vboxadd");
     free_resources();
     vboxadd_cmc_fini ();
-    printk(KERN_DEBUG "vboxadd: unloaded\n");
-    LogRelFunc(("unloaded\n"));
 }