-
Notifications
You must be signed in to change notification settings - Fork 24
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
run_qemu: make git-qemu argument a path #17
base: main
Are you sure you want to change the base?
Conversation
Remove hardcoded git-qemu path, if the argument is not provided and needed for cxl options then set ~/git/qemu/ as the default Signed-off-by: Adam Manzanares <a.manzanares@samsung.com>
@@ -227,16 +227,18 @@ process_options_logic() | |||
_arg_cxl="on" | |||
fi | |||
if [[ $_arg_cxl_legacy == "on" ]] || [[ $_arg_cxl == "on" ]]; then | |||
_arg_git_qemu="on" | |||
if [[ ! $_arg_git_qemu ]]; then | |||
_arg_git_qemu=~/git/qemu/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This puts us in a weird situation where ~/git/qemu is default for CXL, but there's no default outside of CXL.
Also with CXL support soon to start appearing in upstream releases, and distros thereafter, I wonder if it is time to drop the CXL special case requirement of git-qemu altogether.
if [[ $_arg_git_qemu ]]; then | ||
qemu=${_arg_git_qemu}/x86_64-softmmu/qemu-system-x86_64 | ||
qemu_img=${_arg_git_qemu}/qemu-img | ||
qmp=${_arg_git_qemu}/scripts/qmp/qmp-shell |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So this essentially duplicates the env way of setting qemu's location -
qemu=/path/to/qemu/binary run_qemu.sh ...
--git-qemu
was supposed to be a shortcut to make that default to ~/git/qemu
which happened to be the path in my case :)
Now that the user base is slightly bigger, I think it makes sense to clean it all up a bit:
- We can convert to --git=qemu= going forward, and make ~git/qemu the default in parser_generator.m4
- make
qemu=<path> run_qemu.sh ...
behave the same way (probably already the case) - Remove the special case behavior for --cxl
Thoughts on this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we get rid of all of these special cases and just use the env way of setting qemu? Let's assume cxl support moving forward, and figure out a way to add a check for cxl support if --cxl is set, maybe check qemu version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would rather drop the environment way because environments variables are sneaky and evil :-)
While CXL support in QEMU is mainstream now, I think it would be good to keep just ONE way to override it, at the very least for testing purposes.
I forgot to add above - if |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are conflicts now, this needs a rebase.
if [[ $_arg_git_qemu ]]; then | ||
qemu=${_arg_git_qemu}/x86_64-softmmu/qemu-system-x86_64 | ||
qemu_img=${_arg_git_qemu}/qemu-img | ||
qmp=${_arg_git_qemu}/scripts/qmp/qmp-shell |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would rather drop the environment way because environments variables are sneaky and evil :-)
While CXL support in QEMU is mainstream now, I think it would be good to keep just ONE way to override it, at the very least for testing purposes.
Or, even better:
Can "argbash" do that? For sure the shell can tell the difference between unset versus set empty when you ask nicely https://pubs.opengroup.org/onlinepubs/7990989775/xcu/chap2.html#tag_001_006_002 |
Remove hardcoded git-qemu path, if the argument is not provided and needed
for cxl options then set ~/git/qemu/ as the default
Signed-off-by: Adam Manzanares a.manzanares@samsung.com