From cc4983eeac5932eaccaac69c70ab793bd3628dfd Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 8 Sep 2021 13:35:44 +1000 Subject: [PATCH] runtime: Remove unused qemuArchBase.appendBridges definition qemuArchBase.appendBridges is never actually used, because the bare qemuArchBase type is itself never used (outside of unit tests). Instead *all* the subclasses of qemuArchBase override appendBridges() to call the very similar, but not identical genericAppendBridges. So, we can remove the qemuArchBase.appendBridges implementation. Furthermore, all those subclasses override appendBridges() in exactly the same way, and so we can remove *those* definitions and replace the base class qemuArchBase appendBridges() with that version, calling genericAppendBridges(). Signed-off-by: David Gibson --- src/runtime/virtcontainers/qemu_amd64.go | 5 ---- src/runtime/virtcontainers/qemu_arch_base.go | 27 +------------------- src/runtime/virtcontainers/qemu_arm64.go | 5 ---- src/runtime/virtcontainers/qemu_ppc64le.go | 5 ---- src/runtime/virtcontainers/qemu_s390x.go | 5 ---- 5 files changed, 1 insertion(+), 46 deletions(-) diff --git a/src/runtime/virtcontainers/qemu_amd64.go b/src/runtime/virtcontainers/qemu_amd64.go index eab95ff571..689575ab5d 100644 --- a/src/runtime/virtcontainers/qemu_amd64.go +++ b/src/runtime/virtcontainers/qemu_amd64.go @@ -193,11 +193,6 @@ func (q *qemuAmd64) appendImage(ctx context.Context, devices []govmmQemu.Device, return q.appendBlockImage(ctx, devices, path) } -// appendBridges appends to devices the given bridges -func (q *qemuAmd64) appendBridges(devices []govmmQemu.Device) []govmmQemu.Device { - return genericAppendBridges(devices, q.Bridges, q.qemuMachine.Type) -} - // enable protection func (q *qemuAmd64) enableProtection() error { var err error diff --git a/src/runtime/virtcontainers/qemu_arch_base.go b/src/runtime/virtcontainers/qemu_arch_base.go index 98fdfb7661..f338d4e4e0 100644 --- a/src/runtime/virtcontainers/qemu_arch_base.go +++ b/src/runtime/virtcontainers/qemu_arch_base.go @@ -12,7 +12,6 @@ import ( "fmt" "os" "runtime" - "strconv" "strings" govmmQemu "github.com/kata-containers/govmm/qemu" @@ -456,31 +455,7 @@ func (q *qemuArchBase) appendSCSIController(_ context.Context, devices []govmmQe // appendBridges appends to devices the given bridges func (q *qemuArchBase) appendBridges(devices []govmmQemu.Device) []govmmQemu.Device { - for idx, b := range q.Bridges { - if b.Type == types.CCW { - continue - } - t := govmmQemu.PCIBridge - if b.Type == types.PCIE { - t = govmmQemu.PCIEBridge - } - - q.Bridges[idx].Addr = bridgePCIStartAddr + idx - - devices = append(devices, - govmmQemu.BridgeDevice{ - Type: t, - Bus: defaultBridgeBus, - ID: b.ID, - // Each bridge is required to be assigned a unique chassis id > 0 - Chassis: idx + 1, - SHPC: true, - Addr: strconv.FormatInt(int64(q.Bridges[idx].Addr), 10), - }, - ) - } - - return devices + return genericAppendBridges(devices, q.Bridges, q.qemuMachine.Type) } func generic9PVolume(volume types.Volume, nestedRun bool) govmmQemu.FSDevice { diff --git a/src/runtime/virtcontainers/qemu_arm64.go b/src/runtime/virtcontainers/qemu_arm64.go index be45a4e3a5..eced3b044d 100644 --- a/src/runtime/virtcontainers/qemu_arm64.go +++ b/src/runtime/virtcontainers/qemu_arm64.go @@ -89,11 +89,6 @@ func (q *qemuArm64) bridges(number uint32) { q.Bridges = genericBridges(number, q.qemuMachine.Type) } -// appendBridges appends to devices the given bridges -func (q *qemuArm64) appendBridges(devices []govmmQemu.Device) []govmmQemu.Device { - return genericAppendBridges(devices, q.Bridges, q.qemuMachine.Type) -} - func (q *qemuArm64) appendImage(ctx context.Context, devices []govmmQemu.Device, path string) ([]govmmQemu.Device, error) { if !q.disableNvdimm { return q.appendNvdimmImage(devices, path) diff --git a/src/runtime/virtcontainers/qemu_ppc64le.go b/src/runtime/virtcontainers/qemu_ppc64le.go index bff6feff16..51c9003ba2 100644 --- a/src/runtime/virtcontainers/qemu_ppc64le.go +++ b/src/runtime/virtcontainers/qemu_ppc64le.go @@ -123,11 +123,6 @@ func (q *qemuPPC64le) memoryTopology(memoryMb, hostMemoryMb uint64, slots uint8) return genericMemoryTopology(memoryMb, hostMemoryMb, slots, q.memoryOffset) } -// appendBridges appends to devices the given bridges -func (q *qemuPPC64le) appendBridges(devices []govmmQemu.Device) []govmmQemu.Device { - return genericAppendBridges(devices, q.Bridges, q.qemuMachine.Type) -} - func (q *qemuPPC64le) appendIOMMU(devices []govmmQemu.Device) ([]govmmQemu.Device, error) { return devices, fmt.Errorf("PPC64le does not support appending a vIOMMU") } diff --git a/src/runtime/virtcontainers/qemu_s390x.go b/src/runtime/virtcontainers/qemu_s390x.go index 829078cffa..b7611deccd 100644 --- a/src/runtime/virtcontainers/qemu_s390x.go +++ b/src/runtime/virtcontainers/qemu_s390x.go @@ -256,11 +256,6 @@ func (q *qemuS390x) append9PVolume(ctx context.Context, devices []govmmQemu.Devi return devices, nil } -// appendBridges appends to devices the given bridges -func (q *qemuS390x) appendBridges(devices []govmmQemu.Device) []govmmQemu.Device { - return genericAppendBridges(devices, q.Bridges, q.qemuMachine.Type) -} - func (q *qemuS390x) appendSCSIController(ctx context.Context, devices []govmmQemu.Device, enableIOThreads bool) ([]govmmQemu.Device, *govmmQemu.IOThread, error) { d, t := genericSCSIController(enableIOThreads, q.nestedRun) addr, b, err := q.addDeviceToBridge(ctx, d.ID, types.CCW)