From eda8ea154a12c3a537a55d8a42d50727429e8d64 Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Fri, 25 Feb 2022 10:25:33 +0100 Subject: [PATCH] runtime: Gofmt fixes - Mostly blank lines after `+build` -- see https://pkg.go.dev/go/build@go1.14.15 -- this is, to date, enforced by `gofmt`. - 1.17-style go:build directives are also added. - Spaces in govmm/vmm_s390x.go Fixes: #3769 Signed-off-by: Jakob Naucke --- src/runtime/pkg/govmm/qemu/qemu_arch_base_test.go | 1 + src/runtime/pkg/govmm/vmm_s390x.go | 6 +++--- src/runtime/pkg/resourcecontrol/cgroups.go | 3 ++- src/runtime/virtcontainers/acrn.go | 2 +- src/runtime/virtcontainers/acrn_arch_base.go | 2 +- src/runtime/virtcontainers/acrn_test.go | 2 +- src/runtime/virtcontainers/clh.go | 1 - src/runtime/virtcontainers/clh_test.go | 2 +- src/runtime/virtcontainers/fc.go | 1 - src/runtime/virtcontainers/fc_metrics.go | 2 +- src/runtime/virtcontainers/fc_test.go | 2 +- src/runtime/virtcontainers/ipvlan_endpoint.go | 3 ++- src/runtime/virtcontainers/ipvlan_endpoint_test.go | 3 ++- src/runtime/virtcontainers/macvlan_endpoint.go | 3 ++- src/runtime/virtcontainers/macvlan_endpoint_test.go | 3 ++- src/runtime/virtcontainers/macvtap_endpoint.go | 3 ++- src/runtime/virtcontainers/macvtap_endpoint_test.go | 3 ++- src/runtime/virtcontainers/physical_endpoint.go | 3 ++- src/runtime/virtcontainers/physical_endpoint_test.go | 3 ++- src/runtime/virtcontainers/qemu.go | 1 - src/runtime/virtcontainers/qemu_amd64.go | 2 +- src/runtime/virtcontainers/qemu_amd64_test.go | 2 +- src/runtime/virtcontainers/qemu_arch_base.go | 2 +- src/runtime/virtcontainers/qemu_arch_base_test.go | 2 +- src/runtime/virtcontainers/qemu_arm64.go | 2 +- src/runtime/virtcontainers/qemu_arm64_test.go | 2 +- src/runtime/virtcontainers/qemu_ppc64le.go | 2 +- src/runtime/virtcontainers/qemu_ppc64le_test.go | 2 +- src/runtime/virtcontainers/qemu_s390x.go | 2 +- src/runtime/virtcontainers/qemu_s390x_test.go | 2 +- src/runtime/virtcontainers/qemu_test.go | 2 +- src/runtime/virtcontainers/tap_endpoint.go | 3 ++- src/runtime/virtcontainers/tuntap_endpoint.go | 3 ++- src/runtime/virtcontainers/veth_endpoint.go | 3 ++- src/runtime/virtcontainers/veth_endpoint_test.go | 3 ++- src/runtime/virtcontainers/vhostuser_endpoint.go | 3 ++- src/runtime/virtcontainers/vhostuser_endpoint_test.go | 3 ++- 37 files changed, 51 insertions(+), 38 deletions(-) diff --git a/src/runtime/pkg/govmm/qemu/qemu_arch_base_test.go b/src/runtime/pkg/govmm/qemu/qemu_arch_base_test.go index 4d343eedc0..26b2ac5474 100644 --- a/src/runtime/pkg/govmm/qemu/qemu_arch_base_test.go +++ b/src/runtime/pkg/govmm/qemu/qemu_arch_base_test.go @@ -1,3 +1,4 @@ +//go:build !s390x // +build !s390x // Copyright contributors to the Virtual Machine Manager for Go project diff --git a/src/runtime/pkg/govmm/vmm_s390x.go b/src/runtime/pkg/govmm/vmm_s390x.go index 50f1735dc2..d6ef960a8e 100644 --- a/src/runtime/pkg/govmm/vmm_s390x.go +++ b/src/runtime/pkg/govmm/vmm_s390x.go @@ -9,7 +9,7 @@ package govmm // MaxVCPUs returns the maximum number of vCPUs supported func MaxVCPUs() uint32 { // Max number of virtual Cpu defined in qemu. See - // https://github.com/qemu/qemu/blob/80422b00196a7af4c6efb628fae0ad8b644e98af/target/s390x/cpu.h#L55 - // #define S390_MAX_CPUS 248 - return uint32(248) + // https://github.com/qemu/qemu/blob/80422b00196a7af4c6efb628fae0ad8b644e98af/target/s390x/cpu.h#L55 + // #define S390_MAX_CPUS 248 + return uint32(248) } diff --git a/src/runtime/pkg/resourcecontrol/cgroups.go b/src/runtime/pkg/resourcecontrol/cgroups.go index 49c6562afd..4210392d2a 100644 --- a/src/runtime/pkg/resourcecontrol/cgroups.go +++ b/src/runtime/pkg/resourcecontrol/cgroups.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2021-2022 Apple Inc. // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/acrn.go b/src/runtime/virtcontainers/acrn.go index 5e709da424..6b26792019 100644 --- a/src/runtime/virtcontainers/acrn.go +++ b/src/runtime/virtcontainers/acrn.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2019 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/acrn_arch_base.go b/src/runtime/virtcontainers/acrn_arch_base.go index 52f6ea339c..ab547b6bd3 100644 --- a/src/runtime/virtcontainers/acrn_arch_base.go +++ b/src/runtime/virtcontainers/acrn_arch_base.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2019 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/acrn_test.go b/src/runtime/virtcontainers/acrn_test.go index 974b1fe1b8..b92f35a2fa 100644 --- a/src/runtime/virtcontainers/acrn_test.go +++ b/src/runtime/virtcontainers/acrn_test.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2019 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/clh.go b/src/runtime/virtcontainers/clh.go index 57cee5e20b..805fda7169 100644 --- a/src/runtime/virtcontainers/clh.go +++ b/src/runtime/virtcontainers/clh.go @@ -1,7 +1,6 @@ //go:build linux // +build linux -// // Copyright (c) 2019 Ericsson Eurolab Deutschland GmbH // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/clh_test.go b/src/runtime/virtcontainers/clh_test.go index ec73303d03..9bfd2e62ee 100644 --- a/src/runtime/virtcontainers/clh_test.go +++ b/src/runtime/virtcontainers/clh_test.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2019 Ericsson Eurolab Deutschland G.m.b.H. // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/fc.go b/src/runtime/virtcontainers/fc.go index 7fd7909f4e..6137e32cf2 100644 --- a/src/runtime/virtcontainers/fc.go +++ b/src/runtime/virtcontainers/fc.go @@ -1,7 +1,6 @@ //go:build linux // +build linux -// // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/fc_metrics.go b/src/runtime/virtcontainers/fc_metrics.go index 814d819367..0462542fd8 100644 --- a/src/runtime/virtcontainers/fc_metrics.go +++ b/src/runtime/virtcontainers/fc_metrics.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2020 Ant Group // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/fc_test.go b/src/runtime/virtcontainers/fc_test.go index 02d9d71447..f2b099f1db 100644 --- a/src/runtime/virtcontainers/fc_test.go +++ b/src/runtime/virtcontainers/fc_test.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2019 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/ipvlan_endpoint.go b/src/runtime/virtcontainers/ipvlan_endpoint.go index f9196cda37..a257e6ecb4 100644 --- a/src/runtime/virtcontainers/ipvlan_endpoint.go +++ b/src/runtime/virtcontainers/ipvlan_endpoint.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/ipvlan_endpoint_test.go b/src/runtime/virtcontainers/ipvlan_endpoint_test.go index 0f26119b63..7fe33d166b 100644 --- a/src/runtime/virtcontainers/ipvlan_endpoint_test.go +++ b/src/runtime/virtcontainers/ipvlan_endpoint_test.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/macvlan_endpoint.go b/src/runtime/virtcontainers/macvlan_endpoint.go index 228ec33513..061a36f156 100644 --- a/src/runtime/virtcontainers/macvlan_endpoint.go +++ b/src/runtime/virtcontainers/macvlan_endpoint.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/macvlan_endpoint_test.go b/src/runtime/virtcontainers/macvlan_endpoint_test.go index 2f421b6b74..896be917e3 100644 --- a/src/runtime/virtcontainers/macvlan_endpoint_test.go +++ b/src/runtime/virtcontainers/macvlan_endpoint_test.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/macvtap_endpoint.go b/src/runtime/virtcontainers/macvtap_endpoint.go index e64076341b..1a2452cf1b 100644 --- a/src/runtime/virtcontainers/macvtap_endpoint.go +++ b/src/runtime/virtcontainers/macvtap_endpoint.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/macvtap_endpoint_test.go b/src/runtime/virtcontainers/macvtap_endpoint_test.go index 0f9283f794..6b7e009434 100644 --- a/src/runtime/virtcontainers/macvtap_endpoint_test.go +++ b/src/runtime/virtcontainers/macvtap_endpoint_test.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/physical_endpoint.go b/src/runtime/virtcontainers/physical_endpoint.go index 48ff182198..71f67da8fd 100644 --- a/src/runtime/virtcontainers/physical_endpoint.go +++ b/src/runtime/virtcontainers/physical_endpoint.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/physical_endpoint_test.go b/src/runtime/virtcontainers/physical_endpoint_test.go index 7e823f6f7a..cac41358f2 100644 --- a/src/runtime/virtcontainers/physical_endpoint_test.go +++ b/src/runtime/virtcontainers/physical_endpoint_test.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/qemu.go b/src/runtime/virtcontainers/qemu.go index 67b24b9a47..0985380d82 100644 --- a/src/runtime/virtcontainers/qemu.go +++ b/src/runtime/virtcontainers/qemu.go @@ -1,7 +1,6 @@ //go:build linux // +build linux -// // Copyright (c) 2016 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/qemu_amd64.go b/src/runtime/virtcontainers/qemu_amd64.go index ef1e16adbf..8e76bf55c9 100644 --- a/src/runtime/virtcontainers/qemu_amd64.go +++ b/src/runtime/virtcontainers/qemu_amd64.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/qemu_amd64_test.go b/src/runtime/virtcontainers/qemu_amd64_test.go index 1071a7051f..e8cf9fcd54 100644 --- a/src/runtime/virtcontainers/qemu_amd64_test.go +++ b/src/runtime/virtcontainers/qemu_amd64_test.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/qemu_arch_base.go b/src/runtime/virtcontainers/qemu_arch_base.go index 8820fd655e..c5c5e8057c 100644 --- a/src/runtime/virtcontainers/qemu_arch_base.go +++ b/src/runtime/virtcontainers/qemu_arch_base.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/qemu_arch_base_test.go b/src/runtime/virtcontainers/qemu_arch_base_test.go index f8d07bc58c..ff20ba4479 100644 --- a/src/runtime/virtcontainers/qemu_arch_base_test.go +++ b/src/runtime/virtcontainers/qemu_arch_base_test.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/qemu_arm64.go b/src/runtime/virtcontainers/qemu_arm64.go index fb0e7a9d7f..f5af19e219 100644 --- a/src/runtime/virtcontainers/qemu_arm64.go +++ b/src/runtime/virtcontainers/qemu_arm64.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/qemu_arm64_test.go b/src/runtime/virtcontainers/qemu_arm64_test.go index 893c46e66f..d78f4474b3 100644 --- a/src/runtime/virtcontainers/qemu_arm64_test.go +++ b/src/runtime/virtcontainers/qemu_arm64_test.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2018 IBM // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/qemu_ppc64le.go b/src/runtime/virtcontainers/qemu_ppc64le.go index 93c11416ce..e78fcb7016 100644 --- a/src/runtime/virtcontainers/qemu_ppc64le.go +++ b/src/runtime/virtcontainers/qemu_ppc64le.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2018 IBM // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/qemu_ppc64le_test.go b/src/runtime/virtcontainers/qemu_ppc64le_test.go index 6c046b620e..15e75a91b2 100644 --- a/src/runtime/virtcontainers/qemu_ppc64le_test.go +++ b/src/runtime/virtcontainers/qemu_ppc64le_test.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2018 IBM // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/qemu_s390x.go b/src/runtime/virtcontainers/qemu_s390x.go index 77b6f440b1..32716e7767 100644 --- a/src/runtime/virtcontainers/qemu_s390x.go +++ b/src/runtime/virtcontainers/qemu_s390x.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2018 IBM // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/qemu_s390x_test.go b/src/runtime/virtcontainers/qemu_s390x_test.go index 07eaa85172..3d0c393a69 100644 --- a/src/runtime/virtcontainers/qemu_s390x_test.go +++ b/src/runtime/virtcontainers/qemu_s390x_test.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2018 IBM // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/qemu_test.go b/src/runtime/virtcontainers/qemu_test.go index 985c15f1c6..9069bb2128 100644 --- a/src/runtime/virtcontainers/qemu_test.go +++ b/src/runtime/virtcontainers/qemu_test.go @@ -1,6 +1,6 @@ //go:build linux // +build linux -// + // Copyright (c) 2016 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/tap_endpoint.go b/src/runtime/virtcontainers/tap_endpoint.go index 75c6e3273e..62b855382b 100644 --- a/src/runtime/virtcontainers/tap_endpoint.go +++ b/src/runtime/virtcontainers/tap_endpoint.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Huawei Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/tuntap_endpoint.go b/src/runtime/virtcontainers/tuntap_endpoint.go index 9d51f2f72d..888e666ef7 100644 --- a/src/runtime/virtcontainers/tuntap_endpoint.go +++ b/src/runtime/virtcontainers/tuntap_endpoint.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Huawei Corporation // Copyright (c) 2019 Intel Corporation // diff --git a/src/runtime/virtcontainers/veth_endpoint.go b/src/runtime/virtcontainers/veth_endpoint.go index 2dd7a4b087..52a7ae4795 100644 --- a/src/runtime/virtcontainers/veth_endpoint.go +++ b/src/runtime/virtcontainers/veth_endpoint.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/veth_endpoint_test.go b/src/runtime/virtcontainers/veth_endpoint_test.go index c9295af978..c6ae2ce67b 100644 --- a/src/runtime/virtcontainers/veth_endpoint_test.go +++ b/src/runtime/virtcontainers/veth_endpoint_test.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/vhostuser_endpoint.go b/src/runtime/virtcontainers/vhostuser_endpoint.go index 8d317adf39..ecdfa8a5ef 100644 --- a/src/runtime/virtcontainers/vhostuser_endpoint.go +++ b/src/runtime/virtcontainers/vhostuser_endpoint.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0 diff --git a/src/runtime/virtcontainers/vhostuser_endpoint_test.go b/src/runtime/virtcontainers/vhostuser_endpoint_test.go index 783c646bc7..c75930ff6e 100644 --- a/src/runtime/virtcontainers/vhostuser_endpoint_test.go +++ b/src/runtime/virtcontainers/vhostuser_endpoint_test.go @@ -1,5 +1,6 @@ +//go:build linux // +build linux -// + // Copyright (c) 2018 Intel Corporation // // SPDX-License-Identifier: Apache-2.0