VFS: move VFS settings to seperate file

rpcs3/Emu/CMakeLists.txt

@@ -7,6 +7,7 @@
     system_config_types.cpp
     system_progress.cpp
     system_utils.cpp
+    vfs_config.cpp
     VFS.cpp
     GDB.cpp
     title.cpp

rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "overlay_controls.h"
-#include "Emu/system_config.h"
+#include "Emu/vfs_config.h"
 
 #ifndef _WIN32
 #include <unistd.h>
@@ -121,8 +121,8 @@ namespace rsx
 				result.lookup_font_dirs[0] += "/.fonts/";
 #endif
 			// Search dev_flash for the font too
-			result.lookup_font_dirs.push_back(g_cfg.vfs.get_dev_flash() + "data/font/");
+			result.lookup_font_dirs.push_back(g_cfg_vfs.get_dev_flash() + "data/font/");
-			result.lookup_font_dirs.push_back(g_cfg.vfs.get_dev_flash() + "data/font/SONY-CC/");
+			result.lookup_font_dirs.push_back(g_cfg_vfs.get_dev_flash() + "data/font/SONY-CC/");
 
 			switch (class_)
 			{

rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "overlay_user_list_dialog.h"
-#include "Emu/system_config.h"
+#include "Emu/vfs_config.h"
 #include "Emu/system_utils.hpp"
 #include "Utilities/StrUtil.h"
 #include "Utilities/Thread.h"
@@ -170,7 +170,7 @@ namespace rsx
 					}
 
 					// Let's assume there are 26 avatar pngs (like in my installation)
-					const std::string avatar_path = g_cfg.vfs.get_dev_flash() + fmt::format("vsh/resource/explore/user/%03d.png", id % 26);
+					const std::string avatar_path = g_cfg_vfs.get_dev_flash() + fmt::format("vsh/resource/explore/user/%03d.png", id % 26);
 					const std::string username = file.to_string();
 					std::unique_ptr<overlay_element> entry = std::make_unique<user_list_entry>(username, user_id, avatar_path);
 					entries.emplace_back(std::move(entry));

rpcs3/Emu/System.cpp

@@ -6,6 +6,7 @@
 #include "Emu/system_progress.hpp"
 #include "Emu/system_utils.hpp"
 #include "Emu/perf_meter.hpp"
+#include "Emu/vfs_config.h"
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
@@ -137,6 +138,7 @@ void Emulator::Init(bool add_only)
 	g_fxo->reset();
 
 	// Reset defaults, cache them
+	g_cfg_vfs.from_default();
 	g_cfg.from_default();
 	g_cfg.name.clear();
 
@@ -149,6 +151,9 @@ void Emulator::Init(bool add_only)
 
 	g_cfg_defaults = g_cfg.to_string();
 
