Changeset 75970 in vbox for trunk/src/VBox/ImageMounter/vboximg-mount

Timestamp:

Dec 5, 2018 12:30:09 PM (6 years ago)

Author:

vboxsync

Message:

Rename vboxraw to vboximg-mount and make it possible to build it by giving VBOX_WITH_VBOXIMGMOUNT=1 on the command line

Location:

trunk/src/VBox/ImageMounter/vboximg-mount

Files:

• . (moved) (moved from trunk/src/VBox/ImageMounter/vboxraw )
• Makefile.kmk (modified) (2 diffs)
• SelfSizingTable.h (added)
• vboximg-mount.cpp (copied) (copied from trunk/src/VBox/ImageMounter/vboxraw/vboxraw.cpp ) (44 diffs)
• vboximg-mount.h (added)
• vboxraw.cpp (deleted)

trunk/src/VBox/ImageMounter/vboximg-mount/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Sub-Makefile for the vboxraw Program.
+# Sub-Makefile for the vboximg-mount Program.
 
 #
@@ -20 +20 @@
 
 #
-# vboxraw - Disk Image Flatting FUSE Program.
+# vboximg-mount - Disk Image Flatting FUSE Program.
 #
-PROGRAMS += vboxraw
+PROGRAMS += vboximg-mount
 
-vboxraw_TEMPLATE =  VBOXMAINCLIENTEXE
-vboxraw_DEFS.darwin = __FreeBSD_==10
-vboxraw_DEFS        = _FILE_OFFSET_BITS=64
+vboximg-mount_TEMPLATE =  VBOXMAINCLIENTEXE
+vboximg-mount_DEFS.darwin = __FreeBSD_==10
+vboximg-mount_DEFS        = _FILE_OFFSET_BITS=64
 
-vboxraw_SOURCES = \
-    vboxraw.cpp \
-    vboxraw.h \
+vboximg-mount_SOURCES = \
+    vboximg-mount.cpp \
+    vboximg-mount.h \
     SelfSizingTable.h
 
-vboxraw_LIBS = \
+vboximg-mount_LIBS = \
         $(LIB_DDU) \
         $(LIB_RUNTIME)
 
-vboxraw_INCS.darwin = \
+vboximg-mount_INCS.darwin = \
     /usr/local/include \
     /usr/local/include/osxfuse \
-vboxraw_CXXFLAGS.darwin = -std=c++11
+vboximg-mount_CXXFLAGS.darwin = -std=c++11
 
-vboxraw_LIBS.darwin = /usr/local/lib/libosxfuse.dylib
-vboxraw_LIBS.linux = fuse
-vboxraw_LIBS.freebsd = fuse
+vboximg-mount_LIBS.darwin = /usr/local/lib/libosxfuse.dylib
+vboximg-mount_LIBS.linux = fuse
+vboximg-mount_LIBS.freebsd = fuse
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/ImageMounter/vboximg-mount/vboximg-mount.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * vboxraw - Disk Image Flattening FUSE Program.
+ * vboximg-mount - Disk Image Flattening FUSE Program.
  */
 
@@ -75 +75 @@
 #include <iprt/utf16.h>
 
-#include "vboxraw.h"
+#include "vboximg-mount.h"
 #include "SelfSizingTable.h"
 
@@ -91 +91 @@
 } g_u;
 
+#if 0 /* unused */
 const uint64_t KB = 1024;
 const uint64_t MB = KB * KB;
@@ -96 +97 @@
 const uint64_t TB = GB * KB;
 const uint64_t PB = TB * KB;
+#endif
 
 enum { PARTITION_TABLE_MBR = 1, PARTITION_TABLE_GPT = 2 };
@@ -102 +104 @@
 #define MBR_PARTITIONS_MAX          4                /** Fixed number of partitions in Master Boot Record */
 #define BASENAME_MAX                256              /** Maximum name for the basename of a path (for RTStrNLen()*/
-#define VBOXRAW_PARTITION_MAX       256              /** How much storage to allocate to store partition info */
+#define VBOXIMG_PARTITION_MAX       256              /** How much storage to allocate to store partition info */
 #define PARTITION_NAME_MAX          72               /** Maximum partition name size (accomodates GPT partition name) */
 #define BLOCKSIZE                   512              /** Commonly used disk block size */
@@ -124 +126 @@
 #define CSTR(arg)     Utf8Str(arg).c_str()          /* Converts XPCOM string type to C string type */
 
