Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Conversation

@chavafg
Copy link
Contributor

@chavafg chavafg commented Mar 27, 2018

This commit modifies version.yaml to now point to the qemu
2.11 stable version.
It modifies the default QEMU_CMD to be qemu-system-x86_64
instead of qemu-lite-system-x86_64.
And modifies virtcontainers unit tests to now point to the
correct QEMU_CMD.

Fixes: #118.

Depends-on: github.com/kata-containers/tests#182

Signed-off-by: Salvador Fuentes salvador.fuentes@intel.com

@chavafg chavafg added the review label Mar 27, 2018
@devimc
Copy link

devimc commented Mar 27, 2018

lgtm

url: "https://github.com/kata-containers/qemu"
version: "741f430a960b5b67745670e8270db91aeb083c5f-29"
release: "19360"
version: "stable-2.11"
Copy link

Choose a reason for hiding this comment

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

Why are we still relying on url: "https://github.com/kata-containers/qemu" ? I thought we could point to the official qemu repo since we want a vanilla version here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just because in kata-containers/qemu we have the configure.sh script which provides the flags that we use.
https://github.com/kata-containers/qemu/blob/stable-2.11/configure.sh

Copy link

Choose a reason for hiding this comment

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

Ok

Choose a reason for hiding this comment

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

As mentioned kata-containers/tests#182 (comment) though, we shouldn't be storing the config script in the qemu branch itself.

So I think we can switch the URL here.

url: "https://github.com/kata-containers/qemu"
version: "741f430a960b5b67745670e8270db91aeb083c5f-29"
release: "19360"
version: "stable-2.11"

Choose a reason for hiding this comment

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

As mentioned kata-containers/tests#182 (comment) though, we shouldn't be storing the config script in the qemu branch itself.

So I think we can switch the URL here.

const (
qemuArchBaseMachineType = "pc"
qemuArchBaseQemuPath = "/usr/bin/qemu-lite-system-x86_64"
qemuArchBaseQemuPath = "/usr/bin/qemu-system-x86_64"

Choose a reason for hiding this comment

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

If we are dropping qemu-lite entirely, there are changes we'll need to make in a few other areas (search for QemuPCLite).

Copy link
Member

Choose a reason for hiding this comment

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

I think the default will be using the vanilla 2.11 QEMU, though we are expecting a pc-lite supporting qemu-lite to be available in the future as well. So, I think its reasonable to keep here for now? WDYT @jodh-intel

Choose a reason for hiding this comment

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

Ok - fine with this bit then ;)

This commit modifies version.yaml to now point to the qemu
2.11 stable version.
It modifies the default QEMU_CMD to be qemu-system-x86_64
instead of qemu-lite-system-x86_64.
And modifies virtcontainers unit tests to now point to the
correct QEMU_CMD.

Fixes: kata-containers#118.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
@sboeuf
Copy link

sboeuf commented Mar 28, 2018

CI should pass now that kata-containers/tests#182 has been merged. @jodh-intel PTAL

@chavafg
Copy link
Contributor Author

chavafg commented Mar 29, 2018

CI passed correctly. ping @kata-containers/runtime
We need to merge this one now that kata-containers/tests#182 has been merged. If not, we will have failures in the CI jobs on other PRs.

@sboeuf
Copy link

sboeuf commented Mar 29, 2018

@bergwolf PTAL

@sboeuf
Copy link

sboeuf commented Mar 29, 2018

@egernst PTAL

@bergwolf
Copy link
Member

bergwolf commented Mar 29, 2018

lgtm

Approved with PullApprove Approved with PullApprove

@grahamwhaley
Copy link
Contributor

All looking good and green. I believe we have addressed @jodh-intel 's comments, but he will not be around for a few days to ack his requested changes - so pls don't let @jodh-intel 's review change request block this now.

I see enough ack's - so, merging this now...

@grahamwhaley grahamwhaley merged commit d283555 into kata-containers:master Mar 29, 2018
@chavafg chavafg deleted the topic/qemu2-11 branch July 12, 2018 14:13
mcastelino pushed a commit to mcastelino/tests that referenced this pull request Jan 23, 2019
Instead of using a custom version of qemu, we should
use qemu version from upstream.

Fixes clearcontainers#163.

Depends-on: github.com/kata-containers/runtime#119

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
zklei pushed a commit to zklei/runtime that referenced this pull request Jun 13, 2019
Updated the build to support building for the ppc64le architecture.

Fixes kata-containers#119

Signed-off-by: Basheer K <basheer@linux.vnet.ibm.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants