From 8482d3c1035095c89d112c75bfcc2e4095b486bf Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sat, 17 Dec 2022 11:59:24 +0100 Subject: pkg/image: factor out from prog Move image compression-related function to a separate package. In preperation for subsequent changes that make decompression more complex. Prog package is already large and complex. Also makes running compression tests/benchmarks much faster. --- tools/syz-imagegen/imagegen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/syz-imagegen/imagegen.go b/tools/syz-imagegen/imagegen.go index f42cda778..4cabcede2 100644 --- a/tools/syz-imagegen/imagegen.go +++ b/tools/syz-imagegen/imagegen.go @@ -27,6 +27,7 @@ import ( "syscall" "time" + "github.com/google/syzkaller/pkg/image" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/pkg/tool" "github.com/google/syzkaller/prog" @@ -877,8 +878,8 @@ func writeImage(img *Image, data []byte) ([]byte, error) { fmt.Fprintf(buf, "# Code generated by tools/syz-imagegen. DO NOT EDIT.\n") fmt.Fprintf(buf, "# requires: manual\n\n") fmt.Fprintf(buf, "# %v\n\n", img) - compressedData := prog.Compress(data) - b64Data := prog.EncodeB64(compressedData) + compressedData := image.Compress(data) + b64Data := image.EncodeB64(compressedData) if img.fs.Name == parttable { fmt.Fprintf(buf, `%s(AUTO, &AUTO="$`, syzReadPartTable) } else { -- cgit mrf-deployment