From 7188a60e2556c1515b80acedd8274abbd03f3e2f Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Tue, 11 Jul 2023 16:59:16 +0100 Subject: [PATCH] runtime: Fix bad merge - Fix the HotPlug type Signed-off-by: stevenhorsman --- src/runtime/pkg/katautils/config.go | 6 +----- src/runtime/virtcontainers/hypervisor.go | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/runtime/pkg/katautils/config.go b/src/runtime/pkg/katautils/config.go index bcea3e71d7..1397954aa5 100644 --- a/src/runtime/pkg/katautils/config.go +++ b/src/runtime/pkg/katautils/config.go @@ -136,7 +136,6 @@ type hypervisor struct { MemSlots uint32 `toml:"memory_slots"` DefaultBridges uint32 `toml:"default_bridges"` Msize9p uint32 `toml:"msize_9p"` - PCIeRootPort uint32 `toml:"pcie_root_port"` GuestPreAttestationGRPCTimeout uint32 `toml:"guest_pre_attestation_grpc_timeout"` SEVGuestPolicy uint32 `toml:"sev_guest_policy"` SNPGuestPolicy uint64 `toml:"snp_guest_policy"` @@ -159,7 +158,7 @@ type hypervisor struct { DisableImageNvdimm bool `toml:"disable_image_nvdimm"` HotplugVFIOOnRootBus bool `toml:"hotplug_vfio_on_root_bus"` HotPlugVFIO config.PCIePort `toml:"hot_plug_vfio"` - ColdPlugVFIO hv.PCIePort `toml:"cold_plug_vfio"` + ColdPlugVFIO config.PCIePort `toml:"cold_plug_vfio"` DisableVhostNet bool `toml:"disable_vhost_net"` GuestMemoryDumpPaging bool `toml:"guest_memory_dump_paging"` ConfidentialGuest bool `toml:"confidential_guest"` @@ -889,7 +888,6 @@ func newQemuHypervisorConfig(h hypervisor) (vc.HypervisorConfig, error) { HotplugVFIOOnRootBus: h.HotplugVFIOOnRootBus, HotPlugVFIO: h.hotPlugVFIO(), ColdPlugVFIO: h.coldPlugVFIO(), - PCIeRootPort: h.PCIeRootPort, DisableVhostNet: h.DisableVhostNet, EnableVhostUserStore: h.EnableVhostUserStore, VhostUserStorePath: h.vhostUserStorePath(), @@ -1340,7 +1338,6 @@ func GetDefaultHypervisorConfig() vc.HypervisorConfig { HotplugVFIOOnRootBus: defaultHotplugVFIOOnRootBus, ColdPlugVFIO: defaultColdPlugVFIO, HotPlugVFIO: defaultHotPlugVFIO, - PCIeRootPort: defaultPCIeRootPort, GuestHookPath: defaultGuestHookPath, VhostUserStorePath: defaultVhostUserStorePath, VhostUserDeviceReconnect: defaultVhostUserDeviceReconnect, @@ -1363,7 +1360,6 @@ func GetDefaultHypervisorConfig() vc.HypervisorConfig { SEVGuestPolicy: defaultSEVGuestPolicy, SNPGuestPolicy: defaultSNPGuestPolicy, SEVCertChainPath: defaultSEVCertChainPath, - VhostUserDeviceReconnect: defaultVhostUserDeviceReconnect, } } diff --git a/src/runtime/virtcontainers/hypervisor.go b/src/runtime/virtcontainers/hypervisor.go index 299118292a..f2c86c6a6c 100644 --- a/src/runtime/virtcontainers/hypervisor.go +++ b/src/runtime/virtcontainers/hypervisor.go @@ -389,7 +389,6 @@ type HypervisorConfig struct { Gid uint32 SEVGuestPolicy uint32 SNPGuestPolicy uint64 - PCIeRootPort uint32 NumVCPUs uint32 RemoteHypervisorTimeout uint32 IOMMUPlatform bool @@ -421,7 +420,7 @@ type HypervisorConfig struct { DisableGuestSeLinux bool LegacySerial bool HotPlugVFIO config.PCIePort - ColdPlugVFIO hv.PCIePort + ColdPlugVFIO config.PCIePort VFIODevices []config.DeviceInfo VhostUserBlkDevices []config.DeviceInfo }