Changeset 85222 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 11, 2020 4:16:39 PM (5 years ago)

Author:

vboxsync

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

139199

Message:

Main/ovfreader: Clang 11 complains about a bunch of unused members, so I've #if'ed them out. Also a signedness issue with line numbers. Cleaned up some modernistic/random continuation indentation. bugref:9790

Location:

trunk/src/VBox/Main

Files:

• include/ovfreader.h (modified) (6 diffs)
• xml/ovfreader.cpp (modified) (16 diffs)

trunk/src/VBox/Main/include/ovfreader.h

@@ -335 +335 @@
     bool fResourceRequired;
 
-    RTCString strHostResource;   // "Abstractly specifies how a device shall connect to a resource on the deployment platform.
-                                        // Not all devices need a backing." Used with disk items, for which this references a virtual
-                                        // disk from the Disks section.
+    RTCString strHostResource;   ///< "Abstractly specifies how a device shall connect to a resource on the deployment platform.
+                                 /// Not all devices need a backing." Used with disk items, for which this
+                                 /// references a virtual disk from the Disks section.
     bool fAutomaticAllocation;
     bool fAutomaticDeallocation;
-    RTCString strConnection;     // "All Ethernet adapters that specify the same abstract network connection name within an OVF
-                                        // package shall be deployed on the same network. The abstract network connection name shall be
-                                        // listed in the NetworkSection at the outermost envelope level." We ignore this and only set up
-                                        // a network adapter depending on the network name.
-    RTCString strAddress;        // "Device-specific. For an Ethernet adapter, this specifies the MAC address."
-    int32_t lAddress;                   // strAddress as an integer, if applicable.
-    RTCString strAddressOnParent;         // "For a device, this specifies its location on the controller."
-    RTCString strAllocationUnits;         // "Specifies the units of allocation used. For example, “byte * 2^20”."
-    uint64_t ullVirtualQuantity;        // "Specifies the quantity of resources presented. For example, “256”."
-    uint64_t ullReservation;            // "Specifies the minimum quantity of resources guaranteed to be available."
-    uint64_t ullLimit;                  // "Specifies the maximum quantity of resources that will be granted."
-    uint64_t ullWeight;                 // "Specifies a relative priority for this allocation in relation to other allocations."
+    RTCString strConnection;     ///< "All Ethernet adapters that specify the same abstract network connection name within an OVF
+                                 /// package shall be deployed on the same network. The abstract network connection name shall be
+                                 /// listed in the NetworkSection at the outermost envelope level." We ignore this and only set up
+                                 /// a network adapter depending on the network name.
+    RTCString strAddress;        ///< "Device-specific. For an Ethernet adapter, this specifies the MAC address."
+    int32_t lAddress;            ///< strAddress as an integer, if applicable.
+    RTCString strAddressOnParent;///< "For a device, this specifies its location on the controller."
+    RTCString strAllocationUnits;///< "Specifies the units of allocation used. For example, “byte * 2^20”."
+    uint64_t ullVirtualQuantity; ///< "Specifies the quantity of resources presented. For example, “256”."
+    uint64_t ullReservation;     ///< "Specifies the minimum quantity of resources guaranteed to be available."
+    uint64_t ullLimit;           ///< "Specifies the maximum quantity of resources that will be granted."
+    uint64_t ullWeight;          ///< "Specifies a relative priority for this allocation in relation to other allocations."
 
     RTCString strConsumerVisibility;
     RTCString strMappingBehavior;
     RTCString strPoolID;
-    uint32_t ulBusNumber;               // seen with IDE controllers, but not listed in OVF spec
-
-    uint32_t ulLineNumber;              // line number of <Item> element in XML source; cached for error messages
+    uint32_t ulBusNumber;        ///< seen with IDE controllers, but not listed in OVF spec
+
+    int m_iLineNumber;           ///< line number of \<Item\> element in XML source; cached for error messages
 
     VirtualHardwareItem()
