Changeset 64418 in vbox for trunk/src/VBox/Devices/testcase

Timestamp:

Oct 25, 2016 3:21:45 PM (8 years ago)

Author:

vboxsync

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

111533

Message:

DevPci: Working on merging ICH9PCIGLOBALS and PCIGLOBALS.

Location:

trunk/src/VBox/Devices/testcase

Files:

• tstDeviceStructSize.cpp (modified) (1 diff)
• tstDeviceStructSizeRC.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -362 +362 @@
 #endif
     CHECK_MEMBER_ALIGNMENT(DEVPCIBUS, apDevices, 64);
-    CHECK_MEMBER_ALIGNMENT(PCIGLOBALS, auPciLegacyIrqLevels, 16);
+//    CHECK_MEMBER_ALIGNMENT(PCIGLOBALS, Piix3.auPciLegacyIrqLevels, 16); - reenable later
     CHECK_MEMBER_ALIGNMENT(PCNETSTATE, u64LastPoll, 8);
     CHECK_MEMBER_ALIGNMENT(PCNETSTATE, CritSect, 8);

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -197 +197 @@
     GEN_CHECK_OFF(PCIGLOBALS, uPciBiosIo);
     GEN_CHECK_OFF(PCIGLOBALS, uPciBiosMmio);
-    GEN_CHECK_OFF(PCIGLOBALS, auPciLegacyIrqLevels);
-    GEN_CHECK_OFF(PCIGLOBALS, auPciLegacyIrqLevels[1]);
     GEN_CHECK_OFF(PCIGLOBALS, fUseIoApic);
-    GEN_CHECK_OFF(PCIGLOBALS, uaPciApicIrqLevels);
-    GEN_CHECK_OFF(PCIGLOBALS, uaPciApicIrqLevels[1]);
-    GEN_CHECK_OFF(PCIGLOBALS, acpi_irq_level);
-    GEN_CHECK_OFF(PCIGLOBALS, acpi_irq);
-    GEN_CHECK_OFF(PCIGLOBALS, uConfigReg);
     GEN_CHECK_OFF(PCIGLOBALS, pDevInsR3);
     GEN_CHECK_OFF(PCIGLOBALS, pDevInsR0);
     GEN_CHECK_OFF(PCIGLOBALS, pDevInsRC);
-    GEN_CHECK_OFF(PCIGLOBALS, PIIX3State);
+    GEN_CHECK_OFF(PCIGLOBALS, uConfigReg);
+    GEN_CHECK_OFF(PCIGLOBALS, auPciApicIrqLevels);
+    GEN_CHECK_OFF(PCIGLOBALS, auPciApicIrqLevels[1]);
+    GEN_CHECK_OFF(PCIGLOBALS, Piix3.auPciLegacyIrqLevels);
+    GEN_CHECK_OFF(PCIGLOBALS, Piix3.auPciLegacyIrqLevels[1]);
+    GEN_CHECK_OFF(PCIGLOBALS, Piix3.iAcpiIrqLevel);
+    GEN_CHECK_OFF(PCIGLOBALS, Piix3.iAcpiIrq);
+    GEN_CHECK_OFF(PCIGLOBALS, Piix3.PIIX3State);
     GEN_CHECK_OFF(PCIGLOBALS, PciBus);
 
@@ -217 +217 @@
     GEN_CHECK_OFF(ICH9PCIGLOBALS, pDevInsRC);
     GEN_CHECK_OFF(ICH9PCIGLOBALS, uConfigReg);
-    GEN_CHECK_OFF(ICH9PCIGLOBALS, uaPciApicIrqLevels);
-    GEN_CHECK_OFF(ICH9PCIGLOBALS, uaPciApicIrqLevels[1]);
+    GEN_CHECK_OFF(ICH9PCIGLOBALS, auPciApicIrqLevels);
+    GEN_CHECK_OFF(ICH9PCIGLOBALS, auPciApicIrqLevels[1]);
     GEN_CHECK_OFF(ICH9PCIGLOBALS, uPciBiosBus);
     GEN_CHECK_OFF(ICH9PCIGLOBALS, uPciBiosIo);