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

qemu: Move to qemu 2.11 #119

Merged
merged 1 commit into from
Mar 29, 2018
Merged

qemu: Move to qemu 2.11 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions arch/amd64-options.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions virtcontainers/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion virtcontainers/documentation/api/1.0/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions virtcontainers/example_pod_run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion virtcontainers/qemu_arch_base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

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

@jodh-intel jodh-intel Mar 28, 2018

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

@egernst egernst Mar 28, 2018

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

Copy link

@jodh-intel jodh-intel Mar 28, 2018

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 ;)

)

var qemuArchBaseQemuPaths = map[string]string{
Expand Down