Changeset 80657 in vbox for trunk/src/VBox/Devices/VirtIO

Timestamp:

Sep 9, 2019 7:14:32 AM (5 years ago)

Author:

vboxsync

Message:

Storage/DevVirtioScsi.cpp: Start to implement suspend/resume/reset/power on and power off handling. Compiles and code still does SCSI stuff, but the code is untested and unfinished. Posted questions to bugref:9440, Comment #83

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• Virtio_1_0.cpp (modified) (5 diffs)
• Virtio_1_0.h (modified) (1 diff)

trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp

@@ -64 +64 @@
 const char *virtioQueueGetName(VIRTIOHANDLE hVirtio, uint16_t qIdx)
 {
-    PVIRTIOSTATE pVirtio = (PVIRTIOSTATE)hVirtio;
-    AssertMsgReturn(DRIVER_OK(pVirtio) && pVirtio->uQueueEnable[qIdx],
-                    ("Guest driver not in ready state.\n"), "<null>");
-
     return (const char *)((PVIRTIOSTATE)hVirtio)->virtqProxy[qIdx].szVirtqName;
 }
@@ -93 +89 @@
 }
 
-
 /**
  * See API comments in header file for description
@@ -102 +97 @@
     return pVirtio->uDriverFeatures;
 }
-
 
 /**
@@ -227 +221 @@
     PVIRTQ_DESC_CHAIN_T pDescChain = pVirtqProxy->pDescChain;
 
-    AssertMsgReturn(DRIVER_OK(pVirtio) && pVirtio->uQueueEnable[qIdx],
+    AssertMsgReturn(DRIVER_OK(pVirtio) /*&& pVirtio->uQueueEnable[qIdx]*/,
                     ("Guest driver not in ready state.\n"), VERR_INVALID_STATE);
     /**
@@ -451 +445 @@
     for (uint16_t qIdx = 0; qIdx < pVirtio->uNumQueues; qIdx++)
         virtioResetQueue(pVirtio, qIdx);
+}
+
+/**
+ * See API comments in header file for description
+ */
+bool virtioIsQueueEnabled(VIRTIOHANDLE hVirtio, uint16_t qIdx)
+{
+    PVIRTIOSTATE pVirtio = (PVIRTIOSTATE)hVirtio;
+    return pVirtio->uQueueEnable[qIdx];
+}
+
+/**
+ * See API comments in header file for description
+ */
+void virtioQueueEnable(VIRTIOHANDLE hVirtio, uint16_t qIdx, bool fEnabled)
+{
+    PVIRTIOSTATE pVirtio = (PVIRTIOSTATE)hVirtio;
+    if (fEnabled)
+        pVirtio->uQueueSize[qIdx] = VIRTQ_MAX_SIZE;
+    else
+        pVirtio->uQueueSize[qIdx] = 0;
 }
 

trunk/src/VBox/Devices/VirtIO/Virtio_1_0.h

@@ -265 +265 @@
 
 /**
+ * Return queue enable state
+  *
+ * @param hVirtio   - Handle for VirtIO framework
+ * @param qIdx      - Queue number
+ * @param fEnabled  - Flag indicating whether to enable queue or not
+ */
+bool virtioIsQueueEnabled(VIRTIOHANDLE hVirtio, uint16_t qIdx);
+
+/**
+ * Enable or disable queue
+ *
+ * @param hVirtio   - Handle for VirtIO framework
+ * @param qIdx      - Queue number
+ * @param fEnabled  - Flag indicating whether to enable queue or not
+ */
+void virtioQueueEnable(VIRTIOHANDLE hVirtio, uint16_t qIdx, bool fEnabled);
+
+/**
  * Request orderly teardown of VirtIO on host and guest
+ * @param hVirtio   - Handle for VirtIO framework
+ *
  */
 void virtioResetAll(VIRTIOHANDLE hVirtio);
+
+
 
 /** CLIENT MUST CALL ON RELOCATE CALLBACK! */