Changeset 60373 in vbox for trunk/src/VBox/Main/src-server/linux

Timestamp:

Apr 7, 2016 2:21:30 PM (9 years ago)

Author:

vboxsync

Message:

Runtime/linux/sysfs.cpp: Convert RTLinuxSysFs* API to always use IPRT status codes instead of using errno and adapt all of its users

Location:

trunk/src/VBox/Main/src-server/linux

Files:

• HostHardwareLinux.cpp (modified) (3 diffs)
• PerformanceLinux.cpp (modified) (3 diffs)
• USBGetDevices.cpp (modified) (11 diffs)

trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp

@@ -610 +610 @@
     bool findDeviceNode()
     {
-        dev_t dev = RTLinuxSysFsReadDevNumFile("block/%s/dev", mpcszName);
-        if (dev == 0)
+        dev_t dev = 0;
+        int rc = RTLinuxSysFsReadDevNumFile(&dev, "block/%s/dev", mpcszName);
+        if (RT_FAILURE(rc) || dev == 0)
         {
             misConsistent = false;
             return false;
         }
-        if (RTLinuxCheckDevicePath(dev, RTFS_TYPE_DEV_BLOCK, mszNode,
-                                   sizeof(mszNode), "%s", mpcszName) < 0)
+        rc = RTLinuxCheckDevicePath(dev, RTFS_TYPE_DEV_BLOCK, mszNode,
+                                    sizeof(mszNode), "%s", mpcszName);
+        if (RT_FAILURE(rc))
             return false;
         return true;
@@ -630 +632 @@
     {
         char szVendor[128], szModel[128];
-        ssize_t cchVendor, cchModel;
-        int64_t type = RTLinuxSysFsReadIntFile(10, "block/%s/device/type",
-                                               mpcszName);
-        if (type >= 0 && type != TYPE_ROM)
+        int64_t type = 0;
+        int rc = RTLinuxSysFsReadIntFile(10, &type, "block/%s/device/type", mpcszName);
+        if (RT_SUCCESS(rc) && type != TYPE_ROM)
             return;
         if (type == TYPE_ROM)
         {
-            cchVendor = RTLinuxSysFsReadStrFile(szVendor, sizeof(szVendor),
-                                                "block/%s/device/vendor",
-                                                mpcszName);
-            if (cchVendor >= 0)
+            rc = RTLinuxSysFsReadStrFile(szVendor, sizeof(szVendor), NULL,
+                                         "block/%s/device/vendor", mpcszName);
+            if (RT_SUCCESS(rc))
             {
-                cchModel = RTLinuxSysFsReadStrFile(szModel, sizeof(szModel),
-                                                   "block/%s/device/model",
-                                                   mpcszName);
-                if (cchModel >= 0)
+                rc = RTLinuxSysFsReadStrFile(szModel, sizeof(szModel), NULL, 
+                                             "block/%s/device/model", mpcszName);
+                if (RT_SUCCESS(rc))
                 {
                     misValid = true;
@@ -697 +696 @@
         if (!noProbe())
             haveName = floppyGetName(mszNode, mpcszName[2] - '0', szName);
-        if (RTLinuxSysFsGetLinkDest(szDriver, sizeof(szDriver), "block/%s/%s",
-                                    mpcszName, "device/driver") >= 0)
+        int rc = RTLinuxSysFsGetLinkDest(szDriver, sizeof(szDriver), NULL, "block/%s/%s",
+                                         mpcszName, "device/driver");
+        if (RT_SUCCESS(rc))
         {
             if (RTStrCmp(szDriver, "floppy"))

trunk/src/VBox/Main/src-server/linux/PerformanceLinux.cpp

@@ -253 +253 @@
     else
     {
-        int64_t cSize = RTLinuxSysFsReadIntFile(0, pszPath);
-        if (cSize < 0)
-            rc = VERR_ACCESS_DENIED;
-        else
+        int64_t cSize = 0;
+        rc = RTLinuxSysFsReadIntFile(0, &cSize, pszPath);
+        if (RT_SUCCESS(rc))
             *size = cSize * 512;
     }
@@ -325 +324 @@
         return VERR_FILE_NOT_FOUND;
 
-    int64_t cSize = RTLinuxSysFsReadIntFile(0, szIfName);
-    if (cSize < 0)
-        return VERR_ACCESS_DENIED;
+    int64_t cSize = 0;
+    int rc = RTLinuxSysFsReadIntFile(0, &cSize, szIfName);
+    if (RT_FAILURE(rc))
+        return rc;
 
     *rx = cSize;
@@ -335 +335 @@
         return VERR_FILE_NOT_FOUND;
 
-    cSize = RTLinuxSysFsReadIntFile(0, szIfName);
-    if (cSize < 0)
-        return VERR_ACCESS_DENIED;
+    rc = RTLinuxSysFsReadIntFile(0, &cSize, szIfName);
+    if (RT_FAILURE(rc))
+        return rc;
 
     *tx = cSize;

trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp

@@ -879 +879 @@
         return VINF_SUCCESS;
 
-    int device = RTLinuxSysFsReadIntFile(10, "%s/devnum", pcszNode);
-    if (device < 0)
+    int64_t device;
+    int rc = RTLinuxSysFsReadIntFile(10, &device, "%s/devnum", pcszNode);
+    if (RT_FAILURE(rc))
         return VINF_SUCCESS;
 
-    dev_t devnum = usbsysfsMakeDevNum(bus, device);
+    dev_t devnum = usbsysfsMakeDevNum(bus, (int)device);
     if (!devnum)
         return VINF_SUCCESS;
 
     char szDevPath[RTPATH_MAX];
-    ssize_t cchDevPath;
-    cchDevPath = RTLinuxCheckDevicePath(devnum, RTFS_TYPE_DEV_CHAR,
-                                        szDevPath, sizeof(szDevPath),
-                                        "%s/%.3d/%.3d",
-                                        pcszDevicesRoot, bus, device);
-    if (cchDevPath < 0)
+    rc = RTLinuxCheckDevicePath(devnum, RTFS_TYPE_DEV_CHAR,
+                                szDevPath, sizeof(szDevPath),
+                                "%s/%.3d/%.3d",
+                                pcszDevicesRoot, bus, device);
+    if (RT_FAILURE(rc))
         return VINF_SUCCESS;
 
@@ -899 +899 @@
     if (usbsysfsInitDevInfo(&info, szDevPath, pcszNode))
     {
-        int rc = VEC_PUSH_BACK_OBJ(pvecDevInfo, USBDeviceInfo, &info);
+        rc = VEC_PUSH_BACK_OBJ(pvecDevInfo, USBDeviceInfo, &info);
         if (RT_SUCCESS(rc))
             return VINF_SUCCESS;
@@ -1227 +1227 @@
 
 
+/**
+ * Returns the byte value for the given device property or sets the given default if an
+ * error occurs while obtaining it.
+ *
+ * @returns uint8_t value of the given property.
+ * @param   uBase       The base of the number in the sysfs property.
+ * @param   bDef        The default to set on error.
+ * @param   pszFormat   The format string for the property.
+ * @param   ...         Arguments for the format string.
+ */
+static uint8_t usbsysfsReadDevicePropertyU8Def(unsigned uBase, uint8_t bDef, const char *pszFormat, ...)
+{
+    int64_t i64Tmp = 0;
+
+    va_list va;
+    va_start(va, pszFormat);
+    int rc = RTLinuxSysFsReadIntFileV(uBase, &i64Tmp, pszFormat, va);
+    va_end(va);
+    if (RT_SUCCESS(rc))
+        return (uint8_t)i64Tmp;
+    else
+        return bDef;
+}
+
+
+/**
+ * Returns the uint16_t value for the given device property or sets the given default if an
+ * error occurs while obtaining it.
+ *
+ * @returns uint16_t value of the given property.
+ * @param   uBase       The base of the number in the sysfs property.
+ * @param   u16Def      The default to set on error.
+ * @param   pszFormat   The format string for the property.
+ * @param   ...         Arguments for the format string.
+ */
+static uint8_t usbsysfsReadDevicePropertyU16Def(unsigned uBase, uint16_t u16Def, const char *pszFormat, ...)
+{
+    int64_t i64Tmp = 0;
+
+    va_list va;
+    va_start(va, pszFormat);
+    int rc = RTLinuxSysFsReadIntFileV(uBase, &i64Tmp, pszFormat, va);
+    va_end(va);
+    if (RT_SUCCESS(rc))
+        return (uint16_t)i64Tmp;
+    else
+        return u16Def;
+}
+
+
 static void usbsysfsFillInDevice(USBDEVICE *pDev, USBDeviceInfo *pInfo)
 {
@@ -1235 +1285 @@
     pDev->enmState           = USBDEVICESTATE_UNUSED;
     pDev->bBus               = usbsysfsGetBusFromPath(pszSysfsPath);
-    pDev->bDeviceClass       = RTLinuxSysFsReadIntFile(16, "%s/bDeviceClass", pszSysfsPath);
-    pDev->bDeviceSubClass    = RTLinuxSysFsReadIntFile(16, "%s/bDeviceSubClass", pszSysfsPath);
-    pDev->bDeviceProtocol    = RTLinuxSysFsReadIntFile(16, "%s/bDeviceProtocol", pszSysfsPath);
-    pDev->bNumConfigurations = RTLinuxSysFsReadIntFile(10, "%s/bNumConfigurations", pszSysfsPath);
-    pDev->idVendor           = RTLinuxSysFsReadIntFile(16, "%s/idVendor", pszSysfsPath);
-    pDev->idProduct          = RTLinuxSysFsReadIntFile(16, "%s/idProduct", pszSysfsPath);
-    pDev->bDevNum            = RTLinuxSysFsReadIntFile(10, "%s/devnum", pszSysfsPath);
+    pDev->bDeviceClass       = usbsysfsReadDevicePropertyU8Def(16, 0, "%s/bDeviceClass", pszSysfsPath);
+    pDev->bDeviceSubClass    = usbsysfsReadDevicePropertyU8Def(16, 0, "%s/bDeviceSubClass", pszSysfsPath);
+    pDev->bDeviceProtocol    = usbsysfsReadDevicePropertyU8Def(16, 0, "%s/bDeviceProtocol", pszSysfsPath);
+    pDev->bNumConfigurations = usbsysfsReadDevicePropertyU8Def(10, 0, "%s/bNumConfigurations", pszSysfsPath);
+    pDev->idVendor           = usbsysfsReadDevicePropertyU16Def(16, 0, "%s/idVendor", pszSysfsPath);
+    pDev->idProduct          = usbsysfsReadDevicePropertyU16Def(16, 0, "%s/idProduct", pszSysfsPath);
+    pDev->bDevNum            = usbsysfsReadDevicePropertyU8Def(10, 0, "%s/devnum", pszSysfsPath);
 
     /* Now deal with the non-numeric bits. */
@@ -1247 +1297 @@
                         * will need, and insane devices can be unsupported
                         * until further notice. */
-    ssize_t cchRead;
+    size_t cchRead;
 
     /* For simplicity, we just do strcmps on the next one. */
-    cchRead = RTLinuxSysFsReadStrFile(szBuf, sizeof(szBuf), "%s/speed", pszSysfsPath);
-    if (cchRead <= 0 || (size_t) cchRead == sizeof(szBuf))
+    rc = RTLinuxSysFsReadStrFile(szBuf, sizeof(szBuf), &cchRead, "%s/speed", pszSysfsPath);
+    if (RT_FAILURE(rc) || cchRead == sizeof(szBuf))
         pDev->enmState = USBDEVICESTATE_UNSUPPORTED;
     else
@@ -1260 +1310 @@
                        : USBDEVICESPEED_UNKNOWN;
 
-    cchRead = RTLinuxSysFsReadStrFile(szBuf, sizeof(szBuf), "%s/version", pszSysfsPath);
-    if (cchRead <= 0 || (size_t) cchRead == sizeof(szBuf))
+    rc = RTLinuxSysFsReadStrFile(szBuf, sizeof(szBuf), &cchRead, "%s/version", pszSysfsPath);
+    if (RT_FAILURE(rc) || cchRead == sizeof(szBuf))
         pDev->enmState = USBDEVICESTATE_UNSUPPORTED;
     else
@@ -1273 +1323 @@
     }
 
-    cchRead = RTLinuxSysFsReadStrFile(szBuf, sizeof(szBuf), "%s/bcdDevice", pszSysfsPath);
-    if (cchRead <= 0 || (size_t) cchRead == sizeof(szBuf))
+    rc = RTLinuxSysFsReadStrFile(szBuf, sizeof(szBuf), &cchRead, "%s/bcdDevice", pszSysfsPath);
+    if (RT_FAILURE(rc) || cchRead == sizeof(szBuf))
         pDev->bcdDevice = UINT16_MAX;
     else
@@ -1284 +1334 @@
 
     /* Now do things that need string duplication */
-    cchRead = RTLinuxSysFsReadStrFile(szBuf, sizeof(szBuf), "%s/product", pszSysfsPath);
-    if (cchRead > 0 && (size_t) cchRead < sizeof(szBuf))
+    rc = RTLinuxSysFsReadStrFile(szBuf, sizeof(szBuf), &cchRead, "%s/product", pszSysfsPath);
+    if (RT_SUCCESS(rc) && cchRead < sizeof(szBuf))
     {
         USBLibPurgeEncoding(szBuf);
@@ -1291 +1341 @@
     }
 
-    cchRead = RTLinuxSysFsReadStrFile(szBuf, sizeof(szBuf), "%s/serial", pszSysfsPath);
-    if (cchRead > 0 && (size_t) cchRead < sizeof(szBuf))
+    rc = RTLinuxSysFsReadStrFile(szBuf, sizeof(szBuf), &cchRead, "%s/serial", pszSysfsPath);
+    if (RT_SUCCESS(rc) && cchRead < sizeof(szBuf))
     {
         USBLibPurgeEncoding(szBuf);
@@ -1299 +1349 @@
     }
 
-    cchRead = RTLinuxSysFsReadStrFile(szBuf, sizeof(szBuf), "%s/manufacturer", pszSysfsPath);
-    if (cchRead > 0 && (size_t) cchRead < sizeof(szBuf))
+    rc = RTLinuxSysFsReadStrFile(szBuf, sizeof(szBuf), &cchRead, "%s/manufacturer", pszSysfsPath);
+    if (RT_SUCCESS(rc) && cchRead < sizeof(szBuf))
     {
         USBLibPurgeEncoding(szBuf);
@@ -1314 +1364 @@
     VEC_FOR_EACH(&pInfo->mvecpszInterfaces, char *, ppszIf)
     {
-        ssize_t cb = RTLinuxSysFsGetLinkDest(szBuf, sizeof(szBuf), "%s/driver", *ppszIf);
-        if (cb > 0 && pDev->enmState != USBDEVICESTATE_UNSUPPORTED)
+        rc = RTLinuxSysFsGetLinkDest(szBuf, sizeof(szBuf), NULL, "%s/driver", *ppszIf);
+        if (RT_SUCCESS(rc) && pDev->enmState != USBDEVICESTATE_UNSUPPORTED)
             pDev->enmState = (strcmp(szBuf, "hub") == 0)
                            ? USBDEVICESTATE_UNSUPPORTED
                            : USBDEVICESTATE_USED_BY_HOST_CAPTURABLE;
-        if (RTLinuxSysFsReadIntFile(16, "%s/bInterfaceClass", *ppszIf) == 9 /* hub */)
+        if (usbsysfsReadDevicePropertyU8Def(16, 9 /* bDev */, "%s/bInterfaceClass", *ppszIf) == 9 /* hub */)
             pDev->enmState = USBDEVICESTATE_UNSUPPORTED;
     }