-        : ulInstanceID(0),
-          fResourceRequired(false),
-          fAutomaticAllocation(false),
-          fAutomaticDeallocation(false),
-          ullVirtualQuantity(0),
-          ullReservation(0),
-          ullLimit(0),
-          ullWeight(0),
-          ulBusNumber(0),
-          ulLineNumber(0),
-          fDefault(false)
+        : ulInstanceID(0)
+        , fResourceRequired(false)
+        , fAutomaticAllocation(false)
+        , fAutomaticDeallocation(false)
+        , ullVirtualQuantity(0)
+        , ullReservation(0)
+        , ullLimit(0)
+        , ullWeight(0)
+        , ulBusNumber(0)
+        , m_iLineNumber(0)
+        , fDefault(false)
     {
         itemName = "Item";
-    };
+    }
 
     virtual ~VirtualHardwareItem() { /* Makes MSC happy. */ }
@@ -417 +417 @@
     StorageAccessType_T accessType;
     RTCString strHostExtentName;
+#if 0 /* unused */
     int16_t hostExtentNameFormat;
     int16_t hostExtentNameNamespace;
     int64_t hostExtentStartingAddress;
+#endif
     int64_t hostResourceBlockSize;
     int64_t limit;
@@ -430 +432 @@
 
 public:
-    StorageItem(): VirtualHardwareItem(),
-        accessType(StorageAccessType_Unknown),
-        hostExtentNameFormat(-1),
-        hostExtentNameNamespace(-1),
-        hostExtentStartingAddress(-1),
-        hostResourceBlockSize(-1),
-        limit(-1),
-        reservation(-1),
-        virtualQuantity(-1),
-        virtualResourceBlockSize(-1)
+    StorageItem()
+        : VirtualHardwareItem()
+        , accessType(StorageAccessType_Unknown)
+#if 0 /* unused */
+        , hostExtentNameFormat(-1)
+        , hostExtentNameNamespace(-1)
+        , hostExtentStartingAddress(-1)
+#endif
+        , hostResourceBlockSize(-1)
+        , limit(-1)
+        , reservation(-1)
+        , virtualQuantity(-1)
+        , virtualResourceBlockSize(-1)
     {
         itemName = "StorageItem";
@@ -461 +466 @@
 {
     //see DMTF Schema Documentation http://schemas.dmtf.org/wbem/cim-html/2/
+#if 0 /* unused */
     uint16_t DefaultPortVID;
     uint16_t DefaultPriority;
@@ -466 +472 @@
     uint32_t GroupID;
     uint32_t ManagerID;
+    uint16_t NetworkPortProfileIDType;
+#endif
     RTCString strNetworkPortProfileID;
-    uint16_t NetworkPortProfileIDType;
     RTCString strOtherEndpointMode;
     RTCString strOtherNetworkPortProfileIDTypeInfo;
     RTCString strPortCorrelationID;
+#if 0 /* unused */
     uint16_t PortVID;
     bool Promiscuous;
@@ -479 +487 @@
     uint8_t VSITypeIDVersion;
     uint16_t AllowedPriorities[256];
+    uint16_t AllowedToReceiveVLANs[256];
+    uint16_t AllowedToTransmitVLANs[256];
+#endif
     RTCString strAllowedToReceiveMACAddresses;
-    uint16_t AllowedToReceiveVLANs[256];
     RTCString strAllowedToTransmitMACAddresses;
-    uint16_t AllowedToTransmitVLANs[256];
 
 public:
-    EthernetPortItem(): VirtualHardwareItem()
+    EthernetPortItem() : VirtualHardwareItem()
     {
         itemName = "EthernetPortItem";

trunk/src/VBox/Main/xml/ovfreader.cpp

@@ -447 +447 @@
                         continue;
                     vsys.vecHardwareItems.push_back(pItem);
-                    pItem->ulLineNumber = pelmItem->getLineNumber();
+                    pItem->m_iLineNumber = pelmItem->getLineNumber();
                     pItem->fillItem(pelmItem);
 
@@ -469 +469 @@
                         else
 #if 1
-                            LogRel(("OVFREADER: Warning reading '%s'! Duplicate ulInstanceID %u on line %u, previous at %u!\n",
-                                    m_strPath.c_str(), pItem->ulInstanceID, pItem->ulLineNumber, itDup->second->ulLineNumber));
+                            LogRel(("OVFREADER: Warning reading '%s'! Duplicate ulInstanceID %u on line %d, previous at %d!\n",
+                                    m_strPath.c_str(), pItem->ulInstanceID, pItem->m_iLineNumber, itDup->second->m_iLineNumber));
 #else
-                            throw OVFLogicError(N_("Error reading '%s': Duplicate ulInstanceID %u on line %u, previous at %u"),
+                            throw OVFLogicError(N_("Error reading '%s': Duplicate ulInstanceID %u on line %d, previous at %d"),
                                                 m_strPath.c_str(), pItem->ulInstanceID,
-                                                pItem->ulLineNumber, itDup->second->ulLineNumber);
+                                                pItem->m_iLineNumber, itDup->second->m_iLineNumber);
 #endif
                     }
@@ -507 +507 @@
                                                 i.ullVirtualQuantity,
                                                 UINT16_MAX,
-                                                i.ulLineNumber);
+                                                i.m_iLineNumber);
                         break;
 