+	// Load VFS config
+	g_cfg_vfs.load();
+
 	// Load config file
 	if (m_config_mode == cfg_mode::config_override)
 	{
@@ -201,11 +206,11 @@ void Emulator::Init(bool add_only)
 	// Create directories (can be disabled if necessary)
 	const std::string emu_dir = rpcs3::utils::get_emu_dir();
 	const std::string dev_hdd0 = rpcs3::utils::get_hdd0_dir();
-	const std::string dev_hdd1 = g_cfg.vfs.get(g_cfg.vfs.dev_hdd1, emu_dir);
+	const std::string dev_hdd1 = g_cfg_vfs.get(g_cfg_vfs.dev_hdd1, emu_dir);
-	const std::string dev_usb = g_cfg.vfs.get(g_cfg.vfs.dev_usb000, emu_dir);
+	const std::string dev_usb = g_cfg_vfs.get(g_cfg_vfs.dev_usb000, emu_dir);
-	const std::string dev_flsh = g_cfg.vfs.get_dev_flash();
+	const std::string dev_flsh = g_cfg_vfs.get_dev_flash();
-	const std::string dev_flsh2 = g_cfg.vfs.get_dev_flash2();
+	const std::string dev_flsh2 = g_cfg_vfs.get_dev_flash2();
-	const std::string dev_flsh3 = g_cfg.vfs.get_dev_flash3();
+	const std::string dev_flsh3 = g_cfg_vfs.get_dev_flash3();
 
 	auto make_path_verbose = [](const std::string& path)
 	{
@@ -731,7 +736,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
 
 		if (!add_only)
 		{
-			bdvd_dir = g_cfg.vfs.dev_bdvd;
+			bdvd_dir = g_cfg_vfs.dev_bdvd;
 
 			if (!bdvd_dir.empty() && bdvd_dir.back() != fs::delim[0] && bdvd_dir.back() != fs::delim[1])
 			{
@@ -747,13 +752,13 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
 		}
 
 		// Mount default relative path to non-existent directory
-		vfs::mount("/dev_hdd0", g_cfg.vfs.get(g_cfg.vfs.dev_hdd0, emu_dir));
+		vfs::mount("/dev_hdd0", g_cfg_vfs.get(g_cfg_vfs.dev_hdd0, emu_dir));
-		vfs::mount("/dev_flash", g_cfg.vfs.get_dev_flash());
+		vfs::mount("/dev_flash", g_cfg_vfs.get_dev_flash());
-		vfs::mount("/dev_flash2", g_cfg.vfs.get_dev_flash2());
+		vfs::mount("/dev_flash2", g_cfg_vfs.get_dev_flash2());
-		vfs::mount("/dev_flash3", g_cfg.vfs.get_dev_flash3());
+		vfs::mount("/dev_flash3", g_cfg_vfs.get_dev_flash3());
-		vfs::mount("/dev_usb", g_cfg.vfs.get(g_cfg.vfs.dev_usb000, emu_dir));
+		vfs::mount("/dev_usb", g_cfg_vfs.get(g_cfg_vfs.dev_usb000, emu_dir));
-		vfs::mount("/dev_usb000", g_cfg.vfs.get(g_cfg.vfs.dev_usb000, emu_dir));
+		vfs::mount("/dev_usb000", g_cfg_vfs.get(g_cfg_vfs.dev_usb000, emu_dir));
-		vfs::mount("/app_home", g_cfg.vfs.app_home.to_string().empty() ? elf_dir + '/' : g_cfg.vfs.get(g_cfg.vfs.app_home, emu_dir));
+		vfs::mount("/app_home", g_cfg_vfs.app_home.to_string().empty() ? elf_dir + '/' : g_cfg_vfs.get(g_cfg_vfs.app_home, emu_dir));
 
 		if (!hdd1.empty())
 		{
@@ -803,7 +808,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
 				if (m_title_id.empty())
 				{
 					// Check if we are trying to scan vsh/module
-					const std::string vsh_path = g_cfg.vfs.get_dev_flash() + "vsh/module";
+					const std::string vsh_path = g_cfg_vfs.get_dev_flash() + "vsh/module";
 
 					if (IsPathInsideDir(m_path, vsh_path))
 					{
@@ -895,12 +900,12 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
 		const std::string hdd0_game = vfs::get("/dev_hdd0/game/");
 		const std::string hdd0_disc = vfs::get("/dev_hdd0/disc/");
 		const bool from_hdd0_game   = IsPathInsideDir(m_path, hdd0_game);
-		const bool from_dev_flash   = IsPathInsideDir(m_path, g_cfg.vfs.get_dev_flash());
+		const bool from_dev_flash   = IsPathInsideDir(m_path, g_cfg_vfs.get_dev_flash());
 
 #ifdef _WIN32
 		// m_path might be passed from command line with differences in uppercase/lowercase on windows.
 		if ((!from_hdd0_game && IsPathInsideDir(fmt::to_lower(m_path), fmt::to_lower(hdd0_game))) ||
-			(!from_dev_flash && IsPathInsideDir(fmt::to_lower(m_path), fmt::to_lower(g_cfg.vfs.get_dev_flash()))))
+			(!from_dev_flash && IsPathInsideDir(fmt::to_lower(m_path), fmt::to_lower(g_cfg_vfs.get_dev_flash()))))
 		{
 			// Let's just abort to prevent errors down the line.
 			sys_log.error("The boot path seems to contain incorrectly cased characters. Please adjust the path and try again.");
@@ -1329,7 +1334,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
 				else if (from_dev_flash)
 				{
 					// Firmware executables
-					argv[0] = "/dev_flash" + resolved_path.substr(GetCallbacks().resolve_path(g_cfg.vfs.get_dev_flash()).size());
+					argv[0] = "/dev_flash" + resolved_path.substr(GetCallbacks().resolve_path(g_cfg_vfs.get_dev_flash()).size());
 					m_dir = fs::get_parent_dir(argv[0]) + '/';
 				}
 				else if (g_cfg.vfs.host_root)
@@ -1417,7 +1422,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
 			return game_boot_result::invalid_file_or_folder;
 		}
 
-		if (ppu_exec == elf_error::ok && !fs::is_file(g_cfg.vfs.get_dev_flash() + "sys/external/liblv2.sprx"))
+		if (ppu_exec == elf_error::ok && !fs::is_file(g_cfg_vfs.get_dev_flash() + "sys/external/liblv2.sprx"))
 		{
 			const auto libs = g_cfg.core.libraries_control.get_set();
 

rpcs3/Emu/system_config.cpp

@@ -1,7 +1,5 @@
 #include "stdafx.h"
 #include "system_config.h"
-#include "Utilities/StrUtil.h"
-#include "Utilities/StrFmt.h"
 
 #include "util/sysinfo.hpp"
 
@@ -11,44 +9,3 @@ bool cfg_root::node_core::has_rtm()
 {
 	return utils::has_rtm();
 }
-
-std::string cfg_root::node_vfs::get(const cfg::string& _cfg, std::string_view emu_dir) const
-{
-	std::string _emu_dir; // Storage only
-
-	if (emu_dir.empty())
-	{
-		// Optimization if provided arg
-		_emu_dir = emulator_dir;
-
-		if (_emu_dir.empty())
-		{
-			_emu_dir = fs::get_config_dir() + '/';
-		}
-		// Check if path does not end with a delimiter
-		else if (_emu_dir.back() != fs::delim[0] && _emu_dir.back() != fs::delim[1])
-		{
-			_emu_dir += '/';
-		}
-
-		emu_dir = _emu_dir;
-	}
-
-	std::string path = _cfg.to_string();
-
-	if (path.empty())
-	{
-		// Fallback
-		path = _cfg.def;
-	}
-
-	path = fmt::replace_all(path, "$(EmulatorDir)", emu_dir);
-
-	// Check if path does not end with a delimiter
-	if (path.back() != fs::delim[0] && path.back() != fs::delim[1])
-	{
-		path += '/';
-	}
-
-	return path;
-}

rpcs3/Emu/system_config.h

@@ -85,33 +85,6 @@ struct cfg_root : cfg::node
 	{
 		node_vfs(cfg::node* _this) : cfg::node(_this, "VFS") {}
 
-		std::string get(const cfg::string&, std::string_view emu_dir = {}) const;
-
-		cfg::string emulator_dir{ this, "$(EmulatorDir)" }; // Default (empty): taken from fs::get_config_dir()
-		cfg::string dev_hdd0{ this, "/dev_hdd0/", "$(EmulatorDir)dev_hdd0/" };
-		cfg::string dev_hdd1{ this, "/dev_hdd1/", "$(EmulatorDir)dev_hdd1/" };
-		cfg::string dev_flash{ this, "/dev_flash/", "$(EmulatorDir)dev_flash/" };
-		cfg::string dev_flash2{ this, "/dev_flash2/", "$(EmulatorDir)dev_flash2/" };
-		cfg::string dev_flash3{ this, "/dev_flash3/", "$(EmulatorDir)dev_flash3/" };
-		cfg::string dev_usb000{ this, "/dev_usb000/", "$(EmulatorDir)dev_usb000/" };
-		cfg::string dev_bdvd{ this, "/dev_bdvd/" }; // Not mounted
-		cfg::string app_home{ this, "/app_home/" }; // Not mounted
-
-		std::string get_dev_flash() const
-		{
-			return get(dev_flash);
-		}
-
-		std::string get_dev_flash2() const
-		{
-			return get(dev_flash2);
-		}
-
-		std::string get_dev_flash3() const
-		{
-			return get(dev_flash3);
-		}
-
 		cfg::_bool host_root{ this, "Enable /host_root/" };
 		cfg::_bool init_dirs{ this, "Initialize Directories", true };
 

rpcs3/Emu/system_utils.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "system_utils.hpp"
 #include "system_config.h"
+#include "vfs_config.h"
 #include "Emu/Io/pad_config.h"
 #include "util/sysinfo.hpp"
 #include "Utilities/File.h"
@@ -116,18 +117,18 @@ namespace rpcs3::utils
 
 	std::string get_emu_dir()
 	{
-		const std::string& emu_dir_ = g_cfg.vfs.emulator_dir;
+		const std::string& emu_dir_ = g_cfg_vfs.emulator_dir;
 		return emu_dir_.empty() ? fs::get_config_dir() : emu_dir_;
 	}
 
 	std::string get_hdd0_dir()
 	{
-		return g_cfg.vfs.get(g_cfg.vfs.dev_hdd0, get_emu_dir());
+		return g_cfg_vfs.get(g_cfg_vfs.dev_hdd0, get_emu_dir());
 	}
 
 	std::string get_hdd1_dir()
 	{
-		return g_cfg.vfs.get(g_cfg.vfs.dev_hdd1, get_emu_dir());
+		return g_cfg_vfs.get(g_cfg_vfs.dev_hdd1, get_emu_dir());
 	}
 
 	std::string get_cache_dir()

rpcs3/Emu/vfs_config.cpp

@@ -0,0 +1,93 @@
+#include "stdafx.h"
+#include "vfs_config.h"
+#include "Utilities/StrUtil.h"
+#include "Utilities/StrFmt.h"
+#include "util/yaml.hpp"
+
+LOG_CHANNEL(vfs_log, "VFS");
+
+cfg_vfs g_cfg_vfs{};
+
+std::string cfg_vfs::get(const cfg::string& _cfg, std::string_view emu_dir) const
+{
+	std::string _emu_dir; // Storage only
+
+	if (emu_dir.empty())
+	{
+		// Optimization if provided arg
+		_emu_dir = emulator_dir;
+
+		if (_emu_dir.empty())
+		{
+			_emu_dir = fs::get_config_dir() + '/';
+		}
+		// Check if path does not end with a delimiter
+		else if (_emu_dir.back() != fs::delim[0] && _emu_dir.back() != fs::delim[1])
+		{
+			_emu_dir += '/';
+		}
+
+		emu_dir = _emu_dir;
+	}
+
+	std::string path = _cfg.to_string();
+
+	if (path.empty())
+	{
+		// Fallback
+		path = _cfg.def;
+	}
+
+	path = fmt::replace_all(path, "$(EmulatorDir)", emu_dir);
+
+	// Check if path does not end with a delimiter
+	if (path.back() != fs::delim[0] && path.back() != fs::delim[1])
+	{
+		path += '/';
+	}
+
+	return path;
+}
+
+void cfg_vfs::load()
+{
+	if (fs::file cfg_file{cfg_vfs::get_path(), fs::read})
+	{
+		from_string(cfg_file.to_string());
+	}
+}
+
+void cfg_vfs::save() const
+{
+#ifdef _WIN32
+	const std::string path_to_cfg = fs::get_config_dir() + "config/";
+	if (!fs::create_path(path_to_cfg))
+	{
+		vfs_log.error("Could not create path: %s", path_to_cfg);
+	}
+#endif
+
+	fs::pending_file temp(cfg_vfs::get_path());
+
+	if (!temp.file)
+	{
+		vfs_log.error("Could not save config: \"%s\"", cfg_vfs::get_path());
+		return;
+	}
+
+	temp.file.write(to_string());
+
+	if (!temp.commit())
+	{
+		vfs_log.error("Could not save config: \"%s\" (error=%s)", cfg_vfs::get_path(), fs::g_tls_error);
+	}
+}
+
+std::string cfg_vfs::get_path()
+{
+#ifdef _WIN32
+	return fs::get_config_dir() + "config/vfs.yml";
+#else
+	return fs::get_config_dir() + "vfs.yml";
+#endif
+}

rpcs3/Emu/vfs_config.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#include "Utilities/Config.h"
+
+struct cfg_vfs : cfg::node
+{
+	std::string get(const cfg::string&, std::string_view emu_dir = {}) const;
+	void load();
+	void save() const;
+	static std::string get_path();
+
+	cfg::string emulator_dir{ this, "$(EmulatorDir)" }; // Default (empty): taken from fs::get_config_dir()
+	cfg::string dev_hdd0{ this, "/dev_hdd0/", "$(EmulatorDir)dev_hdd0/" };
+	cfg::string dev_hdd1{ this, "/dev_hdd1/", "$(EmulatorDir)dev_hdd1/" };
+	cfg::string dev_flash{ this, "/dev_flash/", "$(EmulatorDir)dev_flash/" };
+	cfg::string dev_flash2{ this, "/dev_flash2/", "$(EmulatorDir)dev_flash2/" };
+	cfg::string dev_flash3{ this, "/dev_flash3/", "$(EmulatorDir)dev_flash3/" };
+	cfg::string dev_usb000{ this, "/dev_usb000/", "$(EmulatorDir)dev_usb000/" };
+	cfg::string dev_bdvd{ this, "/dev_bdvd/" }; // Not mounted
+	cfg::string app_home{ this, "/app_home/" }; // Not mounted
+
+	std::string get_dev_flash() const
+	{
+		return get(dev_flash);
+	}
+
+	std::string get_dev_flash2() const
+	{
+		return get(dev_flash2);
+	}
+
+	std::string get_dev_flash3() const
+	{
+		return get(dev_flash3);
+	}
+};
+
+extern cfg_vfs g_cfg_vfs;

rpcs3/emucore.vcxproj

@@ -95,6 +95,7 @@
     <ClCompile Include="Emu\NP\signaling_handler.cpp" />
     <ClCompile Include="Emu\NP\np_structs_extra.cpp" />
     <ClCompile Include="Emu\NP\rpcn_client.cpp" />
+    <ClCompile Include="Emu\vfs_config.cpp" />
     <ClCompile Include="util\atomic.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
@@ -489,6 +490,7 @@
     <ClInclude Include="Emu\title.h" />
     <ClInclude Include="Emu\system_config.h" />
     <ClInclude Include="Emu\system_config_types.h" />
+    <ClInclude Include="Emu\vfs_config.h" />
     <ClInclude Include="Loader\mself.hpp" />
     <ClInclude Include="util\atomic.hpp" />
     <ClInclude Include="util\media_utils.h" />

rpcs3/emucore.vcxproj.filters

@@ -1006,6 +1006,9 @@
     <ClCompile Include="Emu\Audio\audio_device_listener.cpp">
       <Filter>Emu\Audio</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\vfs_config.cpp">
+      <Filter>Emu</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">
@@ -1984,6 +1987,9 @@
     <ClInclude Include="Emu\Audio\audio_device_listener.h">
       <Filter>Emu\Audio</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\vfs_config.h">
+      <Filter>Emu</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="Emu\RSX\Common\Interpreter\FragmentInterpreter.glsl">

rpcs3/rpcs3qt/emu_settings.cpp

@@ -268,8 +268,6 @@ void emu_settings::SaveSettings()
 	}
 	else
 	{
-		// VFS paths are being controlled mainly by the main config (needs manual modification for customization of custom configs)
-		m_current_settings.remove("VFS");
 		config_name = rpcs3::utils::get_custom_config_path(m_title_id);
 	}
 

rpcs3/rpcs3qt/emu_settings_type.h

@@ -154,15 +154,6 @@ enum class emu_settings_type
 	LimitCacheSize,
 	MaximumCacheSize,
 	ConsoleTimeOffset,
-
-	// Virtual File System
-	emulatorLocation,
-	dev_hdd0Location,
-	dev_hdd1Location,
-	dev_flashLocation,
-	dev_flash2Location,
-	dev_flash3Location,
-	dev_usb000Location,
 };
 
 /** A helper map that keeps track of where a given setting type is located*/
@@ -317,13 +308,4 @@ inline static const QMap<emu_settings_type, cfg_location> settings_location =
 	{ emu_settings_type::LimitCacheSize,        { "VFS", "Limit disk cache size"}},
 	{ emu_settings_type::MaximumCacheSize,      { "VFS", "Disk cache maximum size (MB)"}},
 	{ emu_settings_type::ConsoleTimeOffset,     { "System", "Console time offset (s)"}},
-
-	// Virtual File System
-	{ emu_settings_type::emulatorLocation,   { "VFS", "$(EmulatorDir)"}},
-	{ emu_settings_type::dev_hdd0Location,   { "VFS", "/dev_hdd0/" }},
-	{ emu_settings_type::dev_hdd1Location,   { "VFS", "/dev_hdd1/" }},
-	{ emu_settings_type::dev_flashLocation,  { "VFS", "/dev_flash/"}},
-	{ emu_settings_type::dev_flash2Location, { "VFS", "/dev_flash2/"}},
-	{ emu_settings_type::dev_flash3Location, { "VFS", "/dev_flash3/"}},
-	{ emu_settings_type::dev_usb000Location, { "VFS", "/dev_usb000/"}},
 };

rpcs3/rpcs3qt/game_list_frame.cpp

@@ -16,7 +16,7 @@
 
 #include "Emu/Memory/vm.h"
 #include "Emu/System.h"
-#include "Emu/system_config.h"
+#include "Emu/vfs_config.h"
 #include "Emu/system_utils.hpp"
 #include "Loader/PSF.h"
 #include "util/types.hpp"
@@ -1630,7 +1630,7 @@ bool game_list_frame::RemoveSPUCache(const std::string& base_dir, bool is_intera
 
 void game_list_frame::BatchCreatePPUCaches()
 {
-	const std::string vsh_path = g_cfg.vfs.get_dev_flash() + "vsh/module/";
+	const std::string vsh_path = g_cfg_vfs.get_dev_flash() + "vsh/module/";
 	const bool vsh_exists = fs::is_file(vsh_path + "vsh.self");
 	const u32 total = m_game_data.size() + (vsh_exists ? 1 : 0);
 

rpcs3/rpcs3qt/gui_application.cpp

@@ -18,6 +18,7 @@
 #include "Emu/Cell/Modules/cellAudio.h"
 #include "Emu/RSX/Overlays/overlay_perf_metrics.h"
 #include "Emu/system_utils.hpp"
+#include "Emu/vfs_config.h"
 #include "trophy_notification_helper.h"
 #include "save_data_dialog.h"
 #include "msg_dialog_frame.h"
@@ -513,7 +514,7 @@ void gui_application::OnChangeStyleSheetRequest()
 			const QString config_dir = qstr(fs::get_config_dir());
 
 			// Add PS3 fonts
-			QDirIterator ps3_font_it(qstr(g_cfg.vfs.get_dev_flash() + "data/font/"), QStringList() << "*.ttf", QDir::Files, QDirIterator::Subdirectories);
+			QDirIterator ps3_font_it(qstr(g_cfg_vfs.get_dev_flash() + "data/font/"), QStringList() << "*.ttf", QDir::Files, QDirIterator::Subdirectories);
 			while (ps3_font_it.hasNext())
 				QFontDatabase::addApplicationFont(ps3_font_it.next());
 

rpcs3/rpcs3qt/main_window.cpp

@@ -42,7 +42,7 @@
 #include "rpcs3_version.h"
 #include "Emu/IdManager.h"
 #include "Emu/VFS.h"
-#include "Emu/system_config.h"
+#include "Emu/vfs_config.h"
 #include "Emu/system_utils.hpp"
 
 #include "Crypto/unpkg.h"
@@ -239,7 +239,7 @@ bool main_window::Init(bool with_cli_boot)
 #endif
 
 	// Disable vsh if not present.
-	ui->bootVSHAct->setEnabled(fs::is_file(g_cfg.vfs.get_dev_flash() + "vsh/module/vsh.self"));
+	ui->bootVSHAct->setEnabled(fs::is_file(g_cfg_vfs.get_dev_flash() + "vsh/module/vsh.self"));
 
 	return true;
 }
@@ -476,7 +476,7 @@ void main_window::BootGame()
 void main_window::BootVSH()
 {
 	gui_log.notice("Booting from BootVSH...");
-	Boot(g_cfg.vfs.get_dev_flash() + "/vsh/module/vsh.self");
+	Boot(g_cfg_vfs.get_dev_flash() + "/vsh/module/vsh.self");
 }
 
 void main_window::BootRsxCapture(std::string path)
@@ -1133,7 +1133,7 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString&
 	pdlg.show();
 
 	// Used by tar_object::extract() as destination directory
-	vfs::mount("/dev_flash", g_cfg.vfs.get_dev_flash());
+	vfs::mount("/dev_flash", g_cfg_vfs.get_dev_flash());
 
 	// Synchronization variable
 	atomic_t<uint> progress(0);
@@ -1213,7 +1213,7 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString&
 
 	if (progress == update_filenames.size())
 	{
-		ui->bootVSHAct->setEnabled(fs::is_file(g_cfg.vfs.get_dev_flash() + "/vsh/module/vsh.self"));
+		ui->bootVSHAct->setEnabled(fs::is_file(g_cfg_vfs.get_dev_flash() + "/vsh/module/vsh.self"));
 
 		gui_log.success("Successfully installed PS3 firmware version %s.", version_string);
 		m_gui_settings->ShowInfoBox(tr("Success!"), tr("Successfully installed PS3 firmware and LLE Modules!"), gui::ib_pup_success, this);
@@ -1232,7 +1232,7 @@ void main_window::DecryptSPRXLibraries()
 	if (!fs::is_dir(sstr(path_last_sprx)))
 	{
 		// Default: redirect to userland firmware SPRX directory
-		path_last_sprx = qstr(g_cfg.vfs.get_dev_flash() + "sys/external");
+		path_last_sprx = qstr(g_cfg_vfs.get_dev_flash() + "sys/external");
 	}
 
 	const QStringList modules = QFileDialog::getOpenFileNames(this, tr("Select binary files"), path_last_sprx, tr("All Binaries (*.bin *.BIN *.self *.SELF *.sprx *.SPRX);;BIN files (*.bin *.BIN);;SELF files (*.self *.SELF);;SPRX files (*.sprx *.SPRX);;All files (*.*)"));
@@ -2079,7 +2079,7 @@ void main_window::CreateConnects()
 	{
 		vfs_dialog dlg(m_gui_settings, m_emu_settings, this);
 		dlg.exec();
-		ui->bootVSHAct->setEnabled(fs::is_file(g_cfg.vfs.get_dev_flash() + "vsh/module/vsh.self")); // dev_flash may have changed. Disable vsh if not present.
+		ui->bootVSHAct->setEnabled(fs::is_file(g_cfg_vfs.get_dev_flash() + "vsh/module/vsh.self")); // dev_flash may have changed. Disable vsh if not present.
 		m_game_list_frame->Refresh(true); // dev_hdd0 may have changed. Refresh just in case.
 	});
 
@@ -2679,7 +2679,7 @@ void main_window::CreateFirmwareCache()
 	Emu.Stop();
 	Emu.SetForceBoot(true);
 
-	if (const game_boot_result error = Emu.BootGame(g_cfg.vfs.get_dev_flash() + "sys", "", true);
+	if (const game_boot_result error = Emu.BootGame(g_cfg_vfs.get_dev_flash() + "sys", "", true);
 		error != game_boot_result::no_errors)
 	{
 		gui_log.error("Creating firmware cache failed: reason: %s", error);

rpcs3/rpcs3qt/vfs_dialog.cpp

@@ -1,7 +1,6 @@
 #include "vfs_dialog.h"
 #include "vfs_dialog_tab.h"
 #include "gui_settings.h"
-#include "emu_settings_type.h"
 
 #include <QTabWidget>
 #include <QDialogButtonBox>
@@ -10,7 +9,7 @@
 #include <QVBoxLayout>
 
 #include "Emu/System.h"
-#include "Emu/system_config.h"
+#include "Emu/vfs_config.h"
 
 inline std::string sstr(const QString& _in) { return _in.toStdString(); }
 
@@ -20,29 +19,29 @@ vfs_dialog::vfs_dialog(std::shared_ptr<gui_settings> guiSettings, std::shared_pt
 	QTabWidget* tabs = new QTabWidget();
 	tabs->setUsesScrollButtons(false);
 
-	m_emu_settings->LoadSettings();
+	g_cfg_vfs.load();
 
 	// Create tabs
-	vfs_dialog_tab* emulator_tab = new vfs_dialog_tab({ "$(EmulatorDir)", emu_settings_type::emulatorLocation, gui::fs_emulator_dir_list, &g_cfg.vfs.emulator_dir },
+	vfs_dialog_tab* emulator_tab = new vfs_dialog_tab({ "$(EmulatorDir)", gui::fs_emulator_dir_list, &g_cfg_vfs.emulator_dir },
-		m_gui_settings, m_emu_settings, this);
+		m_gui_settings, this);
 
-	vfs_dialog_tab* dev_hdd0_tab = new vfs_dialog_tab({ "dev_hdd0", emu_settings_type::dev_hdd0Location, gui::fs_dev_hdd0_list, &g_cfg.vfs.dev_hdd0 },
+	vfs_dialog_tab* dev_hdd0_tab = new vfs_dialog_tab({ "dev_hdd0", gui::fs_dev_hdd0_list, &g_cfg_vfs.dev_hdd0 },
-		m_gui_settings, m_emu_settings, this);
+		m_gui_settings, this);
 
-	vfs_dialog_tab* dev_hdd1_tab = new vfs_dialog_tab({ "dev_hdd1", emu_settings_type::dev_hdd1Location, gui::fs_dev_hdd1_list, &g_cfg.vfs.dev_hdd1 },
+	vfs_dialog_tab* dev_hdd1_tab = new vfs_dialog_tab({ "dev_hdd1", gui::fs_dev_hdd1_list, &g_cfg_vfs.dev_hdd1 },
-		m_gui_settings, m_emu_settings, this);
+		m_gui_settings, this);
 
-	vfs_dialog_tab* dev_flash_tab = new vfs_dialog_tab({ "dev_flash", emu_settings_type::dev_flashLocation, gui::fs_dev_flash_list, &g_cfg.vfs.dev_flash },
+	vfs_dialog_tab* dev_flash_tab = new vfs_dialog_tab({ "dev_flash", gui::fs_dev_flash_list, &g_cfg_vfs.dev_flash },
-		m_gui_settings, m_emu_settings, this);
+		m_gui_settings, this);
 
-	vfs_dialog_tab* dev_flash2_tab = new vfs_dialog_tab({ "dev_flash2", emu_settings_type::dev_flash2Location, gui::fs_dev_flash2_list, &g_cfg.vfs.dev_flash2 },
+	vfs_dialog_tab* dev_flash2_tab = new vfs_dialog_tab({ "dev_flash2", gui::fs_dev_flash2_list, &g_cfg_vfs.dev_flash2 },
-		m_gui_settings, m_emu_settings, this);
+		m_gui_settings, this);
 
-	vfs_dialog_tab* dev_flash3_tab = new vfs_dialog_tab({ "dev_flash3", emu_settings_type::dev_flash3Location, gui::fs_dev_flash3_list, &g_cfg.vfs.dev_flash3 },
+	vfs_dialog_tab* dev_flash3_tab = new vfs_dialog_tab({ "dev_flash3", gui::fs_dev_flash3_list, &g_cfg_vfs.dev_flash3 },
-		m_gui_settings, m_emu_settings, this);
+		m_gui_settings, this);
 
-	vfs_dialog_tab* dev_usb000_tab = new vfs_dialog_tab({ "dev_usb000", emu_settings_type::dev_usb000Location, gui::fs_dev_usb000_list, &g_cfg.vfs.dev_usb000 },
+	vfs_dialog_tab* dev_usb000_tab = new vfs_dialog_tab({ "dev_usb000", gui::fs_dev_usb000_list, &g_cfg_vfs.dev_usb000 },
-		m_gui_settings, m_emu_settings, this);
+		m_gui_settings, this);
 
 	tabs->addTab(emulator_tab, "$(EmulatorDir)");
 	tabs->addTab(dev_hdd0_tab, "dev_hdd0");
@@ -75,7 +74,8 @@ vfs_dialog::vfs_dialog(std::shared_ptr<gui_settings> guiSettings, std::shared_pt
 			{
 				static_cast<vfs_dialog_tab*>(tabs->widget(i))->SetSettings();
 			}
-			m_emu_settings->SaveSettings();
+
+			g_cfg_vfs.save();
 
 			// Recreate folder structure for new VFS paths
 			if (Emu.IsStopped())

rpcs3/rpcs3qt/vfs_dialog_tab.cpp

@@ -6,10 +6,11 @@
 #include <QHBoxLayout>
 #include <QPushButton>
 
+constexpr auto qstr = QString::fromStdString;
 inline std::string sstr(const QString& _in) { return _in.toStdString(); }
 
-vfs_dialog_tab::vfs_dialog_tab(vfs_settings_info settingsInfo, std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, QWidget* parent)
+vfs_dialog_tab::vfs_dialog_tab(vfs_settings_info settingsInfo, std::shared_ptr<gui_settings> guiSettings, QWidget* parent)
-	: QWidget(parent), m_info(std::move(settingsInfo)), m_gui_settings(std::move(guiSettings)), m_emu_settings(std::move(emuSettings))
+	: QWidget(parent), m_info(std::move(settingsInfo)), m_gui_settings(std::move(guiSettings))
 {
 	m_dir_dist = new QListWidget(this);
 
@@ -77,7 +78,6 @@ void vfs_dialog_tab::SetSettings() const
 
 	const std::string new_dir = m_selected_config_label->text() == EmptyPath ? "" : sstr(m_selected_config_label->text());
 	m_info.cfg_node->from_string(new_dir);
-	m_emu_settings->SetSetting(m_info.settingLoc, new_dir);
 }
 
 void vfs_dialog_tab::Reset() const

rpcs3/rpcs3qt/vfs_dialog_tab.h

@@ -3,8 +3,6 @@
 #include "util/types.hpp"
 
 #include "gui_settings.h"
-#include "emu_settings.h"
-#include "emu_settings_type.h"
 
 #include <QListWidget>
 #include <QLabel>
@@ -19,7 +17,6 @@ namespace cfg
 struct vfs_settings_info
 {
 	QString name; // name of tab
-	emu_settings_type settingLoc; // Where the setting is saved in emu_settings
 	gui_save listLocation; // Where the list of dir options are saved
 	cfg::string* cfg_node; // Needed since emu_settings overrides settings file and doesn't touch g_cfg currently.
 };
@@ -29,7 +26,7 @@ class vfs_dialog_tab : public QWidget
 	Q_OBJECT
 
 public:
-	explicit vfs_dialog_tab(vfs_settings_info info, std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, QWidget* parent = nullptr);
+	explicit vfs_dialog_tab(vfs_settings_info info, std::shared_ptr<gui_settings> guiSettings, QWidget* parent = nullptr);
 
 	void SetSettings() const;
 
@@ -44,7 +41,6 @@ private:
 
 	vfs_settings_info m_info;
 	std::shared_ptr<gui_settings> m_gui_settings;
-	std::shared_ptr<emu_settings> m_emu_settings;
 
 	// UI variables needed in higher scope
 	QListWidget* m_dir_dist;

rpcs3/util/sysinfo.cpp

@@ -1,7 +1,7 @@
 #include "util/sysinfo.hpp"
 #include "Utilities/StrFmt.h"
 #include "Utilities/File.h"
-#include "Emu/system_config.h"
+#include "Emu/vfs_config.h"
 #include "Utilities/Thread.h"
 
 #ifdef _WIN32
@@ -241,7 +241,7 @@ std::string utils::get_system_info()
 
 std::string utils::get_firmware_version()
 {
-	const std::string file_path = g_cfg.vfs.get_dev_flash() + "vsh/etc/version.txt";
+	const std::string file_path = g_cfg_vfs.get_dev_flash() + "vsh/etc/version.txt";
 	if (fs::file version_file{file_path})
 	{
 		const std::string version_str = version_file.to_string();