-static struct fuse_operations g_vboxrawOps;         /** FUSE structure that defines allowed ops for this FS */
+static struct fuse_operations g_vboximgOps;         /** FUSE structure that defines allowed ops for this FS */
 
 /* Global variables */
@@ -164 +166 @@
 } PARTITIONINFO;
 
-PARTITIONINFO g_aParsedPartitionInfo[VBOXRAW_PARTITION_MAX + 1]; /* Note: Element 0 reserved for EntireDisk partitionEntry */
-
-static struct vboxrawOpts {
+PARTITIONINFO g_aParsedPartitionInfo[VBOXIMG_PARTITION_MAX + 1]; /* Note: Element 0 reserved for EntireDisk partitionEntry */
+
+static struct vboximgOpts {
      char         *pszVm;                   /** optional VM UUID */
      char         *pszImage;                /** Virtual Disk image UUID or path */
@@ -180 +182 @@
      uint32_t      fBriefUsage;             /** Flag to display only FS-specific program usage options */
      uint32_t      fVerbose;                /** Make some noise */
-} g_vboxrawOpts;
-
-#define OPTION(fmt, pos, val) { fmt, offsetof(struct vboxrawOpts, pos), val }
-
-static struct fuse_opt vboxrawOptDefs[] = {
+} g_vboximgOpts;
+
+#define OPTION(fmt, pos, val) { fmt, offsetof(struct vboximgOpts, pos), val }
+
+static struct fuse_opt vboximgOptDefs[] = {
     OPTION("-l",              fListMediaBrief,   1),
     OPTION("-L",              fListMedia,        1),
@@ -211 +213 @@
 briefUsage()
 {
-    RTPrintf("usage: vboxraw [options] <mountpoint>\n\n"
-        "vboxraw options:\n\n"
+    RTPrintf("usage: vboximg-mount [options] <mountpoint>\n\n"
+        "vboximg-mount options:\n\n"
         "    [ -l ]                                     List virtual disk media (brief version)\n"
         "    [ -L ]                                     List virtual disk media (long version)\n"
@@ -258 +260 @@
 
 static int
-vboxrawOptHandler(void *data, const char *arg, int optKey, struct fuse_args *outargs)
+vboximgOptHandler(void *data, const char *arg, int optKey, struct fuse_args *outargs)
 {
     (void) data;
@@ -267 +269 @@
             briefUsage();
             fuse_opt_add_arg(outargs, "-ho");
-            fuse_main(outargs->argc, outargs->argv, &g_vboxrawOps, NULL);
+            fuse_main(outargs->argc, outargs->argv, &g_vboximgOps, NULL);
             break;
     }
@@ -274 +276 @@
 
 /** @copydoc fuse_operations::open */
-static int vboxrawOp_open(const char *pszPath, struct fuse_file_info *pInfo)
+static int vboximgOp_open(const char *pszPath, struct fuse_file_info *pInfo)
 {
     (void) pInfo;
@@ -336 +338 @@
 
 /** @todo Remove when VD I/O becomes threadsafe */
-static DECLCALLBACK(int) vboxrawThreadStartRead(void *pvUser)
+static DECLCALLBACK(int) vboximgThreadStartRead(void *pvUser)
 {
     PRTCRITSECT vdioLock = (PRTCRITSECT)pvUser;
@@ -342 +344 @@
 }
 
-static DECLCALLBACK(int) vboxrawThreadFinishRead(void *pvUser)
+static DECLCALLBACK(int) vboximgThreadFinishRead(void *pvUser)
 {
     PRTCRITSECT vdioLock = (PRTCRITSECT)pvUser;
@@ -348 +350 @@
 }
 
-static DECLCALLBACK(int) vboxrawThreadStartWrite(void *pvUser)
+static DECLCALLBACK(int) vboximgThreadStartWrite(void *pvUser)
 {
     PRTCRITSECT vdioLock = (PRTCRITSECT)pvUser;
@@ -354 +356 @@
 }
 
-static DECLCALLBACK(int) vboxrawThreadFinishWrite(void *pvUser)
+static DECLCALLBACK(int) vboximgThreadFinishWrite(void *pvUser)
 {
     PRTCRITSECT vdioLock = (PRTCRITSECT)pvUser;
@@ -362 +364 @@
 
 /** @copydoc fuse_operations::release */
-static int vboxrawOp_release(const char *pszPath, struct fuse_file_info *pInfo)
+static int vboximgOp_release(const char *pszPath, struct fuse_file_info *pInfo)
 {
     (void) pszPath;
@@ -571 +573 @@
 
 /** @copydoc fuse_operations::read */
-static int vboxrawOp_read(const char *pszPath, char *pbBuf, size_t cbBuf,
+static int vboximgOp_read(const char *pszPath, char *pbBuf, size_t cbBuf,
                            off_t offset, struct fuse_file_info *pInfo)
 {
@@ -602 +604 @@
 
 /** @copydoc fuse_operations::write */
-static int vboxrawOp_write(const char *pszPath, const char *pbBuf, size_t cbBuf,
+static int vboximgOp_write(const char *pszPath, const char *pbBuf, size_t cbBuf,
                            off_t offset, struct fuse_file_info *pInfo)
 {
@@ -617 +619 @@
 
     int rc = 0;
-    if (!g_vboxrawOpts.fRW) {
-        LogFlowFunc(("WARNING: vboxraw (FUSE FS) --rw option not specified\n"
+    if (!g_vboximgOpts.fRW) {
+        LogFlowFunc(("WARNING: vboximg-mount (FUSE FS) --rw option not specified\n"
                      "              (write operation ignored w/o error!)\n"));
         return cbBuf;
@@ -638 +640 @@
 /** @copydoc fuse_operations::getattr */
 static int
-vboxrawOp_getattr(const char *pszPath, struct stat *stbuf)
+vboximgOp_getattr(const char *pszPath, struct stat *stbuf)
 {
     int rc = 0;
@@ -670 +672 @@
          * representing the offset range of the partition.
          *
-         *  $ vboxraw -i /stroll/along/the/path/simple_fixed_disk.vdi -p 1 /mnt/tmpdir
+         *  $ vboximg-mount -i /stroll/along/the/path/simple_fixed_disk.vdi -p 1 /mnt/tmpdir
          *  $ ls /mnt/tmpdir
          *  simple_fixed_disk.vdi[20480:2013244928]    vhdd
@@ -690 +692 @@
 /** @copydoc fuse_operations::readdir */
 static int
-vboxrawOp_readdir(const char *pszPath, void *pvBuf, fuse_fill_dir_t pfnFiller,
+vboximgOp_readdir(const char *pszPath, void *pvBuf, fuse_fill_dir_t pfnFiller,
                               off_t offset, struct fuse_file_info *pInfo)
 
@@ -734 +736 @@
 /** @copydoc fuse_operations::readlink */
 static int
-vboxrawOp_readlink(const char *pszPath, char *buf, size_t size)
+vboximgOp_readlink(const char *pszPath, char *buf, size_t size)
 {
     (void) pszPath;
@@ -792 +794 @@
                 if (ancestorNumber == 0)
                 {
-                    if (!g_vboxrawOpts.fListMediaBrief)
+                    if (!g_vboximgOpts.fListMediaBrief)
                     {
                         RTPrintf("   -----------------------\n");
@@ -810 +812 @@
                 else
                 {
-                    if (!g_vboxrawOpts.fListMediaBrief)
+                    if (!g_vboximgOpts.fListMediaBrief)
                     {
                         RTPrintf("     Diff %d:\n", ancestorNumber);
@@ -855 +857 @@
                 CHECK_ERROR(pMachine, COMGETTER(SettingsFilePath)(pMachineLocation.asOutParam()));
 
-                if (   g_vboxrawOpts.pszVm == NULL
-                    || RTStrNCmp(CSTR(pMachineUuid), g_vboxrawOpts.pszVm, MAX_UUID_LEN) == 0
-                    || RTStrNCmp((const char *)pMachineName.raw(), g_vboxrawOpts.pszVm, MAX_UUID_LEN) == 0)
+                if (   g_vboximgOpts.pszVm == NULL
+                    || RTStrNCmp(CSTR(pMachineUuid), g_vboximgOpts.pszVm, MAX_UUID_LEN) == 0
+                    || RTStrNCmp((const char *)pMachineName.raw(), g_vboximgOpts.pszVm, MAX_UUID_LEN) == 0)
                 {
-                    if (!g_vboxrawOpts.fListMediaBrief)
+                    if (!g_vboximgOpts.fListMediaBrief)
                     {
                         RTPrintf("------------------------------------------------------\n");
@@ -990 +992 @@
             RTPrintf("   UUID: %s\n\n", g_pvDiskUuid);
 
-        if (g_vboxrawOpts.fVerbose)
+        if (g_vboximgOpts.fVerbose)
         {
             RTPrintf("   GPT Partition Table Header:\n\n");
@@ -1056 +1058 @@
 
         for (int idxPartition = 5;
-                 idxPartition <= VBOXRAW_PARTITION_MAX;
+                 idxPartition <= VBOXIMG_PARTITION_MAX;
                  idxPartition++)
         {
@@ -1241 +1243 @@
         return RTMsgErrorExitFailure("VDInit failed, rc=%Rrc\n", rc);
 
-    memset(&g_vboxrawOps, 0, sizeof(g_vboxrawOps));
-    g_vboxrawOps.open        = vboxrawOp_open;
-    g_vboxrawOps.read        = vboxrawOp_read;
-    g_vboxrawOps.write       = vboxrawOp_write;
-    g_vboxrawOps.getattr     = vboxrawOp_getattr;
-    g_vboxrawOps.release     = vboxrawOp_release;
-    g_vboxrawOps.readdir     = vboxrawOp_readdir;
-    g_vboxrawOps.readlink    = vboxrawOp_readlink;
+    memset(&g_vboximgOps, 0, sizeof(g_vboximgOps));
+    g_vboximgOps.open        = vboximgOp_open;
+    g_vboximgOps.read        = vboximgOp_read;
+    g_vboximgOps.write       = vboximgOp_write;
+    g_vboximgOps.getattr     = vboximgOp_getattr;
+    g_vboximgOps.release     = vboximgOp_release;
+    g_vboximgOps.readdir     = vboximgOp_readdir;
+    g_vboximgOps.readlink    = vboximgOp_readlink;
 
     struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
-    memset(&g_vboxrawOpts, 0, sizeof(g_vboxrawOpts));
-
-    rc = fuse_opt_parse(&args, &g_vboxrawOpts, vboxrawOptDefs, vboxrawOptHandler);
-
-    if (g_vboxrawOpts.fAllowRoot)
+    memset(&g_vboximgOpts, 0, sizeof(g_vboximgOpts));
+
+    rc = fuse_opt_parse(&args, &g_vboximgOpts, vboximgOptDefs, vboximgOptHandler);
+
+    if (g_vboximgOpts.fAllowRoot)
         fuse_opt_add_arg(&args, "-oallow_root");
 
     if (rc == -1)
         return RTMsgErrorExitFailure("Couldn't parse fuse options, rc=%Rrc\n", rc);
-    if (g_vboxrawOpts.fBriefUsage)
+    if (g_vboximgOpts.fBriefUsage)
     {
         briefUsage();
@@ -1297 +1299 @@
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to get IVirtualBox object! (hrc=%Rhrc)", hrc);
 
-    if (g_vboxrawOpts.fVerbose)
-        RTPrintf("vboxraw: VirtualBox XPCOM object created\n");
-
-    if (g_vboxrawOpts.fListMedia || g_vboxrawOpts.fListMediaBrief)
+    if (g_vboximgOpts.fVerbose)
+        RTPrintf("vboximg: VirtualBox XPCOM object created\n");
+
+    if (g_vboximgOpts.fListMedia || g_vboximgOpts.fListMediaBrief)
     {
         listVMs(pVirtualBox);
@@ -1307 +1309 @@
 
 
-    if (g_vboxrawOpts.pszImage == NULL)
+    if (g_vboximgOpts.pszImage == NULL)
     {
         RTMsgErrorExitFailure("To list partitions, must also specify --i or --image option\n");
@@ -1315 +1317 @@
     char    *pszFormat;
     VDTYPE  enmType;
-    searchForBaseImage(pVirtualBox, g_vboxrawOpts.pszImage, &pBaseImageMedium);
+    searchForBaseImage(pVirtualBox, g_vboximgOpts.pszImage, &pBaseImageMedium);
     if (pBaseImageMedium == NULL)
     {
@@ -1322 +1324 @@
          * resolving symlinks back to hard path.
          */
-        int cbNameMax = pathconf(g_vboxrawOpts.pszImage, _PC_PATH_MAX);
+        int cbNameMax = pathconf(g_vboximgOpts.pszImage, _PC_PATH_MAX);
         if (cbNameMax < 0)
             return cbNameMax;
 
-        g_pszBaseImagePath = RTStrDup(g_vboxrawOpts.pszImage);
+        g_pszBaseImagePath = RTStrDup(g_vboximgOpts.pszImage);
         if (g_pszBaseImagePath == NULL)
             return RTMsgErrorExitFailure("out of memory\n");
@@ -1337 +1339 @@
                     "Virtual disk image not readable: \"%s\"\n", g_pszBaseImagePath);
 
-        if (g_vboxrawOpts.fRW && access(g_vboxrawOpts.pszImage, W_OK) < 0)
+        if (g_vboximgOpts.fRW && access(g_vboximgOpts.pszImage, W_OK) < 0)
              return RTMsgErrorExitFailure(
                     "Virtual disk image not writeable: \"%s\"\n", g_pszBaseImagePath);
@@ -1421 +1423 @@
                     return RTMsgErrorExitFailure("VDGetFormat(,,%s,,) "
                         "failed (during HDD container creation), rc=%Rrc\n", g_pszBaseImagePath, rc);
-                if (g_vboxrawOpts.fVerbose)
+                if (g_vboximgOpts.fVerbose)
                     RTPrintf("Creating container for base image of format %s\n", pszFormat);
                 /** @todo Remove I/O CB's and crit sect. when VDRead()/VDWrite() are made threadsafe */
@@ -1427 +1429 @@
                 if (RT_SUCCESS(rc))
                 {
-                    g_VDIfThreadSync.pfnStartRead   = vboxrawThreadStartRead;
-                    g_VDIfThreadSync.pfnFinishRead  = vboxrawThreadFinishRead;
-                    g_VDIfThreadSync.pfnStartWrite  = vboxrawThreadStartWrite;
-                    g_VDIfThreadSync.pfnFinishWrite = vboxrawThreadFinishWrite;
-                    rc = VDInterfaceAdd(&g_VDIfThreadSync.Core, "vboxraw_ThreadSync", VDINTERFACETYPE_THREADSYNC,
+                    g_VDIfThreadSync.pfnStartRead   = vboximgThreadStartRead;
+                    g_VDIfThreadSync.pfnFinishRead  = vboximgThreadFinishRead;
+                    g_VDIfThreadSync.pfnStartWrite  = vboximgThreadStartWrite;
+                    g_VDIfThreadSync.pfnFinishWrite = vboximgThreadFinishWrite;
+                    rc = VDInterfaceAdd(&g_VDIfThreadSync.Core, "vboximg_ThreadSync", VDINTERFACETYPE_THREADSYNC,
                                         &g_vdioLock, sizeof(VDINTERFACETHREADSYNC), &g_pVdIfs);
                 }
@@ -1445 +1447 @@
             /** @todo (end of to do section) */
 
-            if ( g_vboxrawOpts.cHddImageDiffMax != 0 && diffNumber > g_vboxrawOpts.cHddImageDiffMax)
+            if ( g_vboximgOpts.cHddImageDiffMax != 0 && diffNumber > g_vboximgOpts.cHddImageDiffMax)
                 break;
 
-            if (g_vboxrawOpts.fVerbose)
+            if (g_vboximgOpts.fVerbose)
             {
                 if (diffNumber == 0)
-                    RTPrintf("\nvboxraw: Opening base image into container:\n       %s\n",
+                    RTPrintf("\nvboximg-mount: Opening base image into container:\n       %s\n",
                         g_pszBaseImagePath);
                 else
-                    RTPrintf("\nvboxraw: Opening difference image #%d into container:\n       %s\n",
+                    RTPrintf("\nvboximg-mount: Opening difference image #%d into container:\n       %s\n",
                         diffNumber, g_pszBaseImagePath);
             }
@@ -1484 +1486 @@
     g_cbEntireVDisk  = VDGetSize(g_pVDisk, 0 /* base */);
 
-    if (g_vboxrawOpts.fListParts)
+    if (g_vboximgOpts.fListParts)
     {
         if (g_pVDisk == NULL)
@@ -1505 +1507 @@
         return 0;
     }
-    if (g_vboxrawOpts.idxPartition >= 0)
-    {
-        if (g_vboxrawOpts.offset)
+    if (g_vboximgOpts.idxPartition >= 0)
+    {
+        if (g_vboximgOpts.offset)
             return RTMsgErrorExitFailure("--offset and --partition are mutually exclusive options\n");
 
-        if (g_vboxrawOpts.size)
+        if (g_vboximgOpts.size)
             return RTMsgErrorExitFailure("--size and --partition are mutually exclusive options\n");
 
@@ -1521 +1523 @@
         if (rc < 0)
             return RTMsgErrorExitFailure("Error parsing disk MBR/Partition table\n");
-        int partNbr = g_vboxrawOpts.idxPartition;
+        int partNbr = g_vboximgOpts.idxPartition;
 
         if (partNbr < 0 || partNbr > g_lastPartNbr)
@@ -1530 +1532 @@
             g_vDiskOffset = 0;
             g_vDiskSize = VDGetSize(g_pVDisk, 0);
-            if (g_vboxrawOpts.fVerbose)
+            if (g_vboximgOpts.fVerbose)
                 RTPrintf("Partition 0 specified - Whole disk will be accessible\n");
         } else {
             for (int i = 0; i < g_lastPartNbr; i++)
             {
-                /* If GPT, display vboxraw's representation of partition table starts at partition 2
+                /* If GPT, display vboximg's representation of partition table starts at partition 2
                  * but the table is displayed calling it partition 1, because the protective MBR
                  * record is relatively pointless to display or reference in this context */
@@ -1543 +1545 @@
                      g_vDiskOffset = g_aParsedPartitionInfo[i].offPartition;
                      g_vDiskSize = g_vDiskOffset + g_aParsedPartitionInfo[i].cbPartition;
-                     if (g_vboxrawOpts.fVerbose)
+                     if (g_vboximgOpts.fVerbose)
                         RTPrintf("Partition %d specified. Only sectors %llu to %llu of disk will be accessible\n",
-                            g_vboxrawOpts.idxPartition, g_vDiskOffset / BLOCKSIZE, g_vDiskSize / BLOCKSIZE);
+                            g_vboximgOpts.idxPartition, g_vDiskOffset / BLOCKSIZE, g_vDiskSize / BLOCKSIZE);
                 }
             }
         }
     } else {
-        if (g_vboxrawOpts.offset) {
-            if (g_vboxrawOpts.offset < 0 || g_vboxrawOpts.offset + g_vboxrawOpts.size > g_cbEntireVDisk)
+        if (g_vboximgOpts.offset) {
+            if (g_vboximgOpts.offset < 0 || g_vboximgOpts.offset + g_vboximgOpts.size > g_cbEntireVDisk)
                 return RTMsgErrorExitFailure("User specified offset out of range of virtual disk\n");
 
-            if (g_vboxrawOpts.fVerbose)
+            if (g_vboximgOpts.fVerbose)
                 RTPrintf("Setting r/w bias (offset) to user requested value for sector %llu\n", g_vDiskOffset / BLOCKSIZE);
 
-            g_vDiskOffset = g_vboxrawOpts.offset;
-        }
-        if (g_vboxrawOpts.size) {
-            if (g_vboxrawOpts.size < 0 || g_vboxrawOpts.offset + g_vboxrawOpts.size > g_cbEntireVDisk)
+            g_vDiskOffset = g_vboximgOpts.offset;
+        }
+        if (g_vboximgOpts.size) {
+            if (g_vboximgOpts.size < 0 || g_vboximgOpts.offset + g_vboximgOpts.size > g_cbEntireVDisk)
                 return RTMsgErrorExitFailure("User specified size out of range of virtual disk\n");
 
-            if (g_vboxrawOpts.fVerbose)
+            if (g_vboximgOpts.fVerbose)
                 RTPrintf("Setting r/w size limit to user requested value %llu\n", g_vDiskSize / BLOCKSIZE);
 
-            g_vDiskSize = g_vboxrawOpts.size;
+            g_vDiskSize = g_vboximgOpts.size;
         }
     }
@@ -1575 +1577 @@
      * Hand control over to libfuse.
      */
-    if (g_vboxrawOpts.fVerbose)
-        RTPrintf("\nvboxraw: Going into background...\n");
-
-    rc = fuse_main(args.argc, args.argv, &g_vboxrawOps, NULL);
+    if (g_vboximgOpts.fVerbose)
+        RTPrintf("\nvboximg-mount: Going into background...\n");
+
+    rc = fuse_main(args.argc, args.argv, &g_vboximgOps, NULL);
 
     int rc2 = VDClose(g_pVDisk, false /* fDelete */);
     AssertRC(rc2);
-    RTPrintf("vboxraw: fuse_main -> %d\n", rc);
+    RTPrintf("vboximg-mount: fuse_main -> %d\n", rc);
     return rc;
 }