Index: /trunk/src/VBox/ImageMounter/vboxraw/Makefile.kmk =================================================================== --- /trunk/src/VBox/ImageMounter/vboxraw/Makefile.kmk (revision 75266) +++ /trunk/src/VBox/ImageMounter/vboxraw/Makefile.kmk (revision 75266) @@ -0,0 +1,45 @@ +# $Id$ +## @file +# Sub-Makefile for the vboxraw Program. +# + +# +# Copyright (C) 2006-2017 Oracle Corporation +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + +SUB_DEPTH = ../../../.. +include $(KBUILD_PATH)/subheader.kmk + +# +# vboxraw - Disk Image Flatting FUSE Program. +# +PROGRAMS += vboxraw + +vboxraw_TEMPLATE = VBOXMAINCLIENTEXE +vboxraw_DEFS.darwin = __FreeBSD_==10 +vboxraw_DEFS = _FILE_OFFSET_BITS=64 + +vboxraw_SOURCES = \ + vboxraw.cpp + +vboxraw_LIBS = \ + $(LIB_DDU) \ + $(LIB_RUNTIME) + +vboxraw_INCS.darwin = \ + /usr/local/include \ + /usr/local/include/osxfuse + +vboxraw_LIBS.darwin = /usr/local/lib/libosxfuse.dylib +vboxraw_LIBS.linux = fuse +vboxraw_LIBS.freebsd = fuse + +include $(FILE_KBUILD_SUB_FOOTER) Index: /trunk/src/VBox/ImageMounter/vboxraw/vboxraw.cpp =================================================================== --- /trunk/src/VBox/ImageMounter/vboxraw/vboxraw.cpp (revision 75265) +++ /trunk/src/VBox/ImageMounter/vboxraw/vboxraw.cpp (revision 75266) @@ -20,30 +20,15 @@ * Header Files * *********************************************************************************************************************************/ - #define LOG_GROUP LOG_GROUP_DEFAULT /** @todo log group */ -#define VBox_WITH_XPCOM +#define UNUSED(x) (void)(x) #define FUSE_USE_VERSION 27 #if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_FEEBSD) -# define UNIXY +# define UNIX_DERIVATIVE #endif #define MAX_READERS (INT32_MAX / 32) -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include -#ifdef UNIXY +#ifdef UNIX_DERIVATIVE #include #include @@ -57,17 +42,34 @@ # undef PVM /* Blasted old BSD mess still hanging around darwin. */ #endif - -/* - * Include the XPCOM headers - */ +#ifdef RT_OS_LINUX +# include +# include +#endif #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace com; enum { @@ -92,4 +94,5 @@ #define PADMAX 50 #define MAX_ID_LEN 256 +#define CSTR(arg) Utf8Str(arg).c_str() static struct fuse_operations g_vboxrawOps; @@ -103,12 +106,5 @@ char *nsIDToString(nsID *guid); void printErrorInfo(); - /** XPCOM stuff */ -static struct { - nsCOMPtr serviceManager; - nsCOMPtr eventQ; - nsCOMPtr manager; - nsCOMPtr virtualBox; -} g_XPCOM; static struct vboxrawOpts { @@ -118,5 +114,6 @@ uint32_t cHddImageDiffMax; uint32_t fList; - uint32_t fWriteable; + uint32_t fAllowRoot; + uint32_t fRW; uint32_t fVerbose; } g_vboxrawOpts; @@ -126,9 +123,10 @@ static struct fuse_opt vboxrawOptDefs[] = { OPTION("--list", fList, 1), + OPTION("--root", fAllowRoot, 1), OPTION("--vm=%s", pszVm, 0), OPTION("--maxdiff=%d", cHddImageDiffMax, 1), OPTION("--diff=%d", cHddImageDiffMax, 1), OPTION("--image=%s", pszImage, 0), - OPTION("--writable", fWriteable, 1), + OPTION("--rw", fRW, 1), OPTION("--verbose", fVerbose, 1), FUSE_OPT_KEY("-h", USAGE_FLAG), @@ -149,4 +147,6 @@ "%s options:\n" " [--list] List media\n" + " [--root] Same as -o allow_root\n" + " [--rw] writeable (default = readonly)\n" " [--vm ] vm UUID (limit media list to specific VM)\n\n" " [--diff= ] Apply diffs to base image up " @@ -181,5 +181,5 @@ int rc = 0; -#ifdef UNIXY +#ifdef UNIX_DERIVATIVE # ifdef RT_OS_DARWIN notsup = O_APPEND | O_NONBLOCK | O_SYMLINK | O_NOCTTY | O_SHLOCK | O_EXLOCK | @@ -189,5 +189,5 @@ /* | O_LARGEFILE | O_SYNC | ? */ # elif defined(RT_OS_FREEBSD) - notsup = O_APPEND | O_ASYNC | O_DIRECT | O_NOCTTY | O_NOFOLLOW | O_NONBLOCK'; + notsup = O_APPEND | O_ASYNC | O_DIRECT | O_NOCTTY | O_NOFOLLOW | O_NONBLOCK; /* | O_LARGEFILE | O_SYNC | ? */ # endif @@ -199,5 +199,5 @@ rc -EINVAL; -#ifdef UNIXY +#ifdef UNIX_DERIVATIVE if ((pInfo->flags & O_ACCMODE) == O_ACCMODE) rc = -EINVAL; @@ -258,4 +258,17 @@ LogFlowFunc(("\"%s\"\n", pszPath)); return 0; +} + +static int retryableVDRead(PVDISK pvDisk, uint64_t offset, void *pvBuf, size_t cbRead) +{ + int rc = -1; + int cRetry = 5; + do + { + if (cRetry < 5) + Log(("(rc=%d retrying read)\n", rc)); + rc = VDRead(pvDisk, offset, pvBuf, cbRead); + } while (RT_FAILURE(rc) && --cRetry); + return rc; } @@ -295,5 +308,13 @@ if ( !(offset & VBoxRAW_MIN_SIZE_MASK_OFF) && !(cbBuf & VBoxRAW_MIN_SIZE_MASK_OFF)) - rc2 = VDRead(g_pVDisk, offset, pbBuf, cbBuf); + { + rc2 = retryableVDRead(g_pVDisk, offset, pbBuf, cbBuf); + if (RT_FAILURE(rc2)) + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; + } + } else { @@ -305,7 +326,15 @@ { /* a single partial block. */ - rc2 = VDRead(g_pVDisk, offset & VBoxRAW_MIN_SIZE_MASK_BLK, abBlock, VBoxRAW_MIN_SIZE); + rc2 = retryableVDRead(g_pVDisk, offset & VBoxRAW_MIN_SIZE_MASK_BLK, abBlock, VBoxRAW_MIN_SIZE); if (RT_SUCCESS(rc2)) + { memcpy(pbBuf, &abBlock[offset & VBoxRAW_MIN_SIZE_MASK_OFF], cbBuf); + } + else + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; + } } else @@ -315,5 +344,5 @@ if (offset & VBoxRAW_MIN_SIZE_MASK_OFF) { - rc2 = VDRead(g_pVDisk, offset & VBoxRAW_MIN_SIZE_MASK_BLK, abBlock, VBoxRAW_MIN_SIZE); + rc2 = retryableVDRead(g_pVDisk, offset & VBoxRAW_MIN_SIZE_MASK_BLK, abBlock, VBoxRAW_MIN_SIZE); if (RT_SUCCESS(rc2)) { @@ -324,4 +353,10 @@ cbBuf -= cbCopy; } + else + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; + } } @@ -331,5 +366,5 @@ { size_t cbRead = cbBuf & VBoxRAW_MIN_SIZE_MASK_BLK; - rc2 = VDRead(g_pVDisk, offset, pbBuf, cbRead); + rc2 = retryableVDRead(g_pVDisk, offset, pbBuf, cbRead); if (RT_SUCCESS(rc2)) { @@ -337,4 +372,10 @@ offset += cbRead; cbBuf -= cbRead; + } + else + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; } } @@ -345,7 +386,14 @@ if (cbBuf && RT_SUCCESS(rc2)) { - rc2 = VDRead(g_pVDisk, offset, abBlock, VBoxRAW_MIN_SIZE); - if (RT_SUCCESS(rc2)) + rc2 = retryableVDRead(g_pVDisk, offset, abBlock, VBoxRAW_MIN_SIZE); + if (RT_SUCCESS(rc2)) { memcpy(pbBuf, &abBlock[0], cbBuf); + } + else + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; + } } } @@ -356,5 +404,8 @@ rc = cbBuf; else + { rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("Error rc2=%d, rc=%d=%s\n", rc2, rc, strerror(rc))); + } return rc; } @@ -369,4 +420,5 @@ (void) pszPath; (void) pInfo; + AssertReturn((int)cbBuf >= 0, -EINVAL); @@ -375,8 +427,11 @@ AssertReturn((off_t)(offset + cbBuf) >= offset, -EINVAL); + LogFlowFunc(("offset=%#llx size=%#zx path=\"%s\"\n", (uint64_t)offset, cbBuf, pszPath)); int rc; - if ((off_t)(offset + cbBuf) < offset) + if (!g_vboxrawOpts.fRW) + rc = -EPERM; + else if ((off_t)(offset + cbBuf) < offset) rc = -EINVAL; else if (offset >= g_cbPrimary) @@ -396,5 +451,13 @@ if ( !(offset & VBoxRAW_MIN_SIZE_MASK_OFF) && !(cbBuf & VBoxRAW_MIN_SIZE_MASK_OFF)) - rc2 = VDWrite(g_pVDisk, offset, pbBuf, cbBuf); + { + rc2 = VDWrite(g_pVDisk, offset, pbBuf, cbBuf); + if (RT_FAILURE(rc2)) + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; + } + } else { @@ -412,4 +475,16 @@ /* Update the block */ rc2 = VDWrite(g_pVDisk, offset & VBoxRAW_MIN_SIZE_MASK_BLK, abBlock, VBoxRAW_MIN_SIZE); + if (RT_FAILURE(rc2)) + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; + } + } + else + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; } } @@ -429,4 +504,16 @@ cbBuf -= cbCopy; rc2 = VDWrite(g_pVDisk, offset & VBoxRAW_MIN_SIZE_MASK_BLK, abBlock, VBoxRAW_MIN_SIZE); + if (RT_FAILURE(rc2)) + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; + } + } + else + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; } } @@ -443,4 +530,10 @@ offset += cbWrite; cbBuf -= cbWrite; + } + if (RT_FAILURE(rc2)) + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; } } @@ -456,4 +549,16 @@ memcpy(&abBlock[0], pbBuf, cbBuf); rc2 = VDWrite(g_pVDisk, offset, abBlock, VBoxRAW_MIN_SIZE); + if (RT_FAILURE(rc2)) + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; + } + } + else + { + rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("error: rc2=%d, rc=%d, %s\n", rc2, rc, strerror(rc))); + return rc; } } @@ -465,6 +570,9 @@ rc = cbBuf; else + { rc = -RTErrConvertToErrno(rc2); + LogFlowFunc(("Error rc2=%d, rc=%d=%s\n", rc2, rc, strerror(rc))); return rc; + } } return rc; @@ -472,6 +580,6 @@ /** @copydoc fuse_operations::getattr */ -static int vboxrawOp_getattr(const char *pszPath, - struct stat *stbuf) +static int +vboxrawOp_getattr(const char *pszPath, struct stat *stbuf) { int rc = 0; @@ -491,4 +599,6 @@ if (rc < 0) return rc; + + stbuf->st_size = VDGetSize(g_pVDisk, 0); stbuf->st_nlink = 1; } @@ -501,4 +611,6 @@ stbuf->st_mode = S_IFLNK | 0444; stbuf->st_nlink = 1; + stbuf->st_uid = 0; + stbuf->st_gid = 0; } else rc = -ENOENT; @@ -508,5 +620,6 @@ /** @copydoc fuse_operations::readdir */ -static int vboxrawOp_readdir(const char *pszPath, void *pvBuf, fuse_fill_dir_t pfnFiller, +static int +vboxrawOp_readdir(const char *pszPath, void *pvBuf, fuse_fill_dir_t pfnFiller, off_t offset, struct fuse_file_info *pInfo) @@ -543,5 +656,6 @@ /** @copydoc fuse_operations::readlink */ -static int vboxrawOp_readlink(const char *pszPath, char *buf, size_t size) +static int +vboxrawOp_readlink(const char *pszPath, char *buf, size_t size) { (void) pszPath; @@ -550,93 +664,71 @@ } - -static int +static void listMedia(IMachine *pMachine) { - IMediumAttachment **pMediumAttachments = NULL; - PRUint32 pMediumAttachmentsSize = 0; - nsresult rc = pMachine->GetMediumAttachments(&pMediumAttachmentsSize, &pMediumAttachments); - if (NS_SUCCEEDED(rc)) - { - for (PRUint32 i = 0; i < pMediumAttachmentsSize; i++) - { - IMedium *pMedium; - DeviceType_T deviceType; - nsXPIDLString pMediumUuid; - nsXPIDLString pMediumName; - nsXPIDLString pMediumPath; - - pMediumAttachments[i]->GetType(&deviceType); - if (deviceType == DeviceType_HardDisk) - { - rc = pMediumAttachments[i]->GetMedium(&pMedium); - if (NS_SUCCEEDED(rc) && pMedium) - { - IMedium *pParent = pMedium; - IMedium *pEarliestAncestor; - while (pParent != nsnull) - { - pEarliestAncestor = pParent; - pParent->GetParent(&pParent); - } - PRUint32 cChildren = 1; - IMedium **aMediumChildren = nsnull; - IMedium *pChild = pEarliestAncestor; - uint32_t ancestorNumber = 0; - RTPrintf("\n"); - do - { - rc = pChild->GetName(getter_Copies(pMediumName)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "Couldn't access pMedium name rc=%#x\n", rc); - - rc = pChild->GetId(getter_Copies(pMediumUuid)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "Couldn't access pMedium ID rc=%#x\n", rc); - - rc = pChild->GetLocation(getter_Copies(pMediumPath)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "Couldn't access pMedium location rc=%#x\n", rc); - - const char *pszMediumName = ToNewCString(pMediumName); - const char *pszMediumUuid = ToNewCString(pMediumUuid); - const char *pszMediumPath = ToNewCString(pMediumPath); - - if (ancestorNumber == 0) - { - RTPrintf(" -----------------------\n"); - RTPrintf(" HDD base: \"%s\"\n", pszMediumName); - RTPrintf(" UUID: %s\n", pszMediumUuid); - RTPrintf(" Location: %s\n\n", pszMediumPath); - } - else - { - RTPrintf(" Diff %d:\n", ancestorNumber); - RTPrintf(" UUID: %s\n", pszMediumUuid); - RTPrintf(" Location: %s\n\n", pszMediumPath); - } - - free((void*)pszMediumName); - free((void*)pszMediumUuid); - free((void*)pszMediumPath); - - rc = pChild->GetChildren(&cChildren, &aMediumChildren); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "could not get children of media! rc=%#x\n", rc); - - pChild = aMediumChildren[0]; - ++ancestorNumber; - } while(NS_SUCCEEDED(rc) && cChildren); - } - pMedium->Release(); - } + int rc = 0; + com::SafeIfaceArray pMediumAttachments; + + CHECK_ERROR(pMachine, COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(pMediumAttachments))); + for (size_t i = 0; i < pMediumAttachments.size(); i++) + { + ComPtr pMedium; + DeviceType_T deviceType; + Bstr pMediumUuid; + Bstr pMediumName; + Bstr pMediumPath; + + CHECK_ERROR(pMediumAttachments[i], COMGETTER(Type)(&deviceType)); + + if (deviceType == DeviceType_HardDisk) + { + CHECK_ERROR(pMediumAttachments[i], COMGETTER(Medium)(pMedium.asOutParam())); + if (pMedium.isNull()) + return; + + MediumState_T state; + CHECK_ERROR(pMedium, COMGETTER(State)(&state)); + if (FAILED(rc)) + return; + if (state == MediumState_Inaccessible) + { + CHECK_ERROR(pMedium, RefreshState(&state)); + if (FAILED(rc)) + return; + } + + ComPtr pEarliestAncestor; + CHECK_ERROR(pMedium, COMGETTER(Base)(pEarliestAncestor.asOutParam())); + ComPtr pChild = pEarliestAncestor; + uint32_t ancestorNumber = 0; + if (pEarliestAncestor.isNull()) + return; + RTPrintf("\n"); + do + { + com::SafeIfaceArray aMediumChildren; + CHECK_ERROR(pChild, COMGETTER(Name)(pMediumName.asOutParam())); + CHECK_ERROR(pChild, COMGETTER(Id)(pMediumUuid.asOutParam())); + CHECK_ERROR(pChild, COMGETTER(Location)(pMediumPath.asOutParam())); + + if (ancestorNumber == 0) + { + RTPrintf(" -----------------------\n"); + RTPrintf(" HDD base: \"%s\"\n", CSTR(pMediumName)); + RTPrintf(" UUID: %s\n", CSTR(pMediumUuid)); + RTPrintf(" Location: %s\n\n", CSTR(pMediumPath)); + } + else + { + RTPrintf(" Diff %d:\n", ancestorNumber); + RTPrintf(" UUID: %s\n", CSTR(pMediumUuid)); + RTPrintf(" Location: %s\n\n", CSTR(pMediumPath)); + } + CHECK_ERROR_BREAK(pChild, COMGETTER(Children)(ComSafeArrayAsOutParam(aMediumChildren))); + pChild = (aMediumChildren.size()) ? aMediumChildren[0] : NULL; + ++ancestorNumber; + } while(pChild); } } - return rc; - } /** @@ -645,117 +737,74 @@ * @param virtualBox VirtualBox instance object. */ -static int -listVMs(IVirtualBox *virtualBox) -{ - IMachine **ppMachines = NULL; - PRUint32 cMachines = 0; - nsresult rc; - - rc = virtualBox->GetMachines(&cMachines, &ppMachines); - if (NS_SUCCEEDED(rc)) - { - for (PRUint32 i = 0; i < cMachines; ++ i) - { - IMachine *pMachine = ppMachines[i]; - if (pMachine) - { - PRBool isAccessible = PR_FALSE; - pMachine->GetAccessible(&isAccessible); - - if (isAccessible) - { - nsXPIDLString pMachineUuid; - nsXPIDLString pMachineName; - nsXPIDLString pMachinePath; - - rc = pMachine->GetName(getter_Copies(pMachineName)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "Couldn't access pMachine name rc=%#x\n", rc); - - rc = pMachine->GetId(getter_Copies(pMachineUuid)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "Couldn't access pMachine Id rc=%#x\n", rc); - - rc = pMachine->GetStateFilePath(getter_Copies(pMachinePath)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "Couldn't access pMachine Location rc=%#x\n", rc); - - const char *pszMachineName = ToNewCString(pMachineName); - const char *pszMachineUuid = ToNewCString(pMachineUuid); - const char *pszMachinePath = ToNewCString(pMachinePath); - - if ( g_vboxrawOpts.pszVm == NULL - || RTStrNCmp(pszMachineUuid, g_vboxrawOpts.pszVm, MAX_ID_LEN) == 0 - || RTStrNCmp(pszMachineName, g_vboxrawOpts.pszVm, MAX_ID_LEN) == 0) - { - RTPrintf("------------------------------------------------------\n"); - RTPrintf("VM Name: \"%s\"\n", pszMachineName); - RTPrintf("UUID: %s\n", pszMachineUuid); - RTPrintf("Location: %s\n", pszMachinePath); - - rc = listMedia(pMachine); - if (NS_FAILED(rc)) - return rc; - - RTPrintf("\n"); - } - free((void *)pszMachineUuid); - free((void *)pszMachineName); - free((void *)pszMachinePath); - } - pMachine->Release(); +static void +listVMs(IVirtualBox *pVirtualBox) +{ + HRESULT rc = 0; + com::SafeIfaceArray pMachines; + CHECK_ERROR(pVirtualBox, COMGETTER(Machines)(ComSafeArrayAsOutParam(pMachines))); + for (size_t i = 0; i < pMachines.size(); ++i) + { + ComPtr pMachine = pMachines[i]; + if (pMachine) + { + BOOL fAccessible; + CHECK_ERROR(pMachines[i], COMGETTER(Accessible)(&fAccessible)); + if (fAccessible) + { + Bstr pMachineName; + Bstr pMachineUuid; + Bstr pDescription; + Bstr pMachineLocation; + + CHECK_ERROR(pMachine, COMGETTER(Name)(pMachineName.asOutParam())); + CHECK_ERROR(pMachine, COMGETTER(Id)(pMachineUuid.asOutParam())); + CHECK_ERROR(pMachine, COMGETTER(Description)(pDescription.asOutParam())); + CHECK_ERROR(pMachine, COMGETTER(SettingsFilePath)(pMachineLocation.asOutParam())); + + if ( g_vboxrawOpts.pszVm == NULL + || RTStrNCmp(CSTR(pMachineUuid), g_vboxrawOpts.pszVm, MAX_ID_LEN) == 0 + || RTStrNCmp((const char *)pMachineName.raw(), g_vboxrawOpts.pszVm, MAX_ID_LEN) == 0) + { + RTPrintf("------------------------------------------------------\n"); + RTPrintf("VM Name: \"%s\"\n", CSTR(pMachineName)); + RTPrintf("UUID: %s\n", CSTR(pMachineUuid)); + if (*pDescription.raw() != '\0') + RTPrintf("Description: %s\n", CSTR(pDescription)); + RTPrintf("Location: %s\n", CSTR(pMachineLocation)); + + listMedia(pMachine); + + RTPrintf("\n"); + } } } } - return rc; -} - -static int -searchForBaseImage(IVirtualBox *virtualBox, char *pszImageString, IMedium **baseImage) -{ - PRUint32 cDisks; - IMedium **ppDisks; - - nsresult rc = virtualBox->GetHardDisks(&cDisks, &ppDisks); - if (NS_SUCCEEDED(rc)) - { - for (PRUint32 i = 0; i < cDisks && ppDisks[i]; i++) - { - if (ppDisks[i]) - { - nsXPIDLString pMediumUuid; - nsXPIDLString pMediumName; - - rc = ppDisks[i]->GetName(getter_Copies(pMediumName)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "Couldn't access pMedium name rc=%#x\n", rc); - - rc = ppDisks[i]->GetId(getter_Copies(pMediumUuid)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "Couldn't access pMedium Id rc=%#x\n", rc); - - const char *pszMediumName = ToNewCString(pMediumName); - const char *pszMediumUuid = ToNewCString(pMediumUuid); - - if ( RTStrCmp(pszImageString, pszMediumUuid) == 0 - || RTStrCmp(pszImageString, pszMediumName) == 0) - { - *baseImage = ppDisks[i]; - free((void*)pszMediumUuid); - free((void*)pszMediumName); - return rc; - } - ppDisks[i]->Release(); - free((void*)pszMediumUuid); - free((void*)pszMediumName); +} + +static void +searchForBaseImage(IVirtualBox *pVirtualBox, char *pszImageString, ComPtr *pBaseImage) +{ + int rc = 0; + com::SafeIfaceArray aDisks; + + CHECK_ERROR(pVirtualBox, COMGETTER(HardDisks)(ComSafeArrayAsOutParam(aDisks))); + for (size_t i = 0; i < aDisks.size() && aDisks[i]; i++) + { + if (aDisks[i]) + { + Bstr pMediumUuid; + Bstr pMediumName; + + CHECK_ERROR(aDisks[i], COMGETTER(Name)(pMediumName.asOutParam())); + CHECK_ERROR(aDisks[i], COMGETTER(Id)(pMediumUuid.asOutParam())); + + if ( RTStrCmp(pszImageString, CSTR(pMediumUuid)) == 0 + || RTStrCmp(pszImageString, CSTR(pMediumName)) == 0) + { + *pBaseImage = aDisks[i]; + return; } } } - return rc; } @@ -780,5 +829,4 @@ g_vboxrawOps.readdir = vboxrawOp_readdir; g_vboxrawOps.readlink = vboxrawOp_readlink; - struct fuse_args args = FUSE_ARGS_INIT(argc, argv); @@ -786,32 +834,40 @@ rc = fuse_opt_parse(&args, &g_vboxrawOpts, vboxrawOptDefs, vboxrawOptHandler); + if (g_vboxrawOpts.fAllowRoot) + fuse_opt_add_arg(&args, "-oallow_root"); + if (rc == -1) return RTMsgErrorExitFailure("vboxraw: ERROR: Couldn't parse fuse options, rc=%Rrc\n", rc); /* - * Initialize XPCOM to so we can use the API + * Initialize COM. */ - rc = NS_InitXPCOM2(getter_AddRefs(g_XPCOM.serviceManager), nsnull, nsnull); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: ERROR: " - "XPCOM could not be initialized! rc=%#x\n", rc); - - rc = NS_GetMainEventQ(getter_AddRefs(g_XPCOM.eventQ)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: ERROR: " - "could not get main event queue! rc=%#x\n", rc); - - rc = NS_GetComponentManager(getter_AddRefs(g_XPCOM.manager)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: ERROR: " - "couldn't get the component manager! rc=%#x\n", rc); - - rc = g_XPCOM.manager->CreateInstanceByContractID(NS_VIRTUALBOX_CONTRACTID, - nsnull, - NS_GET_IID(IVirtualBox), - getter_AddRefs(g_XPCOM.virtualBox)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: ERROR: " - "could not instantiate VirtualBox object! rc=%#x\n", rc); + using namespace com; + HRESULT hrc = com::Initialize(); + if (FAILED(hrc)) + { +# ifdef VBOX_WITH_XPCOM + if (hrc == NS_ERROR_FILE_ACCESS_DENIED) + { + char szHome[RTPATH_MAX] = ""; + com::GetVBoxUserHomeDirectory(szHome, sizeof(szHome)); + return RTMsgErrorExit(RTEXITCODE_FAILURE, + "Failed to initialize COM because the global settings directory '%s' is not accessible!", szHome); + } +# endif + return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to initialize COM! (hrc=%Rhrc)", hrc); + } + + /* + * Get the remote VirtualBox object and create a local session object. + */ + ComPtr pVirtualBoxClient; + ComPtr pVirtualBox; + + hrc = pVirtualBoxClient.createInprocObject(CLSID_VirtualBoxClient); + if (SUCCEEDED(hrc)) + hrc = pVirtualBoxClient->COMGETTER(VirtualBox)(pVirtualBox.asOutParam()); + if (FAILED(hrc)) + return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to get IVirtualBox object! (hrc=%Rhrc)", hrc); if (g_vboxrawOpts.fVerbose) @@ -819,19 +875,20 @@ if (g_vboxrawOpts.fList) - return listVMs(g_XPCOM.virtualBox); + { + listVMs(pVirtualBox); + return 0; + } if (g_vboxrawOpts.pszImage == NULL) + { RTMsgErrorExitFailure("vboxraw: ERROR: " "Must provide at at least --list or --image option\n"); - - IMedium *pBaseImageMedium = NULL; + return 0; + } + ComPtr pBaseImageMedium = NULL; char *pszFormat; VDTYPE enmType; - rc = searchForBaseImage(g_XPCOM.virtualBox, g_vboxrawOpts.pszImage, &pBaseImageMedium); - if (NS_FAILED(rc)) - RTMsgErrorExitFailure("vboxraw: ERROR: " - "Couldn't locate base image \"%s\"\n", g_vboxrawOpts.pszImage); - + searchForBaseImage(pVirtualBox, g_vboxrawOpts.pszImage, &pBaseImageMedium); if (pBaseImageMedium == NULL) { @@ -844,26 +901,7 @@ return cbNameMax; - char *pszBounceA = (char *)RTMemAlloc(cbNameMax + 1); - if (!pszBounceA) - return VERR_NO_MEMORY; - memset(pszBounceA, 0, cbNameMax + 1); - - char *pszBounceB = (char *)RTMemAlloc(cbNameMax + 1); - if (!pszBounceB) - return VERR_NO_MEMORY; - memset(pszBounceB, 0, cbNameMax + 1); - - RTStrCopy(pszBounceA, cbNameMax, g_vboxrawOpts.pszImage); - while (readlink(pszBounceA, pszBounceB, cbNameMax) >= 0) - RTStrCopy(pszBounceA, cbNameMax, pszBounceB); - - free(g_vboxrawOpts.pszImage); - - g_pszBaseImagePath = RTStrDup(pszBounceA); + g_pszBaseImagePath = RTStrDup(g_vboxrawOpts.pszImage); if (g_pszBaseImagePath == NULL) return RTMsgErrorExitFailure("vboxraw: out of memory\n"); - - RTMemFree(pszBounceA); - RTMemFree(pszBounceB); if (access(g_pszBaseImagePath, F_OK) < 0) @@ -875,5 +913,5 @@ "Virtual disk image not readable: \"%s\"\n", g_pszBaseImagePath); - if ( g_vboxrawOpts.fWriteable && access(g_vboxrawOpts.pszImage, W_OK) < 0) + if ( g_vboxrawOpts.fRW && access(g_vboxrawOpts.pszImage, W_OK) < 0) return RTMsgErrorExitFailure("vboxraw: ERROR: " "Virtual disk image not writeable: \"%s\"\n", g_pszBaseImagePath); @@ -889,5 +927,5 @@ g_pszBaseImageName = g_u.split.apszComps[g_u.split.cComps - 1]; - rc = searchForBaseImage(g_XPCOM.virtualBox, g_pszBaseImageName, &pBaseImageMedium); + searchForBaseImage(pVirtualBox, g_pszBaseImageName, &pBaseImageMedium); if (pBaseImageMedium == NULL) @@ -923,45 +961,22 @@ if (g_pVDisk == NULL) { - IMedium **aMediumChildren = nsnull; - IMedium *pChild = pBaseImageMedium; - PRUint32 cChildren; + com::SafeIfaceArray aMediumChildren; + ComPtr pChild = pBaseImageMedium; uint32_t diffNumber = 0; /* diff # 0 = base image */ - do { - nsXPIDLString pMediumUuid; - nsXPIDLString pMediumName; - nsXPIDLString pMediumPath; - - rc = pChild->GetName(getter_Copies(pMediumName)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "Couldn't access pMedium name rc=%#x\n", rc); - - rc = pChild->GetId(getter_Copies(pMediumUuid)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "Couldn't access pMedium ID rc=%#x\n", rc); - - rc = pChild->GetLocation(getter_Copies(pMediumPath)); - if (NS_FAILED(rc)) - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "Couldn't access pMedium location rc=%#x\n", rc); - - const char *pszMediumName = ToNewCString(pMediumName); - const char *pszMediumUuid = ToNewCString(pMediumUuid); - const char *pszMediumPath = ToNewCString(pMediumPath); + Bstr pMediumName; + Bstr pMediumPath; + + CHECK_ERROR(pChild, COMGETTER(Name)(pMediumName.asOutParam())); + CHECK_ERROR(pChild, COMGETTER(Location)(pMediumPath.asOutParam())); if (pChild == pBaseImageMedium) { free((void *)g_pszBaseImageName); - g_pszBaseImageName = RTStrDup(pszMediumName); + g_pszBaseImageName = RTStrDup(CSTR(pMediumName)); free((void *)g_pszBaseImagePath); - g_pszBaseImagePath = RTStrDup(pszMediumPath); - - free((void *)pszMediumUuid); - free((void *)pszMediumName); - + g_pszBaseImagePath = RTStrDup(CSTR(pMediumPath)); if (g_pszBaseImageName == NULL) return RTMsgErrorExitFailure("vboxraw: out of memory\n"); @@ -977,5 +992,4 @@ return RTMsgErrorExitFailure("vboxraw: VDGetFormat(,,%s,,) " "failed (during HDD container creation), rc=%Rrc\n", g_pszBaseImagePath, rc); - if (g_vboxrawOpts.fVerbose) RTPrintf("vboxraw: Creating container for base image of format %s\n", pszFormat); @@ -986,9 +1000,4 @@ return RTMsgErrorExitFailure("vboxraw: ERROR: Couldn't create virtual disk container\n"); } - else - { - free((void *)pszMediumUuid); - free((void *)pszMediumName); - } if ( g_vboxrawOpts.cHddImageDiffMax != 0 && diffNumber > g_vboxrawOpts.cHddImageDiffMax) break; @@ -998,32 +1007,30 @@ if (diffNumber == 0) RTPrintf("\nvboxraw: Opening base image into container:\n %s\n", - pszMediumPath); + g_pszBaseImagePath); else RTPrintf("\nvboxraw: Opening difference image #%d into container:\n %s\n", - diffNumber, pszMediumPath); - } - - rc = VDOpen(g_pVDisk, pszFormat, pszMediumPath, 0, NULL /* pVDIfsImage */); + diffNumber, g_pszBaseImagePath); + } + + rc = VDOpen(g_pVDisk, pszFormat, g_pszBaseImagePath, 0, NULL /* pVDIfsImage */); if (RT_FAILURE(rc)) { VDClose(g_pVDisk, false /* fDeletes */); - free((void *)pszMediumPath); - return RTMsgErrorExitFailure("vboxraw: VDOpen(,,%s,,) failed, rc=%Rrc\n", pszMediumPath, rc); - } - - rc = pChild->GetChildren(&cChildren, &aMediumChildren); - if (NS_FAILED(rc)) - { - free((void *)pszMediumPath); - return RTMsgErrorExitFailure("vboxraw: VBox API/XPCOM ERROR: " - "Couldn't get children of medium, rc=%Rrc\n", pszMediumPath, rc); - } - - pChild = aMediumChildren[0]; + return RTMsgErrorExitFailure("vboxraw: VDOpen(,,%s,,) failed, rc=%Rrc\n", + g_pszBaseImagePath, rc); + } + + CHECK_ERROR(pChild, COMGETTER(Children)(ComSafeArrayAsOutParam(aMediumChildren))); + + if (aMediumChildren.size() != 0) { + pChild = aMediumChildren[0]; + } + + aMediumChildren.setNull(); + ++diffNumber; - free((void *)pszMediumPath); - - - } while(NS_SUCCEEDED(rc) && cChildren); + + + } while(NS_SUCCEEDED(rc) && aMediumChildren.size()); }