Merge pull request #119 from chavafg/topic/qemu2-11

qemu: Move to qemu 2.11
kata-containers · Mar 29, 2018 · d283555 · d283555
2 parents c4f922d + 10c38ae
commit d283555
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 18 deletions.
diff --git a/arch/amd64-options.mk b/arch/amd64-options.mk
@@ -18,10 +18,4 @@ MACHINETYPE := pc
 KERNELPARAMS :=
 MACHINEACCELERATORS :=
 
-# The CentOS/RHEL hypervisor binary is not called qemu-lite
-ifeq (,$(filter-out centos rhel,$(distro)))
-    QEMUCMD := qemu-system-x86_64
-else
-    QEMUCMD := qemu-lite-system-x86_64
-endif
-
+QEMUCMD := qemu-system-x86_64
diff --git a/versions.yaml b/versions.yaml
@@ -60,9 +60,8 @@ assets:
 
     qemu:
       description: "VMM that uses KVM"
-      url: "https://github.com/kata-containers/qemu"
-      version: "741f430a960b5b67745670e8270db91aeb083c5f-29"
-      release: "19360"
+      url: "https://github.com/qemu/qemu"
+      version: "stable-2.11"
 
   image:
     description: |

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

diff --git a/virtcontainers/documentation/api/1.0/api.md b/virtcontainers/documentation/api/1.0/api.md
@@ -894,7 +894,7 @@ func Example_createAndStartPod() {
 	hypervisorConfig := vc.HypervisorConfig{
 		KernelPath:     "/usr/share/clear-containers/vmlinux.container",
 		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.

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

diff --git a/virtcontainers/qemu_arch_base_test.go b/virtcontainers/qemu_arch_base_test.go
@@ -28,7 +28,7 @@ import (
 
 const (
 	qemuArchBaseMachineType = "pc"
-	qemuArchBaseQemuPath    = "/usr/bin/qemu-lite-system-x86_64"
+	qemuArchBaseQemuPath    = "/usr/bin/qemu-system-x86_64"
 )
 
 var qemuArchBaseQemuPaths = map[string]string{