Skip to content

[Mac OS X] Fix sys_ss_random_number_generator & cleanup some dead code #19382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elad335 merged 3 commits into from
Sep 2, 2026
+9 −9
Merged

[Mac OS X] Fix sys_ss_random_number_generator & cleanup some dead code #19382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d513db1
[Mac OS X] Fix sys_ss_random_number_generator & cleanup some dead code
schm1dtmac Sep 2, 2026
f12b878
Update disk path validation for Mac OS X
elad335 Sep 2, 2026
56f7213
Address review
schm1dtmac Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Utilities/File.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,13 +1224,21 @@ bool fs::is_optical_raw_device(const std::string& path)
}

return false;
#else
#ifdef __APPLE__
// On Mac OS X optical disks will only ever be mounted under /dev/disk(whatever), similar for raw devices,
// so reject anything not containing the disk string.
if (!path.starts_with("/dev/disk") && !path.starts_with("/dev/rdisk"))
{
return false;
}
#else
// Skip a useless check if the path cannot point to a device node (device nodes always live in "/dev")
if (!path.starts_with("/dev/"))
{
return false;
}

#endif
struct ::stat file_info;

if (::stat(path.c_str(), &file_info) != 0)
Expand Down
8 changes: 0 additions & 8 deletions rpcs3/rpcs3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,14 +655,6 @@ int run_rpcs3(int argc, char** argv)
}
#endif

#if defined(__APPLE__) && defined(__x86_64__)
if (const utils::OS_version os = utils::get_OS_version();
os.version_major == 14 && os.version_minor < 3 && (utils::get_cpu_brand().rfind("VirtualApple", 0) == 0))
{
report_fatal_error(fmt::format("RPCS3 requires macOS 14.3.0 or later.\nYou're currently using macOS %i.%i.%i.\nPlease update macOS from System Settings.\n\n", os.version_major, os.version_minor, os.version_patch));
}
#endif

ensure(thread_ctrl::is_main(), "Not main thread");

// Initialize thread pool finalizer (on first use)
Expand Down
Loading