diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-19 01:55:24 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-19 01:55:24 +0000 |
| commit | d1ed73fafd02d394090850cac586d3ef4bf7b7ee (patch) | |
| tree | fcbd63d12b99991210907e66778f34e504014f22 /pkg/sentry | |
| parent | 726718b500bfd2aa926f120c93561c88912b7f79 (diff) | |
| parent | afe7303c3cdcf04c9e4491004b3ef2d229bafc74 (diff) | |
Merge release-20200810.0-55-gafe7303c3 (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/device/device.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_arm64.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/device/device.go b/pkg/sentry/device/device.go index f45b2bd2b..6ca9dc79f 100644 --- a/pkg/sentry/device/device.go +++ b/pkg/sentry/device/device.go @@ -256,7 +256,7 @@ func (m *MultiDevice) Load(key MultiDeviceKey, value uint64) bool { } if k, exists := m.rcache[value]; exists && k != key { // Should never happen. - panic("MultiDevice's caches are inconsistent") + panic(fmt.Sprintf("MultiDevice's caches are inconsistent, current: %+v, previous: %+v", key, k)) } // Cache value at key. diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go index 2dac9ad14..eba2eac30 100644 --- a/pkg/sentry/platform/ring0/defs_impl_arm64.go +++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go @@ -3,11 +3,11 @@ package ring0 import ( "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" + "io" "reflect" "fmt" "gvisor.dev/gvisor/pkg/usermem" - "io" ) // Useful bits. |