Get rid of Parallels word in source code #PSBM-102329

OpenVZ · Mar 26, 2020 · 88eb2ab · 88eb2ab
1 parent 89e1823
commit 88eb2ab
Show file tree

Hide file tree

Showing 304 changed files with 957 additions and 957 deletions.
diff --git a/Build/Branding.incl b/Build/Branding.incl
@@ -1,5 +1,5 @@
 #define VER_SHORTPRODUCTNAME_STR_PS "Virtuozzo Server"
-#define VER_COMPANYNAME_STR "Parallels International GmbH"
-#define VER_COMPANYNAME_REGISTRYBRANCH_STR "Parallels"
-#define VER_LEGALTRADEMARKS_STR "Parallels is a trademark of " VER_COMPANYNAME_STR
+#define VER_COMPANYNAME_STR "Virtuozzo International GmbH"
+#define VER_COMPANYNAME_REGISTRYBRANCH_STR "Virtuozzo"
+#define VER_LEGALTRADEMARKS_STR "Virtuozzo is a trademark of " VER_COMPANYNAME_STR
 #define VER_WEBSITE_STR "virtuozzo.com"
diff --git a/Build/LinUtil/files/prl_prelink.conf b/Build/LinUtil/files/prl_prelink.conf
@@ -1,5 +1,5 @@
-# Parallels prelink conf
--b /usr/lib{,64}/parallels-server
+# Virtuozzo prelink conf
+-b /usr/lib{,64}/virtuozzo-server
 -b /usr/lib{,64}/libprl*
 -b /usr/{,s}bin/prl*
 
diff --git a/Build/LinUtil/files/rc.sysinit.vz b/Build/LinUtil/files/rc.sysinit.vz
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 VTD_MODULE=prl_vtdhook
-VTD_CONFIG=/etc/parallels/vtd.hook
+VTD_CONFIG=/etc/virtuozzo/vtd.hook
 
 if [ -f $VTD_CONFIG ]; then
        modprobe $VTD_MODULE `cat $VTD_CONFIG`

