Changeset 43715 in vbox

Timestamp:

Oct 24, 2012 8:32:14 AM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: devmapper support in Linux (#6345)

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• configure (modified) (6 diffs)
• debian/postinst.in (modified) (1 diff)
• debian/rules (modified) (1 diff)
• src/VBox/Installer/linux/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/linux/debian/postinst.in (modified) (1 diff)
• src/VBox/Installer/linux/debian/rules (modified) (1 diff)
• src/VBox/Installer/linux/install.sh (modified) (1 diff)
• src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (2 diffs)
• src/VBox/Main/src-server/linux/PerformanceLinux.cpp (modified) (4 diffs)
• src/apps/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -458 +458 @@
 # Enable performance API.
 VBOX_WITH_RESOURCE_USAGE_API = 1
+# Use VBoxVolInfo for getting FS dependecies.
+if1of ($(KBUILD_TARGET), linux)
+ VBOX_WITH_DEVMAPPER = 1
+endif
 # Enable BusLogic SCSI host adapter
 VBOX_WITH_BUSLOGIC = 1

trunk/configure

@@ -87 +87 @@
 WITH_PULSE=1
 WITH_DBUS=1
+WITH_DEVMAPPER=1
 WITH_KMODS=1
 WITH_OPENGL=1
@@ -128 +129 @@
 INCVNCSERVER=""
 LIBVNCSERVER="-lvncserver"
+INCDEVMAPPER=""
+LIBDEVMAPPER="-ldevmapper"
 CXX_FLAGS=""
 if [ "$OS" = "freebsd" ]; then
@@ -748 +751 @@
 
 #
+# Check for libdevmapper, needed by the VBoxVolInfo
+#
+check_libdevmapper()
+{
+  test_header libdevmapper
+  cat > $ODIR.tmp_src.cc << EOF
+#include <cstdio>
+extern "C" {
+#define private
+#include <libdevmapper.h>
+int main()
+{
+  char version[80];
+
+  if (!dm_get_library_version(version, sizeof(version)))
+  {
+    printf("dm_get_library_version() failed.\n");
+    return 1;
+  }
+
+  const char* v=version;
+  unsigned int major = 0, minor = 0, micro = 0;
+
+  for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0';
+  if (*v == '.') v++;
+  for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0';
+  if (*v == '.') v++;
+  for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0';
+
+  printf("found version %s", version);
+  if (major*10000 + minor*100 + micro >= 10200)
+  {
+    printf(", OK.\n");
+    return 0;
+  }
+  else
+  {
+    printf(", expected version 1.02 or higher\n");
+    return 1;
+  }
+}
+}
+EOF
+  if test_compile "$LIBDEVMAPPER $INCDEVMAPPER" libdevmapper libdevmapper; then
+    if test_execute; then
+      cnf_append "VBOX_WITH_DEVMAPPER" "1"
+    fi
+  fi
+}
+
+
+#
 # Check for openssl, needed for RDP and S3
 #
@@ -2130 +2185 @@
 cat << EOF
   --disable-udptunnel      disable UDP tunnel networking
+  --disable-devmapper      disable device mapper library access
   --disable-hardening      don't be strict about /dev/vboxdrv access
   --build-libxml2          build libxml2 from sources
@@ -2334 +2390 @@
       WITH_VDE=1
       ;;
+    --disable-devmapper)
+      WITH_DEVMAPPER=0
+      ;;
     --build-debug|-d)
       BUILD_TYPE=debug
@@ -2569 +2628 @@
   if [ $WITH_DBUS -eq 0 ]; then
     cnf_append "VBOX_WITH_DBUS" ""
+  fi
+  if [ $WITH_DEVMAPPER -eq 1 ]; then
+    check_libdevmapper
+  else
+    cnf_append "VBOX_WITH_DEVMAPPER" ""
   fi
   check_libcap

trunk/debian/postinst.in

@@ -69 +69 @@
   if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetAdpCtl > /dev/null 2>&1; then
     chmod 4511 /usr/lib/virtualbox/VBoxNetAdpCtl
+  fi
+  if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxVolInfo > /dev/null 2>&1; then
+    chmod 4511 /usr/lib/virtualbox/VBoxVolInfo
   fi
 

trunk/debian/rules

@@ -222 +222 @@
         mv $(archdir)/VBoxNetDHCP $(prefix)/usr/lib/$(package)
         mv $(archdir)/VBoxNetAdpCtl $(prefix)/usr/lib/$(package)
+        mv $(archdir)/VBoxVolInfo $(prefix)/usr/lib/$(package)
         mv $(archdir)/VBoxXPCOMIPCD $(prefix)/usr/lib/$(package)
         mv $(archdir)/components $(prefix)/usr/lib/$(package)/components

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -150 +150 @@
                 VBoxNetDHCP $(if $(VBOX_WITH_HARDENING),VBoxNetDHCP.so,) \
                 VBoxNetAdpCtl \
