-
-
Notifications
You must be signed in to change notification settings - Fork 248
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
8
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
8 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 23033eb
fix: address disk resize review feedback
balcsida 5954bf4
refactor(resize): claim expanded disk space in guest
balcsida 7ac13dc
fix(resize): require explicit resize requests
balcsida e303a46
fix(resize): harden disk image expansion
balcsida 9f7d7c9
test(wormhole): ignore JSON key order
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
73 changes: 73 additions & 0 deletions
73
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,73 @@ | ||
| // | ||
| // 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 | ||
|
|
||
| /// Expands managed disk images whose configured size is larger than the image on disk. | ||
| /// Returns `true` if any disk image was expanded. | ||
| @discardableResult | ||
| mutating func checkAndResizeDiskImages(progressHandler: DiskResizeProgressHandler? = nil) async throws -> Bool { | ||
| let resizableImages = configuration.hardware.storageDevices.indices.compactMap { index -> (index: Int, name: String, image: VBManagedDiskImage)? in | ||
| let device = configuration.hardware.storageDevices[index] | ||
| guard case .managedImage(let image) = device.backing, image.resizePending else { return nil } | ||
| return (index, device.displayName, image) | ||
| } | ||
|
|
||
| let formatter = ByteCountFormatter() | ||
| formatter.allowedUnits = [.useGB, .useMB, .useTB] | ||
| formatter.countStyle = .binary | ||
|
|
||
| var didResize = false | ||
|
|
||
| for (index, name, image) in resizableImages { | ||
| let imageURL = diskImageURL(for: image) | ||
|
|
||
| guard FileManager.default.fileExists(atPath: imageURL.path) else { | ||
| throw VBDiskResizeError.diskImageNotFound(imageURL) | ||
| } | ||
|
|
||
| let actualSize = try await VBDiskResizer.currentImageSize(at: imageURL, format: image.format) | ||
| guard image.size >= actualSize else { | ||
| var image = image | ||
| image.resizePending = false | ||
| configuration.hardware.storageDevices[index].backing = .managedImage(image) | ||
| continue | ||
| } | ||
|
|
||
| if image.size > actualSize { | ||
| let targetDescription = formatter.string(fromByteCount: Int64(image.size)) | ||
| if let progressHandler { | ||
| await progressHandler("Expanding \(name) to \(targetDescription)...") | ||
| } | ||
| } | ||
|
|
||
| diskResizeLogger.debug("Resizing disk image at \(imageURL.path, privacy: .public) to \(image.size, privacy: .public) bytes") | ||
| try await VBDiskResizer.resizeDiskImage(at: imageURL, format: image.format, newSize: image.size) | ||
|
|
||
| var image = image | ||
| image.resizePending = false | ||
| configuration.hardware.storageDevices[index].backing = .managedImage(image) | ||
| didResize = didResize || image.size > actualSize | ||
| } | ||
|
|
||
| return didResize | ||
| } | ||
|
|
||
| var hasPendingDiskImageResizes: Bool { | ||
| configuration.hardware.storageDevices.contains { | ||
| guard case .managedImage(let image) = $0.backing else { return false } | ||
| return image.resizePending | ||
| } | ||
| } | ||
| } |
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.