Changeset 44888 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Mar 1, 2013 3:42:23 PM (12 years ago)

Author:

vboxsync

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

84056

Message:

BusLogic: Ignore mailbox commands if mailbox not set up.

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevBusLogic.cpp (modified) (2 diffs)
• DrvSCSI.cpp (modified) (2 diffs)
• VSCSI/VSCSIInternal.h (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

@@ -376 +376 @@
     bool                            fISAEnabled;    /**< @todo unused, to be removed */
     /** Flag whether 24-bit mailboxes are in use (default is 32-bit). */
-    bool                            fMbxIs24Bit;    /**< @todo save? */
+    bool                            fMbxIs24Bit;
     /** ISA I/O port base (encoded in FW-compatible format). */
     uint8_t                         uISABaseCode;
@@ -2161 +2161 @@
             if ((uVal == BUSLOGICCOMMAND_EXECUTE_MAILBOX_COMMAND) && (pBusLogic->uOperationCode == 0xff))
             {
-                ASMAtomicIncU32(&pBusLogic->cMailboxesReady);
-                if (!ASMAtomicXchgBool(&pBusLogic->fNotificationSend, true))
-                {
-                    /* Send new notification to the queue. */
-                    PPDMQUEUEITEMCORE pItem = PDMQueueAlloc(pBusLogic->CTX_SUFF(pNotifierQueue));
-                    AssertMsg(pItem, ("Allocating item for queue failed\n"));
-                    PDMQueueInsert(pBusLogic->CTX_SUFF(pNotifierQueue), (PPDMQUEUEITEMCORE)pItem);
+                /* If there are no mailboxes configured, don't even try to do anything. */
+                if (pBusLogic->cMailbox) {
+                    ASMAtomicIncU32(&pBusLogic->cMailboxesReady);
+                    if (!ASMAtomicXchgBool(&pBusLogic->fNotificationSend, true))
+                    {
+                        /* Send new notification to the queue. */
+                        PPDMQUEUEITEMCORE pItem = PDMQueueAlloc(pBusLogic->CTX_SUFF(pNotifierQueue));
+                        AssertMsg(pItem, ("Allocating item for queue failed\n"));
+                        PDMQueueInsert(pBusLogic->CTX_SUFF(pNotifierQueue), (PPDMQUEUEITEMCORE)pItem);
+                    }
                 }
 

trunk/src/VBox/Devices/Storage/DrvSCSI.cpp

@@ -258 +258 @@
 }
 
+static DECLCALLBACK(int) drvscsiEject(VSCSILUN hVScsiLun, void *pvScsiLunUser)
+{
+    PDRVSCSI    pThis = (PDRVSCSI)pvScsiLunUser;
+    int         rc;
+
+#if 0
+    /* This must be done from EMT. */
+    PPDMDEVINS pDevIns = NULL; //ATADEVSTATE_2_DEVINS(s);
+    
+    rc = VMR3ReqPriorityCallWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
+                                 (PFNRT)pThis->pDrvMount->pfnUnmount, 3,
+                                 pThis->pDrvMount, false /*=fForce*/, true /*=fEject*/);
+    Assert(RT_SUCCESS(rc) || (rc == VERR_PDM_MEDIA_LOCKED) || (rc = VERR_PDM_MEDIA_NOT_MOUNTED));
+    if (RT_SUCCESS(rc) && pThis->pMediaNotify)
+    {
+        rc = VMR3ReqCallNoWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
+                               (PFNRT)pThis->pMediaNotify->pfnEjected, 2,
+                               pThis->pMediaNotify, s->iLUN);
+        AssertRC(rc);
+    }
+#endif
+    return VINF_SUCCESS;
+}
+
 static int drvscsiTransferCompleteNotify(PPDMIBLOCKASYNCPORT pInterface, void *pvUser, int rc)
 {
@@ -974 +998 @@
     pThis->VScsiIoCallbacks.pfnVScsiLunGetFeatureFlags    = drvscsiGetFeatureFlags;
     pThis->VScsiIoCallbacks.pfnVScsiLunMediumSetLock      = drvscsiSetLock;
+    pThis->VScsiIoCallbacks.pfnVScsiLunMediumEject        = drvscsiEject;
 
     rc = VSCSIDeviceCreate(&pThis->hVScsiDevice, drvscsiVScsiReqCompleted, pThis);

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h

@@ -364 +364 @@
 
 /**
- * Wrapper for the get medium lock/unlock I/O callback.
+ * Wrapper for the medium lock/unlock I/O callback.
  *
  * @returns VBox status code.
@@ -378 +378 @@
 
 /**
+ * Wrapper for the medium eject I/O callback.
+ *
+ * @returns VBox status code.
+ * @param   pVScsiLun   The LUN.
+ */
+DECLINLINE(int) vscsiLunMediumEject(PVSCSILUNINT pVScsiLun)
+{
+    return pVScsiLun->pVScsiLunIoCallbacks->pfnVScsiLunMediumEject(pVScsiLun,
+                                                                   pVScsiLun->pvVScsiLunUser);
+}
+
+/**
  * Wrapper for the I/O request enqueue I/O callback.
  *