From 73201f4c5700ce7af404b968698b86d80989ab1e Mon Sep 17 00:00:00 2001 From: Haibo Xu Date: Tue, 25 Feb 2020 07:30:12 +0000 Subject: Code Clean: Move arch independent codes to common file in kvm pkg. Signed-off-by: Haibo Xu Change-Id: Iefbdf53e8e8d6d23ae75d8a2ff0d2a6e71f414d8 --- pkg/sentry/platform/kvm/kvm_amd64.go | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'pkg/sentry/platform/kvm/kvm_amd64.go') diff --git a/pkg/sentry/platform/kvm/kvm_amd64.go b/pkg/sentry/platform/kvm/kvm_amd64.go index c5a6f9c7d..093497bc4 100644 --- a/pkg/sentry/platform/kvm/kvm_amd64.go +++ b/pkg/sentry/platform/kvm/kvm_amd64.go @@ -21,17 +21,6 @@ import ( "gvisor.dev/gvisor/pkg/sentry/platform/ring0" ) -// userMemoryRegion is a region of physical memory. -// -// This mirrors kvm_memory_region. -type userMemoryRegion struct { - slot uint32 - flags uint32 - guestPhysAddr uint64 - memorySize uint64 - userspaceAddr uint64 -} - // userRegs represents KVM user registers. // // This mirrors kvm_regs. @@ -169,27 +158,6 @@ type modelControlRegisters struct { entries [16]modelControlRegister } -// runData is the run structure. This may be mapped for synchronous register -// access (although that doesn't appear to be supported by my kernel at least). -// -// This mirrors kvm_run. -type runData struct { - requestInterruptWindow uint8 - _ [7]uint8 - - exitReason uint32 - readyForInterruptInjection uint8 - ifFlag uint8 - _ [2]uint8 - - cr8 uint64 - apicBase uint64 - - // This is the union data for exits. Interpretation depends entirely on - // the exitReason above (see vCPU code for more information). - data [32]uint64 -} - // cpuidEntry is a single CPUID entry. // // This mirrors kvm_cpuid_entry2. -- cgit v1.2.3