-
-
Notifications
You must be signed in to change notification settings - Fork 231
Add macOS disk resize support #678
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.
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
Open
balcsida
wants to merge
15
commits into
insidegui:main
Choose a base branch
from
balcsida:feat/macos-disk-resize-compact
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
5e770da
feat(storage): add disk image resize engine
balcsida 66d3eb7
feat(resize): run disk resizing before startup
balcsida 5e9a160
feat(ui): add managed disk resize controls
balcsida a48b16c
style(config): modernize disk image switches
balcsida af64b7f
refactor(storage): move disk resize VM helpers
balcsida af58f4b
fix(resize): report startup resize failures
balcsida d5f1e92
refactor(ui): pass VM into disk image editor
balcsida 50c843d
chore(ui): note resize slider extraction
balcsida c64df7c
style(ui): modernize disk editor messages
balcsida bda6568
fix(ui): allow resizable boot disk settings
balcsida 8b3adac
chore(xcode): add project file modifications
balcsida 74a2f41
style(ui): soften resizable disk indicator
balcsida a28d965
feat(resize): support ASIF disk expansion
balcsida 8ffd7b6
fix(resize): select backing disk on attach
balcsida 01c5a43
fix(resize): finish partial disk expansion
balcsida File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
112 changes: 112 additions & 0 deletions
112
VirtualCore/Source/Models/VBVirtualMachine+DiskResize.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| // | ||
| // VBVirtualMachine+DiskResize.swift | ||
| // VirtualCore | ||
| // | ||
| // Created by VirtualBuddy on 25/05/26. | ||
| // | ||
|
|
||
| import Foundation | ||
| import OSLog | ||
|
|
||
| private let diskResizeLogger = Logger(for: VBVirtualMachine.self, label: "DiskResize") | ||
|
|
||
| public extension VBVirtualMachine { | ||
|
|
||
| typealias DiskResizeProgressHandler = @MainActor (_ message: String) -> Void | ||
|
|
||
| /// Checks if any disk images need resizing based on configuration vs actual size | ||
| func checkAndResizeDiskImages(progressHandler: DiskResizeProgressHandler? = nil) async throws { | ||
| let config = configuration | ||
|
|
||
| func report(_ message: String) async { | ||
| guard let progressHandler else { return } | ||
| await MainActor.run { | ||
| progressHandler(message) | ||
| } | ||
| } | ||
|
|
||
| let resizableDevices = config.hardware.storageDevices.compactMap { device -> (VBStorageDevice, VBManagedDiskImage)? in | ||
| guard case .managedImage(let image) = device.backing else { return nil } | ||
| guard image.canBeResized else { return nil } | ||
| return (device, image) | ||
| } | ||
|
|
||
| guard !resizableDevices.isEmpty else { | ||
| await report("Disk images already match their configured sizes.") | ||
| return | ||
| } | ||
|
|
||
| let formatter: ByteCountFormatter = { | ||
| let formatter = ByteCountFormatter() | ||
| formatter.allowedUnits = [.useGB, .useMB, .useTB] | ||
| formatter.countStyle = .binary | ||
| formatter.includesUnit = true | ||
| return formatter | ||
| }() | ||
|
|
||
| for (index, entry) in resizableDevices.enumerated() { | ||
| let (device, image) = entry | ||
| let position = index + 1 | ||
| let total = resizableDevices.count | ||
| let deviceName = device.displayName | ||
|
|
||
| await report("Checking \(deviceName) (\(position)/\(total))...") | ||
|
|
||
| let imageURL = diskImageURL(for: image) | ||
|
|
||
| guard FileManager.default.fileExists(atPath: imageURL.path) else { | ||
| await report("Skipping \(deviceName): disk image not found.") | ||
| continue | ||
| } | ||
|
|
||
| let actualSize = try await VBDiskResizer.currentImageSize(at: imageURL, format: image.format) | ||
|
|
||
| if image.size > actualSize { | ||
| let targetDescription = formatter.string(fromByteCount: Int64(image.size)) | ||
| await report("Expanding \(deviceName) to \(targetDescription) (\(position)/\(total))...") | ||
|
|
||
| try await resizeDiskImage(image, to: image.size) | ||
|
|
||
| await report("\(deviceName) expanded successfully.") | ||
| } else if image.size < actualSize { | ||
| let actualDescription = formatter.string(fromByteCount: Int64(actualSize)) | ||
| await report("\(deviceName) exceeds the configured size (\(actualDescription)); no changes made.") | ||
| } else { | ||
| let currentDescription = formatter.string(fromByteCount: Int64(actualSize)) | ||
| if VBDiskResizer.shouldReconcilePartitions( | ||
| configuredSize: image.size, | ||
| actualSize: actualSize, | ||
| format: image.format | ||
| ) { | ||
| await report("Verifying \(deviceName) partition layout (\(position)/\(total))...") | ||
| try await VBDiskResizer.reconcilePartitions(at: imageURL, format: image.format) | ||
| } | ||
| await report("\(deviceName) already uses \(currentDescription).") | ||
| } | ||
| } | ||
|
|
||
| await report("Disk image checks complete.") | ||
| } | ||
|
|
||
| /// Resizes a managed disk image to the specified size | ||
| private func resizeDiskImage(_ image: VBManagedDiskImage, to newSize: UInt64) async throws { | ||
| let imageURL = diskImageURL(for: image) | ||
| diskResizeLogger.debug("Resizing disk image at \(imageURL.path, privacy: .public) to \(newSize, privacy: .public) bytes") | ||
|
|
||
| try await VBDiskResizer.resizeDiskImage( | ||
| at: imageURL, | ||
| format: image.format, | ||
| newSize: newSize | ||
| ) | ||
|
|
||
| diskResizeLogger.debug("Successfully resized disk image at \(imageURL.path, privacy: .public) to \(newSize, privacy: .public) bytes") | ||
| } | ||
|
|
||
| /// Checks if a managed disk image has FileVault (locked volumes) enabled. | ||
| /// - Parameter image: The managed disk image to check. | ||
| /// - Returns: `true` if the disk image has FileVault-protected (locked) volumes, `false` otherwise. | ||
| func checkFileVaultForDiskImage(_ image: VBManagedDiskImage) async -> Bool { | ||
| let imageURL = diskImageURL(for: image) | ||
| return await VBDiskResizer.checkFileVaultStatus(at: imageURL, format: image.format) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.