@@ -520 +520 @@
                                                 m_strPath.c_str(),
                                                 i.strAllocationUnits.c_str(),
-                                                i.ulLineNumber);
+                                                i.m_iLineNumber);
                         break;
 
@@ -675 +675 @@
                                                 m_strPath.c_str(),
                                                 ResourceType_OtherStorageDevice,
-                                                i.ulLineNumber, i.strResourceSubType.c_str() );
+                                                i.m_iLineNumber, i.strResourceSubType.c_str() );
                         break;
                     }
@@ -712 +712 @@
                                                 m_strPath.c_str(),
                                                 i.resourceType,
-                                                i.ulLineNumber);
+                                                i.m_iLineNumber);
                         }
                     }
@@ -757 +757 @@
                                                 i.ulInstanceID,
                                                 i.ulParent,
-                                                i.ulLineNumber);
+                                                i.m_iLineNumber);
 
                         VirtualDisk vd;
@@ -778 +778 @@
                                               i.ulInstanceID,
                                               i.strHostResource.c_str(),
-                                              i.ulLineNumber);
+                                              i.m_iLineNumber);
 
                         vsys.mapVirtualDisks[vd.strDiskId] = vd;
@@ -891 +891 @@
 //          throw OVFLogicError(N_("Unknown element \"%s\" under Item element, line %d"),
 //                              pcszItemChildName,
-//                              ulLineNumber);
+//                              m_iLineNumber);
     }
 }
@@ -900 +900 @@
     if (resourceType == 0)
         throw OVFLogicError(N_("Empty element ResourceType under %s element, line %d. see DMTF Schema Documentation %s"),
-                            name.c_str(), ulLineNumber, DTMF_SPECS_URI);
+                            name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
 
     /* Don't be too uptight about the ulInstanceID value.  There are OVAs out
@@ -913 +913 @@
             || resourceType == ResourceType_IBHCA )  //??
             throw OVFLogicError(N_("Element InstanceID is absent under %s element, line %d. see DMTF Schema Documentation %s"),
-                                name.c_str(), ulLineNumber, DTMF_SPECS_URI);
+                                name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
         else
             LogRel(("OVFREADER: Warning: Ignoring missing or invalid ulInstanceID under element %s, line %u\n",
-                    name.c_str(), ulLineNumber));
+                    name.c_str(), m_iLineNumber));
     }
 }
@@ -995 +995 @@
     {
         //throw OVFLogicError(N_("Access type is unknown under %s element, line %d"),
-        //        name.c_str(), ulLineNumber);
+        //                    name.c_str(), m_iLineNumber);
     }
 
@@ -1002 +1002 @@
         throw OVFLogicError(N_("Element HostResourceBlockSize is absent under %s element, line %d. "
                                "see DMTF Schema Documentation %s"),
-                name.c_str(), ulLineNumber, DTMF_SPECS_URI);
+                            name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
     }
 
@@ -1009 +1009 @@
         throw OVFLogicError(N_("Element VirtualResourceBlockSize is absent under %s element, line %d. "
                                "see DMTF Schema Documentation %s"),
-                name.c_str(), ulLineNumber, DTMF_SPECS_URI);
+                            name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
     }
 
@@ -1016 +1016 @@
         throw OVFLogicError(N_("Element VirtualQuantityUnits is absent under %s element, line %d. "
                                "see DMTF Schema Documentation %s"),
-                name.c_str(), ulLineNumber, DTMF_SPECS_URI);
+                            name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
     }
 
@@ -1028 +1028 @@
                                "It's needed to change on \"byte\". "
                                "see DMTF Schema Documentation %s"),
-                                name.c_str(), ulLineNumber, DTMF_SPECS_URI);
+                            name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
     }
 }