aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2025-12-22 00:34:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

virtcontainers: Remove the pc machine

Browse Source 
Keeping around two different x86 machines has no added value
and require more tests and maintenance. Prefer the q35 machine
since it has more features and drop the pc machine.

Fixes #1953
Depends-on: github.com/kata-containers/tests#3586
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
This commit is contained in:
Marcel Apfelbaum
2021-05-31 11:47:58 +03:00
parent 1faaf5f35d
commit 789a59549e
11 changed files with 20 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime/virtcontainers/qemu_arch_base_test.go
View File

@@ -28,7 +28,7 @@ const (
)
var qemuArchBaseMachine = govmmQemu.Machine{
Type: "pc",
Type: "q35",
}
var qemuArchBaseQemuPaths = map[string]string{
@@ -143,7 +143,7 @@ func TestQemuAddDeviceToBridge(t *testing.T) {
// addDeviceToBridge successfully
q := newQemuArchBase()
q.qemuMachine.Type = QemuPC
q.qemuMachine.Type = QemuQ35
q.bridges(1)
for i := uint32(1); i <= types.PCIBridgeMaxCapacity; i++ {
@@ -559,10 +559,6 @@ func TestQemuArchBaseAppendIOMMU(t *testing.T) {
CachingMode: true,
},
}
// Test IOMMU is not appended to PC machine type
qemuArchBase.qemuMachine.Type = QemuPC
devices, err = qemuArchBase.appendIOMMU(devices)
assert.Error(err)
qemuArchBase.qemuMachine.Type = QemuQ35
devices, err = qemuArchBase.appendIOMMU(devices)