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

Timestamp:

Jan 22, 2010 11:15:43 AM (15 years ago)

Author:

vboxsync

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

56818

Message:

PDMIBASE refactoring; use UUID as interface IDs.

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• Makefile.kup (added)
• Virtio.cpp (modified) (4 diffs)
• Virtio.h (modified) (4 diffs)

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

@@ -2 +2 @@
 /** @file
  * Virtio - Virtio Common Functions (VRing, VQueue, Virtio PCI)
- *
  */
 
 /*
- * Copyright (C) 2009 Sun Microsystems, Inc.
+ * Copyright (C) 2009-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +24 @@
 
 #include <iprt/param.h>
+#include <iprt/uuid.h>
 #include <VBox/pdmdev.h>
 #include "Virtio.h"
@@ -522 +522 @@
 
 #ifdef IN_RING3
-/**
- * Provides interfaces to the driver.
- *
- * @returns Pointer to interface. NULL if the interface is not supported.
- * @param   pInterface          Pointer to this interface structure.
- * @param   enmInterface        The requested interface identification.
- * @thread  EMT
- */
-void *vpciQueryInterface(struct PDMIBASE *pInterface, PDMINTERFACE enmInterface)
-{
-    VPCISTATE *pState = IFACE_TO_STATE(pInterface, IBase);
-    Assert(&pState->IBase == pInterface);
-    switch (enmInterface)
-    {
-        case PDMINTERFACE_BASE:
-            return &pState->IBase;
-        case PDMINTERFACE_LED_PORTS:
-            return &pState->ILeds;
-        default:
-            return NULL;
-    }
+
+/**
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
+ */
+void *vpciQueryInterface(struct PDMIBASE *pInterface, const char *pszIID)
+{
+    VPCISTATE *pThis = IFACE_TO_STATE(pInterface, IBase);
+    Assert(&pThis->IBase == pInterface);
+
+    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
+        return &pThis->IBase;
+    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_LED_PORTS) == 0)
+        return &pThis->ILeds;
+    return NULL;
 }
 
@@ -934 +927 @@
 }
 
-
 #endif /* IN_RING3 */
 

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

@@ -2 +2 @@
 /** @file
  * Virtio.h - Virtio Declarations
- *
  */
 
@@ -162 +161 @@
 };
 
+
+/**
+ * The state of the VirtIO PCI device
+ *
+ * @implements  PDMILEDPORTS
+ */
 struct VPCIState_st
 {
@@ -172 +177 @@
 #endif
 
+    /** Status LUN: Base interface. */
     PDMIBASE               IBase;
-    PDMILEDPORTS           ILeds;                               /**< LED interface */
+    /** Status LUN: LED port interface. */
+    PDMILEDPORTS           ILeds;
+    /** Status LUN: LED connector (peer). */
     R3PTRTYPE(PPDMILEDCONNECTORS) pLedsConnector;
 
@@ -263 +271 @@
 void  vpciRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta);
 void  vpciReset(PVPCISTATE pState);
-void *vpciQueryInterface(struct PDMIBASE *pInterface,
-                         PDMINTERFACE enmInterface);
+void *vpciQueryInterface(struct PDMIBASE *pInterface, const char *pszIID);
 PVQUEUE vpciAddQueue(VPCISTATE* pState, unsigned uSize,
                      void (*pfnCallback)(void *pvState, PVQUEUE pQueue),