diff --git a/arch/amd64-options.mk b/arch/amd64-options.mk index 718f83473e..b30fb161b2 100644 --- 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 index 470357d09c..d5cee8e17a 100644 --- 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 index 3601b69cef..ce4d01fff2 100644 --- 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 index a8ecb80f05..9c1a0e4563 100644 --- 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 index df55b7efd3..d246ada94c 100644 --- 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 index a91a06a586..21890ac143 100644 --- 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{