Changeset 4299 in vbox for trunk/src/VBox/Additions/linux/module

Timestamp:

Aug 23, 2007 7:13:58 AM (18 years ago)

Author:

vboxsync

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

23822

Message:

Linux guest kernel module adaption to 2.6.22

File:

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

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

@@ -640 +640 @@
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+#define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p)
+#define PCI_DEV_PUT(x) pci_dev_put(x)
+#else
+#define PCI_DEV_GET(v,d,p) pci_find_device(v,d,p)
+#define PCI_DEV_PUT(x)
+#endif
+
 /**
  * Module initialization
@@ -651 +659 @@
     VMMDevReportGuestInfo *infoReq = NULL;
 
-    printk(KERN_INFO "vboxadd: initializing. Version %s\n", VERSION);
+    printk(KERN_INFO "vboxadd: initializing version %s\n", VERSION);
 
     if (vboxadd_cmc_init ())
@@ -662 +670 @@
      * Detect PCI device
      */
-    pcidev = pci_find_device(VMMDEV_VENDORID, VMMDEV_DEVICEID, pcidev);
+    pcidev = PCI_DEV_GET(VMMDEV_VENDORID, VMMDEV_DEVICEID, pcidev);
     if (!pcidev)
     {
@@ -673 +681 @@
     {
         printk (KERN_ERR "vboxadd: could not enable device: %d\n", err);
+        PCI_DEV_PUT(pcidev);
         return -ENODEV;
     }
@@ -682 +691 @@
         printk(KERN_ERR "vboxadd: register_chrdev failed: vbox_major: %d, err = %d\n",
                vbox_major, err);
+        PCI_DEV_PUT(pcidev);
         return -ENODEV;
     }
@@ -704 +714 @@
     /* get the memory region */
     vboxDev->vmmdevmem = pci_resource_start(pcidev, 1);
-    /* and size */
     vboxDev->vmmdevmem_size = pci_resource_len(pcidev, 1);
 
@@ -722 +731 @@
 
     /* map adapter memory into kernel address space and check version */
-    vboxDev->pVMMDevMemory = (VMMDevMemory *) ioremap(
-        vboxDev->vmmdevmem,
-        vboxDev->vmmdevmem_size
-        );
+    vboxDev->pVMMDevMemory = (VMMDevMemory *) ioremap(vboxDev->vmmdevmem,
+                                                      vboxDev->vmmdevmem_size);
     if (!vboxDev->pVMMDevMemory)
     {
@@ -749 +756 @@
 
     /* report guest information to host, this must be done as the very first request */
-    rcVBox = VbglGRAlloc(
-        (VMMDevRequestHeader**)&infoReq,
-        sizeof(VMMDevReportGuestInfo),
-        VMMDevReq_ReportGuestInfo
-        );
+    rcVBox = VbglGRAlloc((VMMDevRequestHeader**)&infoReq,
+                         sizeof(VMMDevReportGuestInfo), VMMDevReq_ReportGuestInfo);
     if (VBOX_FAILURE(rcVBox))
     {
@@ -785 +789 @@
 
     /* allocate a VMM request structure for use in the ISR */
-    rcVBox = VbglGRAlloc(
-        (VMMDevRequestHeader**)&vboxDev->irqAckRequest,
-        sizeof(VMMDevEvents),
-        VMMDevReq_AcknowledgeEvents
-        );
+    rcVBox = VbglGRAlloc((VMMDevRequestHeader**)&vboxDev->irqAckRequest,
+                         sizeof(VMMDevEvents), VMMDevReq_AcknowledgeEvents);
     if (VBOX_FAILURE(rcVBox))
     {
@@ -797 +798 @@
 
     /* get ISR */
-    err = request_irq(pcidev->irq, vboxadd_irq_handler, SA_SHIRQ, "vboxadd", vboxDev);
+    err = request_irq(pcidev->irq, vboxadd_irq_handler,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+                      IRQF_SHARED,
+#else
+                      SA_SHIRQ,
+#endif
+                      "vboxadd", vboxDev);
     if (err)
     {
@@ -809 +816 @@
     /* some useful information for the user */
     printk(KERN_INFO
-           "vboxadd: major code: %d, "
-           "using irq %d, "
+           "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",
@@ -818 +824 @@
 
     /* successful return */
+    PCI_DEV_PUT(pcidev);
     return 0;
+
 fail:
+    PCI_DEV_PUT(pcidev);
     free_resources();
     unregister_chrdev(vbox_major, "vboxadd");