9 files changed, 35 insertions, 35 deletions
diff --git a/vm/vmimpl/console.go b/vm/vmimpl/console.go
index 07c9b9d27..cd47a43bc 100644
--- a/vm/vmimpl/console.go
+++ b/vm/vmimpl/console.go
@@ -27,12 +27,12 @@ func OpenConsole(con string) (rc io.ReadCloser, err error) {
 		}
 	}()
 	var term unix.Termios
-	_, _, errno := syscall.Syscall(unix.SYS_IOCTL, uintptr(fd), syscall_TCGETS, uintptr(unsafe.Pointer(&term)))
+	_, _, errno := syscall.Syscall(unix.SYS_IOCTL, uintptr(fd), syscallTCGETS, uintptr(unsafe.Pointer(&term)))
 	if errno != 0 {
 		return nil, fmt.Errorf("failed to get console termios: %v", errno)
 	}
 	// no parity bit, only need 1 stop bit, no hardware flowcontrol
-	term.Cflag &^= unix_CBAUD | unix.CSIZE | unix.PARENB | unix.CSTOPB | unix_CRTSCTS
+	term.Cflag &^= unixCBAUD | unix.CSIZE | unix.PARENB | unix.CSTOPB | unixCRTSCTS
 	// ignore modem controls
 	term.Cflag |= unix.B115200 | unix.CS8 | unix.CLOCAL | unix.CREAD
 	// setup for non-canonical mode
