Changeset 57901 in vbox

Timestamp:

Sep 25, 2015 3:29:51 PM (10 years ago)

Author:

vboxsync

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

102873

Message:

Devices/Virtio: semantic fixes.

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet.cpp (modified) (3 diffs)
• VirtIO/Virtio.cpp (modified) (3 diffs)
• VirtIO/Virtio.h (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

@@ -48 +48 @@
 #ifdef IN_RING3
 
-#define VNET_PCI_SUBSYSTEM_ID        1 + VIRTIO_NET_ID
 #define VNET_PCI_CLASS               0x0200
 #define VNET_N_QUEUES                3
@@ -55 +54 @@
 #if 0
 /* Virtio Block Device */
-#define VNET_PCI_SUBSYSTEM_ID        1 + VIRTIO_BLK_ID
 #define VNET_PCI_CLASS               0x0180
 #define VNET_N_QUEUES                2
@@ -1951 +1949 @@
     pThis->VPCI.IBase.pfnQueryInterface    = vnetQueryInterface;
     rc = vpciConstruct(pDevIns, &pThis->VPCI, iInstance,
-                       VNET_NAME_FMT, VNET_PCI_SUBSYSTEM_ID,
+                       VNET_NAME_FMT, VIRTIO_NET_ID,
                        VNET_PCI_CLASS, VNET_N_QUEUES);
     pThis->pRxQueue  = vpciAddQueue(&pThis->VPCI, 256, vnetQueueReceive,  "RX ");

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

@@ -769 +769 @@
  *
  * @param   pci          Reference to PCI device structure.
- * @param   uSubsystemId PCI Subsystem Id
+ * @param   uDeviceId    VirtiO Device Id
  * @param   uClass       Class of PCI device (network, etc)
  * @thread  EMT
  */
 static DECLCALLBACK(void) vpciConfigure(PCIDEVICE& pci,
-                                        uint16_t uSubsystemId,
+                                        uint16_t uDeviceId,
                                         uint16_t uClass)
 {
     /* Configure PCI Device, assume 32-bit mode ******************************/
     PCIDevSetVendorId(&pci, DEVICE_PCI_VENDOR_ID);
-    PCIDevSetDeviceId(&pci, DEVICE_PCI_DEVICE_ID);
+    PCIDevSetDeviceId(&pci, DEVICE_PCI_BASE_ID + uDeviceId);
     vpciCfgSetU16(pci, VBOX_PCI_SUBSYSTEM_VENDOR_ID, DEVICE_PCI_SUBSYSTEM_VENDOR_ID);
-    vpciCfgSetU16(pci, VBOX_PCI_SUBSYSTEM_ID, uSubsystemId);
+    vpciCfgSetU16(pci, VBOX_PCI_SUBSYSTEM_ID, DEVICE_PCI_SUBSYSTEM_BASE_ID + uDeviceId);
 
     /* ABI version, must be equal 0 as of 2.6.30 kernel. */
@@ -812 +812 @@
 int vpciConstruct(PPDMDEVINS pDevIns, VPCISTATE *pState,
                   int iInstance, const char *pcszNameFmt,
-                  uint16_t uSubsystemId, uint16_t uClass,
+                  uint16_t uDeviceId, uint16_t uClass,
                   uint32_t nQueues)
 {
@@ -832 +832 @@
 
     /* Set PCI config registers */
-    vpciConfigure(pState->pciDevice, uSubsystemId, uClass);
+    vpciConfigure(pState->pciDevice, uDeviceId, uClass);
     /* Register PCI device */
     rc = PDMDevHlpPCIRegister(pDevIns, &pState->pciDevice);

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

@@ -33 +33 @@
 
 #define DEVICE_PCI_VENDOR_ID                0x1AF4
-#define DEVICE_PCI_DEVICE_ID                0x1000
+#define DEVICE_PCI_BASE_ID                  0x1000
 #define DEVICE_PCI_SUBSYSTEM_VENDOR_ID      0x1AF4
+#define DEVICE_PCI_SUBSYSTEM_BASE_ID       1
 
 #define VIRTIO_MAX_NQUEUES                  3
@@ -260 +261 @@
 int   vpciLoadExec(PVPCISTATE pState, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass, uint32_t nQueues);
 int   vpciConstruct(PPDMDEVINS pDevIns, VPCISTATE *pState, int iInstance, const char *pcszNameFmt,
-                    uint16_t uSubsystemId, uint16_t uClass, uint32_t nQueues);
+                    uint16_t uDeviceId, uint16_t uClass, uint32_t nQueues);
 int   vpciDestruct(VPCISTATE* pState);
 void  vpciRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta);