github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 23:11:57 +00:00
Code Issues Projects Releases Wiki Activity

qemu: Move to qemu 2.11

Browse Source 
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.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
This commit is contained in:
Salvador Fuentes 2018-03-27 13:51:18 -06:00
parent 4d6e9c9f68
commit 10c38aeebf
6 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/amd64-options.mk
View File

@ -18,10 +18,4 @@ MACHINETYPE := pc
KERNELPARAMS := KERNELPARAMS :=
MACHINEACCELERATORS := MACHINEACCELERATORS :=
# The CentOS/RHEL hypervisor binary is not called qemu-lite QEMUCMD := qemu-system-x86_64
ifeq (,$(filter-out centos rhel,$(distro)))
QEMUCMD := qemu-system-x86_64
else
QEMUCMD := qemu-lite-system-x86_64
endif

5
versions.yaml
View File

@ -60,9 +60,8 @@ assets:
qemu: qemu:
description: "VMM that uses KVM" description: "VMM that uses KVM"
url: "https://github.com/kata-containers/qemu" url: "https://github.com/qemu/qemu"
version: "741f430a960b5b67745670e8270db91aeb083c5f-29" version: "stable-2.11"
release: "19360"
image: image:
description: | description: |

6
virtcontainers/api_test.go
View File

@ -1990,9 +1990,9 @@ func TestProcessListContainer(t *testing.T) {
func createNewPodConfig(hType HypervisorType, aType AgentType, aConfig interface{}, netModel NetworkModel) PodConfig { func createNewPodConfig(hType HypervisorType, aType AgentType, aConfig interface{}, netModel NetworkModel) PodConfig {
hypervisorConfig := HypervisorConfig{ hypervisorConfig := HypervisorConfig{
KernelPath: "/usr/share/clear-containers/vmlinux.container", KernelPath: "/usr/share/kata-containers/vmlinux.container",
ImagePath: "/usr/share/clear-containers/clear-containers.img", ImagePath: "/usr/share/kata-containers/kata-containers.img",
HypervisorPath: "/usr/bin/qemu-lite-system-x86_64", HypervisorPath: "/usr/bin/qemu-system-x86_64",
} }
netConfig := NetworkConfig{ netConfig := NetworkConfig{

2
virtcontainers/documentation/api/1.0/api.md
View File

@ -894,7 +894,7 @@ func Example_createAndStartPod() {
hypervisorConfig := vc.HypervisorConfig{ hypervisorConfig := vc.HypervisorConfig{
KernelPath: "/usr/share/clear-containers/vmlinux.container", KernelPath: "/usr/share/clear-containers/vmlinux.container",
ImagePath: "/usr/share/clear-containers/clear-containers.img", ImagePath: "/usr/share/clear-containers/clear-containers.img",
HypervisorPath: "/usr/bin/qemu-lite-system-x86_64", HypervisorPath: "/usr/bin/qemu-system-x86_64",
} }
// Use hyperstart default values for the agent. // Use hyperstart default values for the agent.

6
virtcontainers/example_pod_run_test.go
View File

@ -50,9 +50,9 @@ func Example_createAndStartPod() {
// Sets the hypervisor configuration. // Sets the hypervisor configuration.
hypervisorConfig := vc.HypervisorConfig{ hypervisorConfig := vc.HypervisorConfig{
KernelPath: "/usr/share/clear-containers/vmlinux.container", KernelPath: "/usr/share/kata-containers/vmlinux.container",
ImagePath: "/usr/share/clear-containers/clear-containers.img", ImagePath: "/usr/share/kata-containers/kata-containers.img",
HypervisorPath: "/usr/bin/qemu-lite-system-x86_64", HypervisorPath: "/usr/bin/qemu-system-x86_64",
} }
// Use hyperstart default values for the agent. // Use hyperstart default values for the agent.

2
virtcontainers/qemu_arch_base_test.go
View File

@ -28,7 +28,7 @@ import (
const ( const (
qemuArchBaseMachineType = "pc" qemuArchBaseMachineType = "pc"
qemuArchBaseQemuPath = "/usr/bin/qemu-lite-system-x86_64" qemuArchBaseQemuPath = "/usr/bin/qemu-system-x86_64"
) )
var qemuArchBaseQemuPaths = map[string]string{ var qemuArchBaseQemuPaths = map[string]string{