Changeset 3650 in vbox for trunk/src

Timestamp:

Jul 16, 2007 3:46:38 PM (18 years ago)

Author:

vboxsync

Message:

Don't allow the guest to set status bits of the PCI status register to 1, writing a 1 has to clear the corresponding bit. Though fixes no known issue. And don't depend on vl_vbox.h anymore.

File:

• trunk/src/VBox/Devices/Bus/DevPCI.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -52 +52 @@
 /* Hack to get PCIDEVICEINT declare at the right point - include "PCIInternal.h". */
 #define PCI_INCLUDE_PRIVATE
-#include "vl_vbox.h"
 #include <VBox/pci.h>
 #include <VBox/pdm.h>
@@ -59 +58 @@
 #include <VBox/log.h>
 #include <iprt/assert.h>
+#include <iprt/string.h>
 
 #include "Builtins.h"
@@ -226 +226 @@
     uint32_t last_addr, new_addr, config_ofs;
 
-    cmd = le16_to_cpu(*(uint16_t *)(d->config + PCI_COMMAND));
+    cmd = RT_LE2H_U16(*(uint16_t *)(d->config + PCI_COMMAND));
     for(i = 0; i < PCI_NUM_REGIONS; i++) {
         r = &d->Int.s.aIORegions[i];
@@ -237 +237 @@
             if (r->type & PCI_ADDRESS_SPACE_IO) {
                 if (cmd & PCI_COMMAND_IO) {
-                    new_addr = le32_to_cpu(*(uint32_t *)(d->config +
+                    new_addr = RT_LE2H_U32(*(uint32_t *)(d->config +
                                                          config_ofs));
                     new_addr = new_addr & ~(r->size - 1);
@@ -251 +251 @@
             } else {
                 if (cmd & PCI_COMMAND_MEMORY) {
-                    new_addr = le32_to_cpu(*(uint32_t *)(d->config +
+                    new_addr = RT_LE2H_U32(*(uint32_t *)(d->config +
                                                          config_ofs));
                     /* the ROM slot has a specific enable bit */
@@ -318 +318 @@
         break;
     case 2:
-        val = le16_to_cpu(*(uint16_t *)(d->config + address));
+        val = RT_LE2H_U16(*(uint16_t *)(d->config + address));
         break;
     default:
     case 4:
-        val = le32_to_cpu(*(uint32_t *)(d->config + address));
+        val = RT_LE2H_U32(*(uint32_t *)(d->config + address));
         break;
     }
@@ -355 +355 @@
             val |= r->type;
         }
-        *(uint32_t *)(d->config + address) = cpu_to_le32(val);
+        *(uint32_t *)(d->config + address) = RT_H2LE_U32(val);
         pci_update_mappings(d);
         return;
@@ -411 +411 @@
             break;
         }
+#ifdef VBOX
+        /* status register: only clear bits by writing a '1' at the corresponding bit */
+        if (addr == 0x06)
+        {
+            d->config[addr] &= ~val;
+            d->config[addr] |= 0x08; /* interrupt status */
+        }
+        else if (addr == 0x07)
+        {
+            d->config[addr] &= ~val;
+        }
+        else
+#endif
         if (can_write) {
             d->config[addr] = val;