@@ -42,7 +42,7 @@ func OpenConsole(con string) (rc io.ReadCloser, err error) {
 	term.Oflag &^= unix.OPOST
 	term.Cc[unix.VMIN] = 0
 	term.Cc[unix.VTIME] = 10 // 1 second timeout
-	_, _, errno = syscall.Syscall(unix.SYS_IOCTL, uintptr(fd), syscall_TCSETS, uintptr(unsafe.Pointer(&term)))
+	_, _, errno = syscall.Syscall(unix.SYS_IOCTL, uintptr(fd), syscallTCSETS, uintptr(unsafe.Pointer(&term)))
 	if errno != 0 {
 		return nil, fmt.Errorf("failed to get console termios: %v", errno)
 	}
diff --git a/vm/vmimpl/console_darwin.go b/vm/vmimpl/console_darwin.go
index 15909ae57..1de3380c0 100644
--- a/vm/vmimpl/console_darwin.go
+++ b/vm/vmimpl/console_darwin.go
@@ -6,8 +6,8 @@ package vmimpl
 import "syscall"
 
 const (
-	unix_CBAUD     = 0
-	unix_CRTSCTS   = 0
-	syscall_TCGETS = syscall.TIOCGETA
-	syscall_TCSETS = syscall.TIOCSETA
+	unixCBAUD     = 0
+	unixCRTSCTS   = 0
+	syscallTCGETS = syscall.TIOCGETA
+	syscallTCSETS = syscall.TIOCSETA
 )
diff --git a/vm/vmimpl/console_freebsd.go b/vm/vmimpl/console_freebsd.go
index 1bc79c439..9f4455ed5 100644
--- a/vm/vmimpl/console_freebsd.go
+++ b/vm/vmimpl/console_freebsd.go
@@ -5,8 +5,8 @@ package vmimpl
 
 // Merely to fix build.
 const (
-	unix_CBAUD     = 0
-	unix_CRTSCTS   = 0
-	syscall_TCGETS = 0
-	syscall_TCSETS = 0
+	unixCBAUD     = 0
+	unixCRTSCTS   = 0
+	syscallTCGETS = 0
+	syscallTCSETS = 0
 )
diff --git a/vm/vmimpl/console_linux_386.go b/vm/vmimpl/console_linux_386.go
index 2f7cad8e6..c2743088b 100644
--- a/vm/vmimpl/console_linux_386.go
+++ b/vm/vmimpl/console_linux_386.go
@@ -9,8 +9,8 @@ import (
 
 // Builds but is not tested.
 const (
-	unix_CBAUD     = unix.CBAUD
-	unix_CRTSCTS   = unix.CRTSCTS
-	syscall_TCGETS = unix.TCGETS2
-	syscall_TCSETS = unix.TCSETS2
+	unixCBAUD     = unix.CBAUD
+	unixCRTSCTS   = unix.CRTSCTS
+	syscallTCGETS = unix.TCGETS2
+	syscallTCSETS = unix.TCSETS2
 )
diff --git a/vm/vmimpl/console_linux_amd64.go b/vm/vmimpl/console_linux_amd64.go
index 6eeb2b258..4b6c11703 100644
--- a/vm/vmimpl/console_linux_amd64.go
+++ b/vm/vmimpl/console_linux_amd64.go
@@ -8,8 +8,8 @@ import (
 )
 
 const (
-	unix_CBAUD     = unix.CBAUD
-	unix_CRTSCTS   = unix.CRTSCTS
-	syscall_TCGETS = unix.TCGETS2
-	syscall_TCSETS = unix.TCSETS2
+	unixCBAUD     = unix.CBAUD
+	unixCRTSCTS   = unix.CRTSCTS
+	syscallTCGETS = unix.TCGETS2
+	syscallTCSETS = unix.TCSETS2
 )
diff --git a/vm/vmimpl/console_linux_arm.go b/vm/vmimpl/console_linux_arm.go
index f10edf002..35944a761 100644
--- a/vm/vmimpl/console_linux_arm.go
+++ b/vm/vmimpl/console_linux_arm.go
@@ -9,8 +9,8 @@ import (
 
 // This compiles, but wan't tested.
 const (
-	unix_CBAUD     = unix.CBAUD
-	unix_CRTSCTS   = unix.CRTSCTS
-	syscall_TCGETS = unix.TCGETS2
-	syscall_TCSETS = unix.TCSETS2
+	unixCBAUD     = unix.CBAUD
+	unixCRTSCTS   = unix.CRTSCTS
+	syscallTCGETS = unix.TCGETS2
+	syscallTCSETS = unix.TCSETS2
 )
diff --git a/vm/vmimpl/console_linux_arm64.go b/vm/vmimpl/console_linux_arm64.go
index f10edf002..35944a761 100644
--- a/vm/vmimpl/console_linux_arm64.go
+++ b/vm/vmimpl/console_linux_arm64.go
@@ -9,8 +9,8 @@ import (
 
 // This compiles, but wan't tested.
 const (
-	unix_CBAUD     = unix.CBAUD
-	unix_CRTSCTS   = unix.CRTSCTS
-	syscall_TCGETS = unix.TCGETS2
-	syscall_TCSETS = unix.TCSETS2
+	unixCBAUD     = unix.CBAUD
+	unixCRTSCTS   = unix.CRTSCTS
+	syscallTCGETS = unix.TCGETS2
+	syscallTCSETS = unix.TCSETS2
 )
diff --git a/vm/vmimpl/console_linux_ppc64le.go b/vm/vmimpl/console_linux_ppc64le.go
index a7374c0e5..62e2c7709 100644
--- a/vm/vmimpl/console_linux_ppc64le.go
+++ b/vm/vmimpl/console_linux_ppc64le.go
@@ -6,8 +6,8 @@ package vmimpl
 // Just to make the code compile.
 // linux_ppc64le as host with adb VMs is not tested.
 const (
-	unix_CBAUD     = 0
-	unix_CRTSCTS   = 0
-	syscall_TCGETS = 0
-	syscall_TCSETS = 0
+	unixCBAUD     = 0
+	unixCRTSCTS   = 0
+	syscallTCGETS = 0
+	syscallTCSETS = 0
 )
diff --git a/vm/vmimpl/console_netbsd.go b/vm/vmimpl/console_netbsd.go
index dc332833d..d7e3487c4 100644
--- a/vm/vmimpl/console_netbsd.go
+++ b/vm/vmimpl/console_netbsd.go
@@ -5,8 +5,8 @@ package vmimpl
 
 // Merely to fix build.
 const (
-	unix_CBAUD     = 0
-	unix_CRTSCTS   = 0
-	syscall_TCGETS = 0
-	syscall_TCSETS = 0
+	unixCBAUD     = 0
+	unixCRTSCTS   = 0
+	syscallTCGETS = 0
+	syscallTCSETS = 0
 )