Skip to content

boot-qemu.sh: Combine x86 and x86_64 for shared KVM handling#12

Merged
nickdesaulniers merged 1 commit into
ClangBuiltLinux:masterfrom
nathanchance:fix-x86-travis
May 4, 2020
Merged

boot-qemu.sh: Combine x86 and x86_64 for shared KVM handling#12
nickdesaulniers merged 1 commit into
ClangBuiltLinux:masterfrom
nathanchance:fix-x86-travis

Conversation

@nathanchance

Copy link
Copy Markdown
Member

The x86 section unconditionally adds -enable-kvm to the QEMU flags. This
won't work for Travis because it does not have KVM support. The x86_64
section handles this already and the only difference between the x86 and
x86_64 sections is the QEMU binary name. Combine the sections and handle
that so that there is less duplication and everything works properly.

Comment thread boot-qemu.sh
The x86 section unconditionally adds -enable-kvm to the QEMU flags. This
won't work for Travis because it does not have KVM support. The x86_64
section handles this already and the only difference between the x86 and
x86_64 sections is the QEMU binary name. Combine the sections and handle
that so that there is less duplication and everything works properly.

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

@msfjarvis msfjarvis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@nickdesaulniers nickdesaulniers merged commit d16f094 into ClangBuiltLinux:master May 4, 2020
@nickdesaulniers

Copy link
Copy Markdown
Member

cool, thanks!

@nathanchance nathanchance deleted the fix-x86-travis branch May 19, 2020 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants