Changeset 6280 in vbox

Timestamp:

Jan 8, 2008 2:19:00 PM (17 years ago)

Author:

vboxsync

Message:

Guest Additions: added a ring 3 library function to set the interrupt filter and the corresponding Linux kernel code

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (2 diffs)
• linux/module/vboxmod.c (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -269 +269 @@
  * @returns IPRT status code
  *
- * @remakes This currently does not accept more than 255 bytes of data at
+ * @remarks This currently does not accept more than 255 bytes of data at
  *          one time. It should probably be rewritten to use pass a pointer
  *          in the IOCtl.
@@ -290 +290 @@
 }
 
+/**
+ * Change the IRQ filter mask.
+ *
+ * @returns IPRT status code
+ */
+VBGLR3DECL(int) VbglR3CtlFilterMask(uint32_t u32OrMask, uint32_t u32NotMask)
+{
+    VBoxGuestFilterMaskInfo info;
+
+    info.u32OrMask = u32OrMask;
+    info.u32NotMask = u32NotMask;
+    return vbglR3DoIOCtl(VBOXGUEST_IOCTL_CTL_FILTER_MASK, &info, sizeof(info));
+}
+

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

@@ -313 +313 @@
 
 /**
+ * IOCtl handler.  Control the interrupt filter mask to specify which VMMDev interrupts
+ * we know how to handle.
+ *
+ * @returns iprt status code
+ * @param pInfo kernel space pointer to the filter mask change info
+ */
+static int vboxadd_control_filter_mask(VBoxGuestFilterMaskInfo *pInfo)
+{
+    VMMDevCtlGuestFilterMask *pReq;
+    int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_CtlGuestFilterMask);
+    if (RT_FAILURE(rc))
+    {
+        Log(("VBoxGuestCommonIOCtl: CTL_FILTER_MASK: failed to allocate %u (%#x) bytes to cache the request. rc=%d!!\n",
+             sizeof(*pReq), sizeof(*pReq), rc));
+        return rc;
+    }
+
+    pReq->u32OrMask = pInfo->u32OrMask;
+    pReq->u32NotMask = pInfo->u32NotMask;
+
+    rc = VbglGRPerform(&pReq->header);
+    if (RT_FAILURE(rc))
+        Log(("VBoxGuestCommonIOCtl: CTL_FILTER_MASK: VbglGRPerform failed, rc=%Rrc!\n", rc));
+    else if (RT_FAILURE(pReq->header.rc))
+    {
+        Log(("VBoxGuestCommonIOCtl: CTL_FILTER_MASK: The request failed; VMMDev rc=%Rrc!\n", pReq->header.rc));
+        rc = pReq->header.rc;
+    }
+
+    VbglGRFree(&pReq->header);
+    return rc;
+}
+
+/**
  * IOCTL handler
  *
@@ -446 +480 @@
                 break;
 
+        case VBOXGUEST_IOCTL_CTL_FILTER_MASK:
+        {
+                VBoxGuestFilterMaskInfo info;
+                if (copy_to_user((void*)arg, (void*)&info, sizeof(info)))
+                {
+                    LogRelFunc(("VBOXGUEST_IOCTL_CTL_FILTER_MASK: error getting parameters from user space!\n"));
+                    rc = -EFAULT;
+                    break;
+                }
+                rc = -RTErrConvertToErrno(vboxadd_control_filter_mask(&info));
+                break;
+        }
         default:
                 LogRelFunc(("unknown command: %x\n", cmd));