Changeset 35885 in vbox for trunk/include/VBox

Timestamp:

Feb 8, 2011 1:20:04 AM (14 years ago)

Author:

vboxsync

Message:

Main, VMM, vboxshell: more PCI work (persistent settings, logging, more driver API), API consumer in vboxshell

Location:

trunk/include/VBox

Files:

• log.h (modified) (2 diffs)
• settings.h (modified) (2 diffs)

trunk/include/VBox/log.h

@@ -120 +120 @@
     /** PCI Device group. */
     LOG_GROUP_DEV_PCI,
+    /** PCI Raw Device group. */
+    LOG_GROUP_DEV_PCI_RAW,
     /** PCNet Device group. */
     LOG_GROUP_DEV_PCNET,
@@ -395 +397 @@
     "DEV_PC_BIOS",  \
     "DEV_PCI",      \
+    "DEV_PCI_RAW",  \
     "DEV_PCNET",    \
     "DEV_PIC",      \

trunk/include/VBox/settings.h

@@ -693 +693 @@
 
 /**
+ * NOTE: If you add any fields in here, you must update a) the constructor and b)
+ * the operator== which is used by MachineConfigFile::operator==(), or otherwise
+ * your settings might never get saved.
+ */
+struct HostPciDeviceAttachment
+{
+    HostPciDeviceAttachment()
+        : uHostAddress(0),
+          uGuestAddress(0)
+    {}
+
+    bool operator==(const HostPciDeviceAttachment &a) const
+    {
+        return (   (uHostAddress   == a.uHostAddress)
+                && (uGuestAddress  == a.uGuestAddress)
+                && (strDeviceName  == a.strDeviceName)
+               );
+    }
+
+    com::Utf8Str    strDeviceName;
+    uint32_t        uHostAddress;
+    uint32_t        uGuestAddress;
+};
+typedef std::list<HostPciDeviceAttachment> HostPciDeviceAttachmentList;
+
+/**
  * Representation of Machine hardware; this is used in the MachineConfigFile.hardwareMachine
  * field.
@@ -761 +787 @@
 
     IoSettings          ioSettings;             // requires settings version 1.10 (VirtualBox 3.2)
+    HostPciDeviceAttachmentList pciAttachments; // requires settings version 1.12 (VirtualBox 4.1)
 };