Repository navigation
project: restore changes accidentally reverted by the QEMU patch update - #7973
Merged
Merged
Conversation
10fb1eb ("qemu: cut GIC exits on HVF, ...") was committed from a stale tree based on 7eadb05, so besides adding patches/qemu-10.0.12-utm.patch it reverted everything merged between 7eadb05 and 7928d11: #7911 (iPhone Duo), #7910 (camera housing area on macOS 12+, which is why the option only shows on macOS 27 again), #7925, #7957, the README badges, #7959 (QEMUKit zstd snapshot fix), #7960, #7961 and #7962. These all shipped reverted in v5.0.7. Reapply the non-patch part of that commit in reverse. Outside patches/ and Build.xcconfig the tree now matches 7928d11 again. Assisted-by: Claude:claude-opus-5-5
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
10fb1eb ("qemu: cut GIC exits on HVF, honor host refresh rate, fix virtio-gpu stalls", from #7963) was committed from a stale tree based on 7eadb05. Besides adding
patches/qemu-10.0.12-utm.patch, it reverted everything merged between 7eadb05 and 7928d11, and all of it shipped reverted in v5.0.7:This reapplies the non-
patches/part of 10fb1eb in reverse. Apart from the intended later changes (patches/andBuild.xcconfig), the tree is now identical to 7928d11:git diff 7928d11c HEAD -- . ':!patches' ':!Build.xcconfig'is empty.Testing: No new code. Every restored change was tested by a human when its original PR merged, and the result has zero diff from that tested state. The author acknowledges that this change has been tested and/or reviewed by a human in accordance with UTM's AI contribution guidelines.