summaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-02-20 22:31:43 +0000
committergVisor bot <gvisor-bot@google.com>2020-02-20 22:31:43 +0000
commit1ef036583b04a3a3ac625899d124e4b732281ab3 (patch)
tree6aae8adee759b0a3fb015a997391c9d0733559b8 /tools
parentd3b40e45b3bdc3e444cda9816c4e30924d7c9122 (diff)
parentd90d71474f4c82f742140fdf026821709845cece (diff)
Merge release-20200211.0-55-gd90d714 (automated)
Diffstat (limited to 'tools')
-rwxr-xr-xtools/go_marshal/marshal/marshal.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/go_marshal/marshal/marshal.go b/tools/go_marshal/marshal/marshal.go
index 20353850d..f129788e0 100755
--- a/tools/go_marshal/marshal/marshal.go
+++ b/tools/go_marshal/marshal/marshal.go
@@ -91,12 +91,12 @@ type Marshallable interface {
// marshalled does not escape. The implementation should avoid creating
// extra copies in memory by directly deserializing to the object's
// underlying memory.
- CopyIn(task Task, addr usermem.Addr) (int, error)
+ CopyIn(task Task, addr usermem.Addr) error
// CopyOut serializes a Marshallable type to a task's memory. This may only
// be called from a task goroutine. This is more efficient than calling
// MarshalUnsafe on Marshallable.Packed types, as the type being serialized
// does not escape. The implementation should avoid creating extra copies in
// memory by directly serializing from the object's underlying memory.
- CopyOut(task Task, addr usermem.Addr) (int, error)
+ CopyOut(task Task, addr usermem.Addr) error
}