Qira patches to QEMU version 3.1.0 #1
Closed
Conversation
This file contains 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
I attempted to be as literal as possible, but this was not actually a cherry-pick. There were so many re-arranged files from v2.5.1 where the patch was last applied, that the merge conflicts were just nonsense. Additional fixes to get QEMU to build are in follow commits.
I'm really not sure about this one. I can't see how QEMU would build for anyone without --disable-capstone, without this change. Surely this must be a misconfiguration of my own system? However, the Capstone documentation for their C API clearly shows to use \#include <capstone/capstone.h> here: http://www.capstone-engine.org/lang_c.html
Standard QEMU passes only the pointer to the start of the translation block's instructions, however for Qira tracking we need more details from the `TranslationBlock` structure. This updates the `tcg_qemu_tb_exec` function to take a pointer to the `TranslationBlock` to execute, to minimize the changes needed to build with the Qira patch. We should probably determine if it would be possible to move the Qira tracking code into `cpu_tb_exec` instead, which would not require modifying the signature of `tcg_qemu_tb_exec` (although it is only called from that one location).
The `next_tb` variable was renamed to `ret` at some point.
|
Will merge if you change to not push to master. |
|
Which branch should it merge into? The qira branch is too out of date for this to merge correctly, I think. |
|
Can you merge into a new branch? The one referenced in the main qira PR. |
|
I don't believe I have sufficient permissions on your fork to create a new branch for the PR to be merged into. I think you'll need to do that part, and then I can update the PR (although I'd wager you also have access to modify the PR). |
|
Merged into v3.1.0-qira. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This updates Qira's QEMU patch to work with version 3.1.0.
Details
The first commit is my recreation of the original QEMU patch, done manually because of the extent of changes between version 2.5.1 and 3.1.0.
The remaining commits are minimal changes to enable QEMU to build successfully.
I've tested this (with related changes to Qira's build scripts) and had some success getting it to build both in the Docker container for Ubuntu 16.04 and on Arch Linux.
TODO
v3.1.0-qirabranch pointing at the same commit fromv3.1.0tagmasterNotes
docker/test.sh, and the automated tests all pass (but those also passed on un-patched 3.1.0 so I think they're not very comprehensive).