Print more info and make it neater.

go.mod

@@ -0,0 +1,5 @@
+module github.com/klauspost/ryzen-master-vbs-patch
+
+go 1.14
+
+require github.com/klauspost/cpuid/v2 v2.0.3

go.sum

@@ -0,0 +1,3 @@
+github.com/klauspost/cpuid v1.3.1 h1:5JNjFYYQrZeKRJ0734q51WCEEn2huer72Dc7K+R/b6s=
+github.com/klauspost/cpuid/v2 v2.0.3 h1:DNljyrHyxlkk8139OXIAAauCwV8eQGDD6Z8YqnDXdZw=
+github.com/klauspost/cpuid/v2 v2.0.3/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=

main.go

@@ -32,6 +32,8 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+
+	"github.com/klauspost/cpuid/v2"
 )
 
 var patterns = []struct {
@@ -82,7 +84,7 @@ func main() {
 		switch err {
 		case nil:
 		default:
-			fmt.Println(err)
+			fmt.Printf("\nError: %v", err)
 			os.Exit(1)
 		}
 	}
@@ -91,7 +93,10 @@ func main() {
 var errCannotPatch = errors.New("no byte sequence not found")
 
 func patch(in string, out string) error {
-	fmt.Printf("Reading %q\n", in)
+	if cpuid.CPU.BrandName != "" {
+		fmt.Printf("* Host CPU: %s\n\n", cpuid.CPU.BrandName)
+	}
+	fmt.Printf("Reading %q\n\n", in)
 	b, err := ioutil.ReadFile(in)
 	if err != nil {
 		return err
@@ -101,6 +106,9 @@ func patch(in string, out string) error {
 		fmt.Printf("%d. Checking patch for %q. ", i, pattern.desc)
 		fmt.Println("Matching byte sequences:", c, "(should be 1)")
 		if c != 1 {
+			if c = bytes.Count(b, pattern.replace); c > 0 {
+				fmt.Println(" -> Found", c, "replacement pattern(s). Is this already patched?\n")
+			}
 			continue
 		}
 		b = bytes.Replace(b, pattern.search, pattern.replace, -1)