summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrei Vagin <avagin@google.com>2020-10-09 14:32:05 -0700
committergVisor bot <gvisor-bot@google.com>2020-10-09 14:34:51 -0700
commita0ffc84adfe345e52a249bd1bac9c9f883bf0fe7 (patch)
treecffdd4a6ba06f3e1511fd556ef3e24f5c377b525
parentb576de907cb42b8df11695cc58792631f4c059ae (diff)
platform/kvm: remove the unused field
PiperOrigin-RevId: 336366624
-rw-r--r--pkg/sentry/platform/ring0/defs_amd64.go1
-rw-r--r--pkg/sentry/platform/ring0/offsets_amd64.go1
2 files changed, 0 insertions, 2 deletions
diff --git a/pkg/sentry/platform/ring0/defs_amd64.go b/pkg/sentry/platform/ring0/defs_amd64.go
index f617519fa..00899273e 100644
--- a/pkg/sentry/platform/ring0/defs_amd64.go
+++ b/pkg/sentry/platform/ring0/defs_amd64.go
@@ -92,7 +92,6 @@ type kernelEntry struct {
// scratch space for temporary usage.
scratch0 uint64
- scratch1 uint64
// stackTop is the top of the stack.
stackTop uint64
diff --git a/pkg/sentry/platform/ring0/offsets_amd64.go b/pkg/sentry/platform/ring0/offsets_amd64.go
index 290d94bd6..ca4075b09 100644
--- a/pkg/sentry/platform/ring0/offsets_amd64.go
+++ b/pkg/sentry/platform/ring0/offsets_amd64.go
@@ -38,7 +38,6 @@ func Emit(w io.Writer) {
e := &kernelEntry{}
fmt.Fprintf(w, "\n// CPU entry offsets.\n")
fmt.Fprintf(w, "#define ENTRY_SCRATCH0 0x%02x\n", reflect.ValueOf(&e.scratch0).Pointer()-reflect.ValueOf(e).Pointer())
- fmt.Fprintf(w, "#define ENTRY_SCRATCH1 0x%02x\n", reflect.ValueOf(&e.scratch1).Pointer()-reflect.ValueOf(e).Pointer())
fmt.Fprintf(w, "#define ENTRY_STACK_TOP 0x%02x\n", reflect.ValueOf(&e.stackTop).Pointer()-reflect.ValueOf(e).Pointer())
fmt.Fprintf(w, "#define ENTRY_CPU_SELF 0x%02x\n", reflect.ValueOf(&e.cpuSelf).Pointer()-reflect.ValueOf(e).Pointer())
fmt.Fprintf(w, "#define ENTRY_KERNEL_CR3 0x%02x\n", reflect.ValueOf(&e.kernelCR3).Pointer()-reflect.ValueOf(e).Pointer())