Tries to guess which qemu executable should use via WORKER_CLASS #931
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
coolo
reviewed
Mar 5, 2018
backend/qemu.pm
Outdated
| $qemubin = find_bin('/usr/bin/', 'qemu-system-' . $vars->{QEMU}); | ||
| } | ||
| else { | ||
| (my $class = $vars->{WORKER_CLASS}) =~ s/qemu_/qemu-system\-/g; |
There was a problem hiding this comment.
won't this cause warnings on undefined?
coolo
reviewed
Mar 5, 2018
backend/qemu.pm
Outdated
| } | ||
| else { | ||
| (my $class = $vars->{WORKER_CLASS} || '') =~ s/qemu_/qemu-system\-/g; | ||
| $qemubin = find_bin('/usr/bin/', (split(/\s*,\s*/, $class), qw(kvm qemu-kvm qemu qemu-system-x86_64 qemu-system-ppc64))); |
There was a problem hiding this comment.
I have one more question: if WORKER_CLASS=tap,qemu_x86_64 will you start /usr/bin/tap?
There was a problem hiding this comment.
dasantiago
changed the title
coolo
requested changes
Mar 5, 2018
backend/qemu.pm
Outdated
| for (split(/\s*,\s*/, $class)) { | ||
| $qemubin = find_bin('/usr/bin/', $_) if $allowed{$_}; | ||
| } | ||
| $qemubin = find_bin('/usr/bin/', keys %allowed) unless $qemubin; |
There was a problem hiding this comment.
this drops order - and we would run qemu-system-ppc64 before qemu by chance (perl hash randomization)
There are two ways to define which qemu to use: - via environment variable QEMU - via setting the variable QEMU (it will be appended to qemu-system-) However some templates don't have this variable defined, inducing the worker to choose the wrong qemu. So if any of the previous mechanisms work, it will use the WORKER_CLASS to guess which executable should use.
dasantiago
changed the title
coolo
approved these changes
Mar 5, 2018
|
you thought it's an easy one, didn't you? :) |
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.
related poo#14674
There are two ways to define which qemu to use:
However some templates don't have this variable defined, inducing
the worker to choose the wrong qemu.
So if any of the previous mechanisms work, it will use the
WORKER_CLASS to guess which executable should use.