Changeset 63449 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Aug 15, 2016 12:25:41 AM (8 years ago)

Author:

vboxsync

Message:

VBoxGuest-netbsd.c: don't save a pointer to transient pci_attach_args,
we only really need pci chipset tag (to disestablish the interrupt).

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c (modified) (8 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c

@@ -76 +76 @@
 {
     device_t sc_dev;
-    struct pci_attach_args *pa;
+    pci_chipset_tag_t pc;
     bus_space_tag_t io_tag;
     bus_space_handle_t io_handle;
@@ -124 +124 @@
  */
 static void VBoxGuestNetBSDRemoveIRQ(vboxguest_softc *sc);
-static int  VBoxGuestNetBSDAddIRQ(vboxguest_softc *pvState);
+static int  VBoxGuestNetBSDAddIRQ(vboxguest_softc *pvState, struct pci_attach_args *pa);
 static int  VBoxGuestNetBSDISR(void *pvState);
 
@@ -420 +420 @@
  * @returns NetBSD error code.
  * @param   vboxguest  Pointer to the state info structure.
- */
-static int VBoxGuestNetBSDAddIRQ(vboxguest_softc *vboxguest)
+ * @param   pa  Pointer to the PCI attach arguments.
+ */
+static int VBoxGuestNetBSDAddIRQ(vboxguest_softc *vboxguest, struct pci_attach_args *pa)
 {
     int iResId = 0;
     int rc = 0;
-    struct pci_attach_args *pa = vboxguest->pa;
     const char *intrstr;
 #if __NetBSD_Prereq__(6, 99, 39)
@@ -437 +437 @@
         return VERR_DEV_IO_ERROR;
     }
-    intrstr = pci_intr_string(vboxguest->pa->pa_pc, vboxguest->ih
+    intrstr = pci_intr_string(vboxguest->pc, vboxguest->ih
 #if __NetBSD_Prereq__(6, 99, 39)
                               , intstrbuf, sizeof(intstrbuf)
@@ -443 +443 @@
                               );
     aprint_normal_dev(vboxguest->sc_dev, "interrupting at %s\n", intrstr);
-    vboxguest->pfnIrqHandler = pci_intr_establish(vboxguest->pa->pa_pc, vboxguest->ih, IPL_BIO, VBoxGuestNetBSDISR, vboxguest);
+    vboxguest->pfnIrqHandler = pci_intr_establish(vboxguest->pc, vboxguest->ih, IPL_BIO, VBoxGuestNetBSDISR, vboxguest);
     if (vboxguest->pfnIrqHandler == NULL) {
         aprint_error_dev(vboxguest->sc_dev, "couldn't establish interrupt\n");
@@ -463 +463 @@
     if (vboxguest->pfnIrqHandler)
     {
-        pci_intr_disestablish(vboxguest->pa->pa_pc, vboxguest->pfnIrqHandler);
+        pci_intr_disestablish(vboxguest->pc, vboxguest->pfnIrqHandler);
     }
 }
@@ -496 +496 @@
     }
 
-    vboxguest->pa = pa;
+    vboxguest->pc = pa->pa_pc;
 
     /*
@@ -530 +530 @@
                  * Add IRQ of VMMDev.
                  */
-                rc = VBoxGuestNetBSDAddIRQ(vboxguest);
+                rc = VBoxGuestNetBSDAddIRQ(vboxguest, pa);
                 if (RT_SUCCESS(rc))
                 {