+                VBoxVolInfo \
                 VBoxSVC \
                 VBoxXPCOM.so \

trunk/src/VBox/Installer/linux/debian/postinst.in

@@ -69 +69 @@
   if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetAdpCtl > /dev/null 2>&1; then
     chmod 4511 /usr/lib/virtualbox/VBoxNetAdpCtl
+  fi
+  if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxVolInfo > /dev/null 2>&1; then
+    chmod 4511 /usr/lib/virtualbox/VBoxVolInfo
   fi
 

trunk/src/VBox/Installer/linux/debian/rules

@@ -246 +246 @@
         mv $(archdir)/VBoxNetDHCP $(prefix)/usr/lib/$(package)
         mv $(archdir)/VBoxNetAdpCtl $(prefix)/usr/lib/$(package)
+        mv $(archdir)/VBoxVolInfo $(prefix)/usr/lib/$(package)
         mv $(archdir)/VBoxXPCOMIPCD $(prefix)/usr/lib/$(package)
         mv $(archdir)/components $(prefix)/usr/lib/$(package)/components

trunk/src/VBox/Installer/linux/install.sh

@@ -370 +370 @@
     fi
 
-    # This binary needs to be suid root in any case, even if not hardened
+    # This binaries need to be suid root in any case, even if not hardened
     test -e $INSTALLATION_DIR/VBoxNetAdpCtl && chmod 4511 $INSTALLATION_DIR/VBoxNetAdpCtl
+    test -e $INSTALLATION_DIR/VBoxVolInfo && chmod 4511 $INSTALLATION_DIR/VBoxVolInfo
 
     # Install runlevel scripts

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -81 +81 @@
 mv VBoxNetDHCP $RPM_BUILD_ROOT/usr/lib/virtualbox
 mv VBoxNetAdpCtl $RPM_BUILD_ROOT/usr/lib/virtualbox
+mv VBoxVolInfo $RPM_BUILD_ROOT/usr/lib/virtualbox
 mv VBoxXPCOMIPCD $RPM_BUILD_ROOT/usr/lib/virtualbox
 mv components $RPM_BUILD_ROOT/usr/lib/virtualbox/components
@@ -117 +118 @@
     mv $i $RPM_BUILD_ROOT/usr/lib/virtualbox; done
 fi
-for i in VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl; do
+for i in VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxVolInfo; do
   chmod 4511 $RPM_BUILD_ROOT/usr/lib/virtualbox/$i; done
 if [ -d ExtensionPacks/VNC ]; then

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

@@ -28 +28 @@
 #include <iprt/err.h>
 #include <iprt/param.h>
+#include <iprt/path.h>
 #include <iprt/string.h>
 #include <iprt/mp.h>
@@ -36 +37 @@
 #include "Logging.h"
 #include "Performance.h"
+
+#define VBOXVOLINFO_NAME "VBoxVolInfo"
 
 namespace pm {
@@ -365 +368 @@
 }
 
+static void addVolumeDependencies(const char *pcszVolume, DiskList& listDisks)
+{
+    char szVolInfo[RTPATH_MAX];
+    int rc = RTPathExecDir(szVolInfo, sizeof(szVolInfo) - sizeof("/" VBOXVOLINFO_NAME " ") - strlen(pcszVolume));
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("VolInfo: Failed to get program path, rc=%Rrc\n", rc));
+        return VERR_INVALID_PARAMETER;
+    }
+    strcat(szVolInfo, "/" VBOXVOLINFO_NAME " ");
+    strcat(szVolInfo, pcszVolume);
+
+    FILE *fp = popen(szVolInfo, "r");
+    if (fp)
+    {
+        char szBuf[128];
+
+        while (fgets(szBuf, sizeof(szBuf), fp))
+            listDisks.push_back(RTCString(szBuf));
+
+        pclose(fp);
+    }
+    else
+        listDisks.push_back(RTCString(pcszVolume));
+}
 
 int getDiskListByFs(const char *pszPath, DiskList& listDisks)
@@ -376 +404 @@
             if (strcmp(pszPath, mntent->mnt_dir) == 0)
             {
-                char szDevName[32];
-                listDisks.push_back(RTCString(getDiskName(szDevName, sizeof(szDevName), mntent->mnt_fsname)));
+                char szDevName[128];
+                getDiskName(szDevName, sizeof(szDevName), mntent->mnt_fsname);
+                if (strncmp(mntent->mnt_fsname, "/dev/mapper", 11))
+                    listDisks.push_back(RTCString(szDevName));
+                else
+                    addVolumeDependencies(szDevName, listDisks);
                 break;
             }

trunk/src/apps/Makefile.kmk

@@ -34 +34 @@
  endif
 endif
+ifdef VBOX_WITH_DEVMAPPER
+ ifneq ($(wildcard $(PATH_SUB_CURRENT)/volinfo),)
+  include $(PATH_SUB_CURRENT)/volinfo/Makefile.kmk
+ endif
+endif
 
 include $(FILE_KBUILD_SUB_FOOTER)