diff --git a/Build/qmake/build_target.pri b/Build/qmake/build_target.pri
@@ -44,7 +44,7 @@ isEmpty(NON_SUBDIRS) {
 
 _TARGET_IS_SET = 1
 
-!include(../../Parallels.pri): error(Cannot include Parallels.pri)
+!include(../../Virtuozzo.pri): error(Cannot include Virtuozzo.pri)
 
 equals(TEMPLATE, subdirs) {
 	win32-msvc2013: wdkruntime: isEmpty(_msvcrt_compat_internal) {

diff --git a/Build/qmake/common.pri b/Build/qmake/common.pri
@@ -27,7 +27,7 @@ isEmpty(__COMMON_PRI__) {
 	__COMMON_PRI__ = 1
 	equals(TARGET, bin) | equals(TARGET, lib): error(TARGET has unacceptable name $$TARGET)
 
-	include(../../Parallels.pri)
+	include(../../Virtuozzo.pri)
 
 	# ROOT = $$PWD
 	# BUILD_DIR = $$ROOT/build

diff --git a/Dispatcher/Dispatcher.pro b/Dispatcher/Dispatcher.pro
@@ -118,7 +118,7 @@ HEADERS += \
 	Tasks/Task_DeleteVm_p.h \
 	Tasks/Task_FileSystemEntriesOperations.h \
 	Tasks/Task_GetFileSystemEntries.h \
-	Tasks/Task_GetInfoFromParallelsUtils.h \
+	Tasks/Task_GetInfoFromVirtuozzoUtils.h \
 	Tasks/Task_RegisterVm.h \
 	Tasks/Task_SearchLostConfigs.h \
 	Tasks/Task_UpdateCommonPrefs.h \
@@ -244,7 +244,7 @@ SOURCES += \
 	Tasks/Task_DeleteVm.cpp \
 	Tasks/Task_FileSystemEntriesOperations.cpp \
 	Tasks/Task_GetFileSystemEntries.cpp \
-	Tasks/Task_GetInfoFromParallelsUtils.cpp \
+	Tasks/Task_GetInfoFromVirtuozzoUtils.cpp \
 	Tasks/Task_ManagePrlNetService.cpp \
 	Tasks/Task_RegisterVm.cpp \
 	Tasks/Task_SearchLostConfigs.cpp \

diff --git a/Dispatcher/Dispatcher/CDspAccessManager.cpp b/Dispatcher/Dispatcher/CDspAccessManager.cpp
@@ -30,7 +30,7 @@
 #include "Libraries/PrlCommonUtils/CFileHelper.h"
 #include <prlcommon/HostUtils/HostUtils.h>
 
-#include <prlcommon/Interfaces/ParallelsQt.h>
+#include <prlcommon/Interfaces/VirtuozzoQt.h>
 #include <prlcommon/Logging/Logging.h>
 #include <prlcommon/PrlCommonUtilsBase/SysError.h>
 #include <prlxmlmodel/VmConfig/CVmConfiguration.h>
@@ -710,7 +710,7 @@ CDspAccessManager::setFullAccessRightsToVm( SmartPtr<CDspClient> pSession
 			throw err;
 
 		// set perm to scripts
-		QString scriptsDir = ParallelsDirs::getVmScriptsDir( strVmDirPath );
+		QString scriptsDir = VirtuozzoDirs::getVmScriptsDir( strVmDirPath );
 		if( CFileHelper::DirectoryExists(scriptsDir, &pSession->getAuthHelper()) )
 		{
 			CAuth::AccessMode otherScripts = CAuth::fileMayRead;

diff --git a/Dispatcher/Dispatcher/CDspBackupDevice.cpp b/Dispatcher/Dispatcher/CDspBackupDevice.cpp
@@ -35,11 +35,11 @@
 #include "Libraries/PrlCommonUtils/CFileHelper.h"
 #include "Libraries/DispToDispProtocols/CVmBackupProto.h"
 #include "prlxmlmodel/VmConfig/CVmConfiguration.h"
-#include "prlxmlmodel/ParallelsObjects/CXmlModelHelper.h"
-#include <prlcommon/Interfaces/ParallelsDispToDispProto.h>
+#include "prlxmlmodel/VirtuozzoObjects/CXmlModelHelper.h"
+#include <prlcommon/Interfaces/VirtuozzoDispToDispProto.h>
 #include "Libraries/Buse/Buse.h"
 
-using namespace Parallels;
+using namespace Virtuozzo;
 
 namespace Backup
 {

diff --git a/Dispatcher/Dispatcher/CDspBugPatcherLogic.cpp b/Dispatcher/Dispatcher/CDspBugPatcherLogic.cpp
@@ -44,7 +44,7 @@
 #include <prlxmlmodel/VmConfig/CVmConfiguration.h>
 #include <prlxmlmodel/VmConfig/CVmSoundInputs.h>
 #include <prlxmlmodel/VmConfig/CVmSoundOutputs.h>
-#include <prlxmlmodel/ParallelsObjects/CVmProfileHelper.h>
+#include <prlxmlmodel/VirtuozzoObjects/CVmProfileHelper.h>
 
 #include <prlcommon/Logging/Logging.h>
 #include <prlcommon/Std/PrlAssert.h>
@@ -53,7 +53,7 @@
 #include "Libraries/PrlCommonUtils/CFileHelper.h"
 #include <prlcommon/PrlCommonUtilsBase/CHardDiskHelper.h>
 
-#include <prlcommon/Interfaces/ParallelsSdkPrivate.h>
+#include <prlcommon/Interfaces/VirtuozzoSdkPrivate.h>
 
 #include "Tasks/Mixin_CreateHddSupport.h"
 #include "Tasks/Task_ManagePrlNetService.h"
@@ -376,7 +376,7 @@ void CDspBugPatcherLogic::patchDefaultVmDirectoryPath()
 	// 1. replace default path for default vm directory
 	// 2. fix default path in users vm directories if they have path which equals path to common vm directory
 
-	QString sDefaultSharedVmCataloguePath =  ParallelsDirs::getCommonDefaultVmCatalogue();
+	QString sDefaultSharedVmCataloguePath =  VirtuozzoDirs::getCommonDefaultVmCatalogue();
 	//////////////////////////////////////////////////////////////////////////
 	// 1. set default path for default vm directory
 	QString sDirUuid = CDspService::instance()->getDispConfigGuard()

diff --git a/Dispatcher/Dispatcher/CDspClient.cpp b/Dispatcher/Dispatcher/CDspClient.cpp
@@ -45,7 +45,7 @@
 #include <prlcommon/Std/PrlAssert.h>
 #include "Libraries/PrlCommonUtils/CFileHelper.h"
 
-using namespace Parallels;
+using namespace Virtuozzo;
 
 #define TIMEOUT_CLIENT_MSEC		100
 

diff --git a/Dispatcher/Dispatcher/CDspClient.h b/Dispatcher/Dispatcher/CDspClient.h
@@ -38,7 +38,7 @@
 #include <QHash>
 
 #include "CVmIdent.h"
-#include <prlcommon/Interfaces/ParallelsNamespace.h>
+#include <prlcommon/Interfaces/VirtuozzoNamespace.h>
 #include "Libraries/PrlCommonUtils/CAuthHelper.h"
 #include <prlxmlmodel/DispConfig/CDispUser.h>
 #include <prlxmlmodel/UserInformation/SessionInfo.h>
@@ -47,7 +47,7 @@
 #include <prlcommon/ProtoSerializer/CProtoSerializer.h>
 
 using namespace IOService;
-using Parallels::CProtoCommandPtr;
+using Virtuozzo::CProtoCommandPtr;
 
 class CDspClient;
 

diff --git a/Dispatcher/Dispatcher/CDspClientManager.cpp b/Dispatcher/Dispatcher/CDspClientManager.cpp
@@ -51,7 +51,7 @@
 #include "CDspVzHelper.h"
 #include "CVmValidateConfig.h"
 
-using namespace Parallels;
+using namespace Virtuozzo;
 
 /*****************************************************************************/
 

diff --git a/Dispatcher/Dispatcher/CDspDispConfigGuard.cpp b/Dispatcher/Dispatcher/CDspDispConfigGuard.cpp
@@ -35,7 +35,7 @@
 #include "CDspDispConfigGuard.h"
 #include <prlcommon/PrlCommonUtilsBase/SysError.h>
 #include <prlcommon/PrlCommonUtilsBase/PrlStringifyConsts.h>
-#include <prlcommon/PrlCommonUtilsBase/ParallelsDirs.h>
+#include <prlcommon/PrlCommonUtilsBase/VirtuozzoDirs.h>
 
 // By adding this interface we enable allocations tracing in the module
 #include "Interfaces/Debug.h"
@@ -62,7 +62,7 @@ void CDspDispConfigGuard::enableCrashSafeMech()
 
 PRL_RESULT  CDspDispConfigGuard::saveConfig( bool bNoSaveNetwork )
 {
-	QString path = ParallelsDirs::getDispatcherConfigFilePath();
+	QString path = VirtuozzoDirs::getDispatcherConfigFilePath();
 	return saveConfig( path, bNoSaveNetwork );
 }
 

diff --git a/Dispatcher/Dispatcher/CDspDispConnection.h b/Dispatcher/Dispatcher/CDspDispConnection.h
@@ -38,7 +38,7 @@
 #include "CDspClient.h"
 #include "Libraries/DispToDispProtocols/CDispToDispCommonProto.h"
 
-using namespace Parallels;
+using namespace Virtuozzo;
 
 class CDspDispConnection : public QObject
 {

diff --git a/Dispatcher/Dispatcher/CDspDispConnectionsManager.cpp b/Dispatcher/Dispatcher/CDspDispConnectionsManager.cpp
@@ -47,7 +47,7 @@
 
 #include "CDspVzHelper.h"
 
-using namespace Parallels;
+using namespace Virtuozzo;
 
 namespace
 {

diff --git a/Dispatcher/Dispatcher/CDspLibvirt.cpp b/Dispatcher/Dispatcher/CDspLibvirt.cpp
@@ -552,7 +552,7 @@ void Script::syncNetwork(const QFileInfo& config_)
 	if (d.exists())
 		return;
 
-	CParallelsNetworkConfig f;
+	CVirtuozzoNetworkConfig f;
 	PRL_RESULT e = PrlNet::ReadNetworkConfig(f);
 	if (PRL_ERR_FILE_NOT_FOUND == e)
 		PrlNet::FillDefaultConfiguration(&f);
@@ -735,7 +735,7 @@ void Subject::run()
 	u.setLink(m_link);
 	Host::Script h(u);
 	h.syncCpu("/usr/share/libvirt/cpu_map.xml");
-	h.syncNetwork(ParallelsDirs::getNetworkConfigFilePath());
+	h.syncNetwork(VirtuozzoDirs::getNetworkConfigFilePath());
 	(Vm(v))(u);
 	QProcess::startDetached("/usr/libexec/vz_systemd");
 }

diff --git a/Dispatcher/Dispatcher/CDspLibvirtAgent.cpp b/Dispatcher/Dispatcher/CDspLibvirtAgent.cpp
@@ -2992,7 +2992,7 @@ Prl::Expected<CVirtualNetwork, ::Error::Simple>
 		Prl::Expected<Libvirt::Instrument::Agent::Interface::Bridge, ::Error::Simple>
 			b = bridges_.findByName(z->getBridgeName());
 		output.getHostOnlyNetwork()->
-			getParallelsAdapter()->setName(z->getBridgeName());
+			getVirtuozzoAdapter()->setName(z->getBridgeName());
 		if (b.isSucceed())
 		{
 			output.setBoundCardMac(b.value().getMaster().getMacAddress());

diff --git a/Dispatcher/Dispatcher/CDspProblemReportHelper.cpp b/Dispatcher/Dispatcher/CDspProblemReportHelper.cpp
@@ -39,7 +39,7 @@
 #include <QMap>
 #include <QtAlgorithms>
 #include "CDspClientManager.h"
-#include <prlcommon/Interfaces/ParallelsNamespace.h>
+#include <prlcommon/Interfaces/VirtuozzoNamespace.h>
 #include <prlsdk/PrlEventsValues.h>
 #include <prlsdk/PrlEnums.h>
 #include <prlcommon/ProtoSerializer/CProtoSerializer.h>
@@ -62,7 +62,7 @@
 #include <prlcommon/HostUtils/HostUtils.h>
 #include <prlcommon/PrlCommonUtilsBase/CSimpleFileHelper.h>
 #include "Libraries/PrlCommonUtils/CFileHelper.h"
-#include <prlcommon/PrlCommonUtilsBase/ParallelsDirsDefs.h>
+#include <prlcommon/PrlCommonUtilsBase/VirtuozzoDirsDefs.h>
 
 #ifdef _WIN_
 #include <prlcommon/PrlCommonUtilsBase/countof.h>
@@ -655,7 +655,7 @@ static void addSysrqTriggerToReport( CProblemReport & cReport )
 #endif // 0
 
 static void addCrashDumpsToReport( CProblemReport & cReport,
-								  const ParallelsDirs::UserInfo* pUserInfo,
+								  const VirtuozzoDirs::UserInfo* pUserInfo,
 								  unsigned maxDumpsCount)
 {
 	unsigned dumpsAdded = 0;
@@ -664,7 +664,7 @@ static void addCrashDumpsToReport( CProblemReport & cReport,
 		QStringList crashDirList;
 
 		(void)pUserInfo;
-		crashDirList << ParallelsDirs::getCrashDumpsPath();
+		crashDirList << VirtuozzoDirs::getCrashDumpsPath();
 		QStringList strLogs = CDspVmDirHelper::getListOfLastCrashedLogs( crashDirList );
 
 		for (int i = 0 ; i < strLogs.size() ; i++)
@@ -783,9 +783,9 @@ void CDspProblemReportHelper::FillVmProblemReportData
 	PRL_ASSERT( !strVmHome.isEmpty() );
 	QString strVmDir = CFileHelper::GetFileRoot( strVmHome );
 
-	QString strParallelsLogPath = getVmLogPath( strVmDir );
+	QString strVirtuozzoLogPath = getVmLogPath( strVmDir );
 	WRITE_REPORT_PROFILER_STRING( "addVmLog" );
-	cReport.appendTemplateSystemLog( strParallelsLogPath, "vm.log", 2 );
+	cReport.appendTemplateSystemLog( strVirtuozzoLogPath, "vm.log", 2 );
 
 	QString strReconfigLogPath = getVmReconfigLogPath( strVmDir );
 	WRITE_REPORT_PROFILER_STRING( "addVmReconfigLog" );
@@ -829,7 +829,7 @@ void CDspProblemReportHelper::FillVmProblemReportData
 	// Add Guest Os Information
 	//
 	CVmGuestOsInformation vmGuestOsInfo;
-	const QString sPath = ParallelsDirs::getVmInfoPath( CFileHelper::GetFileRoot( strVmHome ) );
+	const QString sPath = VirtuozzoDirs::getVmInfoPath( CFileHelper::GetFileRoot( strVmHome ) );
 	SmartPtr<CVmInfo> pVmInfo = CDspVmInfoDatabase::readVmInfo( sPath );
 	if ( pVmInfo && pVmInfo->getGuestOsInformation() )
 		vmGuestOsInfo = *(pVmInfo->getGuestOsInformation());
@@ -871,14 +871,14 @@ void CDspProblemReportHelper::FillProblemReportData
 	INIT_PROBLEM_REPORT_PROFILER_TIME
 
 	CAuthHelperImpersonateWrapperPtr pImpersonate;
-	ParallelsDirs::UserInfo info, *pUserInfo = 0;
+	VirtuozzoDirs::UserInfo info, *pUserInfo = 0;
 
 	const bool bVerboseLog = CDspService::instance()->getDispConfigGuard().
 		getDispCommonPrefs()->getDebug()->isVerboseLogEnabled();
 
 	if ( pUser.isValid() )
 	{
-		pUserInfo = &(info = pUser->getAuthHelper().getParallelsDirUserInfo());
+		pUserInfo = &(info = pUser->getAuthHelper().getVirtuozzoDirUserInfo());
 		pImpersonate = CAuthHelperImpersonateWrapper::create( &pUser->getAuthHelper() );
 	}
 
@@ -1129,7 +1129,7 @@ SmartPtr<CPackedProblemReport> CDspProblemReportHelper::getProblemReportObj(
 		pUser->sendSimpleResponse(p, PRL_ERR_FAILURE);
 		return SmartPtr<CPackedProblemReport>();
 	}
-	QString c = ParallelsDirs::getCommonDefaultVmCatalogue();
+	QString c = VirtuozzoDirs::getCommonDefaultVmCatalogue();
 	if (!CFileHelper::WriteDirectory(c, &pUser->getAuthHelper()))
 	{
 		pUser->sendSimpleResponse(p, PRL_ERR_FAILURE);
@@ -1319,7 +1319,7 @@ void CDspProblemReportHelper::AddGuestCrashDumps( CProblemReport & cReport, cons
 	if ( sVmHome.isEmpty() )
 		return;
 
-	const QString dumpsDirPath = ParallelsDirs::getVmGuestCrashDumpsDir( sVmHome );
+	const QString dumpsDirPath = VirtuozzoDirs::getVmGuestCrashDumpsDir( sVmHome );
 	WRITE_TRACE( DBG_DEBUG, "Searching guest crash dumps in \"%s\"",
 				 QSTR2UTF8( dumpsDirPath ) );
 	const QDir::Filters dumpsFilter = QDir::Files | QDir::NoSymLinks | QDir::Hidden;
@@ -1389,7 +1389,7 @@ void CDspProblemReportHelper::AddProcsMiniDumps(CProblemReport & cReport,
 
 #ifdef _WIN_
 
-	QString tmpPath = ParallelsDirs::getSystemTempDir();
+	QString tmpPath = VirtuozzoDirs::getSystemTempDir();
 	PRL_ASSERT(!tmpPath.isEmpty());
 	PRL_ASSERT(QDir(tmpPath).exists());
 
@@ -1410,7 +1410,7 @@ void CDspProblemReportHelper::AddProcsMiniDumps(CProblemReport & cReport,
 				break;
 
 			DWORD dwPid = (DWORD)pid.toULong();
-			QString procDumpTool = ParallelsDirs::getProcDumpToolPath(WinDbgUtils::Is64BitProc(dwPid));
+			QString procDumpTool = VirtuozzoDirs::getProcDumpToolPath(WinDbgUtils::Is64BitProc(dwPid));
 			QString dumpFilepath = QString("%1\\%2_%3.dmp").arg(tmpPath).arg(procName).arg(pid);
 
 			if (!QFile::exists(procDumpTool))

diff --git a/Dispatcher/Dispatcher/CDspProblemReportHelper.h b/Dispatcher/Dispatcher/CDspProblemReportHelper.h
@@ -36,7 +36,7 @@
 #include "Libraries/ProblemReportUtils/CProblemReportUtils.h"
 #include <prlcommon/Std/SmartPtr.h>
 #include <prlcommon/IOService/IOCommunication/IOServer.h>
-#include <prlcommon/PrlCommonUtilsBase/ParallelsDirs.h>
+#include <prlcommon/PrlCommonUtilsBase/VirtuozzoDirs.h>
 #include "CDspClient.h"
 #include "CDspVm.h"
 

diff --git a/Dispatcher/Dispatcher/CDspRegistry.cpp b/Dispatcher/Dispatcher/CDspRegistry.cpp
@@ -43,7 +43,7 @@
 #include <boost/functional/factory.hpp>
 #include <boost/phoenix/core/argument.hpp>
 #include <boost/phoenix/core/reference.hpp>
-#include <prlxmlmodel/ParallelsObjects/CXmlModelHelper.h>
+#include <prlxmlmodel/VirtuozzoObjects/CXmlModelHelper.h>
 #include "CDspVmGuestPersonality.h"
 #ifdef _LIBVIRT_
 #include "CDspLibvirt.h"

diff --git a/Dispatcher/Dispatcher/CDspRouter.cpp b/Dispatcher/Dispatcher/CDspRouter.cpp
@@ -31,7 +31,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "CDspRouter.h"
-#include <prlcommon/Interfaces/ParallelsNamespace.h>
+#include <prlcommon/Interfaces/VirtuozzoNamespace.h>
 
 #include <prlcommon/Logging/Logging.h>